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

r3123 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by vsalaun＠users.chorem.org May 13, 2011

May 13, 2011

Author: vsalaun Date: 2011-05-13 14:17:45 +0200 (Fri, 13 May 2011) New Revision: 3123 Url: http://chorem.org/repositories/revision/lima/3123 Log: correction de la requete de selection Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2011-05-13 12:11:59 UTC (rev 3122) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2011-05-13 12:17:45 UTC (rev 3123) @@ -157,7 +157,6 @@ getFinancialPeriodDAO(transaction); TopiaQuery query = financialPeriodDAO.createQuery() - .addEquals(FinancialPeriod.LOCKED, Boolean.TRUE) .addOrder(FinancialPeriod.BEGIN_DATE); result = financialPeriodDAO.findAllByQuery(query);

1 0

r3122 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox
by echatellier＠users.chorem.org May 13, 2011

May 13, 2011

Author: echatellier Date: 2011-05-13 14:11:59 +0200 (Fri, 13 May 2011) New Revision: 3122 Url: http://chorem.org/repositories/revision/lima/3122 Log: Improve code, remove duplicated. Add javadoc "VERY IMPORTANT" ;) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2011-05-13 12:04:23 UTC (rev 3121) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2011-05-13 12:11:59 UTC (rev 3122) @@ -64,20 +64,19 @@ protected FiscalPeriod selectedFiscalPeriod; - //constructor for blocked financial period only + /** + * Constructor for locked period list. + */ public FinancialPeriodComboBoxModel() { - financialPeriodService = - LimaServiceFactory.getInstance().getService( - FinancialPeriodServiceMonitorable.class); - financialPeriodService.addListener(this); - LimaServiceFactory.getInstance().getService( - FiscalPeriodServiceMonitorable.class).addListener(this); - LimaServiceFactory.getInstance().getService( - ImportServiceMonitorable.class).addListener(this); - datasCache=getDataList(); + this(false); } - //constructor for all financial period + /** + * Constructor for period list. + * + * @param all if {@code true}, display all available period, otherwize + * display only locked ones + */ public FinancialPeriodComboBoxModel(boolean all) { financialPeriodService = LimaServiceFactory.getInstance().getService( @@ -87,7 +86,12 @@ FiscalPeriodServiceMonitorable.class).addListener(this); LimaServiceFactory.getInstance().getService( ImportServiceMonitorable.class).addListener(this); - datasCache=getAllDataList(); + if (all) { + datasCache=getAllDataList(); + } + else { + datasCache=getDataList(); + } } public void setFiscalPeriod(FiscalPeriod fiscalPeriod){

1 0

r3121 - in trunk: . lima-business lima-callao lima-neogia lima-swing
by echatellier＠users.chorem.org May 13, 2011

May 13, 2011

Author: echatellier Date: 2011-05-13 14:04:23 +0200 (Fri, 13 May 2011) New Revision: 3121 Url: http://chorem.org/repositories/revision/lima/3121 Log: Update next version Modified: trunk/lima-business/pom.xml trunk/lima-callao/pom.xml trunk/lima-neogia/pom.xml trunk/lima-swing/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2011-05-13 11:50:53 UTC (rev 3120) +++ trunk/lima-business/pom.xml 2011-05-13 12:04:23 UTC (rev 3121) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.4.4-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-callao/pom.xml =================================================================== --- trunk/lima-callao/pom.xml 2011-05-13 11:50:53 UTC (rev 3120) +++ trunk/lima-callao/pom.xml 2011-05-13 12:04:23 UTC (rev 3121) @@ -8,7 +8,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.4.4-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-neogia/pom.xml =================================================================== --- trunk/lima-neogia/pom.xml 2011-05-13 11:50:53 UTC (rev 3120) +++ trunk/lima-neogia/pom.xml 2011-05-13 12:04:23 UTC (rev 3121) @@ -7,7 +7,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.3.2-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/lima-swing/pom.xml =================================================================== --- trunk/lima-swing/pom.xml 2011-05-13 11:50:53 UTC (rev 3120) +++ trunk/lima-swing/pom.xml 2011-05-13 12:04:23 UTC (rev 3121) @@ -9,7 +9,7 @@ <parent> <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.4.4-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> </parent> <groupId>org.chorem.lima</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-05-13 11:50:53 UTC (rev 3120) +++ trunk/pom.xml 2011-05-13 12:04:23 UTC (rev 3121) @@ -15,7 +15,7 @@ <groupId>org.chorem</groupId> <artifactId>lima</artifactId> - <version>0.4.4-SNAPSHOT</version> + <version>0.5-SNAPSHOT</version> <modules> <module>lima-callao</module>

