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

r3598 - in trunk: lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod lima-swing/src/main/resources
by mallon＠users.chorem.org 10 Aug '12

10 Aug '12

Author: mallon Date: 2012-08-10 18:31:26 +0200 (Fri, 10 Aug 2012) New Revision: 3598 Url: http://chorem.org/repositories/revision/lima/3598 Log: refs #625 Correction sur le modele utilise dans la gestion des boutons de cloture et de suppression d'exercice, afin de permettre le binding de jaxx. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodModelUI.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java trunk/lima-swing/src/main/resources/log4j.properties Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-08-10 11:36:35 UTC (rev 3597) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-08-10 16:31:26 UTC (rev 3598) @@ -123,7 +123,11 @@ " WHERE locked = false" + " ORDER BY endDate desc"; - FiscalPeriod fiscalPeriod = (FiscalPeriod)context.findUnique(query); - return fiscalPeriod; + List<FiscalPeriod> fiscalPeriods = context.findAll(query); + FiscalPeriod result = null; + if (!fiscalPeriods.isEmpty()) { + result = fiscalPeriods.get(0); + } + return result; } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodModelUI.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodModelUI.java 2012-08-10 11:36:35 UTC (rev 3597) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodModelUI.java 2012-08-10 16:31:26 UTC (rev 3598) @@ -23,31 +23,22 @@ * #L% */ -import java.beans.PropertyChangeListener; -import java.beans.PropertyChangeSupport; - -import javax.swing.DefaultListSelectionModel; - import org.chorem.lima.entity.FiscalPeriod; +import org.jdesktop.beans.AbstractSerializableBean; -public class FiscalPeriodModelUI extends DefaultListSelectionModel { +public class FiscalPeriodModelUI extends AbstractSerializableBean { - public static final String SELECTED_FISCAL_PERIOD_PROPERTY = "selectedFiscalPeriod"; - + private static final long serialVersionUID = 1L; + public static final String BLOCK_ENABLED_PROPERTY = "blockEnabled"; public static final String DELETE_ENABLED_PROPERTY = "deleteEnabled"; - - protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); - - protected FiscalPeriodTableModel model; - + protected FiscalPeriod selectedFiscalPeriod; protected boolean blockEnabled; protected boolean deleteEnabled; - - public FiscalPeriodModelUI(FiscalPeriodTableModel model) { - this.model = model; + + public FiscalPeriodModelUI() { } public boolean isDeleteEnabled() { @@ -58,10 +49,6 @@ return blockEnabled; } - public FiscalPeriod getSelectedFiscalPeriod() { - return selectedFiscalPeriod; - } - public void setBlockEnabled(boolean blockEnabled) { Boolean oldValue = isBlockEnabled(); this.blockEnabled = blockEnabled; @@ -73,45 +60,7 @@ this.deleteEnabled = deleteEnabled; firePropertyChange(DELETE_ENABLED_PROPERTY, oldValue, deleteEnabled); } - - public void setSelectedFiscalPeriod(FiscalPeriod selectedFiscalPeriod) { - FiscalPeriod oldValue = getSelectedFiscalPeriod(); - this.selectedFiscalPeriod = selectedFiscalPeriod; - firePropertyChange(SELECTED_FISCAL_PERIOD_PROPERTY, oldValue, selectedFiscalPeriod); - - int rowToSelect = model.getRow(selectedFiscalPeriod); - super.setSelectionInterval(rowToSelect, rowToSelect); - } - public void addPropertyChangeListener(PropertyChangeListener listener) { - pcs.addPropertyChangeListener(listener); - } - public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { - pcs.addPropertyChangeListener(propertyName, listener); - } - public void removePropertyChangeListener(PropertyChangeListener listener) { - pcs.removePropertyChangeListener(listener); - } - - public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { - pcs.removePropertyChangeListener(propertyName, listener); - } - - protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { - pcs.firePropertyChange(propertyName, oldValue, newValue); - } - - @Override - public void setSelectionInterval(int index0, int index1) { - super.setSelectionInterval(index0, index1); - setSelectedFiscalPeriod(model.getFiscalPeriodAt(index0)); - } - - @Override - public int getSelectionMode() { - return SINGLE_SELECTION; - } - } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-08-10 11:36:35 UTC (rev 3597) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-08-10 16:31:26 UTC (rev 3598) @@ -27,13 +27,15 @@ <import> javax.swing.ListSelectionModel + javax.swing.DefaultListSelectionModel org.chorem.lima.entity.FiscalPeriod org.chorem.lima.entity.FinancialPeriod </import> <FiscalPeriodViewHandler id="handler" constructorParams="this"/> <FiscalPeriodTableModel id="fiscalPeriodTableModel" /> - <FiscalPeriodModelUI id='model' constructorParams='fiscalPeriodTableModel'/> + <ListSelectionModel id="selectionModel" initializer="new DefaultListSelectionModel()" onValueChanged="handler.onSelectionChanged(event)" selectionMode="{ListSelectionModel.SINGLE_SELECTION}"/> + <FiscalPeriodModelUI id='model' javaBean='new FiscalPeriodModelUI()'/> <script><![CDATA[ void $afterCompleteSetup() { @@ -48,7 +50,7 @@ id="fiscalPeriodTable" sortable="false" rowHeight="24" constructorParams="getFiscalPeriodTableModel()" columnControlVisible="true" - selectionModel='{model}'/> + selectionModel='{selectionModel}'/> </JScrollPane> </cell> </row> @@ -61,14 +63,14 @@ <row> <cell fill="horizontal"> <JButton id="blockButton" text="lima.charts.fiscalperiod.block" - enabled="{getModel().isBlockEnabled()}" + enabled="{model.isBlockEnabled()}" onActionPerformed="getHandler().blockFiscalPeriod()"/> </cell> </row> <row> <cell fill="horizontal"> <JButton id="deleteButton" text="lima.charts.fiscalperiod.delete" - enabled="{getModel().isDeleteEnabled()}" + enabled="{model.isDeleteEnabled()}" onActionPerformed="getHandler().deleteFiscalPeriod()"/> </cell> </row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-08-10 11:36:35 UTC (rev 3597) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-08-10 16:31:26 UTC (rev 3598) @@ -35,7 +35,9 @@ import java.util.Date; import java.util.List; +import javax.swing.DefaultListSelectionModel; import javax.swing.JOptionPane; +import javax.swing.event.ListSelectionEvent; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; @@ -89,15 +91,6 @@ public void init() { loadAllFiscalPeriod(); - FiscalPeriodModelUI model = view.getModel(); - model.addPropertyChangeListener(FiscalPeriodModelUI.SELECTED_FISCAL_PERIOD_PROPERTY, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - FiscalPeriodModelUI model = (FiscalPeriodModelUI)evt.getSource(); - FiscalPeriod selectedFiscalPeriod = (FiscalPeriod)evt.getNewValue(); - reloadEnablingButton(model, selectedFiscalPeriod); - } - }); } /** @@ -161,6 +154,8 @@ fiscalPeriodService.deleteFiscalPeriod(selectedFiscalPeriod); model.deleteFiscalPeriod(selectedFiscalPeriod); + view.getModel().setBlockEnabled(false); + view.getModel().setDeleteEnabled(false); } } @@ -215,6 +210,11 @@ JOptionPane.WARNING_MESSAGE); if (response == JOptionPane.YES_OPTION) { + // FIXME report a nouveau et bloquage en une seule opération + // transactionnelle + selectedFiscalPeriod = fiscalPeriodService.blockFiscalPeriod(selectedFiscalPeriod); + model.updateFiscalPeriod(selectedFiscalPeriod); + //use to tell if the user wants to create a new fiscal year boolean newyear = false; //check if two fiscal periods are open @@ -233,11 +233,9 @@ } } - // FIXME report a nouveau et bloquage en une seule opération - // transactionnelle addRetainedEarnings(selectedFiscalPeriod, newyear); - selectedFiscalPeriod = fiscalPeriodService.blockFiscalPeriod(selectedFiscalPeriod); - model.updateFiscalPeriod(selectedFiscalPeriod); + view.getModel().setBlockEnabled(false); + view.getModel().setDeleteEnabled(false); } } @@ -307,33 +305,53 @@ /** * Manage the differents buttons for fiscal period * */ - protected void reloadEnablingButton(FiscalPeriodModelUI model, FiscalPeriod selectedFiscalPeriod){ - - financialTransactionService = LimaServiceFactory.getService(FinancialTransactionService.class); - List<FinancialTransaction> financialTransactionList = financialTransactionService.getAllFinancialTransactions(selectedFiscalPeriod); - - boolean enableBlock = false; - boolean enableDelete = false; + protected void onSelectionChanged(ListSelectionEvent listSelectionEvent){ + if(!listSelectionEvent.getValueIsAdjusting()) { + DefaultListSelectionModel listSelectionModel = (DefaultListSelectionModel)listSelectionEvent.getSource(); - - //when a fiscal period is deleted, no row is selected ('-1') - if (selectedFiscalPeriod != null){ - - //no action possible for fiscal period closed - if (!selectedFiscalPeriod.getLocked()){ - enableBlock = true; - - //only an empty and open fiscal period may be deleted - if (financialTransactionList.size() <= 0){ - enableDelete = true; - - }else{ - enableDelete = false; - } - } + int selectedRow = listSelectionEvent.getFirstIndex(); + if (!listSelectionModel.isSelectedIndex(selectedRow)) { + selectedRow = listSelectionEvent.getLastIndex(); + } + + FiscalPeriodTableModel fiscalPeriodTableModel = view.getFiscalPeriodTableModel(); + if (fiscalPeriodTableModel.getRowCount() != selectedRow) { + FiscalPeriod fiscalPeriodAt = fiscalPeriodTableModel.getFiscalPeriodAt(selectedRow); + + List<FinancialTransaction> financialTransactionList = financialTransactionService.getAllFinancialTransactions(fiscalPeriodAt); + + boolean enableBlock = false; + boolean enableDelete = false; + + if (log.isDebugEnabled()) { + log.debug("reloadEnablingButton"); + } + + if (selectedRow != -1){ + if (log.isDebugEnabled()) { + log.debug("selectedFiscalPeriod != null"); + } + + //no action possible for fiscal period closed + if (!fiscalPeriodAt.getLocked()){ + if (log.isDebugEnabled()) { + log.debug("selectedFiscalPeriod not locked"); + } + enableBlock = true; + + //only an empty and open fiscal period may be deleted + if (financialTransactionList.size() <= 0){ + enableDelete = true; + + }else{ + enableDelete = false; + } + } + } + view.getModel().setBlockEnabled(enableBlock); + view.getModel().setDeleteEnabled(enableDelete); + } } - model.setBlockEnabled(enableBlock); - model.setDeleteEnabled(enableDelete); } } Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-08-10 11:36:35 UTC (rev 3597) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-08-10 16:31:26 UTC (rev 3598) @@ -53,4 +53,5 @@ log4j.logger.org.chorem.lima.entity.FinancialTransactionDAOImpl=DEBUG log4j.logger.org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel=DEBUG log4j.logger.org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionPeriodSearchPanel=DEBUG -log4j.logger.org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchViewHandler=DEBUG \ No newline at end of file +log4j.logger.org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchViewHandler=DEBUG +log4j.logger.org.chorem.lima.ui.fiscalperiod.FiscalPeriodViewHandler=DEBUG \ No newline at end of file

