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

[Git][ultreiaio/ird-observe][develop] 2 commits: remove some false mainDto tag values
by Tony CHEMIT 30 Jul '19

30 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: e03db19e by tchemit at 2019-07-30T14:33:51Z remove some false mainDto tag values - - - - - 45dca012 by tchemit at 2019-07-30T14:34:16Z Use generated ObserveEntitiesSpi - - - - - 30 changed files: - dto/src/main/models/Observe-20-data-ps-observation.model - dto/src/main/models/Observe-30-data-ll-observation.model - persistence/pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/ObserveServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/common/TripLonglineGearUseServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/common/TripLonglineServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/landing/TripLonglineLandingServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/ActivityLonglineLogbookSampleServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/ActivityLonglineLogbookServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetLonglineLogbookCatchServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetLonglineLogbookGlobalCompositionServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/SetLonglineLogbookServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/logbook/TripLonglineSampleLogbookServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/ActivityLongLineObsEncounterServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/ActivityLongLineObsSensorUsedServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/ActivityLonglineObsServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/BranchlineObsServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/SetLonglineObsCatchServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/SetLonglineObsDetailCompositionServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/SetLonglineObsGlobalCompositionServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/SetLonglineObsServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ll/observation/TdrObsServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/common/TripGearUseFeaturesServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/common/TripServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/ActivityServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/FloatingObjectServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/NonTargetCatchReleaseServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/NonTargetCatchServiceLocal.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cdbde05ce8fa54677b1077c740… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cdbde05ce8fa54677b1077c740… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 20 commits: Use new ServicesProvider (everything is now generated)
by Tony CHEMIT 30 Jul '19

30 Jul '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: cdbde05c by tchemit at 2019-07-30T09:06:49Z Use new ServicesProvider (everything is now generated) - - - - - f7179f64 by tchemit at 2019-07-30T10:18:49Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - 53831275 by tchemit at 2019-07-30T10:19:11Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 17537c32 by tchemit at 2019-07-30T10:19:11Z Move to new version 9.0-alpha-1 - - - - - 933c9bb1 by tchemit at 2019-07-30T10:19:11Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - 95042b17 by tchemit at 2019-07-30T10:19:12Z Module 2 (first flush) - - - - - 8713f7d4 by tchemit at 2019-07-30T10:19:12Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - 07f04cba by tchemit at 2019-07-30T10:19:13Z Module 2 - second flush - - - - - dd2350ac by tchemit at 2019-07-30T10:19:13Z Report from v8 for ps logbook model - - - - - e48a9100 by tchemit at 2019-07-30T10:19:13Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - f0459002 by tchemit at 2019-07-30T10:19:13Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - e769fd89 by tchemit at 2019-07-30T10:19:13Z Consolidation des champs techniques en base - Realing on v9 - See #1353 - - - - - c8cc5993 by tchemit at 2019-07-30T10:19:14Z Insertion des lots de débarquements - See #1259 - - - - - 1e3df696 by tchemit at 2019-07-30T10:19:14Z Insertion du plan de cuves - See #1260 - - - - - 27325633 by tchemit at 2019-07-30T10:19:14Z Insertion de l’échantillonnage au port - See #1261 - - - - - c76b8add by tchemit at 2019-07-30T10:19:15Z Création de nouvelles icônes de navigation - Pass for v9 - See #1358 - - - - - ab0f55c5 by tchemit at 2019-07-30T10:19:15Z First realign i18n after develop merge - - - - - 5dd7790d by tchemit at 2019-07-30T10:19:15Z Realign Seine model (no more any Seine in any Seine data - - - - - cf47de5b by tchemit at 2019-07-30T10:19:16Z optimize i18n - - - - - 566f9751 by tchemit at 2019-07-30T10:28:28Z Use new ServicesProvider (everything is now generated) (report on v9) - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java.getter - client-core/.mvn/pom.gitflow.develop - client-core/.mvn/pom.gitflow.master - client-core/pom.xml - client-core/src/license/THIRD-PARTY.properties - client-core/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - client-core/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - client-core/src/main/dcp-presets/ps/logbook/03-update-preset.yml - client-core/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveDataSourceServicesProvider.java - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/ChooseRelatedObservedActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/GenerateTripLonglineHomeIdUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSampleLonglineLogbookUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/17ca06c879a6b7e81f355b8979… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/17ca06c879a6b7e81f355b8979… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Use new ServicesProvider (everything is now generated)
by Tony CHEMIT 30 Jul '19

