November 2014 - Tutti-commits - mailman.cloud.codelutin.com

branch develop updated (b040e4c -> a150129)
by codelutin.com scm 25 Nov '14

25 Nov '14

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 b040e4c [jgitflow-maven-plugin]updating poms for 3.10-SNAPSHOT development new d0605b8 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts new e882951 add license headers + optimize third parties new 882cc71 [jgitflow-maven-plugin]updating poms for branch'release/3.9' with non-snapshot versions new bc41c04 Merge branch 'release/3.9' new f2ba60e Merge branch 'master' into develop new a150129 [jgitflow-maven-plugin]Updating develop poms back to pre merge state The 6 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 a150129a203dacbcb444c19c078935c0d16dbd65 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Nov 25 11:45:52 2014 +0000 [jgitflow-maven-plugin]Updating develop poms back to pre merge state commit f2ba60e533b4a496dcf90dfc78f4e85bfeec67e5 Merge: d0605b8 bc41c04 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Nov 25 11:45:52 2014 +0000 Merge branch 'master' into develop commit d0605b87f66ca708a22afd70a30631f3f11ddc07 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Nov 25 11:45:51 2014 +0000 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts commit bc41c04c3be8c6983ebe0235b82992c61f3cbf00 Merge: f91779d 882cc71 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Nov 25 11:45:48 2014 +0000 Merge branch 'release/3.9' commit 882cc71788aa1d27246ef393288d614b774fc947 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Nov 25 11:41:20 2014 +0000 [jgitflow-maven-plugin]updating poms for branch'release/3.9' with non-snapshot versions commit e882951c5bb1a3b592a1c780dbe26aa94919be25 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Nov 25 11:40:44 2014 +0000 add license headers + optimize third parties Summary of changes: .../src/license/THIRD-PARTY.properties | 4 ++-- tutti-service/src/license/THIRD-PARTY.properties | 6 +++--- .../ifremer/tutti/service/PdfGeneratorService.java | 24 ++++++++++++++++++++++ .../service/catches/multipost/CatchBatchRow.java | 24 ++++++++++++++++++++++ .../catches/multipost/CatchBatchRowModel.java | 24 ++++++++++++++++++++++ .../catches/multipost/MultiPostConstants.java | 24 ++++++++++++++++++++++ .../fr/ifremer/tutti/service/pupitri/BoxType.java | 24 ++++++++++++++++++++++ .../pupitri/CarrouselImportRequestResult.java | 24 ++++++++++++++++++++++ .../service/pupitri/PupitriExportService.java | 24 ++++++++++++++++++++++ .../tutti/service/pupitri/PupitriSignContext.java | 24 ++++++++++++++++++++++ .../pupitri/report/PupitriImportReportModel.java | 24 ++++++++++++++++++++++ .../pupitri/report/PupitriImportReportRow.java | 24 ++++++++++++++++++++++ .../service/referential/ImportRequestResult.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryGearService.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryPersonService.java | 24 ++++++++++++++++++++++ .../ReferentialTemporarySpeciesService.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryVesselService.java | 24 ++++++++++++++++++++++ .../pupitri/PupitriImportServiceEvo6149Test.java | 24 ++++++++++++++++++++++ .../pupitri/PupitryImportServiceTestSupport.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryGearServiceTest.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryPersonServiceTest.java | 24 ++++++++++++++++++++++ .../ReferentialTemporarySpeciesServiceTest.java | 24 ++++++++++++++++++++++ .../ReferentialTemporaryVesselServiceTest.java | 24 ++++++++++++++++++++++ .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../swing/action/ExportMultiPostCatchAction.java | 24 ++++++++++++++++++++++ .../swing/action/ImportMultiPostCatchAction.java | 24 ++++++++++++++++++++++ 26 files changed, 580 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

[ANN] - Tutti 3.9 released
by codelutin.com Release Notification 25 Nov '14

25 Nov '14