1 0

r3120 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: accountsreports balance entrybooksreports financialstatementreport ledger
by vsalaun＠users.chorem.org May 13, 2011

May 13, 2011

Author: vsalaun Date: 2011-05-13 13:50:53 +0200 (Fri, 13 May 2011) New Revision: 3120 Url: http://chorem.org/repositories/revision/lima/3120 Log: #352 Prise en charge de la nouvelle selection des periodes pour : Edition compte, Edition journal, Balance, Grand livre, Bilan et Compte de resultat Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsPeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalancePeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsPeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportPeriodSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerPeriodSearchPanel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsPeriodSearchPanel.java 2011-05-13 11:49:07 UTC (rev 3119) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/accountsreports/AccountsReportsPeriodSearchPanel.java 2011-05-13 11:50:53 UTC (rev 3120) @@ -109,7 +109,7 @@ break; case FISCAL_PERIOD: - FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(); + FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(true); FiscalPeriodComboBoxRenderer fiscalRenderer = new FiscalPeriodComboBoxRenderer(); final JComboBox fiscalPeriod = new JComboBox(fiscalModel); fiscalPeriod.setRenderer(fiscalRenderer); @@ -132,7 +132,7 @@ break; case FINANCIAL_PERIOD: - FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(); + FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(true); FinancialPeriodComboBoxRenderer financialRenderer = new FinancialPeriodComboBoxRenderer(); final JComboBox financialPeriod = new JComboBox(financialModel); financialPeriod.setRenderer(financialRenderer); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalancePeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalancePeriodSearchPanel.java 2011-05-13 11:49:07 UTC (rev 3119) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalancePeriodSearchPanel.java 2011-05-13 11:50:53 UTC (rev 3120) @@ -110,7 +110,7 @@ break; case FISCAL_PERIOD: - FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(); + FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(true); FiscalPeriodComboBoxRenderer fiscalRenderer = new FiscalPeriodComboBoxRenderer(); final JComboBox fiscalPeriod = new JComboBox(fiscalModel); fiscalPeriod.setRenderer(fiscalRenderer); @@ -133,7 +133,7 @@ break; case FINANCIAL_PERIOD: - FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(); + FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(true); FinancialPeriodComboBoxRenderer financialRenderer = new FinancialPeriodComboBoxRenderer(); final JComboBox financialPeriod = new JComboBox(financialModel); financialPeriod.setRenderer(financialRenderer); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsPeriodSearchPanel.java 2011-05-13 11:49:07 UTC (rev 3119) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/entrybooksreports/EntryBooksReportsPeriodSearchPanel.java 2011-05-13 11:50:53 UTC (rev 3120) @@ -109,7 +109,7 @@ break; case FISCAL_PERIOD: - FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(); + FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(true); FiscalPeriodComboBoxRenderer fiscalRenderer = new FiscalPeriodComboBoxRenderer(); final JComboBox fiscalPeriod = new JComboBox(fiscalModel); fiscalPeriod.setRenderer(fiscalRenderer); @@ -132,7 +132,7 @@ break; case FINANCIAL_PERIOD: - FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(); + FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(true); FinancialPeriodComboBoxRenderer financialRenderer = new FinancialPeriodComboBoxRenderer(); final JComboBox financialPeriod = new JComboBox(financialModel); financialPeriod.setRenderer(financialRenderer); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportPeriodSearchPanel.java 2011-05-13 11:49:07 UTC (rev 3119) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementreport/FinancialStatementReportPeriodSearchPanel.java 2011-05-13 11:50:53 UTC (rev 3120) @@ -109,7 +109,7 @@ break; case FISCAL_PERIOD: - FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(); + FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(true); FiscalPeriodComboBoxRenderer fiscalRenderer = new FiscalPeriodComboBoxRenderer(); final JComboBox fiscalPeriod = new JComboBox(fiscalModel); fiscalPeriod.setRenderer(fiscalRenderer); @@ -132,7 +132,7 @@ break; case FINANCIAL_PERIOD: - FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(); + FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(true); FinancialPeriodComboBoxRenderer financialRenderer = new FinancialPeriodComboBoxRenderer(); final JComboBox financialPeriod = new JComboBox(financialModel); financialPeriod.setRenderer(financialRenderer); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerPeriodSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerPeriodSearchPanel.java 2011-05-13 11:49:07 UTC (rev 3119) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerPeriodSearchPanel.java 2011-05-13 11:50:53 UTC (rev 3120) @@ -109,7 +109,7 @@ break; case FISCAL_PERIOD: - FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(); + FiscalPeriodComboBoxModel fiscalModel = new FiscalPeriodComboBoxModel(true); FiscalPeriodComboBoxRenderer fiscalRenderer = new FiscalPeriodComboBoxRenderer(); final JComboBox fiscalPeriod = new JComboBox(fiscalModel); fiscalPeriod.setRenderer(fiscalRenderer); @@ -132,7 +132,7 @@ break; case FINANCIAL_PERIOD: - FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(); + FinancialPeriodComboBoxModel financialModel = new FinancialPeriodComboBoxModel(true); FinancialPeriodComboBoxRenderer financialRenderer = new FinancialPeriodComboBoxRenderer(); final JComboBox financialPeriod = new JComboBox(financialModel); financialPeriod.setRenderer(financialRenderer);