30 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cdbde05c by tchemit at 2019-07-30T09:06:49Z Use new ServicesProvider (everything is now generated) - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/db/ObserveDataSourceServicesProvider.java - − client-core/src/main/java/fr/ird/observe/client/db/ObserveMainDataSourceServicesProvider.java - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/ChooseRelatedObservedActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/GenerateTripLonglineHomeIdUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSampleLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSetLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSetLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineLandingUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineSampleLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleActivityLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleActivityLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineLandingUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineSampleLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleActivityLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleActivityLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleActivityLonglineSampleLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleTripLonglineLandingUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleTripLonglineSampleLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleTripLonglineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/CopyValuesAndSaveSetLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveActivityLonglineLogbookSampleUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveActivityLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveActivityLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveLonglineDetailCompositionObsUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/cdbde05ce8fa54677b1077c7404… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/cdbde05ce8fa54677b1077c7404… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 20 commits: Création de nouvelles icônes de navigation (fix ref ps 16) - See #1358
by Tony CHEMIT 29 Jul '19

29 Jul '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 7d34dcd8 by tchemit at 2019-07-29T14:23:04Z Création de nouvelles icônes de navigation (fix ref ps 16) - See #1358 - - - - - d9ba5b80 by tchemit at 2019-07-29T14:25:47Z Realign Seine model (last report on v8) - - - - - 7f29e152 by tchemit at 2019-07-29T14:26:12Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - 6e91808a by tchemit at 2019-07-29T14:29:13Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 3f806961 by tchemit at 2019-07-29T14:29:13Z Move to new version 9.0-alpha-1 - - - - - 3c0fac7c by tchemit at 2019-07-29T14:29:13Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - 49995bd2 by tchemit at 2019-07-29T14:29:14Z Module 2 (first flush) - - - - - 8fec85a7 by tchemit at 2019-07-29T14:29:15Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - 5689a4a0 by tchemit at 2019-07-29T14:29:16Z Module 2 - second flush - - - - - b5f14cd5 by tchemit at 2019-07-29T14:29:16Z Report from v8 for ps logbook model - - - - - b3d848fd by tchemit at 2019-07-29T14:29:16Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 3ad263a7 by tchemit at 2019-07-29T14:29:17Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - 7d20b505 by tchemit at 2019-07-29T14:29:17Z Consolidation des champs techniques en base - Realing on v9 - See #1353 - - - - - 2131184a by tchemit at 2019-07-29T14:29:53Z Insertion des lots de débarquements - See #1259 - - - - - 61dce9fc by tchemit at 2019-07-29T14:29:55Z Insertion du plan de cuves - See #1260 - - - - - 244a2d83 by tchemit at 2019-07-29T14:29:56Z Insertion de l’échantillonnage au port - See #1261 - - - - - 24f01d82 by tchemit at 2019-07-29T14:29:56Z Création de nouvelles icônes de navigation - Pass for v9 - See #1358 - - - - - c0d6b7ce by tchemit at 2019-07-29T14:29:57Z First realign i18n after develop merge - - - - - ae4ebd51 by tchemit at 2019-07-29T14:42:41Z Realign Seine model (no more any Seine in any Seine data - - - - - 17ca06c8 by tchemit at 2019-07-29T14:42:43Z optimize i18n - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java.getter - client-core/.mvn/pom.gitflow.develop - client-core/.mvn/pom.gitflow.master - client-core/pom.xml - client-core/src/license/THIRD-PARTY.properties - client-core/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - client-core/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - client-core/src/main/dcp-presets/ps/logbook/03-update-preset.yml - client-core/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/ChooseRelatedObservedActivityUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddSampleSpeciesSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteSampleSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/delete/DeleteSampleSpeciesSeineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineFloatingObjectUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineSetUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/041b5cd6a7179ea3231eba07af… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/041b5cd6a7179ea3231eba07af… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Création de nouvelles icônes de navigation (fix ref ps 16) - See #1358
by Tony CHEMIT 29 Jul '19