1 0

r3597 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by mallon＠users.chorem.org 10 Aug '12

10 Aug '12

Author: mallon Date: 2012-08-10 13:36:35 +0200 (Fri, 10 Aug 2012) New Revision: 3597 Url: http://chorem.org/repositories/revision/lima/3597 Log: refs #705 Correction sur l editeur des cellules de type montant Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-09 16:30:53 UTC (rev 3596) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-08-10 11:36:35 UTC (rev 3597) @@ -38,10 +38,15 @@ import java.awt.event.FocusListener; import java.awt.event.KeyEvent; import java.awt.event.KeyListener; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.math.BigDecimal; import java.math.RoundingMode; import java.text.DecimalFormat; +import java.text.NumberFormat; +import java.text.ParseException; import java.text.ParsePosition; +import java.util.Locale; /** * @author sletellier <letellier(a)codelutin.com> @@ -61,12 +66,12 @@ getComponent().addKeyListener(new KeyListener() { @Override public void keyTyped(KeyEvent e) { - // nothing to do + //nothing to do } @Override public void keyPressed(KeyEvent e) { - // nothing to do + //nothing to do } @Override @@ -103,6 +108,12 @@ // nothing to do } }); + getComponent().addPropertyChangeListener(new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + runEdition(); + } + }); } @Override @@ -125,18 +136,18 @@ /** * Round the value to higher, and the number of decimal to 2; - * Parse string value to BigDecimal when it contains comma * @return bigDecimal value * */ @Override public BigDecimal getCellEditorValue() { - String editorStringValue = super.getCellEditorValue().toString(); - if (StringUtils.isBlank(editorStringValue)) { - editorStringValue = "0"; + String stringValue = super.getCellEditorValue().toString(); + if (StringUtils.isBlank(stringValue) + || stringValue.matches("[^0-9]*[0-9]*[^0-9]*") + || stringValue.matches("[^0-9]*")) { + stringValue = "0"; } - BigDecimal cellEditorValue; - DecimalFormat decimalFormat = new DecimalFormat(); - cellEditorValue = new BigDecimal(decimalFormat.parse(editorStringValue,new ParsePosition(0)).doubleValue()); + stringValue=stringValue.replaceAll(",","."); + BigDecimal cellEditorValue = new BigDecimal(stringValue); if (super.getCellEditorValue() != BigDecimal.ZERO) { return cellEditorValue.setScale(2, RoundingMode.HALF_UP); } @@ -144,14 +155,13 @@ } /** - * Limit number of comma to one - * @param e keyEvent starting control of comma + * Limit number of decimalSeparator to one + * @param e keyEvent starting control of decimalSeparator * */ protected void limitComma(KeyEvent e) { - if ( (String.valueOf(e.getKeyChar()).equals(",") && comma.equals(","))) { + if ( (String.valueOf(e.getKeyChar()).matches("[^0-9]") + && getComponent().getText().length() > 2) ) { getComponent().setText(getComponent().getText().substring(0, getComponent().getText().length()-1)); - } else if (String.valueOf(e.getKeyChar()).equals(",") && !comma.equals(",")) { - comma = ","; } }