1 0

r3119 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox
by vsalaun＠users.chorem.org May 13, 2011

May 13, 2011

Author: vsalaun Date: 2011-05-13 13:49:07 +0200 (Fri, 13 May 2011) New Revision: 3119 Url: http://chorem.org/repositories/revision/lima/3119 Log: #352 ajout d'une selection sur la totalite des periodes fiscales et financieres (au lieu de seulement celles qui etaient non bloquees) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2011-05-13 11:44:11 UTC (rev 3118) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FinancialPeriodComboBoxModel.java 2011-05-13 11:49:07 UTC (rev 3119) @@ -64,6 +64,7 @@ protected FiscalPeriod selectedFiscalPeriod; + //constructor for blocked financial period only public FinancialPeriodComboBoxModel() { financialPeriodService = LimaServiceFactory.getInstance().getService( @@ -76,7 +77,20 @@ datasCache=getDataList(); } - public void setFiscalPeriod(FiscalPeriod fiscalPeriod){ + //constructor for all financial period + public FinancialPeriodComboBoxModel(boolean all) { + financialPeriodService = + LimaServiceFactory.getInstance().getService( + FinancialPeriodServiceMonitorable.class); + financialPeriodService.addListener(this); + LimaServiceFactory.getInstance().getService( + FiscalPeriodServiceMonitorable.class).addListener(this); + LimaServiceFactory.getInstance().getService( + ImportServiceMonitorable.class).addListener(this); + datasCache=getAllDataList(); + } + + public void setFiscalPeriod(FiscalPeriod fiscalPeriod){ selectedFiscalPeriod=fiscalPeriod; datasCache=getDataList(); } @@ -101,6 +115,7 @@ return selectedFinancialPeriod; } + //get unblocked financial periods data list public List<FinancialPeriod> getDataList(){ List<FinancialPeriod> result = null; try { @@ -120,10 +135,36 @@ return result; } + //get all financial periods data list + public List<FinancialPeriod> getAllDataList() { + List<FinancialPeriod> result = null; + try { + if (selectedFiscalPeriod != null){ + result = (List<FinancialPeriod>) + selectedFiscalPeriod.getFinancialPeriod(); + } + else { + result = financialPeriodService.getAllFinancialPeriods(); + } + } + catch (LimaException ex) { + if (log.isDebugEnabled()){ + log.debug("Can't get Financial Period list",ex); + } + } + return result; + } + + public void refresh(){ datasCache = getDataList(); fireContentsChanged(this, 0, datasCache.size()); } + + public void refreshAll() { + datasCache = getAllDataList(); + fireContentsChanged(this, 0, datasCache.size()); + } @Override public void notifyMethod(String serviceName, String methodeName) { 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 2011-05-13 11:44:11 UTC (rev 3118) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox/FiscalPeriodComboBoxModel.java 2011-05-13 11:49:07 UTC (rev 3119) @@ -50,7 +50,7 @@ protected List<FiscalPeriod> datasCache; - + //constructor for blocked fiscal period only public FiscalPeriodComboBoxModel(){ fiscalPeriodService = LimaServiceFactory.getInstance().getService( @@ -61,6 +61,17 @@ datasCache = getDataList(); } + //constructor for all fiscal period + public FiscalPeriodComboBoxModel(boolean all) { + fiscalPeriodService = + LimaServiceFactory.getInstance().getService( + FiscalPeriodServiceMonitorable.class); + fiscalPeriodService.addListener(this); + LimaServiceFactory.getInstance().getService( + ImportServiceMonitorable.class).addListener(this); + datasCache = getAllDataList(); + } + @Override public int getSize() { return datasCache.size(); @@ -82,6 +93,7 @@ return selectedFiscalPeriod; } + //get unblocked fiscal periods data list public List<FiscalPeriod> getDataList(){ List<FiscalPeriod> result = null; try { @@ -96,11 +108,30 @@ } + //get all fiscal periods data list + public List<FiscalPeriod> getAllDataList() { + List<FiscalPeriod> result = null; + try { + result = fiscalPeriodService.getAllFiscalPeriods(); + } + catch (LimaException eee) { + if (log.isDebugEnabled()) { + log.debug("Can't get list accounts", eee); + } + } + return result; + } + public void refresh(){ datasCache = getDataList(); fireContentsChanged(this, 0, datasCache.size()); } + public void refreshAll() { + datasCache = getAllDataList(); + fireContentsChanged(this, 0, datasCache.size()); + } + @Override public void notifyMethod(String serviceName, String methodeName) { if (serviceName.contains("FiscalPeriod") || methodeName.contains("importAll")){

