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

branch develop updated (c4d6063 -> d2bcd62)
by codelutin.com scm 30 Mar '15

30 Mar '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 c4d6063 generic format import action only from menu + improve select popup open (add a timer for this) new 538357d fixes #6879: [TECH] Passer sur adagio 3.8.6.1 (sur la version 3.14.x) new d2bcd62 add comment 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 d2bcd622da474af16e89358343437aa2ff0c70ea Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Mar 30 16:38:06 2015 +0200 add comment commit 538357dab250d45bb5735837a761b812f481d2c0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Mar 30 17:13:51 2015 +0200 fixes #6879: [TECH] Passer sur adagio 3.8.6.1 (sur la version 3.14.x) Summary of changes: pom.xml | 3 +- .../CaracteristicPersistenceServiceImpl.java | 4 +- .../referential/GearPersistenceServiceImpl.java | 56 +++++----------------- .../LocationPersistenceServiceImpl.java | 11 +++-- .../referential/PersonPersistenceServiceImpl.java | 24 ++++------ .../ReferentialPersistenceServiceSupport.java | 5 +- .../referential/SpeciesPersistenceServiceImpl.java | 3 +- .../referential/VesselPersistenceServiceImpl.java | 25 ++++------ .../src/main/resources/queries-failsafe.hbm.xml | 36 +++++++------- 9 files changed, 63 insertions(+), 104 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 (d4d4bac -> c4d6063)
by codelutin.com scm 30 Mar '15

30 Mar '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 d4d4bac fixes #6882: [IMPORT GENERIQUE] On ne peut pas ouvrir les rapports d'import new 29dd28c introduction d'une configuration pour l'export et utilisation dans les exports existants new 057b4a8 introduce DataModel API in persistence module new 80c5987 improve CSVProducer API new c5240d3 can now export partial data new 148837e impact Export API in Report service new a95fae1 impact Export API in legacy export actions new bf8a93c add new export screen new c4d6063 generic format import action only from menu + improve select popup open (add a timer for this) 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 c4d6063d677074ff2885e35357909766f5d64fd1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Mar 30 16:02:00 2015 +0200 generic format import action only from menu + improve select popup open (add a timer for this) commit bf8a93c34480c6529baf9c75591bac53274f0665 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Mar 30 16:00:01 2015 +0200 add new export screen commit a95fae176fdaafcfad2d248bee0f6d2ebe503d92 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Mar 30 15:59:08 2015 +0200 impact Export API in legacy export actions commit 148837e7b87a045a9be17dec2e747f95e60f5f93 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Mar 30 15:58:27 2015 +0200 impact Export API in Report service commit c5240d364bb3b772a72a5db55ba31f5aa207138a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Mar 30 15:57:29 2015 +0200 can now export partial data commit 80c598757d13db246fbc89423907fb24f0db23ee Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Mar 30 15:56:32 2015 +0200 improve CSVProducer API commit 057b4a84db2f8602ffbad0c10f8610729fd08185 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Mar 30 15:55:47 2015 +0200 introduce DataModel API in persistence module commit 29dd28c4a8c7deec091479d471bd85de87229768 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Mar 28 19:07:49 2015 +0100 introduction d'une configuration pour l'export et utilisation dans les exports existants Summary of changes: .../tutti/persistence/TuttiPersistence.java | 33 ++ .../tutti/persistence/TuttiPersistenceImpl.java | 78 +++- .../persistence/TuttiPersistenceNoDbImpl.java | 16 + .../tutti/persistence/model/CruiseDataModel.java | 39 ++ .../tutti/persistence/model/DataModelSupport.java | 47 +++ .../persistence/model/OperationDataModel.java | 33 ++ .../tutti/persistence/model/ProgramDataModel.java | 39 ++ .../ifremer/tutti/service/PersistenceService.java | 18 +- .../fr/ifremer/tutti/service/csv/CsvProducer.java | 37 +- ...ort.java => GenericFormatCheckDataService.java} | 122 ++++--- .../GenericFormatExportActionEngine.java | 52 ++- .../GenericFormatExportConfiguration.java | 122 +++++++ .../genericformat/GenericFormatExportContext.java | 207 +++++++---- .../GenericFormatExportCruiseContext.java | 44 +++ .../genericformat/GenericFormatExportRequest.java | 77 ++++ .../genericformat/GenericFormatExportResult.java | 45 +++ .../genericformat/GenericFormatExportService.java | 392 ++++++--------------- .../genericformat/GenericFormatImportService.java | 50 ++- .../service/genericformat/csv/CatchModel.java | 2 +- .../tutti/service/genericformat/csv/CatchRow.java | 6 +- .../service/genericformat/csv/OperationRow.java | 186 +++++++--- .../exportactions/CheckDataAction.java | 45 +++ .../CreateAccidentalCatchRowsAction.java | 13 +- .../exportactions/CreateCatchBatchRowsAction.java | 86 ++++- .../CreateIndividualObservationRowsAction.java | 15 +- .../CreateMarineLitterRowsAction.java | 13 +- .../exportactions/CreateOperationRowsAction.java | 21 +- .../exportactions/CreateParameterRowsAction.java | 5 + .../ExportFishingOperationActionSupport.java | 3 + .../exportactions/ExportProtocolAction.java | 2 +- .../exportactions/ExportSurveyAction.java | 28 +- .../exportactions/FinalizeExportAction.java | 44 +-- .../exportactions/FlushOperationAction.java | 5 + .../exportactions/GenerateExportArchiveAction.java | 26 ++ .../exportactions/LoadDataAction.java | 52 +++ .../importactions/DoCheckWeightAction.java | 10 +- .../producer/CsvProducerForCatch.java | 32 ++ .../producer/CsvProducerForOperation.java | 1 - .../service/report/ReportGenerationRequest.java | 13 + .../service/report/ReportGenerationService.java | 24 +- .../resources/i18n/tutti-service_en_GB.properties | 3 + .../resources/i18n/tutti-service_fr_FR.properties | 3 + .../GenericFormatExportServiceAno5804Test.java | 11 +- .../GenericFormatExportServiceTest.java | 378 ++++++++++---------- .../filtered-resources/tutti-help-fr.properties | 39 +- .../fr/ifremer/tutti/ui/swing/TuttiScreen.java | 6 + .../fr/ifremer/tutti/ui/swing/content/MainUI.css | 13 +- .../fr/ifremer/tutti/ui/swing/content/MainUI.jaxx | 2 + .../tutti/ui/swing/content/MainUIHandler.java | 8 + .../actions/OpenGenericFormatExportScreen.java | 41 +++ .../actions/OpenGenericFormatImportScreen.java | 3 +- .../genericformat/GenericFormatExportUI.css | 169 +++++++++ .../genericformat/GenericFormatExportUI.jaxx | 121 +++++++ .../GenericFormatExportUIHandler.java | 154 ++++++++ .../genericformat/GenericFormatExportUIModel.java | 156 ++++++++ .../genericformat/actions/FoldAllDataAction.java | 41 +++ .../actions/GenericFormatExportAction.java | 113 ++++++ .../genericformat/actions/SelectAllDataAction.java | 35 ++ .../genericformat/actions/UnfoldAllDataAction.java | 39 ++ .../actions/UnselectAllDataAction.java | 35 ++ .../genericformat/tree/CruiseSelectTreeNode.java | 121 +++++++ .../tree/DataSelectTreeCellEditor.java | 65 ++++ .../tree/DataSelectTreeCellRenderer.java | 112 ++++++ .../tree/DataSelectTreeNodeSupport.java | 49 +++ .../tree/OperationSelectTreeNode.java | 51 +++ .../genericformat/tree/ProgramSelectTreeNode.java | 64 ++++ .../tutti/ui/swing/content/home/SelectCruiseUI.css | 10 +- .../ui/swing/content/home/SelectCruiseUI.jaxx | 26 +- .../swing/content/home/SelectCruiseUIHandler.java | 56 +-- .../actions/ExportGenericFormatCruiseAction.java | 41 ++- .../ExportGenericFormatProgramCruisesAction.java | 34 +- .../ImportGenericFormatProgramCruisesAction.java | 138 -------- .../ui/swing/content/report/ReportUIHandler.java | 4 + .../ui/swing/content/report/ReportUIModel.java | 10 + .../report/actions/GenerateReportAction.java | 17 +- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 33 -- .../resources/i18n/tutti-ui-swing_en_GB.properties | 58 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 63 +++- .../src/main/resources/icons/action-collapse.png | Bin 0 -> 372 bytes .../src/main/resources/icons/action-expand.png | Bin 0 -> 371 bytes .../src/main/resources/icons/action-select.png | Bin 0 -> 392 bytes .../src/main/resources/icons/action-unselect.png | Bin 0 -> 311 bytes 82 files changed, 3396 insertions(+), 1009 deletions(-) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/CruiseDataModel.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/DataModelSupport.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/OperationDataModel.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/model/ProgramDataModel.java rename tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/{GenericFormatServiceSupport.java => GenericFormatCheckDataService.java} (63%) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportConfiguration.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportCruiseContext.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportRequest.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportResult.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CheckDataAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/GenerateExportArchiveAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/LoadDataAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/actions/OpenGenericFormatExportScreen.java rename tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/{home => }/actions/OpenGenericFormatImportScreen.java (94%) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUI.css create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUI.jaxx create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIHandler.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/GenericFormatExportUIModel.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/FoldAllDataAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/GenericFormatExportAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/SelectAllDataAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/UnfoldAllDataAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/actions/UnselectAllDataAction.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/CruiseSelectTreeNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeCellEditor.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeCellRenderer.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/DataSelectTreeNodeSupport.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/OperationSelectTreeNode.java create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/genericformat/tree/ProgramSelectTreeNode.java delete mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/actions/ImportGenericFormatProgramCruisesAction.java create mode 100644 tutti-ui-swing/src/main/resources/icons/action-collapse.png create mode 100644 tutti-ui-swing/src/main/resources/icons/action-expand.png create mode 100644 tutti-ui-swing/src/main/resources/icons/action-select.png create mode 100644 tutti-ui-swing/src/main/resources/icons/action-unselect.png -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 8