1 0

r3596 - in trunk: lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch
by mallon＠users.chorem.org 09 Aug '12

09 Aug '12

Author: mallon Date: 2012-08-09 18:30:53 +0200 (Thu, 09 Aug 2012) New Revision: 3596 Url: http://chorem.org/repositories/revision/lima/3596 Log: fixes #755 Correction sur les listeners poses sur les editeurs de date. La date est donc maintenant prise en compte lorsqu on l entre dans l editeur et qu on clique directement sur le bouton 'recherche'. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-08-09 15:08:53 UTC (rev 3595) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-08-09 16:30:53 UTC (rev 3596) @@ -294,6 +294,12 @@ args.add(beginDate); args.add("endDate"); args.add(endDate); + + if (log.isDebugEnabled()) { + log.debug("Begin date :" + beginDate); + log.debug("End date :" + endDate); + } + } else if (beginDate != null) { query += " AND :beginDate = T.transactionDate"; args.add(beginDate); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2012-08-09 15:08:53 UTC (rev 3595) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2012-08-09 16:30:53 UTC (rev 3596) @@ -40,8 +40,16 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.ListCellRenderer; +import javax.swing.event.AncestorEvent; +import javax.swing.event.AncestorListener; +import javax.swing.event.CaretEvent; +import javax.swing.event.CaretListener; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.util.Calendar; import java.util.Date; @@ -90,31 +98,38 @@ beginDate = DateUtils.truncate(beginDate, Calendar.YEAR); JLabel beginDateLabel = new JLabel(_("lima.common.begindate")); final JXDatePicker beginDatePicker = new JXDatePicker(beginDate); - ActionListener beginDateActionListener = new ActionListener() { + PropertyChangeListener beginDatePCListener = new PropertyChangeListener() { + @Override - public void actionPerformed(ActionEvent e) { + public void propertyChange(PropertyChangeEvent evt) { handler.setBeginDate(beginDatePicker.getDate()); handler.refresh(); } }; handler.setBeginDate(beginDatePicker.getDate()); - beginDatePicker.addActionListener(beginDateActionListener); + beginDatePicker.addPropertyChangeListener(beginDatePCListener); // get end date Calendar calendarEnd = Calendar.getInstance(); Date endDate = calendarEnd.getTime(); JLabel endDateLabel = new JLabel(_("lima.common.enddate")); final JXDatePicker endDatePicker = new JXDatePicker(endDate); - ActionListener endDateActionListener = new ActionListener() { + PropertyChangeListener endDatePCListener = new PropertyChangeListener() { + @Override - public void actionPerformed(ActionEvent e) { + public void propertyChange(PropertyChangeEvent evt) { handler.setEndDate(endDatePicker.getDate()); handler.refresh(); } }; handler.setEndDate(endDatePicker.getDate()); - endDatePicker.addActionListener(endDateActionListener); + endDatePicker.addPropertyChangeListener(endDatePCListener); + if (log.isDebugEnabled()) { + log.debug("Begin date : " + beginDate); + log.debug("End date : " + endDate); + } + handler.refresh(); removeAll();

