Author: kmorin Date: 2013-05-27 11:41:41 +0200 (Mon, 27 May 2013) New Revision: 1010 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1010 Log: fixes #2508 [MELAG] Modified: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 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/CreateBenthosMelagAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateSpeciesMelagAction.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/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/filtered-resources/log4j.properties 2013-05-27 09:41:41 UTC (rev 1010) @@ -31,7 +31,7 @@ log4j.appender.stdout.layout.ConversionPattern=%d{ISO8601} %5p (%c:%L) - %m%n # tutti levels -log4j.logger.fr.ifremer.tutti=INFO +log4j.logger.fr.ifremer.tutti=DEBUG #log4j.logger.fr.ifremer.tutti.ui.swing.util=WARN #log4j.logger.fr.ifremer.tutti.ui.swing.util.action=INFO #log4j.logger.fr.ifremer.tutti.ui.swing.util.attachment=INFO 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-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-en.properties 2013-05-27 09:41:41 UTC (rev 1010) @@ -22,7 +22,7 @@ # #L% ### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Thu May 23 15:38:00 CEST 2013 +#Fri May 24 09:39:08 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html\#actions tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html\#actions @@ -115,6 +115,7 @@ tutti.editBenthosFrequencies.help=editBenthosFrequencies.html tutti.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions +tutti.editCatchBatch.action.importPupitri.help= tutti.editCatchBatch.action.saveCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editCatchBatch.html\#fields @@ -332,7 +333,7 @@ tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.help=splitSpeciesBatch.html -tutti.validateCruise.navigation.action.export.all.help=validateCruise.html#actions -tutti.validateCruise.navigation.action.export.help=validateCruise.html#actions -tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html#actions -tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html#actions \ No newline at end of file +tutti.validateCruise.navigation.action.export.all.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.export.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html\#actions 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-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2013-05-27 09:41:41 UTC (rev 1010) @@ -22,7 +22,7 @@ # #L% ### #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Thu May 23 15:38:00 CEST 2013 +#Fri May 24 09:39:08 CEST 2013 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=createAccidentalBatch.html\#actions tutti.createAccidentalBatch.action.save.help=createAccidentalBatch.html\#actions @@ -115,6 +115,7 @@ tutti.editBenthosFrequencies.help=editBenthosFrequencies.html tutti.editCatchBatch.action.cancelEditCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.action.computeWeights.help=editCatchBatch.html\#actions +tutti.editCatchBatch.action.importPupitri.help= tutti.editCatchBatch.action.saveCatchBatch.help=editCatchBatch.html\#actions tutti.editCatchBatch.field.benthosTotalSampleSortedWeight.help=editCatchBatch.html\#fields tutti.editCatchBatch.field.benthosTotalSortedWeight.help=editCatchBatch.html\#fields @@ -332,7 +333,7 @@ tutti.splitSpeciesBatch.field.sampleWeightField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.field.speciesField.help=splitSpeciesBatch.html\#fields tutti.splitSpeciesBatch.help=splitSpeciesBatch.html -tutti.validateCruise.navigation.action.export.all.help=validateCruise.html#actions -tutti.validateCruise.navigation.action.export.help=validateCruise.html#actions -tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html#actions -tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html#actions \ No newline at end of file +tutti.validateCruise.navigation.action.export.all.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.export.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.export.operation.help=validateCruise.html\#actions +tutti.validateCruise.navigation.action.refresh.all.help=validateCruise.html\#actions 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-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-05-27 09:41:41 UTC (rev 1010) @@ -863,6 +863,7 @@ public void saveRows(Iterable<BenthosBatchRowModel> rows) { for (BenthosBatchRowModel row : rows) { + recomputeRowValidState(row); saveRow(row); } } @@ -970,7 +971,7 @@ enableRemove = selectedRowCount == 1; enableRemoveSub = selectedRowCount == 1; enableRename = selectedRowCount == 1; - enableCreateMelag = selectedRowCount == 1; + enableCreateMelag = selectedRowCount > 1; enableEditFrequencies = selectedRowCount == 1; if (enableSplit) { @@ -1020,20 +1021,14 @@ JXTable table = getTable(); // can add species to a melag if several root are selected + int[] selectedRows = table.getSelectedRows(); + for (int selectedRowIndex : selectedRows) { + BenthosBatchRowModel selectedRow = + tableModel.getEntry(selectedRowIndex); - if (selectedRowCount < 2) { - enableCreateMelag = false; - - } else { - int[] selectedRows = table.getSelectedRows(); - for (int selectedRowIndex : selectedRows) { - BenthosBatchRowModel selectedRow = - tableModel.getEntry(selectedRowIndex); - - if (!selectedRow.isBatchRoot()) { - enableCreateMelag = false; - break; - } + if (!selectedRow.isBatchRoot()) { + enableCreateMelag = false; + break; } } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/CreateBenthosMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/CreateBenthosMelagAction.java 2013-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/CreateBenthosMelagAction.java 2013-05-27 09:41:41 UTC (rev 1010) @@ -142,12 +142,18 @@ @Override protected void doAction() throws Exception { + String melagComment = _("tutti.createBenthosMelag.comment.part1"); for (BenthosBatchRowModel batch : selectedRows.keySet()) { Float sampleWeight = selectedRows.get(batch); if (sampleWeight != null) { Float weight = sampleMelagWeight * sampleWeight / sortedWeight; batch.getFinestCategory().setCategoryWeight(weight); } + melagComment += _("tutti.createBenthosMelag.comment.part2", sampleWeight, decorate(batch.getSpecies())); + } + melagComment += _("tutti.createBenthosMelag.comment.part3", melagWeight); + + for (BenthosBatchRowModel batch : selectedRows.keySet()) { String comment = batch.getComment(); if (StringUtils.isBlank(comment)) { comment = ""; @@ -155,7 +161,7 @@ } else { comment += "\n"; } - comment += "issu d'un MELAG de " + melagWeight + "kg"; + comment += melagComment; batch.setComment(comment); } getHandler().saveRows(selectedRows.keySet()); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateSpeciesMelagAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateSpeciesMelagAction.java 2013-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/CreateSpeciesMelagAction.java 2013-05-27 09:41:41 UTC (rev 1010) @@ -142,12 +142,18 @@ @Override protected void doAction() throws Exception { + String melagComment = _("tutti.createSpeciesMelag.comment.part1"); for (SpeciesBatchRowModel batch : selectedRows.keySet()) { Float sampleWeight = selectedRows.get(batch); if (sampleWeight != null) { Float weight = sampleMelagWeight * sampleWeight / sortedWeight; batch.getFinestCategory().setCategoryWeight(weight); } + melagComment += _("tutti.createSpeciesMelag.comment.part2", sampleWeight, decorate(batch.getSpecies())); + } + melagComment += _("tutti.createSpeciesMelag.comment.part3", melagWeight); + + for (SpeciesBatchRowModel batch : selectedRows.keySet()) { String comment = batch.getComment(); if (StringUtils.isBlank(comment)) { comment = ""; @@ -155,7 +161,7 @@ } else { comment += "\n"; } - comment += "issu d'un MELAG de " + melagWeight + "kg"; + comment += melagComment; batch.setComment(comment); } getHandler().saveRows(selectedRows.keySet()); 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-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-05-27 09:41:41 UTC (rev 1010) @@ -869,6 +869,7 @@ public void saveRows(Iterable<SpeciesBatchRowModel> rows) { for (SpeciesBatchRowModel row : rows) { + recomputeRowValidState(row); saveRow(row); } } @@ -974,7 +975,7 @@ enableRemove = selectedRowCount == 1; enableRemoveSub = selectedRowCount == 1; enableRename = selectedRowCount == 1; - enableCreateMelag = selectedRowCount == 1; + enableCreateMelag = selectedRowCount > 1; enableEditFrequencies = selectedRowCount == 1; if (enableSplit) { @@ -1024,20 +1025,14 @@ JXTable table = getTable(); // can add species to a melag if several root are selected + int[] selectedRows = table.getSelectedRows(); + for (int selectedRowIndex : selectedRows) { + SpeciesBatchRowModel selectedRow = + tableModel.getEntry(selectedRowIndex); - if (selectedRowCount < 2) { - enableCreateMelag = false; - - } else { - int[] selectedRows = table.getSelectedRows(); - for (int selectedRowIndex : selectedRows) { - SpeciesBatchRowModel selectedRow = - tableModel.getEntry(selectedRowIndex); - - if (!selectedRow.isBatchRoot()) { - enableCreateMelag = false; - break; - } + if (!selectedRow.isBatchRoot()) { + enableCreateMelag = false; + break; } } } 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-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-05-27 09:41:41 UTC (rev 1010) @@ -168,6 +168,9 @@ tutti.createBenthosBatch.field.species= tutti.createBenthosBatch.field.species.tip= tutti.createBenthosBatch.title= +tutti.createBenthosMelag.comment.part1= +tutti.createBenthosMelag.comment.part2= +tutti.createBenthosMelag.comment.part3= tutti.createBenthosMelag.error.message= tutti.createBenthosMelag.error.title= tutti.createIndividualObservationBatch.action.addSpecies= @@ -223,6 +226,9 @@ tutti.createSpeciesMelag.action.validate= tutti.createSpeciesMelag.action.validate.mnemonic= tutti.createSpeciesMelag.action.validate.tip= +tutti.createSpeciesMelag.comment.part1= +tutti.createSpeciesMelag.comment.part2= +tutti.createSpeciesMelag.comment.part3= tutti.createSpeciesMelag.error.message= tutti.createSpeciesMelag.error.title= tutti.createSpeciesMelag.message= 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-05-26 06:57:31 UTC (rev 1009) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-05-27 09:41:41 UTC (rev 1010) @@ -162,6 +162,9 @@ tutti.createBenthosBatch.field.species=Espèce du lot tutti.createBenthosBatch.field.species.tip=Espèce du lot tutti.createBenthosBatch.title=Créer un lot +tutti.createBenthosMelag.comment.part1=Traitement issu d'un mélange composé de \:\n +tutti.createBenthosMelag.comment.part2=- %skg de %s\n +tutti.createBenthosMelag.comment.part3=avec un poids d'élévation de %skg tutti.createBenthosMelag.error.message=Erreur à la ligne %s \: le lot n'a pas de poids de sous échantillon ni de poids dans les mensurations tutti.createBenthosMelag.error.title=Erreur tutti.createIndividualObservationBatch.action.addSpecies=... @@ -217,6 +220,9 @@ tutti.createSpeciesMelag.action.validate=Valider tutti.createSpeciesMelag.action.validate.mnemonic=V tutti.createSpeciesMelag.action.validate.tip=Valider la création du MELAG +tutti.createSpeciesMelag.comment.part1=Traitement issu d'un mélange composé de \:\n +tutti.createSpeciesMelag.comment.part2=- %skg de %s\n +tutti.createSpeciesMelag.comment.part3=avec un poids d'élévation de %skg tutti.createSpeciesMelag.error.message=Erreur à la ligne %s \: le lot n'a pas de poids de sous échantillon ni de poids dans les mensurations tutti.createSpeciesMelag.error.title=Erreur tutti.createSpeciesMelag.message=Combien pesait le MELAG (kg) ?