This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 79078b2 [PS] Forcer l'utilisateur à consulter l'écran "Systèmes observés" (Fixes #6840) Merge branch 'feature/6840' into develop new f17ffef Ajout d'une eénumration ReportType et utilisation dans l'écran de configuration des rapports new b3e25ab Filtrage sur le type de modèle à utiliser pour sélectionner les marées disponibles new c67f4e4 Déplacement de ReportType en ObserveModelType + ajout de ce type sur les rapports new 8483a4e Pour les rapports, proposer un choix sur le type de marées à utiliser (Fixes #6853) Merge branch 'feature/6853' into develop new 7a69690 [PS] Améliorer l'ergonomie de l'écran de saisie des mensurations de non target (Fixes #7511) new 560313e [REFERENTIEL] Automatiser la réattribution de code lors de la désactivation ou la suppression d'une ligne de référentiel (fixes #8338) new 389f441 Ajout du type de marée LL new cabd563 amélioration de l'algorithme de détection du nœud trip new 576bc1d Conditionner l'utilisation selon le type de marée (LL) new 99a2471 [LL] Mode de saisie des captures 'groupé' par défaut dans le cas d'une marée auto-échantillonnage (Fixes #7889) Merge branch 'feature/7889' into develop new ca01bdd fix tests new 4f556bc Passage en modèle 5.1 new 3a0995b Suppression SetSeine.sonarUsed (persistence) new 9555171 Suppression SetSeine.sonarUsed (service) new d50cb7e Suppression SetSeine.sonarUsed (ui) new 521a65e clean i18n new f898510 Retirer le champ relatif à l'utilisation du sonar pendant la calée (Fixes #8374) Merge branch 'feature/8374' into develop new 39dd80c Rendre la collections de captures indexées + correction nommage script de migration new d7fba14 Ajout du menu contextuel pour changer l'ordre des captures new 2c87644 Bien conserver le nouvel ordre lors de la recopie de liste new bc3f80e recopie de la liste avant sauvegarde new 46db19b [LL] numérotation des captures (Fixes #7886) Merge branch 'feature/7886' into develop new fc9004c Suppression champs supportVesselName (persistence) new fa0f031 Suppression champs supportVesselName (service) new 1ec6cd6 Suppression champs supportVesselName (ui) new 86eadcd [PS] Supprimer le champ floattingobject.supportvesselname (Fixes #6997) Merge branch 'feature/6997' into develop The 26 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 86eadcdf38de1db0b6aaf9b0c61e9c839d0fbd66 Merge: 46db19b 1ec6cd6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 09:44:29 2016 +0200 [PS] Supprimer le champ floattingobject.supportvesselname (Fixes #6997) Merge branch 'feature/6997' into develop commit 1ec6cd6ad8d406a87e99ae829a295ac7f1a36e38 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 09:44:22 2016 +0200 Suppression champs supportVesselName (ui) commit fa0f031a56c5f32bfa9a3ba93b74228170500182 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 09:44:19 2016 +0200 Suppression champs supportVesselName (service) commit fc9004c0c80818729ce4dd316ff8acce9fcd5f0f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 28 09:43:20 2016 +0200 Suppression champs supportVesselName (persistence) commit 46db19b16947b42bace0ea84fd4fd2fd764803a7 Merge: f898510 bc3f80e Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 20:27:59 2016 +0200 [LL] numérotation des captures (Fixes #7886) Merge branch 'feature/7886' into develop commit bc3f80e1c504033cb8f1104bfe605c9731ed5d24 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 20:27:54 2016 +0200 recopie de la liste avant sauvegarde commit 2c876441e300a8172979d034956208f895390432 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 20:23:48 2016 +0200 Bien conserver le nouvel ordre lors de la recopie de liste commit d7fba14f856776fc96165b6511b70a7e0cf0d900 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 20:06:35 2016 +0200 Ajout du menu contextuel pour changer l'ordre des captures commit 39dd80c11204d8247c9d8c4208c67ce58aaaa205 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 17:30:45 2016 +0200 Rendre la collections de captures indexées + correction nommage script de migration commit f8985105c9d91685a72bf3766e9faee00298c8e8 Merge: ca01bdd 521a65e Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 15:45:19 2016 +0200 Retirer le champ relatif à l'utilisation du sonar pendant la calée (Fixes #8374) Merge branch 'feature/8374' into develop commit 521a65e3787294ae6d2efc1744cbc2e1ef3f2e92 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 15:44:44 2016 +0200 clean i18n commit d50cb7ea608d6673aff10f9eb18bb0477fd476d5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 15:41:44 2016 +0200 Suppression SetSeine.sonarUsed (ui) commit 95551710c0235a7a70763ab0df7b60383d4b0698 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 15:41:40 2016 +0200 Suppression SetSeine.sonarUsed (service) commit 3a0995b6ef1d8c56e1858cd520429ef3a7348f01 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 15:40:34 2016 +0200 Suppression SetSeine.sonarUsed (persistence) commit 4f556bc64caf86dc8461bd6c2e487b22c8907156 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 15:39:57 2016 +0200 Passage en modèle 5.1 commit ca01bdd44d69557e941217b5e9b61b95157c1c15 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 15:41:57 2016 +0200 fix tests commit 99a247193bd91406cffb5aac01ba3e1742ebf1a2 Merge: 560313e 576bc1d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 14:54:53 2016 +0200 [LL] Mode de saisie des captures 'groupé' par défaut dans le cas d'une marée auto-échantillonnage (Fixes #7889) Merge branch 'feature/7889' into develop commit 576bc1d13706ec52c0bd31c4addf3cb639a8a1a1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 14:54:48 2016 +0200 Conditionner l'utilisation selon le type de marée (LL) commit cabd563ef3021707c45833bf75a1076cb3f02b40 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 14:54:05 2016 +0200 amélioration de l'algorithme de détection du nœud trip commit 389f44185d7fa310bb9aeb636771e7c5b9936756 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 14:53:28 2016 +0200 Ajout du type de marée LL commit 560313efe35d4db7f9079b5856deadd5585bc0dc Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 13:40:12 2016 +0200 [REFERENTIEL] Automatiser la réattribution de code lors de la désactivation ou la suppression d'une ligne de référentiel (fixes #8338) commit 7a69690072a4f3f7c10b6d198510d364c37555ca Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 11:37:51 2016 +0200 [PS] Améliorer l'ergonomie de l'écran de saisie des mensurations de non target (Fixes #7511) commit 8483a4ea091bca21526be129e113fd8fe5ac69ee Merge: 79078b2 c67f4e4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 11:03:15 2016 +0200 Pour les rapports, proposer un choix sur le type de marées à utiliser (Fixes #6853) Merge branch 'feature/6853' into develop commit c67f4e421ec774d2f978dd11870c19747bfa9527 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 11:03:06 2016 +0200 Déplacement de ReportType en ObserveModelType + ajout de ce type sur les rapports commit b3e25ab0c529ae32ef046ed614bb27ca28c48901 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 10:10:29 2016 +0200 Filtrage sur le type de modèle à utiliser pour sélectionner les marées disponibles commit f17ffef1ad018f522ad9fd9776d14d15587fd07d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Oct 27 09:39:39 2016 +0200 Ajout d'une eénumration ReportType et utilisation dans l'écran de configuration des rapports Summary of changes: .../application-swing-decoration_en_GB.properties | 4 - .../application-swing-decoration_es_ES.properties | 4 - .../application-swing-decoration_fr_FR.properties | 4 - ...loatingObjectDto-ui-create-error-validation.xml | 13 --- ...loatingObjectDto-ui-update-error-validation.xml | 13 --- .../application-swing-validation_en_GB.properties | 3 - .../application-swing-validation_es_ES.properties | 3 - .../application-swing-validation_fr_FR.properties | 3 - .../validation/BeanValidatorDetectorTest.java | 2 +- application-swing/pom.xml | 1 + .../application/swing/ui/admin/AdminUIModel.java | 62 +++++++---- .../swing/ui/admin/report/ReportConfigUI.jaxx | 15 ++- .../swing/ui/admin/report/ReportConfigUI.jcss | 9 ++ .../swing/ui/admin/report/ReportModel.java | 48 ++++++-- .../swing/ui/admin/report/ReportUIHandler.java | 21 ++-- .../ui/content/impl/seine/FloatingObjectUI.jaxx | 13 --- .../ui/content/impl/seine/FloatingObjectUI.jcss | 16 --- .../impl/seine/FloatingObjectUIHandler.java | 1 - .../swing/ui/content/impl/seine/SetSeineUI.jaxx | 5 - .../swing/ui/content/impl/seine/SetSeineUI.jcss | 7 -- .../ui/content/impl/seine/SetSeineUIHandler.java | 1 - .../ui/content/impl/seine/SetSeineUIModel.java | 5 +- .../ui/content/open/ContentOpenableUIHandler.java | 6 +- .../ui/content/ref/ContentReferenceUIHandler.java | 124 ++++++++++++++++----- .../impl/longline/CatchLonglineTableModel.java | 35 ++++-- .../table/impl/longline/CatchLonglineUI.jaxx | 5 + .../table/impl/longline/CatchLonglineUI.jcss | 14 ++- .../impl/longline/CatchLonglineUIHandler.java | 88 +++++++++++++-- .../table/impl/seine/TargetSampleUIHandler.java | 29 +++-- .../swing/ui/storage/tabs/DataSelectionModel.java | 63 ++++++++++- .../application/swing/ui/usage/UsagesUI.jaxx | 27 +++-- .../swing/ui/usage/UsagesUIHandler.java | 43 +++++-- .../i18n/application-swing_en_GB.properties | 15 ++- .../i18n/application-swing_es_ES.properties | 15 ++- .../i18n/application-swing_fr_FR.properties | 15 ++- .../v1/ReferentialServiceController.java | 5 + application-web/src/main/resources/mapping | 1 + .../ObserveMigrationConfigurationProviderImpl.java | 3 +- ...java => DataSourceMigrationForVersion_5_1.java} | 42 ++----- .../V5_1_01_evol_8374_delete_sonarUsed-H2.sql | 1 + .../V5_1_01_evol_8374_delete_sonarUsed-PG.sql | 1 + .../V5_1_02_evol_7886_catch_add_set_idx-H2.sql | 1 + .../V5_1_02_evol_7886_catch_add_set_idx-PG.sql | 1 + ..._1_03_evol-6997_delete_supportVesselName-H2.sql | 1 + ..._1_03_evol-6997_delete_supportVesselName-PG.sql | 1 + .../entities/longline/TripLonglineTopiaDao.java | 22 +++- .../observe/entities/seine/TripSeineTopiaDao.java | 8 +- entities/src/main/xmi/observe-seine.zargo | Bin 83418 -> 83232 bytes entities/src/main/xmi/observe.ini | 2 +- pom.xml | 2 +- .../ird/observe/services/dto/ObserveModelType.java | 12 ++ .../services/dto/actions/report/Report.java | 20 +++- .../dto/reference/DataReferenceSetDefinitions.java | 3 +- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 58913 -> 58766 bytes services-dto/src/main/xmi/observe-services-dto.ini | 1 + .../FloatingObject-service-error-validation.xml | 13 --- .../services-topia-validation_en_GB.properties | 1 - .../services-topia-validation_es_ES.properties | 1 - .../services-topia-validation_fr_FR.properties | 1 - .../topia/binder/data/DataBinderSupport.java | 56 +++++++--- .../topia/binder/data/FloatingObjectBinder.java | 2 - .../binder/data/SetLonglineCatchDtoBinder.java | 4 +- .../services/topia/binder/data/SetSeineBinder.java | 2 - .../topia/binder/data/TripLonglineBinder.java | 2 + .../topia/service/ReferentialServiceTopia.java | 24 ++++ .../topia/binder/BinderEngineMetadataTest.java | 2 +- .../src/main/filters/observe-reports.properties | 31 +++--- .../services/service/ReferentialService.java | 11 +- .../service/actions/report/ReportBuilder.java | 5 +- .../actions/report/observe-reports-test.properties | 2 + 70 files changed, 671 insertions(+), 345 deletions(-) copy entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_5_0.java => DataSourceMigrationForVersion_5_1.java} (55%) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_01_evol_8374_delete_sonarUsed-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_01_evol_8374_delete_sonarUsed-PG.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_02_evol_7886_catch_add_set_idx-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_02_evol_7886_catch_add_set_idx-PG.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_03_evol-6997_delete_supportVesselName-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_03_evol-6997_delete_supportVesselName-PG.sql create mode 100644 services-dto/src/main/java/fr/ird/observe/services/dto/ObserveModelType.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.