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

branch feature/6688 updated (8605d60 -> 97dfac1)
by codelutin.com scm 27 Feb '15

27 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git from 8605d60 continue validation new 97dfac1 suppression de l'engin dans les fichiers non requis 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 97dfac1690cadb84a27bc8ac2acadfdca80efde8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Feb 27 18:48:11 2015 +0100 suppression de l'engin dans les fichiers non requis Summary of changes: .../genericformat/GenericFormatFileResult.java | 2 +- .../genericformat/csv/AccidentalCatchModel.java | 4 - .../service/genericformat/csv/CatchModel.java | 4 - .../csv/IndividualObservationModel.java | 4 - .../genericformat/csv/MarineLitterModel.java | 4 - .../service/genericformat/csv/OperationRow.java | 37 + .../csv/RowWithOperationContextSupport.java | 33 - .../GenericFormatExportServiceTest.java | 116 +-- .../GenericFormatImportServiceTest.java | 189 ++--- .../genericFormat/default/accidentalCatch.csv | 30 +- .../test/resources/genericFormat/default/catch.csv | 866 ++++++++++----------- .../default/individualObservation.csv | 52 +- .../genericFormat/default/marineLitter.csv | 8 +- .../genericFormat/empty/accidentalCatch.csv | 2 +- .../test/resources/genericFormat/empty/catch.csv | 2 +- .../genericFormat/empty/individualObservation.csv | 2 +- .../resources/genericFormat/empty/marineLitter.csv | 2 +- 17 files changed, 628 insertions(+), 729 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/6688 updated (11bdb67 -> 8605d60)
by codelutin.com scm 27 Feb '15

