- Lima-commits - mailman.cloud.codelutin.com

r3508 - in trunk: . lima-business/src/main/java/org/chorem/lima/business/ejb lima-business-api/src/main/java/org/chorem/lima/business/api lima-swing/src/main/java/org/chorem/lima/ui/combobox lima-swing/src/main/java/org/chorem/lima/ui/lettering lima-swing/src/main/resources
by mallon＠users.chorem.org 10 Jul '12

10 Jul '12

Author: mallon Date: 2012-07-10 10:26:59 +0200 (Tue, 10 Jul 2012) New Revision: 3508 Url: http://chorem.org/repositories/revision/lima/3508 Log: refs#688 Correction sur le modele de selection, quand le lettrage n'est pas pr?\195?\169sent (null). Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSelectionModel.java Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java 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 trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java trunk/lima-swing/src/main/resources/log4j.properties trunk/pom.xml Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-07-09 16:36:10 UTC (rev 3507) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-07-10 08:26:59 UTC (rev 3508) @@ -26,6 +26,7 @@ package org.chorem.lima.business.ejb; import org.chorem.lima.beans.FinancialTransactionSearch; +import org.chorem.lima.beans.LetteringFilter; import org.chorem.lima.business.AccountingRules; import org.chorem.lima.business.LimaConfig; import org.chorem.lima.business.LimaException; @@ -264,12 +265,12 @@ } @Override - public List<Entry> getAllEntrieByDatesAndAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean letterFilter) throws LimaException { + public List<Entry> getAllEntrieByDatesAndAccountAndLettering(LetteringFilter filter) throws LimaException { List<Entry> entries; try { EntryDAO entryDAO = getDaoHelper().getEntryDAO(); - entries = entryDAO.findAllEntryByAccountAndLettering(beginDate, endDate, account, letterFilter); + entries = entryDAO.findAllEntryByAccountAndLettering(filter); } catch (Exception ex) { throw new LimaException("Can't get entries", ex); } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java 2012-07-09 16:36:10 UTC (rev 3507) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java 2012-07-10 08:26:59 UTC (rev 3508) @@ -26,8 +26,8 @@ package org.chorem.lima.business.api; import org.chorem.lima.beans.FinancialTransactionSearch; +import org.chorem.lima.beans.LetteringFilter; import org.chorem.lima.business.LimaException; -import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialPeriod; @@ -79,11 +79,10 @@ String getNextLetters() throws LimaException; /** - * Get all entries by dates, account and lettering - * @param beginDate begin date - * @param endDate end date - * @param account acount - * @param letterFilter lettering + * Retourne toutes les entrées d'une transaction + * pour un compte et la présence d'un lettrage ou (xor) non + * @param filter filtre sur les entrees, selon le compte, les dates de debut et de fin, et le lettrage + * @throws org.nuiton.topia.TopiaException * */ - List<Entry> getAllEntrieByDatesAndAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean letterFilter) throws LimaException; + List<Entry> getAllEntrieByDatesAndAccountAndLettering(LetteringFilter filter) throws LimaException; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java 2012-07-09 16:36:10 UTC (rev 3507) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java 2012-07-10 08:26:59 UTC (rev 3508) @@ -25,11 +25,6 @@ package org.chorem.lima.ui.combobox; -import java.util.List; - -import javax.swing.AbstractListModel; -import javax.swing.ComboBoxModel; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.LimaException; @@ -39,6 +34,9 @@ import org.chorem.lima.entity.Account; import org.chorem.lima.service.LimaServiceFactory; +import javax.swing.*; +import java.util.List; + /** Account combo box model. */ public class AccountComboBoxModel extends AbstractListModel implements ComboBoxModel, ServiceListener { @@ -48,7 +46,7 @@ private static final Log log = LogFactory.getLog(AccountComboBoxModel.class); - protected Object selectedAccount; + protected Account selectedAccount; protected List<Account> datasCache; @@ -64,13 +62,13 @@ } @Override - public Object getSelectedItem() { + public Account getSelectedItem() { return selectedAccount; } @Override public void setSelectedItem(Object anItem) { - selectedAccount = anItem; + selectedAccount = (Account)anItem; fireContentsChanged(this, -1, -1); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java 2012-07-09 16:36:10 UTC (rev 3507) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java 2012-07-10 08:26:59 UTC (rev 3508) @@ -8,10 +8,10 @@ public class LetteringEditModel { protected boolean lettred; - protected boolean unLettred; - protected BigDecimal debit; - protected BigDecimal credit; - protected BigDecimal solde; + protected boolean unLettred = true; //By default, present unLettred entries + protected BigDecimal debit = BigDecimal.ZERO; + protected BigDecimal credit = BigDecimal.ZERO; + protected BigDecimal solde = BigDecimal.ZERO; public boolean isLettred() { return lettred; @@ -52,4 +52,10 @@ public void setSolde(BigDecimal solde) { this.solde = solde; } + + public void resetDebitCreditBalance(){ + setDebit(BigDecimal.ZERO); + setCredit(BigDecimal.ZERO); + setSolde(BigDecimal.ZERO); + } } 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-09 16:36:10 UTC (rev 3507) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-10 08:26:59 UTC (rev 3508) @@ -12,6 +12,8 @@ import java.util.List; public class LetteringModelUI extends DefaultListSelectionModel{ + //TODO Algo a repartir entre les autres modeles. Classe a + //supprimer public static final String SELECTED_ENTRY_PROPERTY = "selectedEntry"; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java 2012-07-09 16:36:10 UTC (rev 3507) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java 2012-07-10 08:26:59 UTC (rev 3508) @@ -1,9 +1,61 @@ package org.chorem.lima.ui.lettering; -import javax.swing.DefaultListSelectionModel; +import jaxx.runtime.swing.model.AbstractGenericListSelectionModel; +import org.chorem.lima.entity.Entry; +import java.util.List; + /** * @author sletellier <letellier(a)codelutin.com> */ -public class LetteringSelectionModel extends DefaultListSelectionModel { +public class LetteringSelectionModel extends AbstractGenericListSelectionModel<Entry> { + + protected LetteringTableModel letteringTableModel; + + //Modele de selection du tableau lors de la selection d une entree lettree + + public LetteringSelectionModel(LetteringTableModel letteringTableModel) { + this.letteringTableModel = letteringTableModel; + } + + @Override + public void setSelectionInterval(int row, int column){ + super.setSelectionInterval(row, column); + //select entries with the same letter of the selected entry + for(Entry entry : getEntries()){ + if (entry.getLettering() != null && !entry.getLettering().isEmpty()){ + if (entry.getLettering().equals(getCurrentLettring())){ + int entryToSelect = letteringTableModel.getIndexOfEntry(entry); + super.addSelectionInterval(entryToSelect, entryToSelect); + } + } + } + } + + @Override + public int getSize() { + return letteringTableModel.getRowCount(); + } + + @Override + public Entry getValueAt(int i) { + return letteringTableModel.getEntryAt(i); + } + + public List<Entry> getEntries(){ + return letteringTableModel.getEntries(); + } + + public Entry getCurrentEntrySelected(){ + return letteringTableModel.getEntryAt(super.getMaxSelectionIndex()); + } + + public String getCurrentLettring(){ + return getCurrentEntrySelected().getLettering(); + } + + @Override + public int getSelectionMode() { + return SINGLE_SELECTION; + } } 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-09 16:36:10 UTC (rev 3507) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2012-07-10 08:26:59 UTC (rev 3508) @@ -30,22 +30,21 @@ org.chorem.lima.ui.common.FinancialPeriodComboBoxModel org.chorem.lima.entity.Account javax.swing.ListSelectionModel - org.jdesktop.swingx.JXDatePicker; + org.jdesktop.swingx.JXDatePicker + org.chorem.lima.beans.LetteringFilter + org.chorem.lima.beans.LetteringFilterImpl </import> <LetteringViewHandler id="handler" constructorParams="this"/> <LetteringTableModel id="tableModel"/> -  <LetteringEditModel id='letteringEditModel'/> - <LetteringFilter id='filterModel'/> + <LetteringFilter id='filterModel' initializer='new LetteringFilterImpl()'/> - <LetteringSelectionModel id='letteringSelectionModel'/> - <DefaultListSelectionModel id='defaultListSelectionModel'/> + <LetteringSelectionModel id='letteringSelectionModel' constructorParams='tableModel'/> + <UnlettringSelectionModel id='unletteringSelectionModel' constructorParams='tableModel'/> <LettringAndUnlettringSelectionModel id='lettringAndUnlettringSelectionModel' - constructorParams='letteringSelectionModel, defaultListSelectionModel'/> - -  + constructorParams='letteringSelectionModel, unletteringSelectionModel, tableModel'/> <script> <![CDATA[ @@ -72,7 +71,7 @@ <org.chorem.lima.ui.common.AccountComboBoxModel id="accountComboBoxModel"/> <JComboBox id="accountComboBox" model="{accountComboBoxModel}" renderer="{new org.chorem.lima.ui.common.AccountListRenderer()}" - onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), ( letteredCheckGroup.isSelected(noLettredEntryCheckBox.getModel()) || letteredCheckGroup.isSelected(lettredEntryCheckBox.getModel())))"/> + onActionPerformed="filterModel.setAccount((Account)accountComboBoxModel.getSelectedItem())"/> <JButton id="backCount" text="lima.ui.account.buttonback" onActionPerformed="handler.back(accountComboBox)"/> <JButton id="nextCount" text="lima.ui.account.buttonnext" @@ -88,7 +87,7 @@ </cell> <cell> <JXDatePicker id="pickerDebut" - onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), ( letteredCheckGroup.isSelected(noLettredEntryCheckBox.getModel()) || letteredCheckGroup.isSelected(lettredEntryCheckBox.getModel())))"/> + onActionPerformed="filterModel.getFiscalDateFilter().setDateStart(pickerDebut.getDate())"/> </cell> </row> <row> @@ -97,7 +96,7 @@ </cell> <cell> <JXDatePicker id="pickerFin" - onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), ( letteredCheckGroup.isSelected(noLettredEntryCheckBox.getModel()) || letteredCheckGroup.isSelected(lettredEntryCheckBox.getModel())))"/> + onActionPerformed="filterModel.getFiscalDateFilter().setDateStart(pickerFin.getDate())"/> </cell> </row> </Table> @@ -109,7 +108,7 @@ <row> <cell> <JRadioButton id="lettredEntryCheckBox" buttonGroup="letteredCheckGroup" - onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), letteredCheckGroup.isSelected(noLettredEntryCheckBox.getModel()))"/> + onActionPerformed="filterModel.setDisplayLettered(true) ; filterModel.setDisplayUnlettred(false)"/> </cell> <cell> <JLabel text="lima.ui.lettering.checkLettredEntry"/> @@ -118,7 +117,7 @@ <row> <cell> <JRadioButton id="noLettredEntryCheckBox" selected="true" buttonGroup="letteredCheckGroup" - onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), letteredCheckGroup.isSelected(noLettredEntryCheckBox.getModel()))"/> + onActionPerformed="filterModel.setDisplayUnlettred(true) ; filterModel.setDisplayLettered(false)"/> </cell> <cell> <JLabel text="lima.ui.lettering.checkNoLettredEntry"/> @@ -127,7 +126,7 @@ <row> <cell> <JRadioButton id="allCheckBox" buttonGroup="letteredCheckGroup" - onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), null)"/> + onActionPerformed="filterModel.setDisplayLettered(true) ; filterModel.setDisplayUnlettred(true)"/> </cell> <cell> <JLabel text="lima.ui.lettering.checkAll"/> @@ -156,15 +155,15 @@ <JLabel text="lima.ui.lettering.selectEntry"/> </cell> <cell fill="horizontal" weightx="0.25"> - <JTextField id="debitTexttField" editable="false" text="{getModelUi().getDebit().toString()}" + <JTextField id="debitTexttField" editable="false" text="{getLetteringEditModel().getDebit().toString()}" focusable="false"/> </cell> <cell fill="horizontal" weightx="0.25"> - <JTextField id="creditTextField" editable="false" text="{getModelUi().getCredit().toString()}" + <JTextField id="creditTextField" editable="false" text="{getLetteringEditModel().getCredit().toString()}" focusable="false"/> </cell> <cell fill="horizontal" weightx="0.25"> - <JTextField id="soldeTextField" editable="false" text="{getModelUi().getSolde().toString()}" + <JTextField id="soldeTextField" editable="false" text="{getLetteringEditModel().getSolde().toString()}" focusable="false"/> </cell> </row> @@ -177,10 +176,10 @@ <cell anchor="center" columns='4'> <JPanel id="actionsPanel"> <JButton id="lettered" text="lima.ui.lettering.buttonLettered" - enabled="{getModelUi().isLettrer()}" + enabled="{getLetteringEditModel().isLettred()}" onActionPerformed="handler.addLetter()"/> <JButton id="noLettered" text="lima.ui.lettering.buttonNoLettered" - enabled="{getModelUi().isDelettrer()}" + enabled="{getLetteringEditModel().isUnLettred()}" onActionPerformed="handler.removeLetter()"/> </JPanel> </cell> @@ -192,7 +191,7 @@ id="table" sortable="false" rowHeight="22" constructorParams="getTableModel()" selectionMode="{ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" - selectionModel="{modelUi}" + selectionModel="{lettringAndUnlettringSelectionModel}" /> </JScrollPane> </cell> 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-09 16:36:10 UTC (rev 3507) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-10 08:26:59 UTC (rev 3508) @@ -25,16 +25,10 @@ package org.chorem.lima.ui.lettering; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import javax.swing.JComboBox; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.beans.LetteringFilter; import org.chorem.lima.business.ServiceListener; import org.chorem.lima.business.api.AccountService; import org.chorem.lima.business.api.EntryBookService; @@ -46,6 +40,17 @@ import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import javax.swing.*; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; + /** * Handler associated with financial transaction view. * @@ -60,7 +65,6 @@ private static final Log log = LogFactory.getLog(LetteringViewHandler.class); protected LetteringView view; - protected LetteringTable table; /** Transaction service. */ @@ -69,6 +73,7 @@ protected AccountService accountService; protected FinancialTransactionService financialTransactionService; protected EntryBookService entryBookService; + protected LetteringFilter filter; public LetteringViewHandler(LetteringView view) { this.view = view; @@ -84,11 +89,16 @@ * Init all combo box in view. */ public void init() { - loadComboAndRows(); + filter = view.getFilterModel(); + loadComboAndRows(); - letteringSelectionModel; - defaultListSelectionModel; - lettringAndUnlettringSelectionModel.addD + filter.addPropertyChangeListener(new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + updateAllEntries(); + } + }); } public void loadComboAndRows(){ @@ -135,30 +145,42 @@ log.debug("Val select letter : " + view.getLetteredCheckGroup().getSelectedButton().getName()); - //Load entry with the default dates, default account 4 and with no letter - updateAllEntries(defaultDateBegFiscalPeriod, defaultDateEndCurrent, (Account)view.getAccountComboBoxModel().getSelectedItem(), view.getLetteredCheckGroup().isSelected(view.getNoLettredEntryCheckBox().getModel())); + filter.getFiscalDateFilter().setDateStart(defaultDateBegFiscalPeriod); + filter.getFiscalDateFilter().setDateEnd(defaultDateEndCurrent); + + updateAllEntries(); + if (log.isInfoEnabled()) { log.info("Nb entries model (After update all entries) : " + view.getTableModel().getNumberOfEntries()); } } - protected List<Entry> findAllEntries(Date selectedBeginDate, Date selectedEndDate, Account compte, Boolean filtreLettre){ - if (selectedBeginDate != null && selectedEndDate != null) { - if (log.isInfoEnabled()) { - log.info("FiltreLettre : " + filtreLettre); - } + protected List<Entry> findAllEntries(LetteringFilter filter){ + if (filter != null && filter.getFiscalDateFilter() != null) { List<Entry> entries = - financialTransactionService.getAllEntrieByDatesAndAccountAndLettering(selectedBeginDate, selectedEndDate, compte, filtreLettre); + financialTransactionService.getAllEntrieByDatesAndAccountAndLettering(filter); return entries; } return null; } - public void updateAllEntries(Date selectedBeginDate, Date selectedEndDate, Account compte, Boolean filtreLettre) { + public void updateAllEntries() { - if (selectedBeginDate != null && selectedEndDate != null){ - log.debug("updateAllEntries"); - List<Entry> entries = findAllEntries(selectedBeginDate, selectedEndDate, compte, filtreLettre); + if (log.isInfoEnabled()) { + log.info("updateAllEntries"); + } + + if (filter != null && filter.getFiscalDateFilter() != null) { + + if (log.isInfoEnabled()) { + log.info("Date deb : " + filter.getFiscalDateFilter().getDateStart() + "\n" + + "Date fin : " + filter.getFiscalDateFilter().getDateEnd() + "\n" + + "Account : " + filter.getAccount().getLabel() + "\n" + + "Letter display : " + filter.getDisplayLettered() + "\n" + + "Letter undisplay : " + filter.getDisplayUnlettred()); + } + + List<Entry> entries = findAllEntries(filter); List<String> journalEntrees = new ArrayList<String>(); List<Date> datesEntree = new ArrayList<Date>(); @@ -172,8 +194,8 @@ log.info("Nb entries model : " + view.getTableModel().getNumberOfEntries()); } } - view.getModelUi().resetDebitCreditBalance(); - view.getModelUi().clearSelection(); + view.getLetteringEditModel().resetDebitCreditBalance(); + view.getLettringAndUnlettringSelectionModel().clearSelection(); } /** @@ -187,8 +209,8 @@ if (row > 0) { comboBox.setSelectedIndex(row - 1); } - view.getModelUi().resetDebitCreditBalance(); - view.getModelUi().clearSelection(); + /*view.getModelUi().resetDebitCreditBalance(); + view.getModelUi().clearSelection();*/ } /** @@ -203,8 +225,8 @@ if (row < size - 1) { comboBox.setSelectedIndex(row + 1); } - view.getModelUi().resetDebitCreditBalance(); - view.getModelUi().clearSelection(); + view.getLetteringEditModel().resetDebitCreditBalance(); + view.getLettringAndUnlettringSelectionModel().clearSelection(); } public void setBeginDate(Date date) { @@ -219,13 +241,13 @@ public void addLetter() { String newLetters = financialTransactionService.getNextLetters(); changeLetter(newLetters); - view.getModelUi().setLettrer(false); + view.getLetteringEditModel().setLettred(false); } /**Remove a group of three letters to n entries*/ public void removeLetter() { changeLetter(null); - view.getModelUi().setDelettrer(false); + view.getLetteringEditModel().setUnLettred(false); } /**Add or remove a group of three letters to n entries*/ @@ -240,12 +262,35 @@ } @Override - public void notifyMethod(String serviceName, String methodeName) { + public void valueChanged(ListSelectionEvent e) { + // calcul solde et boutons lettrer/delettrer actif/inactif sur changement de ligne selectionnee + + LetteringEditModel editModel = view.getLetteringEditModel(); + + int[] numEntriesSelected = view.getTable().getSelectedRows(); + Entry entry = null; + for(int numEntry : numEntriesSelected){ + entry = view.getTableModel().getEntryAt(numEntry); + boolean debitSelected = entry.getDebit(); + BigDecimal amountSelected = entry.getAmount(); + BigDecimal debit = debitSelected ? amountSelected : BigDecimal.ZERO; + BigDecimal credit = debitSelected ? BigDecimal.ZERO : amountSelected; + editModel.setDebit(editModel.getDebit().add(debit)); + editModel.setCredit(editModel.getCredit().add(credit)); + editModel.setSolde(editModel.getSolde().add(debit.subtract(credit))); + } + + if (entry != null){ + if (!entry.getLettering().isEmpty()){ + editModel.setUnLettred(true); + }else if (editModel.getSolde()==BigDecimal.ZERO){ + editModel.setLettred(true); + } + } } @Override - public void valueChanged(ListSelectionEvent e) { - LetteringEditModel editModel = view.getLetteringEditModel(); - editModel. + public void notifyMethod(String serviceName, String methodeName) { + //To change body of implemented methods use File | Settings | File Templates. } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java 2012-07-09 16:36:10 UTC (rev 3507) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java 2012-07-10 08:26:59 UTC (rev 3508) @@ -1,17 +1,79 @@ package org.chorem.lima.ui.lettering; -import javax.swing.DefaultListSelectionModel; +import jaxx.runtime.swing.model.AbstractGenericListSelectionModel; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.entity.Entry; /** * @author sletellier <letellier(a)codelutin.com> */ -public class LettringAndUnlettringSelectionModel { +public class LettringAndUnlettringSelectionModel extends AbstractGenericListSelectionModel<Entry> { + private static final Log log = LogFactory.getLog(LetteringViewHandler.class); protected LetteringSelectionModel letteringSelectionModel; - protected DefaultListSelectionModel defaultListSelectionModel; + protected UnlettringSelectionModel unlettringSelectionModel; + protected LetteringTableModel letteringTableModel; - public LettringAndUnlettringSelectionModel(LetteringSelectionModel letteringSelectionModel, DefaultListSelectionModel defaultListSelectionModel) { + public LettringAndUnlettringSelectionModel(LetteringSelectionModel letteringSelectionModel, UnlettringSelectionModel unlettringSelectionModel, LetteringTableModel letteringTableModel) { this.letteringSelectionModel = letteringSelectionModel; - this.defaultListSelectionModel = defaultListSelectionModel; + this.unlettringSelectionModel = unlettringSelectionModel; + this.letteringTableModel = letteringTableModel; } + + /**choice of model : two differents ui reactions, if lettering is present or not*/ + @Override + public void setSelectionInterval(int row, int column) { + if (log.isInfoEnabled()) { + log.info("Selection de ligne : choix du modele"); + } + if (!letteringNotExist(row)) { + letteringSelectionModel.setSelectionInterval(row, column); + } else { + if (log.isInfoEnabled()) { + log.info("Modele de selection utilise : 'unlettringSelectionModel'"); + } + unlettringSelectionModel.setSelectionInterval(row, column); + } + } + + /**return true if lettering is null, or not null but empty*/ + public boolean letteringNotExist(int row){ + boolean emptyOrNull; + String lettering = letteringTableModel.getEntryAt(row).getLettering(); + + if (lettering != null){ + emptyOrNull = lettering.isEmpty(); + }else + emptyOrNull = true; + + if (log.isInfoEnabled()) { + log.info("Retour : " + emptyOrNull); + } + + return emptyOrNull; + } + + /**return number of row in the model*/ + @Override + public int getSize() { + return letteringTableModel.getRowCount(); + } + + /**return the entry at the index indicate*/ + @Override + public Entry getValueAt(int i) { + return letteringTableModel.getEntryAt(i); + } + + /**clear the selection of the current using model*/ + @Override + public void clearSelection(){ + if (letteringSelectionModel.getSelectedValues().size() == 0) { + letteringSelectionModel.clearSelection(); + }else{ + unlettringSelectionModel.clearSelection(); + } + } + } Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSelectionModel.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/UnlettringSelectionModel.java 2012-07-10 08:26:59 UTC (rev 3508) @@ -0,0 +1,41 @@ +package org.chorem.lima.ui.lettering; + +import jaxx.runtime.swing.model.AbstractGenericListSelectionModel; +import org.chorem.lima.entity.Entry; + +public class UnlettringSelectionModel extends AbstractGenericListSelectionModel<Entry> { + + protected LetteringTableModel letteringTableModel; + + //Modele de selection du tableau lors de la selection d une entree non lettree + + public UnlettringSelectionModel(LetteringTableModel letteringTableModel) { + this.letteringTableModel = letteringTableModel; + } + + @Override + public void setSelectionInterval(int row, int column){ + super.addSelectionInterval(row, column); + } + + @Override + public int getSize() { + return letteringTableModel.getRowCount(); + } + + @Override + public Entry getValueAt(int i) { + return letteringTableModel.getEntryAt(i); + } + + @Override + public void addSelectionInterval(int index0, int index1) { + setSelectionInterval(index0, index1); + } + + @Override + public int getSelectionMode() { + return MULTIPLE_INTERVAL_SELECTION; + } + +} Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-07-09 16:36:10 UTC (rev 3507) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-07-10 08:26:59 UTC (rev 3508) @@ -44,4 +44,5 @@ log4j.logger.org.chorem.lima.business.accountingrules.DefaultAccountingRules=DEBUG log4j.logger.org.chorem.lima.ui.lettering.LetteringViewHandler=DEBUG log4j.logger.org.chorem.lima.ui.lettering.LetteringTableModel=DEBUG -log4j.logger.org.chorem.lima.ui.lettering.LetteringModelUi=DEBUG \ No newline at end of file +log4j.logger.org.chorem.lima.ui.lettering.LetteringModelUi=DEBUG +log4j.logger.org.chorem.lima.ui.lettering.LettringAndUnlettringSelectionModel=DEBUG \ No newline at end of file Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-09 16:36:10 UTC (rev 3507) +++ trunk/pom.xml 2012-07-10 08:26:59 UTC (rev 3508) @@ -333,7 +333,7 @@ <nuitonUtilsVersion>2.5</nuitonUtilsVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <topiaVersion>2.6.11</topiaVersion> - <jaxxVersion>2.5</jaxxVersion> + <jaxxVersion>2.5.1-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <openEjbVersion>4.0.0</openEjbVersion> <slf4jVersion>1.6.6</slf4jVersion>