29 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7d34dcd8 by tchemit at 2019-07-29T14:23:04Z Création de nouvelles icônes de navigation (fix ref ps 16) - See #1358 - - - - - d9ba5b80 by tchemit at 2019-07-29T14:25:47Z Realign Seine model (last report on v8) - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetCatchUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetCatchUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetDiscardCatchUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetDiscardCatchUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/observation/WeightCategorySeineUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/observation/WeightCategoryUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/observation/WeightCategorySeineUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/observation/WeightCategoryUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/observation/WeightCategorySeineUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/ref/ps/observation/WeightCategoryUIModel.java - client-core/src/main/resources/icons/navigation/default/referential/referential_ps_16x16.png - dto/src/main/i18n/getters/eugene.getter - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/WeightCategorySeineHelper.java → dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/WeightCategoryHelper.java - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/main/models/Observe-03-referential-ps-observation.model - dto/src/main/models/Observe-20-data-ps-observation.model - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties - persistence/src/main/java/fr/ird/observe/binder/referential/ps/observation/WeightCategorySeineEntityDtoBinder.java → persistence/src/main/java/fr/ird/observe/binder/referential/ps/observation/WeightCategoryEntityDtoBinder.java - persistence/src/main/java/fr/ird/observe/entities/Entities.java - persistence/src/main/models/Observe-03-referential-ps-observation.model - persistence/src/main/models/Observe-20-data-ps-observation.model - persistence/src/main/resources/db/migration/8.0/103_create_ps_observation_schema-common.sql - persistence/src/main/resources/db/migration/old/3.5/V3_5_01_migration-H2.sql - persistence/src/main/resources/db/migration/old/3.5/V3_5_01_migration-PG.sql - services-client/src/test/java/fr/ird/observe/services/client/service/actions/validate/ValidateServiceClientTest.java - test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - test/src/main/resources/db/8.0/referentiel.sql.gz - test/src/main/resources/fixtures/bean-validator-detector-n1-create.list The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3adbb922d8b3645bfb91d972c7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/3adbb922d8b3645bfb91d972c7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] optimize i18n
by Tony CHEMIT 29 Jul '19