The Tutti team is pleased to announce the tutti-3.9 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: https://tutti.codelutin.com Changes ------- Changes in this version include: New features: o [IMPORT PUPITRI] Nouvelle règle métier sur le melag Issue: 6149. Thanks to Tony Chemit. Resolved by tchemit. o Nouvelles actions dans l'écran configuration Issue: 6151. Thanks to Tony Chemit. Resolved by tchemit. o [IMPORT PUPITRI] comme pour gestion "à la main" du mélange, mettre en commentaire des lots l'historique des poids (poids avant élévation et poids d'élévation) Issue: 6147. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURE] rendre plus visible le bouton pièces jointes Issue: 6153. Thanks to Tony Chemit. Resolved by tchemit. o [EXPORT/IMPORT] vérifier données au dessus du tableau sont bien exportées/importées Issue: 6105. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé Issue: 6146. Thanks to Tony Chemit. Resolved by tchemit. o [IMPORT] pupitri depuis especes, si des espèces ne sont pas importées, lister les codes non importés pour aider à identifier le problème Issue: 6145. Thanks to Tony Chemit. Resolved by tchemit. o [RAPPORT] ajout rapport pdf à l'import pupitri Issue: 6150. Thanks to Tony Chemit. Resolved by tchemit. o [ERGO] case à cocher "à confirmer", déplacer en première colonne et surpprimer son titre Issue: 6139. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURE] autocompléter le champ .car dès que le champ .tnk est renseigné Issue: 6108. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] pouvoir spécifier le chemin de génération de l'export générique dans la configuration Issue: 6106. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURE] le nom du fichier resume .csv n'est pas explicite Issue: 6152. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o Le controle à la suppression d'une ref temporaire utilisée dans le protocole ne fonctionne pas Issue: 6096. Thanks to Vincent BADTS. Resolved by tchemit. o Les actions export générique série de campagne ou campagne sont grisées Issue: 6107. Thanks to Tony Chemit. Resolved by tchemit. o [REFERENTIEL] L'action d'export de l'existant non grisée même si plus de personnes temporaires Issue: 6076. Thanks to Tony Chemit. Resolved by tchemit. o [CAPTURE] poids 127 ou 254 ou 508 g etc dans le Benthos, modification de la valeur saisie au moment de l'élévation des poids ! Issue: 6091. Thanks to Vincent BADTS. Resolved by tchemit. o [CAPTURE] Impossible de supprimer le poids total de la capture Issue: 6075. Thanks to Tony Chemit. Resolved by tchemit. Changes: o [TECHNIQUE] Mise à jour de librairies Issue: 6077. Thanks to Tony Chemit. Resolved by tchemit. o [TECHNIQUE] Mise à jour de certaines urls dans le site Issue: 6074. Thanks to Tony Chemit. Resolved by tchemit. o [TECHNIQUE] Mise à jour java 1.7u72 Issue: 6073. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-3.9-tools.zip - http://forge.codelutin.com/attachments/download/2504 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

branch release/3.9 created (now 1513f0a)
by codelutin.com scm 25 Nov '14

25 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch release/3.9 in repository tutti. See http://git.codelutin.com/tutti.git at 1513f0a fixes #6077: [TECHNIQUE] Mise à jour de librairies No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (1513f0a -> b040e4c)
by codelutin.com scm 25 Nov '14

25 Nov '14

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 1513f0a fixes #6077: [TECHNIQUE] Mise à jour de librairies new b040e4c [jgitflow-maven-plugin]updating poms for 3.10-SNAPSHOT development The 1 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 b040e4c458a2ed90daa56da99ee1feddc075d222 Author: Maven Release <maven-release(a)codelutin.com> Date: Tue Nov 25 11:30:25 2014 +0000 [jgitflow-maven-plugin]updating poms for 3.10-SNAPSHOT development Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (c0e4038 -> 1513f0a)
by codelutin.com scm 25 Nov '14

25 Nov '14

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 c0e4038 fixes #6153: [CAPTURE] rendre plus visible le bouton pièces jointes new 1513f0a fixes #6077: [TECHNIQUE] Mise à jour de librairies The 1 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 1513f0ac8031864f1c7348df1c8810b5e540e304 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Nov 25 12:07:30 2014 +0100 fixes #6077: [TECHNIQUE] Mise à jour de librairies Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (ca954ab -> c0e4038)
by codelutin.com scm 25 Nov '14

25 Nov '14

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 ca954ab fixes #6150 Merge branch 'feature/6150' into develop new c0e4038 fixes #6153: [CAPTURE] rendre plus visible le bouton pièces jointes The 1 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 c0e4038a33ea0522311b0fb623d75764303f9f73 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Nov 25 11:15:02 2014 +0100 fixes #6153: [CAPTURE] rendre plus visible le bouton pièces jointes Summary of changes: .../swing/action/EditFishingOperationAction.java | 13 ++++++ .../content/operation/catches/EditCatchesUI.css | 1 + .../operation/catches/EditCatchesUIHandler.java | 23 ++++++++++- .../catches/accidental/AccidentalBatchUI.css | 4 ++ .../catches/accidental/AccidentalBatchUI.jaxx | 4 ++ .../accidental/AccidentalBatchUIHandler.java | 1 + .../operation/catches/benthos/BenthosBatchUI.css | 4 ++ .../operation/catches/benthos/BenthosBatchUI.jaxx | 4 ++ .../catches/benthos/BenthosBatchUIHandler.java | 47 +--------------------- .../IndividualObservationBatchUI.css | 4 ++ .../IndividualObservationBatchUI.jaxx | 4 ++ .../IndividualObservationBatchUIHandler.java | 1 + .../catches/marinelitter/MarineLitterBatchUI.css | 4 ++ .../catches/marinelitter/MarineLitterBatchUI.jaxx | 4 ++ .../marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../operation/catches/species/SpeciesBatchUI.css | 4 ++ .../operation/catches/species/SpeciesBatchUI.jaxx | 4 ++ .../catches/species/SpeciesBatchUIHandler.java | 2 +- .../ui/swing/util/attachment/ButtonAttachment.java | 20 ++++++--- .../resources/i18n/tutti-ui-swing_en_GB.properties | 8 ++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 9 ++++- 21 files changed, 111 insertions(+), 56 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (1e1f975 -> ca954ab)
by codelutin.com scm 25 Nov '14

