Author: tchemit Date: 2013-09-24 17:43:28 +0200 (Tue, 24 Sep 2013) New Revision: 1220 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1220 Log: fixes #3344: [CAPTURE] harmoniser les racourcis Alt+C pour cr?\195?\169er et continuer dans esp?\195?\169ces et mensuration (actuellment Alt + E dans mensuration) fixes #3322: [ERGO] cr?\195?\169er et continuer : mieux g?\195?\169rer l'?\195?\169cran entre quantification d'un lot et cat?\195?\169gorisation fixes #3318: [MENSURATIONS] ajouter bouton "r?\195?\169initialiser" dans l'?\195?\169cran pour effacer toutes les classes de tailles et les nombres refs #3359: [TECH] Updates jaxx to 2.5.27 Modified: trunk/pom.xml trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel-error-validation.xml trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel-error-validation.xml trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/pom.xml 2013-09-24 15:43:28 UTC (rev 1220) @@ -131,7 +131,7 @@ <eugenePluginVersion>2.7</eugenePluginVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> - <jaxxVersion>2.5.26</jaxxVersion> + <jaxxVersion>2.5.27-SNAPSHOT</jaxxVersion> <swingXVersion>1.6.4</swingXVersion> <xworkVersion>2.3.15.1</xworkVersion> Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-09-24 15:43:28 UTC (rev 1220) @@ -1,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Sun Sep 22 16:40:00 CEST 2013 +#Tue Sep 24 16:21:02 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -251,6 +251,7 @@ tutti.editSpeciesBatch.help=editFishingOperation.html\#captureEspeces tutti.editSpeciesFrequencies.action.cancel.help=editFishingOperation.html\#captureEspecesMensurationActions tutti.editSpeciesFrequencies.action.generate.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.action.reset.help= tutti.editSpeciesFrequencies.action.save.help=editFishingOperation.html\#captureEspecesMensurationActions tutti.editSpeciesFrequencies.action.saveAndClose.help= tutti.editSpeciesFrequencies.action.saveAndContinue.help= Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-09-24 15:43:28 UTC (rev 1220) @@ -1,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Sun Sep 22 16:40:00 CEST 2013 +#Tue Sep 24 16:21:02 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -249,6 +249,7 @@ tutti.editSpeciesBatch.help=editFishingOperation.html\#captureEspeces tutti.editSpeciesFrequencies.action.cancel.help=editFishingOperation.html\#captureEspecesMensurationActions tutti.editSpeciesFrequencies.action.generate.help=editFishingOperation.html\#captureEspecesMensurationActions +tutti.editSpeciesFrequencies.action.reset.help= tutti.editSpeciesFrequencies.action.saveAndClose.help=editFishingOperation.html\#captureEspecesMensurationActions tutti.editSpeciesFrequencies.action.saveAndContinue.help=editFishingOperation.html\#captureEspecesMensurationActions tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.help=editFishingOperation.html\#captureEspecesMensurationFields Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-09-24 15:43:28 UTC (rev 1220) @@ -676,7 +676,8 @@ // update speciesUsed addToSpeciesUsed(newRow); - if (batchRootRowModel.getSelectedCategory() != null) { + if (batchRootRowModel.getBatchCount() == null && + batchRootRowModel.getSelectedCategory() != null) { // add first category splitBatch(batchRootRowModel.getSelectedCategory(), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css 2013-09-24 15:43:28 UTC (rev 1220) @@ -52,7 +52,7 @@ } #categoryPanel { - visible: {model.getSpecies() != null}; + visible: {model.getSpecies() != null && model.getBatchCount() == null}; } #sampleCategoryLabel { @@ -79,7 +79,6 @@ property: batchWeight; model: {model.getBatchWeight()}; useFloat: true; - /*numberPattern: {DECIMAL3_PATTERN};*/ bean: {model}; } @@ -112,6 +111,7 @@ showReset: false; selectedItem: {model.getSelectedCategory()}; data: {model.getCategory()}; + enabled: {model.getBatchCount() == null}; } #sampleWeightLabel { @@ -133,7 +133,7 @@ selectionBackground: {null}; selectionForeground: {Color.BLACK}; sortable: false; - enabled: {model.getSelectedCategory() != null} + enabled: {model.getSelectedCategory() != null && model.getBatchCount() == null}; } #addSpeciesButton { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jaxx 2013-09-24 15:43:28 UTC (rev 1220) @@ -67,8 +67,7 @@ <BeanValidator id='validator' bean='model' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> <field name='species' component='speciesComboBox'/> - <field name='sampleCategory' - component='sampleCategoryComboBox'/> + <field name='sampleCategory' component='sampleCategoryComboBox'/> <field name='batchWeight' component='batchWeightField'/> <field name='batchCount' component='batchCountField'/> <field name='selectedCategory' component='categoryComboBox'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.css 2013-09-24 15:43:28 UTC (rev 1220) @@ -295,3 +295,11 @@ enabled: {model.isValid()}; _help: {"tutti.editBenthosFrequencies.action.saveAndClose.help"}; } + +#resetButton { + actionIcon: reset; + text: "tutti.editSpeciesFrequencies.action.reset"; + toolTipText: "tutti.editSpeciesFrequencies.action.reset.tip"; + i18nMnemonic: "tutti.editSpeciesFrequencies.action.reset.mnemonic"; + _help: {"tutti.editSpeciesFrequencies.action.reset.help"}; +} \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUI.jaxx 2013-09-24 15:43:28 UTC (rev 1220) @@ -205,9 +205,14 @@ </JPanel> <JPanel id='dataFieldPanel' constraints='BorderLayout.CENTER'> - <JScrollPane id='tableScrollPane' constraints='"lengthCaracteristicPmfm"'> - <JXTable id='table'/> - </JScrollPane> + <JPanel constraints='"lengthCaracteristicPmfm"' + layout='{new BorderLayout()}'> + <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> + <JXTable id='table'/> + </JScrollPane> + <JButton id='resetButton' onActionPerformed='handler.reset()' + constraints='BorderLayout.SOUTH'/> + </JPanel> <Table constraints='"noLengthCaracteristicPmfm"' fill='horizontal'> <row> <cell columns='2'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-09-24 15:43:28 UTC (rev 1220) @@ -130,6 +130,13 @@ } @Override + protected void onModelRowsChanged(List<BenthosFrequencyRowModel> rows) { + super.onModelRowsChanged(rows); + + recomputeTotalNumberAndWeight(); + } + + @Override protected void onRowModified(int rowIndex, BenthosFrequencyRowModel row, String propertyName, @@ -153,27 +160,14 @@ } - List<BenthosFrequencyRowModel> rows = model.getRows(); - Integer totalNumber = 0; - Float totalWeight = 0f; - for (BenthosFrequencyRowModel r : rows) { - if (recomputeAllRows) { + if (recomputeAllRows) { + for (BenthosFrequencyRowModel r : model.getRows()) { recomputeRowValidState(r); } - if (r.isValid()) { - Integer number = r.getNumber(); - if (number != null) { - totalNumber += number; - } - Float weight = r.getWeight(); - if (weight != null) { - totalWeight += weight; - } - } } - model.setTotalNumber(totalNumber); - model.setTotalWeight(totalWeight); + recomputeTotalNumberAndWeight(); + if (!recomputeAllRows) { recomputeRowValidState(row); } @@ -615,6 +609,12 @@ model.setBatch(speciesBatch); } + public void reset() { + + // remove all frequencies + getModel().setRows(Lists.<BenthosFrequencyRowModel>newArrayList()); + } + public void saveAndClose() { if (log.isDebugEnabled()) { @@ -699,4 +699,24 @@ //-- Internal methods --// //------------------------------------------------------------------------// + protected void recomputeTotalNumberAndWeight() { + BenthosFrequencyUIModel model = getModel(); + List<BenthosFrequencyRowModel> rows = model.getRows(); + Integer totalNumber = 0; + Float totalWeight = 0f; + for (BenthosFrequencyRowModel r : rows) { + if (r.isValid()) { + Integer number = r.getNumber(); + if (number != null) { + totalNumber += number; + } + Float weight = r.getWeight(); + if (weight != null) { + totalWeight += weight; + } + } + } + model.setTotalNumber(totalNumber); + model.setTotalWeight(totalWeight); + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-09-24 15:43:28 UTC (rev 1220) @@ -679,7 +679,8 @@ // update speciesUsed addToSpeciesUsed(newRow); - if (batchRootRowModel.getSelectedCategory() != null) { + if (batchRootRowModel.getBatchCount() == null && + batchRootRowModel.getSelectedCategory() != null) { // add first category splitBatch(batchRootRowModel.getSelectedCategory(), Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css 2013-09-24 15:43:28 UTC (rev 1220) @@ -79,7 +79,6 @@ property: batchWeight; model: {model.getBatchWeight()}; useFloat: true; - /*numberPattern: {DECIMAL3_PATTERN};*/ bean: {model}; } @@ -112,6 +111,7 @@ showReset: false; selectedItem: {model.getSelectedCategory()}; data: {model.getCategory()}; + enabled: {model.getBatchCount() == null}; } #sampleWeightLabel { @@ -133,7 +133,7 @@ selectionBackground: {null}; selectionForeground: {Color.BLACK}; sortable: false; - enabled: {model.getSelectedCategory() != null} + enabled: {model.getSelectedCategory() != null && model.getBatchCount() == null}; } #addSpeciesButton { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jaxx 2013-09-24 15:43:28 UTC (rev 1220) @@ -67,8 +67,7 @@ <BeanValidator id='validator' bean='model' uiClass='jaxx.runtime.validator.swing.ui.ImageValidationUI'> <field name='species' component='speciesComboBox'/> - <field name='sampleCategory' - component='sampleCategoryComboBox'/> + <field name='sampleCategory' component='sampleCategoryComboBox'/> <field name='batchWeight' component='batchWeightField'/> <field name='batchCount' component='batchCountField'/> <field name='selectedCategory' component='categoryComboBox'/> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.css 2013-09-24 15:43:28 UTC (rev 1220) @@ -296,3 +296,11 @@ _help: {"tutti.editSpeciesFrequencies.action.saveAndClose.help"}; } +#resetButton { + actionIcon: reset; + text: "tutti.editSpeciesFrequencies.action.reset"; + toolTipText: "tutti.editSpeciesFrequencies.action.reset.tip"; + i18nMnemonic: "tutti.editSpeciesFrequencies.action.reset.mnemonic"; + _help: {"tutti.editSpeciesFrequencies.action.reset.help"}; +} + Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx 2013-09-24 15:43:28 UTC (rev 1220) @@ -205,9 +205,15 @@ </JPanel> <JPanel id='dataFieldPanel' constraints='BorderLayout.CENTER'> - <JScrollPane id='tableScrollPane' constraints='"lengthCaracteristicPmfm"'> - <JXTable id='table'/> - </JScrollPane> + <JPanel constraints='"lengthCaracteristicPmfm"' + layout='{new BorderLayout()}'> + <JScrollPane id='tableScrollPane' constraints='BorderLayout.CENTER'> + <JXTable id='table'/> + </JScrollPane> + <JButton id='resetButton' onActionPerformed='handler.reset()' + constraints='BorderLayout.SOUTH'/> + </JPanel> + <Table constraints='"noLengthCaracteristicPmfm"' fill='horizontal'> <row> <cell columns='2'> Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-09-24 15:43:28 UTC (rev 1220) @@ -130,6 +130,13 @@ } @Override + protected void onModelRowsChanged(List<SpeciesFrequencyRowModel> rows) { + super.onModelRowsChanged(rows); + + recomputeTotalNumberAndWeight(); + } + + @Override protected void onRowModified(int rowIndex, SpeciesFrequencyRowModel row, String propertyName, @@ -152,27 +159,14 @@ recomputeAllRows = withWeightRows.isEmpty(); } - List<SpeciesFrequencyRowModel> rows = model.getRows(); - Integer totalNumber = 0; - Float totalWeight = 0f; - for (SpeciesFrequencyRowModel r : rows) { - if (recomputeAllRows) { + if (recomputeAllRows) { + for (SpeciesFrequencyRowModel r : model.getRows()) { recomputeRowValidState(r); } - if (r.isValid()) { - Integer number = r.getNumber(); - if (number != null) { - totalNumber += number; - } - Float weight = r.getWeight(); - if (weight != null) { - totalWeight += weight; - } - } } - model.setTotalNumber(totalNumber); - model.setTotalWeight(totalWeight); + recomputeTotalNumberAndWeight(); + if (!recomputeAllRows) { recomputeRowValidState(row); } @@ -438,8 +432,8 @@ public void applyRafaleStep(Float step) { - if (log.isInfoEnabled()) { - log.info("Will apply rafale step: " + step); + if (log.isDebugEnabled()) { + log.debug("Will apply rafale step: " + step); } SpeciesFrequencyUIModel model = getModel(); SpeciesFrequencyTableModel tableModel = getTableModel(); @@ -614,6 +608,12 @@ model.setBatch(speciesBatch); } + public void reset() { + + // remove all frequencies + getModel().setRows(Lists.<SpeciesFrequencyRowModel>newArrayList()); + } + public void saveAndClose() { if (log.isDebugEnabled()) { @@ -698,4 +698,24 @@ //-- Internal methods --// //------------------------------------------------------------------------// + protected void recomputeTotalNumberAndWeight() { + SpeciesFrequencyUIModel model = getModel(); + List<SpeciesFrequencyRowModel> rows = model.getRows(); + Integer totalNumber = 0; + Float totalWeight = 0f; + for (SpeciesFrequencyRowModel r : rows) { + if (r.isValid()) { + Integer number = r.getNumber(); + if (number != null) { + totalNumber += number; + } + Float weight = r.getWeight(); + if (weight != null) { + totalWeight += weight; + } + } + } + model.setTotalNumber(totalNumber); + model.setTotalWeight(totalWeight); + } } Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel-error-validation.xml 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIModel-error-validation.xml 2013-09-24 15:43:28 UTC (rev 1220) @@ -69,28 +69,15 @@ </message> </field-validator> - </field> - - <field name="batchCount"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ batchCount == null || !categoryIsFilled ]]> + <![CDATA[ batchCount != null || sampleWeight == null || batchWeight == null || sampleWeight <= batchWeight]]> </param> <message> - tutti.validator.error.createSpeciesBatch.countAndCategories.notPossible + tutti.validator.error.splitSpeciesBatch.sampleWeight.sampleBatchGreaterThanBatchWeight </message> </field-validator> - </field> - <field name="selectedCategory"> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ batchCount == null || !categoryIsFilled ]]> - </param> - <message> - tutti.validator.error.createSpeciesBatch.countAndCategories.notPossible - </message> - </field-validator> </field> <field name="sampleWeight"> @@ -105,7 +92,8 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ sampleWeight == null || batchWeight == null || sampleWeight <= batchWeight]]></param> + <![CDATA[ batchCount != null || sampleWeight == null || batchWeight == null || sampleWeight <= batchWeight]]> + </param> <message> tutti.validator.error.splitSpeciesBatch.sampleWeight.sampleBatchGreaterThanBatchWeight </message> Modified: trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel-error-validation.xml =================================================================== --- trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel-error-validation.xml 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/resources/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIModel-error-validation.xml 2013-09-24 15:43:28 UTC (rev 1220) @@ -68,28 +68,15 @@ </message> </field-validator> - </field> - - <field name="batchCount"> <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ batchCount == null || !categoryIsFilled ]]> + <![CDATA[ batchCount != null || sampleWeight == null || batchWeight == null || sampleWeight <= batchWeight]]> </param> <message> - tutti.validator.error.createSpeciesBatch.countAndCategories.notPossible + tutti.validator.error.splitSpeciesBatch.sampleWeight.sampleBatchGreaterThanBatchWeight </message> </field-validator> - </field> - <field name="selectedCategory"> - <field-validator type="fieldexpression" short-circuit="true"> - <param name="expression"> - <![CDATA[ batchCount == null || !categoryIsFilled ]]> - </param> - <message> - tutti.validator.error.createSpeciesBatch.countAndCategories.notPossible - </message> - </field-validator> </field> <field name="sampleWeight"> @@ -104,7 +91,8 @@ <field-validator type="fieldexpression" short-circuit="true"> <param name="expression"> - <![CDATA[ sampleWeight == null || batchWeight == null || sampleWeight <= batchWeight]]></param> + <![CDATA[ batchCount != null || sampleWeight == null || batchWeight == null || sampleWeight <= batchWeight]]> + </param> <message> tutti.validator.error.splitSpeciesBatch.sampleWeight.sampleBatchGreaterThanBatchWeight </message> Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-09-24 15:43:28 UTC (rev 1220) @@ -251,6 +251,7 @@ tutti.createSpeciesBatch.field.sampleWeight.tip= tutti.createSpeciesBatch.field.species= tutti.createSpeciesBatch.field.species.tip= +tutti.createSpeciesBatch.message.countOrCategorize= tutti.createSpeciesBatch.title= tutti.createSpeciesMelag.action.cancel= tutti.createSpeciesMelag.action.cancel.mnemonic= @@ -948,6 +949,9 @@ tutti.editSpeciesFrequencies.action.generate= tutti.editSpeciesFrequencies.action.generate.mnemonic= tutti.editSpeciesFrequencies.action.generate.tip= +tutti.editSpeciesFrequencies.action.reset= +tutti.editSpeciesFrequencies.action.reset.mnemonic= +tutti.editSpeciesFrequencies.action.reset.tip= tutti.editSpeciesFrequencies.action.saveAndClose= tutti.editSpeciesFrequencies.action.saveAndClose.mnemonic= tutti.editSpeciesFrequencies.action.saveAndClose.tip= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-24 13:30:43 UTC (rev 1219) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-24 15:43:28 UTC (rev 1220) @@ -433,7 +433,7 @@ tutti.editBenthosFrequencies.action.saveAndClose.mnemonic=F tutti.editBenthosFrequencies.action.saveAndClose.tip=Enregistrer les mensurations tutti.editBenthosFrequencies.action.saveAndContinue=Enregistrer et Continuer -tutti.editBenthosFrequencies.action.saveAndContinue.mnemonic=E +tutti.editBenthosFrequencies.action.saveAndContinue.mnemonic=C tutti.editBenthosFrequencies.action.saveAndContinue.tip=Enregistrer les mensurations et saisir les mensurations pour le lot suivant tutti.editBenthosFrequencies.error.length.doublon=La classe de taille <strong>%s</strong> est utilisée plusieurs fois (deuxième occurrence trouvée à la ligne <strong>%s</strong>), ce qui n'est pas autorisé.<hr/>Veuillez corriger cela pour pouvoir enregistrer les mensurations. tutti.editBenthosFrequencies.field.lengthStepCaracteristic=Type de mesure @@ -948,11 +948,17 @@ tutti.editSpeciesFrequencies.action.generate=Générer tutti.editSpeciesFrequencies.action.generate.mnemonic=G tutti.editSpeciesFrequencies.action.generate.tip=Générer les mensurations +tutti.editSpeciesFrequencies.action.reset=Réinitialiser +tutti.editSpeciesFrequencies.action.reset.mnemonic=R +tutti.editSpeciesFrequencies.action.reset.tip=Supprimer toutes les mensurations saisies +tutti.editBenthosFrequencies.action.reset=Réinitialiser +tutti.editbenthosFrequencies.action.reset.mnemonic=R +tutti.editBenthosFrequencies.action.reset.tip=Supprimer toutes les mensurations saisies tutti.editSpeciesFrequencies.action.saveAndClose=Enregistrer et Fermer tutti.editSpeciesFrequencies.action.saveAndClose.mnemonic=F tutti.editSpeciesFrequencies.action.saveAndClose.tip=Enregistrer les mensurations tutti.editSpeciesFrequencies.action.saveAndContinue=Enregistrer et Continuer -tutti.editSpeciesFrequencies.action.saveAndContinue.mnemonic=E +tutti.editSpeciesFrequencies.action.saveAndContinue.mnemonic=C tutti.editSpeciesFrequencies.action.saveAndContinue.tip=Enregistrer les mensurations et saisir les mensurations pour le lot suivant tutti.editSpeciesFrequencies.error.length.doublon=La classe de taille <strong>%s</strong> est utilisée plusieurs fois (deuxième occurrence trouvée à la ligne <strong>%s</strong>), ce qui n'est pas autorisé.<hr/>Veuillez corriger cela pour pouvoir enregistrer les mensurations. tutti.editSpeciesFrequencies.field.lengthStepCaracteristic=Type de mesure