September 2013 - Tutti-commits - mailman.cloud.codelutin.com

r1220 - in trunk: . tutti-ui-swing/src/main/filtered-resources tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/conte
by tchemit＠users.forge.codelutin.com Sept. 24, 2013

Sept. 24, 2013

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

1 0

Sept. 24, 2013

Author: tchemit Date: 2013-09-24 15:30:43 +0200 (Tue, 24 Sep 2013) New Revision: 1219 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1219 Log: fixes #3312: [CAPTURES] - Ajouter une d?\195?\169cimale aux poids (4 d?\195?\169cimales pour les poids en kg et une d?\195?\169cimale pour les grammes) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css 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/CreateBenthosBatchUIHandler.java 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/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 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/CreateSpeciesBatchUIHandler.java 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/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WeightUnit.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-09-24 13:30:43 UTC (rev 1219) @@ -28,7 +28,7 @@ bean: {model}; showReset: true; useFloat: true; - numberPattern: {DECIMAL3_PATTERN}; + /*numberPattern: {DECIMAL3_PATTERN};*/ _selectOnFocus: {true}; } @@ -37,8 +37,8 @@ showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; useFloat: true; - numberPattern: {DECIMAL3_PATTERN}; - decimalNumber: 3; + /*numberPattern: {DECIMAL3_PATTERN}; + decimalNumber: 3;*/ computedDataColor: {handler.getConfig().getColorComputedWeights()}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/SampleCategoryComponent.java 2013-09-24 13:30:43 UTC (rev 1219) @@ -26,6 +26,7 @@ import fr.ifremer.tutti.persistence.entities.data.SampleCategory; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.WeightUnit; import jaxx.runtime.JAXXUtil; import jaxx.runtime.swing.editor.NumberEditor; import org.nuiton.decorator.Decorator; @@ -63,8 +64,9 @@ return new SampleCategoryRenderer<C>(renderer, decorator, computedDataColor); } - public static <C extends Serializable> TableCellEditor newEditor(Decorator<C> decorator) { - return new SampleCategoryEditor<C>(decorator); + public static <C extends Serializable> TableCellEditor newEditor(Decorator<C> decorator, + WeightUnit weightUnit) { + return new SampleCategoryEditor<C>(decorator, weightUnit); } /** @@ -86,7 +88,7 @@ protected final Decorator<C> categoryDecorator; - public SampleCategoryEditor(Decorator<C> categoryDecorator) { + public SampleCategoryEditor(Decorator<C> categoryDecorator, WeightUnit weightUnit) { this.categoryDecorator = categoryDecorator; numberEditor = new NumberEditor(); numberEditor.getTextField().setHorizontalAlignment(SwingConstants.RIGHT); @@ -95,6 +97,7 @@ numberEditor.getTextField().addAncestorListener(this); numberEditor.setModelType(Float.class); numberEditor.setUseSign(false); + numberEditor.setNumberPattern(weightUnit.getNumberEditorPattern()); numberEditor.init(); editor = new JPanel(new BorderLayout()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css 2013-09-24 13:30:43 UTC (rev 1219) @@ -39,6 +39,17 @@ borderPainted: false; } +#tablePopup { + label: "tutti.editAccidentalBatch.title.batchActions"; +} + +#table { + selectionMode: {ListSelectionModel.SINGLE_SELECTION}; + selectionBackground: {null}; + selectionForeground: {Color.BLACK}; + sortable: false; +} + #importMultiPostButton { actionIcon: import; text: "tutti.editAccidentalBatch.action.importMultiPost"; @@ -57,17 +68,6 @@ _help: {"tutti.editAccidentalBatch.action.exportMultiPost.help"}; } -#tablePopup { - label: "tutti.editAccidentalBatch.title.batchActions"; -} - -#table { - selectionMode: {ListSelectionModel.SINGLE_SELECTION}; - selectionBackground: {null}; - selectionForeground: {Color.BLACK}; - sortable: false; -} - #createAccidentalBatchButton { actionIcon: batch-create; text: "tutti.editAccidentalBatch.action.createBatch"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java 2013-09-24 13:30:43 UTC (rev 1219) @@ -262,7 +262,6 @@ table.addHighlighter(commentHighlighter); // paint in a special color for attachment cell (when some attachments) - Highlighter attachmentHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( new HighlightPredicate.AndHighlightPredicate( new HighlightPredicate.IdentifierHighlightPredicate(AccidentalBatchTableModel.ATTACHMENT), @@ -344,7 +343,6 @@ addFloatColumnToModel(columnModel, AccidentalBatchTableModel.WEIGHT, - TuttiUI.DECIMAL3_PATTERN, weightUnit); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css 2013-09-24 13:30:43 UTC (rev 1219) @@ -70,7 +70,6 @@ #accidentalWeightField { property: weight; useFloat: true; - numberPattern: {DECIMAL3_PATTERN}; bean: {model}; model: {model.getWeight()}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css 2013-09-24 13:30:43 UTC (rev 1219) @@ -28,7 +28,7 @@ bean: {model}; showReset: true; useFloat: true; - numberPattern: {DECIMAL3_PATTERN}; + /*numberPattern: {DECIMAL3_PATTERN};*/ _selectOnFocus: {true}; } @@ -37,8 +37,8 @@ showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; useFloat: true; - numberPattern: {DECIMAL3_PATTERN}; - decimalNumber: 3; + /*numberPattern: {DECIMAL3_PATTERN}; + decimalNumber: 3;*/ computedDataColor: {handler.getConfig().getColorComputedWeights()}; } 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 11:19:17 UTC (rev 1218) +++ 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) @@ -117,6 +117,11 @@ protected ValidationService validationService = getContext().getValidationService(); + /** + * Sample categories model. + * + * @since 2.4 + */ protected final SampleCategoryModel sampleCategoryModel; /** @@ -266,7 +271,7 @@ List<BenthosBatchFrequency> frequencies = BenthosFrequencyRowModel.toEntity( row.getFrequency(), - batch); + batch); result = TuttiProtocols.isBenthosBatchValid( getDataContext().getProtocol(), batch, @@ -453,7 +458,6 @@ table.addHighlighter(commentHighlighter); // paint in a special color for attachment cell (when some attachments) - Highlighter attachmentHighlighter = TuttiUIUtil.newBackgroundColorHighlighter( new HighlightPredicate.AndHighlightPredicate( new HighlightPredicate.IdentifierHighlightPredicate(BenthosBatchTableModel.ATTACHMENT), @@ -554,9 +558,9 @@ addColumnToModel(columnModel, TuttiComputedOrNotDataTableCell.newEditor( - Float.class, false, true, 3, computedDataColor), + Float.class, weightUnit, computedDataColor), TuttiComputedOrNotDataTableCell.newRender( - defaultRenderer, true, 3, computedDataColor), + defaultRenderer, weightUnit, computedDataColor), BenthosBatchTableModel.WEIGHT, weightUnit); } @@ -891,7 +895,7 @@ List<BenthosBatchFrequency> frequency = BenthosFrequencyRowModel.toEntity( frequencyRows, - entityToSave); + entityToSave); if (log.isInfoEnabled()) { log.info("Will save " + frequency.size() + " frequencies."); @@ -1151,7 +1155,7 @@ WeightUnit weightUnit) { addColumnToModel( columnModel, - SampleCategoryComponent.newEditor(decorator), + SampleCategoryComponent.newEditor(decorator, weightUnit), SampleCategoryComponent.newRender(defaultRenderer, decorator, getConfig().getColorComputedWeights()), 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 11:19:17 UTC (rev 1218) +++ 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) @@ -79,7 +79,7 @@ property: batchWeight; model: {model.getBatchWeight()}; useFloat: true; - numberPattern: {DECIMAL3_PATTERN}; + /*numberPattern: {DECIMAL3_PATTERN};*/ bean: {model}; } @@ -93,7 +93,7 @@ #batchCountField { property: batchCount; model: {model.getBatchCount()}; - useFloat: true; + useFloat: false; numberPattern: {INT_6_DIGITS_PATTERN}; bean: {model}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-09-24 13:30:43 UTC (rev 1219) @@ -46,6 +46,7 @@ import fr.ifremer.tutti.ui.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import fr.ifremer.tutti.ui.swing.util.WeightUnit; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; @@ -76,10 +77,27 @@ private final TuttiPersistence persistenceService; - private final CaracteristicQualitativeValue sortedValue; + /** + * Qualitative value for the Vrac. + * + * @since 2.5 + */ + protected final CaracteristicQualitativeValue sortedValue; - private SampleCategoryModel sampleCategoryModel; + /** + * Sample categories model. + * + * @since 2.4 + */ + protected final SampleCategoryModel sampleCategoryModel; + /** + * Weight unit. + * + * @since 2.6 + */ + protected final WeightUnit weightUnit; + public CreateBenthosBatchUIHandler(TuttiUI parentUi, CreateBenthosBatchUI ui) { super(parentUi.getHandler().getContext(), ui, @@ -87,7 +105,7 @@ SplitBenthosBatchRowModel.PROPERTY_CATEGORY_VALUE, SplitBenthosBatchRowModel.PROPERTY_WEIGHT); this.persistenceService = context.getPersistenceService(); - + this.weightUnit = getConfig().getBenthosWeightUnit(); this.sampleCategoryModel = getDataContext().getSampleCategoryModel(); SampleCategoryModelEntry caracteristic = sampleCategoryModel.getCategoryById(sampleCategoryModel.getFirstCategoryId()); @@ -515,8 +533,7 @@ addFloatColumnToModel(columnModel, SplitBenthosBatchTableModel.WEIGHT, - TuttiUI.DECIMAL3_PATTERN, - getConfig().getBenthosWeightUnit()); + weightUnit); } } 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 11:19:17 UTC (rev 1218) +++ 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) @@ -177,33 +177,6 @@ enabled: false; } -#autoGenModeButton { - text: "tutti.editBenthosFrequencies.field.mode.autoGen"; - toolTipText: "tutti.editBenthosFrequencies.field.mode.autoGen.tip"; - value: "autoGenMode"; - selected: {model.isAutoGenMode()}; - buttonGroup: "mode"; - _help: {"tutti.editBenthosFrequencies.field.mode.autoGen.help"}; -} - -#rafaleModeButton { - text: "tutti.editBenthosFrequencies.field.mode.rafale"; - toolTipText: "tutti.editBenthosFrequencies.field.mode.rafale.tip"; - value: "rafaleMode"; - selected: {model.isRafaleMode()}; - buttonGroup: "mode"; - _help: {"tutti.editBenthosFrequencies.field.mode.rafale.help"}; -} - -#simpleCountingModeButton { - text: "tutti.editBenthosFrequencies.field.mode.simpleCounting"; - toolTipText: "tutti.editBenthosFrequencies.field.mode.simpleCounting.tip"; - value: "simpleCountingMode"; - selected: {model.isSimpleCountingMode()}; - buttonGroup: "mode"; - _help: {"tutti.editBenthosFrequencies.field.mode.simpleCounting.help"}; -} - #simpleCountingModeLabel { text: "tutti.editBenthosFrequencies.label.no.configuration"; horizontalAlignment: {JLabel.CENTER}; @@ -250,6 +223,44 @@ bean: {model}; } +#dataInFrequenciesWarningContainer { + background: {new java.awt.Color(245, 218, 88)}; + visible: {(model.getRowsInError().size() + model.getEmptyRows().size()) != model.getRows().size()}; +} + +#dataInFrequenciesWarning { + actionIcon: warning; + border: {new javax.swing.border.EmptyBorder(5, 10, 5, 10)}; + text: "tutti.editBenthosFrequencies.simpleCountingAndFrequencies"; +} + +#autoGenModeButton { + text: "tutti.editBenthosFrequencies.field.mode.autoGen"; + toolTipText: "tutti.editBenthosFrequencies.field.mode.autoGen.tip"; + value: "autoGenMode"; + selected: {model.isAutoGenMode()}; + buttonGroup: "mode"; + _help: {"tutti.editBenthosFrequencies.field.mode.autoGen.help"}; +} + +#rafaleModeButton { + text: "tutti.editBenthosFrequencies.field.mode.rafale"; + toolTipText: "tutti.editBenthosFrequencies.field.mode.rafale.tip"; + value: "rafaleMode"; + selected: {model.isRafaleMode()}; + buttonGroup: "mode"; + _help: {"tutti.editBenthosFrequencies.field.mode.rafale.help"}; +} + +#simpleCountingModeButton { + text: "tutti.editBenthosFrequencies.field.mode.simpleCounting"; + toolTipText: "tutti.editBenthosFrequencies.field.mode.simpleCounting.tip"; + value: "simpleCountingMode"; + selected: {model.isSimpleCountingMode()}; + buttonGroup: "mode"; + _help: {"tutti.editBenthosFrequencies.field.mode.simpleCounting.help"}; +} + #generateButton { actionIcon: generate; text: "tutti.editBenthosFrequencies.action.generate"; @@ -284,14 +295,3 @@ enabled: {model.isValid()}; _help: {"tutti.editBenthosFrequencies.action.saveAndClose.help"}; } - -#dataInFrequenciesWarningContainer { - background: {new java.awt.Color(245, 218, 88)}; - visible: {(model.getRowsInError().size() + model.getEmptyRows().size()) != model.getRows().size()}; -} - -#dataInFrequenciesWarning { - actionIcon: warning; - border: {new javax.swing.border.EmptyBorder(5, 10, 5, 10)}; - text: "tutti.editBenthosFrequencies.simpleCountingAndFrequencies"; -} 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 11:19:17 UTC (rev 1218) +++ 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) @@ -324,7 +324,6 @@ addFloatColumnToModel(columnModel, BenthosFrequencyTableModel.WEIGHT, - TuttiUI.DECIMAL3_PATTERN, weightUnit); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/split/SplitBenthosBatchUIHandler.java 2013-09-24 13:30:43 UTC (rev 1219) @@ -390,7 +390,6 @@ addFloatColumnToModel(columnModel, SplitBenthosBatchTableModel.WEIGHT, - TuttiUI.DECIMAL3_PATTERN, getConfig().getBenthosWeightUnit()); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java 2013-09-24 13:30:43 UTC (rev 1219) @@ -360,7 +360,6 @@ addFloatColumnToModel(columnModel, IndividualObservationBatchTableModel.WEIGHT, - TuttiUI.DECIMAL3_PATTERN, weightUnit); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css 2013-09-24 13:30:43 UTC (rev 1219) @@ -28,6 +28,8 @@ NumberEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; + bean: {model}; + useFloat: true; showReset: true; } @@ -57,10 +59,8 @@ #individualObservationWeightField { property: weight; - useFloat: true; - numberPattern: {DECIMAL3_PATTERN}; - bean: {model}; model: {model.getWeight()}; + /*numberPattern: {DECIMAL3_PATTERN};*/ } #individualObservationSizeLabel { @@ -72,10 +72,8 @@ #individualObservationSizeField { property: size; - useFloat: true; - numberPattern: {DECIMAL3_PATTERN}; - bean: {model}; model: {model.getSize()}; + /*numberPattern: {DECIMAL3_PATTERN};*/ } #individualObservationLengthStepCaracteristicLabel { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css 2013-09-24 13:30:43 UTC (rev 1219) @@ -27,8 +27,8 @@ showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; useFloat: true; - numberPattern: {DECIMAL3_PATTERN}; - decimalNumber: 3; + /*numberPattern: {DECIMAL3_PATTERN}; + decimalNumber: 3;*/ computedDataColor: {handler.getConfig().getColorComputedWeights()}; } @@ -42,24 +42,6 @@ borderPainted: false; } -#importMultiPostButton { - actionIcon: import; - text: "tutti.editMarineLitterBatch.action.importMultiPost"; - toolTipText: "tutti.editMarineLitterBatch.action.importMultiPost.tip"; - i18nMnemonic: "tutti.editMarineLitterBatch.action.importMultiPost.mnemonic"; - _tuttiAction: {ImportMultiPostAction.class}; - _help: {"tutti.editMarineLitterBatch.action.importMultiPost.help"}; -} - -#exportMultiPostButton { - actionIcon: export; - text: "tutti.editMarineLitterBatch.action.exportMultiPost"; - toolTipText: "tutti.editMarineLitterBatch.action.exportMultiPost.tip"; - i18nMnemonic: "tutti.editMarineLitterBatch.action.exportMultiPost.mnemonic"; - _tuttiAction: {ExportMultiPostAction.class}; - _help: {"tutti.editMarineLitterBatch.action.exportMultiPost.help"}; -} - #marineLitterTotalWeightLabel { text: "tutti.editMarineLitterBatch.field.marineLitterTotalWeight"; toolTipText: "tutti.editMarineLitterBatch.field.marineLitterTotalWeight.tip"; @@ -84,6 +66,24 @@ sortable: false; } +#importMultiPostButton { + actionIcon: import; + text: "tutti.editMarineLitterBatch.action.importMultiPost"; + toolTipText: "tutti.editMarineLitterBatch.action.importMultiPost.tip"; + i18nMnemonic: "tutti.editMarineLitterBatch.action.importMultiPost.mnemonic"; + _tuttiAction: {ImportMultiPostAction.class}; + _help: {"tutti.editMarineLitterBatch.action.importMultiPost.help"}; +} + +#exportMultiPostButton { + actionIcon: export; + text: "tutti.editMarineLitterBatch.action.exportMultiPost"; + toolTipText: "tutti.editMarineLitterBatch.action.exportMultiPost.tip"; + i18nMnemonic: "tutti.editMarineLitterBatch.action.exportMultiPost.mnemonic"; + _tuttiAction: {ExportMultiPostAction.class}; + _help: {"tutti.editMarineLitterBatch.action.exportMultiPost.help"}; +} + #createMarineLitterBatchButton { actionIcon: batch-create; text: "tutti.editMarineLitterBatch.action.createBatch"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java 2013-09-24 13:30:43 UTC (rev 1219) @@ -348,7 +348,6 @@ addFloatColumnToModel(columnModel, MarineLitterBatchTableModel.WEIGHT, - TuttiUI.DECIMAL3_PATTERN, weightUnit); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css 2013-09-24 13:30:43 UTC (rev 1219) @@ -30,8 +30,9 @@ NumberEditor { autoPopup: {handler.getConfig().isAutoPopupNumberEditor()}; showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; - showReset: true; bean: {model}; + showReset: true; + useFloat: true; } #createMarineLitterBatchTopPanel { @@ -72,7 +73,6 @@ #marineLitterNumberField { property: number; model: {model.getNumber()}; - useFloat: true; numberPattern: {DECIMAL3_PATTERN}; } @@ -87,8 +87,7 @@ #marineLitterWeightField { property: weight; model: {model.getWeight()}; - useFloat: true; - numberPattern: {DECIMAL3_PATTERN}; + /*numberPattern: {DECIMAL3_PATTERN};*/ } #saveAndContinueButton { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css 2013-09-24 13:30:43 UTC (rev 1219) @@ -28,7 +28,7 @@ bean: {model}; showReset: true; useFloat: true; - numberPattern: {DECIMAL3_PATTERN}; + /*numberPattern: {DECIMAL3_PATTERN};*/ _selectOnFocus: {true}; } @@ -37,8 +37,8 @@ showPopupButton: {handler.getConfig().isShowNumberEditorButton()}; showReset: true; useFloat: true; - numberPattern: {DECIMAL3_PATTERN}; - decimalNumber: 3; + /*numberPattern: {DECIMAL3_PATTERN}; + decimalNumber: 3;*/ computedDataColor: {handler.getConfig().getColorComputedWeights()}; } @@ -52,33 +52,6 @@ borderPainted: false; } -#importPupitriButton { - actionIcon: pupitri-import; - text: "tutti.editSpeciesBatch.action.importPupitri"; - toolTipText: "tutti.editSpeciesBatch.action.importPupitri.tip"; - i18nMnemonic: "tutti.editSpeciesBatch.action.importPupitri.mnemonic"; - _tuttiAction: {ImportPupitriAction.class}; - _help: {"tutti.editSpeciesBatch.action.importPupitri.help"}; -} - -#importMultiPostButton { - actionIcon: import; - text: "tutti.editSpeciesBatch.action.importMultiPost"; - toolTipText: "tutti.editSpeciesBatch.action.importMultiPost.tip"; - i18nMnemonic: "tutti.editSpeciesBatch.action.importMultiPost.mnemonic"; - _tuttiAction: {ImportMultiPostAction.class}; - _help: {"tutti.editSpeciesBatch.action.importMultiPost.help"}; -} - -#exportMultiPostButton { - actionIcon: export; - text: "tutti.editSpeciesBatch.action.exportMultiPost"; - toolTipText: "tutti.editSpeciesBatch.action.exportMultiPost.tip"; - i18nMnemonic: "tutti.editSpeciesBatch.action.exportMultiPost.mnemonic"; - _tuttiAction: {ExportMultiPostAction.class}; - _help: {"tutti.editSpeciesBatch.action.exportMultiPost.help"}; -} - #speciesTotalWeightLabel { text: "tutti.editSpeciesBatch.field.speciesTotalWeight"; toolTipText: "tutti.editSpeciesBatch.field.speciesTotalWeight.tip"; @@ -180,30 +153,6 @@ _help: {"tutti.editSpeciesBatch.filterSpeciesBatch.help"}; } -#filterSpeciesBatchAllButton { - text: "tutti.editSpeciesBatch.filterBatch.mode.all"; - toolTipText: "tutti.editSpeciesBatch.filterBatch.mode.all.tip"; - value: "all"; - selected: {model.isTableViewModeAll()}; - buttonGroup: "filterSpeciesBatchMode"; -} - -#filterSpeciesBatchLeafButton { - text: "tutti.editSpeciesBatch.filterBatch.mode.leaf"; - toolTipText: "tutti.editSpeciesBatch.filterBatch.mode.leaf.tip"; - value: "leaf"; - selected: {model.isTableViewModeLeaf()}; - buttonGroup: "filterSpeciesBatchMode"; -} - -#filterSpeciesBatchRootButton { - text: {handler.getFilterSpeciesBatchRootButtonText(model.getRootNumber())}; - toolTipText: "tutti.editSpeciesBatch.filterBatch.mode.root.tip"; - value: "root"; - selected: {model.isTableViewModeRoot()}; - buttonGroup: "filterSpeciesBatchMode"; -} - #splitSpeciesBatchMenu { actionIcon: batch-split; text: "tutti.editSpeciesBatch.action.splitBatch"; @@ -253,6 +202,66 @@ _help: {"tutti.editSpeciesBatch.action.createMelag.help"}; } +#editFrequenciesMenu { + actionIcon: show-frequency; + text: "tutti.editSpeciesBatch.action.editFrequencies"; + toolTipText: "tutti.editSpeciesBatch.action.editFrequencies.tip"; + i18nMnemonic: "tutti.editSpeciesBatch.action.editFrequencies.mnemonic"; + enabled: {model.isTableViewModeAll() && model.isEditFrequenciesEnabled()}; + _help: {"tutti.editSpeciesBatch.action.editFrequencies.help"}; +} + +#importPupitriButton { + actionIcon: pupitri-import; + text: "tutti.editSpeciesBatch.action.importPupitri"; + toolTipText: "tutti.editSpeciesBatch.action.importPupitri.tip"; + i18nMnemonic: "tutti.editSpeciesBatch.action.importPupitri.mnemonic"; + _tuttiAction: {ImportPupitriAction.class}; + _help: {"tutti.editSpeciesBatch.action.importPupitri.help"}; +} + +#importMultiPostButton { + actionIcon: import; + text: "tutti.editSpeciesBatch.action.importMultiPost"; + toolTipText: "tutti.editSpeciesBatch.action.importMultiPost.tip"; + i18nMnemonic: "tutti.editSpeciesBatch.action.importMultiPost.mnemonic"; + _tuttiAction: {ImportMultiPostAction.class}; + _help: {"tutti.editSpeciesBatch.action.importMultiPost.help"}; +} + +#exportMultiPostButton { + actionIcon: export; + text: "tutti.editSpeciesBatch.action.exportMultiPost"; + toolTipText: "tutti.editSpeciesBatch.action.exportMultiPost.tip"; + i18nMnemonic: "tutti.editSpeciesBatch.action.exportMultiPost.mnemonic"; + _tuttiAction: {ExportMultiPostAction.class}; + _help: {"tutti.editSpeciesBatch.action.exportMultiPost.help"}; +} + +#filterSpeciesBatchAllButton { + text: "tutti.editSpeciesBatch.filterBatch.mode.all"; + toolTipText: "tutti.editSpeciesBatch.filterBatch.mode.all.tip"; + value: "all"; + selected: {model.isTableViewModeAll()}; + buttonGroup: "filterSpeciesBatchMode"; +} + +#filterSpeciesBatchLeafButton { + text: "tutti.editSpeciesBatch.filterBatch.mode.leaf"; + toolTipText: "tutti.editSpeciesBatch.filterBatch.mode.leaf.tip"; + value: "leaf"; + selected: {model.isTableViewModeLeaf()}; + buttonGroup: "filterSpeciesBatchMode"; +} + +#filterSpeciesBatchRootButton { + text: {handler.getFilterSpeciesBatchRootButtonText(model.getRootNumber())}; + toolTipText: "tutti.editSpeciesBatch.filterBatch.mode.root.tip"; + value: "root"; + selected: {model.isTableViewModeRoot()}; + buttonGroup: "filterSpeciesBatchMode"; +} + #createSpeciesBatchButton { actionIcon: batch-create; text: "tutti.editSpeciesBatch.action.createBatch"; @@ -261,12 +270,3 @@ enabled: {model.isCreateBatchEnabled()}; _help: {"tutti.editSpeciesBatch.action.createBatch.help"}; } - -#editFrequenciesMenu { - actionIcon: show-frequency; - text: "tutti.editSpeciesBatch.action.editFrequencies"; - toolTipText: "tutti.editSpeciesBatch.action.editFrequencies.tip"; - i18nMnemonic: "tutti.editSpeciesBatch.action.editFrequencies.mnemonic"; - enabled: {model.isTableViewModeAll() && model.isEditFrequenciesEnabled()}; - _help: {"tutti.editSpeciesBatch.action.editFrequencies.help"}; -} \ No newline at end of file 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 11:19:17 UTC (rev 1218) +++ 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) @@ -117,6 +117,11 @@ protected final EditCatchesUI parentUi; + /** + * Sample categories model. + * + * @since 2.4 + */ protected final SampleCategoryModel sampleCategoryModel; /** @@ -273,7 +278,7 @@ List<SpeciesBatchFrequency> frequencies = SpeciesFrequencyRowModel.toEntity( row.getFrequency(), - batch); + batch); result = TuttiProtocols.isSpeciesBatchValid(getDataContext().getProtocol(), batch, frequencies); @@ -555,9 +560,9 @@ addColumnToModel(columnModel, TuttiComputedOrNotDataTableCell.newEditor( - Float.class, false, true, 3, computedDataColor), + Float.class, weightUnit, computedDataColor), TuttiComputedOrNotDataTableCell.newRender( - defaultRenderer, true, 3, computedDataColor), + defaultRenderer, weightUnit, computedDataColor), SpeciesBatchTableModel.WEIGHT, weightUnit); } @@ -891,7 +896,7 @@ List<SpeciesBatchFrequency> frequency = SpeciesFrequencyRowModel.toEntity( frequencyRows, - catchBean); + catchBean); if (log.isInfoEnabled()) { log.info("Will save " + frequency.size() + " frequencies."); @@ -1152,10 +1157,11 @@ WeightUnit weightUnit) { addColumnToModel( columnModel, - SampleCategoryComponent.newEditor(decorator), + SampleCategoryComponent.newEditor(decorator, weightUnit), SampleCategoryComponent.newRender(defaultRenderer, decorator, - getConfig().getColorComputedWeights()), + getConfig().getColorComputedWeights() + ), columnIdentifier, weightUnit); } 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 11:19:17 UTC (rev 1218) +++ 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) @@ -79,7 +79,7 @@ property: batchWeight; model: {model.getBatchWeight()}; useFloat: true; - numberPattern: {DECIMAL3_PATTERN}; + /*numberPattern: {DECIMAL3_PATTERN};*/ bean: {model}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-09-24 13:30:43 UTC (rev 1219) @@ -46,6 +46,7 @@ import fr.ifremer.tutti.ui.swing.util.Cancelable; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; import fr.ifremer.tutti.ui.swing.util.TuttiUI; +import fr.ifremer.tutti.ui.swing.util.WeightUnit; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUI; import fr.ifremer.tutti.ui.swing.util.species.SelectSpeciesUIModel; import fr.ifremer.tutti.ui.swing.util.table.AbstractTuttiTableUIHandler; @@ -77,10 +78,27 @@ private final TuttiPersistence persistenceService; - private final CaracteristicQualitativeValue sortedValue; + /** + * Qualitative value for the Vrac. + * + * @since 2.5 + */ + protected final CaracteristicQualitativeValue sortedValue; - private SampleCategoryModel sampleCategoryModel; + /** + * Sample categories model. + * + * @since 2.4 + */ + protected final SampleCategoryModel sampleCategoryModel; + /** + * Weight unit. + * + * @since 2.6 + */ + protected final WeightUnit weightUnit; + public CreateSpeciesBatchUIHandler(TuttiUI parentUi, CreateSpeciesBatchUI ui) { super(parentUi.getHandler().getContext(), ui, @@ -88,7 +106,7 @@ SplitSpeciesBatchRowModel.PROPERTY_CATEGORY_VALUE, SplitSpeciesBatchRowModel.PROPERTY_WEIGHT); this.persistenceService = context.getPersistenceService(); - + this.weightUnit = getConfig().getSpeciesWeightUnit(); this.sampleCategoryModel = getDataContext().getSampleCategoryModel(); SampleCategoryModelEntry caracteristic = sampleCategoryModel.getCategoryById(sampleCategoryModel.getFirstCategoryId()); @@ -498,8 +516,7 @@ editableCategoryValue = true; addFloatColumnToModel(columnModel, SplitSpeciesBatchTableModel.EDITABLE_CATEGORY_VALUE, - TuttiUI.DECIMAL1_PATTERN, - getConfig().getSpeciesWeightUnit()); + TuttiUI.DECIMAL1_PATTERN); } if (data != null) { @@ -516,7 +533,7 @@ addFloatColumnToModel(columnModel, SplitSpeciesBatchTableModel.WEIGHT, - TuttiUI.DECIMAL3_PATTERN); + weightUnit); } } 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 11:19:17 UTC (rev 1218) +++ 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) @@ -162,48 +162,12 @@ layout: {modeConfigurationLayout}; } -#simpleModeButton { - text: "tutti.editSpeciesFrequencies.field.mode.simple"; - toolTipText: "tutti.editSpeciesFrequencies.field.mode.simple.tip"; - value: "simpleMode"; - selected: {model.isSimpleMode()}; - buttonGroup: "mode"; - _help: {"tutti.editSpeciesFrequencies.field.mode.simple.help"}; -} - #simpleModeLabel { text: "tutti.editSpeciesFrequencies.label.no.configuration"; horizontalAlignment: {JLabel.CENTER}; enabled: false; } -#autoGenModeButton { - text: "tutti.editSpeciesFrequencies.field.mode.autoGen"; - toolTipText: "tutti.editSpeciesFrequencies.field.mode.autoGen.tip"; - value: "autoGenMode"; - selected: {model.isAutoGenMode()}; - buttonGroup: "mode"; - _help: {"tutti.editSpeciesFrequencies.field.mode.autoGen.help"}; -} - -#rafaleModeButton { - text: "tutti.editSpeciesFrequencies.field.mode.rafale"; - toolTipText: "tutti.editSpeciesFrequencies.field.mode.rafale.tip"; - value: "rafaleMode"; - selected: {model.isRafaleMode()}; - buttonGroup: "mode"; - _help: {"tutti.editSpeciesFrequencies.field.mode.rafale.help"}; -} - -#simpleCountingModeButton { - text: "tutti.editSpeciesFrequencies.field.mode.simpleCounting"; - toolTipText: "tutti.editSpeciesFrequencies.field.mode.simpleCounting.tip"; - value: "simpleCountingMode"; - selected: {model.isSimpleCountingMode()}; - buttonGroup: "mode"; - _help: {"tutti.editSpeciesFrequencies.field.mode.simpleCounting.help"}; -} - #simpleCountingModeLabel { text: "tutti.editSpeciesFrequencies.label.no.configuration"; horizontalAlignment: {JLabel.CENTER}; @@ -250,6 +214,53 @@ bean: {model}; } +#dataInFrequenciesWarningContainer { + background: {new java.awt.Color(245, 218, 88)}; + visible: {(model.getRowsInError().size() + model.getEmptyRows().size()) != model.getRows().size()}; +} + +#dataInFrequenciesWarning { + actionIcon: warning; + border: {new javax.swing.border.EmptyBorder(5, 10, 5, 10)}; + text: "tutti.editSpeciesFrequencies.simpleCountingAndFrequencies"; +} + +#simpleModeButton { + text: "tutti.editSpeciesFrequencies.field.mode.simple"; + toolTipText: "tutti.editSpeciesFrequencies.field.mode.simple.tip"; + value: "simpleMode"; + selected: {model.isSimpleMode()}; + buttonGroup: "mode"; + _help: {"tutti.editSpeciesFrequencies.field.mode.simple.help"}; +} + +#autoGenModeButton { + text: "tutti.editSpeciesFrequencies.field.mode.autoGen"; + toolTipText: "tutti.editSpeciesFrequencies.field.mode.autoGen.tip"; + value: "autoGenMode"; + selected: {model.isAutoGenMode()}; + buttonGroup: "mode"; + _help: {"tutti.editSpeciesFrequencies.field.mode.autoGen.help"}; +} + +#rafaleModeButton { + text: "tutti.editSpeciesFrequencies.field.mode.rafale"; + toolTipText: "tutti.editSpeciesFrequencies.field.mode.rafale.tip"; + value: "rafaleMode"; + selected: {model.isRafaleMode()}; + buttonGroup: "mode"; + _help: {"tutti.editSpeciesFrequencies.field.mode.rafale.help"}; +} + +#simpleCountingModeButton { + text: "tutti.editSpeciesFrequencies.field.mode.simpleCounting"; + toolTipText: "tutti.editSpeciesFrequencies.field.mode.simpleCounting.tip"; + value: "simpleCountingMode"; + selected: {model.isSimpleCountingMode()}; + buttonGroup: "mode"; + _help: {"tutti.editSpeciesFrequencies.field.mode.simpleCounting.help"}; +} + #generateButton { actionIcon: generate; text: "tutti.editSpeciesFrequencies.action.generate"; @@ -285,13 +296,3 @@ _help: {"tutti.editSpeciesFrequencies.action.saveAndClose.help"}; } -#dataInFrequenciesWarningContainer { - background: {new java.awt.Color(245, 218, 88)}; - visible: {(model.getRowsInError().size() + model.getEmptyRows().size()) != model.getRows().size()}; -} - -#dataInFrequenciesWarning { - actionIcon: warning; - border: {new javax.swing.border.EmptyBorder(5, 10, 5, 10)}; - text: "tutti.editSpeciesFrequencies.simpleCountingAndFrequencies"; -} 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 11:19:17 UTC (rev 1218) +++ 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) @@ -322,7 +322,6 @@ addFloatColumnToModel(columnModel, SpeciesFrequencyTableModel.WEIGHT, - TuttiUI.DECIMAL3_PATTERN, weightUnit); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/split/SplitSpeciesBatchUIHandler.java 2013-09-24 13:30:43 UTC (rev 1219) @@ -393,7 +393,6 @@ addFloatColumnToModel(columnModel, SplitSpeciesBatchTableModel.WEIGHT, - TuttiUI.DECIMAL3_PATTERN, getConfig().getSpeciesWeightUnit()); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java 2013-09-24 13:30:43 UTC (rev 1219) @@ -39,6 +39,7 @@ import fr.ifremer.tutti.ui.swing.util.action.TuttiActionUI; import fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment; import fr.ifremer.tutti.ui.swing.util.editor.SimpleTimeEditor; +import fr.ifremer.tutti.ui.swing.util.editor.TuttiComputedOrNotDataEditor; import fr.ifremer.tutti.ui.swing.util.table.ColumnIdentifier; import jaxx.runtime.JAXXUtil; import jaxx.runtime.SwingUtil; @@ -445,6 +446,20 @@ String tip = weightUnit.decorateTip(jLabel.getToolTipText()); jLabel.setToolTipText(tip); + + Component labelFor = jLabel.getLabelFor(); + if (labelFor instanceof TuttiComputedOrNotDataEditor) { + + // set also the number of digits (4 for kg, 1 for g) + TuttiComputedOrNotDataEditor editor = (TuttiComputedOrNotDataEditor) labelFor; + editor.setNumberPattern(weightUnit.getNumberEditorPattern()); + editor.setDecimalNumber(weightUnit.getNumberDigits()); + } else if (labelFor instanceof NumberEditor) { + + // set also the number of digits (4 for kg, 1 for g) + NumberEditor editor = (NumberEditor) labelFor; + editor.setNumberPattern(weightUnit.getNumberEditorPattern()); + } } } @@ -882,16 +897,30 @@ addColumnToModel(model, editor, null, identifier, null); } +// protected <R extends AbstractTuttiBeanUIModel> void addFloatColumnToModel(TableColumnModel model, +// ColumnIdentifier<R> identifier, +// String numberPattern, +// WeightUnit weightUnit) { +// +// NumberCellEditor<Float> editor = +// JAXXWidgetUtil.newNumberTableCellEditor(Float.class, false); +// editor.getNumberEditor().setSelectAllTextOnError(true); +// editor.getNumberEditor().getTextField().setBorder(new LineBorder(Color.GRAY, 2)); +// editor.getNumberEditor().setNumberPattern(numberPattern); +// +// addColumnToModel(model, editor, null, identifier, weightUnit); +// } + protected <R extends AbstractTuttiBeanUIModel> void addFloatColumnToModel(TableColumnModel model, ColumnIdentifier<R> identifier, - String numberPattern, WeightUnit weightUnit) { + Preconditions.checkNotNull(weightUnit); NumberCellEditor<Float> editor = JAXXWidgetUtil.newNumberTableCellEditor(Float.class, false); editor.getNumberEditor().setSelectAllTextOnError(true); editor.getNumberEditor().getTextField().setBorder(new LineBorder(Color.GRAY, 2)); - editor.getNumberEditor().setNumberPattern(numberPattern); + editor.getNumberEditor().setNumberPattern(weightUnit.getNumberEditorPattern()); addColumnToModel(model, editor, null, identifier, weightUnit); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUI.java 2013-09-24 13:30:43 UTC (rev 1219) @@ -122,6 +122,14 @@ public static final String DECIMAL3_PATTERN = "\\d{0,6}(\\.\\d{0,3})?"; /** + * Pattern to use for decimal numeric values with 4 decimal digits in + * editors. + * + * @since 2.6 + */ + public static final String DECIMAL4_PATTERN = "\\d{0,6}(\\.\\d{0,4})?"; + + /** * Pattern to use for decimal numeric values with 2 digits + 3 decimal digits in * editors. * Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WeightUnit.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WeightUnit.java 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/WeightUnit.java 2013-09-24 13:30:43 UTC (rev 1219) @@ -36,7 +36,7 @@ * @since 2.5 */ public enum WeightUnit { - G(n_("tutti.common.unit.g"), n_("tutti.common.unit.short.g")) { + G(n_("tutti.common.unit.g"), n_("tutti.common.unit.short.g"), 1, TuttiUI.DECIMAL1_PATTERN) { @Override public Float fromEntity(Float weight) { return weight == null ? null : weight * 1000; @@ -47,7 +47,7 @@ return weight == null ? null : weight / 1000.0f; } }, - KG(n_("tutti.common.unit.kg"), n_("tutti.common.unit.short.kg")) { + KG(n_("tutti.common.unit.kg"), n_("tutti.common.unit.short.kg"), 4, TuttiUI.DECIMAL4_PATTERN) { @Override public Float fromEntity(Float weight) { return weight; @@ -63,9 +63,15 @@ private final String i18nKey; - WeightUnit(String i18nKey, String i18nShortKey) { + private final int numberDigits; + + private final String numberEditorPattern; + + WeightUnit(String i18nKey, String i18nShortKey, int numberDigits, String numberEditorPattern) { this.i18nKey = i18nKey; this.i18nShortKey = i18nShortKey; + this.numberDigits = numberDigits; + this.numberEditorPattern = numberEditorPattern; } public String getLabel() { @@ -76,6 +82,14 @@ return _(i18nShortKey); } + public int getNumberDigits() { + return numberDigits; + } + + public String getNumberEditorPattern() { + return numberEditorPattern; + } + /** * Transform the given {@code weight} coming from db to ui. * Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java 2013-09-24 11:19:17 UTC (rev 1218) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/editor/TuttiComputedOrNotDataTableCell.java 2013-09-24 13:30:43 UTC (rev 1219) @@ -27,6 +27,7 @@ import fr.ifremer.tutti.ui.swing.util.TuttiComputedOrNotData; import fr.ifremer.tutti.ui.swing.util.TuttiUI; import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; +import fr.ifremer.tutti.ui.swing.util.WeightUnit; import jaxx.runtime.JAXXUtil; import javax.swing.AbstractCellEditor; @@ -53,26 +54,27 @@ * @since 1.0 */ public class TuttiComputedOrNotDataTableCell extends DefaultTableCellRenderer { + private static final long serialVersionUID = 1L; public static TableCellRenderer newRender(TableCellRenderer renderer, - boolean useFloat, - Integer decimalNumber, + WeightUnit weightUnit, Color computedDataColor) { return new TuttiComputedOrNotDataTableCellRenderer(renderer, - useFloat, - decimalNumber, + true, + weightUnit.getNumberDigits(), computedDataColor); } public static TableCellEditor newEditor(Class type, - boolean useSign, - boolean useFloat, - Integer decimalNumber, + WeightUnit weightUnit, Color computedDataColor) { - return new TuttiComputedOrNotDataTableCellEditor(type, useSign, - useFloat, decimalNumber, + return new TuttiComputedOrNotDataTableCellEditor(type, + false, + true, + weightUnit.getNumberDigits(), + weightUnit.getNumberEditorPattern(), computedDataColor); } @@ -91,6 +93,7 @@ boolean useSign, boolean useFloat, Integer decimalNumber, + String numberPattern, Color computedDataColor) { numberEditor = new TuttiComputedOrNotDataEditor(); @@ -100,8 +103,8 @@ numberEditor.getTextField().addAncestorListener(this); numberEditor.getTextField().setBorder(new LineBorder(Color.GRAY, 2)); numberEditor.setSelectAllTextOnError(true); - numberEditor.setNumberPattern(TuttiUI.DECIMAL3_PATTERN); + numberEditor.setNumberPattern(numberPattern); numberEditor.setModelType(type); numberEditor.setUseSign(useSign); numberEditor.setUseFloat(useFloat); @@ -179,7 +182,7 @@ } } - public static class TuttiComputedOrNotDataTableCellRenderer<E> + public static class TuttiComputedOrNotDataTableCellRenderer implements TableCellRenderer { protected final TableCellRenderer delegate;