25 Nov '14

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 1e1f975 fixes #6096 (amélioration du message lors que les références sont utilisées) adds b9613b5 refs #6149 rename test adds 9fcf63e - ajout d'un service de generation de pdf (utilisation pour le raport des captures) - debut de generation du rapport pupitri adds 1f0b7a1 Propose a l'utilisateur de consulter le rapport pupitri genere adds 3e89c69 refs #6096 renommage variable + methodes adds 7fdd8e7 - reorganisation du paquetage pupitri - prise en compte du nombre de caisse (pour le rapport pupitri) adds 99295a2 use short date format adds a543cdc - ajout des espèces non importées dans le rapport - generer le rapport pdf avant le traitement du melag adds 0ad0f0a refs #6150 adds f0fc16b refs #6150 add checkboxes and table highlighter adds 5636692 sort rows (on sorted + species code), add sorted column, clean report adds 2c5021a refs #6150 adds f91164c refs #6150 adds 2c19b7c refs #6150 adds 2fa05b1 fixes #6096 (ajout de trois lignes blanches en bas du tableau) adds b460b2d refs #6150 adds 5e88001 refs #6150 new ca954ab fixes #6150 Merge branch 'feature/6150' into develop The 1 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 ca954ab82973660aea4e3cd78865dfd82bf38641 Merge: 1e1f975 5e88001 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Nov 25 08:27:27 2014 +0100 fixes #6150 Merge branch 'feature/6150' into develop Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 6 +- .../ifremer/tutti/service/PdfGeneratorService.java | 84 +++++ .../export/pdf/CatchesPdfExportService.java | 90 +++--- .../fr/ifremer/tutti/service/pupitri/BoxType.java | 33 ++ .../pupitri/CarrouselImportRequestResult.java | 64 +++- .../tutti/service/pupitri/PupitriCatch.java | 168 ---------- .../service/pupitri/PupitriExportService.java | 2 + .../tutti/service/pupitri/PupitriImportResult.java | 124 +++++--- .../service/pupitri/PupitriImportService.java | 354 +++++++++------------ .../tutti/service/pupitri/PupitriSignContext.java | 65 ++++ .../service/pupitri/PupitriSpeciesContext.java | 285 +++++++++++++++++ .../service/pupitri/{ => csv}/CarrouselRow.java | 14 +- .../pupitri/{ => csv}/CarrouselRowModel.java | 23 +- .../service/pupitri/{ => csv}/SpeciesRow.java | 2 +- .../service/pupitri/{ => csv}/SpeciesRowModel.java | 2 +- .../tutti/service/pupitri/{ => csv}/TrunkRow.java | 3 +- .../service/pupitri/{ => csv}/TrunkRowModel.java | 3 +- .../pupitri/report/PupitriImportReportModel.java | 126 ++++++++ .../pupitri/report/PupitriImportReportRow.java | 84 +++++ .../service/referential/ImportRequestResult.java | 14 +- .../ReferentialTemporaryGearService.java | 6 +- .../ReferentialTemporaryPersonService.java | 6 +- .../ReferentialTemporarySpeciesService.java | 6 +- .../ReferentialTemporaryVesselService.java | 6 +- .../src/main/resources/ftl/pupitriReport_fr.ftl | 234 ++++++++++++++ .../resources/i18n/tutti-service_en_GB.properties | 4 + .../resources/i18n/tutti-service_fr_FR.properties | 7 +- ...9.java => PupitriImportServiceEvo6149Test.java} | 36 ++- .../src/test/resources/pupitri/evo-6149.car | 4 +- .../tutti/ui/swing/action/ImportPupitriAction.java | 37 +++ .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 14 + .../util/attachment/AttachmentEditorUIHandler.java | 10 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 4 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 + 34 files changed, 1395 insertions(+), 529 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/PdfGeneratorService.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/BoxType.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriCatch.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSignContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/PupitriSpeciesContext.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/{ => csv}/CarrouselRow.java (90%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/{ => csv}/CarrouselRowModel.java (74%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/{ => csv}/SpeciesRow.java (98%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/{ => csv}/SpeciesRowModel.java (96%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/{ => csv}/TrunkRow.java (96%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/{ => csv}/TrunkRowModel.java (95%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportModel.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportRow.java create mode 100644 tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl rename tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/{PupitriImportServiceEvo6149.java => PupitriImportServiceEvo6149Test.java} (80%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/6150 updated (2fa05b1 -> 5e88001)
by codelutin.com scm 24 Nov '14

24 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/6150 in repository tutti. See http://git.codelutin.com/tutti.git from 2fa05b1 fixes #6096 (ajout de trois lignes blanches en bas du tableau) new b460b2d refs #6150 new 5e88001 refs #6150 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 5e88001fbe30f808b8a5287a5a9d38e86b2a936e Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 24 19:11:08 2014 +0100 refs #6150 commit b460b2dc92debdf991ab9d410d06eb46f1abb10d Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 24 18:49:22 2014 +0100 refs #6150 Summary of changes: .../src/main/resources/ftl/pupitriReport_fr.ftl | 107 ++++++++++++--------- 1 file changed, 63 insertions(+), 44 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/6150 updated (2c19b7c -> 2fa05b1)
by codelutin.com scm 24 Nov '14

24 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/6150 in repository tutti. See http://git.codelutin.com/tutti.git from 2c19b7c refs #6150 new 2fa05b1 fixes #6096 (ajout de trois lignes blanches en bas du tableau) The 1 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 2fa05b14e539d5f28e6655d8befa3d6a11e09cdd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Nov 24 18:01:42 2014 +0100 fixes #6096 (ajout de trois lignes blanches en bas du tableau) Summary of changes: .../src/main/resources/ftl/pupitriReport_fr.ftl | 36 ++++++++++++++++++++++ 1 file changed, 36 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/6150 updated (f91164c -> 2c19b7c)
by codelutin.com scm 24 Nov '14

24 Nov '14

This is an automated email from the git hooks/post-receive script. New change to branch feature/6150 in repository tutti. See http://git.codelutin.com/tutti.git from f91164c refs #6150 new 2c19b7c refs #6150 The 1 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 2c19b7c9df9a76c3ae080572721db263e71aeb00 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 24 17:52:55 2014 +0100 refs #6150 Summary of changes: tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1