branch develop updated (6f42ce0 -> d4d4bac)
by codelutin.com scm 28 Mar '15

28 Mar '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 6f42ce0 fixes #6877: [IMPORT GENERIQUE] Après une erreur (visualisation du rapport d'import), l'application est bloquée new 4c5f70a fix build new 9dc3d00 introduce export action API new 9390469 amélioration de l'API d'export new 04ac0f0 fixes #6876: [EXPORT GENERIQUE] L'export n'est plus produit si une erreur d'élévation se produit Merge branch 'feature/6876' into develop new d4d4bac fixes #6882: [IMPORT GENERIQUE] On ne peut pas ouvrir les rapports d'import 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 d4d4bac01caac6fdc4a0fa944352e164edf47830 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Mar 28 16:19:13 2015 +0100 fixes #6882: [IMPORT GENERIQUE] On ne peut pas ouvrir les rapports d'import commit 04ac0f0343d5fd98bc2b49ea539df05058b08917 Merge: 6f42ce0 9390469 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Mar 28 16:18:30 2015 +0100 fixes #6876: [EXPORT GENERIQUE] L'export n'est plus produit si une erreur d'élévation se produit Merge branch 'feature/6876' into develop commit 93904698a3752f095797c83bc145a75eda2eff59 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Mar 28 16:15:43 2015 +0100 amélioration de l'API d'export commit 9dc3d00a2c44bae6c9193f09b08f3855856fec9e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Mar 28 14:15:42 2015 +0100 introduce export action API commit 4c5f70a6d334cfdfceeed82d4ab28a0e1260da48 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Mar 28 14:15:27 2015 +0100 fix build Summary of changes: .../GenericFormatExportActionEngine.java | 162 +++++++++ .../genericformat/GenericFormatExportContext.java | 202 +++-------- .../GenericFormatExportOperationContext.java | 30 +- .../genericformat/GenericFormatExportService.java | 376 ++------------------- .../CreateAccidentalCatchRowsAction.java | 61 ++++ .../exportactions/CreateCatchBatchRowsAction.java | 174 ++++++++++ .../CreateIndividualObservationRowsAction.java | 60 ++++ .../CreateMarineLitterRowsAction.java | 61 ++++ .../exportactions/CreateOperationRowsAction.java | 69 ++++ .../exportactions/CreateParameterRowsAction.java | 29 ++ .../exportactions/ExportCruiseActionSupport.java | 23 ++ .../ExportFishingOperationActionSupport.java | 16 + .../ExportGearCaracteristicAction.java | 60 ++++ .../exportactions/ExportProtocolAction.java | 41 +++ .../exportactions/ExportReferentialGearAction.java | 46 +++ .../ExportReferentialPersonAction.java | 46 +++ .../ExportReferentialSpeciesAction.java | 46 +++ .../ExportReferentialVesselAction.java | 47 +++ .../ExportSampleCategoryModelAction.java | 39 +++ .../exportactions/ExportSpeciesUsedAction.java | 36 ++ .../exportactions/ExportSurveyAction.java | 65 ++++ .../ExportTechnicalActionSupport.java | 15 + .../exportactions/FinalizeExportAction.java | 49 +++ .../exportactions/FlushOperationAction.java | 38 +++ .../producer/CsvProducerForAttachment.java | 81 +---- .../producer/CsvProducerForCatch.java | 6 +- .../resources/i18n/tutti-service_fr_FR.properties | 2 +- .../actions/GenericFormatImportAction.java | 2 +- .../actions/GenericFormatValidateAction.java | 2 +- 29 files changed, 1284 insertions(+), 600 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportActionEngine.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateAccidentalCatchRowsAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateCatchBatchRowsAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateIndividualObservationRowsAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateMarineLitterRowsAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateOperationRowsAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/CreateParameterRowsAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportCruiseActionSupport.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportFishingOperationActionSupport.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportGearCaracteristicAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportProtocolAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialGearAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialPersonAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialSpeciesAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportReferentialVesselAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSampleCategoryModelAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSpeciesUsedAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportSurveyAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/ExportTechnicalActionSupport.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/FinalizeExportAction.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/exportactions/FlushOperationAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch develop updated (3cbcdc3 -> 6f42ce0)
by codelutin.com scm 27 Mar '15

27 Mar '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 3cbcdc3 fixes #6820: [IMPORT GENERIQUE] Import des pièces jointes Merge branch 'feature/6820' into develop new 6f42ce0 fixes #6877: [IMPORT GENERIQUE] Après une erreur (visualisation du rapport d'import), l'application est bloquée 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 6f42ce015b26b380bbc22f86ff41e28bd2bdb434 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Mar 27 18:33:57 2015 +0100 fixes #6877: [IMPORT GENERIQUE] Après une erreur (visualisation du rapport d'import), l'application est bloquée Summary of changes: .../genericformat/GenericFormatImportUI.css | 4 +-- .../OpenGenericFormatImportReportAction.java | 41 ++++++++++------------ .../OpenGenericFormatValidateReportAction.java | 41 ++++++++++------------ 3 files changed, 38 insertions(+), 48 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 (41ae140 -> 3cbcdc3)
by codelutin.com scm 27 Mar '15

27 Mar '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 41ae140 move some code new aaeb470 problème d'égalite d'une campagne si le surveyPart est vide ou null new 4550174 suppression des pieces jointes d'une catchBatch a sa suppression new 5f907f3 amélioration de la suppression d'une pièce jointe new 59e93c7 decompresser l'archive d'import des le debut (on ne travaille plus sur les entrées du zip new ee8aa17 refs #6820 modification des imports pour pouvoir importer les pj new 1432b54 refs #6820 ajout de l'import des pj new b53e9a7 fix typo new ded5f75 delete pj before deleting catch batch new 2e3fee3 all pj imports wokrs now new 3cbcdc3 fixes #6820: [IMPORT GENERIQUE] Import des pièces jointes Merge branch 'feature/6820' into develop The 10 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 3cbcdc3f96f32ecd7abc3c19ae33119b622c3d4c Merge: 41ae140 2e3fee3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Mar 27 18:22:18 2015 +0100 fixes #6820: [IMPORT GENERIQUE] Import des pièces jointes Merge branch 'feature/6820' into develop commit 2e3fee3260ccc887bdbb20c5b120e43486b8ec62 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Mar 27 18:21:59 2015 +0100 all pj imports wokrs now commit ded5f75bbcbda4cb94469546380151cd44dc0c95 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Mar 27 18:21:46 2015 +0100 delete pj before deleting catch batch commit b53e9a70035870da94608926a9bd7bfb9063df6d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Mar 27 16:24:58 2015 +0100 fix typo commit 1432b54c76b994b3a887bd4d6bfd6923b10962cd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Mar 27 16:24:44 2015 +0100 refs #6820 ajout de l'import des pj commit ee8aa173479d96a13fc4fad46763298a8e82a5cf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Mar 27 16:24:11 2015 +0100 refs #6820 modification des imports pour pouvoir importer les pj commit 59e93c7bfb3c13d5aee235cf40c57d02ee5b6db7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Mar 27 16:22:49 2015 +0100 decompresser l'archive d'import des le debut (on ne travaille plus sur les entrées du zip commit 5f907f33e5565f424c1cb50d279225839e47913a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Mar 27 16:22:00 2015 +0100 amélioration de la suppression d'une pièce jointe commit 455017422a1c98861d0ce963f9f48f1dc40b9756 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Mar 27 16:21:35 2015 +0100 suppression des pieces jointes d'une catchBatch a sa suppression commit aaeb47017c46cfbb0a361704f7fde8014f5891ee Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Mar 27 16:20:53 2015 +0100 problème d'égalite d'une campagne si le surveyPart est vide ou null Summary of changes: .../tutti/persistence/entities/data/Cruises.java | 18 ++- .../service/AttachmentPersistenceServiceImpl.java | 26 +++- .../FishingOperationPersistenceServiceImpl.java | 11 +- .../service/util/BatchPersistenceHelper.java | 1 + .../genericformat/GenericFormatArchive.java | 148 +++++++-------------- .../genericformat/GenericFormatContextSupport.java | 33 ++++- .../GenericFormatImportOperationContext.java | 15 +++ .../genericformat/GenericFormatImportService.java | 3 + .../GenericformatImportPersitenceHelper.java | 96 +++++++++++-- .../consumer/CsvConsumerForAccidentalCatch.java | 1 + .../consumer/CsvConsumerForAttachment.java | 29 ++++ .../consumer/CsvConsumerForCatch.java | 12 +- .../CsvConsumerForIndividualObservation.java | 1 + .../service/genericformat/csv/AttachmentRow.java | 12 ++ .../service/genericformat/csv/CatchModel.java | 4 +- .../genericformat/csv/ExportSampleCategory.java | 6 +- .../genericformat/csv/MarineLitterModel.java | 4 +- .../service/genericformat/csv/MarineLitterRow.java | 10 +- .../service/genericformat/csv/OperationModel.java | 8 +- .../service/genericformat/csv/OperationRow.java | 26 ++-- .../service/genericformat/csv/SurveyModel.java | 4 +- .../tutti/service/genericformat/csv/SurveyRow.java | 12 +- .../importactions/ImportOperationAction.java | 8 +- .../importactions/ImportSurveyAction.java | 7 +- .../importactions/LoadAttachmentsAction.java | 80 +++++++++++ .../producer/CsvProducerForSurvey.java | 1 + .../resources/i18n/tutti-service_en_GB.properties | 1 + .../resources/i18n/tutti-service_fr_FR.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 4 +- 29 files changed, 420 insertions(+), 162 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/consumer/CsvConsumerForAttachment.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/LoadAttachmentsAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 10

