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

branch feature/6150 updated (7fdd8e7 -> 99295a2)
by codelutin.com scm 22 Nov '14

22 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 7fdd8e7 - reorganisation du paquetage pupitri - prise en compte du nombre de caisse (pour le rapport pupitri) new 99295a2 use short date format 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 99295a229c30bfa2a64847af52f660b00e2bf6b4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 22 18:09:44 2014 +0100 use short date format Summary of changes: tutti-service/src/main/resources/ftl/pupitriReport_fr.ftl | 4 ++-- 1 file changed, 2 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 feature/6150 updated (3e89c69 -> 7fdd8e7)
by codelutin.com scm 22 Nov '14

22 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 3e89c69 refs #6096 renommage variable + methodes new 7fdd8e7 - reorganisation du paquetage pupitri - prise en compte du nombre de caisse (pour le rapport pupitri) 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 7fdd8e731c5991b7f5b3e7385b0a71f226dd3274 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 22 17:58:42 2014 +0100 - reorganisation du paquetage pupitri - prise en compte du nombre de caisse (pour le rapport pupitri) Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 6 +- .../fr/ifremer/tutti/service/pupitri/BoxType.java | 33 +++ .../pupitri/CarrouselImportRequestResult.java | 16 +- .../tutti/service/pupitri/PupitriCatch.java | 168 ------------ .../service/pupitri/PupitriExportService.java | 2 + .../tutti/service/pupitri/PupitriImportResult.java | 22 +- .../service/pupitri/PupitriImportService.java | 244 ++++-------------- .../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 +- .../{ => report}/PupitriImportReportModel.java | 77 +----- .../pupitri/report/PupitriImportReportRow.java | 76 ++++++ .../src/main/resources/ftl/pupitriReport_fr.ftl | 77 ++++-- 18 files changed, 625 insertions(+), 493 deletions(-) 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%) rename tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/{ => report}/PupitriImportReportModel.java (61%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/report/PupitriImportReportRow.java -- 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 (1f0b7a1 -> 3e89c69)
by codelutin.com scm 22 Nov '14

22 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 1f0b7a1 Propose a l'utilisateur de consulter le rapport pupitri genere new 3e89c69 refs #6096 renommage variable + methodes 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 3e89c693696b9f3d0da740f46ffc6a6b04099e8e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 22 15:55:23 2014 +0100 refs #6096 renommage variable + methodes Summary of changes: .../tutti/service/referential/ImportRequestResult.java | 14 +++----------- .../referential/ReferentialTemporaryGearService.java | 6 +++--- .../referential/ReferentialTemporaryPersonService.java | 6 +++--- .../referential/ReferentialTemporarySpeciesService.java | 6 +++--- .../referential/ReferentialTemporaryVesselService.java | 6 +++--- 5 files changed, 15 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/6150 created (now 1f0b7a1)
by codelutin.com scm 22 Nov '14

22 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 at 1f0b7a1 Propose a l'utilisateur de consulter le rapport pupitri genere This branch includes the following new commits: new b9613b5 refs #6149 rename test new 9fcf63e - ajout d'un service de generation de pdf (utilisation pour le raport des captures) - debut de generation du rapport pupitri new 1f0b7a1 Propose a l'utilisateur de consulter le rapport pupitri genere 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 1f0b7a10317739248f03f9739e9a4762c0959252 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 22 15:51:08 2014 +0100 Propose a l'utilisateur de consulter le rapport pupitri genere commit 9fcf63e92d9090471b84c6d2a3ae9ce803cb0b0f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 22 15:04:02 2014 +0100 - ajout d'un service de generation de pdf (utilisation pour le raport des captures) - debut de generation du rapport pupitri commit b9613b5781bdf7fcc553dfccfaf11a8eee07aeb6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Nov 22 14:50:46 2014 +0100 refs #6149 rename test -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch develop updated (3318653 -> 51ecc0c)
by codelutin.com scm 21 Nov '14