1 0

r3118 - in trunk/lima-business/src/main/java/org/chorem/lima/business: ejb ejbinterface
by vsalaun＠users.chorem.org May 13, 2011

May 13, 2011

Author: vsalaun Date: 2011-05-13 13:44:11 +0200 (Fri, 13 May 2011) New Revision: 3118 Url: http://chorem.org/repositories/revision/lima/3118 Log: #352 ajout d'une selection sur la totalite des periodes fiscales et financi?\195?\168res (au lieu de seulement celles qui etaient non bloquees) Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialPeriodService.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2011-05-13 09:30:21 UTC (rev 3117) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2011-05-13 11:44:11 UTC (rev 3118) @@ -140,6 +140,37 @@ doCatch(topiaContext, ex, log); } } + + /** + * Return all financial period + */ + @Override + public List<FinancialPeriod> getAllFinancialPeriods() throws LimaException { + + List<FinancialPeriod> result = null; + + TopiaContext transaction = null; + try { + transaction = beginTransaction(); + + FinancialPeriodDAO financialPeriodDAO = LimaCallaoDAOHelper. + getFinancialPeriodDAO(transaction); + + TopiaQuery query = financialPeriodDAO.createQuery() + .addEquals(FinancialPeriod.LOCKED, Boolean.TRUE) + .addOrder(FinancialPeriod.BEGIN_DATE); + + result = financialPeriodDAO.findAllByQuery(query); + } + catch (TopiaException ex) { + doCatch(transaction, ex, log); + } + finally { + doFinally(transaction, log); + } + + return result; + } /** * Return all unblocked financial period Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialPeriodService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialPeriodService.java 2011-05-13 09:30:21 UTC (rev 3117) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialPeriodService.java 2011-05-13 11:44:11 UTC (rev 3118) @@ -57,4 +57,7 @@ List<ClosedPeriodicEntryBook> getAllClosedPeriodicEntryBooksFromUnblockedFiscalPeriod() throws LimaException; void blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException; + + + List<FinancialPeriod> getAllFinancialPeriods() throws LimaException; }