1 0

r3595 - in trunk: lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch
by mallon＠users.chorem.org 09 Aug '12

09 Aug '12

Author: mallon Date: 2012-08-09 17:08:53 +0200 (Thu, 09 Aug 2012) New Revision: 3595 Url: http://chorem.org/repositories/revision/lima/3595 Log: fixes #751 Correction concernant le setter de la date de fin, permettant de selectionner l unique date. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-08-09 14:19:55 UTC (rev 3594) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-08-09 15:08:53 UTC (rev 3595) @@ -288,8 +288,8 @@ Date beginDate = financialTransactionSearch.getBeginDate(); Date endDate = financialTransactionSearch.getEndDate(); if (beginDate != null && endDate != null) { - query += " AND :beginDate <= T.transactionDate" + - " AND T.transactionDate <= :endDate"; + query += " AND (:beginDate <= T.transactionDate" + + " AND T.transactionDate <= :endDate)"; args.add("beginDate"); args.add(beginDate); args.add("endDate"); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2012-08-09 14:19:55 UTC (rev 3594) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2012-08-09 15:08:53 UTC (rev 3595) @@ -76,7 +76,6 @@ } }; handler.setBeginDate(datePicker.getDate()); - handler.setEndDate(null); handler.refresh(); datePicker.addActionListener(dateActionListener); removeAll();

1 0

r3594 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui java/org/chorem/lima/ui/combobox java/org/chorem/lima/ui/financialtransactionsearch resources
by mallon＠users.chorem.org 09 Aug '12

09 Aug '12