29 Jul '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 041b5cd6 by tchemit at 2019-07-29T12:49:21Z optimize i18n - - - - - 17 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/ChooseRelatedObservedActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddSampleSpeciesSeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineFloatingObjectUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/AddFloatingObjectPresetUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookActivityAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookRouteAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/CatchUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/wellplan/TripWellPlanUI.jcss - observe-i18n/src/main/i18n/translations/observe_en_GB.properties - observe-i18n/src/main/i18n/translations/observe_es_ES.properties - observe-i18n/src/main/i18n/translations/observe_fr_FR.properties Changes: ===================================== client-core/src/main/i18n/getters/java.getter ===================================== @@ -299,16 +299,6 @@ observe.choice.quit observe.choice.replace observe.choice.save observe.choice.useRemoteStorage -observe.common.ActivityLogbookDto.action.goToOpen.short -observe.common.ActivityLogbookDto.action.goToOpen.tip -observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity -observe.common.FloatingObjectReference.action.add -observe.common.FloatingObjectReference.action.add.tip -observe.common.FloatingObjectReference.choose.title -observe.common.RouteLogbookDto.action.goToOpen.short -observe.common.SampleLogbook.action.addSampleSpecies -observe.common.SampleLogbook.action.addSampleSpecies.tip -observe.common.TripLonglineSampleDto.message.not.open observe.common.action.moveBottom observe.common.action.moveBottom.tip observe.common.action.moveDown @@ -422,6 +412,9 @@ observe.data.ll.landing.TripLonglineLanding.action.moves observe.data.ll.landing.TripLonglineLanding.action.moves.tip observe.data.ll.landing.TripLonglineLanding.action.selectTransshipment observe.data.ll.landing.TripLonglineLanding.message.not.open +observe.data.ll.logbook.ActivityLogbook.action.chooseRelatedObservedActivity +observe.data.ll.logbook.ActivityLogbook.action.goToOpen.short +observe.data.ll.logbook.ActivityLogbook.action.goToOpen.tip observe.data.ll.logbook.ActivityLonglineLogbook.action.addSample observe.data.ll.logbook.ActivityLonglineLogbook.action.addSample.tip observe.data.ll.logbook.ActivityLonglineLogbook.action.addSet @@ -487,6 +480,8 @@ observe.data.ll.logbook.HooksCompositionLogbook.table.hookType observe.data.ll.logbook.HooksCompositionLogbook.table.hookType.tip observe.data.ll.logbook.HooksCompositionLogbook.table.proportion observe.data.ll.logbook.HooksCompositionLogbook.table.proportion.tip +observe.data.ll.logbook.SampleLogbook.action.addSampleSpecies +observe.data.ll.logbook.SampleLogbook.action.addSampleSpecies.tip observe.data.ll.logbook.SamplePartLogbook.table.count observe.data.ll.logbook.SamplePartLogbook.table.count.tip observe.data.ll.logbook.SamplePartLogbook.table.length @@ -665,6 +660,9 @@ observe.data.ll.observation.WeightMeasureObs.table.weight observe.data.ll.observation.WeightMeasureObs.table.weight.tip observe.data.ll.observation.WeightMeasureObs.table.weightMeasureType observe.data.ll.observation.WeightMeasureObs.table.weightMeasureType.tip +observe.data.ps.FloatingObjectReference.action.add +observe.data.ps.FloatingObjectReference.action.add.tip +observe.data.ps.FloatingObjectReference.choose.title observe.data.ps.common.GearUseFeatures.delete observe.data.ps.common.GearUseFeatures.table.comment observe.data.ps.common.GearUseFeatures.table.comment.tip @@ -736,6 +734,7 @@ observe.data.ps.logbook.FloatingObject.not.a.reference observe.data.ps.logbook.FloatingObject.notComputed observe.data.ps.logbook.FloatingObject.table.type observe.data.ps.logbook.Route.action.delete.tip +observe.data.ps.logbook.Route.action.goToOpen.short observe.data.ps.logbook.Route.action.goToOpen.tip observe.data.ps.logbook.Route.action.moves observe.data.ps.logbook.Route.action.moves.tip @@ -744,6 +743,7 @@ observe.data.ps.logbook.Sample.action.goToOpen.short observe.data.ps.logbook.Sample.action.goToOpen.tip observe.data.ps.logbook.Sample.action.moves observe.data.ps.logbook.Sample.action.moves.tip +observe.data.ps.logbook.Sample.message.not.open observe.data.ps.logbook.SampleSpeciesSize.table.count observe.data.ps.logbook.SampleSpeciesSize.table.count.tip observe.data.ps.logbook.SampleSpeciesSize.table.sizeClass @@ -1045,6 +1045,7 @@ observe.ui.tree.data.ps.logbook.route.unsaved observe.ui.tree.data.ps.logbook.set.unsaved observe.ui.tree.data.ps.obs.activity.list observe.ui.tree.data.ps.obs.activity.unsaved +observe.ui.tree.data.ps.obs.catches observe.ui.tree.data.ps.obs.floatingObject.unsaved observe.ui.tree.data.ps.obs.nonTargetCatchRelease observe.ui.tree.data.ps.obs.objectObservedSpecies ===================================== client-core/src/main/i18n/getters/jaxx.getter ===================================== @@ -76,9 +76,6 @@ observe.actions.validate.select.mode observe.actions.validate.select.mode.tip observe.actions.validate.select.scope observe.actions.validate.select.scope.tip -observe.common.Sample.action.resetDefaultSizeMeasureType.tip -observe.common.TargetCatchDto.table.well.tip -observe.common.TripLonglineSampleLogbookDto.comment observe.common.description observe.common.directory observe.common.file @@ -686,7 +683,9 @@ observe.data.ps.logbook.Route.title observe.data.ps.logbook.Route.titles observe.data.ps.logbook.Sample.action.create observe.data.ps.logbook.Sample.action.create.tip +observe.data.ps.logbook.Sample.action.resetDefaultSizeMeasureType.tip observe.data.ps.logbook.Sample.bigsWeight +observe.data.ps.logbook.Sample.comment observe.data.ps.logbook.Sample.message.cantAdd observe.data.ps.logbook.Sample.sampleQuality observe.data.ps.logbook.Sample.sampleType @@ -871,6 +870,7 @@ observe.data.ps.wellplan.WellPlan.title observe.data.ps.wellplan.WellPlan.weight observe.data.ps.wellplan.WellPlan.weightCategory observe.data.ps.wellplan.WellPlan.well +observe.data.table.well.tip observe.info.selected.validators observe.info.validation.credentials observe.menu.actions ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/ChooseRelatedObservedActivityUIAction.java ===================================== @@ -47,7 +47,7 @@ public class ChooseRelatedObservedActivityUIAction extends AbstractContentUIActi private final ActivityLonglinePairingResultItemDecorator decorator; public ChooseRelatedObservedActivityUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, n("observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity"), n("observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity"), "data-calcule", ObserveKeyStrokes.KEY_STROKE_CHOOSE_RELATED_OBSERVATION_ACTIVITY); + super(mainUI, ACTION_NAME, n("observe.data.ll.logbook.ActivityLogbook.action.chooseRelatedObservedActivity"), n("observe.data.ll.logbook.ActivityLogbook.action.chooseRelatedObservedActivity"), "data-calcule", ObserveKeyStrokes.KEY_STROKE_CHOOSE_RELATED_OBSERVATION_ACTIVITY); ObserveSwingApplicationContext applicationContext = ObserveSwingApplicationContext.get(); DecoratorService decoratorService = applicationContext.getDecoratorService(); decorator = new ActivityLonglinePairingResultItemDecorator(decoratorService, applicationContext.getConfig().getLocale()); @@ -87,7 +87,7 @@ public class ChooseRelatedObservedActivityUIAction extends AbstractContentUIActi // String continueActionText = t("observe.choice.continue"); // Object[] options = {continueActionText, t("observe.choice.cancel")}; // JPanel panel = new JPanel(new BorderLayout()); -// panel.add(BorderLayout.NORTH, new JLabel(t("observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity.message", +// panel.add(BorderLayout.NORTH, new JLabel(t("observe.data.ll.logbook.ActivityLogbook.action.chooseRelatedObservedActivity.message", // pairingConfig.getLonglineActivityPairingMaxTime(), pairingConfig.getLonglineActivityPairingMaxDistance()))); // panel.add(BorderLayout.CENTER, editor); // @@ -106,7 +106,7 @@ public class ChooseRelatedObservedActivityUIAction extends AbstractContentUIActi // jButton.setEnabled(false); // editor.addPropertyChangeListener("selectedItem", evt -> jButton.setEnabled(evt.getNewValue() != null)); // -// int response = UIHelper.askUser(ObserveSwingApplicationContext.get().getMainUI(), pane, t("observe.common.ActivityLonglineLogbookDto.action.chooseRelatedObservedActivity.title"), options); +// int response = UIHelper.askUser(ObserveSwingApplicationContext.get().getMainUI(), pane, t("observe.data.ll.logbook.ActivityLogbook.action.chooseRelatedObservedActivity.title"), options); // // ActivityLonglinePairingResultItem newActivityLonglineObs = null; // if (response == 0) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/add/AddSampleSpeciesSeineUIAction.java ===================================== @@ -42,7 +42,7 @@ public class AddSampleSpeciesSeineUIAction extends AbstractContentUIAction { public static final String ACTION_NAME = AddSampleSpeciesSeineUIAction.class.getName(); public AddSampleSpeciesSeineUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, t("observe.common.SampleLogbook.action.addSampleSpecies"), t("observe.common.SampleLogbook.action.addSampleSpecies.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_SAMPLE); + super(mainUI, ACTION_NAME, t("observe.data.ll.logbook.SampleLogbook.action.addSampleSpecies"), t("observe.data.ll.logbook.SampleLogbook.action.addSampleSpecies.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_SAMPLE); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineFloatingObjectUIAction.java ===================================== @@ -90,7 +90,7 @@ public class AddActivitySeineFloatingObjectUIAction extends AbstractContentUIAct userConfigs.add(b); a.install(b, pane); } - int response = UIHelper.askUser(pane, t("observe.common.FloatingObjectReference.choose.title"), options); + int response = UIHelper.askUser(pane, t("observe.data.ps.FloatingObjectReference.choose.title"), options); Object value = pane.getValue(); if (value instanceof FloatingObjectPreset) { floatingObjectPresetsManager.setReferenceToUse((FloatingObjectPreset) value); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/dcp/AddFloatingObjectPresetUIAction.java ===================================== @@ -60,7 +60,7 @@ public class AddFloatingObjectPresetUIAction extends AbstractContentUIAction { private static final Logger log = LogManager.getLogger(AddFloatingObjectPresetUIAction.class); public AddFloatingObjectPresetUIAction(ObserveMainUI mainUI) { - super(mainUI, ACTION_NAME, t("observe.common.FloatingObjectReference.action.add"), t("observe.common.FloatingObjectReference.action.add.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_FLOATING_OBJECT_REFERENCE); + super(mainUI, ACTION_NAME, t("observe.data.ps.FloatingObjectReference.action.add"), t("observe.data.ps.FloatingObjectReference.action.add.tip"), "add", ObserveKeyStrokes.KEY_STROKE_ADD_FLOATING_OBJECT_REFERENCE); } @Override @@ -92,7 +92,7 @@ public class AddFloatingObjectPresetUIAction extends AbstractContentUIAction { } } }); - int response = UIHelper.askUser(pane, t("observe.common.FloatingObjectReference.choose.title"), options); + int response = UIHelper.askUser(pane, t("observe.data.ps.FloatingObjectReference.choose.title"), options); if (response != 0) { // user cancel ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookActivityAction.java ===================================== @@ -38,8 +38,8 @@ public class SelectSeineLogbookActivityAction extends SelectEditDataAction { super(mainUI, ObserveSeineActivityLogbookEditNode.class, (int) 'F', - t("observe.common.ActivityLogbookDto.action.goToOpen.short"), - t("observe.common.ActivityLogbookDto.action.goToOpen.tip")); + t("observe.data.ll.logbook.ActivityLogbook.action.goToOpen.short"), + t("observe.data.ll.logbook.ActivityLogbook.action.goToOpen.tip")); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/navigation/SelectSeineLogbookRouteAction.java ===================================== @@ -38,7 +38,7 @@ public class SelectSeineLogbookRouteAction extends SelectEditDataAction { super(mainUI, ObserveSeineRouteLogbookEditNode.class, (int) 'E', - t("observe.common.RouteLogbookDto.action.goToOpen.short"), + t("observe.data.ps.logbook.Route.action.goToOpen.short"), t("observe.data.ps.logbook.Route.action.goToOpen.tip")); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/CatchUI.jcss ===================================== @@ -25,5 +25,5 @@ } #wellLabel { - toolTipText:"observe.common.TargetCatchDto.table.well.tip"; + toolTipText:"observe.data.table.well.tip"; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesSizeUI.jcss ===================================== @@ -30,7 +30,7 @@ #defaultSizeMeasureType { actionIcon:combobox-reset2; - toolTipText:"observe.common.Sample.action.resetDefaultSizeMeasureType.tip"; + toolTipText:"observe.data.ps.logbook.Sample.action.resetDefaultSizeMeasureType.tip"; enabled:{model.getDefaultSizeMeasureType() != null}; focusable:false; } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleSpeciesUI.jcss ===================================== @@ -38,7 +38,7 @@ } #comment { - title:"observe.common.TripLonglineSampleLogbookDto.comment"; + title:"observe.data.ps.logbook.Sample.comment"; } #sampleSpeciesSizeUI { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleUI.jcss ===================================== @@ -29,11 +29,11 @@ } #wellLabel { - toolTipText:"observe.common.TargetCatchDto.table.well.tip"; + toolTipText:"observe.data.table.well.tip"; } #comment { - title:"observe.common.TripLonglineSampleLogbookDto.comment"; + title:"observe.data.ps.logbook.Sample.comment"; } #reopen { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleUIModel.java ===================================== @@ -38,7 +38,7 @@ public class SampleUIModel extends ContentOpenableUIModel<SampleDto, SampleRefer private static final long serialVersionUID = 1L; public SampleUIModel() { - super(SampleDto.class, I18n.n("observe.common.TripLonglineSampleDto.message.not.open")); + super(SampleDto.class, I18n.n("observe.data.ps.logbook.Sample.message.not.open")); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/wellplan/TripWellPlanUI.jcss ===================================== @@ -28,5 +28,5 @@ } #wellLabel { - toolTipText:"observe.common.TargetCatchDto.table.well.tip"; + toolTipText:"observe.data.table.well.tip"; } ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== The diff for this file was not included because it is too large. ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== The diff for this file was not included because it is too large. ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/041b5cd6a7179ea3231eba07af7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/041b5cd6a7179ea3231eba07af7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] Realign Seine model (no more any Seine in any Seine data
by Tony CHEMIT 29 Jul '19

