Author: mallon Date: 2012-07-05 18:31:54 +0200 (Thu, 05 Jul 2012) New Revision: 3494 Url: http://chorem.org/repositories/revision/lima/3494 Log: Correction du mod?\195?\168le de l'interface de lettrage pour la remise ?\195?\160 z?\195?\169ro des montants de d?\195?\169bit / cr?\195?\169dit / solde, lors de l'utilisation des filtres. fixes #682 Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 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/LetteringModelUI.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-05 15:21:06 UTC (rev 3493) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-05 16:31:54 UTC (rev 3494) @@ -28,7 +28,6 @@ protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); - /** log. */ private static final Log log = LogFactory.getLog(LetteringModelUI.class); protected LetteringTableModel model; @@ -49,6 +48,15 @@ this.model = model; } + public void resetDebitCreditBalance(){ + setDebit(BigDecimal.ZERO); + setCredit(BigDecimal.ZERO); + setSolde(BigDecimal.ZERO); + debitTotal = BigDecimal.ZERO; + creditTotal = BigDecimal.ZERO; + soldeTotal = BigDecimal.ZERO; + } + public Entry getSelectedEntry() { return selectedEntry; } @@ -108,7 +116,7 @@ this.solde = solde; firePropertyChange(SOLDE_PROPERTY, oldSolde, solde); } - + public void addPropertyChangeListener(PropertyChangeListener listener) { pcs.addPropertyChangeListener(listener); } @@ -136,6 +144,8 @@ @Override public void setSelectionInterval(int row, int column) { + setLettrer(false); + setDelettrer(false); Entry entryAt = model.getEntryAt(row); List<Entry> modelEntries = model.getEntries(); setSelectedEntry(entryAt); @@ -167,9 +177,9 @@ } }else{ //no line selected or line selected different of the current - //Test null for currentEntry cause of selection before of entry with letter + //Test null for currentEntry cause of selection before entry with letter if (isSelectionEmpty() || currentEntry == null || !currentEntry.equals(entryAt)){ - if (currentLettring != null){ + if (currentEntry == null && currentLettring != null){ super.clearSelection(); debitTotal = BigDecimal.ZERO; creditTotal = BigDecimal.ZERO; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-07-05 15:21:06 UTC (rev 3493) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-07-05 16:31:54 UTC (rev 3494) @@ -59,7 +59,6 @@ /** serialVersionUID. */ private static final long serialVersionUID = 1L; - /** log. */ private static final Log log = LogFactory.getLog(LetteringTableModel.class); /** Transaction service. */ @@ -106,7 +105,7 @@ return null; } - public int getNUmberOfEntries(){ + public int getNumberOfEntries(){ return entries.size(); } @@ -134,10 +133,6 @@ selectedEndDate = date; } - public void removeLetter(int row) { - //TODO - } - @Override public int getColumnCount() { return 7; @@ -289,33 +284,6 @@ fireTableDataChanged(); } - /** to modifiy letter entry */ - /* @Override - public void setValueAt(Object value, int row, int column) {*/ - //TODO - /*int financialTransactionRow = 0; - if (cacheDataList != null) { - Object currentRow = cacheDataList.get(row); - if (currentRow instanceof Entry) { - Entry currentEntry = (Entry) currentRow; - switch (column) { - case 4: - currentEntry.setLettering((String) value); - break; - } - - financialTransactionService.updateEntry(currentEntry);*/ - - //update the financial transaction in entire - /*financialTransactionRow = - getDataList().indexOf(((Entry) currentRow). - getFinancialTransaction());*/ - /* } - //on recharge la liste - fireTableRowsUpdated(financialTransactionRow, getRowCount() - 1); - }*/ - //} - @Override public void notifyMethod(String serviceName, String methodeName) { if (serviceName.contains("FinancialTransaction") || 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-05 15:21:06 UTC (rev 3493) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-05 16:31:54 UTC (rev 3494) @@ -57,19 +57,12 @@ */ public class LetteringViewHandler implements ServiceListener{ - /** log. */ private static final Log log = LogFactory.getLog(LetteringViewHandler.class); protected LetteringView view; protected LetteringTable table; - /*protected LetteringTableModel tableModel; - - protected FiscalPeriodComboBoxModel fiscalPeriodComboBoxModel; - - protected FinancialPeriodComboBoxModel financialPeriodComboBoxModel;*/ - /** Transaction service. */ protected FiscalPeriodService fiscalPeriodService; protected FinancialPeriodService financialPeriodService; @@ -92,50 +85,6 @@ */ public void init() { loadComboAndRows(); - /*LetteringModelUI modelUi = view.getModelUi(); - - modelUi.addListSelectionListener(new ListSelectionListener(){ - List<Entry> entries = new ArrayList<Entry>(); - - @Override - public void valueChanged(ListSelectionEvent evt) { - - LetteringModelUI modelUiPropChange = (LetteringModelUI)evt.getSource(); - if (evt.getValueIsAdjusting()){ - LetteringTableModel tableModel = view.getTableModel(); - LetteringTable table = view.getTable(); - int nbEntriesModel = tableModel.getNUmberOfEntries(); - - Entry lastEntry = tableModel.getEntryAt(evt.getLastIndex()); - int nbSelectedRowTable = table.getSelectedRows().length; - int sizeEntries = entries.size(); - - if (log.isInfoEnabled()) { - log.info("Size list entries : " + sizeEntries + "\n" + - "Nb selected row : " + nbSelectedRowTable + "\n"+ - "Nb ligne model : " + nbEntriesModel); - } - - //Managing selection - if (nbSelectedRowTable > sizeEntries || (nbSelectedRowTable==sizeEntries && nbSelectedRowTable==1)){ - entries.add(lastEntry); - if (log.isInfoEnabled()) { - log.info("Add entry"); - } - }else if (nbSelectedRowTable < sizeEntries){ - entries.remove(entries.size() - 1); - if (log.isInfoEnabled()) { - log.info("Remove entry"); - } - } - - if (log.isInfoEnabled()) { - log.info("Size entries after update : " + entries.size()); - } - loadCurrentSelection(modelUiPropChange, entries); - } - } - });*/ } public void loadComboAndRows(){ @@ -185,7 +134,7 @@ //Load entry with the default dates, default account 4 and with no letter updateAllEntries(defaultDateBegFiscalPeriod, defaultDateEndCurrent, view.getAccountComboBoxModel().getSelectedItem(), view.getLetteredCheckGroup().getSelectedButton().getName()); if (log.isInfoEnabled()) { - log.info("Nb entries model (After update all entries) : " + view.getTableModel().getNUmberOfEntries()); + log.info("Nb entries model (After update all entries) : " + view.getTableModel().getNumberOfEntries()); } } @@ -231,9 +180,10 @@ view.getTableModel().updateEntries(entries, datesEntree, journalEntrees); if (log.isInfoEnabled()) { - log.info("Nb entries model : " + view.getTableModel().getNUmberOfEntries()); + log.info("Nb entries model : " + view.getTableModel().getNumberOfEntries()); } } + view.getModelUi().resetDebitCreditBalance(); } /** @@ -247,6 +197,7 @@ if (row > 0) { comboBox.setSelectedIndex(row - 1); } + view.getModelUi().resetDebitCreditBalance(); } /** @@ -261,6 +212,7 @@ if (row < size - 1) { comboBox.setSelectedIndex(row + 1); } + view.getModelUi().resetDebitCreditBalance(); } public void setBeginDate(Date date) {