Author: mallon Date: 2012-08-09 16:19:55 +0200 (Thu, 09 Aug 2012) New Revision: 3594 Url: http://chorem.org/repositories/revision/lima/3594 Log: fixes #751 Correction sur les decorateurs des objets contenus par les listes deroulantes. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java trunk/lima-swing/src/main/resources/log4j.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.java 2012-08-09 12:56:08 UTC (rev 3593) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/LimaDecoratorProvider.java 2012-08-09 14:19:55 UTC (rev 3594) @@ -42,12 +42,12 @@ registerJXPathDecorator(EntryBook.class, "${code}$s - ${label}$s"); - registerJXPathDecorator( + registerMultiJXPathDecorator( FiscalPeriod.class, - "${beginDate}$td/%1$tm/%1$tY - ${endDate}$td/%1$tm/%1$tY"); + "${beginDate}$td/%1$tm/%1$tY#${endDate}$td/%2$tm/%2$tY", "#"," - "); - registerJXPathDecorator( + registerMultiJXPathDecorator( FinancialPeriod.class, - "${beginDate}$td/%1$tm/%1$tY - ${endDate}$td/%1$tm/%1$tY"); + "${beginDate}$td/%1$tm/%1$tY#${endDate}$td/%2$tm/%2$tY", "#"," - "); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java 2012-08-09 12:56:08 UTC (rev 3593) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java 2012-08-09 14:19:55 UTC (rev 3594) @@ -37,6 +37,7 @@ import org.chorem.lima.business.api.FiscalPeriodService; import org.chorem.lima.business.api.ImportService; import org.chorem.lima.entity.FiscalPeriod; +import org.chorem.lima.entity.FiscalPeriodImpl; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.financialperiod.FinancialPeriodTableModel; @@ -92,7 +93,7 @@ public void setSelectedItem(Object anItem) { if (log.isDebugEnabled()) { - log.debug("Beginning and end dates of first fiscal period : " + ((FiscalPeriod)getElementAt(0)).getBeginDate() + ", " + ((FiscalPeriod)getElementAt(0)).getEndDate()); + log.debug("Beginning and end dates of first fiscal period : " + ((FiscalPeriod) getElementAt(0)).getBeginDate() + ", " + ((FiscalPeriod) getElementAt(0)).getEndDate()); } selectedFiscalPeriod = (FiscalPeriod)anItem; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2012-08-09 12:56:08 UTC (rev 3593) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2012-08-09 14:19:55 UTC (rev 3594) @@ -131,10 +131,13 @@ LimaRendererUtil.newDecoratorListCellRenderer(FiscalPeriod.class); final JComboBox fiscalPeriod = new JComboBox(fiscalModel); fiscalPeriod.setRenderer(renderer); + fiscalPeriod.setEditable(false); if (log.isDebugEnabled()) { - log.debug("Fiscal period of combo box : " + ((FiscalPeriod)fiscalPeriod.getItemAt(0)).getBeginDate() + " - " + ((FiscalPeriod)fiscalPeriod.getItemAt(0)).getEndDate() ); + log.debug("First fiscal period of combo box : " + ((FiscalPeriod)fiscalPeriod.getItemAt(0)).getBeginDate() + " - " + ((FiscalPeriod)fiscalPeriod.getItemAt(0)).getEndDate() ); + log.debug("Second fiscal period of combo box : " + ((FiscalPeriod)fiscalPeriod.getItemAt(1)).getBeginDate() + " - " + ((FiscalPeriod)fiscalPeriod.getItemAt(1)).getEndDate() ); } + ActionListener fiscalPeriodActionListener = new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -150,14 +153,15 @@ fiscalPeriod.addActionListener(fiscalPeriodActionListener); removeAll(); add(fiscalPeriod); + break; case FINANCIAL_PERIOD: FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(); - renderer = + ListCellRenderer rendererFinancialPeriod = LimaRendererUtil.newDecoratorListCellRenderer(FinancialPeriod.class); final JComboBox financialPeriod = new JComboBox(financialModel); - financialPeriod.setRenderer(renderer); + financialPeriod.setRenderer(rendererFinancialPeriod); financialPeriod.setEditable(false); if (log.isDebugEnabled()) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2012-08-09 12:56:08 UTC (rev 3593) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2012-08-09 14:19:55 UTC (rev 3594) @@ -91,6 +91,11 @@ } public void setEndDate(Date endDate) { + + if (log.isDebugEnabled()) { + log.debug("End date passed : " + endDate); + } + financialTransactionSearch.setEndDate(endDate); } Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-08-09 12:56:08 UTC (rev 3593) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-08-09 14:19:55 UTC (rev 3594) @@ -52,4 +52,5 @@ log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionViewHandler=DEBUG log4j.logger.org.chorem.lima.entity.FinancialTransactionDAOImpl=DEBUG log4j.logger.org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel=DEBUG -log4j.logger.org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionPeriodSearchPanel=DEBUG \ No newline at end of file +log4j.logger.org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionPeriodSearchPanel=DEBUG +log4j.logger.org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchViewHandler=DEBUG \ No newline at end of file

1 0

r3593 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by mallon＠users.chorem.org 09 Aug '12

09 Aug '12