1 0

r3507 - trunk/lima-callao/src/main/java/org/chorem/lima/entity
by mallon＠users.chorem.org 09 Jul '12

09 Jul '12

Author: mallon Date: 2012-07-09 18:36:10 +0200 (Mon, 09 Jul 2012) New Revision: 3507 Url: http://chorem.org/repositories/revision/lima/3507 Log: refs #688 Mise en place des mod?\195?\168les de s?\195?\169lection et de filtres : filtre selon les comptes fonctionnel; filtre selon le lettrage quasi-fonctionnel (Pour lettr?\195?\169es et non-lettr?\195?\169es.) Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-09 10:23:21 UTC (rev 3506) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-09 16:36:10 UTC (rev 3507) @@ -25,6 +25,9 @@ package org.chorem.lima.entity; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.beans.LetteringFilter; import org.nuiton.topia.TopiaException; import java.util.Date; @@ -32,6 +35,8 @@ public class EntryDAOImpl<E extends Entry> extends EntryDAOAbstract<Entry> { + private static final Log log = LogFactory.getLog(EntryDAOImpl.class); + /** * Requete generique qui recupere les entrees equilibrées portant entre * deux dates. @@ -177,22 +182,19 @@ /** * Retourne toutes les entrées d'une transaction - * pour un compte et un lettrage - * @param beginDate debut de la période - * @param endDate fin de la période - * @param account compte sur lequel les entrées sont filtrées - * @param filtreLettre toutes (all), non-lettrées ("null") ou lettrées ("notNull") + * pour un compte et la présence d'un lettrage ou (xor) non + * @param filter filtre sur les entrees, selon le compte, les dates de debut et de fin, et le lettrage * @throws TopiaException * */ - public List<Entry> findAllEntryByAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean filtreLettre) throws TopiaException { + public List<Entry> findAllEntryByAccountAndLettering(LetteringFilter filter) throws TopiaException { List<Entry> entries; String query = "Select E from " + Entry.class.getName() + " E, " + FinancialTransaction.class.getName() + " F" + " where E.financialTransaction = F" + " and E.account = :account "; - if (filtreLettre != null){ - if (filtreLettre){ + if (filter.getDisplayLettered() || filter.getDisplayUnlettred()){ + if (filter.getDisplayUnlettred()){ query += " and E.lettering is null"; }else { query += " and E.lettering is not null"; @@ -203,7 +205,7 @@ " and F.transactionDate <= :endDate"+ " order by F.transactionDate, F." + FinancialTransaction.TOPIA_CREATE_DATE; - entries = context.findAll(query, "account", account, "beginDate", beginDate, "endDate", endDate); + entries = context.findAll(query, "account", filter.getAccount(), "beginDate", filter.getFiscalDateFilter().getDateStart(), "endDate", filter.getFiscalDateFilter().getDateEnd()); return entries; }