29 Jul '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: d0dab5d4 by tchemit at 2019-07-29T12:06:20Z Realign Seine model (no more any Seine in any Seine data - - - - - 30 changed files: - client-core/src/main/i18n/getters/java.getter - client-core/src/main/i18n/getters/jaxx.getter - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineFloatingObjectUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/add/AddActivitySeineSetUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/delete/DeleteActivitySeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/delete/DeleteSetSeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/move/MoveMultipleActivitySeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/move/MoveSingleActivitySeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/save/SaveActivitySeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ps/logbook/save/SaveSetSeineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/BranchlineObsUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/landing/TripSeineLandingUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/landing/TripLandingUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/landing/TripSeineLandingUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/landing/TripLandingUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/landing/TripSeineLandingUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/landing/TripLandingUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivitySeineListUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivityListUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivitySeineListUI.jcss → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivityListUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivitySeineListUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivityListUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivitySeineListUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivityListUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivitySeineUI.jaxx → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivityUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivitySeineUI.jcss → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivityUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivitySeineUIHandler.java → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivityUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivitySeineUIModel.java → client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/ActivityUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/CatchUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/CatchUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/CatchUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/RouteListUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/RouteUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleListUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/logbook/SampleUI.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d0dab5d496593cfa8e04e0fd02d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d0dab5d496593cfa8e04e0fd02d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 22 commits: Refactor Seine model (remove Seine from any entity nor dto)
by Tony CHEMIT 29 Jul '19

29 Jul '19

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 4c390804 by tchemit at 2019-07-26T12:12:55Z Refactor Seine model (remove Seine from any entity nor dto) - - - - - 0f9adfde by tchemit at 2019-07-26T12:12:56Z Refactor I18n - quite a bit change.... - - - - - 3ea31d6f by tchemit at 2019-07-26T14:38:01Z Création de nouvelles icônes de navigation - Closes #1358 - - - - - b1ed422f by tchemit at 2019-07-26T14:38:02Z [PS] Transformation de deux énumérations en référentiels (utilisation d'une composition dans le référentiel...) - Closes #1322 - - - - - 3adbb922 by tchemit at 2019-07-26T15:06:07Z N'afficher que les référentiels des modèles sélectionnés - - - - - 6c4c0043 by tchemit at 2019-07-26T15:16:49Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - f41f54dc by tchemit at 2019-07-26T16:47:39Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 2ae9619e by tchemit at 2019-07-26T16:47:39Z Move to new version 9.0-alpha-1 - - - - - 968cd145 by tchemit at 2019-07-26T16:48:45Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - 93703a29 by tchemit at 2019-07-27T16:41:29Z Module 2 (first flush) - - - - - 677073fe by tchemit at 2019-07-27T16:58:01Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - 7cdf849c by tchemit at 2019-07-28T11:44:16Z Module 2 - second flush - - - - - 6be5ed72 by tchemit at 2019-07-28T11:44:16Z Report from v8 for ps logbook model - - - - - b28f017c by tchemit at 2019-07-28T11:47:08Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 80e76801 by tchemit at 2019-07-28T11:51:09Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - 01abfdf1 by tchemit at 2019-07-28T11:51:10Z Consolidation des champs techniques en base - Realing on v9 - See #1353 - - - - - 72286b96 by tchemit at 2019-07-28T12:18:03Z Insertion des lots de débarquements - See #1259 - - - - - e7e12d4b by tchemit at 2019-07-28T12:29:52Z Insertion du plan de cuves - See #1260 - - - - - 7c16b451 by tchemit at 2019-07-28T12:58:34Z Insertion de l’échantillonnage au port - See #1261 - - - - - aefc865d by tchemit at 2019-07-28T13:16:22Z Création de nouvelles icônes de navigation - Pass for v9 - See #1358 - - - - - b70daea9 by tchemit at 2019-07-28T15:09:06Z First realign i18n after develop merge - - - - - cfc0fb8a by tchemit at 2019-07-29T08:49:44Z Realign Seine referential model - - - - - 17 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/i18n/getters/config.getter - client-configuration/src/main/i18n/getters/java.getter - client-core/.mvn/pom.gitflow.develop - client-core/.mvn/pom.gitflow.master - client-core/pom.xml - client-core/src/license/THIRD-PARTY.properties - client-core/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - client-core/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - client-core/src/main/dcp-presets/ps/logbook/03-update-preset.yml - client-core/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml - client-core/src/main/i18n/getters/java.getter The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1464aaf451f4fef701b381226c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1464aaf451f4fef701b381226c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Création de nouvelles icônes de navigation - Closes #1358
by Tony CHEMIT 26 Jul '19