1 0

r3117 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by vsalaun＠users.chorem.org May 13, 2011

May 13, 2011

Author: vsalaun Date: 2011-05-13 11:30:21 +0200 (Fri, 13 May 2011) New Revision: 3117 Url: http://chorem.org/repositories/revision/lima/3117 Log: #286 description et piece comptable rendues obligatoires pour chaque transaction Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.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 2011-05-13 09:28:53 UTC (rev 3116) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2011-05-13 09:30:21 UTC (rev 3117) @@ -211,7 +211,7 @@ .addOrder("T."+FinancialTransaction.TOPIA_CREATE_DATE) .addFrom(FiscalPeriod.class, "F") .addLeftJoin("T."+FinancialTransaction.ENTRY, "E", true) - .addWhere("T.amountCredit != T.amountDebit OR E.account = null OR T.entryBook = null") + .addWhere("T.amountCredit != T.amountDebit OR E.account = null OR T.entryBook = null OR E.voucher = null OR E.voucher = '' OR E.description = null OR E.description = ''") .addInElements("T.financialPeriod", "F.financialPeriod") .addEquals("F", fiscalPeriod) // load lazy

1 0

r3116 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: financialtransaction financialtransactionsearch financialtransactionunbalanced
by vsalaun＠users.chorem.org May 13, 2011

May 13, 2011

Author: vsalaun Date: 2011-05-13 11:28:53 +0200 (Fri, 13 May 2011) New Revision: 3116 Url: http://chorem.org/repositories/revision/lima/3116 Log: #286 prise en compte du renderer des champs invalides dans les transactions 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/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.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 2011-05-13 09:03:39 UTC (rev 3115) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-05-13 09:28:53 UTC (rev 3116) @@ -41,6 +41,7 @@ import org.chorem.lima.ui.celleditor.AccountTableCellEditor; import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.chorem.lima.ui.celleditor.DateTableCellEditor; +import org.chorem.lima.ui.celleditor.EmptyCellRenderer; import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; import org.jdesktop.swingx.JXTable; @@ -89,6 +90,10 @@ setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); + //get new String renderer for empty cells + setDefaultRenderer(String.class, new EmptyCellRenderer()); + //get new Account renderer for empty cells + setDefaultRenderer(Account.class, new EmptyCellRenderer()); //highlight financial financial transactions addColorTransaction(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-05-13 09:03:39 UTC (rev 3115) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-05-13 09:28:53 UTC (rev 3116) @@ -414,7 +414,9 @@ Object currentRow = cacheDataList.get(row); Entry entry = new EntryImpl(); entry.setAmount(BigDecimal.ZERO); - entry.setDescription(description); + if (description != null) { + entry.setDescription(description); + } //check if current row is a transaction or an entry if (currentRow instanceof FinancialTransaction) { currentTransaction = (FinancialTransaction)currentRow; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-13 09:03:39 UTC (rev 3115) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-13 09:28:53 UTC (rev 3116) @@ -35,6 +35,7 @@ import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.chorem.lima.ui.celleditor.DateTableCellEditor; +import org.chorem.lima.ui.celleditor.EmptyCellRenderer; import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ColorHighlighter; @@ -76,6 +77,10 @@ setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); + //get new String renderer for empty cells + setDefaultRenderer(String.class, new EmptyCellRenderer()); + //get new Account renderer for empty cells + setDefaultRenderer(Account.class, new EmptyCellRenderer()); //highlight financial financial transactions addColorTransaction(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-13 09:03:39 UTC (rev 3115) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-13 09:28:53 UTC (rev 3116) @@ -37,6 +37,7 @@ import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.chorem.lima.ui.celleditor.DateTableCellEditor; +import org.chorem.lima.ui.celleditor.EmptyCellRenderer; import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; import org.chorem.lima.ui.financialtransactionunbalanced.FinancialTransactionUnbalancedViewHandler; import org.jdesktop.swingx.JXTable; @@ -81,6 +82,10 @@ setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); + //get new String renderer for empty cells + setDefaultRenderer(String.class, new EmptyCellRenderer()); + //get new Account renderer for empty cells + setDefaultRenderer(Account.class, new EmptyCellRenderer()); //highlight financial financial transactions addColorTransaction(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2011-05-13 09:03:39 UTC (rev 3115) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2011-05-13 09:28:53 UTC (rev 3116) @@ -368,7 +368,9 @@ Object currentRow = cacheDataList.get(row); Entry entry = new EntryImpl(); entry.setAmount(BigDecimal.ZERO); - entry.setDescription(description); + if (description != null) { + entry.setDescription(description); + } //check if current row is a transaction or an entry if (currentRow instanceof FinancialTransaction) { currentTransaction = (FinancialTransaction)currentRow;

