Author: mallon Date: 2012-06-25 15:16:58 +0200 (Mon, 25 Jun 2012) New Revision: 3472 Url: http://chorem.org/repositories/revision/lima/3472 Log: Mise ?\195?\160 jour du panneau d'accueil : du code inutile a ?\195?\169t?\195?\169 supprim?\195?\169 (Acc?\195?\168s ?\195?\160 la saisie des ?\195?\169critures), et la mise ?\195?\160 jour du panneau se fait selon la suppression d'un exercice / d'un journal et la cl?\195?\180ture d'un exercice. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java trunk/lima-swing/src/main/resources/log4j.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-25 13:16:58 UTC (rev 3472) @@ -50,6 +50,7 @@ import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import org.chorem.lima.ui.home.FinancialTransactionsPane; import org.jdesktop.swingx.JXTable; import org.nuiton.util.DateUtil; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java 2012-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java 2012-06-25 13:16:58 UTC (rev 3472) @@ -78,6 +78,8 @@ public void refresh() { + log.debug("Rafraîchissement accounts pane"); + String htmlBegin = "<font face='sans-serif' size=3>" + "<p style=vertical-align:'bottom', horizontal-align:'center'>"; String htmlEnd = "</p></font>"; @@ -110,6 +112,7 @@ @Override public void notifyMethod(String serviceName, String methodeName) { + log.debug("Nom de la méthode : " + methodeName); if (methodeName.contains("Account") || methodeName.contains("importAll") || methodeName.contains("importAs")) { refresh(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2012-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2012-06-25 13:16:58 UTC (rev 3472) @@ -81,6 +81,8 @@ public void refresh() { + log.debug("Rafraîchissement entry books pane"); + String htmlBegin = "<font face='sans-serif' size=3>" + "<p style=vertical-align:'bottom', horizontal-align:'center'>"; String htmlEnd = "</p></font>"; @@ -133,6 +135,7 @@ @Override public void notifyMethod(String serviceName, String methodeName) { + log.debug("Nom de la méthode : " + methodeName); if (methodeName.contains("EntryBook") || methodeName.contains("importAll") || methodeName.contains("importAs") || methodeName.contains("importEntries")) { refresh(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java 2012-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java 2012-06-25 13:16:58 UTC (rev 3472) @@ -36,14 +36,18 @@ import org.chorem.lima.LimaContext; import org.chorem.lima.business.LimaException; import org.chorem.lima.business.ServiceListener; +import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.business.api.FiscalPeriodService; import org.chorem.lima.business.api.ImportService; +import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.MainView; +import com.google.common.collect.Multiset.Entry; + /** * Home view pane that display statistics about unbalanced transactions. * @@ -62,12 +66,15 @@ protected FinancialTransactionService financialTransactionService; protected FiscalPeriodService fiscalPeriodService; + + protected EntryBookService entryBookService; public FinancialTransactionsPane(HomeView view) { super(view); financialTransactionService = LimaServiceFactory.getService(FinancialTransactionService.class); fiscalPeriodService = LimaServiceFactory.getService(FiscalPeriodService.class); + entryBookService = LimaServiceFactory.getService(EntryBookService.class); LimaServiceFactory.addServiceListener(FinancialTransactionService.class, this); LimaServiceFactory.addServiceListener(FiscalPeriodService.class, this); LimaServiceFactory.addServiceListener(ImportService.class, this); @@ -90,7 +97,9 @@ } public void refresh() { - + + log.debug("Rafraîchissement financial transaction pane"); + String htmlBegin = "<font face='sans-serif' size=3>" + "<p style=vertical-align:'bottom', horizontal-align:'center'>"; String htmlEnd = "</p></font>"; @@ -99,7 +108,10 @@ List<FiscalPeriod> unblockedFiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriods(); - if (unblockedFiscalPeriods.size() != 0) { + List<EntryBook> entryBooks = entryBookService.getAllEntryBooks(); + + //Au moins un exercice ouvert et un journal ouvert + if (unblockedFiscalPeriods.size() != 0 && entryBooks.size() != 0) { List<FinancialTransaction> financialTransactionsUnbal = financialTransactionService. getAllInexactFinancialTransactions(unblockedFiscalPeriods.get(0)); @@ -121,20 +133,19 @@ + " " + _("lima.ui.home.transaction.balanced") + "<br/><br/><a href='#financialtransactionbalanced'>" + _("lima.ui.home.transaction.modifiy.balanced") + "</a>"; - //set Text setText(htmlBegin + transactionsString + htmlEnd); } else { setBackground(RED_BACKGROUND); String transactionsString = _("lima.ui.home.transaction.nothing") + "<br/><br/><a href='#financialtransactionbalanced'>" + _("lima.ui.home.transaction.create") + "</a>"; - //set Text setText(htmlBegin + transactionsString + htmlEnd); } } - } else { + }else { setBackground(RED_BACKGROUND); + setText(""); } } catch (LimaException eee) { @@ -143,10 +154,11 @@ } @Override - public void notifyMethod(String serviceName, String methodeName) { + public void notifyMethod(String serviceName, String methodeName) { + log.debug("Nom de la méthode : " + methodeName); if (methodeName.contains("FiscalPeriod") || methodeName.contains("FinancialTransaction") || methodeName.contains("Entry") || methodeName.contains("importEntries") - || methodeName.contains("importAll") || methodeName.contains("importAs")) { + || methodeName.contains("importAll") || methodeName.contains("importAs")) { refresh(); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java 2012-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java 2012-06-25 13:16:58 UTC (rev 3472) @@ -87,6 +87,8 @@ public void refresh() { + log.debug("Rafraîchissement fiscal periods pane"); + String htmlBegin = "<font face='sans-serif' size=3>" + "<p style=vertical-align:'bottom', horizontal-align:'center'>"; String htmlEnd = "</p></font>"; @@ -130,6 +132,7 @@ @Override public void notifyMethod(String serviceName, String methodeName) { + log.debug("Nom de la méthode : " + methodeName); if (methodeName.contains("FiscalPeriod") || methodeName.contains("importAll") || methodeName.contains("importAs")) { Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-06-25 13:16:58 UTC (rev 3472) @@ -40,4 +40,5 @@ log4j.logger.org.chorem.lima=INFO log4j.logger.org.chorem.lima.business.ejb=DEBUG log4j.logger.org.chorem.lima.ui.account=DEBUG +log4j.logger.org.chorem.lima.ui.home=DEBUG log4j.logger.org.chorem.lima.business.accountingrules.DefaultAccountingRules=DEBUG \ No newline at end of file