Author: jpepin Date: 2010-07-22 11:10:03 +0200 (Thu, 22 Jul 2010) New Revision: 2982 Url: http://chorem.org/repositories/revision/lima/2982 Log: D?\195?\169placement dans les rapports de la r?\195?\169cup?\195?\169ration des donn?\195?\169es aux services dans le handler au lieu du mod?\195?\168le. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java 2010-07-21 16:46:42 UTC (rev 2981) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsTableModel.java 2010-07-22 09:10:03 UTC (rev 2982) @@ -21,67 +21,27 @@ import static org.nuiton.i18n.I18n._; import java.text.SimpleDateFormat; -import java.util.Date; import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.ReportsDatas; -import org.chorem.lima.business.FinancialTransactionServiceMonitorable; -import org.chorem.lima.business.ImportServiceMonitorable; -import org.chorem.lima.business.LimaException; -import org.chorem.lima.business.ReportServiceMonitorable; -import org.chorem.lima.business.ServiceListener; -import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; -import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.util.ErrorHelper; /** * Entry book table model. - * - * @author ore - * @author chatellier - * @version $Revision: 2865 $ - * - * Last update : $Date: 2010-04-19 15:19:30 +0200 (lun. 19 avril 2010) $ * By : $Author: jpepin $ */ -public class AccountsReportsTableModel extends AbstractTableModel implements ServiceListener { +public class AccountsReportsTableModel extends AbstractTableModel{ /** serialVersionUID. */ private static final long serialVersionUID = 1L; /** log. */ private static final Log log = LogFactory.getLog(AccountsReportsTableModel.class); - - /** Services. */ - protected ReportServiceMonitorable reportService; - /** Account. */ - protected Account selectedAccount; - - /** Begin Date. */ - protected Date selectedBeginDate; - - /** EndDate. */ - protected Date selectedEndDate; - /** data cache */ protected ReportsDatas cacheDataList; - /** - * Constructor. - */ - public AccountsReportsTableModel() { - - reportService = - LimaServiceFactory.getInstance().getService( - ReportServiceMonitorable.class); - LimaServiceFactory.getInstance().getService( - ImportServiceMonitorable.class).addListener(this); - LimaServiceFactory.getInstance().getService( - FinancialTransactionServiceMonitorable.class).addListener(this); - } @Override public int getRowCount() { @@ -178,45 +138,10 @@ // Just read, no write return false; } - - public void setBeginDate(Date date){ - selectedBeginDate = date; - } - public void setEndDate(Date date){ - selectedEndDate = date; - } - - - public void setAccount(Account account) { - selectedAccount = account; - } - - public ReportsDatas getDataList(){ - ReportsDatas results = null; - try { - results = reportService.generateAccountsReports(selectedAccount, - selectedBeginDate, selectedEndDate); - } - catch (LimaException eee) { - if (log.isErrorEnabled()) { - log.debug("Can't update model", eee); - } - ErrorHelper.showErrorDialog("Can't get entries list", eee); - } - return results; - } - - public void refresh(){ - cacheDataList = getDataList(); + public void refresh(ReportsDatas datasList){ + cacheDataList = datasList; fireTableDataChanged(); } - - @Override - public void notifyMethod(String serviceName, String methodeName) { - if (serviceName.contains("FinancialTransaction") || methodeName.contains("importAccount") || methodeName.contains("importAll")){ - refresh(); - } - } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx 2010-07-21 16:46:42 UTC (rev 2981) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsView.jaxx 2010-07-22 09:10:03 UTC (rev 2982) @@ -32,12 +32,12 @@ // set begindate to JAN 1 - 0:00.000 of this years Date beginDate = calendarBegin.getTime(); beginDate = DateUtils.truncate(beginDate, Calendar.YEAR); - getModelAccountsReportsTable().setBeginDate(beginDate); + getHandler().setBeginDate(beginDate); // get end date Calendar calendarEnd = Calendar.getInstance(); Date endDate = calendarEnd.getTime(); - getModelAccountsReportsTable().setEndDate(endDate); + getHandler().setEndDate(endDate); getBeginDatePicker().setDate(beginDate); getEndDatePicker().setDate(endDate); @@ -54,16 +54,14 @@ </cell> <cell anchor="west"> <org.jdesktop.swingx.JXDatePicker id="beginDatePicker" - onActionPerformed="getModelAccountsReportsTable().setBeginDate(beginDatePicker.getDate()); - getHandler().refresh()" /> + onActionPerformed="getHandler().setBeginDate(beginDatePicker.getDate())" /> </cell> <cell anchor="east"> <JLabel id="endCalendarPanelLabel" text="lima.accountsreports.endcalendar"/> </cell> <cell anchor="west"> <org.jdesktop.swingx.JXDatePicker id="endDatePicker" - onActionPerformed="getModelAccountsReportsTable().setEndDate(endDatePicker.getDate()); - getHandler().refresh()"/> + onActionPerformed="getHandler().setEndDate(endDatePicker.getDate())"/> </cell> <cell anchor="east"> <JLabel id="accountSelectorLabel" text="lima.account"/> @@ -72,8 +70,7 @@ <JComboBox id="accountSelectorComboBox" model="{getModelAccounts()}" renderer="{new org.chorem.lima.ui.combobox.AccountRenderer()}" - onActionPerformed="getModelAccountsReportsTable().setAccount((Account) accountSelectorComboBox.getSelectedItem()); - getHandler().refresh()" + onActionPerformed="getHandler().setAccount((Account) accountSelectorComboBox.getSelectedItem())" editable="false" /> </cell> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2010-07-21 16:46:42 UTC (rev 2981) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsViewHandler.java 2010-07-22 09:10:03 UTC (rev 2982) @@ -19,45 +19,107 @@ package org.chorem.lima.ui.accountsreports; import static org.nuiton.i18n.I18n._; +import java.util.Date; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.business.FinancialTransactionServiceMonitorable; +import org.chorem.lima.business.ImportServiceMonitorable; +import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.ReportServiceMonitorable; +import org.chorem.lima.business.ServiceListener; +import org.chorem.lima.entity.Account; +import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.combobox.AccountComboBoxModel; +import org.chorem.lima.util.ErrorHelper; /** * Handler associated with accounts reports view. - * - * @author chatellier - * @version $Revision: 2884 $ - * - * Last update : $Date: 2010-05-06 11:57:19 +0200 (jeu. 06 mai 2010) $ * By : $Author: jpepin $ */ -public class AccountsReportsViewHandler { +public class AccountsReportsViewHandler implements ServiceListener { protected AccountsReportsView view; protected AccountsReportsTableModel tableModel; protected AccountComboBoxModel comboBoxModel; + + /** log. */ + private static final Log log = LogFactory.getLog(AccountsReportsViewHandler.class); + + /** Account. */ + protected Account selectedAccount; + + /** Begin Date. */ + protected Date selectedBeginDate; + + /** EndDate. */ + protected Date selectedEndDate; + + /** Services. */ + protected ReportServiceMonitorable reportService; protected AccountsReportsViewHandler(AccountsReportsView view) { this.view = view; + + reportService = + LimaServiceFactory.getInstance().getService( + ReportServiceMonitorable.class); + LimaServiceFactory.getInstance().getService( + ImportServiceMonitorable.class).addListener(this); + LimaServiceFactory.getInstance().getService( + FinancialTransactionServiceMonitorable.class).addListener(this); } + public void setBeginDate(Date date){ + selectedBeginDate = date; + refresh(); + } + + public void setEndDate(Date date){ + selectedEndDate = date; + refresh(); + } + + + public void setAccount(Account account) { + selectedAccount = account; + refresh(); + } + + public ReportsDatas getDataList(){ + ReportsDatas results = null; + try { + results = reportService.generateAccountsReports(selectedAccount, + selectedBeginDate, selectedEndDate); + } + catch (LimaException eee) { + if (log.isErrorEnabled()) { + log.debug("Can't update model", eee); + } + ErrorHelper.showErrorDialog("Can't get entries list", eee); + } + return results; + } + public void refresh(){ + + ReportsDatas datasList = getDataList(); + tableModel = view.getModelAccountsReportsTable(); - tableModel.refresh(); + tableModel.refresh(datasList); /** * set text and amounts of labels credit, debit, solde */ - ReportsDatas cacheDataList = tableModel.cacheDataList; - if (cacheDataList != null){ + if (datasList != null){ // set amounts credit and debit and solde - view.amountCreditLabel.setText(String.valueOf(cacheDataList.getAmountCredit())); - view.amountDebitLabel.setText(String.valueOf(cacheDataList.getAmountDebit())); - Double amountSolde = cacheDataList.getAmountSolde(); + view.amountCreditLabel.setText(String.valueOf(datasList.getAmountCredit())); + view.amountDebitLabel.setText(String.valueOf(datasList.getAmountDebit())); + Double amountSolde = datasList.getAmountSolde(); view.amountSoldeLabel.setText(String.valueOf(amountSolde)); @@ -66,7 +128,7 @@ } else { // set label solde: credit or debit - if (cacheDataList.getSoldeDebit()) { + if (datasList.getSoldeDebit()) { view.soldeLabel.setText(_("lima.soldedebit")); } else { @@ -76,4 +138,11 @@ } } + @Override + public void notifyMethod(String serviceName, String methodeName) { + if (serviceName.contains("FinancialTransaction") || methodeName.contains("importAccount") || methodeName.contains("importAll")){ + refresh(); + } + } + } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java 2010-07-21 16:46:42 UTC (rev 2981) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceTableModel.java 2010-07-22 09:10:03 UTC (rev 2982) @@ -20,66 +20,28 @@ package org.chorem.lima.ui.balance; import static org.nuiton.i18n.I18n._; -import java.util.Date; import java.util.List; import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.ReportsDatas; -import org.chorem.lima.business.FinancialTransactionServiceMonitorable; -import org.chorem.lima.business.ImportServiceMonitorable; -import org.chorem.lima.business.LimaException; -import org.chorem.lima.business.ReportServiceMonitorable; -import org.chorem.lima.business.ServiceListener; -import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.util.ErrorHelper; + /** * Entry book table model. - * - * @author ore - * @author chatellier - * @version $Revision: 2865 $ - * - * Last update : $Date: 2010-04-19 15:19:30 +0200 (lun. 19 avril 2010) $ * By : $Author: jpepin $ */ -public class BalanceTableModel extends AbstractTableModel implements ServiceListener { +public class BalanceTableModel extends AbstractTableModel { /** serialVersionUID. */ - private static final long serialVersionUID = 7578692417919755647L; + private static final long serialVersionUID = 1L; /** log. */ private static final Log log = LogFactory.getLog(BalanceTableModel.class); - - /** Services. */ - protected ReportServiceMonitorable reportService; - /** DatePicker Begin Date. */ - protected Date selectedBeginDate; - - /** DatePicker EndDate. */ - protected Date selectedEndDate; - - /** Text field Accounts */ - protected String selectedAccounts; - /** data cache */ protected BalanceTrial cacheDataList; - - /** - * Constructor. - */ - public BalanceTableModel() { - reportService = - LimaServiceFactory.getInstance().getService( - ReportServiceMonitorable.class); - LimaServiceFactory.getInstance().getService( - ImportServiceMonitorable.class).addListener(this); - LimaServiceFactory.getInstance().getService( - FinancialTransactionServiceMonitorable.class).addListener(this); - } @Override public int getRowCount() { @@ -171,47 +133,11 @@ // Just read, no write return false; } - - public void setBeginDate(Date date){ - selectedBeginDate = date; - } - public void setEndDate(Date date){ - selectedEndDate = date; - } - public void setAccountFilter(String accounts) { - selectedAccounts = accounts; - } - - /** - * get all account fot the selected period - * @return - */ - public BalanceTrial getDataList(){ - BalanceTrial results = null; - - try { - results = reportService.generateBalanceTrial(selectedBeginDate, selectedEndDate, selectedAccounts, false); - } - catch (LimaException eee) { - if (log.isErrorEnabled()) { - log.debug("Can't update model", eee); - } - ErrorHelper.showErrorDialog("Can't get entries list", eee); - } - return results; - } - - public void refresh(){ - cacheDataList = getDataList(); + public void refresh(BalanceTrial datasList){ + cacheDataList = datasList; fireTableDataChanged(); } - @Override - public void notifyMethod(String serviceName, String methodeName) { - if (serviceName.contains("FinancialTransaction") || methodeName.contains("importAccount") || methodeName.contains("importAll")){ - refresh(); - } - } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx 2010-07-21 16:46:42 UTC (rev 2981) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx 2010-07-22 09:10:03 UTC (rev 2982) @@ -38,8 +38,8 @@ getBeginDatePicker().setDate(beginDate); getEndDatePicker().setDate(endDate); - getModelBalanceTable().setBeginDate(beginDate); - getModelBalanceTable().setEndDate(endDate); + getHandler().setBeginDate(beginDate); + getHandler().setEndDate(endDate); void $afterCompleteSetup() { getHandler().refresh(); @@ -54,24 +54,21 @@ </cell> <cell anchor="west"> <org.jdesktop.swingx.JXDatePicker id="beginDatePicker" - onActionPerformed="getModelBalanceTable().setBeginDate(beginDatePicker.getDate()); - getHandler().refresh()" /> + onActionPerformed="getHandler().setBeginDate(beginDatePicker.getDate())"/> </cell> <cell anchor="east"> <JLabel id="endCalendarPanelLabel" text="lima.accountsreports.endcalendar"/> </cell> <cell anchor="west"> <org.jdesktop.swingx.JXDatePicker id="endDatePicker" - onActionPerformed="getModelBalanceTable().setEndDate(endDatePicker.getDate()); - getHandler().refresh()"/> + onActionPerformed="getHandler().setEndDate(endDatePicker.getDate())"/> </cell> <cell anchor="east"> <JTextField id="accountFilter"/> </cell> <cell anchor="west"> <JButton text="lima.accountsreports.accountfilter" - onActionPerformed="getModelBalanceTable().setAccountFilter(accountFilter.getText()); - getHandler().refresh()"/> + onActionPerformed="getHandler().setAccountFilter(accountFilter.getText())"/> </cell> </row> <row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2010-07-21 16:46:42 UTC (rev 2981) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceViewHandler.java 2010-07-22 09:10:03 UTC (rev 2982) @@ -19,52 +19,105 @@ package org.chorem.lima.ui.balance; import static org.nuiton.i18n.I18n._; +import java.util.Date; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.BalanceTrial; -import org.chorem.lima.business.FinancialTransactionService; import org.chorem.lima.business.FinancialTransactionServiceMonitorable; +import org.chorem.lima.business.ImportServiceMonitorable; +import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.ReportServiceMonitorable; +import org.chorem.lima.business.ServiceListener; import org.chorem.lima.service.LimaServiceFactory; +import org.chorem.lima.util.ErrorHelper; /** * Handler associated with accounts reports view. - * - * @author chatellier - * @version $Revision: 2884 $ - * - * Last update : $Date: 2010-05-06 11:57:19 +0200 (jeu. 06 mai 2010) $ * By : $Author: jpepin $ */ -public class BalanceViewHandler { +public class BalanceViewHandler implements ServiceListener { protected BalanceView view; - /** service **/ - protected FinancialTransactionService financialTransactionService; + /** log. */ + private static final Log log = LogFactory.getLog(BalanceViewHandler.class); + + /** Services. */ + protected ReportServiceMonitorable reportService; + + /** DatePicker Begin Date. */ + protected Date selectedBeginDate; + + /** DatePicker EndDate. */ + protected Date selectedEndDate; + + /** Text field Accounts */ + protected String selectedAccounts; protected BalanceTableModel model; protected BalanceViewHandler(BalanceView view) { this.view = view; - financialTransactionService = + + reportService = LimaServiceFactory.getInstance().getService( - FinancialTransactionServiceMonitorable.class); + ReportServiceMonitorable.class); + LimaServiceFactory.getInstance().getService( + ImportServiceMonitorable.class).addListener(this); + LimaServiceFactory.getInstance().getService( + FinancialTransactionServiceMonitorable.class).addListener(this); } + public void setBeginDate(Date date){ + selectedBeginDate = date; + refresh(); + } + + public void setEndDate(Date date){ + selectedEndDate = date; + refresh(); + } + + public void setAccountFilter(String accounts) { + selectedAccounts = accounts; + refresh(); + } + + /** + * get all account fot the selected period + * @return + */ + public BalanceTrial getDataList(){ + BalanceTrial results = null; + + try { + results = reportService.generateBalanceTrial(selectedBeginDate, selectedEndDate, selectedAccounts, false); + } + catch (LimaException eee) { + if (log.isErrorEnabled()) { + log.debug("Can't update model", eee); + } + ErrorHelper.showErrorDialog("Can't get entries list", eee); + } + return results; + } + public void refresh(){ model = view.getModelBalanceTable(); - model.refresh(); + BalanceTrial datasList = getDataList(); + model.refresh(datasList); /** * update the labels credit, debit, solde on the footer * get all entries for all accounts on the selected period */ - BalanceTrial cacheDataList = model.cacheDataList; - if (cacheDataList != null){ + if (datasList != null){ // set amounts credit, debit and solde - view.amountCreditLabel.setText(String.valueOf(cacheDataList.getAmountCredit())); - view.amountDebitLabel.setText(String.valueOf(cacheDataList.getAmountDebit())); - Double amountSolde = cacheDataList.getAmountSolde(); + view.amountCreditLabel.setText(String.valueOf(datasList.getAmountCredit())); + view.amountDebitLabel.setText(String.valueOf(datasList.getAmountDebit())); + Double amountSolde = datasList.getAmountSolde(); view.amountSoldeLabel.setText(String.valueOf(amountSolde)); @@ -73,7 +126,7 @@ } else { // set label solde: credit or debit - if (cacheDataList.getSoldeDebit()) { + if (datasList.getSoldeDebit()) { view.soldeLabel.setText(_("lima.soldedebit")); } else { @@ -83,4 +136,10 @@ } } + @Override + public void notifyMethod(String serviceName, String methodeName) { + if (serviceName.contains("FinancialTransaction") || methodeName.contains("importAccount") || methodeName.contains("importAll")){ + refresh(); + } + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java 2010-07-21 16:46:42 UTC (rev 2981) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTable.java 2010-07-22 09:10:03 UTC (rev 2982) @@ -29,16 +29,10 @@ import org.jdesktop.swingx.decorator.Highlighter; -/** - * Table des transaction qui ajoute des comportement (keys). - * - * @author ore - * @author Rémi Chapelet - */ public class EntryBooksReportsTable extends JXTable { /** serialVersionUID. */ - private static final long serialVersionUID = 3133690382049594727L; + private static final long serialVersionUID = 1L; protected EntryBooksReportsViewHandler handler; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java 2010-07-21 16:46:42 UTC (rev 2981) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsTableModel.java 2010-07-22 09:10:03 UTC (rev 2982) @@ -21,74 +21,34 @@ import static org.nuiton.i18n.I18n._; import java.text.SimpleDateFormat; -import java.util.Date; import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.ReportsDatas; -import org.chorem.lima.beans.ReportsDatasImpl; -import org.chorem.lima.business.FinancialTransactionServiceMonitorable; -import org.chorem.lima.business.ImportServiceMonitorable; -import org.chorem.lima.business.LimaException; -import org.chorem.lima.business.ReportServiceMonitorable; -import org.chorem.lima.business.ServiceListener; import org.chorem.lima.entity.Entry; -import org.chorem.lima.entity.EntryBook; -import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.util.ErrorHelper; + /** * Entry book table model. - * - * @author ore - * @author chatellier - * @version $Revision: 2865 $ - * - * Last update : $Date: 2010-04-19 15:19:30 +0200 (lun. 19 avril 2010) $ * By : $Author: jpepin $ */ -public class EntryBooksReportsTableModel extends AbstractTableModel implements ServiceListener { +public class EntryBooksReportsTableModel extends AbstractTableModel { /** serialVersionUID. */ private static final long serialVersionUID = 1L; /** log. */ private static final Log log = LogFactory.getLog(EntryBooksReportsTableModel.class); - - /** Services. */ - protected ReportServiceMonitorable reportService; - /** Account. */ - protected EntryBook selectedEntryBook; - - /** Begin Date. */ - protected Date selectedBeginDate; - - /** EndDate. */ - protected Date selectedEndDate; - /** data cache */ protected ReportsDatas cacheDataList; - - /** - * Constructor. - */ - public EntryBooksReportsTableModel() { - reportService = - LimaServiceFactory.getInstance().getService( - ReportServiceMonitorable.class); - LimaServiceFactory.getInstance().getService( - ImportServiceMonitorable.class).addListener(this); - LimaServiceFactory.getInstance().getService( - FinancialTransactionServiceMonitorable.class).addListener(this); - } @Override public int getRowCount() { int result = 0; // just prevent too much result - if (selectedEntryBook != null) { + if (cacheDataList.getListEntry() != null) { result = cacheDataList.getListEntry().size(); } @@ -129,7 +89,7 @@ @Override public Object getValueAt(int row, int column) { Object result = null; - if(selectedEntryBook != null) { + if(cacheDataList.getListEntry() != null) { Entry currentRow = cacheDataList.getListEntry().get(row); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("dd MMMMM yyyy"); @@ -180,45 +140,10 @@ // Just read, no write return false; } - - public void setBeginDate(Date date){ - selectedBeginDate = date; - } - public void setEndDate(Date date){ - selectedEndDate = date; - } - - - public void setEntryBook(EntryBook entryBook) { - selectedEntryBook = entryBook; - } - - public ReportsDatas getDataList(){ - ReportsDatas results = new ReportsDatasImpl(); - try { - results = - reportService.generateEntryBooksReports(selectedEntryBook, selectedBeginDate, selectedEndDate); - } - catch (LimaException eee) { - if (log.isErrorEnabled()) { - log.debug("Can't update model", eee); - } - ErrorHelper.showErrorDialog("Can't get entries list", eee); - } - return results; - } - - public void refresh(){ - cacheDataList = getDataList(); + public void refresh(ReportsDatas datasList){ + cacheDataList = datasList; fireTableDataChanged(); } - - @Override - public void notifyMethod(String serviceName, String methodeName) { - if (serviceName.contains("FinancialTransaction") || methodeName.contains("importEntryBook") || methodeName.contains("importAll")){ - refresh(); - } - } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx 2010-07-21 16:46:42 UTC (rev 2981) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsView.jaxx 2010-07-22 09:10:03 UTC (rev 2982) @@ -32,12 +32,12 @@ // set begindate to JAN 1 - 0:00.000 of this years Date beginDate = calendarBegin.getTime(); beginDate = DateUtils.truncate(beginDate, Calendar.YEAR); - getModelTable().setBeginDate(beginDate); + getHandler().setBeginDate(beginDate); // get end date Calendar calendarEnd = Calendar.getInstance(); Date endDate = calendarEnd.getTime(); - getModelTable().setEndDate(endDate); + getHandler().setEndDate(endDate); getBeginDatePicker().setDate(beginDate); getEndDatePicker().setDate(endDate); @@ -54,16 +54,14 @@ </cell> <cell anchor="west"> <org.jdesktop.swingx.JXDatePicker id="beginDatePicker" - onActionPerformed="getModelTable().setBeginDate(beginDatePicker.getDate()); - getHandler().refresh()" /> + onActionPerformed="getHandler().setBeginDate(beginDatePicker.getDate())" /> </cell> <cell anchor="east"> <JLabel id="endCalendarPanelLabel" text="lima.accountsreports.endcalendar"/> </cell> <cell anchor="west"> <org.jdesktop.swingx.JXDatePicker id="endDatePicker" - onActionPerformed="getModelTable().setEndDate(endDatePicker.getDate()); - getHandler().refresh()"/> + onActionPerformed="getHandler().setEndDate(endDatePicker.getDate())"/> </cell> <cell anchor="east"> <JLabel id="entryBookSelectorLabel" text="lima.entrybook"/> @@ -72,8 +70,7 @@ <JComboBox id="entryBookComboBox" model="{getModelEntryBook()}" renderer="{new org.chorem.lima.ui.combobox.EntryBookRenderer()}" - onActionPerformed="getModelTable().setEntryBook((EntryBook) entryBookComboBox.getSelectedItem()); - getHandler().refresh()" + onActionPerformed="getHandler().setEntryBook((EntryBook) entryBookComboBox.getSelectedItem())" editable="false" /> </cell> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2010-07-21 16:46:42 UTC (rev 2981) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsViewHandler.java 2010-07-22 09:10:03 UTC (rev 2982) @@ -19,20 +19,29 @@ package org.chorem.lima.ui.entrybooksreports; import static org.nuiton.i18n.I18n._; + +import java.util.Date; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.beans.ReportsDatasImpl; +import org.chorem.lima.business.FinancialTransactionServiceMonitorable; +import org.chorem.lima.business.ImportServiceMonitorable; +import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.ReportServiceMonitorable; +import org.chorem.lima.business.ServiceListener; +import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.combobox.EntryBookComboBoxModel; +import org.chorem.lima.util.ErrorHelper; /** * Handler associated with accounts reports view. - * - * @author chatellier - * @version $Revision: 2884 $ - * - * Last update : $Date: 2010-05-06 11:57:19 +0200 (jeu. 06 mai 2010) $ * By : $Author: jpepin $ */ -public class EntryBooksReportsViewHandler { +public class EntryBooksReportsViewHandler implements ServiceListener { protected EntryBooksReportsView view; @@ -41,28 +50,81 @@ protected EntryBooksReportsTableModel tableModel; protected EntryBookComboBoxModel comboBoxModel; + + /** log. */ + private static final Log log = LogFactory.getLog(EntryBooksReportsViewHandler.class); + + /** Services. */ + protected ReportServiceMonitorable reportService; + + /** Account. */ + protected EntryBook selectedEntryBook; + + /** Begin Date. */ + protected Date selectedBeginDate; + + /** EndDate. */ + protected Date selectedEndDate; protected EntryBooksReportsViewHandler(EntryBooksReportsView view) { this.view = view; + + reportService = + LimaServiceFactory.getInstance().getService( + ReportServiceMonitorable.class); + LimaServiceFactory.getInstance().getService( + ImportServiceMonitorable.class).addListener(this); + LimaServiceFactory.getInstance().getService( + FinancialTransactionServiceMonitorable.class).addListener(this); } + public void setBeginDate(Date date){ + selectedBeginDate = date; + refresh(); + } + + public void setEndDate(Date date){ + selectedEndDate = date; + refresh(); + } + + + public void setEntryBook(EntryBook entryBook) { + selectedEntryBook = entryBook; + refresh(); + } + + public ReportsDatas getDataList(){ + ReportsDatas results = new ReportsDatasImpl(); + try { + results = + reportService.generateEntryBooksReports(selectedEntryBook, selectedBeginDate, selectedEndDate); + } + catch (LimaException eee) { + if (log.isErrorEnabled()) { + log.debug("Can't update model", eee); + } + ErrorHelper.showErrorDialog("Can't get entries list", eee); + } + return results; + } + public void refresh(){ tableModel = view.getModelTable(); - tableModel.refresh(); - // comboBoxModel = view.getModelEntryBook(); - // comboBoxModel.refresh(); + ReportsDatas datasList = getDataList(); + tableModel.refresh(datasList); + /** * set text and amounts of labels credit, debit, solde */ - ReportsDatas cacheDataList = tableModel.cacheDataList; - if (cacheDataList != null){ + if (datasList != null){ // set amounts credit, debit and solde - view.amountCreditLabel.setText(String.valueOf(cacheDataList.getAmountCredit())); - view.amountDebitLabel.setText(String.valueOf(cacheDataList.getAmountDebit())); - Double amountSolde = cacheDataList.getAmountSolde(); + view.amountCreditLabel.setText(String.valueOf(datasList.getAmountCredit())); + view.amountDebitLabel.setText(String.valueOf(datasList.getAmountDebit())); + Double amountSolde = datasList.getAmountSolde(); view.amountSoldeLabel.setText(String.valueOf(amountSolde)); @@ -71,7 +133,7 @@ } else { // set label solde: credit or debit - if (cacheDataList.getSoldeDebit()) { + if (datasList.getSoldeDebit()) { view.soldeLabel.setText(_("lima.soldedebit")); } else { @@ -81,4 +143,11 @@ } } + @Override + public void notifyMethod(String serviceName, String methodeName) { + if (serviceName.contains("FinancialTransaction") || methodeName.contains("importEntryBook") || methodeName.contains("importAll")){ + refresh(); + } + } + } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx 2010-07-21 16:46:42 UTC (rev 2981) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportView.jaxx 2010-07-22 09:10:03 UTC (rev 2982) @@ -80,24 +80,4 @@ </JScrollPane> </cell> </row> - <row fill="horizontal" anchor="center"> - <cell> - <JLabel text="lima.amountdebit" /> - </cell> - <cell> - <JLabel id="amountDebitLabel" /> - </cell> - <cell> - <JLabel text="lima.amountcredit"/> - </cell> - <cell> - <JLabel id="amountCreditLabel" /> - </cell> - <cell> - <JLabel id="soldeLabel" text="lima.solde"/> - </cell> - <cell> - <JLabel id="amountSoldeLabel"/> - </cell> - </row> </Table> \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java 2010-07-21 16:46:42 UTC (rev 2981) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportViewHandler.java 2010-07-22 09:10:03 UTC (rev 2982) @@ -42,34 +42,6 @@ public void refresh(){ model = view.getModelTable(); model.refresh(); - - /** - * update the labels credit, debit, solde on the footer - * get all entries for all accounts on the selected period - * - BalanceTrial cacheDataList = model.cacheDataList; - - if (cacheDataList != null){ - // set amounts credit, debit and solde - view.amountCreditLabel.setText(String.valueOf(cacheDataList.getAmountCredit())); - view.amountDebitLabel.setText(String.valueOf(cacheDataList.getAmountDebit())); - Double amountSolde = cacheDataList.getAmountSolde(); - view.amountSoldeLabel.setText(String.valueOf(amountSolde)); - - - if (amountSolde == 0){ - view.soldeLabel.setText(_("lima.solde")); - } - else { - // set label solde: credit or debit - if (cacheDataList.getSoldeDebit()) { - view.soldeLabel.setText(_("lima.soldedebit")); - } - else { - view.soldeLabel.setText(_("lima.soldecredit")); - } - } - }*/ } public FinancialStatementReportView getView() { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2010-07-21 16:46:42 UTC (rev 2981) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2010-07-22 09:10:03 UTC (rev 2982) @@ -177,7 +177,6 @@ } }.execute(); waitView.setVisible(true); - //TODO refresh the view } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTableModel.java 2010-07-21 16:46:42 UTC (rev 2981) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTableModel.java 2010-07-22 09:10:03 UTC (rev 2982) @@ -21,25 +21,12 @@ import static org.nuiton.i18n.I18n._; import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; import java.util.List; import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.lima.beans.BalanceTrial; import org.chorem.lima.beans.ReportsDatas; -import org.chorem.lima.business.FinancialTransactionServiceMonitorable; -import org.chorem.lima.business.ImportServiceMonitorable; -import org.chorem.lima.business.LimaException; -import org.chorem.lima.business.ReportServiceMonitorable; -import org.chorem.lima.business.ServiceListener; -import org.chorem.lima.business.utils.EntryComparator; import org.chorem.lima.entity.Entry; -import org.chorem.lima.entity.EntryBook; -import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.util.ErrorHelper; /** * Entry book table model. @@ -51,43 +38,16 @@ * Last update : $Date: 2010-04-19 15:19:30 +0200 (lun. 19 avril 2010) $ * By : $Author: jpepin $ */ -public class LedgerTableModel extends AbstractTableModel implements ServiceListener { +public class LedgerTableModel extends AbstractTableModel { /** serialVersionUID. */ - private static final long serialVersionUID = 7578692417919755647L; + private static final long serialVersionUID = 1L; /** log. */ private static final Log log = LogFactory.getLog(LedgerTableModel.class); - - /** Services. */ - protected ReportServiceMonitorable reportService; - /** Account. */ - protected EntryBook selectedEntryBook; - - /** Begin Date. */ - protected Date selectedBeginDate; - - /** EndDate. */ - protected Date selectedEndDate; - /** data cache */ protected List<Object> cacheDataList; - protected BalanceTrial balanceTrialCache; - - /** - * Constructor. - */ - public LedgerTableModel() { - reportService = - LimaServiceFactory.getInstance().getService( - ReportServiceMonitorable.class); - reportService.addListener(this); - LimaServiceFactory.getInstance().getService( - ImportServiceMonitorable.class).addListener(this); - LimaServiceFactory.getInstance().getService( - FinancialTransactionServiceMonitorable.class).addListener(this); - } @Override public int getRowCount() { @@ -225,7 +185,6 @@ } } - return result; } @@ -235,52 +194,11 @@ // Just read, no write return false; } - - public void setBeginDate(Date date){ - selectedBeginDate = date; - } - public void setEndDate(Date date){ - selectedEndDate = date; - } - /** - * get all account fot the selected period - * @return - */ - public List<Object> getDataList(){ - List<Object> results = new ArrayList<Object>(); - - try { - balanceTrialCache = reportService.generateLedger(selectedBeginDate, selectedEndDate); - } - catch (LimaException eee) { - if (log.isErrorEnabled()) { - log.debug("Can't update model", eee); - } - ErrorHelper.showErrorDialog("Can't get entries list", eee); - } - for (ReportsDatas reportsDatas : balanceTrialCache.getReportsDatas()) { - results.add(reportsDatas); - List<Entry> entries = (List<Entry>) reportsDatas.getListEntry(); - if (entries != null){ - Collections.sort(entries, new EntryComparator()); - results.addAll(entries); - } - } - return results; - } - - public void refresh(){ - cacheDataList = getDataList(); + public void refresh(List<Object> datasList){ + cacheDataList = datasList; fireTableDataChanged(); } - @Override - public void notifyMethod(String serviceName, String methodeName) { - if (serviceName.contains("FinancialTransaction") || methodeName.contains("importAccount") || methodeName.contains("importAll")){ - refresh(); - } - } - } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx 2010-07-21 16:46:42 UTC (rev 2981) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx 2010-07-22 09:10:03 UTC (rev 2982) @@ -31,12 +31,12 @@ // set begindate to JAN 1 - 0:00.000 of this years Date beginDate = calendarBegin.getTime(); beginDate = DateUtils.truncate(beginDate, Calendar.YEAR); - getModelTable().setBeginDate(beginDate); + getHandler().setBeginDate(beginDate); // get end date Calendar calendarEnd = Calendar.getInstance(); Date endDate = calendarEnd.getTime(); - getModelTable().setEndDate(endDate); + getHandler().setEndDate(endDate); getBeginDatePicker().setDate(beginDate); getEndDatePicker().setDate(endDate); @@ -53,16 +53,14 @@ </cell> <cell anchor="west"> <org.jdesktop.swingx.JXDatePicker id="beginDatePicker" - onActionPerformed="getModelTable().setBeginDate(beginDatePicker.getDate()); - getHandler().refresh()" /> + onActionPerformed="getHandler().setBeginDate(beginDatePicker.getDate())" /> </cell> <cell anchor="east"> <JLabel id="endCalendarPanelLabel" text="lima.accountsreports.endcalendar"/> </cell> <cell anchor="west"> <org.jdesktop.swingx.JXDatePicker id="endDatePicker" - onActionPerformed="getModelTable().setEndDate(endDatePicker.getDate()); - getHandler().refresh()"/> + onActionPerformed="getHandler().setEndDate(endDatePicker.getDate())"/> </cell> </row> <row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2010-07-21 16:46:42 UTC (rev 2981) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerViewHandler.java 2010-07-22 09:10:03 UTC (rev 2982) @@ -19,44 +19,120 @@ package org.chorem.lima.ui.ledger; import static org.nuiton.i18n.I18n._; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.BalanceTrial; +import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.business.FinancialTransactionServiceMonitorable; +import org.chorem.lima.business.ImportServiceMonitorable; +import org.chorem.lima.business.LimaException; +import org.chorem.lima.business.ReportServiceMonitorable; +import org.chorem.lima.business.ServiceListener; +import org.chorem.lima.business.utils.EntryComparator; +import org.chorem.lima.entity.Entry; +import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.service.LimaServiceFactory; +import org.chorem.lima.util.ErrorHelper; /** * Handler associated with accounts reports view. - * - * @author chatellier - * @version $Revision: 2884 $ - * - * Last update : $Date: 2010-05-06 11:57:19 +0200 (jeu. 06 mai 2010) $ * By : $Author: jpepin $ */ -public class LedgerViewHandler { +public class LedgerViewHandler implements ServiceListener { protected LedgerView view; protected LedgerTableModel model; + + /** log. */ + private static final Log log = LogFactory.getLog(LedgerTableModel.class); + + /** Services. */ + protected ReportServiceMonitorable reportService; + + /** Account. */ + protected EntryBook selectedEntryBook; + + /** Begin Date. */ + protected Date selectedBeginDate; + + /** EndDate. */ + protected Date selectedEndDate; + + protected BalanceTrial balanceTrialCache; protected LedgerViewHandler(LedgerView view) { this.view = view; + + reportService = + LimaServiceFactory.getInstance().getService( + ReportServiceMonitorable.class); + reportService.addListener(this); + LimaServiceFactory.getInstance().getService( + ImportServiceMonitorable.class).addListener(this); + LimaServiceFactory.getInstance().getService( + FinancialTransactionServiceMonitorable.class).addListener(this); } + public void setBeginDate(Date date){ + selectedBeginDate = date; + } + + public void setEndDate(Date date){ + selectedEndDate = date; + } + + /** + * get all account fot the selected period + * @return + */ + public List<Object> getDataList(){ + List<Object> results = new ArrayList<Object>(); + try { + balanceTrialCache = reportService.generateLedger(selectedBeginDate, selectedEndDate); + if (balanceTrialCache.getReportsDatas() != null){ + for (ReportsDatas reportsDatas : balanceTrialCache.getReportsDatas()) { + results.add(reportsDatas); + List<Entry> entries = (List<Entry>) reportsDatas.getListEntry(); + if (entries != null){ + Collections.sort(entries, new EntryComparator()); + results.addAll(entries); + } + } + } + } + catch (LimaException eee) { + if (log.isErrorEnabled()) { + log.debug("Can't update model", eee); + } + ErrorHelper.showErrorDialog("Can't get entries list", eee); + } + return results; + } + public void refresh(){ model = view.getModelTable(); - model.refresh(); + List<Object> datasList = getDataList(); + model.refresh(datasList); /** * set text and amounts of labels credit, debit, solde */ - BalanceTrial cacheDataList = model.balanceTrialCache; - if (cacheDataList != null){ + if (balanceTrialCache != null){ // set amounts credit, debit and solde view.amountCreditLabel.setText( - String.valueOf(cacheDataList.getAmountCredit())); + String.valueOf(balanceTrialCache.getAmountCredit())); view.amountDebitLabel.setText( - String.valueOf(cacheDataList.getAmountDebit())); - Double amountSolde = cacheDataList.getAmountSolde(); + String.valueOf(balanceTrialCache.getAmountDebit())); + Double amountSolde = balanceTrialCache.getAmountSolde(); view.amountSoldeLabel.setText( String.valueOf(amountSolde)); @@ -65,7 +141,7 @@ } else { // set label solde: credit or debit - if (cacheDataList.getSoldeDebit()) { + if (balanceTrialCache.getSoldeDebit()) { view.soldeLabel.setText(_("lima.soldedebit")); } else { @@ -75,4 +151,11 @@ } } + @Override + public void notifyMethod(String serviceName, String methodeName) { + if (serviceName.contains("FinancialTransaction") || methodeName.contains("importAccount") || methodeName.contains("importAll")){ + refresh(); + } + } + }