Author: vsalaun Date: 2011-05-18 17:28:28 +0200 (Wed, 18 May 2011) New Revision: 3134 Url: http://chorem.org/repositories/revision/lima/3134 Log: #369 mise en relation des combobox fiscalPeriods/financialPeriods (1/2) 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 trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialPeriodComboBox.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 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-18 14:26:46 UTC (rev 3133) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2011-05-18 15:28:28 UTC (rev 3134) @@ -25,6 +25,7 @@ package org.chorem.lima.business.ejb; +import java.util.Date; import java.util.List; import javax.ejb.Stateless; import org.apache.commons.logging.Log; @@ -201,7 +202,38 @@ return result; } + + /** + * Return all financial period from a fiscal period + */ + @Override + public List<FinancialPeriod> getFinancialPeriods(Date beginDate, Date endDate) throws LimaException { + + List<FinancialPeriod> result = null; + TopiaContext transaction = null; + try { + transaction = beginTransaction(); + + FinancialPeriodDAO financialPeriodDAO = LimaCallaoDAOHelper. + getFinancialPeriodDAO(transaction); + + TopiaQuery query = financialPeriodDAO.createQuery() + .addBetween(FinancialPeriod.BEGIN_DATE, beginDate, endDate) + .addOrder(FinancialPeriod.BEGIN_DATE); + + result = financialPeriodDAO.findAllByQuery(query); + } + catch (TopiaException ex) { + doCatch(transaction, ex, log); + } + finally { + doFinally(transaction, log); + } + + return result; + } + @Override public void blockClosedPeriodicEntryBookWithTransaction( 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-18 14:26:46 UTC (rev 3133) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialPeriodService.java 2011-05-18 15:28:28 UTC (rev 3134) @@ -25,6 +25,7 @@ package org.chorem.lima.business.ejbinterface; +import java.util.Date; import java.util.List; import javax.ejb.Remote; import org.chorem.lima.business.LimaException; @@ -58,6 +59,7 @@ void blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException; - List<FinancialPeriod> getAllFinancialPeriods() throws LimaException; + + List<FinancialPeriod> getFinancialPeriods(Date beginDate, Date endDate) throws LimaException; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialPeriodComboBox.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialPeriodComboBox.java 2011-05-18 14:26:46 UTC (rev 3133) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialPeriodComboBox.java 2011-05-18 15:28:28 UTC (rev 3134) @@ -25,18 +25,13 @@ package org.chorem.lima.ui.financialtransaction; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import javax.swing.JComboBox; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.entity.FinancialPeriod; -import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel; -import org.chorem.lima.ui.combobox.FinancialPeriodComboBoxRenderer; +public class FinancialPeriodComboBox extends JComboBox { -public class FinancialPeriodComboBox extends JComboBox implements ActionListener { - private static final long serialVersionUID = 1L; private static final Log log = @@ -46,14 +41,6 @@ public FinancialPeriodComboBox(FinancialTransactionViewHandler handler) { this.handler = handler; - - FinancialPeriodComboBoxModel comboBoxModel = new FinancialPeriodComboBoxModel(); - FinancialPeriodComboBoxRenderer comboBoxRenderer = new FinancialPeriodComboBoxRenderer(); - - setModel(comboBoxModel); - setRenderer(comboBoxRenderer); - addActionListener(this); - } public void back(){ @@ -74,16 +61,8 @@ if (row < size-1){ this.setSelectedItem(this.getItemAt(row+1)); repaint(); + //FIXME handler.tableModel.setFinancialPeriod( (FinancialPeriod) this.getSelectedItem()); } } - - @Override - public void actionPerformed(ActionEvent e) { - Object object = this.getSelectedItem(); - if (object instanceof FinancialPeriod){ - handler.tableModel.setFinancialPeriod( (FinancialPeriod) this.getSelectedItem()); - } - } - } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2011-05-18 14:26:46 UTC (rev 3133) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2011-05-18 15:28:28 UTC (rev 3134) @@ -26,17 +26,14 @@ <Table> <FinancialTransactionViewHandler id="handler" javaBean="new FinancialTransactionViewHandler(this)" /> <Boolean id="selectedRow" javaBean="false" /> - <org.chorem.lima.ui.combobox.FinancialPeriodComboBoxModel id="modelFinancialPeriod"/> - <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id="modelFiscalPeriod"/> + <script> <
vsalaun＠users.chorem.org