21 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 3318653 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé (centrage des fenetres) new 7de70d3 reecriture de l'import pupitri pour mieux le gerer new fd9f6d3 les tests d'import pupitri refonctionnent new 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 new 51e9b2f amelioration du code d'import pupitri + ajout d'un test pour la fonctionnalite #6149 new 51ecc0c fixes #6147 fixes #6149 Merge branch 'feature/6147' into develop The 5 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 51ecc0c7ff9735f6b198e7d269ec9474d4bb20a0 Merge: 3318653 51e9b2f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 21 18:37:31 2014 +0100 fixes #6147 fixes #6149 Merge branch 'feature/6147' into develop commit 51e9b2fa3a92c5be9d6afd0ec61dd0de3eb0413f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 21 18:36:50 2014 +0100 amelioration du code d'import pupitri + ajout d'un test pour la fonctionnalite #6149 commit f742ba87cbe7e01af617911670dbfcb49d2d30bb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 21 18:00:02 2014 +0100 - 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 commit fd9f6d3f6b2f90b6c68c213d779c8f2b1d96689a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 21 16:19:30 2014 +0100 les tests d'import pupitri refonctionnent commit 7de70d388fa024f52b8cd269ef3a3928a21cbb0a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 21 16:19:00 2014 +0100 reecriture de l'import pupitri pour mieux le gerer Summary of changes: .../pupitri/CarrouselImportRequestResult.java | 83 ++++++ .../tutti/service/pupitri/PupitriCatch.java | 27 +- .../tutti/service/pupitri/PupitriImportResult.java | 194 ++++++++------ .../service/pupitri/PupitriImportService.java | 298 ++++++++++++++------- .../resources/i18n/tutti-service_en_GB.properties | 1 - .../resources/i18n/tutti-service_fr_FR.properties | 4 +- .../pupitri/PupitriImportServiceAno3898Test.java | 58 +--- .../pupitri/PupitriImportServiceAno5032Test.java | 60 +---- .../pupitri/PupitriImportServiceAno5079Test.java | 57 +--- .../pupitri/PupitriImportServiceEvo5060Test.java | 56 +--- .../pupitri/PupitriImportServiceEvo5062Test.java | 56 +--- .../pupitri/PupitriImportServiceEvo6149.java | 153 +++++++++++ .../service/pupitri/PupitriImportServiceTest.java | 68 ++--- .../pupitri/PupitryImportServiceTestSupport.java | 53 ++++ .../src/test/resources/pupitri/evo-6149.car | 6 + .../pupitri/{evo-5060.tnk => evo-6149.tnk} | 0 ...o-5062.tuttiProtocol => evo-6149.tuttiProtocol} | 0 17 files changed, 705 insertions(+), 469 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselImportRequestResult.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitriImportServiceEvo6149.java create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/PupitryImportServiceTestSupport.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%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch develop updated (7bd7807 -> 3318653)
by codelutin.com scm 21 Nov '14

21 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 7bd7807 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé new 3318653 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé (centrage des fenetres) 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 3318653bb2f3fda3f28719652dee1a8a3a17de67 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 21 09:22:39 2014 +0100 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé (centrage des fenetres) Summary of changes: .../fr/ifremer/tutti/ui/swing/action/CreateBenthosMelagAction.java | 2 +- .../fr/ifremer/tutti/ui/swing/action/CreateSpeciesMelagAction.java | 2 +- .../tutti/ui/swing/util/species/EnterMelagWeightUIHandler.java | 7 +++++-- 3 files changed, 7 insertions(+), 4 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 (13263c3 -> 7bd7807)
by codelutin.com scm 21 Nov '14

21 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 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 new 7bd7807 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé 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 7bd7807a7520fe8315f8084738ceda5aaee91d41 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Nov 21 09:13:56 2014 +0100 fixes #6146: [CAPTURE] Pouvoir effectuer du melag sur un lot catégorisé Summary of changes: .../ui/swing/action/CreateBenthosMelagAction.java | 154 ++++++++++++++------ .../ui/swing/action/CreateSpeciesMelagAction.java | 158 ++++++++++++++------- .../catches/SpeciesAbleBatchRowHelper.java | 41 +++++- .../catches/benthos/BenthosBatchUIHandler.java | 20 +-- .../catches/species/SpeciesBatchUIHandler.java | 20 +-- 5 files changed, 259 insertions(+), 134 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 (75f9a99 -> 13263c3)
by codelutin.com scm 20 Nov '14