Author: mallon Date: 2012-08-09 14:56:08 +0200 (Thu, 09 Aug 2012) New Revision: 3593 Url: http://chorem.org/repositories/revision/lima/3593 Log: Correction minime sur l'utilisation de la touche tabulation et l ajout d entrees ou de transactions. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-09 11:13:20 UTC (rev 3592) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-08-09 12:56:08 UTC (rev 3593) @@ -293,7 +293,7 @@ } BigDecimal amountC = financialTransaction.getAmountCredit(); BigDecimal amountD = financialTransaction.getAmountDebit(); - if (amountC == amountD) { + if (amountC.equals(amountD)) { if (y_t == m_t - 1) { handler.addFinancialTransaction(); setColumnSelectionInterval(0, 0);

1 0

r3592 - in trunk: lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/combobox lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch lima-swing/src/main/resources
by mallon＠users.chorem.org 09 Aug '12

09 Aug '12

Author: mallon Date: 2012-08-09 13:13:20 +0200 (Thu, 09 Aug 2012) New Revision: 3592 Url: http://chorem.org/repositories/revision/lima/3592 Log: refs #751 Correction sur le fonctionnement des filtres de dates, meme si aucun montant n'est saisie. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java trunk/lima-swing/src/main/resources/log4j.properties 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-08-09 08:28:08 UTC (rev 3591) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-08-09 11:13:20 UTC (rev 3592) @@ -212,6 +212,7 @@ * */ public Entry getLastEntry(FinancialTransaction financialTransaction) throws TopiaException { List<Entry> entries; + Entry lastEntry = null; String query = "Select E from " + Entry.class.getName() + " E" + " where E.financialTransaction.transactionDate = :financialTransactionDate " + " and E.financialTransaction = :financialTransaction" + @@ -219,10 +220,10 @@ entries = context.findAll(query, "financialTransactionDate", financialTransaction.getTransactionDate(), "financialTransaction", financialTransaction); - Entry lastEntry = entries.get(0); - if (log.isDebugEnabled()) { - log.debug("Last entry description : " + lastEntry.getDescription() ); + if (entries.size() > 0) { + lastEntry = entries.get(0); } + return lastEntry; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java 2012-08-09 08:28:08 UTC (rev 3591) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java 2012-08-09 11:13:20 UTC (rev 3592) @@ -44,7 +44,7 @@ private static final long serialVersionUID = 1L; - private static final Log log = LogFactory.getLog(FinancialPeriodTableModel.class); + private static final Log log = LogFactory.getLog(FiscalPeriodComboBoxModel.class); protected Object selectedFiscalPeriod; @@ -60,6 +60,11 @@ LimaServiceFactory.addServiceListener(FiscalPeriodService.class, this); LimaServiceFactory.addServiceListener(ImportService.class, this); datasCache = getDataList(); + + if (log.isDebugEnabled()) { + log.debug("Size of datasCache : " + datasCache.size()); + log.debug("Beginning and end dates of first fiscal period in datasCache: " + ((FiscalPeriod)getElementAt(0)).getBeginDate() + ", " + ((FiscalPeriod)getElementAt(0)).getEndDate()); + } } //constructor for all fiscal period @@ -85,7 +90,12 @@ @Override public void setSelectedItem(Object anItem) { - selectedFiscalPeriod = anItem; + + if (log.isDebugEnabled()) { + log.debug("Beginning and end dates of first fiscal period : " + ((FiscalPeriod)getElementAt(0)).getBeginDate() + ", " + ((FiscalPeriod)getElementAt(0)).getEndDate()); + } + + selectedFiscalPeriod = (FiscalPeriod)anItem; } @Override @@ -103,6 +113,11 @@ log.debug("Can't get list accounts", eee); } } + if (log.isDebugEnabled()) { + log.debug("Size of result : " + result.size()); + log.debug("Beginning and end dates of first fiscal period : " + result.get(0).getBeginDate() + ", " + result.get(0).getEndDate()); + } + return result; } @@ -117,6 +132,11 @@ log.debug("Can't get list accounts", eee); } } + if (log.isDebugEnabled()) { + log.debug("Size of result : " + result); + log.debug("Beginning and end dates of first fiscal period : " + result.get(0).getBeginDate() + ", " + result.get(0).getEndDate()); + } + return result; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2012-08-09 08:28:08 UTC (rev 3591) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionPeriodSearchPanel.java 2012-08-09 11:13:20 UTC (rev 3592) @@ -49,8 +49,7 @@ public class FinancialTransactionPeriodSearchPanel extends JPanel { - private static final Log log = - LogFactory.getLog(FinancialTransactionPeriodSearchPanel.class); + private static final Log log = LogFactory.getLog(FinancialTransactionPeriodSearchPanel.class); protected FinancialTransactionSearchViewHandler handler; @@ -90,12 +89,6 @@ // set begindate to JAN 1 - 0:00.000 of this years Date beginDate = calendarBegin.getTime(); beginDate = DateUtils.truncate(beginDate, Calendar.YEAR); - //handler().setBeginDate(beginDate); - - // get end date - Calendar calendarEnd = Calendar.getInstance(); - Date endDate = calendarEnd.getTime(); - //handler().setEndDate(endDate); JLabel beginDateLabel = new JLabel(_("lima.common.begindate")); final JXDatePicker beginDatePicker = new JXDatePicker(beginDate); ActionListener beginDateActionListener = new ActionListener() { @@ -108,6 +101,9 @@ handler.setBeginDate(beginDatePicker.getDate()); beginDatePicker.addActionListener(beginDateActionListener); + // get end date + Calendar calendarEnd = Calendar.getInstance(); + Date endDate = calendarEnd.getTime(); JLabel endDateLabel = new JLabel(_("lima.common.enddate")); final JXDatePicker endDatePicker = new JXDatePicker(endDate); ActionListener endDateActionListener = new ActionListener() { @@ -119,6 +115,7 @@ }; handler.setEndDate(endDatePicker.getDate()); endDatePicker.addActionListener(endDateActionListener); + handler.refresh(); removeAll(); @@ -135,6 +132,9 @@ final JComboBox fiscalPeriod = new JComboBox(fiscalModel); fiscalPeriod.setRenderer(renderer); fiscalPeriod.setEditable(false); + if (log.isDebugEnabled()) { + log.debug("Fiscal period of combo box : " + ((FiscalPeriod)fiscalPeriod.getItemAt(0)).getBeginDate() + " - " + ((FiscalPeriod)fiscalPeriod.getItemAt(0)).getEndDate() ); + } ActionListener fiscalPeriodActionListener = new ActionListener() { @Override public void actionPerformed(ActionEvent e) { @@ -142,10 +142,12 @@ handler.setBeginDate(fPeriod.getBeginDate()); handler.setEndDate(fPeriod.getEndDate()); handler.refresh(); + if (log.isDebugEnabled()) { + log.debug("Refreshing with this Fiscal period : " + fPeriod.getBeginDate() + " - " + fPeriod.getEndDate()); + } } }; fiscalPeriod.addActionListener(fiscalPeriodActionListener); - removeAll(); add(fiscalPeriod); break; @@ -157,6 +159,12 @@ final JComboBox financialPeriod = new JComboBox(financialModel); financialPeriod.setRenderer(renderer); financialPeriod.setEditable(false); + + if (log.isDebugEnabled()) { + log.debug("First financial period of combo box : " + ((FinancialPeriod)financialPeriod.getItemAt(0)).getBeginDate() + " - " + ((FinancialPeriod)financialPeriod.getItemAt(0)).getEndDate() ); + log.debug("Second financial period of combo box : " + ((FinancialPeriod)financialPeriod.getItemAt(1)).getBeginDate() + " - " + ((FinancialPeriod)financialPeriod.getItemAt(1)).getEndDate() ); + } + ActionListener financialPeriodActionListener = new ActionListener() { @Override public void actionPerformed(ActionEvent e) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2012-08-09 08:28:08 UTC (rev 3591) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2012-08-09 11:13:20 UTC (rev 3592) @@ -110,13 +110,8 @@ */ protected List<Object> getDataList(FinancialTransactionSearch financialTransactionSearch) { List<Object> results = null; - //prevent to much result - if (financialTransactionSearch != null && (financialTransactionSearch.getVoucher() != null || financialTransactionSearch.getDescription() != null - || financialTransactionSearch.getLettering() != null || financialTransactionSearch.getAccountList() != null - || financialTransactionSearch.getAccount() != null || financialTransactionSearch.getEntryBook() != null - || financialTransactionSearch.getAmount() != null && financialTransactionSearch.getOperator() != null - || financialTransactionSearch.getAmount() != null && financialTransactionSearch.getAmount2() != null)) { + if (financialTransactionSearch != null) { results = financialTransactionService.searchFinancialTransaction(financialTransactionSearch); } @@ -353,7 +348,6 @@ selectedFiscalPeriod.getEndDate()); FinancialPeriod financialPeriod = financialPeriodsList.get(0); - //financialTransaction.setSelectedFinancialPeriod(selectedFiscalPeriod); // get today Calendar actualCalendar = Calendar.getInstance(); // get the financial period date @@ -386,7 +380,6 @@ cacheDataList = getDataList(financialTransactionSearch); index = cacheDataList.indexOf(fTransaction); fireTableRowsInserted(index, index); - //fireTableDataChanged(); } return index; } Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-08-09 08:28:08 UTC (rev 3591) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-08-09 11:13:20 UTC (rev 3592) @@ -50,4 +50,6 @@ log4j.logger.org.chorem.lima.business.ui.financialtransaction.FinancialTransactionTableModel=DEBUG log4j.logger.org.chorem.lima.entity.EntryDAOImpl=DEBUG log4j.logger.org.chorem.lima.ui.financialtransaction.FinancialTransactionViewHandler=DEBUG -log4j.logger.org.chorem.lima.entity.FinancialTransactionDAOImpl=DEBUG \ No newline at end of file +log4j.logger.org.chorem.lima.entity.FinancialTransactionDAOImpl=DEBUG +log4j.logger.org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel=DEBUG +log4j.logger.org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionPeriodSearchPanel=DEBUG \ No newline at end of file