27 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git from 11bdb67 ecran d'import au format generique new 30ace56 add failFast option in csvconsumer new 83babc1 add new line of temporary files (should fix this one...) new 1e67a06 introduce file result new bd1fccc -mmissing vessel linked new 92390da use failfats mode in normal temporary referential import new 7e02fa9 count file lines new acb35e6 add failfast option when loading files + show inmport configuration for report generation new 17510cb introduce result support + begin of validate report new 8605d60 continue validation The 9 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 8605d6019af9030ed3f9796478df56b9de6a82d2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Feb 27 08:53:25 2015 +0100 continue validation commit 17510cb2cf232dce93138aeded2dba4a88702e11 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 25 19:54:10 2015 +0100 introduce result support + begin of validate report commit acb35e6b2e07387910eaf99c8ff7d5ebc9031d70 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 25 19:29:32 2015 +0100 add failfast option when loading files + show inmport configuration for report generation commit 7e02fa99ab963f66edf3d5bd457fa0317e56e5ef Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 25 19:26:46 2015 +0100 count file lines commit 92390daaf1915fad9955dfd67caf0ecab60b0891 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 25 19:26:11 2015 +0100 use failfats mode in normal temporary referential import commit bd1fcccf449696298e27adf0684a1cddc40e230f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 25 19:25:41 2015 +0100 -mmissing vessel linked commit 1e67a06126dcb434f3fcaf3aae7b25bccfacc50c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 25 19:25:14 2015 +0100 introduce file result commit 83babc158cde80539db68f734728fe8c8f91b854 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 25 19:24:39 2015 +0100 add new line of temporary files (should fix this one...) commit 30ace567229e3736af9372fe2565a693b370bb0d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 25 19:23:32 2015 +0100 add failFast option in csvconsumer Summary of changes: .../fr/ifremer/tutti/service/csv/CsvComsumer.java | 61 ++- .../genericformat/GenericFormatArchive.java | 275 ++++++++------ ...GenericFormatArchiveInvalidLayoutException.java | 23 +- .../genericformat/GenericFormatFileResult.java | 74 ++++ .../genericformat/GenericFormatImportContext.java | 199 +++++++--- .../GenericFormatImportEntityParserFactory.java | 8 +- .../genericformat/GenericFormatImportRequest.java | 4 + .../genericformat/GenericFormatImportResult.java | 116 +----- .../genericformat/GenericFormatImportService.java | 327 +++++++++++----- .../GenericFormatReferentialImportResult.java | 36 +- .../genericformat/GenericFormatResultSupport.java | 217 +++++++++++ .../genericformat/GenericFormatServiceSupport.java | 2 +- .../GenericFormatValidateFileResult.java | 76 +--- .../consumer/CsvConsumerForAccidentalCatch.java | 4 +- .../consumer/CsvConsumerForCatch.java | 4 +- .../consumer/CsvConsumerForGearCaracteristic.java | 4 +- .../CsvConsumerForIndividualObservation.java | 4 +- .../consumer/CsvConsumerForMarineLitter.java | 4 +- .../consumer/CsvConsumerForOperation.java | 4 +- .../consumer/CsvConsumerForParameter.java | 4 +- .../consumer/CsvConsumerForSampleCategory.java | 4 +- .../consumer/CsvConsumerForSurvey.java | 4 +- .../referential/ReferentialImportRequest.java | 24 +- .../ReferentialTemporaryGearService.java | 2 +- .../ReferentialTemporaryPersonService.java | 2 +- .../ReferentialTemporarySpeciesService.java | 2 +- .../ReferentialTemporaryVesselService.java | 11 +- .../consumer/CsvConsumerForTemporaryGear.java | 80 ++-- .../consumer/CsvConsumerForTemporaryPerson.java | 80 ++-- .../consumer/CsvConsumerForTemporarySpecies.java | 80 ++-- .../consumer/CsvConsumerForTemporaryVessel.java | 81 ++-- .../resources/ftl/genericFormatImportReport_fr.ftl | 409 +++++++++++++++++++++ .../ftl/genericFormatValidateReport_fr.ftl | 335 ++++++++++++++++- .../GenericFormatImportServiceTest.java | 55 ++- .../GenericFormatImportServiceValidTest.java | 133 +++++++ .../sampleCategory.csv | 4 +- .../temporaryGears.csv | 4 +- .../temporaryGears.csv | 5 + .../genericFormat/default/accidentalCatch.csv | 2 +- .../default/individualObservation.csv | 2 +- .../genericFormat/default/marineLitter.csv | 2 +- .../resources/genericFormat/default/operation.csv | 2 +- .../resources/genericFormat/default/survey.csv | 2 +- .../genericFormat/empty/accidentalCatch.csv | 2 +- .../test/resources/genericFormat/empty/catch.csv | 2 +- .../genericFormat/empty/gearCaracteristics.csv | 2 +- .../genericFormat/empty/individualObservation.csv | 2 +- .../resources/genericFormat/empty/marineLitter.csv | 2 +- .../resources/genericFormat/empty/operation.csv | 2 +- .../resources/genericFormat/empty/parameter.csv | 2 +- .../test/resources/genericFormat/empty/survey.csv | 2 +- .../resources/genericFormat/onlyCruise/survey.csv | 2 +- .../{technical => referentials}/temporaryGears.csv | 2 +- .../temporaryPersons.csv | 0 .../temporarySpecies.csv | 0 .../temporaryVessels.csv | 0 .../sampleCategory.csv | 2 +- .../sampleCategory.csv | 4 +- 58 files changed, 2142 insertions(+), 655 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatFileResult.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatResultSupport.java create mode 100644 tutti-service/src/main/resources/ftl/genericFormatImportReport_fr.ftl create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportServiceValidTest.java copy tutti-service/src/test/resources/genericFormat/{technical => badSampleCategoryFormat}/sampleCategory.csv (60%) copy tutti-service/src/test/resources/genericFormat/{technical => badTemporaryReferentialGearFormat}/temporaryGears.csv (61%) create mode 100644 tutti-service/src/test/resources/genericFormat/badTemporaryReferentialGearImport/temporaryGears.csv rename tutti-service/src/test/resources/genericFormat/{technical => referentials}/temporaryGears.csv (77%) rename tutti-service/src/test/resources/genericFormat/{technical => referentials}/temporaryPersons.csv (100%) rename tutti-service/src/test/resources/genericFormat/{technical => referentials}/temporarySpecies.csv (100%) rename tutti-service/src/test/resources/genericFormat/{technical => referentials}/temporaryVessels.csv (100%) copy tutti-service/src/test/resources/genericFormat/{technical => sampleCategory}/sampleCategory.csv (87%) rename tutti-service/src/test/resources/genericFormat/{technical => sampleCategoryFormatMismatch}/sampleCategory.csv (87%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 8

02/09: add new line of temporary files (should fix this one...)
by codelutin.com scm 27 Feb '15

27 Feb '15