1 0

r3506 - in trunk: lima-callao/src/main/xmi lima-swing/src/main/java/org/chorem/lima/ui/lettering
by sletellier＠users.chorem.org 09 Jul '12

09 Jul '12

Author: sletellier Date: 2012-07-09 12:23:21 +0200 (Mon, 09 Jul 2012) New Revision: 3506 Url: http://chorem.org/repositories/revision/lima/3506 Log: Start decouping ui using models Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java Modified: trunk/lima-callao/src/main/xmi/accounting.zargo 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-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ) Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java 2012-07-09 10:23:21 UTC (rev 3506) @@ -0,0 +1,55 @@ +package org.chorem.lima.ui.lettering; + +import java.math.BigDecimal; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class LetteringEditModel { + + protected boolean lettred; + protected boolean unLettred; + protected BigDecimal debit; + protected BigDecimal credit; + protected BigDecimal solde; + + public boolean isLettred() { + return lettred; + } + + public void setLettred(boolean lettred) { + this.lettred = lettred; + } + + public boolean isUnLettred() { + return unLettred; + } + + public void setUnLettred(boolean unLettred) { + this.unLettred = unLettred; + } + + public BigDecimal getDebit() { + return debit; + } + + public void setDebit(BigDecimal debit) { + this.debit = debit; + } + + public BigDecimal getCredit() { + return credit; + } + + public void setCredit(BigDecimal credit) { + this.credit = credit; + } + + public BigDecimal getSolde() { + return solde; + } + + public void setSolde(BigDecimal solde) { + this.solde = solde; + } +} Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java 2012-07-09 10:23:21 UTC (rev 3506) @@ -0,0 +1,9 @@ +package org.chorem.lima.ui.lettering; + +import javax.swing.DefaultListSelectionModel; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class LetteringSelectionModel extends DefaultListSelectionModel { +} 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-09 09:28:37 UTC (rev 3505) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2012-07-09 10:23:21 UTC (rev 3506) @@ -35,7 +35,15 @@ <LetteringViewHandler id="handler" constructorParams="this"/> <LetteringTableModel id="tableModel"/> - <LetteringModelUI id='modelUi' constructorParams='tableModel'/> +  + + <LetteringEditModel id='letteringEditModel'/> + <LetteringFilter id='filterModel'/> + + <LetteringSelectionModel id='letteringSelectionModel'/> + <DefaultListSelectionModel id='defaultListSelectionModel'/> + <LettringAndUnlettringSelectionModel id='lettringAndUnlettringSelectionModel' + constructorParams='letteringSelectionModel, defaultListSelectionModel'/>  @@ -102,7 +110,7 @@ <cell> <JRadioButton id="lettredEntryCheckBox" buttonGroup="letteredCheckGroup" onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), letteredCheckGroup.isSelected(noLettredEntryCheckBox.getModel()))"/> - </cell> + </cell> <cell> <JLabel text="lima.ui.lettering.checkLettredEntry"/> </cell> 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-09 09:28:37 UTC (rev 3505) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-09 10:23:21 UTC (rev 3506) @@ -25,6 +25,13 @@ package org.chorem.lima.ui.lettering; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import javax.swing.JComboBox; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -39,12 +46,6 @@ import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; -import javax.swing.*; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - /** * Handler associated with financial transaction view. * @@ -54,7 +55,7 @@ * Last update : $Date$ * By : $Author$ */ -public class LetteringViewHandler implements ServiceListener{ +public class LetteringViewHandler implements ServiceListener, ListSelectionListener { private static final Log log = LogFactory.getLog(LetteringViewHandler.class); @@ -84,6 +85,10 @@ */ public void init() { loadComboAndRows(); + + letteringSelectionModel; + defaultListSelectionModel; + lettringAndUnlettringSelectionModel.addD } public void loadComboAndRows(){ @@ -237,4 +242,10 @@ @Override public void notifyMethod(String serviceName, String methodeName) { } + + @Override + public void valueChanged(ListSelectionEvent e) { + LetteringEditModel editModel = view.getLetteringEditModel(); + editModel. + } } Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java 2012-07-09 10:23:21 UTC (rev 3506) @@ -0,0 +1,17 @@ +package org.chorem.lima.ui.lettering; + +import javax.swing.DefaultListSelectionModel; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class LettringAndUnlettringSelectionModel { + + protected LetteringSelectionModel letteringSelectionModel; + protected DefaultListSelectionModel defaultListSelectionModel; + + public LettringAndUnlettringSelectionModel(LetteringSelectionModel letteringSelectionModel, DefaultListSelectionModel defaultListSelectionModel) { + this.letteringSelectionModel = letteringSelectionModel; + this.defaultListSelectionModel = defaultListSelectionModel; + } +}

