Author: mallon Date: 2012-06-19 16:45:12 +0200 (Tue, 19 Jun 2012) New Revision: 3458 Url: http://chorem.org/repositories/revision/lima/3458 Log: Correction concernant la gestion des boutons de suppression et de cloture des exercices ('onMouseClicked' supprim?\195?\169, et d?\195?\169placement de la m?\195?\169thode de gestion des boutons dans le handler.). 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/FiscalPeriodViewHandler.java 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:15:41 UTC (rev 3457) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 14:45:12 UTC (rev 3458) @@ -34,30 +34,7 @@ <FiscalPeriodViewHandler id="handler" constructorParams="this"/> <Boolean id="selectedPeriod" javaBean="false"/> - <script><![CDATA[ - import static org.nuiton.i18n.I18n._; - - /** - * Manage the differents buttons for fiscal period - * */ - public void reloadEnablingButton() - { - int selectedRow = fiscalPeriodTable.getSelectedRow(); - - Object valueColumnClos = fiscalPeriodTableModel.getValueAt(selectedRow, 1 ); - - if ( String.valueOf(valueColumnClos).equals( _("lima.ui.fiscalperiod.closed") ) )//Cloture - { - blockButton.setEnabled(false); - deleteButton.setEnabled(false); - } - else - { - blockButton.setEnabled(true); - deleteButton.setEnabled(true); - } - } - + <script><![CDATA[ void $afterCompleteSetup() { getHandler().init(); } @@ -72,11 +49,10 @@ constructorParams="getFiscalPeriodTableModel()" selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" columnControlVisible="true" - onMouseClicked="reloadEnablingButton()" /> <ListSelectionModel javaBean="getFiscalPeriodTable().getSelectionModel()" - onValueChanged="setSelectedPeriod(fiscalPeriodTable.getSelectedRow() != -1)"/> + onValueChanged="getHandler().reloadEnablingButton()"/> </JScrollPane> </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:15:41 UTC (rev 3457) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-19 14:45:12 UTC (rev 3458) @@ -109,9 +109,20 @@ addPeriodDialog.setVisible(true); FiscalPeriod fiscalPeriod = addPeriodDialog.getPeriod(); - if (fiscalPeriod != null) { - int response = JOptionPane.YES_OPTION; - if (response == checkTimeFiscalPeriod(fiscalPeriod)) { + if (fiscalPeriod != null) { + + //check if fiscalperiod have 12 months, ask a confirmation + int nbMonth = DateUtil.getDifferenceInMonths(fiscalPeriod.getBeginDate(), + fiscalPeriod.getEndDate()); + int response = JOptionPane.YES_OPTION; + if (nbMonth != 12) { + response = JOptionPane.showConfirmDialog(view, + _("lima.ui.fiscalperiod.addfiscalperiod.morethan12"), + _("lima.ui.fiscalperiod.addfiscalperiodtitle"), + JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + } + + if (response == JOptionPane.YES_OPTION) { fiscalPeriod = fiscalPeriodService.createFiscalPeriod(fiscalPeriod); model.addFiscalPeriod(fiscalPeriod); } @@ -280,19 +291,26 @@ } } - private int checkTimeFiscalPeriod(FiscalPeriod fiscalPeriod){ - //check if fiscalperiod have 12 months, ask a confirmation - int nbMonth = DateUtil.getDifferenceInMonths(fiscalPeriod.getBeginDate(), - fiscalPeriod.getEndDate()); - int response = JOptionPane.YES_OPTION; - if (nbMonth != 12) { - response = JOptionPane.showConfirmDialog(view, - _("lima.ui.fiscalperiod.addfiscalperiod.morethan12"), - _("lima.ui.fiscalperiod.addfiscalperiodtitle"), - JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); - } + /** + * Manage the differents buttons for fiscal period + * */ + public void reloadEnablingButton(){ - return response; - } - + JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); + FiscalPeriodTableModel model = view.getFiscalPeriodTableModel(); + + int selectedRow = fiscalPeriodeTable.getSelectedRow(); + + Object valueColumnClos = model.getValueAt(selectedRow, 1 ); + + if ( String.valueOf(valueColumnClos).equals( _("lima.ui.fiscalperiod.closed") ) ){ + 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 + } + } + }