1 0

r3591 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox
by mallon＠users.chorem.org 09 Aug '12

09 Aug '12

Author: mallon Date: 2012-08-09 10:28:08 +0200 (Thu, 09 Aug 2012) New Revision: 3591 Url: http://chorem.org/repositories/revision/lima/3591 Log: fixes #750 Correction sur le modele de la liste deroulante, permettant de charger correctement le compte selectionne dans l editeur de la liste. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java 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-08-08 16:44:41 UTC (rev 3590) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/AccountComboBoxModel.java 2012-08-09 08:28:08 UTC (rev 3591) @@ -46,7 +46,7 @@ private static final Log log = LogFactory.getLog(AccountComboBoxModel.class); - protected Account selectedAccount; + protected Object selectedAccount; protected List<Account> datasCache; @@ -62,13 +62,13 @@ } @Override - public Account getSelectedItem() { + public Object getSelectedItem() { return selectedAccount; } @Override public void setSelectedItem(Object anItem) { - selectedAccount = (Account)anItem; + selectedAccount = anItem; fireContentsChanged(this, -1, -1); }

1 0

r3590 - trunk
by tchemit＠users.chorem.org 08 Aug '12

08 Aug '12

Author: tchemit Date: 2012-08-08 18:44:41 +0200 (Wed, 08 Aug 2012) New Revision: 3590 Url: http://chorem.org/repositories/revision/lima/3590 Log: updates to jaxx 2.5.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-08-08 16:30:29 UTC (rev 3589) +++ trunk/pom.xml 2012-08-08 16:44:41 UTC (rev 3590) @@ -359,7 +359,7 @@ <nuitonUtilsVersion>2.5.3</nuitonUtilsVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> <topiaVersion>2.6.11</topiaVersion> - <jaxxVersion>2.5.4-SNAPSHOT</jaxxVersion> + <jaxxVersion>2.5.4</jaxxVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <openEjbVersion>4.0.0</openEjbVersion> <slf4jVersion>1.6.6</slf4jVersion>