1 0

r3505 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-business-api/src/main/java/org/chorem/lima/business/api lima-callao/src/main/java/org/chorem/lima/beans lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 09 Jul '12

09 Jul '12

Author: mallon Date: 2012-07-09 11:28:37 +0200 (Mon, 09 Jul 2012) New Revision: 3505 Url: http://chorem.org/repositories/revision/lima/3505 Log: Correction concernant la suppression de classes inutilis?\195?\169es, le renommage et retypage de variables, et la coh?\195?\169rence de pr?\195?\169sentation (Indentation et mots-clefs hql.). Removed: trunk/lima-callao/src/main/java/org/chorem/lima/beans/FiscalPeriodOpenClose.java Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-07-07 19:46:50 UTC (rev 3504) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-07-09 09:28:37 UTC (rev 3505) @@ -121,7 +121,7 @@ * and increment them * */ @Override - public String getNewLetters() throws LimaException { + public String getNextLetters() throws LimaException { String lastActualLetters; try { @@ -135,6 +135,8 @@ String nextSecondLetter = "A"; String nextFirstLetter = "A"; + //TODO:permettre de lettrer avec plus de trois lettres + if (lastActualLetters != null){ if (lastActualLetters.length() > 2 && lastActualLetters.charAt(2) != 'Z'){ nextThirdLetter = incrementLetter(2, lastActualLetters); @@ -145,7 +147,9 @@ } } - return nextFirstLetter + nextSecondLetter + nextThirdLetter; + String nextLetters = String.valueOf(nextFirstLetter + nextSecondLetter + nextThirdLetter); + + return nextLetters; } /**Increment letter alphabetically*/ @@ -259,20 +263,13 @@ return result; } - /** - * Get all entries by dates, account and lettering - * @param beginDate begin date - * @param endDate end date - * @param account acount - * @param filtreLettre lettering - * */ @Override - public List<Entry> getAllEntrieByDatesAndAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean filtreLettre) throws LimaException { + public List<Entry> getAllEntrieByDatesAndAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean letterFilter) throws LimaException { List<Entry> entries; try { EntryDAO entryDAO = getDaoHelper().getEntryDAO(); - entries = entryDAO.findAllEntryByAccountAndLettering(beginDate, endDate, account, filtreLettre); + entries = entryDAO.findAllEntryByAccountAndLettering(beginDate, endDate, account, letterFilter); } catch (Exception ex) { throw new LimaException("Can't get entries", ex); } Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java 2012-07-07 19:46:50 UTC (rev 3504) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java 2012-07-09 09:28:37 UTC (rev 3505) @@ -76,7 +76,14 @@ void removeEntry(Entry entry) throws LimaException; - String getNewLetters() throws LimaException; + String getNextLetters() throws LimaException; - List<Entry> getAllEntrieByDatesAndAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean filtreLettre) throws LimaException; + /** + * Get all entries by dates, account and lettering + * @param beginDate begin date + * @param endDate end date + * @param account acount + * @param letterFilter lettering + * */ + List<Entry> getAllEntrieByDatesAndAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean letterFilter) throws LimaException; } Deleted: trunk/lima-callao/src/main/java/org/chorem/lima/beans/FiscalPeriodOpenClose.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/beans/FiscalPeriodOpenClose.java 2012-07-07 19:46:50 UTC (rev 3504) +++ trunk/lima-callao/src/main/java/org/chorem/lima/beans/FiscalPeriodOpenClose.java 2012-07-09 09:28:37 UTC (rev 3505) @@ -1,26 +0,0 @@ -package org.chorem.lima.beans; - -import org.apache.commons.lang3.tuple.Pair; - -public class FiscalPeriodOpenClose extends Pair<Object, Object>{ - - @Override - public Object setValue(Object value) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Object getLeft() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Object getRight() { - // TODO Auto-generated method stub - return null; - } - - -} Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-07 19:46:50 UTC (rev 3504) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-09 09:28:37 UTC (rev 3505) @@ -185,7 +185,7 @@ * @throws TopiaException * */ public List<Entry> findAllEntryByAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean filtreLettre) throws TopiaException { - List<Entry> entries = null; + List<Entry> entries; String query = "Select E from " + Entry.class.getName() + " E, " + FinancialTransaction.class.getName() + " F" + " where E.financialTransaction = F" + @@ -194,14 +194,14 @@ if (filtreLettre != null){ if (filtreLettre){ query += " and E.lettering is null"; - }else if (!filtreLettre){ + }else { query += " and E.lettering is not null"; } } query += " and :beginDate <= F.transactionDate" + - " AND F.transactionDate <= :endDate"+ - " ORDER BY F.transactionDate, F." + FinancialTransaction.TOPIA_CREATE_DATE; + " and F.transactionDate <= :endDate"+ + " order by F.transactionDate, F." + FinancialTransaction.TOPIA_CREATE_DATE; entries = context.findAll(query, "account", account, "beginDate", beginDate, "endDate", endDate); return entries; 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-07 19:46:50 UTC (rev 3504) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-09 09:28:37 UTC (rev 3505) @@ -177,7 +177,7 @@ //select entries with the same letter of the selected entry for(Entry entry : modelEntries){ if (entry.getLettering() != null && !entry.getLettering().isEmpty()){ - if (entry.getLettering().equals(lastEntrySelected.getLettering())){ + if (entry.getLettering().equals(currentLettring)){ int entryToSelect = model.getIndexOfEntry(entry); //Save current entry before changing it to add // debit / credit / solde with current entry later (Case : multiple selection 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-07 19:46:50 UTC (rev 3504) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-09 09:28:37 UTC (rev 3505) @@ -212,7 +212,7 @@ /**Add a group of three letters to n entries*/ public void addLetter() { - String newLetters = financialTransactionService.getNewLetters(); + String newLetters = financialTransactionService.getNextLetters(); changeLetter(newLetters); view.getModelUi().setLettrer(false); }

1 0

r3504 - trunk
by tchemit＠users.chorem.org 07 Jul '12

07 Jul '12

Author: tchemit Date: 2012-07-07 21:46:50 +0200 (Sat, 07 Jul 2012) New Revision: 3504 Url: http://chorem.org/repositories/revision/lima/3504 Log: updates to mavenpom 3.3.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-06 16:29:11 UTC (rev 3503) +++ trunk/pom.xml 2012-07-07 19:46:50 UTC (rev 3504) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.3</version> + <version>3.3.4</version> </parent> <groupId>org.chorem</groupId>

1 0

r3503 - in trunk: lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 06 Jul '12

06 Jul '12

Author: mallon Date: 2012-07-06 18:29:11 +0200 (Fri, 06 Jul 2012) New Revision: 3503 Url: http://chorem.org/repositories/revision/lima/3503 Log: commit #684 : Correction sur les montants, quand la m?\195?\170me ligne est d?\195?\169-/s?\195?\169lectionn?\195?\169e (Ecritures lettr?\195?\169es.). Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-06 14:51:49 UTC (rev 3502) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-06 16:29:11 UTC (rev 3503) @@ -186,10 +186,6 @@ * */ public List<Entry> findAllEntryByAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean filtreLettre) throws TopiaException { List<Entry> entries = null; - /* String query = "FROM " + FinancialTransaction.class.getName() + " T"+ - " WHERE :beginDate <= T.transactionDate" + - " AND T.transactionDate <= :endDate" + - " ORDER BY T.transactionDate, T." + FinancialTransaction.TOPIA_CREATE_DATE;*/ String query = "Select E from " + Entry.class.getName() + " E, " + FinancialTransaction.class.getName() + " F" + " where E.financialTransaction = F" + @@ -202,7 +198,6 @@ query += " and E.lettering is not null"; } } - System.out.println(query); query += " and :beginDate <= F.transactionDate" + " AND F.transactionDate <= :endDate"+ 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-06 14:51:49 UTC (rev 3502) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-06 16:29:11 UTC (rev 3503) @@ -8,6 +8,7 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; public class LetteringModelUI extends DefaultListSelectionModel{ @@ -42,6 +43,7 @@ protected boolean lettrer; protected boolean delettrer; protected String currentLettring; + protected List<Entry> precedentEntries; protected Entry currentEntry; public LetteringModelUI(LetteringTableModel model) { @@ -146,14 +148,15 @@ public void setSelectionInterval(int row, int column) { setLettrer(false); setDelettrer(false); - Entry entryAt = model.getEntryAt(row); + Entry lastEntrySelected = model.getEntryAt(row); List<Entry> modelEntries = model.getEntries(); - setSelectedEntry(entryAt); + setSelectedEntry(lastEntrySelected); + precedentEntries=new ArrayList<Entry>(); - if (entryAt.getLettering() != null){ + if (lastEntrySelected.getLettering() != null){ // no line selected or line selected different of the current - if (isSelectionEmpty() || currentEntry != null || !currentLettring.equals(entryAt.getLettering())){ + if (isSelectionEmpty() || currentEntry != null || !currentLettring.equals(lastEntrySelected.getLettering())){ if (log.isInfoEnabled()) { log.info("First"); } @@ -169,15 +172,18 @@ soldeTotal = BigDecimal.ZERO; } - currentLettring = entryAt.getLettering(); + currentLettring = lastEntrySelected.getLettering(); super.setSelectionInterval(row, column); //select entries with the same letter of the selected entry for(Entry entry : modelEntries){ if (entry.getLettering() != null && !entry.getLettering().isEmpty()){ - if (entry.getLettering().equals(entryAt.getLettering())){ + if (entry.getLettering().equals(lastEntrySelected.getLettering())){ int entryToSelect = model.getIndexOfEntry(entry); + //Save current entry before changing it to add + // debit / credit / solde with current entry later (Case : multiple selection + //for entries with same letters.) + precedentEntries.add(entry); super.addSelectionInterval(entryToSelect, entryToSelect); - //TODO add debit / credit / balance of entry with same letters } } } @@ -185,7 +191,7 @@ }else{ //no line selected or line selected different of the current //Test null for currentEntry cause of selection before entry with letter - if (isSelectionEmpty() || currentEntry == null || !currentEntry.equals(entryAt)){ + if (isSelectionEmpty() || currentEntry == null || !currentEntry.equals(lastEntrySelected)){ if (log.isInfoEnabled()) { log.info("Second"); } @@ -199,7 +205,7 @@ creditTotal = BigDecimal.ZERO; soldeTotal = BigDecimal.ZERO; } - currentEntry = entryAt; + currentEntry = lastEntrySelected; super.addSelectionInterval(row, column); //remove entry and get precedent entry for currentEntry @@ -212,60 +218,94 @@ /**Managing components when n rows are selected * */ if (!isSelectionEmpty()){ - boolean debitSelected = selectedEntry.getDebit(); - BigDecimal amountSelected = selectedEntry.getAmount(); - BigDecimal debitVal = debitSelected ? amountSelected : BigDecimal.ZERO; - if (log.isInfoEnabled()) { log.info("debit : " + debitTotal + "\n" + "credit : " + creditTotal + "\n" + "solde : " + soldeTotal); } - if (debitVal == BigDecimal.ZERO){ - BigDecimal creditVal = debitSelected ? BigDecimal.ZERO : amountSelected; - if (creditVal != BigDecimal.ZERO){ + //Case of selection of entry not lettered + if (precedentEntries.isEmpty()){ + boolean debitSelected = selectedEntry.getDebit(); + BigDecimal amountSelected = selectedEntry.getAmount(); + + BigDecimal debitVal = debitSelected ? amountSelected : BigDecimal.ZERO; + if (debitVal == BigDecimal.ZERO){ + BigDecimal creditVal = debitSelected ? BigDecimal.ZERO : amountSelected; + if (creditVal != BigDecimal.ZERO){ + if (selectedEntry != currentEntry){ + creditTotal = creditTotal.subtract(creditVal); + soldeTotal = soldeTotal.add(creditVal); + }else{ + creditTotal = creditTotal.add(creditVal); + soldeTotal = soldeTotal.subtract(creditVal); + } + } + }else{ if (selectedEntry != currentEntry){ - creditTotal = creditTotal.subtract(creditVal); - soldeTotal = soldeTotal.add(creditVal); + debitTotal = debitTotal.subtract(debitVal); + soldeTotal = soldeTotal.subtract(debitVal); }else{ - creditTotal = creditTotal.add(creditVal); - soldeTotal = soldeTotal.subtract(creditVal); + debitTotal = debitTotal.add(debitVal); + soldeTotal = soldeTotal.add(debitVal); } } + + if (log.isInfoEnabled()) { + log.info("AFTER / debit : " + debitTotal + "\n" + + "credit : " + creditTotal + "\n" + + "solde : " + soldeTotal); + } }else{ - if (selectedEntry != currentEntry){ - debitTotal = debitTotal.subtract(debitVal); - soldeTotal = soldeTotal.subtract(debitVal); - }else{ - debitTotal = debitTotal.add(debitVal); - soldeTotal = soldeTotal.add(debitVal); - } - } + if (log.isInfoEnabled()) { + log.info("precedentEntries.size() : " + precedentEntries.size()); + } + //In case of multiple selection (Entry with same letters) + //add debit / credit / balance of entries selected + for (Entry precedentEntry : precedentEntries){ + if (precedentEntry != null){ + if (log.isInfoEnabled()) { + log.info("precedentEntries not null"); + } + boolean precedentDebitSelected = precedentEntry.getDebit(); + BigDecimal precedentAmountSelected = precedentEntry.getAmount(); - if (log.isInfoEnabled()) { - log.info("AFTER / debit : " + debitTotal + "\n" + - "credit : " + creditTotal + "\n" + - "solde : " + soldeTotal); - } + BigDecimal precedentDebitVal = precedentDebitSelected ? precedentAmountSelected : BigDecimal.ZERO; + BigDecimal precedentCreditVal = precedentDebitSelected ? BigDecimal.ZERO : precedentAmountSelected; - setDebit(debitTotal); - setCredit(creditTotal); - setSolde(soldeTotal); + if (log.isInfoEnabled()) { + log.info("precedentDebitVal : " + precedentDebitVal + "\n" + + "precedentCreditVal : " + precedentCreditVal); + } - //Managing lettering buttons - String lettering = null; + debitTotal = debitTotal.add(precedentDebitVal); + soldeTotal = soldeTotal.add(precedentDebitVal); - //lettering impossible if one of entries have letter - lettering = entryAt.getLettering(); - if (lettering != null && !lettering.isEmpty()){ - setDelettrer(true); + creditTotal = creditTotal.add(precedentCreditVal); + soldeTotal = soldeTotal.subtract(precedentCreditVal); + + } + } + precedentEntries.clear(); } - if (solde.intValue() == 0 && !delettrer){ - setLettrer(true); - } + setDebit(debitTotal); + setCredit(creditTotal); + setSolde(soldeTotal); + + //Managing lettering buttons + String lettering = null; + + //lettering impossible if one of entries have letter + lettering = lastEntrySelected.getLettering(); + if (lettering != null && !lettering.isEmpty()){ + setDelettrer(true); + } + + if (solde.intValue() == 0 && !delettrer){ + setLettrer(true); + } } else{ debitTotal = BigDecimal.ZERO;

