branch develop updated (78a33c8 -> f60776f)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 78a33c8 Fixes #7944 Merge branch 'feature/7944-2' into develop new 6abdc39 ajout du poids total melag importé et saisi dans le commentaire du lot (fixes #6592) new f60776f Fixes #6592 Merge branch 'feature/6592-2' into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f60776f208e043e139554c9a58afda5b2ad8ed22 Merge: 78a33c8 6abdc39 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 3 19:23:40 2016 +0100 Fixes #6592 Merge branch 'feature/6592-2' into develop commit 6abdc3994fe9ab1ba825873d7c0015a63866b636 Author: Kevin Morin <morin@codelutin.com> Date: Wed Feb 3 12:21:26 2016 +0100 ajout du poids total melag importé et saisi dans le commentaire du lot (fixes #6592) Summary of changes: .../tutti/service/pupitri/PupitriImportResult.java | 26 +++++++++++++++++++--- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + .../pupitri/PupitriImportServiceEvo6592Test.java | 2 +- .../species/actions/ImportPupitriAction.java | 2 +- 5 files changed, 27 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 6abdc3994fe9ab1ba825873d7c0015a63866b636 Author: Kevin Morin <morin@codelutin.com> Date: Wed Feb 3 12:21:26 2016 +0100 ajout du poids total melag importé et saisi dans le commentaire du lot (fixes #6592) --- .../tutti/service/pupitri/PupitriImportResult.java | 26 +++++++++++++++++++--- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + .../pupitri/PupitriImportServiceEvo6592Test.java | 2 +- .../species/actions/ImportPupitriAction.java | 2 +- 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java index 8178d51..8db9991 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriImportResult.java @@ -108,6 +108,14 @@ public class PupitriImportResult { private MutableFloat melagTotalWeight; /** + * Poids total des espèces du mélange cumulé depuis le fichier carrousel, i.e de toutes les lignes dont + * l'espèce appartient à l'ensemble {@link PupitriSpeciesContext#MELAG_SPECIES}. Poids renseigné par l'utilisateur. + * + * @since 4.5 + */ + private Float editedMelagTotalWeight; + + /** * Poids total des lots echantillone cumulé depuis le fichier carrousel, i.e toutes les lignes dont le signe de * l'espèce est {@code T}. * @@ -189,6 +197,14 @@ public class PupitriImportResult { this.melagTotalWeight.setValue(melagTotalWeight); } + public Float getEditedMelagTotalWeight() { + return editedMelagTotalWeight; + } + + public void setEditedMelagTotalWeight(float editedMelagTotalWeight) { + this.editedMelagTotalWeight = editedMelagTotalWeight; + } + public Float getMelagSortedWeight() { return melagSortedWeight == null ? null : melagSortedWeight.floatValue(); } @@ -274,10 +290,10 @@ public class PupitriImportResult { float melagRatio = 1f; if (useMelag) { - melagRatio = melagSortedWeight.floatValue() / melagTotalWeight.floatValue(); + melagRatio = melagSortedWeight.floatValue() / editedMelagTotalWeight; if (log.isInfoEnabled()) { - log.info("Use Melag (sorted weight: " + melagSortedWeight.floatValue() + " / total weight: " + melagTotalWeight.floatValue() + ")"); + log.info("Use Melag (sorted weight: " + melagSortedWeight.floatValue() + " / total weight: " + editedMelagTotalWeight + ")"); } } @@ -346,7 +362,11 @@ public class PupitriImportResult { if (useMelag) { - melagCommentBuilder.append(t("tutti.service.pupitri.import.createMelag.comment.part3", melagTotalWeight, unitLabel)); + melagCommentBuilder.append(t("tutti.service.pupitri.import.createMelag.comment.part3", editedMelagTotalWeight, unitLabel)).append("\n"); + + if (Weights.isNotEqualWeight(editedMelagTotalWeight, melagTotalWeight.floatValue())) { + melagCommentBuilder.append(t("tutti.service.pupitri.import.createMelag.comment.part4", melagTotalWeight.floatValue(), unitLabel, editedMelagTotalWeight, unitLabel)).append("\n"); + } melagComment = melagCommentBuilder.toString(); if (log.isInfoEnabled()) { diff --git a/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties b/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties index 50bc56b..2b30977 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties @@ -346,6 +346,7 @@ tutti.service.pupitri.import.carrousel.error= tutti.service.pupitri.import.createMelag.comment.part1= tutti.service.pupitri.import.createMelag.comment.part2= tutti.service.pupitri.import.createMelag.comment.part3= +tutti.service.pupitri.import.createMelag.comment.part4= tutti.service.pupitri.import.trunk.error= tutti.service.referential.export.gear.error= tutti.service.referential.export.person.error= diff --git a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties index d36b2eb..a267035 100644 --- a/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties +++ b/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties @@ -308,6 +308,7 @@ tutti.service.pupitri.import.carrousel.error=Erreur lors de l'import du fichier tutti.service.pupitri.import.createMelag.comment.part1=Traitement issu d'un mélange composé de \: tutti.service.pupitri.import.createMelag.comment.part2=- %s%s de %s tutti.service.pupitri.import.createMelag.comment.part3=avec un poids d'élévation de %s%s +tutti.service.pupitri.import.createMelag.comment.part4=poids d'élévation modifié à l'import : valeur importée \= %s%s, valeur saisie \= %s%s tutti.service.pupitri.import.trunk.error=Erreur lors de l'import du fichier de trémie %2s pour le trait %1s tutti.service.referential.export.gear.error=Erreur lors de l'export des engins dans le fichier %s tutti.service.referential.export.person.error=Erreur lors de l'export des personnes dans le fichier %s diff --git a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6592Test.java b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6592Test.java index 3a2783c..31e5aa4 100644 --- a/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6592Test.java +++ b/tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6592Test.java @@ -72,7 +72,7 @@ public class PupitriImportServiceEvo6592Test extends PupitryImportServiceTestSup Assert.assertEquals(0, rootSpeciesBatch.sizeChildren()); PupitriImportResult pupitriImportResult = service.readImportPupitri(trunk, carroussel, operation, false); - pupitriImportResult.setMelagTotalWeight(200); + pupitriImportResult.setEditedMelagTotalWeight(200); pupitriImportResult = service.saveImportPupitri(trunk, carroussel, operation, catchBatch, false, pupitriImportResult); Assert.assertTrue(pupitriImportResult.isFishingOperationFound()); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java index 07f808f..cec0d5c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/actions/ImportPupitriAction.java @@ -180,7 +180,7 @@ public class ImportPupitriAction extends LongActionSupport<SpeciesBatchUIModel, ImportPupitriMelagWeightPopupUI importPupitriMelagWeightDialog = new ImportPupitriMelagWeightPopupUI(getUI()); importPupitriMelagWeightDialog.open(importResult.getMelagTotalWeight()); float weight = importPupitriMelagWeightDialog.getModel().getTotalMelagWeight(); - importResult.setMelagTotalWeight(weight); + importResult.setEditedMelagTotalWeight(weight); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit f60776f208e043e139554c9a58afda5b2ad8ed22 Merge: 78a33c8 6abdc39 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 3 19:23:40 2016 +0100 Fixes #6592 Merge branch 'feature/6592-2' into develop .../tutti/service/pupitri/PupitriImportResult.java | 26 +++++++++++++++++++--- .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + .../pupitri/PupitriImportServiceEvo6592Test.java | 2 +- .../species/actions/ImportPupitriAction.java | 2 +- 5 files changed, 27 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm