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

branch feature/8035 updated (c21f7d2 -> 2d3f169)
by codelutin.com scm 01 Mar '16

01 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8035 in repository tutti. See http://git.codelutin.com/tutti.git from c21f7d2 Ajout d'un hightlighter pour grouper et alterner la couleur de fond pour les espèces (See #8035) adds 2d3f169 Mise en évidence des lignes à ne pas prélever (Fixes #8036) No new revisions were added by this update. Summary of changes: .../CalcifiedPiecesSamplingEditorUIHandler.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/ecran_obs_individuelles updated (cf52df3 -> 9e962b9)
by codelutin.com scm 01 Mar '16

01 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/ecran_obs_individuelles in repository tutti. See http://git.codelutin.com/tutti.git from cf52df3 - copie des donnees d'observation individuelles dans le tableau des mensurations en fonction du mode - suppression ou ecrasement des données au changement de mode de copie refs #8019 new 7213e28 - suppression des lignes d'observations individuelles sur - correction de l'affichage de l'histogramme des mensurations refs #8019 new 52b5e76 remplissage des lignes vides lors de l'ajout en rafale (refs #8019) new 8f3eab7 correction de l'incrément des lignes quand on quitte et revient sur l'ecran des mensurations (refs #8019) new 7ec84d0 suppression des lignes d'observation individuelles générées en rafale quand on supprime le log correspondant (refs #8019) new 9e962b9 - validation des lignes d'observations - correction de l'ouverture de l'editeur de caracteristiques refs #8019 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 9e962b9ab0137fadd99939ce525444a2ede9b871 Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 1 18:57:28 2016 +0100 - validation des lignes d'observations - correction de l'ouverture de l'editeur de caracteristiques refs #8019 commit 7ec84d07dfeb707e5bf9ce8d5bdde914f08b981e Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 1 15:05:06 2016 +0100 suppression des lignes d'observation individuelles générées en rafale quand on supprime le log correspondant (refs #8019) commit 8f3eab7b03b9fa919626ad4fd36e3e1f8b31cccf Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 1 14:57:43 2016 +0100 correction de l'incrément des lignes quand on quitte et revient sur l'ecran des mensurations (refs #8019) commit 52b5e76bbc5d3ba49c46ae81859fd20e1548ff5f Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 1 14:45:52 2016 +0100 remplissage des lignes vides lors de l'ajout en rafale (refs #8019) commit 7213e28bef08c393e787d7f7a0a4eef7906e19cb Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Mar 1 12:01:02 2016 +0100 - suppression des lignes d'observations individuelles sur - correction de l'affichage de l'histogramme des mensurations refs #8019 Summary of changes: .../content/operation/catches/EditCatchesUI.jaxx | 6 + .../operation/catches/EditCatchesUIHandler.java | 54 +++++- .../accidental/AccidentalBatchUIHandler.java | 5 +- .../IndividualObservationBatchTableModel.java | 26 ++- .../frequency/SpeciesFrequencyLogRowModel.java | 11 ++ .../frequency/SpeciesFrequencyUIHandler.java | 188 ++++++++++++++------- .../species/frequency/SpeciesFrequencyUIModel.java | 121 +++++++++++-- .../actions/ApplySpeciesFrequencyRafaleAction.java | 19 ++- .../DeleteSpeciesFrequencyLogRowAction.java | 7 + .../frequency/actions/RemoveObservationAction.java | 1 + .../actions/ResetSpeciesFrequencyAction.java | 4 +- .../CaracteristicMapCellComponent.java | 2 +- .../CaracteristicMapColumnUIHandler.java | 4 +- .../caracteristics/CaracteristicMapEditorUI.jaxx | 2 +- 14 files changed, 354 insertions(+), 96 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch feature/8035 created (now c21f7d2)
by codelutin.com scm 01 Mar '16

01 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8035 in repository tutti. See http://git.codelutin.com/tutti.git at c21f7d2 Ajout d'un hightlighter pour grouper et alterner la couleur de fond pour les espèces (See #8035) This branch includes the following new commits: new c21f7d2 Ajout d'un hightlighter pour grouper et alterner la couleur de fond pour les espèces (See #8035) 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 c21f7d22c39da06955f28f884b29a7b7e1cda634 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 18:02:41 2016 +0100 Ajout d'un hightlighter pour grouper et alterner la couleur de fond pour les espèces (See #8035) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/8029 created (now 02e6144)
by codelutin.com scm 01 Mar '16

01 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8029 in repository tutti. See http://git.codelutin.com/tutti.git at 02e6144 Utilisation d'un vrai drapeau pour savoir si l'utilisateur a bien valider le nouvel intervalle (See #8029) This branch includes the following new commits: new 02e6144 Utilisation d'un vrai drapeau pour savoir si l'utilisateur a bien valider le nouvel intervalle (See #8029) 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 02e61440cf232d03a3c7465d8ead75acb132a5b7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 17:12:38 2016 +0100 Utilisation d'un vrai drapeau pour savoir si l'utilisateur a bien valider le nouvel intervalle (See #8029) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

branch feature/8033 created (now 608eee4)
by codelutin.com scm 01 Mar '16

01 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/8033 in repository tutti. See http://git.codelutin.com/tutti.git at 608eee4 Changement du comparateur de lignes de l'éditeur de prélèvement des pièces calcifiées (See #8033) This branch includes the following new commits: new 7250846 Changement de l'ordre d'insertion des lignes (See #8033) new 608eee4 Changement du comparateur de lignes de l'éditeur de prélèvement des pièces calcifiées (See #8033) 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 608eee40da45127b4eaf7bfc9f74b451d8b47966 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 16:56:03 2016 +0100 Changement du comparateur de lignes de l'éditeur de prélèvement des pièces calcifiées (See #8033) commit 7250846a3d78139b681826abf03aeda91cb3c9db Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 16:43:44 2016 +0100 Changement de l'ordre d'insertion des lignes (See #8033) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop updated (ef6e386 -> 0e085e8)
by codelutin.com scm 01 Mar '16

01 Mar '16

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 ef6e386 Fixes #8023 Merge branch 'feature/8023' into develop new 2b01ccc Mise à jour de l'aide en ligne new 0e085e8 Merge branch 'feature/7962' into develop The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 0e085e86a2b7cce7b4232591a29b0ebe3a9ad0d4 Merge: ef6e386 2b01ccc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 16:38:33 2016 +0100 Merge branch 'feature/7962' into develop commit 2b01ccc829a5bc246f24f40cc315a8731230cfb9 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 16:21:26 2016 +0100 Mise à jour de l'aide en ligne Summary of changes: tutti-ui-swing/src/main/help/fr/config.html | 60 +++++---- .../src/main/help/fr/editFishingOperation.html | 137 +++++++++++++++------ tutti-ui-swing/src/main/help/fr/selectCruise.html | 2 +- 3 files changed, 134 insertions(+), 65 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2

branch develop-4.4.x updated (d9886ac -> 95d2856)
by codelutin.com scm 01 Mar '16

01 Mar '16