1 0

r1218 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches
by tchemit＠users.forge.codelutin.com Sept. 24, 2013

Sept. 24, 2013

Author: tchemit Date: 2013-09-24 13:19:17 +0200 (Tue, 24 Sep 2013) New Revision: 1218 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1218 Log: fixes #3341: [CAPTURE] manque l'unit?\195?\169 kg sur onglet R?\195?\169sum?\195?\169 boite Capture (poids total, poids total vrac etc.) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-09-23 16:25:28 UTC (rev 1217) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css 2013-09-24 11:19:17 UTC (rev 1218) @@ -90,6 +90,7 @@ labelFor: {catchTotalWeightField}; _strongStyle: true; _help: {"tutti.editCatchBatch.field.catchTotalWeight.help"}; + _addWeightUnit: {model.getCatchWeightUnit()}; } #catchTotalSortedWeightPanel { @@ -106,6 +107,7 @@ toolTipText: {"tutti.editCatchBatch.field.catchTotalSortedWeight.tip"}; labelFor: {catchTotalSortedWeightField}; _help: {"tutti.editCatchBatch.field.catchTotalSortedWeight.help"}; + _addWeightUnit: {model.getCatchWeightUnit()}; } #catchTotalSortedWeightField { @@ -122,6 +124,7 @@ toolTipText: {"tutti.editCatchBatch.field.catchTotalSortedTremisWeight.tip"}; labelFor: {catchTotalSortedTremisWeightField}; _help: {"tutti.editCatchBatch.field.catchTotalSortedTremisWeight.help"}; + _addWeightUnit: {model.getCatchWeightUnit()}; } #catchTotalSortedTremisWeightField { @@ -134,6 +137,7 @@ toolTipText: {"tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.tip"}; labelFor: {catchTotalSortedCarousselWeightField}; _help: {"tutti.editCatchBatch.field.catchTotalSortedCarousselWeight.help"}; + _addWeightUnit: {model.getCatchWeightUnit()}; } #catchTotalSortedCarousselWeightField { @@ -146,6 +150,7 @@ toolTipText: {"tutti.editCatchBatch.field.catchTotalRejectedWeight.tip"}; labelFor: {catchTotalRejectedWeightField}; _help: {"tutti.editCatchBatch.field.catchTotalRejectedWeight.help"}; + _addWeightUnit: {model.getCatchWeightUnit()}; } #catchTotalRejectedWeightField { @@ -158,6 +163,7 @@ toolTipText: {"tutti.editCatchBatch.field.catchTotalUnsortedWeight.tip"}; labelFor: {catchTotalUnsortedWeightField}; _help: {"tutti.editCatchBatch.field.catchTotalUnsortedWeight.help"}; + _addWeightUnit: {model.getCatchWeightUnit()}; } #catchTotalUnsortedWeightField { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-09-23 16:25:28 UTC (rev 1217) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-09-24 11:19:17 UTC (rev 1218) @@ -58,7 +58,6 @@ import static org.nuiton.i18n.I18n.n_; /** - * //FIXME Do weightUnit conversion... * @author tchemit <chemit(a)codelutin.com> * @since 0.3 */ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2013-09-23 16:25:28 UTC (rev 1217) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIModel.java 2013-09-24 11:19:17 UTC (rev 1218) @@ -174,7 +174,12 @@ WeightUnit individualObservationWeightUnit) { super(CatchBatch.class, fromBeanBinder, toBeanBinder); //FIXME See if this can be configurable or guess from other weightUnits - this.catchWeightUnit = WeightUnit.KG; + if (WeightUnit.G == speciesWeightUnit && + WeightUnit.G == benthosWeightUnit) { + this.catchWeightUnit = WeightUnit.G; + } else { + this.catchWeightUnit = WeightUnit.KG; + } this.speciesWeightUnit = speciesWeightUnit; this.benthosWeightUnit = benthosWeightUnit; this.marineLitterWeightUnit = marineLitterWeightUnit; @@ -203,6 +208,10 @@ PROPERTY_CATCH_TOTAL_REJECTED_WEIGHT, this); } + public WeightUnit getCatchWeightUnit() { + return catchWeightUnit; + } + public boolean isLoadingData() { return loadingData; }