26 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3ea31d6f by tchemit at 2019-07-26T14:38:01Z Création de nouvelles icônes de navigation - Closes #1358 - - - - - b1ed422f by tchemit at 2019-07-26T14:38:02Z [PS] Transformation de deux énumérations en référentiels (utilisation d'une composition dans le référentiel...) - Closes #1322 - - - - - 3adbb922 by tchemit at 2019-07-26T15:06:07Z N'afficher que les référentiels des modèles sélectionnés - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeModel.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/common/ProgramLonglineNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/logbook/ActivityLonglineLogbookListNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/logbook/TripLonglineLandingLogbookListNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/obs/ActivityLonglineObsListNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ps/common/ProgramSeineNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ps/obs/RouteSeineListNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ref/ReferentialListNavigationTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ref/ReferentialNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ref/common/ReferentialListCommonNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ref/ll/ReferentialListLonglineCommonNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ref/ll/ReferentialListLonglineLandingNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ref/ll/ReferentialListLonglineObsNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ref/ps/ReferentialListSeineCommonNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ref/ps/ReferentialListSeineObsNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ProgramSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/util/DtoIconHelper.java - client-core/src/main/resources/icons/navigation/default/data/ll/common/GearUseFeaturesLongline_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/common/GearUseFeaturesLongline_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/common/TripLongline_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/common/TripLongline_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/landing/LandingLongline_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/landing/LandingLongline_24x24.png - + client-core/src/main/resources/icons/navigation/default/data/ll/landing/LandingLongline_list_24x24.png - + client-core/src/main/resources/icons/navigation/default/data/ll/landing/LandingLongline_list__16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/ActivityLonglineLogbook_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/ActivityLonglineLogbook_24x24.png The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4b435b0103ae0f5127ab82f2d3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4b435b0103ae0f5127ab82f2d3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Création de nouvelles icônes de navigation - Closes #1358
by Tony CHEMIT 26 Jul '19

26 Jul '19

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4b435b01 by tchemit at 2019-07-26T13:46:10Z Création de nouvelles icônes de navigation - Closes #1358 - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ll/common/ProgramLonglineNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/data/ps/common/ProgramSeineNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ref/ReferentialListNavigationTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ref/ReferentialNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ref/common/ReferentialListCommonNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ref/ll/ReferentialListLonglineCommonNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ref/ll/ReferentialListLonglineLandingNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ref/ll/ReferentialListLonglineObsNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ref/ps/ReferentialListSeineCommonNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ref/ps/ReferentialListSeineObsNavigationTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ProgramSelectionTreeNode.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/selection/nodes/ReferenceSelectionTreeNodeSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/util/DtoIconHelper.java - client-core/src/main/resources/icons/navigation/default/data/ll/common/GearUseFeaturesLongline_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/common/GearUseFeaturesLongline_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/common/TripLongline_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/common/TripLongline_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/landing/LandingLongline_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/landing/LandingLongline_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/ActivityLonglineLogbook_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/ActivityLonglineLogbook_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/CatchLonglineLogbook_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/CatchLonglineLogbook_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/SampleLogbook_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/SampleLogbook_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/SetLonglineLogbook_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/logbook/SetLonglineLogbook_24x24.png - client-core/src/main/resources/icons/navigation/default/data/ll/observation/ActivityLonglineObs_16x16.png - client-core/src/main/resources/icons/navigation/default/data/ll/observation/ActivityLonglineObs_24x24.png The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4b435b0103ae0f5127ab82f2d35… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4b435b0103ae0f5127ab82f2d35… You're receiving this email because of your account on gitlab.com.

1 0