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();