1 0

r1217 - trunk
by tchemit＠users.forge.codelutin.com Sept. 23, 2013

Sept. 23, 2013

Author: tchemit Date: 2013-09-23 18:25:28 +0200 (Mon, 23 Sep 2013) New Revision: 1217 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1217 Log: fix for maven 3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-23 16:11:33 UTC (rev 1216) +++ trunk/pom.xml 2013-09-23 16:25:28 UTC (rev 1217) @@ -609,7 +609,7 @@ </profile> <profile> - <id>deploy-legacy-tutti-application-update</id> + <id>deploy-update-tutti-update</id> <activation> <property> <name>performRelease</name> @@ -624,7 +624,7 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <id>copy tutti-application.properties to site</id> + <id>copy update-tutti.properties to site</id> <phase>package</phase> <inherited>false</inherited> <configuration> @@ -655,6 +655,7 @@ <version>1.0-beta-4</version> <executions> <execution> + <id>deploy update-tutti.properties</id> <phase>deploy</phase> <inherited>false</inherited> <goals> @@ -724,6 +725,7 @@ <version>1.0-beta-4</version> <executions> <execution> + <id>deploy tutti-application.properties</id> <phase>deploy</phase> <inherited>false</inherited> <goals> @@ -792,6 +794,7 @@ <version>1.0-beta-4</version> <executions> <execution> + <id>deploy tutti-db.properties</id> <phase>deploy</phase> <inherited>false</inherited> <goals>