20 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 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 ! new ecd9945 separation en deux du service d'import et d'export pupitri new cdea1ed enregistrement des ids des especes non importees new b91151b affichage des especes non importees new 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 The 4 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 13263c398f23bd03c085d008faab0e9a106b63be Merge: 75f9a99 b91151b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 20 13:36:55 2014 +0100 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 commit b91151b6c8b1c372ff8b550353133fdee4a44c60 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 20 13:32:08 2014 +0100 affichage des especes non importees commit cdea1edd304af7ab74e3377fdffa34bb37c0933a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 20 13:31:47 2014 +0100 enregistrement des ids des especes non importees commit ecd99450526525904ac46db9fd5b786ffb9dc5b2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 20 12:52:22 2014 +0100 separation en deux du service d'import et d'export pupitri Summary of changes: .../service/pupitri/PupitriExportService.java | 58 ++++++++++++++++++++++ .../tutti/service/pupitri/PupitriImportResult.java | 33 ++++++++---- ...xportService.java => PupitriImportService.java} | 42 ++-------------- .../pupitri/PupitriImportServiceAno3898Test.java | 7 +-- .../pupitri/PupitriImportServiceAno5032Test.java | 7 +-- .../pupitri/PupitriImportServiceAno5079Test.java | 7 +-- .../pupitri/PupitriImportServiceEvo5060Test.java | 7 +-- .../pupitri/PupitriImportServiceEvo5062Test.java | 7 +-- ...viceTest.java => PupitriImportServiceTest.java} | 6 +-- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 11 ++-- .../tutti/ui/swing/action/ExportPupitriAction.java | 9 ++-- .../tutti/ui/swing/action/ImportPupitriAction.java | 44 ++++++++++++---- .../resources/i18n/tutti-ui-swing_en_GB.properties | 2 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 + 14 files changed, 160 insertions(+), 82 deletions(-) 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} (93%) rename tutti-service/src/test/java/fr/ifremer/tutti/service/pupitri/{PupitriImportExportServiceTest.java => PupitriImportServiceTest.java} (96%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (1ea908c -> 75f9a99)
by codelutin.com scm 20 Nov '14

20 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 1ea908c fixes #6139: [ERGO] case à cocher "à confirmer", déplacer en première colonne et surpprimer son titre new 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 ! 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 75f9a99325522d77957c06aa07ca3bf7d22edbb4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 20 12:34:08 2014 +0100 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 ! Summary of changes: .../java/fr/ifremer/tutti/type/WeightUnit.java | 24 +++++++++++++++ .../operation/catches/SampleCategoryComponent.java | 35 +++++++++++++++------- .../catches/benthos/BenthosBatchUIHandler.java | 3 +- .../catches/species/SpeciesBatchUIHandler.java | 3 +- 4 files changed, 53 insertions(+), 12 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 (b9d1960 -> 1ea908c)
by codelutin.com scm 20 Nov '14

20 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 b9d1960 fixes #6096 new 1ea908c fixes #6139: [ERGO] case à cocher "à confirmer", déplacer en première colonne et surpprimer son titre 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 1ea908c5f39510427649a673aea7d7dda15c0e53 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Nov 20 11:44:41 2014 +0100 fixes #6139: [ERGO] case à cocher "à confirmer", déplacer en première colonne et surpprimer son titre Summary of changes: ...wHelper.java => SpeciesAbleBatchRowHelper.java} | 13 +++-- .../catches/benthos/BenthosBatchTableModel.java | 2 +- .../catches/benthos/BenthosBatchUIHandler.java | 58 ++++++++++------------ .../catches/species/SpeciesBatchTableModel.java | 14 +++--- .../catches/species/SpeciesBatchUIHandler.java | 47 ++++++++---------- .../content/protocol/EditProtocolUIHandler.java | 10 ++-- .../resources/i18n/tutti-ui-swing_en_GB.properties | 6 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 10 ++-- 8 files changed, 84 insertions(+), 76 deletions(-) rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/{SpeciesBatchRowHelper.java => SpeciesAbleBatchRowHelper.java} (96%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1