1 0

r3589 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-callao/src/main/java/org/chorem/lima/entity
by mallon＠users.chorem.org 08 Aug '12

08 Aug '12

Author: mallon Date: 2012-08-08 18:30:29 +0200 (Wed, 08 Aug 2012) New Revision: 3589 Url: http://chorem.org/repositories/revision/lima/3589 Log: fixes #749 Les transactions sont desormais triees selon leurs dates (Ordre decroissant) Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.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-08-08 16:09:25 UTC (rev 3588) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-08-08 16:30:29 UTC (rev 3589) @@ -59,9 +59,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.Date; -import java.util.HashSet; import java.util.List; -import java.util.Set; import static org.nuiton.i18n.I18n._; @@ -617,13 +615,9 @@ List<FinancialTransaction> financialTransactions = financialTransactionDAO.searchFinancialTransaction( financialTransactionSearch, accounts); - Set set = new HashSet() ; - set.addAll(financialTransactions) ; - ArrayList<FinancialTransaction> distinctFinancialTransactions = new ArrayList(set) ; - // merge result with sub entries EntryDAO entryDAO = getDaoHelper().getEntryDAO(); - for (FinancialTransaction financialTransaction : distinctFinancialTransactions) { + for (FinancialTransaction financialTransaction : financialTransactions) { result.add(financialTransaction); List<Entry> entries = entryDAO.findAllByFinancialTransaction(financialTransaction); Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-08-08 16:09:25 UTC (rev 3588) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-08-08 16:30:29 UTC (rev 3589) @@ -9,15 +9,15 @@ * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public + * + * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% @@ -42,10 +42,10 @@ /** * Ajout de requetes specifiques aux financial transaction sur le DAO. - * + * * @author chatellier * @version $Revision$ - * + * * Last update : $Date$ * By : $Author$ */ @@ -278,7 +278,7 @@ */ public List<FinancialTransaction> searchFinancialTransaction(FinancialTransactionSearch financialTransactionSearch, List<Account> accounts) throws TopiaException { - String query = "SELECT T FROM " + FinancialTransaction.class.getName() + " T"+ + String query = "SELECT distinct T FROM " + FinancialTransaction.class.getName() + " T"+ " JOIN T.entry AS E" + " WHERE 1=1 "; // to not manage first where in all condition @@ -393,6 +393,8 @@ } } + query += " order by T.transactionDate desc"; + if (log.isDebugEnabled()) { log.debug("Generated query : " + query); }

1 0