branch feature/1242-no-account-research-exception updated (5cf4e25 -> 79ebf7d)
This is an automated email from the git hooks/post-receive script. New change to branch feature/1242-no-account-research-exception in repository lima. See http://git.chorem.org/lima.git discards 5cf4e25 refs #1242 Refactoring pour plus de lisibilité discards c5f4901 refs #1242 Modification pour plus de lisibilité suite à revue de code Kevin discards 559a100 fixes #1243 la sortie du champ date ou le clic sur une autre action entraine bien la prise en compte des dates saisies discards 5966078 refs #1242 verifivation que l'on filtre bien sur un compte adds 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 adds d100451 refs #1289 calcul de la colonne Solde dans l'onglet recherche des entrées adds acefd82 refs #1289refactoring adds 32aa3f8 refs #1289 Le solde est positif si le solde est débiteur adds 13b9893 Merge branch 'feature/1289-SearchEntriescomputeSold' into develop adds 26111c4 refs #1293 "Onglet Saisie des écritures" La saisie dans le champ jour est dirrectement prise en compte adds 54e25dd refs #1293 Auto selection du compte si un seul compte correspond à la recherche adds 785fc80 refs #1295 Même objet sélectionné entre la combobox et le model adds c51843f Merge branch 'feature/1295-improveEditEntryView' into develop adds 2d2c8a4 refs #1241 ordonne les entrée par date adds 8ef9bf6 refs #1286 Regrouppement des entrées par pièces comptable dans la saisie d'écriture adds bce1075 refs #1286 La solution adopter n'est pas idéale, il faudra revoir le model pour ordonnée les entrée d'une transaction voir ref #1207 adds 4bbfd4d Merge branch 'feature/1286-ordered-entries' into develop new 636a5ba refs #1242 verifivation que l'on filtre bien sur un compte new ae8502c fixes #1243 la sortie du champ date ou le clic sur une autre action entraine bien la prise en compte des dates saisies new 2dc6345 refs #1242 Modification pour plus de lisibilité suite à revue de code Kevin new 79ebf7d refs #1242 Refactoring pour plus de lisibilité 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 (5cf4e25) \ N -- N -- N refs/heads/feature/1242-no-account-research-exception (79ebf7d) 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 79ebf7d220ed2688a10b0ad1e421fabd7d706e2c Author: dcosse <cosse@codelutin.com> Date: Mon Sep 28 17:15:06 2015 +0200 refs #1242 Refactoring pour plus de lisibilité commit 2dc6345cdd1916ea9f90e358e407dd02efd60f41 Author: dcosse <cosse@codelutin.com> Date: Mon Sep 28 16:43:18 2015 +0200 refs #1242 Modification pour plus de lisibilité suite à revue de code Kevin commit ae8502c6e4ead0749acab5d1b714228efbc35370 Author: dcosse <cosse@codelutin.com> Date: Tue Jun 30 16:55:21 2015 +0200 fixes #1243 la sortie du champ date ou le clic sur une autre action entraine bien la prise en compte des dates saisies commit 636a5ba8c0db0f3bc3fd6675c69b6abc108541cd Author: dcosse <cosse@codelutin.com> Date: Mon Jun 29 14:49:57 2015 +0200 refs #1242 verifivation que l'on filtre bien sur un compte Summary of changes: .../ejb/FinancialTransactionServiceImpl.java | 2 +- .../java/org/chorem/lima/entity/EntryTopiaDao.java | 19 +++++--- .../lima/ui/celleditor/AccountTableCellEditor.java | 28 +++++++++-- .../lima/ui/celleditor/DayTableCellEditor.java | 30 +++++------- .../ui/common/FinancialTransactionTableModel.java | 56 +++++++++++++++++++++- .../ui/financialtransaction/AccountColumn.java | 4 ++ .../ui/financialtransaction/BalanceColumn.java | 35 +++++++++++--- .../lima/ui/financialtransaction/DayColumn.java | 6 ++- .../FinancialTransactionViewHandler.java | 23 +++++++-- .../FinancialTransactionSearchTableModel.java | 15 ++++-- pom.xml | 2 +- 11 files changed, 172 insertions(+), 48 deletions(-) copy lima-business-api/src/main/java/org/chorem/lima/LimaTechnicalException.java => lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DayTableCellEditor.java (64%) -- 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/1242-no-account-research-exception in repository lima. See http://git.chorem.org/lima.git commit 636a5ba8c0db0f3bc3fd6675c69b6abc108541cd Author: dcosse <cosse@codelutin.com> Date: Mon Jun 29 14:49:57 2015 +0200 refs #1242 verifivation que l'on filtre bien sur un compte --- .../lima/ui/Filter/AccountCondition/AccountConditionHandler.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionHandler.java index 4138fdc..e5ba896 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionHandler.java @@ -80,7 +80,8 @@ public class AccountConditionHandler implements ConditionHandler { public void accountComboBoxChange(PropertyChangeEvent event) { if (event.getPropertyName().equals(AccountComboBox.PROPERTY_SELECTED_ITEM)) { - setAccount((Account) event.getNewValue()); + Account account = event.getNewValue() == null ? null : event.getNewValue() instanceof Account ? (Account) event.getNewValue() : null; + setAccount(account); } } } -- 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/1242-no-account-research-exception in repository lima. See http://git.chorem.org/lima.git commit ae8502c6e4ead0749acab5d1b714228efbc35370 Author: dcosse <cosse@codelutin.com> Date: Tue Jun 30 16:55:21 2015 +0200 fixes #1243 la sortie du champ date ou le clic sur une autre action entraine bien la prise en compte des dates saisies --- .../org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx | 2 +- .../ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx index 93e365c..7c7168f 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx @@ -39,5 +39,5 @@ <JAXXDatePicker id='datePicker' date='{handler.getDate()}' formats='{handler.getFormats()}' - onActionPerformed='handler.setDate(datePicker.getDate())'/> + onPropertyChange='handler.setDate(datePicker.getDate())'/> </JInternalFrame> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx index a5fa4f6..bf261b6 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx @@ -28,7 +28,8 @@ org.chorem.lima.beans.DateCondition </import> <DateIntervalConditionHandler id="handler" - javaBean="new DateIntervalConditionHandler(this)"/> + constructorParams="this"/> + <Table> <row> <cell> @@ -38,7 +39,7 @@ <JAXXDatePicker id='beginDatePicker' date='{handler.getBeginDate()}' formats='{handler.getFormats()}' - onActionPerformed='handler.setBeginDate(beginDatePicker.getDate())'/> + onPropertyChange='handler.setBeginDate(beginDatePicker.getDate())'/> </cell> </row> <row> @@ -49,7 +50,7 @@ <JAXXDatePicker id='endDatePicker' date='{handler.getEndDate()}' formats='{handler.getFormats()}' - onActionPerformed='handler.setEndDate(endDatePicker.getDate())'/> + onPropertyChange='handler.setEndDate(endDatePicker.getDate())'/> </cell> </row> </Table> -- 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/1242-no-account-research-exception in repository lima. See http://git.chorem.org/lima.git commit 2dc6345cdd1916ea9f90e358e407dd02efd60f41 Author: dcosse <cosse@codelutin.com> Date: Mon Sep 28 16:43:18 2015 +0200 refs #1242 Modification pour plus de lisibilité suite à revue de code Kevin --- .../lima/ui/Filter/AccountCondition/AccountConditionHandler.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionHandler.java index e5ba896..0dd92ed 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionHandler.java @@ -80,7 +80,10 @@ public class AccountConditionHandler implements ConditionHandler { public void accountComboBoxChange(PropertyChangeEvent event) { if (event.getPropertyName().equals(AccountComboBox.PROPERTY_SELECTED_ITEM)) { - Account account = event.getNewValue() == null ? null : event.getNewValue() instanceof Account ? (Account) event.getNewValue() : null; + Account account = null; + if (event.getNewValue() != null && event.getNewValue() instanceof Account) { + account = (Account) event.getNewValue(); + } setAccount(account); } } -- 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/1242-no-account-research-exception in repository lima. See http://git.chorem.org/lima.git commit 79ebf7d220ed2688a10b0ad1e421fabd7d706e2c Author: dcosse <cosse@codelutin.com> Date: Mon Sep 28 17:15:06 2015 +0200 refs #1242 Refactoring pour plus de lisibilité --- .../ui/financialtransaction/AccountColumn.java | 44 +++++++++++++++------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java index e8484d0..a76504d 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/AccountColumn.java @@ -50,19 +50,20 @@ public class AccountColumn extends AbstractColumn<FinancialTransactionTableModel @Override public boolean setValueAt(Object value, int row) { Entry entry = tableModel.get(row); - // In case of Account field being feed up but no account was selected - // the value is a String instead of Account. - Account account = value == null ? null : value instanceof Account ? (Account) value : null; - boolean update = ((entry.getAccount()) == null != (account == null)) - || (entry.getAccount() != null - && !entry.getAccount().getAccountNumber().equals(account.getAccountNumber())); + + Account selectedAccount = getSelectedAccount(value); + Account previousAccount = entry.getAccount(); + + boolean update = isValueChange(selectedAccount, previousAccount); + if (update) { - Account previousAccount = entry.getAccount(); - entry.setAccount(account); - if (!tableModel.updateEntry(entry)) { - update = revertAccountChange(entry, previousAccount); + entry.setAccount(selectedAccount); + boolean updateSucceed = !tableModel.updateEntry(entry); + if (updateSucceed) { + setDescriptionFieldIfNone(entry, selectedAccount); } else { setDescriptionFieldIfNone(entry, account); + update = revertAccountChange(entry, previousAccount); } } @@ -70,15 +71,32 @@ public class AccountColumn extends AbstractColumn<FinancialTransactionTableModel } protected void setDescriptionFieldIfNone(Entry entry, Account account) { + protected Account getSelectedAccount(Object value) { + Account newAccount = null; + if (value != null && value instanceof Account) { + newAccount = (Account) value; + } + return newAccount; + } + + protected boolean isValueChange(Account newAccount, Account previousAccount) { + boolean update; + if (previousAccount == null) { + update = newAccount != null; + } else { + update = newAccount == null || !previousAccount.getAccountNumber().equals(newAccount.getAccountNumber()); + } + return update; + } + + protected void setDescriptionFieldIfNone(Entry entry, Account account) { if (StringUtils.isBlank(entry.getDescription()) && account != null && StringUtils.isNotBlank(account.getLabel())) { entry.setDescription(account.getLabel()); } } protected boolean revertAccountChange(Entry entry, Account previousAccount) { - boolean update; entry.setAccount(previousAccount); - update = false; - return update; + return false; } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm