October 2016 - Observe-commits - mailman.cloud.codelutin.com

branch develop updated (4288df8 -> 08a36cc)
by codelutin.com scm 28 Oct '16

28 Oct '16

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 4288df8 [PS] Ajouter un champ "Numéro de cuve", sur le formulaire des captures accessoires (Fixes #6999) new 60bc9a6 Ajout boolean sur SetSeine (persistence) new 8021750 Ajout boolean sur SetSeine (service) new d0a9b49 Ajout boolean sur SetSeine (ui) new 08a36cc [PS] Ajout d'un champ sur les captures (Fixes #8375) Merge branch 'feature/8375' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 08a36ccfef5181ee47474a2adc322f20229e315f Merge: 4288df8 d0a9b49 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 28 13:27:24 2016 +0200 [PS] Ajout d'un champ sur les captures (Fixes #8375) Merge branch 'feature/8375' into develop commit d0a9b499db43d06fe5c28e7886e0994099c3f424 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 28 13:27:19 2016 +0200 Ajout boolean sur SetSeine (ui) commit 80217501b9e69bcdddde21c3d0272986aa03016d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 28 13:27:10 2016 +0200 Ajout boolean sur SetSeine (service) commit 60bc9a68b2d6cabe3504524ae3b5c864212489d0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 28 13:26:57 2016 +0200 Ajout boolean sur SetSeine (persistence) Summary of changes: .../ui/content/table/impl/seine/TargetCatchUI.jaxx | 11 +++++++++++ .../ui/content/table/impl/seine/TargetCatchUI.jcss | 7 +++++++ .../table/impl/seine/TargetDiscardCatchUI.jaxx | 11 +++++++++++ .../table/impl/seine/TargetDiscardCatchUI.jcss | 7 +++++++ .../i18n/application-swing_en_GB.properties | 2 ++ .../i18n/application-swing_es_ES.properties | 2 ++ .../i18n/application-swing_fr_FR.properties | 2 ++ .../versions/DataSourceMigrationForVersion_5_1.java | 1 + .../V5_1_06_evol_8375_setSeine_add_booleans-H2.sql | 2 ++ .../V5_1_06_evol_8375_setSeine_add_booleans-PG.sql | 2 ++ entities/src/main/xmi/observe-seine.zargo | Bin 83324 -> 83528 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 58992 -> 59440 bytes .../services/topia/binder/data/SetSeineBinder.java | 5 +++++ .../binder/data/SetSeineTargetCatchDtoBinder.java | 4 ++++ 14 files changed, 56 insertions(+) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_06_evol_8375_setSeine_add_booleans-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_06_evol_8375_setSeine_add_booleans-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (7c2d503 -> 4288df8)
by codelutin.com scm 28 Oct '16

28 Oct '16

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 7c2d503 [LL] Ajout d'un champs sur l'écran Composition > Onglet Avançons (Fixes #6832) Merge branch 'feature/6832' into develop new 46fe9bc fix migration script name new 0138570 Ajout nonTargCatch.well (persistence) new 5c0c8f7 Ajout nonTargCatch.well (service) new 53c50a8 Ajout nonTargCatch.well (ui) new 4288df8 [PS] Ajouter un champ "Numéro de cuve", sur le formulaire des captures accessoires (Fixes #6999) 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 4288df8ad007f8aacf50dcad541205cff69ea34d Merge: 7c2d503 53c50a8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 28 11:49:56 2016 +0200 [PS] Ajouter un champ "Numéro de cuve", sur le formulaire des captures accessoires (Fixes #6999) Merge branch 'feature/6999' into develop commit 53c50a887dd8dd3549a4762181c9290175a6dd24 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 28 11:49:53 2016 +0200 Ajout nonTargCatch.well (ui) commit 5c0c8f73bcdfafdec7e9945674aac779533c26e8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 28 11:36:00 2016 +0200 Ajout nonTargCatch.well (service) commit 0138570db5eb9fccac394d30ea8b749c14a9dc18 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 28 11:32:10 2016 +0200 Ajout nonTargCatch.well (persistence) commit 46fe9bc1169cb3c9fc8f0709e1ea6c533603bcd5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 28 11:31:46 2016 +0200 fix migration script name Summary of changes: .../content/table/impl/seine/NonTargetCatchUI.jaxx | 15 +++++++++++++++ .../content/table/impl/seine/NonTargetCatchUI.jcss | 19 +++++++++++++++++++ .../table/impl/seine/NonTargetCatchUIHandler.java | 7 +++++-- .../table/impl/seine/NonTargetCatchUIModel.java | 2 ++ .../i18n/application-swing_en_GB.properties | 2 ++ .../i18n/application-swing_es_ES.properties | 2 ++ .../i18n/application-swing_fr_FR.properties | 2 ++ .../versions/DataSourceMigrationForVersion_5_1.java | 3 ++- ...ranchlineComposition_add_tracelineLength-H2.sql} | 0 ...ranchlineComposition_add_tracelineLength-PG.sql} | 0 ...V5_1_05_evol_6999_nonTargetCatch_add_well-H2.sql | 1 + ...V5_1_05_evol_6999_nonTargetCatch_add_well-PG.sql | 1 + entities/src/main/xmi/observe-seine.zargo | Bin 83232 -> 83324 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 58766 -> 58992 bytes .../topia/binder/data/NonTargetCatchBinder.java | 2 ++ 15 files changed, 53 insertions(+), 3 deletions(-) rename entities-migration/src/main/resources/db/migration/{V5_1_evol_6832_branchlineComposition_add_tracelineLength-PG.sql => V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql} (100%) rename entities-migration/src/main/resources/db/migration/{V5_1_evol_6832_branchlineComposition_add_tracelineLength-H2.sql => V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql} (100%) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_05_evol_6999_nonTargetCatch_add_well-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_05_evol_6999_nonTargetCatch_add_well-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 5

branch develop updated (86eadcd -> 7c2d503)
by codelutin.com scm 28 Oct '16

28 Oct '16

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 86eadcd [PS] Supprimer le champ floattingobject.supportvesselname (Fixes #6997) Merge branch 'feature/6997' into develop new 7436e8e Ajout BranchelineComposition.tracelineLength (persistence) new 74ed732 Ajout BranchelineComposition.tracelineLength (service) new 443233e Ajout BranchelineComposition.tracelineLength (ui) new 7c2d503 [LL] Ajout d'un champs sur l'écran Composition > Onglet Avançons (Fixes #6832) Merge branch 'feature/6832' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7c2d5038425e9db80ccfc13e974b5ccbc91a3fe0 Merge: 86eadcd 443233e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 28 11:18:12 2016 +0200 [LL] Ajout d'un champs sur l'écran Composition > Onglet Avançons (Fixes #6832) Merge branch 'feature/6832' into develop commit 443233e2fca051e2b6e353e5cb7c820c005a5e72 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 28 11:18:09 2016 +0200 Ajout BranchelineComposition.tracelineLength (ui) commit 74ed7327a609ad3b1a36415a75acfbaac0925f3c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 28 11:17:51 2016 +0200 Ajout BranchelineComposition.tracelineLength (service) commit 7436e8ed064ea097a5e3e1d5e66522c2824f5629 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 28 11:17:35 2016 +0200 Ajout BranchelineComposition.tracelineLength (persistence) Summary of changes: .../impl/longline/BranchlinesCompositionUI.jaxx | 10 ++++++++++ .../impl/longline/BranchlinesCompositionUI.jcss | 11 +++++++++++ .../longline/BranchlinesCompositionUIHandler.java | 3 +++ .../longline/BranchlinesCompositionUIModel.java | 2 ++ .../i18n/application-swing_en_GB.properties | 3 +++ .../i18n/application-swing_es_ES.properties | 5 ++++- .../i18n/application-swing_fr_FR.properties | 3 +++ .../versions/DataSourceMigrationForVersion_5_1.java | 1 + ...branchlineComposition_add_tracelineLength-H2.sql | 1 + ...branchlineComposition_add_tracelineLength-PG.sql | 1 + entities/src/main/xmi/observe-longline.zargo | Bin 93566 -> 93635 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 67504 -> 67604 bytes .../binder/data/BranchlinesCompositionBinder.java | 2 ++ 13 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_evol_6832_branchlineComposition_add_tracelineLength-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_evol_6832_branchlineComposition_add_tracelineLength-PG.sql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (79078b2 -> 86eadcd)
by codelutin.com scm 28 Oct '16

28 Oct '16

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(a)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(a)codelutin.com> Date: Fri Oct 28 09:44:22 2016 +0200 Suppression champs supportVesselName (ui) commit fa0f031a56c5f32bfa9a3ba93b74228170500182 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 28 09:44:19 2016 +0200 Suppression champs supportVesselName (service) commit fc9004c0c80818729ce4dd316ff8acce9fcd5f0f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Oct 28 09:43:20 2016 +0200 Suppression champs supportVesselName (persistence) commit 46db19b16947b42bace0ea84fd4fd2fd764803a7 Merge: f898510 bc3f80e Author: Tony CHEMIT <chemit(a)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(a)codelutin.com> Date: Thu Oct 27 20:27:54 2016 +0200 recopie de la liste avant sauvegarde commit 2c876441e300a8172979d034956208f895390432 Author: Tony CHEMIT <chemit(a)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(a)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(a)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(a)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(a)codelutin.com> Date: Thu Oct 27 15:44:44 2016 +0200 clean i18n commit d50cb7ea608d6673aff10f9eb18bb0477fd476d5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Oct 27 15:41:44 2016 +0200 Suppression SetSeine.sonarUsed (ui) commit 95551710c0235a7a70763ab0df7b60383d4b0698 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Oct 27 15:41:40 2016 +0200 Suppression SetSeine.sonarUsed (service) commit 3a0995b6ef1d8c56e1858cd520429ef3a7348f01 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Oct 27 15:40:34 2016 +0200 Suppression SetSeine.sonarUsed (persistence) commit 4f556bc64caf86dc8461bd6c2e487b22c8907156 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Oct 27 15:39:57 2016 +0200 Passage en modèle 5.1 commit ca01bdd44d69557e941217b5e9b61b95157c1c15 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Oct 27 15:41:57 2016 +0200 fix tests commit 99a247193bd91406cffb5aac01ba3e1742ebf1a2 Merge: 560313e 576bc1d Author: Tony CHEMIT <chemit(a)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(a)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(a)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(a)codelutin.com> Date: Thu Oct 27 14:53:28 2016 +0200 Ajout du type de marée LL commit 560313efe35d4db7f9079b5856deadd5585bc0dc Author: Tony CHEMIT <chemit(a)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(a)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(a)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(a)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(a)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(a)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(a)codelutin.com>.

1 25

02/26: Filtrage sur le type de modèle à utiliser pour sélectionner les marées disponibles
by codelutin.com scm 28 Oct '16

28 Oct '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit b3e25ab0c529ae32ef046ed614bb27ca28c48901 Author: Tony CHEMIT <chemit(a)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 --- .../application/swing/ui/admin/AdminUIModel.java | 30 +++++++++++ .../swing/ui/storage/tabs/DataSelectionModel.java | 63 ++++++++++++++++++++-- 2 files changed, 89 insertions(+), 4 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java index c4898de..f512ad2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java @@ -31,6 +31,7 @@ import fr.ird.observe.application.swing.ui.admin.config.ConfigUI; import fr.ird.observe.application.swing.ui.admin.consolidate.ConsolidateModel; import fr.ird.observe.application.swing.ui.admin.export.ExportModel; import fr.ird.observe.application.swing.ui.admin.report.ReportModel; +import fr.ird.observe.application.swing.ui.admin.report.ReportType; import fr.ird.observe.application.swing.ui.admin.save.SaveLocalModel; import fr.ird.observe.application.swing.ui.admin.synchronize.data.DataSynchroModel; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode; @@ -333,6 +334,19 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { } + if (newStep == AdminStep.SELECT_DATA && containsOperation(AdminStep.REPORT)) { + + // on remplit le modèle de sélection uniquement avec le bon type de marées + ReportModel reportModel = getReportModel(); + ReportType reportType = reportModel.getReportType(); + boolean loadSeineTrip = ReportType.PS == reportType; + + ObserveSwingDataSource dataSource = getSafeLocalSource(true); + populateSelectionModel(dataSource, loadSeineTrip); + return; + + } + // on remplit le modèle de sélection if (log.isDebugEnabled()) { log.debug("Will refill selectionModel [" + newStep + "] : " + selectModel); @@ -1424,6 +1438,22 @@ public class AdminUIModel extends WizardExtModel<AdminStep> { } } + public void populateSelectionModel(ObserveSwingDataSource source, boolean tripSeine) { + try { + DataSelectionModel.populate(getSelectionDataModel(), source, tripSeine); + + } catch (Exception e) { + if (log.isErrorEnabled()) { + log.error("could not populate selected model", e); + } + } finally { + + // on notifie que le modèle de sélection a changé + // (il faut donc recalculé l'arbre de sélection) + firePropertyChange(SELECTION_MODEL_CHANGED_PROPERTY_NAME, getSelectionDataModel()); + } + } + protected void computeExistingTrips(ObserveSwingDataSource source) { List<DataReference<?>> existingTrip = Lists.newArrayList(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java index 97198c2..7b9ab3a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/DataSelectionModel.java @@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.storage.tabs; import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; @@ -54,6 +54,8 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; +import static com.google.common.collect.Lists.newArrayList; + /** * Un modèle pour représenter la sélection de données. * @@ -75,7 +77,7 @@ public class DataSelectionModel implements Serializable { for (ReferentialReference<ProgramDto> program : programSet) { - List<DataReference> referenceHelper = Lists.newArrayList(); + List<DataReference> referenceHelper = newArrayList(); if (ProgramHelper.isProgramSeine(program)) { @@ -96,6 +98,59 @@ public class DataSelectionModel implements Serializable { } + public static void populate(DataSelectionModel model, ObserveSwingDataSource source, boolean tripSeine) { + + Preconditions.checkState(source.isOpen()); + + Map<ReferentialReference<ProgramDto>, List<DataReference>> datas = Maps.newHashMap(); + + Set<ReferentialReference<ProgramDto>> programSet = source.getReferentialReferences(ProgramDto.class); + + ImmutableSet<DataReference> allTrips; + if (tripSeine) { + TripSeineService tripSeineService = source.newTripSeineService(); + allTrips = (ImmutableSet) tripSeineService.getAllTripSeine().getReferences(); + + } else { + TripLonglineService tripLonglineService = source.newTripLonglineService(); + allTrips = (ImmutableSet) tripLonglineService.getAllTripLongline().getReferences(); + } + + for (ReferentialReference<ProgramDto> program : programSet) { + + List<DataReference> referenceHelper = new ArrayList<>(); + + boolean add = false; + if (tripSeine && ProgramHelper.isProgramSeine(program)) { + + for (DataReference trip : allTrips) { + String programId = (String) trip.getPropertyValue(TripSeineDto.PROPERTY_PROGRAM + "Id"); + if (program.getId().equals(programId)) { + referenceHelper.add(trip); + } + } + add = true; + + } else if (!tripSeine && ProgramHelper.isProgramLongline(program)) { + + for (DataReference trip : allTrips) { + String programId = (String) trip.getPropertyValue(TripSeineDto.PROPERTY_PROGRAM + "Id"); + if (program.getId().equals(programId)) { + referenceHelper.add(trip); + } + } + add = true; + } + + if (add) { + populate(program, referenceHelper, datas); + } + + } + model.setDatas(datas); + + } + protected static void populate(ReferentialReference<ProgramDto> program, List<DataReference> trips, Map<ReferentialReference<ProgramDto>, List<DataReference>> datas) { @@ -229,7 +284,7 @@ public class DataSelectionModel implements Serializable { public boolean containsData(ReferentialReference<ProgramDto> program, DataReference trip) { List<DataReference> datas = getDatas(program.getId()); - return datas!=null && datas.contains(trip); + return datas != null && datas.contains(trip); } public Set<DataReference> getSelectedData() { @@ -252,7 +307,7 @@ public class DataSelectionModel implements Serializable { if (datas.get(p).contains(referenceDto)) { List<DataReference> referenceHelper = result.get(p); if (referenceHelper == null) { - referenceHelper = Lists.newArrayList(); + referenceHelper = newArrayList(); result.put(p, referenceHelper); } referenceHelper.add(referenceDto); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (24f3443 -> 79078b2)
by codelutin.com scm 26 Oct '16

26 Oct '16

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 24f3443 [LL] champ boolean «rejeté avec hamecon» doit accepter une valeur NULL (Fixes #7887) new b0b3fde Ajout des systèmes observés sur le dto ActivitySeine new 9597e36 ajout de la validation new 868bca2 Ajout des systèmes observés comme onglet de l'écran d'activité new 88e8262 suppression de l'ancien écran systèmes observés et tout ce qui s'y rapporte new 79078b2 [PS] Forcer l'utilisateur à consulter l'écran "Systèmes observés" (Fixes #6840) Merge branch 'feature/6840' into develop The 5 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 79078b27187d98cc6cf886e332018c41b6c674a0 Merge: 24f3443 88e8262 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 21:55:46 2016 +0200 [PS] Forcer l'utilisateur à consulter l'écran "Systèmes observés" (Fixes #6840) Merge branch 'feature/6840' into develop commit 88e82627049cded842b672d890c9bd87f00ed389 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 21:55:30 2016 +0200 suppression de l'ancien écran systèmes observés et tout ce qui s'y rapporte commit 868bca2d6c50e379ed47c8e65b08b4b995afe93f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 21:40:49 2016 +0200 Ajout des systèmes observés comme onglet de l'écran d'activité commit 9597e36f170528fe27f17cde26d8a351b965dd00 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 21:40:32 2016 +0200 ajout de la validation commit b0b3fde4469f9609326e19680372ed566624eb9b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 21:40:14 2016 +0200 Ajout des systèmes observés sur le dto ActivitySeine Summary of changes: .../swing/decoration/DecoratorService.java | 2 - ...ActivitySeineDto-ui-create-error-validation.xml | 13 ++ ...tivitySeineDto-ui-create-warning-validation.xml | 21 ++ ...ActivitySeineDto-ui-update-error-validation.xml | 13 ++ ...tivitySeineDto-ui-update-warning-validation.xml | 8 +- ...bservedSystemDto-ui-update-error-validation.xml | 63 ------ ...ervedSystemDto-ui-update-warning-validation.xml | 50 ----- .../validation/BeanValidatorDetectorTest.java | 4 - .../swing/db/ObserveSwingDataSource.java | 6 - .../swing/ui/content/ContentUIManager.java | 3 - .../impl/seine/ActivitySeineObservedSystemUI.jaxx | 113 ---------- .../impl/seine/ActivitySeineObservedSystemUI.jcss | 78 ------- .../ActivitySeineObservedSystemUIHandler.java | 133 ------------ .../seine/ActivitySeineObservedSystemUIModel.java | 42 ---- .../content/open/impl/seine/ActivitySeineUI.jaxx | 58 ++++- .../content/open/impl/seine/ActivitySeineUI.jcss | 33 +++ .../open/impl/seine/ActivitySeineUIHandler.java | 2 + .../open/impl/seine/ActivitySeineUIModel.java | 20 ++ .../tree/loadors/ActivitySeineNodeChildLoador.java | 6 - .../i18n/application-swing_en_GB.properties | 1 + .../i18n/application-swing_es_ES.properties | 1 + .../i18n/application-swing_fr_FR.properties | 1 + ...tivitySeineObservedSystemServiceController.java | 49 ----- application-web/src/main/resources/mapping | 2 - .../request/ReferenceSetRequestDefinitions.java | 8 +- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59611 -> 58913 bytes services-dto/src/main/xmi/observe-services-dto.ini | 4 +- .../topia/binder/BinderEngineInitializer.java | 234 ++++++++++----------- .../topia/binder/data/ActivitySeineBinder.java | 4 + .../data/ActivitySeineObservedSystemDtoBinder.java | 62 ------ .../ActivitySeineObservedSystemServiceTopia.java | 67 ------ .../service/seine/ActivitySeineServiceTopia.java | 2 - .../services/topia/binder/BinderEngineTest.java | 2 - .../observe/services/ObserveServicesProvider.java | 3 - .../seine/ActivitySeineObservedSystemService.java | 47 ----- 35 files changed, 277 insertions(+), 878 deletions(-) delete mode 100644 application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-error-validation.xml delete mode 100644 application-swing-validation/src/main/resources/fr/ird/observe/services/dto/seine/ActivitySeineObservedSystemDto-ui-update-warning-validation.xml delete mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jaxx delete mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUI.jcss delete mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIHandler.java delete mode 100644 application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/ActivitySeineObservedSystemUIModel.java delete mode 100644 application-web/src/main/java/fr/ird/observe/application/web/controller/v1/seine/ActivitySeineObservedSystemServiceController.java delete mode 100644 services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineObservedSystemDtoBinder.java delete mode 100644 services-topia/src/main/java/fr/ird/observe/services/topia/service/seine/ActivitySeineObservedSystemServiceTopia.java delete mode 100644 services/src/main/java/fr/ird/observe/services/service/seine/ActivitySeineObservedSystemService.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 (3c6e833 -> 24f3443)
by codelutin.com scm 26 Oct '16

26 Oct '16

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 3c6e833 [LL] défaut d'affichage coord DMD (Fixes #7891) Merge branch 'feature/7891' into develop new 24f3443 [LL] champ boolean «rejeté avec hamecon» doit accepter une valeur NULL (Fixes #7887) 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 24f344362d60fbbc4800652c82e3a5b975b69e25 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 20:51:36 2016 +0200 [LL] champ boolean «rejeté avec hamecon» doit accepter une valeur NULL (Fixes #7887) Summary of changes: .../swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx | 8 ++++++-- .../swing/ui/content/table/impl/longline/CatchLonglineUI.jcss | 10 +++++++--- 2 files changed, 13 insertions(+), 5 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 (7cd954c -> 3c6e833)
by codelutin.com scm 26 Oct '16

26 Oct '16

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 7cd954c [UI][PS][LL] Widget des positions DMD par défaut (fixes #8394) Merge branch 'feature/8394' into develop new cd3c3c3 Arrondi à 4 décimales du poids de capture ciblé (persistence) new 428c3a5 Arrondi à 4 décimales du poids de capture ciblé (UI) new f07bef0 Amélioration taille colonnes tableaux new e77e66e [UI] Masque de saisie sur les formulaires captures (et surtout) rejets de thonidés (Fixes #8395) Merge branch 'feature/8395' into develop new 35c679d introduce node package new de88bd5 introduce renderer package new 2691002 Nettoyage de code new 7640d6f Onb remonte le programme dans les marées sur les stubs new 1b633a4 Chargement des toutes les marées (sinon on ne peut pas en connaitre le nombre par programme) new 6568734 Remonté du nombre de routes par marée new dd1b9ea Récupération du bon nœud de Marée new d1ae1f0 Chargement dans l'arbre du nombre de route par marée new 85d7849 On doit toujours recharger le nœud de la marée dès que le nombre de routes change new a001a2c Ajouter le nombre de marées par programme et le nombre de routes par marée new 38d7a6d Petites améliorations ergonomiques dans l'arbre (Fixes #8576) Merge branch 'feature/8576' into develop new 6cce00a [LL] état appâts au filage doit être un champ non obligatoire (Fixes #7885) new 8cb1ed6 [LL] taille hameçon doit être un champ non obligatoire (fixes #7884) new 29cafc3 Move to snpashot of jaxx new a7b26cc Ajout directive pour remplir avec des zéros les coordonnées non nulles new a097cdd Use last stable of jaxx new 3c6e833 [LL] défaut d'affichage coord DMD (Fixes #7891) Merge branch 'feature/7891' into develop The 21 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 3c6e83323197c1afb465499b1d52b2bde05dfecf Merge: 8cb1ed6 a097cdd Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 19:59:15 2016 +0200 [LL] défaut d'affichage coord DMD (Fixes #7891) Merge branch 'feature/7891' into develop commit a097cdd859ee7e5a7c5f181e381fe3bef3e8ebea Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 19:59:11 2016 +0200 Use last stable of jaxx commit a7b26cc24583e2b1fa87a26c22e54769a2c82f8e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 19:06:53 2016 +0200 Ajout directive pour remplir avec des zéros les coordonnées non nulles commit 29cafc303fee76d2d0ffbe9089f6e15f21a9cfe3 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 19:06:29 2016 +0200 Move to snpashot of jaxx commit 8cb1ed6ce077e8a0c9138d765c82d3d12da2bd50 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 18:17:22 2016 +0200 [LL] taille hameçon doit être un champ non obligatoire (fixes #7884) commit 6cce00a917a00c5ff9bdbb320c2f020acdc72feb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 18:08:12 2016 +0200 [LL] état appâts au filage doit être un champ non obligatoire (Fixes #7885) commit 38d7a6d9d7565474eaaabf0471c3a0e35027e5be Merge: e77e66e a001a2c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 17:56:27 2016 +0200 Petites améliorations ergonomiques dans l'arbre (Fixes #8576) Merge branch 'feature/8576' into develop commit a001a2c6e37b059a1ba4f9d0cc0014ae51207fa7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 17:56:21 2016 +0200 Ajouter le nombre de marées par programme et le nombre de routes par marée commit 85d7849d9ef5fdc10207fceea6318f8b016b3a67 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 17:54:14 2016 +0200 On doit toujours recharger le nœud de la marée dès que le nombre de routes change commit d1ae1f09b3ea8960639d50ef86a887183d689b4c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 17:51:39 2016 +0200 Chargement dans l'arbre du nombre de route par marée commit dd1b9ea08644af1375c68a21fe4c1b0a04785990 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 17:50:58 2016 +0200 Récupération du bon nœud de Marée commit 65687342106a7d0141330798db833484c6b53c3b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 17:50:12 2016 +0200 Remonté du nombre de routes par marée commit 1b633a425f4ff406834e23885a7dddce8735b62a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 16:12:07 2016 +0200 Chargement des toutes les marées (sinon on ne peut pas en connaitre le nombre par programme) commit 7640d6fc078b62b64f44d2b517843d4ee715a268 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 16:11:06 2016 +0200 Onb remonte le programme dans les marées sur les stubs commit 2691002df832b2a2bb0efb970a0e029499d25983 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 15:00:56 2016 +0200 Nettoyage de code commit de88bd529d8501d259896c86a384c2f646486e03 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 14:33:10 2016 +0200 introduce renderer package commit 35c679db691c8438eb137495ff162102300fe6b8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 14:29:48 2016 +0200 introduce node package commit e77e66e3644a4d2e4e5ee4119b20962f8472a0d3 Merge: 7cd954c f07bef0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 14:22:12 2016 +0200 [UI] Masque de saisie sur les formulaires captures (et surtout) rejets de thonidés (Fixes #8395) Merge branch 'feature/8395' into develop commit f07bef08c8e3d2d471d3fe24c252e49c30ad7867 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 14:21:42 2016 +0200 Amélioration taille colonnes tableaux commit 428c3a54c333291c9f139e628f10e4c383438131 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 14:21:29 2016 +0200 Arrondi à 4 décimales du poids de capture ciblé (UI) commit cd3c3c385200e83484e8b25484fe26fa4b48b835 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Oct 26 14:20:58 2016 +0200 Arrondi à 4 décimales du poids de capture ciblé (persistence) Summary of changes: ...tsCompositionDto-ui-update-error-validation.xml | 5 -- ...ksCompositionDto-ui-update-error-validation.xml | 7 +-- .../application-swing-validation_en_GB.properties | 2 - .../application-swing-validation_es_ES.properties | 2 - .../application-swing-validation_fr_FR.properties | 2 - .../application/swing/ui/ObserveCommon.jcss | 1 + .../application/swing/ui/ObserveMainUI.jaxx | 2 +- .../application/swing/ui/ObserveMainUIHandler.java | 2 +- .../ird/observe/application/swing/ui/UIHelper.java | 7 +++ .../swing/ui/actions/shared/AbstractUIAction.java | 2 +- .../ui/actions/shared/CancelCreateUIAction.java | 2 +- .../swing/ui/actions/shared/CloseOpenUIAction.java | 2 +- .../swing/ui/actions/shared/GoDownUIAction.java | 4 +- .../swing/ui/actions/shared/GoUpUIAction.java | 4 +- .../shared/MoveActivityLonglinesUIAction.java | 4 +- .../actions/shared/MoveActivitySeinesUIAction.java | 4 +- .../ui/actions/shared/MoveRoutesUIAction.java | 4 +- .../swing/ui/actions/shared/MoveTripsUIAction.java | 2 +- .../swing/ui/actions/shared/ReOpenUIAction.java | 2 +- .../ui/actions/shared/SelectNodeUIAction.java | 2 +- .../swing/ui/admin/config/SelectDataUI.jaxx | 2 +- .../data/DataSynchroSelectionTreeCellRenderer.java | 6 +- .../ui/admin/synchronize/data/DataSynchroUI.jaxx | 2 +- .../swing/ui/content/ContentUIHandler.java | 4 +- .../swing/ui/content/ContentUIManager.java | 2 +- .../impl/longline/SetLonglineUIHandler.java | 2 +- .../impl/seine/FloatingObjectUIHandler.java | 2 +- .../ui/content/impl/seine/SetSeineUIHandler.java | 2 +- .../ui/content/list/ContentListUIHandler.java | 4 +- .../ui/content/open/ContentOpenableUIHandler.java | 13 +++-- .../ui/content/open/impl/seine/RouteUIHandler.java | 14 +++-- .../ui/content/table/ContentTableUIHandler.java | 2 +- .../ui/content/table/impl/seine/TargetCatchUI.jcss | 2 +- .../table/impl/seine/TargetCatchUIHandler.java | 2 +- .../table/impl/seine/TargetDiscardCatchUI.jcss | 2 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 4 +- .../swing/ui/storage/tabs/SelectDataUI.jaxx | 2 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 3 + .../tree/ObserveNavigationTreeShowPopupAction.java | 1 + .../swing/ui/tree/ObserveTreeBridge.java | 1 + .../swing/ui/tree/ObserveTreeHelper.java | 63 +++++++++++++++++++++ .../actions/ChangeActivityRouteActionListener.java | 2 +- .../actions/ChangeActivityTripActionListener.java | 2 +- .../actions/ChangeRouteTripActionListener.java | 2 +- .../actions/ChangeTripProgramActionListener.java | 2 +- .../ui/tree/actions/NodeChangeActionListener.java | 2 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 2 +- .../loadors/ActivityLonglineNodeChildLoador.java | 6 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 4 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 8 +-- .../loadors/ActivitySeinesNodeChildLoador.java | 4 +- .../loadors/FloatingObjectNodeChildLoador.java | 2 +- .../loadors/ProgramLonglineNodeChildLoador.java | 17 +++--- .../tree/loadors/ProgramSeineNodeChildLoador.java | 17 +++--- .../ui/tree/loadors/ReferenceNodeChildLoador.java | 2 +- .../swing/ui/tree/loadors/RootNodeChildLoador.java | 6 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 4 +- .../tree/loadors/SetLonglineNodeChildLoador.java | 2 +- .../ui/tree/loadors/SetSeineNodeChildLoador.java | 2 +- .../MoveActivityLonglineNodeMenuPopulator.java | 4 +- .../menu/MoveActivitySeineNodeMenuPopulator.java | 4 +- .../swing/ui/tree/menu/MoveNodeMenuPopulator.java | 2 +- .../ui/tree/menu/MoveRouteNodeMenuPopulator.java | 4 +- .../ui/tree/menu/MoveTripNodeMenuPopulator.java | 6 +- .../{ => node}/AbstrctReferenceNodeSupport.java | 3 +- .../ui/tree/{ => node}/ActivityLonglineNode.java | 3 +- .../ui/tree/{ => node}/ActivitySeineNode.java | 3 +- .../tree/{ => node}/DataReferenceNodeSupport.java | 3 +- .../tree/{ => node}/FloatingObjectSeineNode.java | 3 +- .../swing/ui/tree/{ => node}/ObserveNode.java | 2 +- .../ui/tree/{ => node}/ProgramLonglineNode.java | 19 ++++++- .../swing/ui/tree/{ => node}/ProgramSeineNode.java | 18 +++++- .../ReferentialReferenceNodeSupport.java | 3 +- .../swing/ui/tree/{ => node}/RouteSeineNode.java | 2 +- .../swing/ui/tree/{ => node}/SetLonglineNode.java | 3 +- .../swing/ui/tree/{ => node}/SetSeineNode.java | 3 +- .../swing/ui/tree/{ => node}/TripLonglineNode.java | 2 +- .../swing/ui/tree/{ => node}/TripSeineNode.java | 14 ++++- .../AbstractObserveTreeCellRenderer.java | 40 +++++++------ .../DataSelectionTreeCellRenderer.java | 4 +- .../{ => renderer}/NavigationTreeCellRenderer.java | 4 +- .../swing/ui/util/DecoratedNodeEntity.java | 2 +- .../entities/longline/TripLonglineTopiaDao.java | 22 +++++-- .../observe/entities/seine/TargetCatchImpl.java | 4 +- .../ird/observe/entities/seine/TripSeineImpl.java | 10 ++++ .../observe/entities/seine/TripSeineTopiaDao.java | 32 ++++++++--- entities/src/main/xmi/observe-seine.zargo | Bin 83234 -> 83418 bytes pom.xml | 2 +- .../dto/reference/DataReferenceSetDefinitions.java | 19 ++++--- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 59520 -> 59611 bytes .../topia/binder/data/TripLonglineBinder.java | 2 + .../topia/binder/data/TripSeineBinder.java | 4 ++ .../topia/service/seine/TripSeineServiceTopia.java | 9 +-- 93 files changed, 357 insertions(+), 181 deletions(-) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/AbstrctReferenceNodeSupport.java (96%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ActivityLonglineNode.java (93%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ActivitySeineNode.java (93%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/DataReferenceNodeSupport.java (96%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/FloatingObjectSeineNode.java (93%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ObserveNode.java (98%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ProgramLonglineNode.java (72%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ProgramSeineNode.java (71%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/ReferentialReferenceNodeSupport.java (95%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/RouteSeineNode.java (96%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/SetLonglineNode.java (93%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/SetSeineNode.java (93%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/TripLonglineNode.java (96%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => node}/TripSeineNode.java (80%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => renderer}/AbstractObserveTreeCellRenderer.java (90%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => renderer}/DataSelectionTreeCellRenderer.java (95%) rename application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/{ => renderer}/NavigationTreeCellRenderer.java (96%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 21

branch develop updated (2290105 -> 7cd954c)
by codelutin.com scm 25 Oct '16

25 Oct '16

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 2290105 [LL] le champ devenir capture doit être obligatoire (fixes #7888) new 1b0d03c Suppression de classes qui sont désormais générées new 5ac26ae Ajout de l'option ui.coordinate.format (CoordinateFormat) new eb2bd47 Utilisation de la valeur de la configuration pour initialiser le format d'un éditeur de positions new 7cd954c [UI][PS][LL] Widget des positions DMD par défaut (fixes #8394) Merge branch 'feature/8394' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7cd954cda4868563f02e0a0665c26cfadc1d047e Merge: 2290105 eb2bd47 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Oct 25 20:14:21 2016 +0200 [UI][PS][LL] Widget des positions DMD par défaut (fixes #8394) Merge branch 'feature/8394' into develop commit eb2bd475a2aeb56f8b94810be8c3ddff9e015803 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Oct 25 20:14:15 2016 +0200 Utilisation de la valeur de la configuration pour initialiser le format d'un éditeur de positions commit 5ac26aed47643e9d5177494e353c97131a9fa580 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Oct 25 20:14:09 2016 +0200 Ajout de l'option ui.coordinate.format (CoordinateFormat) commit 1b0d03c3a9e5b71f9e3aa8df9fe7d0782d155503 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Oct 25 20:14:04 2016 +0200 Suppression de classes qui sont désormais générées Summary of changes: application-swing-configuration/pom.xml | 4 + .../src/main/config/ObserveSwingApplication.ini | 6 + .../ObserveSwingApplicationConfig.java | 8 +- .../ObserveSwingApplicationConfigAction.java | 142 ---- .../ObserveSwingApplicationConfigOption.java | 780 --------------------- ...pplication-swing-configuration_en_GB.properties | 1 + ...pplication-swing-configuration_es_ES.properties | 1 + ...pplication-swing-configuration_fr_FR.properties | 1 + .../observe/application/swing/ObserveCLAction.java | 6 +- .../swing/ui/actions/ShowConfigAction.java | 3 +- .../swing/ui/content/ContentUIInitializer.java | 1 + 11 files changed, 26 insertions(+), 927 deletions(-) delete mode 100644 application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigAction.java delete mode 100644 application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 4

branch develop updated (67ee001 -> 2290105)
by codelutin.com scm 25 Oct '16

25 Oct '16

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 67ee001 [LL] réorganisation du layout du formulaire Activité/Opération de pêche/Caractéristiques pour rapprocher les informations associées (Fixes #7881) Merge branch 'feature/7881' into develop new 2290105 [LL] le champ devenir capture doit être obligatoire (fixes #7888) 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 22901051dc69ba454ec2e9ce2b2fa25697371788 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Oct 25 19:29:58 2016 +0200 [LL] le champ devenir capture doit être obligatoire (fixes #7888) Summary of changes: .../dto/longline/CatchLonglineDto-ui-update-error-validation.xml | 5 +++++ .../resources/i18n/application-swing-validation_en_GB.properties | 1 + .../resources/i18n/application-swing-validation_es_ES.properties | 1 + .../resources/i18n/application-swing-validation_fr_FR.properties | 1 + 4 files changed, 8 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1