This is an automated email from the git hooks/post-receive script. New change to branch feature/1289-SearchEntriescomputeSold in repository lima. See http://git.chorem.org/lima.git discards 616ec6d refs #1289 Le solde est positif si le solde est débiteur discards 2a3623d refs #1289refactoring discards 9e607a7 refs #1289 calcul de la colonne Solde dans l'onglet recherche des entrées new 0112481 refs #1290 A la création d'une transaction si aucune n'a été créée lors de la même session est qu'une transaction est sélectionnée alors la nouvelle trasaction prend la date de celle-ci new d100451 refs #1289 calcul de la colonne Solde dans l'onglet recherche des entrées new acefd82 refs #1289refactoring new 32aa3f8 refs #1289 Le solde est positif si le solde est débiteur This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (616ec6d) \ N -- N -- N refs/heads/feature/1289-SearchEntriescomputeSold (32aa3f8) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 32aa3f8d32f27b0d013c8edf9e2d8e29d2299d4e Author: dcosse <cosse@codelutin.com> Date: Fri Sep 11 14:56:45 2015 +0200 refs #1289 Le solde est positif si le solde est débiteur commit acefd825d3c5187b1c0ba92a8150e3359672d276 Author: dcosse <cosse@codelutin.com> Date: Wed Sep 9 18:51:12 2015 +0200 refs #1289refactoring commit d10045132bb560aa1ecd583793893a047d922fe0 Author: dcosse <cosse@codelutin.com> Date: Wed Sep 9 18:21:17 2015 +0200 refs #1289 calcul de la colonne Solde dans l'onglet recherche des entrées commit 01124814ae59b5e4f3c088da637410822e6be0fd Author: dcosse <cosse@codelutin.com> Date: Thu Sep 10 15:06:06 2015 +0200 refs #1290 A la création d'une transaction si aucune n'a été créée lors de la même session est qu'une transaction est sélectionnée alors la nouvelle trasaction prend la date de celle-ci Summary of changes: .../FinancialTransactionViewHandler.java | 23 +++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/1289-SearchEntriescomputeSold in repository lima. See http://git.chorem.org/lima.git commit 01124814ae59b5e4f3c088da637410822e6be0fd Author: dcosse <cosse@codelutin.com> Date: Thu Sep 10 15:06:06 2015 +0200 refs #1290 A la création d'une transaction si aucune n'a été créée lors de la même session est qu'une transaction est sélectionnée alors la nouvelle trasaction prend la date de celle-ci --- .../FinancialTransactionViewHandler.java | 23 +++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java index c4b7466..2ad6138 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java @@ -478,7 +478,7 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo table.changeSelection(index, 1, false, false); table.requestFocus(); table.scrollRowToVisible(Math.max(0, index - 5)); - table.scrollRowToVisible(Math.min(tableModel.size() -1 , index + transaction.sizeEntry() + 5)); + table.scrollRowToVisible(Math.min(tableModel.size() - 1, index + transaction.sizeEntry() + 5)); } catch (LockedFinancialPeriodException e) { errorHelper.showErrorMessage(t("lima.entries.paste.transaction.error.lockedFinancialPeriod", e.getFinancialPeriod().getBeginDate(), @@ -983,7 +983,11 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo } } - public Date getUseDate() { + /** + * + * @return the last edited transaction, if none the selected transaction date, if none the begin date. + */ + protected Date getUseDate() { FinancialPeriod financialPeriod = (FinancialPeriod)view.getFinancialPeriodComboBox().getSelectedItem(); Date beginDate = financialPeriod.getBeginDate(); @@ -992,12 +996,25 @@ public class FinancialTransactionViewHandler implements ServiceListener, TableMo if (lastAssignDate == null || lastAssignDate.before(beginDate) || lastAssignDate.after(endDate) ) { - lastAssignDate = beginDate; + + FinancialTransaction selectedTransaction = getSelectedFinancialTransaction(); + lastAssignDate = selectedTransaction == null ? beginDate : selectedTransaction.getTransactionDate(); } return lastAssignDate; } + protected FinancialTransaction getSelectedFinancialTransaction() { + FinancialTransactionTable table = view.getFinancialTransactionTable(); + FinancialTransactionTableModel tableModel = view.getFinancialTransactionTableModel(); + int indexSelectedRow = table.getSelectedRow(); + FinancialTransaction selectedTransaction = null; + if (indexSelectedRow != -1) { + selectedTransaction = tableModel.getTransactionAt(indexSelectedRow); + } + return selectedTransaction; + } + protected void computePeriodStatusText() { FinancialPeriod period = (FinancialPeriod) view.getFinancialPeriodComboBoxModel().getSelectedItem(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/1289-SearchEntriescomputeSold in repository lima. See http://git.chorem.org/lima.git commit d10045132bb560aa1ecd583793893a047d922fe0 Author: dcosse <cosse@codelutin.com> Date: Wed Sep 9 18:21:17 2015 +0200 refs #1289 calcul de la colonne Solde dans l'onglet recherche des entrées --- .../ui/financialtransaction/BalanceColumn.java | 24 ++++++++++++++++++---- .../FinancialTransactionSearchTableModel.java | 6 +++--- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/BalanceColumn.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/BalanceColumn.java index 6d37000..70dba87 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/BalanceColumn.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/BalanceColumn.java @@ -22,6 +22,7 @@ package org.chorem.lima.ui.financialtransaction; * #L% */ +import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.ui.common.AbstractColumn; import org.chorem.lima.ui.common.FinancialTransactionTableModel; @@ -41,12 +42,27 @@ public class BalanceColumn extends AbstractColumn<FinancialTransactionTableModel @Override public Object getValueAt(int row) { - BigDecimal result; + BigDecimal result = BigDecimal.ZERO; FinancialTransaction transaction = tableModel.getTransactionAt(row); - if (row == 0 || tableModel.get(row - 1).getFinancialTransaction() != transaction) { - result = transaction.getAmountDebit().subtract(transaction.getAmountCredit()); + if (row == 0) { + Entry entry = tableModel.get(row); + result = entry.isDebit() ? result.subtract(entry.getAmount()) : result.add(entry.getAmount()); } else { - result = BigDecimal.ZERO; + int i = 1; + Entry previousEntry = tableModel.get(row - 1); + FinancialTransaction previousTransaction = previousEntry.getFinancialTransaction(); + + Entry currentEntry = tableModel.get(row); + result = currentEntry.isDebit() ? result.subtract(currentEntry.getAmount()) : result.add(currentEntry.getAmount()); + + if (transaction == previousTransaction) { + while (row - i >= 0 && tableModel.get(row - i).getFinancialTransaction() == transaction) { + Entry prevEntry = tableModel.get(row - i); + result = prevEntry.isDebit() ? result.subtract(prevEntry.getAmount()) : result.add(prevEntry.getAmount()); + i++; + } + } + } return result; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java index 7dc70ae..16ff97e 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java @@ -101,9 +101,9 @@ public class FinancialTransactionSearchTableModel extends FinancialTransactionTa selectedFiscalPeriod = fiscalPeriod; } - public void notifyMethod(String serviceName, String methodeName) { - if ((serviceName.contains("FinancialTransaction") || methodeName.contains("importEntries") - || methodeName.contains("importAll")) && !methodeName.contains("search")) { + public void notifyMethod(String serviceName, String methodName) { + if ((serviceName.contains("FinancialTransaction") || methodName.contains("importEntries") + || methodName.contains("importAll")) && !methodName.contains("search")) { //on recharge la liste refresh(financialTransactionCondition); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/1289-SearchEntriescomputeSold in repository lima. See http://git.chorem.org/lima.git commit acefd825d3c5187b1c0ba92a8150e3359672d276 Author: dcosse <cosse@codelutin.com> Date: Wed Sep 9 18:51:12 2015 +0200 refs #1289refactoring --- .../ui/financialtransaction/BalanceColumn.java | 43 +++++++++++++--------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/BalanceColumn.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/BalanceColumn.java index 70dba87..9c95ea6 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/BalanceColumn.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/BalanceColumn.java @@ -42,28 +42,35 @@ public class BalanceColumn extends AbstractColumn<FinancialTransactionTableModel @Override public Object getValueAt(int row) { - BigDecimal result = BigDecimal.ZERO; - FinancialTransaction transaction = tableModel.getTransactionAt(row); - if (row == 0) { - Entry entry = tableModel.get(row); - result = entry.isDebit() ? result.subtract(entry.getAmount()) : result.add(entry.getAmount()); - } else { - int i = 1; - Entry previousEntry = tableModel.get(row - 1); - FinancialTransaction previousTransaction = previousEntry.getFinancialTransaction(); + BigDecimal balance = BigDecimal.ZERO; + balance = getRowBalance(row, balance); - Entry currentEntry = tableModel.get(row); - result = currentEntry.isDebit() ? result.subtract(currentEntry.getAmount()) : result.add(currentEntry.getAmount()); + if (row > 0) { + balance = addPreviousTransactionEntryBalance(row, balance); + } + return balance; + } + + protected BigDecimal getRowBalance(int row, BigDecimal result) { + Entry currentEntry = tableModel.get(row); + result = currentEntry.isDebit() ? result.subtract(currentEntry.getAmount()) : result.add(currentEntry.getAmount()); + return result; + } - if (transaction == previousTransaction) { - while (row - i >= 0 && tableModel.get(row - i).getFinancialTransaction() == transaction) { - Entry prevEntry = tableModel.get(row - i); - result = prevEntry.isDebit() ? result.subtract(prevEntry.getAmount()) : result.add(prevEntry.getAmount()); - i++; - } - } + protected BigDecimal addPreviousTransactionEntryBalance(int row, BigDecimal result) { + FinancialTransaction rowTransaction = tableModel.getTransactionAt(row); + int i = 1; + while (isSameTransaction(row, rowTransaction, i)) { + result = getRowBalance(row - i, result); + i++; } + return result; } + + protected boolean isSameTransaction(int row, FinancialTransaction transaction, int i) { + return row - i >= 0 && tableModel.get(row - i).getFinancialTransaction() == transaction; + } + } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/1289-SearchEntriescomputeSold in repository lima. See http://git.chorem.org/lima.git commit 32aa3f8d32f27b0d013c8edf9e2d8e29d2299d4e Author: dcosse <cosse@codelutin.com> Date: Fri Sep 11 14:56:45 2015 +0200 refs #1289 Le solde est positif si le solde est débiteur --- .../java/org/chorem/lima/ui/financialtransaction/BalanceColumn.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/BalanceColumn.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/BalanceColumn.java index 9c95ea6..1fa79db 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/BalanceColumn.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/BalanceColumn.java @@ -53,7 +53,7 @@ public class BalanceColumn extends AbstractColumn<FinancialTransactionTableModel protected BigDecimal getRowBalance(int row, BigDecimal result) { Entry currentEntry = tableModel.get(row); - result = currentEntry.isDebit() ? result.subtract(currentEntry.getAmount()) : result.add(currentEntry.getAmount()); + result = currentEntry.isDebit() ? result.add(currentEntry.getAmount()) : result.subtract(currentEntry.getAmount()); return result; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm