r3459 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/main/java/org/chorem/lima/business/ejb lima-business-api/src/main/java/org/chorem/lima/business/api lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod - Lima-commits

19 Jun 2012

Author: mallon
Date: 2012-06-19 17:49:11 +0200 (Tue, 19 Jun 2012)
New Revision: 3459

Url: http://chorem.org/repositories/revision/lima/3459

Log:
Gestion des boutons de suppression et de cloture d'exercices : d?\195?\169sormais, les boutons apparaissent selon l'etat de l'exercie selectionn?\195?\169 (Clot / Ouvert et vide / Ouvert)

Modified:
   trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java
   trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java
   trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java
   trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java
===================================================================

--- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java	2012-06-19 14:45:12 UTC (rev 3458)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java	2012-06-19 15:49:11 UTC (rev 3459)
@@ -213,11 +213,9 @@
             }    	
         } catch (TopiaException ex) {
             throw new LimaException("Can't check rule", ex);
-        }
-            
-    }
+        }            
+    }    
     
-    
     /**
      * Check if old financialperiod for a an entrybook are closed before bock the asked closedperiodicentrybook
      * <p/>

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	2012-06-19 14:45:12 UTC (rev 3458)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java	2012-06-19 15:49:11 UTC (rev 3459)
@@ -126,7 +126,24 @@
             FinancialPeriod period) throws LimaException {
         return getAllFinancialTransactions(period, null);
     }
+    
+    /**
+     * Return the list of all financial transaction of a fiscal period.
+     */
+    @Override
+    public List<FinancialTransaction> getAllFinancialTransactions(
+            FiscalPeriod period) throws LimaException {
+        List<FinancialTransaction> financialTransactions = null;
 
+        try {
+            FinancialTransactionDAO transactionDAO = getDaoHelper().getFinancialTransactionDAO();
+            financialTransactions = transactionDAO.findAllByDates(period.getBeginDate(), period.getEndDate());
+        } catch (Exception ex) {
+            throw new LimaException("Can't get financial transactions", ex);
+        }
+        return financialTransactions;
+    }
+
     /**
      * Return the list of all financial transaction of a financial period and an entrybook.
      */

Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java	2012-06-19 14:45:12 UTC (rev 3458)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java	2012-06-19 15:49:11 UTC (rev 3459)
@@ -211,7 +211,7 @@
 
         return result;
     }
-
+    
     /**
      * to block a fiscal period
      * <p/>

Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java
===================================================================
--- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java	2012-06-19 14:45:12 UTC (rev 3458)
+++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java	2012-06-19 15:49:11 UTC (rev 3459)
@@ -55,7 +55,7 @@
 
     void removeFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException;
 
-    List<FinancialTransaction> getAllFinancialTransactions(FinancialPeriod period) throws LimaException;
+    List<FinancialTransaction> getAllFinancialTransactions(FinancialPeriod period) throws LimaException;    
 
     List<FinancialTransaction> getAllFinancialTransactions(Date beginDate, Date endDate) throws LimaException;
 
@@ -65,6 +65,8 @@
 
     List<FinancialTransaction> getAllFinancialTransactionsBalanced(FiscalPeriod fiscalPeriod) throws LimaException;
 
+    List<FinancialTransaction> getAllFinancialTransactions(FiscalPeriod period) throws LimaException;
+    
     List<Object> searchFinancialTransaction(FinancialTransactionSearch financialTransactionSearch) throws LimaException;
 
     Entry createEntry(Entry entry) throws LimaException;

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx	2012-06-19 14:45:12 UTC (rev 3458)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx	2012-06-19 15:49:11 UTC (rev 3459)
@@ -65,14 +65,12 @@
   <row>
     <cell fill="horizontal">
       <JButton id="blockButton" text="lima.charts.fiscalperiod.block"
-               enabled="{isSelectedPeriod()}"
                onActionPerformed="getHandler().blockFiscalPeriod()"/>
     </cell>
   </row>
    <row>
     <cell fill="horizontal">
       <JButton id="deleteButton" text="lima.charts.fiscalperiod.delete"
-               enabled="{isSelectedPeriod()}"
            	   onActionPerformed="getHandler().deleteFiscalPeriod()"/>
     </cell>
   </row>

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-19 14:45:12 UTC (rev 3458)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java	2012-06-19 15:49:11 UTC (rev 3459)
@@ -300,17 +300,33 @@
         FiscalPeriodTableModel model = view.getFiscalPeriodTableModel();
         
         int selectedRow = fiscalPeriodeTable.getSelectedRow();
-                        
-        Object valueColumnClos = model.getValueAt(selectedRow, 1 );
         
-        if ( String.valueOf(valueColumnClos).equals( _("lima.ui.fiscalperiod.closed") ) ){
+        //when a fiscal period is deleted, no row is selected ('-1')
+        if (selectedRow != -1){
+            FiscalPeriod selectedFiscalPeriod = model.getFiscalPeriodAt(selectedRow);
+            
+            financialTransactionService = LimaServiceFactory.getService(FinancialTransactionService.class);
+            List<FinancialTransaction> financialTransactionList = financialTransactionService.getAllFinancialTransactions(selectedFiscalPeriod);
+            
+            //no action possible for fiscal period closed
+            if (selectedFiscalPeriod.getLocked()){
+                view.blockButton.setEnabled(false);
+                view.deleteButton.setEnabled(false);
+            }else{
+                    view.blockButton.setEnabled(true);
+                    
+                    //only an empty fiscal period may be deleted
+                    if (financialTransactionList.size() <= 0){
+                        view.deleteButton.setEnabled(true);
+                    }else{
+                        view.deleteButton.setEnabled(false);
+                    }
+                }            
+        }else{
+            //after an action (delete or closure), reinitialization at false
             view.blockButton.setEnabled(false);
-            view.deleteButton.setEnabled(false);            
-        }else{
-                view.blockButton.setEnabled(true);
-                view.deleteButton.setEnabled(true);
-                //TODO : si l'exercice est non-vide, suppression reste a false
-            }            
+            view.deleteButton.setEnabled(false);
+        }
     }  
         
 }

    

r3459 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/main/java/org/chorem/lima/business/ejb lima-business-api/src/main/java/org/chorem/lima/business/api lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod

mallon＠users.chorem.org

tags

participants (1)