1 0

r3115 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by vsalaun＠users.chorem.org May 13, 2011

May 13, 2011

Author: vsalaun Date: 2011-05-13 11:03:39 +0200 (Fri, 13 May 2011) New Revision: 3115 Url: http://chorem.org/repositories/revision/lima/3115 Log: #286 ajout du renderer pour mettre en evidence les champs invalides de la ligne Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java 2011-05-13 09:03:39 UTC (rev 3115) @@ -0,0 +1,61 @@ +package org.chorem.lima.ui.celleditor; + +import java.awt.Color; +import java.awt.Component; + +import javax.swing.JLabel; +import javax.swing.JTable; +import javax.swing.border.Border; +import javax.swing.border.EmptyBorder; +import javax.swing.table.DefaultTableCellRenderer; + +import sun.swing.DefaultLookup; + +@SuppressWarnings("restriction") +public class EmptyCellRenderer extends DefaultTableCellRenderer { + + private static final long serialVersionUID = -7834417406160620726L; + + public Component getTableCellRendererComponent(JTable table, Object value, + boolean isSelected, boolean hasFocus, int row, int column) + { + //Create a new JLabel to avoid colouring only when row is selected + JLabel mycell = new JLabel(); + mycell.setOpaque(true); + setBorder(new EmptyBorder(1, 1, 1, 1)); + setName("Table.cellRenderer"); + mycell.setBackground(Color.WHITE); + mycell.setForeground(Color.BLACK); + //Setting default foreGround and backGround colours when isSelected + if (isSelected) { + mycell.setForeground(table.getSelectionForeground()); + mycell.setBackground(table.getSelectionBackground()); + } + //Setting default foreGround and backGround colours when hasFocus + if (hasFocus) { + Border border = null; + if (isSelected) { + border = DefaultLookup.getBorder(this, ui, "Table.focusSelectedCellHighlightBorder"); + } + if (border == null) { + border = DefaultLookup.getBorder(this, ui, "Table.focusCellHighlightBorder"); + } + mycell.setBorder(border); + } + // true for voucher and description + // false for Account Class + // if empty or null, colour background in red + // else setText + if (value instanceof String) { + if (String.valueOf(value).isEmpty() || (String.valueOf(value) == null)) { + mycell.setBackground(new Color(255, 198, 209)); + } else { + mycell.setText(value.toString()); + } + } else { + mycell.setBackground(new Color(255, 198, 209)); + } + return mycell; + } + +}

1 0

r3114 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by vsalaun＠users.chorem.org May 12, 2011

