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

branch develop updated (a8f583b -> c63afb1)
by codelutin.com scm Nov. 28, 2014

Nov. 28, 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 a8f583b Merge branch 'develop' of https://git.codelutin.com/tutti into develop new c63afb1 fixes #6124 [CAPTURE] erreur sur écran mensuration 3.7.8 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 c63afb12131459f7cb1048dd992c0dbeb3832c31 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Nov 28 18:18:55 2014 +0100 fixes #6124 [CAPTURE] erreur sur écran mensuration 3.7.8 Summary of changes: .../frequency/BenthosFrequencyUIHandler.java | 40 ++++++++++++++++---- .../benthos/frequency/BenthosFrequencyUIModel.java | 44 ++++++++++++++++++++++ .../frequency/SpeciesFrequencyUIHandler.java | 42 +++++++++++++++++---- .../species/frequency/SpeciesFrequencyUIModel.java | 44 ++++++++++++++++++++++ 4 files changed, 156 insertions(+), 14 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/5954 updated (da2b256 -> c6cab78)
by codelutin.com scm Nov. 27, 2014

Nov. 27, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/5954 in repository tutti. See http://git.codelutin.com/tutti.git from da2b256 refs #6129 [IMPORT SUMATRA] Import des valeurs des PSFMs et des champs du trait new b24d4a8 refs #6129 new 3cce90a refs #5954 add v2 version new c6cab78 refs #6129 [IMPORT SUMATRA] Import des valeurs des PSFMs et des champs du trait The 3 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 c6cab787eebbaab9e342adab66d1b85cbfc52871 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Nov 27 16:37:05 2014 +0100 refs #6129 [IMPORT SUMATRA] Import des valeurs des PSFMs et des champs du trait commit 3cce90a607e12c98c77a80fc5306da31bd0f17e6 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 24 14:31:13 2014 +0100 refs #5954 add v2 version commit b24d4a8e6f8100adba2ffd6bee10320c3eb94d6f Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Nov 24 11:05:10 2014 +0100 refs #6129 Summary of changes: .../entities/protocol/CaracteristicType.java | 14 +- .../entities/protocol/TuttiProtocols.java | 4 +- .../TuttiProtocol1.java => v2/TuttiProtocol2.java} | 101 +++++------ .../TuttiProtocolBean2.java} | 196 ++++++++++++++------- .../i18n/tutti-persistence_en_GB.properties | 4 + .../fr/ifremer/tutti/service/DecoratorService.java | 11 ++ .../resources/i18n/tutti-service_en_GB.properties | 8 + .../resources/i18n/tutti-service_fr_FR.properties | 4 + .../tutti/ui/swing/action/SaveProtocolAction.java | 6 + .../content/protocol/CaracteristicMappingUI.css | 7 + .../content/protocol/CaracteristicMappingUI.jaxx | 40 +++++ .../protocol/CaracteristicMappingUIHandler.java | 176 ++++++++++++++++++ .../protocol/CaracteristicMappingUIModel.java | 62 +++++++ .../EditProtocolCaracteristicsRowModel.java | 96 ++++++++++ .../EditProtocolCaracteristicsTableModel.java | 45 +++++ .../ui/swing/content/protocol/EditProtocolUI.jaxx | 3 + .../content/protocol/EditProtocolUIHandler.java | 9 +- .../util/table/AbstractTuttiTableUIHandler.java | 1 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 8 +- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 7 + 20 files changed, 685 insertions(+), 117 deletions(-) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/{v1/TuttiProtocol1.java => v2/TuttiProtocol2.java} (57%) copy tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/{v1/TuttiProtocolBean1.java => v2/TuttiProtocolBean2.java} (58%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUI.css create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUI.jaxx create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/CaracteristicMappingUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsRowModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolCaracteristicsTableModel.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/6157 updated (82f4eda -> 83eb615)
by codelutin.com scm Nov. 27, 2014

Nov. 27, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/6157 in repository tutti. See http://git.codelutin.com/tutti.git from 82f4eda changement du nom du device new 83eb615 refs #6174 (ajout d'une exception si le poids est null (et aussi le poids calcule)) 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 83eb615d0c71bdbba64df8b74312ad425f02b343 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 27 11:37:39 2014 +0100 refs #6174 (ajout d'une exception si le poids est null (et aussi le poids calcule)) Summary of changes: .../tutti/service/export/generic/CatchExportModel.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 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 (cc2d9e4 -> a8f583b)
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 cc2d9e4 fixes #6094 [CAPTURE] adapter le pas de l'axe des x "classe de taille" au pas de la classe de taille. Si 1 aller de 1 en 1, si 0.5 alller de 0.5 en 0.5 new 1a84902 Mise à jour des spécifications . Version 0.5.1X new a8f583b Merge branch 'develop' of https://git.codelutin.com/tutti 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 a8f583ba32e7618af01f008693b5b0856359d657 Merge: 1a84902 cc2d9e4 Author: Léo Kaufmann <kaufmann(a)codelutin.com> Date: Tue Nov 25 18:08:40 2014 +0100 Merge branch 'develop' of https://git.codelutin.com/tutti into develop commit 1a8490282a4275b97ddd29f4b41290b2f19ea290 Author: Léo Kaufmann <kaufmann(a)codelutin.com> Date: Tue Nov 25 18:01:06 2014 +0100 Mise à jour des spécifications . Version 0.5.1X Summary of changes: .../AllegroCampagne-Specifications.odt | Bin 776831 -> 766872 bytes .../AllegroCampagne-Specifications.pdf | Bin 1400148 -> 1420873 bytes tutti-ui-swing/src/main/help/en/config.html | 13 ++++++++----- tutti-ui-swing/src/main/help/fr/config.html | 10 ++++++---- 4 files changed, 14 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (a150129 -> cc2d9e4)
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 a150129 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new cc2d9e4 fixes #6094 [CAPTURE] adapter le pas de l'axe des x "classe de taille" au pas de la classe de taille. Si 1 aller de 1 en 1, si 0.5 alller de 0.5 en 0.5 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 cc2d9e42549a60430bb77026bcf5921bdebd85fc Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Nov 25 17:17:23 2014 +0100 fixes #6094 [CAPTURE] adapter le pas de l'axe des x "classe de taille" au pas de la classe de taille. Si 1 aller de 1 en 1, si 0.5 alller de 0.5 en 0.5 Summary of changes: .../frequency/BenthosFrequencyUIHandler.java | 27 ++- .../frequency/SpeciesFrequencyUIHandler.java | 29 ++- .../ui/swing/util/TuttiNumberTickUnitSource.java | 205 +++++++++++++++++++++ 3 files changed, 251 insertions(+), 10 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiNumberTickUnitSource.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/6157 created (now 82f4eda)
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 feature/6157 in repository tutti. See http://git.codelutin.com/tutti.git at 82f4eda changement du nom du device This branch includes the following new commits: new 82f4eda changement du nom du device 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 82f4edad68e2e5456472752f37de21e2fee9dce0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Nov 25 17:07:33 2014 +0100 changement du nom du device -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

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