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

branch release/3.9 deleted (was 882cc71)
by codelutin.com scm Nov. 25, 2014

Nov. 25, 2014

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 was 882cc71 [jgitflow-maven-plugin]updating poms for branch'release/3.9' with non-snapshot versions The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

annotated tag tutti-3.9 created (now 282baee)
by codelutin.com scm Nov. 25, 2014

Nov. 25, 2014

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-3.9 in repository tutti. See http://git.codelutin.com/tutti.git at 282baee (tag) tagging bc41c04c3be8c6983ebe0235b82992c61f3cbf00 (commit) replaces tutti-3.8 tagged by Maven Release on Tue Nov 25 11:45:49 2014 +0000 - Log ----------------------------------------------------------------- [jgitflow-maven-plugin]tagging release 3.9 ----------------------------------------------------------------------- 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 release/3.9 updated (1513f0a -> 882cc71)
by codelutin.com scm Nov. 25, 2014

Nov. 25, 2014

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 from 1513f0a fixes #6077: [TECHNIQUE] Mise à jour de librairies adds e882951 add license headers + optimize third parties adds 882cc71 [jgitflow-maven-plugin]updating poms for branch'release/3.9' with non-snapshot versions No new revisions were added by this update. Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 4 ++-- tutti-service/pom.xml | 2 +- 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 ++++++++++++++++++++++ tutti-ui-swing/pom.xml | 2 +- .../filtered-resources/tutti-help-fr.properties | 23 +++++++++++++++++++++ .../swing/action/ExportMultiPostCatchAction.java | 24 ++++++++++++++++++++++ .../swing/action/ImportMultiPostCatchAction.java | 24 ++++++++++++++++++++++ 31 files changed, 585 insertions(+), 10 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch master updated (f91779d -> bc41c04)
by codelutin.com scm Nov. 25, 2014

Nov. 25, 2014