This is an automated email from the git hooks/post-receive script. New change to branch develop-4.4.x in repository tutti. See http://git.codelutin.com/tutti.git from d9886ac [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 01f94ca Mise à jour de l'aide en ligne new b88216e Mise à jour du guide utilisateur new 95d2856 Fixes #7962 Merge branch 'feature/7962' into develop-4.4.x 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 95d2856d1d9be778a34d3be32aecdb44a6347daf Merge: d9886ac b88216e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 16:23:26 2016 +0100 Fixes #7962 Merge branch 'feature/7962' into develop-4.4.x commit b88216e6de2a4a5ad9d077efd1070864315db4ba Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 16:23:20 2016 +0100 Mise à jour du guide utilisateur commit 01f94ca45813e9b6f0c6a3ad3ad313759b11bba1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Mar 1 16:21:26 2016 +0100 Mise à jour de l'aide en ligne Summary of changes: .../help/Guide_utilisation_Allegro_Campagne.pdf | Bin 1996569 -> 1988880 bytes tutti-ui-swing/src/main/help/fr/config.html | 60 +++++---- .../src/main/help/fr/editFishingOperation.html | 137 +++++++++++++++------ tutti-ui-swing/src/main/help/fr/selectCruise.html | 2 +- 4 files changed, 134 insertions(+), 65 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch develop updated (d65d8e3 -> ef6e386)
by codelutin.com scm 01 Mar '16

01 Mar '16

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 d65d8e3 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new ac9f784 Ajout du batchId sur l'entitié IndividualObservation (See #8023) new 7560d97 o Modification du modèle pour avoir les identifiants des lots dans les observations individuelles o Amélioration de l'API de persistence pour utiliser les bons types d'identifiants (Integer au lieu de String) o Nettoyage de code (java 8, variables inline, imports non optimisés, variables non utilisées) new ef6e386 Fixes #8023 Merge branch 'feature/8023' into develop 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 ef6e38657a9c3413e70997150db3a72e1c6a55e1 Merge: d65d8e3 7560d97 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Feb 27 08:24:35 2016 +0100 Fixes #8023 Merge branch 'feature/8023' into develop commit 7560d9797ab141f8af8179dd5c1ea38767850c63 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Feb 26 12:42:09 2016 +0100 o Modification du modèle pour avoir les identifiants des lots dans les observations individuelles o Amélioration de l'API de persistence pour utiliser les bons types d'identifiants (Integer au lieu de String) o Nettoyage de code (java 8, variables inline, imports non optimisés, variables non utilisées) commit ac9f78414833fedcc4d4ebc29307012fc780ade6 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Feb 26 07:38:45 2016 +0100 Ajout du batchId sur l'entitié IndividualObservation (See #8023) Summary of changes: .../ichtyometer/interactive/CommandEngine.java | 6 +- .../tutti/ichtyometer/tool/FeedReaderTool.java | 49 +- .../tutti/ichtyometer/tool/SendCommandTool.java | 37 +- .../java/fr/ifremer/tutti/ichtyometer/BigFins.java | 19 +- .../tutti/ichtyometer/feed/FeedReaderTest.java | 9 +- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 68 +-- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../tutti/persistence/TuttiPersistence.java | 4 +- .../tutti/persistence/TuttiPersistenceImpl.java | 133 +++--- .../persistence/TuttiPersistenceNoDbImpl.java | 93 ++-- .../persistence/dao/TaxonNameDaoTuttiImpl.java | 9 +- .../tutti/persistence/entities/TuttiEntities.java | 35 +- .../tutti/persistence/entities/data/Cruises.java | 16 +- .../entities/data/FishingOperations.java | 9 +- .../tutti/persistence/entities/data/Programs.java | 17 +- .../persistence/entities/data/SampleCategory.java | 2 +- .../entities/data/SampleCategoryModel.java | 3 +- .../entities/data/SpeciesAbleBatchs.java | 3 +- .../persistence/entities/data/SpeciesBatchs.java | 8 +- .../entities/protocol/SpeciesProtocols.java | 8 +- .../entities/protocol/TuttiProtocols.java | 18 +- .../entities/protocol/v1/TuttiProtocolBean1.java | 75 +-- .../entities/protocol/v2/TuttiProtocolBean2.java | 102 ++-- .../entities/protocol/v3/SpeciesProtocolBean3.java | 34 +- .../entities/protocol/v3/TuttiProtocolBean3.java | 136 ++---- .../persistence/entities/referential/Gears.java | 44 +- .../persistence/entities/referential/Persons.java | 14 +- .../persistence/entities/referential/Speciess.java | 76 +-- .../entities/referential/TaxonCache.java | 6 +- .../entities/referential/TaxonCaches.java | 12 +- .../entities/referential/TuttiLocations.java | 32 +- .../persistence/entities/referential/Vessels.java | 52 +-- .../tutti/persistence/model/DataModelSupport.java | 5 + .../persistence/model/OperationDataModel.java | 11 +- .../service/AbstractPersistenceService.java | 62 ++- .../service/AccidentalBatchPersistenceService.java | 6 +- .../AccidentalBatchPersistenceServiceImpl.java | 8 +- .../service/AttachmentPersistenceServiceImpl.java | 10 +- .../service/BenthosBatchPersistenceService.java | 21 +- .../BenthosBatchPersistenceServiceImpl.java | 40 +- .../service/CatchBatchPersistenceService.java | 8 +- .../service/CatchBatchPersistenceServiceImpl.java | 16 +- .../service/CruisePersistenceService.java | 6 +- .../service/CruisePersistenceServiceImpl.java | 40 +- .../FishingOperationPersistenceService.java | 12 +- .../FishingOperationPersistenceServiceImpl.java | 66 ++- ...dividualObservationBatchPersistenceService.java | 14 +- ...dualObservationBatchPersistenceServiceImpl.java | 137 ++++-- .../MarineLitterBatchPersistenceService.java | 6 +- .../MarineLitterBatchPersistenceServiceImpl.java | 14 +- .../service/ProgramPersistenceServiceImpl.java | 16 +- .../service/ProtocolPersistenceServiceImpl.java | 11 +- .../service/SpeciesBatchPersistenceService.java | 21 +- .../SpeciesBatchPersistenceServiceImpl.java | 46 +- .../service/TechnicalPersistenceServiceImpl.java | 3 +- .../service/TuttiPersistenceServiceLocator.java | 6 +- .../CaracteristicPersistenceServiceImpl.java | 42 +- .../referential/GearPersistenceServiceImpl.java | 6 +- .../ObjectTypePersistenceServiceImpl.java | 3 +- .../referential/PersonPersistenceServiceImpl.java | 6 +- .../ReferentialPersistenceServiceSupport.java | 6 +- .../referential/SpeciesPersistenceServiceImpl.java | 3 +- .../service/util/BatchPersistenceHelper.java | 73 ++- .../persistence/service/util/BatchTreeHelper.java | 3 +- .../service/util/MeasurementPersistenceHelper.java | 3 +- .../tutti/persistence/test/DatabaseFixtures.java | 21 +- .../main/java/fr/ifremer/tutti/util/Numbers.java | 3 +- .../main/java/fr/ifremer/tutti/util/Weights.java | 3 +- .../src/main/resources/queries-failsafe.hbm.xml | 21 +- .../src/main/xmi/tutti-persistence.zargo | Bin 62284 -> 62341 bytes .../config/TuttiPersistenceConfigTest.java | 3 +- ...AccidentalBatchPersistenceServiceWriteTest.java | 60 ++- .../BenthosBatchPersistenceServiceReadTest.java | 10 +- .../BenthosBatchPersistenceServiceWriteTest.java | 46 +- .../CatchBatchPersistenceServiceReadTest.java | 2 +- .../CatchBatchPersistenceServiceWriteTest.java | 18 +- .../service/CruisePersistenceServiceReadTest.java | 2 +- .../service/CruisePersistenceServiceWriteTest.java | 6 +- ...hingOperationPersistenceServiceAno4995Test.java | 5 +- ...ishingOperationPersistenceServiceWriteTest.java | 16 +- ...bservationBatchPersistenceServiceWriteTest.java | 50 +- ...rineLitterBatchPersistenceServiceWriteTest.java | 16 +- .../SpeciesBatchPersistenceServiceReadTest.java | 10 +- .../SpeciesBatchPersistenceServiceWriteTest.java | 42 +- .../tutti/service/AbstractTuttiService.java | 37 +- .../fr/ifremer/tutti/service/DecoratorService.java | 7 +- .../ifremer/tutti/service/PersistenceService.java | 131 +++--- .../fr/ifremer/tutti/service/TuttiDataContext.java | 96 ++-- .../fr/ifremer/tutti/service/TuttiDecorator.java | 8 +- .../ifremer/tutti/service/TuttiServiceContext.java | 6 +- .../ifremer/tutti/service/ValidationService.java | 54 +-- .../tutti/service/bigfin/BigfinImportContext.java | 37 +- .../tutti/service/bigfin/BigfinImportService.java | 33 +- .../service/bigfin/csv/BigfinDataRowModel.java | 3 +- .../fr/ifremer/tutti/service/bigfin/signs/Sex.java | 8 +- .../ifremer/tutti/service/bigfin/signs/Size.java | 8 +- .../tutti/service/bigfin/signs/VracHorsVrac.java | 8 +- .../catches/ValidateCruiseOperationsService.java | 34 +- .../service/catches/WeightCleaningService.java | 50 +- .../service/catches/WeightComputingService.java | 13 +- .../catches/multipost/AttachmentRowModel.java | 9 +- .../catches/multipost/MultiPostExportService.java | 18 +- .../catches/multipost/MultiPostImportService.java | 512 ++++++++++----------- .../csv/AbstractTuttiImportExportModel.java | 4 +- .../service/csv/AbstractTuttiImportModel.java | 4 +- .../fr/ifremer/tutti/service/csv/CsvComsumer.java | 6 +- .../tutti/service/csv/GearParserFormatter.java | 3 +- .../tutti/service/csv/HarbourParserFormatter.java | 3 +- .../service/csv/IntegerListParserFormatter.java | 9 +- .../fr/ifremer/tutti/service/csv/TuttiCsvUtil.java | 29 +- .../tutti/service/csv/VesselParserFormatter.java | 3 +- .../tutti/service/export/ExportBatchEntry.java | 3 +- .../tutti/service/export/ExportCatchContext.java | 28 +- .../export/pdf/CatchesPdfExportService.java | 13 +- .../sumatra/CatchesSumatraExportService.java | 16 +- .../ToConfirmReportFishingOperationData.java | 2 +- .../toconfirmreport/ToConfirmReportService.java | 21 +- .../genericformat/GenericFormatArchive.java | 13 +- .../GenericFormatCheckDataService.java | 14 +- .../genericformat/GenericFormatContextSupport.java | 57 +-- .../genericformat/GenericFormatExportContext.java | 21 +- .../GenericFormatExportOperationContext.java | 10 +- .../genericformat/GenericFormatExportService.java | 25 +- .../GenericFormatImportCruiseContext.java | 18 +- .../GenericFormatImportOperationContext.java | 13 +- .../genericformat/GenericFormatImportService.java | 60 +-- .../GenericFormatImportValidationHelper.java | 9 +- .../genericformat/GenericFormatResultSupport.java | 3 +- .../GenericFormatValidateFileContext.java | 60 ++- .../GenericformatImportPersistenceHelper.java | 39 +- .../consumer/CruiseNotValidException.java | 3 +- .../consumer/CsvConsumerForCatch.java | 10 +- .../FishingOperationNotValidException.java | 3 +- .../genericformat/csv/AccidentalCatchModel.java | 3 +- .../service/genericformat/csv/AttachmentModel.java | 3 +- .../service/genericformat/csv/CatchModel.java | 12 +- .../tutti/service/genericformat/csv/CatchRow.java | 3 +- .../genericformat/csv/GearCaracteristicModel.java | 3 +- .../csv/IndividualObservationModel.java | 3 +- .../genericformat/csv/MarineLitterModel.java | 3 +- .../service/genericformat/csv/OperationModel.java | 3 +- .../service/genericformat/csv/ParameterModel.java | 3 +- .../genericformat/csv/SpeciesExportModel.java | 3 +- .../service/genericformat/csv/SurveyModel.java | 3 +- .../exportactions/CreateCatchBatchRowsAction.java | 3 +- .../ExportGearCaracteristicAction.java | 2 +- .../exportactions/LoadDataAction.java | 4 +- .../importactions/DoCheckWeightAction.java | 18 +- .../importactions/DoCleanWeightAction.java | 18 +- .../importactions/ImportAccidentalCatchAction.java | 2 +- .../importactions/ImportCatchAction.java | 16 +- .../ImportGearCaracteristicAction.java | 25 +- .../ImportIndividualObservationAction.java | 2 +- .../importactions/ImportMarineLitterAction.java | 2 +- .../importactions/ImportOperationAction.java | 55 ++- .../importactions/ImportParameterAction.java | 60 ++- .../ImportReferentialPersonAction.java | 1 - .../ImportReferentialVesselAction.java | 1 - .../importactions/ImportSurveyAction.java | 2 +- .../importactions/RestoreAfterImportAction.java | 14 +- .../importactions/RestoreAfterValidateAction.java | 62 +-- .../importactions/ValidateSurveyAction.java | 2 +- .../producer/CsvProducerForCatch.java | 4 +- .../producer/CsvProducerForSpecies.java | 8 +- .../FishingOperationImportService.java | 8 +- .../operationimport/ImportFromColumnFileModel.java | 67 ++- .../protocol/ProtocolImportExportService.java | 23 +- .../service/psionimport/PsionImportModel.java | 3 +- .../service/psionimport/PsionImportService.java | 8 +- .../service/pupitri/PupitriExportService.java | 10 +- .../service/pupitri/PupitriImportService.java | 8 +- .../service/pupitri/PupitriSpeciesContext.java | 3 +- .../tutti/service/pupitri/csv/CarrouselRow.java | 3 +- .../pupitri/report/PupitriImportReportModel.java | 6 +- .../referential/ReferentialImportRequest.java | 4 +- .../ReferentialTemporaryGearService.java | 6 +- .../ReferentialTemporaryPersonService.java | 6 +- .../ReferentialTemporarySpeciesService.java | 3 +- .../ReferentialTemporaryVesselService.java | 3 +- .../TuttiReferentialSynchronizeService.java | 3 +- .../tutti/service/referential/csv/PersonRow.java | 3 +- .../producer/CsvProducerForTemporaryGear.java | 10 +- .../producer/CsvProducerForTemporaryPerson.java | 10 +- .../producer/CsvProducerForTemporarySpecies.java | 10 +- .../producer/CsvProducerForTemporaryVessel.java | 10 +- .../service/report/ReportGenerationRequest.java | 12 +- .../service/report/ReportGenerationResult.java | 4 +- .../service/report/ReportGenerationService.java | 16 +- .../tutti/service/PersistenceServiceTest.java | 94 ++-- .../ifremer/tutti/service/ServiceDbResource.java | 49 +- .../service/bigfin/BigfinImportService2Test.java | 8 +- .../service/bigfin/BigfinImportServiceTest.java | 12 +- .../catches/WeightComputingServiceTest.java | 16 +- .../multipost/MultiPostExportServiceTest.java | 6 +- .../multipost/MultiPostImportServiceTest.java | 2 +- .../export/pdf/CatchesPdfExportServiceTest.java | 4 +- .../sumatra/CatchesSumatraExportServiceTest.java | 12 +- .../GenericFormatExportServiceAno5804Test.java | 10 +- .../GenericFormatExportServiceAno7992Test.java | 10 +- .../GenericFormatExportServiceTest.java | 10 +- .../psionimport/PsionImportServiceTest.java | 40 +- .../pupitri/PupitriImportServiceAno3898Test.java | 6 +- .../pupitri/PupitriImportServiceAno5032Test.java | 6 +- .../pupitri/PupitriImportServiceAno5079Test.java | 6 +- .../pupitri/PupitriImportServiceEvo5060Test.java | 6 +- .../pupitri/PupitriImportServiceEvo5062Test.java | 6 +- .../pupitri/PupitriImportServiceEvo6116Test.java | 6 +- .../pupitri/PupitriImportServiceEvo6149Test.java | 6 +- .../pupitri/PupitriImportServiceEvo6592Test.java | 6 +- .../service/pupitri/PupitriImportServiceTest.java | 10 +- .../pupitri/PupitryImportServiceTestSupport.java | 6 +- .../ReferentialTemporarySpeciesServiceTest.java | 2 +- .../report/ReportGenerationServiceTest.java | 4 +- .../tutti/ui/swing/updater/UpdateModule.java | 3 +- .../ui/swing/updater/UpdaterFileSystemPathes.java | 24 +- .../java/fr/ifremer/tutti/ui/swing/RunTutti.java | 7 +- .../ifremer/tutti/ui/swing/TuttiActionFactory.java | 3 +- .../fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 35 +- .../content/actions/ConnectIchtyometerAction.java | 33 +- .../EditCatchesForSelectedCruiseAction.java | 23 +- .../OpenTemporaryReferentialScreenAction.java | 7 +- .../ui/swing/content/actions/ShowAboutAction.java | 48 +- .../category/EditSampleCategoryModelUIHandler.java | 27 +- .../actions/AddSampleCategoryRowAction.java | 11 +- .../swing/content/config/TuttiConfigUIHandler.java | 37 +- .../swing/content/cruise/EditCruiseUIHandler.java | 54 +-- .../cruise/GearCaracteristicsEditorTableModel.java | 3 +- .../cruise/GearCaracteristicsEditorUIHandler.java | 23 +- .../actions/EditGearCaracteristicsAction.java | 4 +- .../content/cruise/actions/SaveCruiseAction.java | 4 +- .../actions/ViewGearCaracteristicsAction.java | 4 +- .../ui/swing/content/db/DbManagerUIHandler.java | 34 +- .../genericformat/tree/ProgramSelectTreeNode.java | 5 +- .../swing/content/home/SelectCruiseUIHandler.java | 119 ++--- .../content/home/actions/CloneProtocolAction.java | 2 +- .../content/home/actions/EditCatchesAction.java | 23 +- .../content/home/actions/EditProtocolAction.java | 2 +- .../home/actions/ExportCruiseForSumatraAction.java | 2 +- .../home/actions/SendCruiseReportAction.java | 2 +- .../SpeciesToConfirmReportForCruiseAction.java | 2 +- .../operation/EditFishingOperationUIHandler.java | 200 ++++---- .../operation/EditFishingOperationUIModel.java | 3 +- .../operation/FishingOperationsUIHandler.java | 120 +++-- .../operation/FishingOperationsUIModel.java | 10 +- .../catches/AbstractTuttiBatchTableUIHandler.java | 44 +- .../content/operation/catches/CatchCustomTab.java | 13 +- .../operation/catches/EditCatchesSvgHandler.java | 330 ++++++------- .../operation/catches/EditCatchesUIHandler.java | 20 +- .../operation/catches/EditCatchesUIModel.java | 24 +- .../catches/MultiPostImportLogDialogHandler.java | 5 - .../catches/SampleCategoryColumnIdentifier.java | 15 +- .../operation/catches/SampleCategoryComponent.java | 26 +- .../catches/SpeciesAbleBatchRowHelper.java | 5 +- .../operation/catches/SpeciesBatchDecorator.java | 2 +- .../accidental/AccidentalBatchTableModel.java | 9 +- .../accidental/AccidentalBatchUIHandler.java | 5 +- .../actions/CancelEditCatchBatchAction.java | 12 +- .../catches/actions/CleanBatchWeightsAction.java | 4 +- .../catches/actions/ComputeBatchWeightsAction.java | 4 +- .../ExportFishingOperationForSumatraAction.java | 4 +- .../ExportFishingOperationReportAction.java | 2 +- .../actions/ExportMultiPostActionSupport.java | 3 +- .../actions/ExportMultiPostCatchAction.java | 3 +- .../actions/ImportMultiPostActionSupport.java | 3 +- .../actions/ImportMultiPostCatchAction.java | 6 +- .../catches/benthos/BenthosBatchRowModel.java | 17 +- .../catches/benthos/BenthosBatchUIHandler.java | 175 +++---- .../benthos/actions/CreateBenthosMelagAction.java | 10 +- .../actions/ImportMultiPostBenthosAction.java | 3 +- .../OpenEditBenthosBatchFrequencyUIAction.java | 5 - .../benthos/actions/RemoveBenthosBatchAction.java | 6 +- .../actions/RemoveBenthosSubBatchAction.java | 2 +- .../benthos/actions/RenameBenthosBatchAction.java | 2 +- .../benthos/create/CreateBenthosBatchUIModel.java | 6 +- .../CreateBenthosBatchAndFrequenciesAction.java | 1 - .../frequency/BenthosFrequencyCellComponent.java | 1 - .../frequency/BenthosFrequencyLogsTableModel.java | 3 +- .../frequency/BenthosFrequencyRowModel.java | 3 +- .../frequency/BenthosFrequencyTableModel.java | 108 ++--- .../frequency/BenthosFrequencyUIHandler.java | 92 ++-- .../benthos/frequency/BenthosFrequencyUIModel.java | 5 +- .../frequency/BenthosFrequencyUIModelCache.java | 7 +- ...thosFrequencyLengthStepCaracteristicAction.java | 2 +- .../benthos/split/SplitBenthosBatchRowModel.java | 6 +- .../benthos/split/SplitBenthosBatchUIHandler.java | 8 +- .../IndividualObservationBatchRowModel.java | 10 + .../IndividualObservationBatchUIHandler.java | 5 +- .../IndividualObservationBatchUIModel.java | 5 +- ...enCreateIndividualObservationBatchUIAction.java | 5 - .../RemoveAllIndividualObservationBatchAction.java | 2 +- .../RemoveIndividualObservationBatchAction.java | 2 +- .../CreateIndividualObservationBatchUIHandler.java | 114 ++--- .../marinelitter/MarineLitterBatchUIHandler.java | 5 +- .../actions/ImportMultiPostMarineLitterAction.java | 3 +- .../OpenCreateMarineLitterBatchUIAction.java | 5 - .../actions/RemoveMarineLitterBatchAction.java | 7 +- .../create/CreateMarineLitterBatchUIModel.java | 6 +- .../ImportPupitriMelagWeightPopupUIHandler.java | 5 - .../ImportPupitriMelagWeightPopupUIModel.java | 2 +- .../species/ImportPupitriPopupUIHandler.java | 18 +- .../catches/species/SpeciesBatchRowModel.java | 18 +- .../catches/species/SpeciesBatchUIHandler.java | 187 +++----- .../actions/ImportMultiPostSpeciesAction.java | 3 +- .../actions/OpenCreateSpeciesBatchUIAction.java | 5 - .../OpenEditSpeciesBatchFrequencyUIAction.java | 5 - .../species/actions/RemoveSpeciesBatchAction.java | 6 +- .../actions/RemoveSpeciesSubBatchAction.java | 2 +- .../species/actions/RenameSpeciesBatchAction.java | 2 +- .../species/create/CreateSpeciesBatchUIModel.java | 6 +- .../frequency/SpeciesFrequencyCellComponent.java | 1 - .../frequency/SpeciesFrequencyLogsTableModel.java | 3 +- .../frequency/SpeciesFrequencyRowModel.java | 3 +- .../frequency/SpeciesFrequencyTableModel.java | 108 ++--- .../frequency/SpeciesFrequencyUIHandler.java | 115 ++--- .../species/frequency/SpeciesFrequencyUIModel.java | 5 +- .../frequency/SpeciesFrequencyUIModelCache.java | 7 +- ...ciesFrequencyLengthStepCaracteristicAction.java | 2 +- .../species/split/SplitSpeciesBatchRowModel.java | 6 +- .../species/split/SplitSpeciesBatchUIHandler.java | 8 +- .../fishing/AbstractCaracteristicRowModel.java | 10 +- .../fishing/AbstractCaracteristicTabUIModel.java | 6 +- .../fishing/GearUseFeatureTabUIHandler.java | 7 - .../fishing/GearUseFeatureTableModel.java | 3 +- .../fishing/VesselUseFeatureTabUIHandler.java | 7 - .../fishing/VesselUseFeatureTableModel.java | 3 +- .../actions/DeleteFishingOperationAction.java | 2 +- .../actions/EditFishingOperationAction.java | 65 ++- ...perationCaracteristicsFromColumnFileAction.java | 11 +- .../content/program/EditProgramUIHandler.java | 3 +- .../EditProtocolCaracteristicsRowModel.java | 2 +- .../protocol/EditProtocolSpeciesRowModel.java | 36 +- .../protocol/EditProtocolSpeciesTableModel.java | 25 +- .../content/protocol/EditProtocolUIHandler.java | 3 +- .../content/protocol/EditProtocolUIModel.java | 24 +- .../MandatorySampleCategoryColumnIdentifier.java | 3 +- .../actions/ExportProtocolBenthosAction.java | 14 +- .../actions/ExportProtocolSpeciesAction.java | 12 +- .../protocol/actions/ExportPupitriAction.java | 16 +- .../actions/ImportProtocolBenthosAction.java | 2 +- .../actions/ImportProtocolSpeciesAction.java | 2 +- .../actions/RemoveCaracteristicMappingAction.java | 6 +- .../MinSizePopupUIHandler.java | 6 - .../actions/DeleteRowAction.java | 8 +- .../actions/DeleteSpeciesAction.java | 5 - .../actions/ExportProtocolCpsAction.java | 3 +- .../actions/ImportProtocolCpsAction.java | 5 +- .../actions/SplitSpeciesAction.java | 5 - .../ui/swing/content/protocol/rtp/RtpButton.java | 23 +- .../content/protocol/rtp/RtpCellRenderer.java | 5 - .../content/protocol/rtp/RtpEditorUIHandler.java | 22 +- .../protocol/zones/actions/AddStratasAction.java | 5 - .../protocol/zones/actions/CreateZoneAction.java | 5 - .../protocol/zones/actions/DeleteZoneAction.java | 5 - .../protocol/zones/actions/RenameZoneAction.java | 5 - .../zones/tree/AbstractZoneEditorTreeModel.java | 6 - .../protocol/zones/tree/StratasTreeModel.java | 7 +- .../protocol/zones/tree/ZoneEditorNode.java | 6 - .../zones/tree/ZoneEditorTreeCellRenderer.java | 5 - .../protocol/zones/tree/ZonesTreeModel.java | 2 +- .../actions/ImportTemporaryGearAction.java | 6 +- .../actions/ImportTemporaryPersonAction.java | 6 +- .../actions/ImportTemporarySpeciesAction.java | 6 +- .../actions/ImportTemporaryVesselAction.java | 6 +- .../actions/OpenReplaceTemporaryGearUIAction.java | 3 +- .../OpenReplaceTemporaryPersonUIAction.java | 3 +- .../OpenReplaceTemporarySpeciesUIAction.java | 3 +- .../OpenReplaceTemporaryVesselUIAction.java | 3 +- .../ui/swing/content/report/ReportUIHandler.java | 2 +- .../ui/swing/content/report/ReportUIModel.java | 10 +- .../validation/ValidateCruiseUIHandler.java | 4 +- .../content/validation/ValidateCruiseUIModel.java | 4 +- .../actions/SaveCruiseToReadyToSynchAction.java | 6 +- .../content/validation/tree/MessageTreeNode.java | 6 +- .../fr/ifremer/tutti/ui/swing/update/Updates.java | 3 +- .../ui/swing/update/module/DbModuleUpdater.java | 12 +- .../ui/swing/util/AbstractTuttiUIHandler.java | 114 ++--- .../ifremer/tutti/ui/swing/util/TuttiUIUtil.java | 12 +- .../ui/swing/util/actions/SimpleActionSupport.java | 12 +- .../ui/swing/util/attachment/ButtonAttachment.java | 14 +- .../CaracteristicMapCellComponent.java | 3 +- .../CaracteristicMapEditorTableModel.java | 3 +- .../caracteristics/CaracteristicValueEditor.java | 3 +- .../computable/ComputableDataEditorHandler.java | 36 +- .../util/computable/ComputableDataTableCell.java | 16 +- .../swing/util/editor/TuttiLocationTableCell.java | 2 +- .../ui/swing/util/editor/VesselTableCell.java | 2 +- .../swing/util/species/SelectSpeciesUIHandler.java | 9 +- .../util/table/AbstractTuttiTableUIHandler.java | 13 +- .../util/table/CaracteristicColumnIdentifier.java | 3 +- 389 files changed, 3214 insertions(+), 4756 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

branch feature/ecran_obs_individuelles updated (be0ac0e -> cf52df3)
by codelutin.com scm 29 Feb '16

29 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/ecran_obs_individuelles in repository tutti. See http://git.codelutin.com/tutti.git discards be0ac0e - copie des donnees d'observation individuelles dans le tableau des mensurations en fonction du mode - suppression ou ecrasement des données au changement de mode de copie refs #8019 discards a9c22e9 use lanbdas where possible discards 815f48c - ajout du numéro de l'observation - suppression d'observations refs #8019 discards f600d0c ajout d'une ligne d'observation individuelle quand on ajoute en rafale (refs #8019) discards bed9756 graph des poids moyens (refs #8019) discards 6a26e7b titre de la popup de l'histogramme (refs #8019) discards 47891d3 une seule popup pour l'histogramme pour pouvoir la fermer quand on quitte (refs #8019) discards 2e5ab37 vérification que le poids saisi est proche du poids calculé avec la RTP (refs #8019) discards 6c3ee17 utilisation des rtp pour calculer les poids des lignes de mensuration (refs #8019) discards 02b0ee4 affichage de l'histogramme dans une popup (refs #8019) discards df1825b - suppression de l'onglet observations individuelles dans la capture - ajout des lignes dans la table d'obs individuelles dans les mensurations (refs #8019) discards aa1354f activtation ou desactivation de cellules de la tables des mensurations en fonction du mode de copie (refs #6926) discards a90fe9c organize imports discards 5de9cd8 ajout du model de colonnes de la table des observations (refs #6926) discards 3a3bdac - use jaxx 2.29-SNAPSHOT - correction du mode de config à l'ouverture de l'écran - ajout de useRTP dans le modele refs #6926 discards 3bd5e2e mise en page de l'écran refs #6926 discards 065fdd7 début de réarrangement de l'écran des mensurations refs #6926 adds 4ff1062 Simplification du code de calcul du raising factor final adds e5b5506 Ajout d'un test pour vérifier le calcul du raising factor final adds b68bfe7 Ajout méthode pour récupérer la dernière catégorie renseignée adds 8521235 Utilisation des bonnes catégories pour compléter le sampleWeight (utilisé pour le calcul du raising factor final) adds 1fe175a Fixes #7992 Merge branch 'feature/7992_erreur_calcul_coef_final' into develop adds fad5ce9 Utilisation des bonnes catégories pour compléter le sampleWeight (utilisé pour le calcul du raising factor final) adds c413e57 on ne pousse que les heures et les minutes quand on appelle set...Time (fixes #7996) adds 36d483b Fixes #7996 Merge branch 'feature/7996' into develop adds 39656ac Use pom 7-SNAPSHOT adds 463a07a Début de correction mais il me faut une confirmation de Vincent sur le sujet adds c796f8c Fix test values adds dee8e16 Ajout de nouveaux tests sur le calcul du RF final adds 3f598ad Bien tenir compte de la sous fraction dans le cas de mensurations s'il y a un sous-échantillonage (See #8014) adds f5449e2 Merge branch 'feature/8014' into 'develop' adds 85b0363 Use codelutinpom 7 adds caa6781 Do not use https for project url adds ca7d26b Mise à jour du guide utilisateur adds 27ed7e0 3. ajouter colonne « observations individuelles ». Cette case ne peut être cochée que si « méthode de mensuration » est renseignée refs #8013 adds 1e2aa09 4. ajouter colonne « maturité » et pour chaque taxon proposer liste psfm pour pointer sur l'échelle de maturité adaptée au taxon refs #8013 adds ddf9722 - suppression des colonnes dénombrement et pièces caclifiées - ajout de la colonne type de piece calcifiée refs #8013 adds 2381cf1 wording (refs #8013) adds 523e218 migration du protocole (refs #8013) adds c6bba11 cocher maturité dans l'éditeur de pieces calcifiées si l'espèce sélectionnée a un pmfm de maturité (refs #8013) adds 87cb8c1 Il faut n'autoriser que les taxons dont on a une méthode de mensuration renseigner et du coup il faut aussi demander une confirmation à l'utilisateur si il veut supprimer la méthode de mensuration dans l'onglet espèces (ou benthos) car cela va supprimer des lignes dans l'onglet algo (refs #8013) adds 1a9cd1e ajout du highlighter sur la table des cps (refs #8013) adds 9e44081 coorection de la validité des lignes (refs #8013) adds 370751c test que l'espèce a une méthode de mensuration à l'import de l'algo de pieces calcifiees (refs #8013) adds 883d2f9 modif du nom par défaut des fichiers d'export (refs #8013) adds ad65665 - correction de l'import / export - correction des tests (fixes #8013) adds f3d31f7 wording adds 7d8e1ee correction de la version courante du protocole (fixes #8013) adds ede141d Changement de l'ordre des colonnes dans l'onglet espèces et benthos adds 295d098 Ajout de méthode withXXX sur SpeciesProtocol + bien modifier le modèle global lors d'une modification du tableau des espèces des pièces calcifiées adds 041d0ec Wording toi même! adds a0118c9 Suppression des annotation de génération sur du code non généré adds f5ccf41 Fixes #8013 Merge branch 'feature/8013' into develop adds 7ef3920 Correction du poids total espèce vivant non détaillé trié non exporté (see #8022) adds dbdd317 Correction du poids total espèce vrac non exporté (see #8022) adds 441e785 fixes #8022 Merge branch 'feature/8022' into develop adds dc9b003 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 6d7f9a0 [jgitflow-maven-plugin]updating poms for 4.5-alpha-1 branch with snapshot versions adds 809bcd9 Add missing license headers adds 1ef3936 [jgitflow-maven-plugin]updating poms for branch'release/4.5-alpha-1' with non-snapshot versions adds 43e9096 [jgitflow-maven-plugin]merging 'release/4.5-alpha-1' into 'master' adds 0882928 [jgitflow-maven-plugin]merging 'master' into 'develop' adds d65d8e3 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 34425f8 début de réarrangement de l'écran des mensurations refs #6926 new c8938cb mise en page de l'écran refs #6926 new fac69d8 - use jaxx 2.29-SNAPSHOT - correction du mode de config à l'ouverture de l'écran - ajout de useRTP dans le modele refs #6926 new 998f893 ajout du model de colonnes de la table des observations (refs #6926) new 9ad8c03 organize imports new 47f37ea activtation ou desactivation de cellules de la tables des mensurations en fonction du mode de copie (refs #6926) new c7698c5 - suppression de l'onglet observations individuelles dans la capture - ajout des lignes dans la table d'obs individuelles dans les mensurations (refs #8019) new aad6735 affichage de l'histogramme dans une popup (refs #8019) new ee48c20 utilisation des rtp pour calculer les poids des lignes de mensuration (refs #8019) new 948d32d vérification que le poids saisi est proche du poids calculé avec la RTP (refs #8019) new c15557b une seule popup pour l'histogramme pour pouvoir la fermer quand on quitte (refs #8019) new 95f1e47 titre de la popup de l'histogramme (refs #8019) new ce716ac graph des poids moyens (refs #8019) new c7901d3 ajout d'une ligne d'observation individuelle quand on ajoute en rafale (refs #8019) new e980ec1 - ajout du numéro de l'observation - suppression d'observations refs #8019 new f1b29ce use lanbdas where possible new cf52df3 - copie des donnees d'observation individuelles dans le tableau des mensurations en fonction du mode - suppression ou ecrasement des données au changement de mode de copie refs #8019 This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (be0ac0e) \ N -- N -- N refs/heads/feature/ecran_obs_individuelles (cf52df3) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 17 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 cf52df320c4fa37faba9e9f2c0b2022dfb49f183 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Feb 29 16:04:42 2016 +0100 - copie des donnees d'observation individuelles dans le tableau des mensurations en fonction du mode - suppression ou ecrasement des données au changement de mode de copie refs #8019 commit f1b29ce6ba2f02c866567e2c6435cbc9f5be16c4 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 26 16:35:25 2016 +0100 use lanbdas where possible commit e980ec1bd35ce9a6777aa74e7f1b8e98e660005d Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 26 16:23:13 2016 +0100 - ajout du numéro de l'observation - suppression d'observations refs #8019 commit c7901d33fd3c2c87093bff68c9a923fc1d028d10 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 26 14:20:21 2016 +0100 ajout d'une ligne d'observation individuelle quand on ajoute en rafale (refs #8019) commit ce716ac883cf6b7aedcfcf7a27ff962a0f1c5eb3 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 26 11:35:29 2016 +0100 graph des poids moyens (refs #8019) commit 95f1e478713c4499d7ba70d0213d4d91428ed2ce Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 26 10:02:50 2016 +0100 titre de la popup de l'histogramme (refs #8019) commit c15557b50da0a2e1aa3c2556e1f9b198fea8c672 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 25 18:53:22 2016 +0100 une seule popup pour l'histogramme pour pouvoir la fermer quand on quitte (refs #8019) commit 948d32d0b05d2c75c3a1cb470f9a8dc511a2f829 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 25 18:31:22 2016 +0100 vérification que le poids saisi est proche du poids calculé avec la RTP (refs #8019) commit ee48c200b8962663e81503f3fda6761b6e2faf09 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 25 17:43:35 2016 +0100 utilisation des rtp pour calculer les poids des lignes de mensuration (refs #8019) commit aad67356d2f22799d008d5b189b04a5ea0bc89f0 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 25 14:24:41 2016 +0100 affichage de l'histogramme dans une popup (refs #8019) commit c7698c5ff48c63f5b41fbaec3eade4035ce4fb5b Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 25 11:35:02 2016 +0100 - suppression de l'onglet observations individuelles dans la capture - ajout des lignes dans la table d'obs individuelles dans les mensurations (refs #8019) commit 47f37eacb5e5dab3ac86b7447567aa74e80d7a5a Author: Kevin Morin <morin(a)codelutin.com> Date: Tue Feb 23 09:31:57 2016 +0100 activtation ou desactivation de cellules de la tables des mensurations en fonction du mode de copie (refs #6926) commit 9ad8c03d92824d83ecbe0eaf706fbe81ad13653c Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Feb 22 14:30:13 2016 +0100 organize imports commit 998f89331ed84717af00e5aa5349df7cd933f2e4 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Feb 22 14:25:37 2016 +0100 ajout du model de colonnes de la table des observations (refs #6926) commit fac69d8b8c95934bdb33bdc117b1018b7fb61fc9 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Feb 22 10:32:05 2016 +0100 - use jaxx 2.29-SNAPSHOT - correction du mode de config à l'ouverture de l'écran - ajout de useRTP dans le modele refs #6926 commit c8938cb54bd762b60d9ae98b16eb213fc38e0411 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 19 15:09:16 2016 +0100 mise en page de l'écran refs #6926 commit 34425f8d30b0f0ea82cf975584b5b76472fd1e83 Author: Kevin Morin <morin(a)codelutin.com> Date: Thu Feb 18 18:04:43 2016 +0100 début de réarrangement de l'écran des mensurations refs #6926 Summary of changes: .gitignore | 12 +- README.txt => README.md | 0 pom.xml | 7 +- src/site/site_fr.xml | 2 + .../README.txt => tutti-ichtyometer/README.md | 0 tutti-persistence/{README.txt => README.md} | 0 .../entities/protocol/SpeciesProtocolBean.java | 14 + .../entities/protocol/TuttiProtocols.java | 107 +++- .../entities/protocol/v1/SpeciesProtocol1.java | 5 +- .../entities/protocol/v1/SpeciesProtocolBean1.java | 5 +- .../entities/protocol/v1/TuttiProtocol1.java | 4 +- .../entities/protocol/v1/TuttiProtocolBean1.java | 4 +- .../entities/protocol/v2/TuttiProtocol2.java | 4 +- .../entities/protocol/v2/TuttiProtocolBean2.java | 2 - .../entities/protocol/v3/SpeciesProtocol3.java | 172 ++++++ .../entities/protocol/v3/SpeciesProtocolBean3.java | 182 +++--- .../entities/protocol/v3/TuttiProtocol3.java | 260 +++++++++ .../entities/protocol/v3/TuttiProtocolBean3.java | 620 +++++++++++++++++++++ .../src/main/xmi/tutti-persistence.zargo | Bin 62059 -> 62284 bytes .../entities/protocol/TuttiProtocolsTest.java | 20 - .../ProtocolPersistenceServiceReadTest.java | 6 - .../ProtocolPersistenceServiceWriteTest.java | 9 +- .../README.txt => tutti-report-generator/README.md | 0 tutti-service/{README.txt => README.md} | 0 .../catches/ValidateCruiseOperationsService.java | 4 +- .../tutti/service/genericformat/csv/CatchRow.java | 21 + .../service/genericformat/csv/OperationRow.java | 6 +- .../producer/CsvProducerForCatch.java | 73 ++- .../protocol/CalcifiedPiecesSamplingRow.java | 24 + .../protocol/CalcifiedPiecesSamplingRowModel.java | 24 + .../protocol/ProtocolImportExportService.java | 2 +- .../ifremer/tutti/service/protocol/SpeciesRow.java | 16 - .../tutti/service/protocol/SpeciesRowModel.java | 6 +- .../GenericFormatExportServiceAno7992Test.java | 217 ++++++++ .../protocol/ProtocolImportExportServiceTest.java | 52 +- .../resources/genericFormat/ano7992.tuttiProtocol | 249 +++++++++ .../README.txt => tutti-ui-swing-updater/README.md | 0 .../README.txt => tutti-ui-swing/README.md | 0 .../filtered-resources/tutti-help-fr.properties | 23 + .../help/Guide_utilisation_Allegro_Campagne.pdf | Bin 1996569 -> 1988880 bytes .../operation/EditFishingOperationUIHandler.java | 2 +- .../operation/EditFishingOperationUIModel.java | 20 +- .../content/operation/catches/BatchSavedEvent.java | 24 + .../operation/catches/BatchSavedListener.java | 24 + .../create/CreateBenthosBatchUIHandler.java | 2 +- .../create/CreateSpeciesBatchUIHandler.java | 2 +- .../protocol/EditProtocolSpeciesRowModel.java | 99 +++- .../protocol/EditProtocolSpeciesTableModel.java | 27 +- .../content/protocol/EditProtocolUIHandler.java | 157 +++++- .../content/protocol/EditProtocolUIModel.java | 12 + .../protocol/actions/AddBenthosProtocolAction.java | 3 +- .../protocol/actions/AddSpeciesProtocolAction.java | 3 +- .../actions/ExportAllCaracteristicAction.java | 2 +- .../actions/ExportProtocolBenthosAction.java | 2 +- .../actions/ExportProtocolCaracteristicAction.java | 2 +- .../actions/ExportProtocolSpeciesAction.java | 2 +- .../protocol/actions/ExportPupitriAction.java | 2 +- .../actions/RemoveBenthosProtocolAction.java | 25 +- .../actions/RemoveSpeciesProtocolAction.java | 26 +- .../protocol/actions/SaveProtocolAction.java | 19 - .../CalcifiedPiecesSamplingEditorRowModel.java | 24 + .../CalcifiedPiecesSamplingEditorTableModel.java | 25 + .../CalcifiedPiecesSamplingEditorUI.jaxx | 23 + .../CalcifiedPiecesSamplingEditorUIHandler.java | 39 ++ .../MinSizePopupUIModel.java | 24 + .../actions/AddSpeciesAction.java | 24 + .../actions/DeleteRowAction.java | 24 + .../actions/DeleteSpeciesAction.java | 24 + .../actions/ExportProtocolCpsAction.java | 2 +- .../actions/ImportProtocolCpsAction.java | 1 + .../actions/SplitSpeciesAction.java | 24 + .../content/protocol/rtp/RtpEditorUIModel.java | 2 +- .../swing/content/protocol/zones/ZoneEditorUI.jaxx | 23 + .../protocol/zones/ZoneEditorUIHandler.java | 24 + .../protocol/zones/actions/AddStratasAction.java | 24 + .../CollapseAvailableStratasTreeAction.java | 24 + .../zones/actions/CollapseZonesTreeAction.java | 24 + .../protocol/zones/actions/CreateZoneAction.java | 24 + .../protocol/zones/actions/DeleteZoneAction.java | 24 + .../actions/ExpandAvailableStratasTreeAction.java | 24 + .../zones/actions/ExpandZonesTreeAction.java | 24 + .../zones/actions/RemoveStratasAction.java | 24 + .../protocol/zones/actions/RenameZoneAction.java | 24 + .../protocol/zones/models/StrataUIModel.java | 24 + .../protocol/zones/models/SubStrataUIModel.java | 24 + .../content/protocol/zones/models/ZoneUIModel.java | 24 + .../zones/tree/AbstractZoneEditorTreeModel.java | 24 + .../content/protocol/zones/tree/StrataNode.java | 24 + .../protocol/zones/tree/StratasTreeModel.java | 24 + .../content/protocol/zones/tree/SubStrataNode.java | 24 + .../protocol/zones/tree/ZoneEditorNode.java | 24 + .../zones/tree/ZoneEditorTreeCellRenderer.java | 24 + .../content/protocol/zones/tree/ZoneNode.java | 24 + .../protocol/zones/tree/ZonesTreeModel.java | 24 + .../MinSizePopupUIModel-error-validation.xml | 23 + .../resources/i18n/tutti-ui-swing_en_GB.properties | 8 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 15 +- 97 files changed, 3004 insertions(+), 412 deletions(-) rename README.txt => README.md (100%) rename tutti-ui-swing/README.txt => tutti-ichtyometer/README.md (100%) rename tutti-persistence/{README.txt => README.md} (100%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocol3.java copy tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolSpeciesRowModel.java => tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/SpeciesProtocolBean3.java (62%) create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocol3.java create mode 100644 tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/protocol/v3/TuttiProtocolBean3.java rename tutti-ui-swing-updater/README.txt => tutti-report-generator/README.md (100%) rename tutti-service/{README.txt => README.md} (100%) create mode 100644 tutti-service/src/test/java/fr/ifremer/tutti/service/genericformat/GenericFormatExportServiceAno7992Test.java create mode 100644 tutti-service/src/test/resources/genericFormat/ano7992.tuttiProtocol rename tutti-report-generator/README.txt => tutti-ui-swing-updater/README.md (100%) rename tutti-ichtyometer/README.txt => tutti-ui-swing/README.md (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 17

branch feature/ecran_obs_individuelles updated (f600d0c -> be0ac0e)
by codelutin.com scm 29 Feb '16

29 Feb '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/ecran_obs_individuelles in repository tutti. See http://git.codelutin.com/tutti.git from f600d0c ajout d'une ligne d'observation individuelle quand on ajoute en rafale (refs #8019) new 815f48c - ajout du numéro de l'observation - suppression d'observations refs #8019 new a9c22e9 use lanbdas where possible new be0ac0e - copie des donnees d'observation individuelles dans le tableau des mensurations en fonction du mode - suppression ou ecrasement des données au changement de mode de copie refs #8019 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 be0ac0efc3c93bfe2fa24c7dc7977f7235b19ad5 Author: Kevin Morin <morin(a)codelutin.com> Date: Mon Feb 29 16:04:42 2016 +0100 - copie des donnees d'observation individuelles dans le tableau des mensurations en fonction du mode - suppression ou ecrasement des données au changement de mode de copie refs #8019 commit a9c22e976e587b4871778c52276c16ba6b5ee0d0 Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 26 16:35:25 2016 +0100 use lanbdas where possible commit 815f48cbc956f2bc62ba4b988107f71ee2b6309f Author: Kevin Morin <morin(a)codelutin.com> Date: Fri Feb 26 16:23:13 2016 +0100 - ajout du numéro de l'observation - suppression d'observations refs #8019 Summary of changes: .../filtered-resources/tutti-help-fr.properties | 3 +- .../IndividualObservationBatchTableModel.java | 44 +- .../frequency/SpeciesFrequencyRowModel.java | 30 ++ .../species/frequency/SpeciesFrequencyUI.jaxx | 8 +- .../species/frequency/SpeciesFrequencyUI.jcss | 18 +- .../frequency/SpeciesFrequencyUIHandler.java | 446 ++++++++++++++------- .../species/frequency/SpeciesFrequencyUIModel.java | 25 +- .../frequency/actions/RemoveObservationAction.java | 74 ++++ .../resources/i18n/tutti-ui-swing_en_GB.properties | 12 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 15 +- 10 files changed, 510 insertions(+), 165 deletions(-) create mode 100644 tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/actions/RemoveObservationAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3