Author: mallon Date: 2012-07-10 18:18:41 +0200 (Tue, 10 Jul 2012) New Revision: 3512 Url: http://chorem.org/repositories/revision/lima/3512 Log: refs #688 Correction du fichier jaxx, du filtre utilisant les dates et de la requete de selection des entrees, afin de regler le probleme de selection de dates. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.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/LetteringTableModel.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 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-10 15:17:10 UTC (rev 3511) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-10 16:18:41 UTC (rev 3512) @@ -201,11 +201,12 @@ } } - query += " and :beginDate <= F.transactionDate" + - " and F.transactionDate <= :endDate"+ - " order by F.transactionDate, F." + FinancialTransaction.TOPIA_CREATE_DATE; + query += /*" and :beginDate <= F.transactionDate" + + " and F.transactionDate <= :endDate"+*/ + " and E.financialTransaction.transactionDate between :beginDate and :endDate " + + " order by F.transactionDate, F." + FinancialTransaction.TOPIA_CREATE_DATE; - entries = context.findAll(query, "account", filter.getAccount(), "beginDate", filter.getFiscalDateFilter().getDateStart(), "endDate", filter.getFiscalDateFilter().getDateEnd()); + entries = context.findAll(query, "account", filter.getAccount(), "beginDate", filter.getBeginDate(), "endDate", filter.getEndDate()); return entries; } 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-10 15:17:10 UTC (rev 3511) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java 2012-07-10 16:18:41 UTC (rev 3512) @@ -29,6 +29,7 @@ String currentLettring = getCurrentLettring(); if (log.isInfoEnabled()) { log.info("Select line"); + log.info("Entries : " + getEntries().size()); } //FIXME allon 10-07-12 : problème de rafraichissement très long Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-07-10 15:17:10 UTC (rev 3511) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2012-07-10 16:18:41 UTC (rev 3512) @@ -27,12 +27,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.business.ServiceListener; -import org.chorem.lima.business.api.FinancialTransactionService; -import org.chorem.lima.business.api.ImportService; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; -import org.chorem.lima.service.LimaServiceFactory; import javax.swing.table.AbstractTableModel; import java.math.BigDecimal; @@ -54,16 +50,13 @@ * Last update : $Date$ * By : $Author$ */ -public class LetteringTableModel extends AbstractTableModel implements ServiceListener { +public class LetteringTableModel extends AbstractTableModel{ /** serialVersionUID. */ private static final long serialVersionUID = 1L; private static final Log log = LogFactory.getLog(LetteringTableModel.class); - /** Transaction service. */ - protected final FinancialTransactionService financialTransactionService; - /** Begin Date. */ protected Date selectedBeginDate; @@ -74,34 +67,11 @@ protected List<Date> datesEntree; protected List<String> entryBooks; - /** - * collection - * <p/> - * <p/> - * /** - * Model constructor. - * <p/> - * Just init service proxies. - */ - public LetteringTableModel() { - /* Services */ - financialTransactionService = LimaServiceFactory.getService(FinancialTransactionService.class); - LimaServiceFactory.addServiceListener(FinancialTransactionService.class,this); - LimaServiceFactory.addServiceListener(ImportService.class, this); - } - public List<Entry> getEntries(){ return entries; } public Integer getIndexOfEntry(Entry entrySearch){ -// Integer index = -1; -// for (Entry entry : entries){ -// index++; -// if (entrySearch == entry){ -// return index; -// } -// } return entries.indexOf(entrySearch); } @@ -283,14 +253,4 @@ } fireTableDataChanged(); } - - @Override - public void notifyMethod(String serviceName, String methodeName) { - if (serviceName.contains("FinancialTransaction") || - methodeName.contains("importEntries") || - methodeName.contains("importAll")) { - fireTableDataChanged(); - } - } - } 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-10 15:17:10 UTC (rev 3511) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2012-07-10 16:18:41 UTC (rev 3512) @@ -87,7 +87,7 @@ </cell> <cell> <JXDatePicker id="pickerDebut" - onActionPerformed="filterModel.getFiscalDateFilter().setDateStart(pickerDebut.getDate())"/> + onActionPerformed="filterModel.setBeginDate(pickerDebut.getDate())"/> </cell> </row> <row> @@ -96,7 +96,7 @@ </cell> <cell> <JXDatePicker id="pickerFin" - onActionPerformed="filterModel.getFiscalDateFilter().setDateStart(pickerFin.getDate())"/> + onActionPerformed="filterModel.setEndDate(pickerFin.getDate())"/> </cell> </row> </Table> 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-10 15:17:10 UTC (rev 3511) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-10 16:18:41 UTC (rev 3512) @@ -96,6 +96,9 @@ @Override public void propertyChange(PropertyChangeEvent evt) { + if (log.isInfoEnabled()) { + log.info("Filter changing..."); + } updateAllEntries(); } }); @@ -145,8 +148,8 @@ log.debug("Val select letter : " + view.getLetteredCheckGroup().getSelectedButton().getName()); - filter.getFiscalDateFilter().setDateStart(defaultDateBegFiscalPeriod); - filter.getFiscalDateFilter().setDateEnd(defaultDateEndCurrent); + filter.setBeginDate(defaultDateBegFiscalPeriod); + filter.setEndDate(defaultDateEndCurrent); updateAllEntries(); @@ -156,7 +159,7 @@ } protected List<Entry> findAllEntries(LetteringFilter filter){ - if (filter != null && filter.getFiscalDateFilter() != null) { + if (filter != null) { List<Entry> entries = financialTransactionService.getAllEntrieByDatesAndAccountAndLettering(filter); return entries; @@ -170,16 +173,8 @@ log.info("updateAllEntries"); } - if (filter != null && filter.getFiscalDateFilter() != null) { + if (filter != 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>(); @@ -209,8 +204,6 @@ if (row > 0) { comboBox.setSelectedIndex(row - 1); } - /*view.getModelUi().resetDebitCreditBalance(); - view.getModelUi().clearSelection();*/ } /** @@ -225,8 +218,6 @@ if (row < size - 1) { comboBox.setSelectedIndex(row + 1); } - view.getLetteringEditModel().resetDebitCreditBalance(); - view.getLettringAndUnlettringSelectionModel().clearSelection(); } public void setBeginDate(Date date) {