[Lima-commits] r3119 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox

13 May 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")){

    

[Lima-commits] r3119 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/combobox

vsalaun＠users.chorem.org