1 0

[ANN] - Tutti 2.5.1 released
by forge.codelutin.com Release Notification Sept. 23, 2013

Sept. 23, 2013

The Tutti team is pleased to announce the tutti-2.5.1 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://forge.codelutin.com/projects/tutti Changes ------- Changes in this version include: Fixed Bugs: o [données individuelles] erreur à l'enregistrement pour la cration d'une nouvelle ligne Issue: 3321. Thanks to Vincent BADTS. Resolved by tchemit. Changes: o [TECH] Mettre à jour l'ancien fichier des mises à jour Issue: 3323. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

r1216 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com Sept. 23, 2013

Sept. 23, 2013

Author: maven-release Date: 2013-09-23 18:11:33 +0200 (Mon, 23 Sep 2013) New Revision: 1216 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1216 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-23 16:11:23 UTC (rev 1215) +++ trunk/pom.xml 2013-09-23 16:11:33 UTC (rev 1216) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.5.1</version> + <version>2.6-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.5.1</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.5.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.5.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-09-23 16:11:23 UTC (rev 1215) +++ trunk/tutti-persistence/pom.xml 2013-09-23 16:11:33 UTC (rev 1216) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.5.1</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-09-23 16:11:23 UTC (rev 1215) +++ trunk/tutti-service/pom.xml 2013-09-23 16:11:33 UTC (rev 1216) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.5.1</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-09-23 16:11:23 UTC (rev 1215) +++ trunk/tutti-ui-swing/pom.xml 2013-09-23 16:11:33 UTC (rev 1216) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.5.1</version> + <version>2.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1215 - tags
by maven-release＠users.forge.codelutin.com Sept. 23, 2013

Sept. 23, 2013

Author: maven-release Date: 2013-09-23 18:11:23 +0200 (Mon, 23 Sep 2013) New Revision: 1215 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1215 Log: [maven-release-plugin] copy for tag tutti-2.5.1 Added: tags/tutti-2.5.1/

1 0

r1214 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com Sept. 23, 2013

Sept. 23, 2013

Author: maven-release Date: 2013-09-23 18:11:15 +0200 (Mon, 23 Sep 2013) New Revision: 1214 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1214 Log: [maven-release-plugin] prepare release tutti-2.5.1 Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-23 15:56:04 UTC (rev 1213) +++ trunk/pom.xml 2013-09-23 16:11:15 UTC (rev 1214) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.1</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.5.1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.5.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.5.1 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-09-23 15:56:04 UTC (rev 1213) +++ trunk/tutti-persistence/pom.xml 2013-09-23 16:11:15 UTC (rev 1214) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-09-23 15:56:04 UTC (rev 1213) +++ trunk/tutti-service/pom.xml 2013-09-23 16:11:15 UTC (rev 1214) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-09-23 15:56:04 UTC (rev 1213) +++ trunk/tutti-ui-swing/pom.xml 2013-09-23 16:11:15 UTC (rev 1214) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.6-SNAPSHOT</version> + <version>2.5.1</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1213 - trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation
by tchemit＠users.forge.codelutin.com Sept. 23, 2013

Sept. 23, 2013

Author: tchemit Date: 2013-09-23 17:56:04 +0200 (Mon, 23 Sep 2013) New Revision: 1213 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1213 Log: fixes #3321: [donn?\195?\169es individuelles] erreur ?\195?\160 l'enregistrement pour la cration d'une nouvelle ligne Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-09-23 15:55:03 UTC (rev 1212) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-09-23 15:56:04 UTC (rev 1213) @@ -93,6 +93,9 @@ public IndividualObservationBatchRowModel(WeightUnit weightUnit) { super(IndividualObservationBatch.class, fromBeanBinder, toBeanBinder); this.weightUnit = weightUnit; + if (getCaracteristics() == null) { + setCaracteristics(new CaracteristicMap()); + } } public IndividualObservationBatchRowModel(WeightUnit weightUnit, @@ -102,10 +105,6 @@ fromEntity(entity); - if (getCaracteristics() == null) { - setCaracteristics(new CaracteristicMap()); - } - // move default caracteristics from caracteristic map CaracteristicMap caracteristics = getCaracteristics(); for (Caracteristic caracteristic : defaultCaracteristicsSet) { @@ -139,6 +138,10 @@ // convert weight setWeight(weightUnit.fromEntity(getWeight())); + + if (getCaracteristics() == null) { + setCaracteristics(new CaracteristicMap()); + } } @Override