This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit 83babc158cde80539db68f734728fe8c8f91b854 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 25 19:24:39 2015 +0100 add new line of temporary files (should fix this one...) --- .../src/test/resources/genericFormat/technical/temporaryPersons.csv | 2 +- .../src/test/resources/genericFormat/technical/temporarySpecies.csv | 2 +- .../src/test/resources/genericFormat/technical/temporaryVessels.csv | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tutti-service/src/test/resources/genericFormat/technical/temporaryPersons.csv b/tutti-service/src/test/resources/genericFormat/technical/temporaryPersons.csv index 372a462..3efb40c 100644 --- a/tutti-service/src/test/resources/genericFormat/technical/temporaryPersons.csv +++ b/tutti-service/src/test/resources/genericFormat/technical/temporaryPersons.csv @@ -1,4 +1,4 @@ id;firstName;lastName;toDelete -1;Léo;Paul; -2;Paul;Valery; --3;Valery;François; \ No newline at end of file +-3;Valery;François; diff --git a/tutti-service/src/test/resources/genericFormat/technical/temporarySpecies.csv b/tutti-service/src/test/resources/genericFormat/technical/temporarySpecies.csv index 16277a6..c912f20 100644 --- a/tutti-service/src/test/resources/genericFormat/technical/temporarySpecies.csv +++ b/tutti-service/src/test/resources/genericFormat/technical/temporarySpecies.csv @@ -6,4 +6,4 @@ id;name;toDelete -2;Divers 4; -7;Gelatineux; -8;MBECTOP; --3;Melange; \ No newline at end of file +-3;Melange; diff --git a/tutti-service/src/test/resources/genericFormat/technical/temporaryVessels.csv b/tutti-service/src/test/resources/genericFormat/technical/temporaryVessels.csv index b8bc7d0..d1b7275 100644 --- a/tutti-service/src/test/resources/genericFormat/technical/temporaryVessels.csv +++ b/tutti-service/src/test/resources/genericFormat/technical/temporaryVessels.csv @@ -2,4 +2,4 @@ id;name;internationalRegistrationCode;scientificVessel;toDelete #TEMP¿-1;Temporary fishing vessel name 1;International registration code F1;N; #TEMP¿-2;Temporary fishing vessel name 2;International registration code F2;N; #TEMP¿-3;Temporary scientific vessel name 3;International registration code S3;Y; -#TEMP¿-4;Temporary scientific vessel name 4;International registration code S4;Y; \ No newline at end of file +#TEMP¿-4;Temporary scientific vessel name 4;International registration code S4;Y; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/6688 updated (bd6f2ef -> 11bdb67)
by codelutin.com scm 25 Feb '15

25 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git from bd6f2ef can override cruise + test for it new a1b9ead make Serializable some objects (to include them in a ui model) + add a valid result state new d64ac8d make serializable configuration new c2188a8 change rank order to short for gear + only check gear on operation if there is one new 573a659 review howto validate the layout of an archive new 7bf0b6e add report file in configuration new 5cfc0ce be able to adapt progression total new 3f35fa2 fix archive api (to be serializable) new b7d0d75 add validate import file methods in service new de1b81b ajout d'une option de configuration pour le répertoire de sauvegarde des rapports lors de l'import générique new 63d7e08 update TODO in doc new cb8517a mise en place des rapports de validation new ae34247 fix css new 11bdb67 ecran d'import au format generique The 13 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 11bdb672f87547e4b2691267c573a3e638cd4fe6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 25 10:03:11 2015 +0100 ecran d'import au format generique commit ae34247d99ecde69c37a542dcfe81efef74f6f2d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 25 10:02:51 2015 +0100 fix css commit cb8517a863ef2c67c84a575f34c862683203e79e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 25 10:02:36 2015 +0100 mise en place des rapports de validation commit 63d7e0852e5fc1dd58808af623dde1a904b36af3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 25 09:27:40 2015 +0100 update TODO in doc commit de1b81bac986d4103be7d53d82344f9a278458ef Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Feb 25 08:48:53 2015 +0100 ajout d'une option de configuration pour le répertoire de sauvegarde des rapports lors de l'import générique commit b7d0d751d22d70053468ee59488c44191bcb560d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Feb 24 20:45:07 2015 +0100 add validate import file methods in service commit 3f35fa24e4e2c4129d42262b7b9fd1c3ce1be9e0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Feb 24 20:44:38 2015 +0100 fix archive api (to be serializable) commit 5cfc0ce3b94f575f3eaf28275ccdac801091395d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Feb 24 20:44:09 2015 +0100 be able to adapt progression total commit 7bf0b6e62cd1bab860c0013923f79b3f0d87cd73 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Feb 24 20:43:28 2015 +0100 add report file in configuration commit 573a659a2d577d4ad823b97e8fb00e9a1021e8be Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Feb 24 20:43:01 2015 +0100 review howto validate the layout of an archive commit c2188a87d50574e5352f20240b412f2febd5c7a8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Feb 24 20:41:05 2015 +0100 change rank order to short for gear + only check gear on operation if there is one commit d64ac8d6afaae3cc4432c955d491ac5351cec7cf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Feb 24 16:44:09 2015 +0100 make serializable configuration commit a1b9ead8ba749834576b3e75172e23d2f99f31be Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Feb 24 08:42:46 2015 +0100 make Serializable some objects (to include them in a ui model) + add a valid result state Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 7 + .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 + .../i18n/tutti-persistence_en_GB.properties | 1 + .../i18n/tutti-persistence_fr_FR.properties | 1 + .../genericformat/GenericFormatArchive.java | 129 +++---- ...GenericFormatArchiveInvalidLayoutException.java | 19 ++ .../genericformat/GenericFormatExportService.java | 2 +- .../GenericFormatImportConfiguration.java | 15 +- .../genericformat/GenericFormatImportContext.java | 10 +- .../GenericFormatImportCruiseResult.java | 5 +- .../GenericFormatImportOperationResult.java | 5 +- .../genericformat/GenericFormatImportRequest.java | 19 +- .../genericformat/GenericFormatImportResult.java | 61 +++- .../genericformat/GenericFormatImportService.java | 370 ++++++++++++++++++--- .../GenericFormatImportValidationHelper.java | 6 +- .../GenericFormatReferentialImportResult.java | 5 +- .../GenericFormatValidateFileContext.java | 72 ++++ .../GenericFormatValidateFileResult.java | 89 +++++ .../consumer/CsvConsumerForGearCaracteristic.java | 2 +- .../consumer/CsvConsumerForOperation.java | 12 +- .../consumer/GearNotFoundInCruiseException.java | 6 +- ...t_fr.ftl => genericFormatValidateReport_fr.ftl} | 214 +++--------- .../resources/i18n/tutti-service_en_GB.properties | 10 + .../resources/i18n/tutti-service_fr_FR.properties | 11 +- .../GenericFormatImportServiceTest.java | 24 ++ .../filtered-resources/tutti-help-fr.properties | 97 +++--- .../fr/{genericExport.html => genericFormat.html} | 20 +- tutti-ui-swing/src/main/help/fr/index.html | 2 +- .../main/help/fr/manageTemporaryReferential.html | 2 + tutti-ui-swing/src/main/help/fr/menu.html | 2 + tutti-ui-swing/src/main/help/fr/navbar.js | 2 +- .../fr/ifremer/tutti/ui/swing/TuttiScreen.java | 8 +- .../action/OpenGenericFormatImportScreen.java | 18 + .../fr/ifremer/tutti/ui/swing/content/MainUI.css | 10 + .../fr/ifremer/tutti/ui/swing/content/MainUI.jaxx | 1 + .../tutti/ui/swing/content/MainUIHandler.java | 8 + .../swing/content/config/TuttiConfigUIHandler.java | 3 + .../genericformat/GenericFormatImportUI.css | 154 +++++++++ .../genericformat/GenericFormatImportUI.jaxx | 156 +++++++++ .../GenericFormatImportUIHandler.java | 135 ++++++++ .../genericformat/GenericFormatImportUIModel.java | 234 +++++++++++++ .../actions/GenericFormatImportAction.java | 186 +++++++++++ .../actions/GenericFormatValidateAction.java | 138 ++++++++ .../OpenGenericFormatImportReportAction.java | 55 +++ .../OpenGenericFormatValidateReportAction.java | 55 +++ .../SaveGenericFormatImportReportAction.java | 78 +++++ .../SaveGenericFormatValidateReportAction.java | 78 +++++ .../tutti/ui/swing/content/home/SelectCruiseUI.css | 2 +- .../ui/swing/content/protocol/EditProtocolUI.css | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 86 +++++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 81 ++++- 51 files changed, 2340 insertions(+), 375 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatArchiveInvalidLayoutException.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatValidateFileContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatValidateFileResult.java copy tutti-service/src/main/resources/ftl/{pupitriReport_fr.ftl => genericFormatValidateReport_fr.ftl} (55%) rename tutti-ui-swing/src/main/help/fr/{genericExport.html => genericFormat.html} (98%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/action/OpenGenericFormatImportScreen.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.css create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUI.jaxx create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatImportUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatImportAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatValidateAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/OpenGenericFormatImportReportAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/OpenGenericFormatValidateReportAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/SaveGenericFormatImportReportAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/SaveGenericFormatValidateReportAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 13

branch feature/6688 updated (fe19de0 -> bd6f2ef)
by codelutin.com scm 23 Feb '15

23 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git from fe19de0 test involution when importing temporary referentials new 5ce290a add getAllCruiseId to only grab ids of cruise new bd6f2ef can override cruise + test for it 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 bd6f2ef378cf73be37e3481e7a96fe351372d1a7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 23 20:37:03 2015 +0100 can override cruise + test for it commit 5ce290af9101e17926d273102882396883b89cf8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 23 20:36:31 2015 +0100 add getAllCruiseId to only grab ids of cruise Summary of changes: .../tutti/persistence/TuttiPersistenceImpl.java | 6 ++ .../persistence/TuttiPersistenceNoDbImpl.java | 6 ++ .../service/CruisePersistenceService.java | 2 + .../service/CruisePersistenceServiceImpl.java | 40 ++++++-- .../src/main/resources/queries-failsafe.hbm.xml | 15 +++ .../ifremer/tutti/service/PersistenceService.java | 5 + .../genericformat/GenericFormatImportContext.java | 15 +-- .../GenericFormatImportCruiseContext.java | 9 +- .../GenericFormatImportCruiseResult.java | 7 ++ .../genericformat/GenericFormatImportService.java | 10 +- .../GenericformatImportPersitenceHelper.java | 43 +++++++- .../consumer/CsvConsumerForSurvey.java | 9 +- .../resources/i18n/tutti-service_fr_FR.properties | 1 + .../GenericFormatImportServiceTest.java | 110 +++++++++++++++++++++ .../{default => onlyCruise}/gearCaracteristics.csv | 0 .../{default => onlyCruise}/survey.csv | 2 +- 16 files changed, 256 insertions(+), 24 deletions(-) copy tutti-service/src/test/resources/genericFormat/{default => onlyCruise}/gearCaracteristics.csv (100%) copy tutti-service/src/test/resources/genericFormat/{default => onlyCruise}/survey.csv (94%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch feature/6688 updated (903b37d -> fe19de0)
by codelutin.com scm 23 Feb '15

23 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git from 903b37d fix i18n new d4b1000 introduce a import configuration object new c1635ba fix get linked species code new e0a945a improve test API new 25823e4 improve how to lanche generic format import test new be49961 fix NPE when no test descirption register new 5791b0d fix referential entity id parser new ed69b29 add gears and vessels temporary entities to import new fe19de0 test involution when importing temporary referentials The 8 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 fe19de09cc87488fa8c72c2d6a47ec095ca1d06b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 23 19:33:58 2015 +0100 test involution when importing temporary referentials commit ed69b29b1befaf2359cc501f703256d20d46addf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 23 19:33:36 2015 +0100 add gears and vessels temporary entities to import commit 5791b0dccd1c0437bc8251f5cc6396bc37e13bcd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 23 19:33:09 2015 +0100 fix referential entity id parser commit be49961a797145d42a0846538912d378d8117762 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 23 19:32:46 2015 +0100 fix NPE when no test descirption register commit 25823e4455aab5be221d42fd652ac5adea584f13 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 23 19:13:48 2015 +0100 improve how to lanche generic format import test commit e0a945a07da0851b45eb473527f6dfbb222cb01e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 23 19:12:42 2015 +0100 improve test API commit c1635ba4e9deb9b1cfcab30d3526528880fdee26 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 23 16:21:36 2015 +0100 fix get linked species code commit d4b1000705a0e45d1c9564d0c7fbfab3576ebf7a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 23 12:06:47 2015 +0100 introduce a import configuration object Summary of changes: .../referential/SpeciesPersistenceServiceImpl.java | 6 +- .../tutti/persistence/test/CleanResourcesRule.java | 89 ++++++++++++++++++++++ .../tutti/persistence/test/DatabaseResource.java | 57 ++++++++------ .../tutti/persistence/test/TuttiRunListener.java | 31 ++++++++ .../tutti/persistence/test/TuttiTestSupport.java | 27 +++++++ .../GenericFormatImportConfiguration.java | 62 +++++++++++++++ .../genericformat/GenericFormatImportRequest.java | 20 ++++- .../genericformat/GenericFormatImportService.java | 61 ++++++++++----- .../csv/TemporaryReferentialEntityIdParser.java | 6 -- .../ifremer/tutti/service/ServiceDbResource.java | 10 +-- .../GenericFormatExportServiceTest.java | 3 +- .../GenericFormatImportServiceTest.java | 80 ++++++++++++++++++- .../GenericFormatImportServiceTestSupport.java | 57 ++++++-------- .../genericFormat/empty/accidentalCatch.csv | 1 + .../test/resources/genericFormat/empty/catch.csv | 1 + .../genericFormat/empty/gearCaracteristics.csv | 1 + .../genericFormat/empty/individualObservation.csv | 1 + .../resources/genericFormat/empty/marineLitter.csv | 1 + .../genericFormat/{default => empty}/operation.csv | 2 - .../resources/genericFormat/empty/parameter.csv | 1 + .../genericFormat/{default => empty}/survey.csv | 1 - .../genericFormat/empty/temporaryVessels.csv | 1 - .../{empty => protocol}/protocol.tuttiProtocol | 0 .../{default => technical}/sampleCategory.csv | 0 .../genericFormat/technical/temporaryGears.csv | 5 ++ .../{empty => technical}/temporaryPersons.csv | 0 .../{empty => technical}/temporarySpecies.csv | 0 .../genericFormat/technical/temporaryVessels.csv | 5 ++ .../ImportGenericFormatProgramCruisesAction.java | 12 ++- 29 files changed, 436 insertions(+), 105 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/CleanResourcesRule.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/TuttiTestSupport.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportConfiguration.java create mode 100644 tutti-service/src/test/resources/genericFormat/empty/accidentalCatch.csv create mode 100644 tutti-service/src/test/resources/genericFormat/empty/catch.csv create mode 100644 tutti-service/src/test/resources/genericFormat/empty/gearCaracteristics.csv create mode 100644 tutti-service/src/test/resources/genericFormat/empty/individualObservation.csv create mode 100644 tutti-service/src/test/resources/genericFormat/empty/marineLitter.csv copy tutti-service/src/test/resources/genericFormat/{default => empty}/operation.csv (70%) create mode 100644 tutti-service/src/test/resources/genericFormat/empty/parameter.csv copy tutti-service/src/test/resources/genericFormat/{default => empty}/survey.csv (51%) delete mode 100644 tutti-service/src/test/resources/genericFormat/empty/temporaryVessels.csv rename tutti-service/src/test/resources/genericFormat/{empty => protocol}/protocol.tuttiProtocol (100%) rename tutti-service/src/test/resources/genericFormat/{default => technical}/sampleCategory.csv (100%) create mode 100644 tutti-service/src/test/resources/genericFormat/technical/temporaryGears.csv rename tutti-service/src/test/resources/genericFormat/{empty => technical}/temporaryPersons.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => technical}/temporarySpecies.csv (100%) create mode 100644 tutti-service/src/test/resources/genericFormat/technical/temporaryVessels.csv -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 8

branch feature/6688 updated (b040b43 -> 903b37d)
by codelutin.com scm 23 Feb '15

23 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git from b040b43 prepare test mecanism new 61aa270 do not log when using progression model new d6a5667 fix export check cruise new 903b37d fix i18n 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 903b37ddc7140f00ffeae4fb9946f61a9ab513f8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 23 11:49:23 2015 +0100 fix i18n commit d6a5667f4f9e8326e5213d0cf31e1b88b0f3021d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 23 11:49:14 2015 +0100 fix export check cruise commit 61aa270650912edcceaf62205347ced61aea85d3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 23 11:48:56 2015 +0100 do not log when using progression model Summary of changes: .../tutti/service/genericformat/GenericFormatExportContext.java | 4 ---- .../tutti/service/genericformat/GenericFormatExportService.java | 3 +-- .../ui/swing/action/ImportGenericFormatProgramCruisesAction.java | 2 +- .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 4 ++-- 4 files changed, 4 insertions(+), 9 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/6688 updated (f9212e6 -> b040b43)
by codelutin.com scm 23 Feb '15

23 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git from f9212e6 import catches (stabilize csv model + do the process math) new fe12fd6 fix batch creation new 923d204 generic import is ok \o/ new 86c2f9e - normalize i18n keys - finalize import - improve import result API - imporve import context API - add clean weights + ccheck weights on imported operations new 0a5891a - amélioration du calcul du nombre d'étapes - mise en place de la progression - amélioration de l'API de requete et resultat new b040b43 prepare test mecanism 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 b040b4302b7f7265f74d292b153de9aa53d0bc71 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 23 09:32:20 2015 +0100 prepare test mecanism commit 0a5891a8342ca13bf8a4c2300d31df90166b1f2c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Feb 23 09:01:05 2015 +0100 - amélioration du calcul du nombre d'étapes - mise en place de la progression - amélioration de l'API de requete et resultat commit 86c2f9e8c402ec888a6b3588e97866d88c2f9c9b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Feb 22 13:37:17 2015 +0100 - normalize i18n keys - finalize import - improve import result API - imporve import context API - add clean weights + ccheck weights on imported operations commit 923d204b4821174e288b257eb51a4874bd11e082 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Feb 22 08:37:31 2015 +0100 generic import is ok \o/ commit fe12fd6b45b35319b821d3495a5c3a604f635539 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Feb 21 20:16:47 2015 +0100 fix batch creation Summary of changes: .../tutti/persistence/entities/TuttiEntities.java | 5 +- .../entities/data/SpeciesAbleBatchs.java | 7 +- .../genericformat/GenericFormatArchive.java | 52 ++- .../genericformat/GenericFormatExportContext.java | 7 +- .../genericformat/GenericFormatExportService.java | 237 +++--------- .../genericformat/GenericFormatImportContext.java | 218 +++++------ .../GenericFormatImportCruiseContext.java | 146 ++++++++ .../GenericFormatImportCruiseResult.java | 63 ++++ .../GenericFormatImportEntityParserFactory.java | 24 +- .../GenericFormatImportOperationContext.java | 109 ++++-- .../GenericFormatImportOperationResult.java | 145 ++++++++ .../genericformat/GenericFormatImportRequest.java | 34 +- .../genericformat/GenericFormatImportResult.java | 112 +++--- .../genericformat/GenericFormatImportService.java | 357 ++++++++++-------- .../GenericFormatImportValidationDataContext.java | 7 +- .../GenericFormatImportValidationHelper.java | 41 ++- .../genericformat/GenericFormatServiceSupport.java | 139 +++++++ .../GenericformatImportPersitenceHelper.java | 406 +++++++++++++-------- .../consumer/CruiseAlreadyExistException.java | 2 +- .../consumer/CruiseAlreadyImportedException.java | 2 +- .../consumer/CruiseNotFoundException.java | 2 +- .../consumer/CruiseNotValidException.java | 2 +- .../consumer/CsvConsumerForAccidentalCatch.java | 18 +- .../consumer/CsvConsumerForCatch.java | 175 +++++---- .../consumer/CsvConsumerForGearCaracteristic.java | 29 +- .../CsvConsumerForIndividualObservation.java | 19 +- .../consumer/CsvConsumerForMarineLitter.java | 16 +- .../consumer/CsvConsumerForOperation.java | 25 +- .../consumer/CsvConsumerForParameter.java | 19 +- .../consumer/CsvConsumerForSampleCategory.java | 10 +- .../FishingOperationAlreadyImportedException.java | 2 +- .../FishingOperationNotFoundInCruiseException.java | 2 +- .../FishingOperationNotValidException.java | 2 +- .../consumer/GearNotFoundInCruiseException.java | 2 +- .../tutti/service/genericformat/csv/CatchRow.java | 3 +- .../genericformat/csv/ExportSampleCategory.java | 4 + .../resources/i18n/tutti-service_en_GB.properties | 172 +++++---- .../resources/i18n/tutti-service_fr_FR.properties | 149 ++++---- .../GenericFormatImportServiceTest.java | 68 +--- ... => GenericFormatImportServiceTestSupport.java} | 48 ++- .../{empty => default}/accidentalCatch.csv | 0 .../genericFormat/{empty => default}/catch.csv | 0 .../{empty => default}/gearCaracteristics.csv | 0 .../{empty => default}/individualObservation.csv | 0 .../{empty => default}/marineLitter.csv | 0 .../genericFormat/{empty => default}/operation.csv | 0 .../genericFormat/{empty => default}/parameter.csv | 0 .../{empty => default}/sampleCategory.csv | 0 .../genericFormat/{empty => default}/survey.csv | 0 49 files changed, 1797 insertions(+), 1083 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportCruiseContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportCruiseResult.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationResult.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatServiceSupport.java copy tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/{GenericFormatImportServiceTest.java => GenericFormatImportServiceTestSupport.java} (55%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/accidentalCatch.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/catch.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/gearCaracteristics.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/individualObservation.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/marineLitter.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/operation.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/parameter.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/sampleCategory.csv (100%) rename tutti-service/src/test/resources/genericFormat/{empty => default}/survey.csv (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch feature/6688 updated (f063f8d -> f9212e6)
by codelutin.com scm 21 Feb '15

21 Feb '15

This is an automated email from the git hooks/post-receive script. New change to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git from f063f8d operation parameters were not saved new d5878b9 add comment and list comment parser formatter new 092e141 refactor list parser formatter new 21abd49 add fishingOperation on SpeciesAbleBatch + usefull method to create one from his parent new 31c1f61 fix test when no gear new f3c6b23 add catch test data new f9212e6 import catches (stabilize csv model + do the process math) 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 f9212e640351b46c4e4005482c144e7481891697 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Feb 21 17:06:52 2015 +0100 import catches (stabilize csv model + do the process math) commit f3c6b236a3bce5003edbc171ed452207534c66a0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Feb 21 17:05:05 2015 +0100 add catch test data commit 31c1f61f98c614d1d69baa0bb82d16061fc35f29 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Feb 21 16:12:34 2015 +0100 fix test when no gear commit 21abd49cb17fea2b1d5c8f9f0402a43485bc1008 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Feb 21 16:12:14 2015 +0100 add fishingOperation on SpeciesAbleBatch + usefull method to create one from his parent commit 092e141a79ffab025598a8e18f6af75c68c50b45 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Feb 20 22:00:40 2015 +0100 refactor list parser formatter commit d5878b95a30e7d20e1c772b8fed0b6d9fc639b42 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Feb 20 22:00:16 2015 +0100 add comment and list comment parser formatter Summary of changes: .../entities/data/SpeciesAbleBatchs.java | 37 +- .../src/main/xmi/tutti-persistence.zargo | Bin 58181 -> 58384 bytes .../service/csv/CommentListParserFormatter.java | 23 ++ .../tutti/service/csv/CommentParserFormatter.java | 25 ++ .../tutti/service/csv/GearListParserFormatter.java | 2 +- ...upport.java => ListParserFormatterSupport.java} | 7 +- .../service/csv/PersonListParserFormatter.java | 2 +- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 29 +- .../service/csv/VesselListParserFormatter.java | 2 +- .../GenericFormatImportOperationContext.java | 129 ++++-- .../GenericformatImportPersitenceHelper.java | 111 ++++-- .../consumer/CsvConsumerForCatch.java | 191 +++++++++ .../service/genericformat/csv/CatchModel.java | 19 +- .../tutti/service/genericformat/csv/CatchRow.java | 152 +++++--- .../producer/CsvProducerForCatch.java | 17 +- .../GenericFormatExportServiceTest.java | 82 ++-- .../test/resources/genericFormat/empty/catch.csv | 434 ++++++++++++++++++++- 17 files changed, 1073 insertions(+), 189 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CommentListParserFormatter.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/csv/CommentParserFormatter.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/csv/{EntityListParserFormatterSupport.java => ListParserFormatterSupport.java} (75%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 6

branch develop updated (177d344 -> 05e9fe2)
by codelutin.com scm 20 Feb '15

20 Feb '15

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 177d344 refs #6612 add Serie_Id on each csv file adds ab7f43e remove System.out.println adds 9a1d0d5 ajout de méthodes utiles pour créer des actions adds 284541a ajout sur les boutons d'un racourci clavier (touche entrer) adds 236d7c7 utilisation helper d'action et ajout todos new 05e9fe2 fixes #6690: [TECH] activer via Entrée un bouton qui à le focus Merge branch 'feature/6690' into develop The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 05e9fe217c5ec3913b6eb4d8bc94458c9df76199 Merge: 177d344 236d7c7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Feb 20 21:14:16 2015 +0100 fixes #6690: [TECH] activer via Entrée un bouton qui à le focus Merge branch 'feature/6690' into develop Summary of changes: .../operation/EditFishingOperationUIModel.java | 2 - .../ui/swing/util/AbstractTuttiUIHandler.java | 50 ++++++++++++++++++- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 56 +++++++++++++++++++++- .../util/attachment/AttachmentEditorUIHandler.java | 1 + .../swing/util/catches/EnterWeightUIHandler.java | 18 ++----- .../swing/util/comment/CommentEditorUIHandler.java | 1 + 6 files changed, 107 insertions(+), 21 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1