branch develop updated (dc0722c -> 41ae140)
by codelutin.com scm 26 Mar '15

26 Mar '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 dc0722c refs #6819: ajout des pièces jointes dans l'export new e40976e add some logs when deleting an attachment new 41ae140 move some code 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 41ae1400d4258bb7aa873baeb7a570ea003f4c8d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 26 19:29:58 2015 +0100 move some code commit e40976e9e5cf89cc774da72dd7fac8de046523e6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 26 19:29:50 2015 +0100 add some logs when deleting an attachment Summary of changes: .../persistence/service/AttachmentPersistenceServiceImpl.java | 6 +++++- .../service/FishingOperationPersistenceServiceImpl.java | 8 -------- .../tutti/persistence/service/util/BatchPersistenceHelper.java | 8 ++++++++ 3 files changed, 13 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 (48e8416 -> dc0722c)
by codelutin.com scm 26 Mar '15

26 Mar '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 48e8416 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new dc0722c refs #6819: ajout des pièces jointes dans l'export 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 dc0722c74082427d6ff2bea837e7ae62d97a4bf4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Mar 26 19:15:06 2015 +0100 refs #6819: ajout des pièces jointes dans l'export Summary of changes: .../genericformat/GenericFormatArchive.java | 11 +- .../genericformat/GenericFormatExportContext.java | 77 +++++++++++- .../GenericFormatExportOperationContext.java | 11 ++ .../genericformat/GenericFormatExportService.java | 37 +++--- .../service/genericformat/csv/AttachmentModel.java | 65 ++++++++++ .../service/genericformat/csv/AttachmentRow.java | 74 +++++++++++ .../service/genericformat/csv/CatchModel.java | 3 +- .../genericformat/csv/ExportSampleCategory.java | 12 ++ .../genericformat/csv/MarineLitterModel.java | 2 + .../service/genericformat/csv/MarineLitterRow.java | 10 ++ .../service/genericformat/csv/OperationModel.java | 4 + .../service/genericformat/csv/OperationRow.java | 20 +++ .../service/genericformat/csv/SurveyModel.java | 2 + .../tutti/service/genericformat/csv/SurveyRow.java | 8 ++ .../producer/CsvProducerForAttachment.java | 139 +++++++++++++++++++++ .../producer/CsvProducerForCatch.java | 7 +- 16 files changed, 458 insertions(+), 24 deletions(-) create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentModel.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/csv/AttachmentRow.java create mode 100644 tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/producer/CsvProducerForAttachment.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch support/3.13.x updated (82b073e -> 511ed00)
by codelutin.com scm 26 Mar '15

26 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git from 82b073e Merge branch 'release/3.13.5' into support/3.13.x new 511ed00 set version to snapshots 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 511ed004e350cf6074c007c8c05aff41e7512470 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 26 11:02:12 2015 +0000 set version to snapshots Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

annotated tag tutti-3.13.5 created (now 6755df8)
by codelutin.com scm 26 Mar '15

26 Mar '15

This is an automated email from the git hooks/post-receive script. New change to annotated tag tutti-3.13.5 in repository tutti. See http://git.codelutin.com/tutti.git at 6755df8 (tag) tagging 82b073e2ca65facb0d37452b8056c6e174023f8b (commit) replaces tutti-3.13.4 tagged by Maven Release on Thu Mar 26 10:59:48 2015 +0000 - Log ----------------------------------------------------------------- Tutti release 3.13.5 ----------------------------------------------------------------------- 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 support/3.13.x updated (6675870 -> 82b073e)
by codelutin.com scm 26 Mar '15

26 Mar '15

This is an automated email from the git hooks/post-receive script. New change to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git from 6675870 fixes #6847: [REFERENTIEL] Utilisation de la constante adagio.enumeration.DepartmentCode.INSIDE_PREFIX (bis!) Merge branch 'feature/6847' into support/3.13.x new a3fa53a set version to release new 82b073e Merge branch 'release/3.13.5' into support/3.13.x 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 82b073e2ca65facb0d37452b8056c6e174023f8b Merge: 6675870 a3fa53a Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 26 10:58:59 2015 +0000 Merge branch 'release/3.13.5' into support/3.13.x commit a3fa53afef0430b8313da375a3101a0175dd3fd9 Author: Maven Release <maven-release(a)codelutin.com> Date: Thu Mar 26 10:44:07 2015 +0000 set version to release Summary of changes: pom.xml | 2 +- tutti-ichtyometer/pom.xml | 2 +- tutti-persistence/pom.xml | 2 +- tutti-report-generator/pom.xml | 2 +- tutti-service/pom.xml | 2 +- tutti-ui-swing-updater/pom.xml | 2 +- tutti-ui-swing/pom.xml | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2