1 0

r1212 - in trunk: . src/update
by tchemit＠users.forge.codelutin.com Sept. 23, 2013

Sept. 23, 2013

Author: tchemit Date: 2013-09-23 17:55:03 +0200 (Mon, 23 Sep 2013) New Revision: 1212 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1212 Log: fixes #3323: [TECH] Mettre ?\195?\160 jour l'ancien fichier des mises ?\195?\160 jour Added: trunk/src/update/update-tutti.properties Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-23 14:32:15 UTC (rev 1211) +++ trunk/pom.xml 2013-09-23 15:55:03 UTC (rev 1212) @@ -609,6 +609,76 @@ </profile> <profile> + <id>deploy-legacy-tutti-application-update</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <defaultGoal>deploy</defaultGoal> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy tutti-application.properties to site</id> + <phase>package</phase> + <inherited>false</inherited> + <configuration> + <tasks> + <echo message="copy tutti-application.properties to site" /> + <copy verbose="true" failonerror="false" overwrite="true" filtering="true" todir="${project.build.directory}/update"> + <filterset> + <filter value="${project.version}" token="projectVersion" /> + <filter value="${jreVersion}" token="jreVersion" /> + <filter value="${dbVersion}" token="dbVersion" /> + </filterset> + <fileset dir="${basedir}/src/update/"> + <include name="update-tutti.properties" /> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <version>1.0-beta-4</version> + <executions> + <execution> + <phase>deploy</phase> + <inherited>false</inherited> + <goals> + <goal>upload-single</goal> + </goals> + <configuration> + <serverId>forge.codelutin.com</serverId> + <fromFile> + ${project.build.directory}/update/update-tutti.properties + </fromFile> + <url> + scpexe://forge.codelutin.com/var/www/ApplicationUpdate/http/tutti + </url> + </configuration> + </execution> + </executions> + + </plugin> + </plugins> + </build> + + </profile> + + <profile> <id>deploy-tutti-application-update</id> <activation> <property> Added: trunk/src/update/update-tutti.properties =================================================================== --- trunk/src/update/update-tutti.properties (rev 0) +++ trunk/src/update/update-tutti.properties 2013-09-23 15:55:03 UTC (rev 1212) @@ -0,0 +1,70 @@ +### +# #%L +# Tutti +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 - 2013 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### + +################################################################################ +### IMPORTANT NOTE ############################################################# +### This is the legacy update files, will be removed in version 3.0 ############ +### IMPORTANT NOTE ############################################################# +################################################################################ + +################################################################################ +### JRE Updates ################################################################ +################################################################################ + +jre.version=@jreVersion@ +linux.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-linux-i586.zip +windows.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-i586.zip +windows.x86.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-i586.zip +#linux.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-linux-x64.zip +#windows.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-x64.zip + +################################################################################ +### Tutti Updates ############################################################## +################################################################################ + +tutti.version=@projectVersion@ +tutti.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-standalone.zip + +################################################################################ +### I18n Updates ############################################################### +################################################################################ + +i18n.version=@projectVersion@ +i18n.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-i18n.zip + +################################################################################ +### Help Updates ############################################################### +################################################################################ + +help.version=@projectVersion@ +help.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-help.zip + + +################################################################################ +### DB Updates ################################################################# +################################################################################ + +db.version=@dbVersion@ +db.url=zip:http://appup.nuiton.org/tutti/auth/tutti-db-@dbVersion@.zip +db.auth=true \ No newline at end of file Property changes on: trunk/src/update/update-tutti.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0