Author: mallon Date: 2012-07-20 16:04:22 +0200 (Fri, 20 Jul 2012) New Revision: 3547 Url: http://chorem.org/repositories/revision/lima/3547 Log: fixes #706 Corrections sur la s?\195?\169rialization de 'LetteringEditModel', les 'propertyChange' du handler, et dans la gestion des boutons de lettrage / d?\195?\169lettrage. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2012-07-20 12:24:05 UTC (rev 3546) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2012-07-20 14:04:22 UTC (rev 3547) @@ -38,7 +38,7 @@ <LetteringViewHandler id="handler" constructorParams="this"/> <LetteringTableModel id="tableModel"/> - <LetteringFilter id='filterModel' initializer='new LetteringFilterImpl()'/> + <LetteringFilterImpl id='filterModel' initializer='new LetteringFilterImpl()'/> <LetteringEditModel id='editModel'/> <LettringSelectionModel id='lettringSelectionModel' constructorParams=' tableModel' @@ -107,7 +107,7 @@ <row> <cell> <JRadioButton id="noLettredEntryCheckBox" selected="true" buttonGroup="letteredCheckGroup" - onActionPerformed="filterModel.setDisplayUnlettred(true) ; filterModel.setDisplayLettered(false)"/> + onActionPerformed="filterModel.setDisplayUnlettred(true); filterModel.setDisplayLettered(false)"/> </cell> <cell> <JLabel text="lima.ui.lettering.checkNoLettredEntry"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-20 12:24:05 UTC (rev 3546) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-20 14:04:22 UTC (rev 3547) @@ -28,8 +28,7 @@ import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.beans.DateFilterImpl; -import org.chorem.lima.beans.LetteringFilter; +import org.chorem.lima.beans.LetteringFilterImpl; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.FinancialPeriodService; @@ -70,7 +69,7 @@ protected FinancialTransactionService financialTransactionService; protected EntryBookService entryBookService; - protected LetteringFilter filter; + protected LetteringFilterImpl filter; protected BigDecimal debit = BigDecimal.ZERO; protected BigDecimal credit = BigDecimal.ZERO; @@ -95,34 +94,21 @@ filter = view.getFilterModel(); editModel = view.getEditModel(); lettringSelectionModel = view.getLettringSelectionModel(); - filter.setFiscalDateFilter(new DateFilterImpl()); loadComboAndRows(); filter.addPropertyChangeListener(new PropertyChangeListener() { @Override public void propertyChange(PropertyChangeEvent evt) { - onBalanceChanged(null); - view.getLettringSelectionModel().clearSelection(); updateAllEntries(); - onButtonModeChanged("all"); } }); - - editModel.addPropertyChangeListener(new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - view.getCreditTextField().setText(editModel.getCredit().toString()); - view.getDebitTexttField().setText(editModel.getDebit().toString()); - view.getSoldeTextField().setText(editModel.getSolde().toString()); - view.getNoLettered().setEnabled(editModel.isUnLettred()); - view.getLettered().setEnabled(editModel.isLettred()); - } - }); } public void balanceAndActions() { - if (!letteringNotExist(view.getTable().getSelectedRow())) { + if (view.getTable().getSelectedRow() == -1) { + onButtonModeChanged("all"); + } else if (!letteringNotExist(view.getTable().getSelectedRow())) { //unlettred entries onBalanceChanged(null); setValuesForSelectedEntries(); @@ -255,7 +241,7 @@ updateAllEntries(); } - protected List<Entry> findAllEntries(LetteringFilter filter){ + protected List<Entry> findAllEntries(LetteringFilterImpl filter){ if (filter != null) { List<Entry> entries = financialTransactionService.getAllEntrieByDatesAndAccountAndLettering(filter); @@ -266,7 +252,7 @@ public void updateAllEntries() { - if (filter != null) { + if (isFilterValid()) { List<Entry> entries = findAllEntries(filter); List<String> journalEntrees = new ArrayList<String>(); @@ -283,6 +269,19 @@ view.getLettringSelectionModel().clearSelection(); } + /**To test if the filter contain an account and a period + * @return true if filter is valid + * */ + protected boolean isFilterValid() { + boolean valid = false; + + if (filter.getAccount() != null && filter.getDateStart() != null && filter.getDateEnd() != null) { + valid = true; + } + + return valid; + } + /** * Select previous value in combo box. * @@ -315,18 +314,13 @@ /**Add a group of three letters to n entries*/ public void addLetter() { String newLetters = financialTransactionService.getNextLetters(); - changeLetter(newLetters); - editModel.setLettred(false); - editModel.setUnLettred(false); onBalanceChanged(null); } /**Remove a group of three letters to n entries*/ public void removeLetter() { changeLetter(null); - editModel.setLettred(false); - editModel.setUnLettred(false); onBalanceChanged(null); } @@ -339,6 +333,8 @@ for (int indexEntry : entrieSelected){ financialTransactionService.updateEntry(view.getTableModel().getEntryAt(indexEntry)); } + editModel.setLettred(false); + editModel.setUnLettred(false); } }