1 0

r3502 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 06 Jul '12

06 Jul '12

Author: mallon Date: 2012-07-06 16:51:49 +0200 (Fri, 06 Jul 2012) New Revision: 3502 Url: http://chorem.org/repositories/revision/lima/3502 Log: refs #684 : Correction sur les montants, quand la m?\195?\170me ligne est d?\195?\169-/s?\195?\169lectionn?\195?\169e (Ecritures non-lettr?\195?\169es.). Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.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-06 14:32:58 UTC (rev 3501) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-06 14:51:49 UTC (rev 3502) @@ -177,6 +177,7 @@ if (entry.getLettering().equals(entryAt.getLettering())){ int entryToSelect = model.getIndexOfEntry(entry); super.addSelectionInterval(entryToSelect, entryToSelect); + //TODO add debit / credit / balance of entry with same letters } } } @@ -210,7 +211,7 @@ /**Managing components when n rows are selected * */ - if (!isSelectionEmpty() /*&& selectedEntry != currentEntry*/){ + if (!isSelectionEmpty()){ boolean debitSelected = selectedEntry.getDebit(); BigDecimal amountSelected = selectedEntry.getAmount(); @@ -225,12 +226,22 @@ if (debitVal == BigDecimal.ZERO){ BigDecimal creditVal = debitSelected ? BigDecimal.ZERO : amountSelected; if (creditVal != BigDecimal.ZERO){ - creditTotal = creditTotal.add(creditVal); - soldeTotal = soldeTotal.subtract(creditVal); + if (selectedEntry != currentEntry){ + creditTotal = creditTotal.subtract(creditVal); + soldeTotal = soldeTotal.add(creditVal); + }else{ + creditTotal = creditTotal.add(creditVal); + soldeTotal = soldeTotal.subtract(creditVal); + } } }else{ - debitTotal = debitTotal.add(debitVal); - soldeTotal = soldeTotal.add(debitVal); + if (selectedEntry != currentEntry){ + debitTotal = debitTotal.subtract(debitVal); + soldeTotal = soldeTotal.subtract(debitVal); + }else{ + debitTotal = debitTotal.add(debitVal); + soldeTotal = soldeTotal.add(debitVal); + } } if (log.isInfoEnabled()) {