May 12, 2011

Author: vsalaun Date: 2011-05-12 10:51:57 +0200 (Thu, 12 May 2011) New Revision: 3114 Url: http://chorem.org/repositories/revision/lima/3114 Log: #267 ajout du renderer pour les objets de type BigDecimal Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java Added: 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 (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2011-05-12 08:51:57 UTC (rev 3114) @@ -0,0 +1,60 @@ +package org.chorem.lima.ui.celleditor; + +import java.awt.Component; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.math.BigDecimal; +import java.util.Date; +import java.util.EventObject; + +import javax.swing.AbstractCellEditor; +import javax.swing.DefaultCellEditor; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.SwingConstants; +import javax.swing.SwingUtilities; +import javax.swing.table.TableCellEditor; +import javax.swing.text.JTextComponent; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.LimaContext; + +public class BigDecimalTableCellEditor extends AbstractCellEditor implements TableCellEditor { + + private static final Log log = LogFactory.getLog(BigDecimalTableCellEditor.class); + private static final long serialVersionUID = 1L; + protected final JTextField textField; + + /** + * constructor + */ + public BigDecimalTableCellEditor() { + textField = new JTextField(); + textField.setEditable(true); + textField.setHorizontalAlignment(SwingConstants.RIGHT); + } + + @Override + public Component getTableCellEditorComponent(JTable table, Object value, + boolean isSelected, int row, int column) { + textField.setText(value.toString()); + return textField; + } + + // the editor should return a BigDecimal + public Object getCellEditorValue() { + String textValue = textField.getText().trim(); + //replace all comma by fullstop + textValue = textValue.replaceAll(",", "."); + if (textValue.equals("")) { + return BigDecimal.ZERO; + } else { + BigDecimal bdValue = new BigDecimal(textValue); + bdValue = bdValue.setScale(LimaContext.getContext().getConfig().getScale(), + BigDecimal.ROUND_HALF_UP); + return bdValue; + } + } + +} Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java 2011-05-12 08:51:57 UTC (rev 3114) @@ -0,0 +1,62 @@ +package org.chorem.lima.ui.celleditor; + +import java.awt.Component; +import java.awt.Font; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.text.NumberFormat; +import java.util.Locale; + +import javax.swing.JTable; +import javax.swing.SwingConstants; +import javax.swing.table.TableCellRenderer; +import javax.swing.table.DefaultTableCellRenderer; + +import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaContext; +import org.chorem.lima.beans.FinancialStatementAmounts; +import org.chorem.lima.ui.financialstatementreport.FinancialStatementReportTableModel; + +public class BigDecimalTableCellRenderer extends DefaultTableCellRenderer { + + private static final long serialVersionUID = -2499433026151065390L; + + public BigDecimalTableCellRenderer() { + // + } + + public Component getTableCellRendererComponent(JTable table, Object value, + boolean isSelected, boolean hasFocus, int row, int column) + { + + Component cell = super.getTableCellRendererComponent( + table, value, isSelected, hasFocus, row, column); + setHorizontalAlignment(SwingConstants.RIGHT); + setValue(value); + return this; + } + + public void setValue(Object aValue) { + Object result = aValue; + if (( aValue != null) && (aValue instanceof BigDecimal)) { + LimaConfig config = LimaContext.getContext().getConfig(); + String scale = ""; + for (int i = 0; i < config.getScale(); i++) { + scale += "0"; + } + DecimalFormat formatter = new DecimalFormat("##0." + scale); + DecimalFormatSymbols symbol = new DecimalFormatSymbols(); + //set decimalSeparator and thousandSeparator preferences + symbol.setDecimalSeparator(config.getDecimalSeparator()); + symbol.setGroupingSeparator(config.getThousandSeparator()); + formatter.setDecimalFormatSymbols(symbol); + //always set grouping + formatter.setGroupingUsed(true); + formatter.setGroupingSize(3); + result = formatter.format(result); + } + super.setValue(result); + } + +}

1 0