This is an automated email from the git hooks/post-receive script. New change to branch master in repository tutti. See http://git.codelutin.com/tutti.git from f91779d Merge branch 'release/3.8' adds 8b9e644 [jgitflow-maven-plugin]updating poms for 3.9-SNAPSHOT development adds f424227 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds d2cb759 Merge branch 'master' into develop adds f370eeb [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds f5e93c7 fixes #6073: [TECHNIQUE] Mise à jour java 1.7u72 fixes #6074: [TECHNIQUE] Mise à jour de certaines urls dans le site adds 3b5c7d5 fixes #6076: [REFERENTIEL] L'action d'export de l'existant non grisée même si plus de personnes temporaires adds 83f119b fixes #6075: [CAPTURE] Impossible de supprimer le poids total de la capture adds 77b9ec7 fixes #6077: [TECHNIQUE] Mise à jour de librairies adds 68729dc fixes #6105 vérifier données au dessus du tableau sont bien exportées/importées adds 32fbe4d fixes #6105 (ajout import/export multipost pour l'écran capture) adds 55fe697 fixes #6105 (amélioration du rapport des données non importées - utilisation des unités + meilleur nommage des actions possibles) adds 4eb40e0 refs #6077: [TECHNIQUE] Mise à jour de librairies adds d7d8bde fixes #6106: [TECH] pouvoir spécifier le chemin de génération de l'export générique dans la configuration adds 4ce3f36 fixes #6106: [TECH] pouvoir spécifier le chemin de génération de l'export générique dans la configuration Merge branch 'feature/6106' into develop adds eda075a fixes #6107: Les actions export générique série de campagne ou campagne sont grisées adds 5792aca refs #6105 (renommage des actions + fix NPE quand capture non modifiée adds 0105696 suppression de l'action d'import casino adds 4f6fe70 ne pas conserver des champs pour rien... adds 8320b30 renseigner automatiquement l'autre champs lors de la modification de l'un + amélioration css adds 1372d97 fixes #6108: [CAPTURE] autocompléter le champ .car dès que le champ .tnk est renseigné adds 07a06d9 review referential import services adds 61eda8b refs #6096: on ne peut plus supprimer une espece si present dans protocol, voir pour le reste demain... adds b9d1960 fixes #6096 adds 1ea908c fixes #6139: [ERGO] case à cocher "à confirmer", déplacer en première colonne et surpprimer son titre adds 75f9a99 fixes #6091: [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 ! adds ecd9945 separation en deux du service d'import et d'export pupitri adds cdea1ed enregistrement des ids des especes non importees adds b91151b affichage des especes non importees adds 13263c3 fixes #6145 [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 Merge branch 'feature/5737' into develop adds 7bd7807 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé adds 3318653 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé (centrage des fenetres) adds 7de70d3 reecriture de l'import pupitri pour mieux le gerer adds fd9f6d3 les tests d'import pupitri refonctionnent adds f742ba8 - ajout du commentaire de melag - ajout règle metier lors de l'import du melag pour changer en poids petit si aussi un poid G trouve adds 51e9b2f amelioration du code d'import pupitri + ajout d'un test pour la fonctionnalite #6149 adds 51ecc0c fixes #6147 fixes #6149 Merge branch 'feature/6147' into develop adds cb7b706 fixes #6152: [CAPTURE] le nom du fichier resume .csv n'est pas explicite adds 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 adds ca954ab fixes #6150 Merge branch 'feature/6150' into develop adds c0e4038 fixes #6153: [CAPTURE] rendre plus visible le bouton pièces jointes adds 1513f0a fixes #6077: [TECHNIQUE] Mise à jour de librairies adds e882951 add license headers + optimize third parties adds 882cc71 [jgitflow-maven-plugin]updating poms for branch'release/3.9' with non-snapshot versions adds bc41c04 Merge branch 'release/3.9' No new revisions were added by this update. Summary of changes: pom.xml | 27 +- src/site/rst/update.rst.vm | 4 +- src/site/site_fr.xml | 6 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- .../src/license/THIRD-PARTY.properties | 4 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 16 +- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 + .../tutti/persistence/TuttiPersistenceImpl.java | 80 +- .../persistence/TuttiPersistenceNoDbImpl.java | 26 +- .../tutti/persistence/entities/TuttiEntities.java | 12 +- .../entities/protocol/TuttiProtocols.java | 49 +- .../persistence/entities/referential/Gears.java | 8 + .../persistence/entities/referential/Persons.java | 11 + .../persistence/entities/referential/Speciess.java | 7 + .../persistence/entities/referential/Vessels.java | 8 + .../service/CatchBatchPersistenceServiceImpl.java | 10 +- .../referential/GearPersistenceService.java | 12 +- .../referential/GearPersistenceServiceImpl.java | 10 +- .../referential/PersonPersistenceService.java | 8 +- .../referential/PersonPersistenceServiceImpl.java | 10 +- .../referential/SpeciesPersistenceService.java | 22 +- .../referential/SpeciesPersistenceServiceImpl.java | 34 +- .../referential/VesselPersistenceService.java | 12 +- .../referential/VesselPersistenceServiceImpl.java | 10 +- .../java/fr/ifremer/tutti/type/WeightUnit.java | 24 + .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../GearPersistenceServiceWriteTest.java | 8 +- .../PersonPersistenceServiceWriteTest.java | 8 +- .../SpeciesPersistenceServiceWriteTest.java | 8 +- .../VesselPersistenceServiceWriteTest.java | 8 +- tutti-service/pom.xml | 2 +- tutti-service/src/license/THIRD-PARTY.properties | 6 +- .../ifremer/tutti/service/PdfGeneratorService.java | 108 +++ .../ifremer/tutti/service/PersistenceService.java | 64 +- .../service/catches/multipost/CatchBatchRow.java | 94 +++ .../catches/multipost/CatchBatchRowModel.java | 52 ++ .../catches/multipost/MultiPostConstants.java | 43 +- .../catches/multipost/MultiPostExportService.java | 81 +- .../catches/multipost/MultiPostImportService.java | 194 ++++- .../export/pdf/CatchesPdfExportService.java | 90 +-- .../fr/ifremer/tutti/service/pupitri/BoxType.java | 33 +- .../pupitri/CarrouselImportRequestResult.java | 145 ++++ .../tutti/service/pupitri/PupitriCatch.java | 143 ---- .../service/pupitri/PupitriExportService.java | 84 +++ .../tutti/service/pupitri/PupitriImportResult.java | 295 +++++--- ...xportService.java => PupitriImportService.java} | 458 ++++++------ .../tutti/service/pupitri/PupitriSignContext.java | 89 +++ .../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 | 150 ++++ .../pupitri/report/PupitriImportReportRow.java | 108 +++ .../tutti/service/referential/GearModel.java | 6 - .../ifremer/tutti/service/referential/GearRow.java | 71 +- .../service/referential/ImportRequestResult.java | 111 +++ .../tutti/service/referential/PersonModel.java | 5 - .../tutti/service/referential/PersonRow.java | 58 +- .../referential/ReferentialExportService.java | 375 ---------- .../referential/ReferentialImportService.java | 832 ++++++++++----------- .../ReferentialTemporaryGearService.java | 305 ++++++++ .../ReferentialTemporaryPersonService.java | 292 ++++++++ .../ReferentialTemporarySpeciesService.java | 293 ++++++++ .../ReferentialTemporaryVesselService.java | 311 ++++++++ .../tutti/service/referential/SpeciesModel.java | 10 - .../tutti/service/referential/SpeciesRow.java | 45 +- .../tutti/service/referential/VesselModel.java | 1 - .../tutti/service/referential/VesselRow.java | 73 +- .../src/main/resources/ftl/pupitriReport_fr.ftl | 234 ++++++ .../resources/i18n/tutti-service_en_GB.properties | 16 +- .../resources/i18n/tutti-service_fr_FR.properties | 23 +- .../pupitri/PupitriImportServiceAno3898Test.java | 61 +- .../pupitri/PupitriImportServiceAno5032Test.java | 63 +- .../pupitri/PupitriImportServiceAno5079Test.java | 67 +- .../pupitri/PupitriImportServiceEvo5060Test.java | 59 +- .../pupitri/PupitriImportServiceEvo5062Test.java | 59 +- .../pupitri/PupitriImportServiceEvo6149Test.java | 203 +++++ ...viceTest.java => PupitriImportServiceTest.java} | 68 +- .../PupitryImportServiceTestSupport.java} | 65 +- .../referential/ReferentialImportServiceTest.java | 464 ------------ ... => ReferentialTemporaryExportServiceTest.java} | 71 +- .../ReferentialTemporaryGearServiceTest.java | 172 +++++ .../ReferentialTemporaryPersonServiceTest.java | 122 +++ .../ReferentialTemporarySpeciesServiceTest.java | 207 +++++ .../ReferentialTemporaryVesselServiceTest.java | 137 ++++ .../src/test/resources/pupitri/evo-6149.car | 8 + .../pupitri/{evo-5060.tnk => evo-6149.tnk} | 0 ...o-5062.tuttiProtocol => evo-6149.tuttiProtocol} | 0 tutti-ui-swing/pom.xml | 2 +- tutti-ui-swing/src/license/THIRD-PARTY.properties | 6 +- .../filtered-resources/tutti-help-fr.properties | 4 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 33 +- .../action/AbstractExportMultiPostAction.java | 93 --- .../action/AbstractImportMultiPostAction.java | 110 --- .../ui/swing/action/CreateBenthosMelagAction.java | 154 ++-- .../ui/swing/action/CreateSpeciesMelagAction.java | 158 ++-- .../swing/action/EditFishingOperationAction.java | 13 + .../tutti/ui/swing/action/ExportCruiseAction.java | 6 +- .../swing/action/ExportCruiseForSumatraAction.java | 6 +- .../action/ExportExistingTemporaryGearAction.java | 5 +- .../ExportExistingTemporaryPersonAction.java | 4 +- .../ExportExistingTemporarySpeciesAction.java | 4 +- .../ExportExistingTemporaryVesselAction.java | 4 +- .../ExportFishingOperationForSumatraAction.java | 12 +- ...n.java => ExportMultiPostAccidentalAction.java} | 22 +- .../swing/action/ExportMultiPostActionSupport.java | 200 +++++ ...tion.java => ExportMultiPostBenthosAction.java} | 20 +- .../swing/action/ExportMultiPostCatchAction.java | 87 +++ ...xportMultiPostIndividualObservationAction.java} | 22 +- ...java => ExportMultiPostMarineLitterAction.java} | 20 +- ...tion.java => ExportMultiPostSpeciesAction.java} | 20 +- .../tutti/ui/swing/action/ExportProgramAction.java | 6 +- .../tutti/ui/swing/action/ExportPupitriAction.java | 9 +- .../action/ExportTemporaryGearExampleAction.java | 5 +- .../action/ExportTemporaryPersonExampleAction.java | 5 +- .../ExportTemporarySpeciesExampleAction.java | 5 +- .../action/ExportTemporaryVesselExampleAction.java | 5 +- .../swing/action/ImportBenthosMultiPostAction.java | 126 ---- .../tutti/ui/swing/action/ImportCasinoAction.java | 44 -- ...n.java => ImportMultiPostAccidentalAction.java} | 22 +- .../swing/action/ImportMultiPostActionSupport.java | 262 +++++++ .../swing/action/ImportMultiPostBenthosAction.java | 111 +++ .../swing/action/ImportMultiPostCatchAction.java | 120 +++ ...mportMultiPostIndividualObservationAction.java} | 22 +- ...java => ImportMultiPostMarineLitterAction.java} | 67 +- .../swing/action/ImportMultiPostSpeciesAction.java | 112 +++ .../tutti/ui/swing/action/ImportPupitriAction.java | 89 ++- .../swing/action/ImportSpeciesMultiPostAction.java | 126 ---- .../ui/swing/action/ImportTemporaryGearAction.java | 4 +- .../swing/action/ImportTemporaryPersonAction.java | 4 +- .../swing/action/ImportTemporarySpeciesAction.java | 6 +- .../swing/action/ImportTemporaryVesselAction.java | 6 +- .../action/ReplaceTemporarySpeciesAction.java | 1 + .../swing/content/config/TuttiConfigUIHandler.java | 3 + .../tutti/ui/swing/content/home/SelectCruiseUI.css | 2 - .../content/operation/catches/EditCatchesUI.css | 19 + .../content/operation/catches/EditCatchesUI.jaxx | 2 + .../operation/catches/EditCatchesUIHandler.java | 23 +- .../operation/catches/SampleCategoryComponent.java | 35 +- ...wHelper.java => SpeciesAbleBatchRowHelper.java} | 54 +- .../catches/accidental/AccidentalBatchUI.css | 8 +- .../catches/accidental/AccidentalBatchUI.jaxx | 4 + .../accidental/AccidentalBatchUIHandler.java | 1 + .../catches/benthos/BenthosBatchTableModel.java | 2 +- .../operation/catches/benthos/BenthosBatchUI.css | 8 +- .../operation/catches/benthos/BenthosBatchUI.jaxx | 4 + .../catches/benthos/BenthosBatchUIHandler.java | 128 +--- .../IndividualObservationBatchUI.css | 8 +- .../IndividualObservationBatchUI.jaxx | 4 + .../IndividualObservationBatchUIHandler.java | 1 + .../catches/marinelitter/MarineLitterBatchUI.css | 8 +- .../catches/marinelitter/MarineLitterBatchUI.jaxx | 4 + .../marinelitter/MarineLitterBatchUIHandler.java | 2 +- .../catches/species/ImportPupitriPopupUI.css | 10 +- .../catches/species/ImportPupitriPopupUI.jaxx | 10 +- .../species/ImportPupitriPopupUIHandler.java | 86 ++- .../catches/species/SpeciesBatchTableModel.java | 14 +- .../operation/catches/species/SpeciesBatchUI.css | 8 +- .../operation/catches/species/SpeciesBatchUI.jaxx | 4 + .../catches/species/SpeciesBatchUIHandler.java | 72 +- .../content/protocol/EditProtocolUIHandler.java | 10 +- .../referential/ManageTemporaryReferentialUI.css | 2 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 14 + .../util/attachment/AttachmentEditorUIHandler.java | 10 +- .../ui/swing/util/attachment/ButtonAttachment.java | 20 +- .../util/species/EnterMelagWeightUIHandler.java | 7 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 54 ++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 61 +- 173 files changed, 7326 insertions(+), 3451 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/catches/multipost/CatchBatchRow.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/CatchBatchRowModel.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/validation/tree/MessageTreeNode.java => tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostConstants.java (52%) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/referential/TuttiReferentialEntities.java => tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/BoxType.java (59%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselImportRequestResult.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/PupitriExportService.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/{PupitriImportExportService.java => PupitriImportService.java} (56%) 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/java/fr/ifremer/tutti/service/referential/ImportRequestResult.java delete mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialExportService.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearService.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonService.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesService.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselService.java create mode 100644 tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149Test.java rename tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/{PupitriImportExportServiceTest.java => PupitriImportServiceTest.java} (69%) copy tutti-service/src/test/java/fr/ifremer/tutti/service/{export/generic/TuttiExportServiceAno5804Test.java => pupitri/PupitryImportServiceTestSupport.java} (51%) delete mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialImportServiceTest.java rename tutti-service/src/test/java/fr/ifremer/tutti/service/referential/{ReferentialExportServiceTest.java => ReferentialTemporaryExportServiceTest.java} (79%) create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryGearServiceTest.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryPersonServiceTest.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporarySpeciesServiceTest.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/referential/ReferentialTemporaryVesselServiceTest.java create mode 100644 tutti-service/src/test/resources/pupitri/evo-6149.car copy tutti-service/src/test/resources/pupitri/{evo-5060.tnk => evo-6149.tnk} (100%) copy tutti-service/src/test/resources/pupitri/{evo-5062.tuttiProtocol => evo-6149.tuttiProtocol} (100%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractExportMultiPostAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/AbstractImportMultiPostAction.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{ExportAccidentalMultiPostAction.java => ExportMultiPostAccidentalAction.java} (73%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostActionSupport.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{ExportBenthosMultiPostAction.java => ExportMultiPostBenthosAction.java} (71%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ExportMultiPostCatchAction.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{ExportIndividualObservationMultiPostAction.java => ExportMultiPostIndividualObservationAction.java} (73%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{ExportMarineLitterMultiPostAction.java => ExportMultiPostMarineLitterAction.java} (71%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{ExportSpeciesMultiPostAction.java => ExportMultiPostSpeciesAction.java} (71%) delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportBenthosMultiPostAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportCasinoAction.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{ImportAccidentalMultiPostAction.java => ImportMultiPostAccidentalAction.java} (75%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostActionSupport.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostBenthosAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostCatchAction.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{ImportIndividualObservationMultiPostAction.java => ImportMultiPostIndividualObservationAction.java} (74%) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/{ImportMarineLitterMultiPostAction.java => ImportMultiPostMarineLitterAction.java} (51%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportMultiPostSpeciesAction.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/ImportSpeciesMultiPostAction.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{SpeciesBatchRowHelper.java => SpeciesAbleBatchRowHelper.java} (88%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

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

Nov. 25, 2014

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 Nov. 25, 2014

Nov. 25, 2014

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 Nov. 25, 2014

Nov. 25, 2014

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 Nov. 25, 2014

Nov. 25, 2014

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 Nov. 25, 2014

Nov. 25, 2014

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 Nov. 25, 2014

Nov. 25, 2014

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