1 0

r3501 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 06 Jul '12

06 Jul '12

Author: mallon Date: 2012-07-06 16:32:58 +0200 (Fri, 06 Jul 2012) New Revision: 3501 Url: http://chorem.org/repositories/revision/lima/3501 Log: refs #684 : Remise ?\195?\160 z?\195?\169ro des attributs de d?\195?\169bits / cr?\195?\169dit / soldes totaux lorsqu'aucune ligne n'est s?\195?\169lectionn?\195?\169e. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.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-06 14:26:12 UTC (rev 3500) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-06 14:32:58 UTC (rev 3501) @@ -210,7 +210,7 @@ /**Managing components when n rows are selected * */ - if (!isSelectionEmpty()){ + if (!isSelectionEmpty() /*&& selectedEntry != currentEntry*/){ boolean debitSelected = selectedEntry.getDebit(); BigDecimal amountSelected = selectedEntry.getAmount(); @@ -257,6 +257,9 @@ } } else{ + debitTotal = BigDecimal.ZERO; + creditTotal = BigDecimal.ZERO; + soldeTotal = BigDecimal.ZERO; setDebit(BigDecimal.ZERO); setCredit(BigDecimal.ZERO); setSolde(BigDecimal.ZERO);

1 0

r3500 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 06 Jul '12

06 Jul '12

Author: mallon Date: 2012-07-06 16:26:12 +0200 (Fri, 06 Jul 2012) New Revision: 3500 Url: http://chorem.org/repositories/revision/lima/3500 Log: Remise ?\195?\160 z?\195?\169ro des d?\195?\169bits / cr?\195?\169dit / soldes lorsqu'aucune ligne n'est s?\195?\169lectionn?\195?\169e. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-07-06 13:28:17 UTC (rev 3499) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-07-06 14:26:12 UTC (rev 3500) @@ -268,21 +268,11 @@ * */ @Override public List<Entry> getAllEntrieByDatesAndAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean filtreLettre) throws LimaException { - List<FinancialTransaction> financialTransactions = null; - List<Entry> entries = new ArrayList<Entry>(); + List<Entry> entries; - /* try{ - FinancialTransactionDAO transactionDAO = getDaoHelper().getFinancialTransactionDAO(); - financialTransactions = transactionDAO.findAllByDates(beginDate, endDate); - }catch (Exception ex){ - throw new LimaException("Can't get financial transactions", ex); - }*/ - try { EntryDAO entryDAO = getDaoHelper().getEntryDAO(); - //for (FinancialTransaction financialTransaction : financialTransactions){ - entries = entryDAO.findAllEntryByAccountAndLettering(beginDate, endDate, account, filtreLettre); - // } + entries = entryDAO.findAllEntryByAccountAndLettering(beginDate, endDate, account, filtreLettre); } catch (Exception ex) { throw new LimaException("Can't get entries", ex); } 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-06 13:28:17 UTC (rev 3499) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-06 14:26:12 UTC (rev 3500) @@ -211,7 +211,6 @@ /**Managing components when n rows are selected * */ if (!isSelectionEmpty()){ - boolean debitSelected = selectedEntry.getDebit(); BigDecimal amountSelected = selectedEntry.getAmount(); @@ -225,13 +224,9 @@ if (debitVal == BigDecimal.ZERO){ BigDecimal creditVal = debitSelected ? BigDecimal.ZERO : amountSelected; - if (creditVal != BigDecimal.ZERO){ creditTotal = creditTotal.add(creditVal); soldeTotal = soldeTotal.subtract(creditVal); - }else{ - creditTotal = creditTotal.add(creditVal); - soldeTotal = soldeTotal.add(creditVal); } }else{ debitTotal = debitTotal.add(debitVal); @@ -261,6 +256,11 @@ setLettrer(true); } } + else{ + setDebit(BigDecimal.ZERO); + setCredit(BigDecimal.ZERO); + setSolde(BigDecimal.ZERO); + } } @Override

1 0

r3499 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 06 Jul '12

06 Jul '12

Author: mallon Date: 2012-07-06 15:28:17 +0200 (Fri, 06 Jul 2012) New Revision: 3499 Url: http://chorem.org/repositories/revision/lima/3499 Log: refs #684 : Correction concernant l'?\195?\169tat des boutons lettrer/d?\195?\169lettrer apr?\195?\168s d?\195?\169- / lettrage. Modified: 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/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-06 13:19:17 UTC (rev 3498) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-06 13:28:17 UTC (rev 3499) @@ -214,11 +214,13 @@ public void addLetter() { String newLetters = financialTransactionService.getNewLetters(); changeLetter(newLetters); + view.getModelUi().setLettrer(false); } /**Remove a group of three letters to n entries*/ public void removeLetter() { changeLetter(null); + view.getModelUi().setDelettrer(false); } /**Add or remove a group of three letters to n entries*/

1 0