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

[Git][ultreiaio/ird-observe][develop] continue admin ui storm
by Tony CHEMIT Aug. 28, 2019

Aug. 28, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3f505d6b by tchemit at 2019-08-28T00:53:35Z continue admin ui storm - - - - - 30 changed files: - client-core/pom.xml - 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/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUILauncher.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/actions/AdminTabUIActionSupport.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/actions/CopyToClipBoard.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/SelectDataUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/actions/Start.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/export/actions/Prepare.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/actions/Prepare.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/resume/ShowResumeUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/resume/ShowResumeUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/actions/ObtainRightSource.java → client-core/src/main/java/fr/ird/observe/client/ui/admin/resume/actions/CopyResumeToClipBoard.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/save/actions/Start.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/data/DataSynchroUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3f505d6bcb2f4db39e2ecd5c186… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3f505d6bcb2f4db39e2ecd5c186… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] AdminUI storm... stash
by Tony CHEMIT Aug. 25, 2019

Aug. 25, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 95a919a5 by tchemit at 2019-08-25T14:57:18Z AdminUI storm... stash - - - - - 30 changed files: - client-core/pom.xml - 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/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUILauncher.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/actions/AdminTabUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/actions/AdminUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/actions/Start.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/export/actions/ExportUIActionSupport.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/export/actions/Prepare.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/export/actions/Start.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/ActivityLonglinePairingUIHandler.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/actions/ActivityLonglinePairingUIActionSupport.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/actions/Prepare.java - + client-core/src/main/java/fr/ird/observe/client/ui/admin/longline/pairing/actions/Start.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/report/ReportConfigUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/save/SaveLocalUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/95a919a53f3270cfd4e4f004f47… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/95a919a53f3270cfd4e4f004f47… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 8 commits: clean config bean
by Tony CHEMIT Aug. 22, 2019

Aug. 22, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 393be6f5 by tchemit at 2019-08-19T07:06:08Z clean config bean - - - - - cf580826 by tchemit at 2019-08-20T14:14:00Z move synchro mode to client-db - - - - - ecd13535 by tchemit at 2019-08-20T14:14:37Z add getId method on TripReference - - - - - b004b27b by tchemit at 2019-08-20T14:35:03Z refactor actions (prepare to use next Jaxx actions convention generation) - - - - - aa49cff7 by tchemit at 2019-08-21T12:23:54Z update pom + fix site - - - - - 2c5f39c8 by tchemit at 2019-08-21T15:30:56Z Use new jaxx action api - - - - - 52d91c9d by tchemit at 2019-08-21T20:15:58Z move ObserveMainUI to main package - - - - - 5573e108 by tchemit at 2019-08-22T16:32:55Z Action storm... stash - - - - - 30 changed files: - client-configuration/pom.xml - client-configuration/src/main/i18n/getters/java-enumeration.getter - client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfigBean.java - 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/ObserveActionExecutor.java - client-core/src/main/java/fr/ird/observe/client/ObserveCLAction.java - client-core/src/main/java/fr/ird/observe/client/ObserveRunner.java - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/table/NewTableEntryUIAction.java → client-core/src/main/java/fr/ird/observe/client/ui/ObserveActionContext.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/AbstractContentUIAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/table/ResetTableEntryUIAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/DetailReferentialUIAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/EditReferentialUIAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/tab/GoToTab5UIAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/tab/GoToTab6UIAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/MenuActionSupport.java - − client-core/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ChangeStorageAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/actions/main/storage/CloseStorageAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ReloadStorageAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/actions/main/storage/ShowStorageInfoAction.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminStep.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminTabUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUILauncher.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2fa6b0cd765480539bbc82c86c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2fa6b0cd765480539bbc82c86c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Introduce client-db module
by Tony CHEMIT Aug. 16, 2019

Aug. 16, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 827bf0e5 by tchemit at 2019-08-16T10:33:26Z Introduce client-db module - - - - - 62738216 by tchemit at 2019-08-16T10:33:27Z Move some services to common-service - - - - - 2fa6b0cd by tchemit at 2019-08-16T10:33:27Z update pom - - - - - 30 changed files: - client-configuration/pom.xml - services/src/main/java/fr/ird/observe/client/constants/AcquisitionMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/AcquisitionMode.java - services/src/main/java/fr/ird/observe/client/constants/CatchAcquisitionMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/CatchAcquisitionMode.java - services/src/main/java/fr/ird/observe/client/constants/ConnexionStatus.java → client-configuration/src/main/java/fr/ird/observe/client/constants/ConnexionStatus.java - services/src/main/java/fr/ird/observe/client/constants/CreationMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/CreationMode.java - services/src/main/java/fr/ird/observe/client/constants/DbMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/DbMode.java - services/src/main/java/fr/ird/observe/client/constants/ProgramObservation.java → client-configuration/src/main/java/fr/ird/observe/client/constants/ProgramObservation.java - services/src/main/java/fr/ird/observe/client/constants/ReferentialSynchronizeMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/ReferentialSynchronizeMode.java - services/src/main/java/fr/ird/observe/client/constants/ValidationModelMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/ValidationModelMode.java - client-core/pom.xml - client-core/src/main/i18n/getters/java-enumeration.getter - 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/ObserveRunner.java - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/ObserveTextGenerator.java - − client-core/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - − client-core/src/main/java/fr/ird/observe/client/ui/actions/ObserveActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ReloadStorageAction.java - − client-core/src/main/java/fr/ird/observe/client/ui/actions/storage/presets/PresetsUIActionSupport.java - − client-core/src/main/java/fr/ird/observe/client/ui/actions/tripMap/TripMapActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUILauncher.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss - client-core/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchronizeResources.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/62d89690164a62d450bda252fb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/62d89690164a62d450bda252fb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 28 commits: Introduce client-db module
by Tony CHEMIT Aug. 9, 2019

Aug. 9, 2019

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 62d89690 by tchemit at 2019-08-09T18:08:48Z Introduce client-db module - - - - - ab5636bf by tchemit at 2019-08-09T18:45:32Z Introduce client-db module - - - - - 81dbda35 by tchemit at 2019-08-09T18:45:32Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - 659c00d4 by tchemit at 2019-08-09T18:47:48Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 4d32c6c6 by tchemit at 2019-08-09T18:47:48Z Move to new version 9.0-alpha-1 - - - - - 2c49025b by tchemit at 2019-08-09T18:47:48Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - 1791361f by tchemit at 2019-08-09T18:50:33Z Module 2 (first flush) - - - - - 661b8d4e by tchemit at 2019-08-09T18:50:34Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - 147fc2b1 by tchemit at 2019-08-09T18:50:34Z Module 2 - second flush - - - - - fa203206 by tchemit at 2019-08-09T18:50:34Z Report from v8 for ps logbook model - - - - - 37d21786 by tchemit at 2019-08-09T18:50:34Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 987e06fe by tchemit at 2019-08-09T18:51:30Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - 5f7e1065 by tchemit at 2019-08-09T18:51:30Z Consolidation des champs techniques en base - Realing on v9 - See #1353 - - - - - 3415d8e2 by tchemit at 2019-08-09T18:51:31Z Insertion des lots de débarquements - See #1259 - - - - - 6d0fa6a6 by tchemit at 2019-08-09T18:51:31Z Insertion du plan de cuves - See #1260 - - - - - 430d45c5 by tchemit at 2019-08-09T18:51:42Z Insertion de l’échantillonnage au port - See #1261 - - - - - 80bc13f1 by tchemit at 2019-08-09T18:51:43Z Création de nouvelles icônes de navigation - Pass for v9 - See #1358 - - - - - edf185c3 by tchemit at 2019-08-09T18:51:53Z First realign i18n after develop merge - - - - - 019ca5d7 by tchemit at 2019-08-09T18:54:02Z Realign Seine model (no more any Seine in any Seine data - - - - - a1df1972 by tchemit at 2019-08-09T18:54:12Z optimize i18n - - - - - 0022b449 by tchemit at 2019-08-09T18:54:55Z Use new ServicesProvider (everything is now generated) (report on v9) - - - - - 38880631 by tchemit at 2019-08-09T18:54:55Z Normalize seine services names - - - - - 455c0a64 by tchemit at 2019-08-09T18:54:56Z Align logbook referential - See #1332 - - - - - 1de911a4 by tchemit at 2019-08-09T18:55:04Z realign after big rebase from develop - - - - - 7147af61 by tchemit at 2019-08-09T18:55:04Z Add package priority tag value and generate new package model initializers - - - - - 98144cbc by tchemit at 2019-08-09T18:55:04Z Refactor decorator service init using new per package model initializer. - - - - - fd81b625 by tchemit at 2019-08-09T18:55:04Z Clean content ui models (for v9) - - - - - 9df26630 by tchemit at 2019-08-09T19:04:58Z rebase from develop - - - - - 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 - services/src/main/java/fr/ird/observe/client/constants/AcquisitionMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/AcquisitionMode.java - services/src/main/java/fr/ird/observe/client/constants/CatchAcquisitionMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/CatchAcquisitionMode.java - services/src/main/java/fr/ird/observe/client/constants/ConnexionStatus.java → client-configuration/src/main/java/fr/ird/observe/client/constants/ConnexionStatus.java - services/src/main/java/fr/ird/observe/client/constants/CreationMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/CreationMode.java - services/src/main/java/fr/ird/observe/client/constants/DbMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/DbMode.java - services/src/main/java/fr/ird/observe/client/constants/ProgramObservation.java → client-configuration/src/main/java/fr/ird/observe/client/constants/ProgramObservation.java - services/src/main/java/fr/ird/observe/client/constants/ReferentialSynchronizeMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/ReferentialSynchronizeMode.java - services/src/main/java/fr/ird/observe/client/constants/ValidationModelMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/ValidationModelMode.java - 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-enumeration.getter - 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/ObserveRunner.java - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/ObserveTextGenerator.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/0cfae924c9d61dac22832e8e9f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/0cfae924c9d61dac22832e8e9f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Introduce client-db module
by Tony CHEMIT Aug. 9, 2019

Aug. 9, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 62d89690 by tchemit at 2019-08-09T18:08:48Z Introduce client-db module - - - - - 30 changed files: - client-configuration/pom.xml - services/src/main/java/fr/ird/observe/client/constants/AcquisitionMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/AcquisitionMode.java - services/src/main/java/fr/ird/observe/client/constants/CatchAcquisitionMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/CatchAcquisitionMode.java - services/src/main/java/fr/ird/observe/client/constants/ConnexionStatus.java → client-configuration/src/main/java/fr/ird/observe/client/constants/ConnexionStatus.java - services/src/main/java/fr/ird/observe/client/constants/CreationMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/CreationMode.java - services/src/main/java/fr/ird/observe/client/constants/DbMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/DbMode.java - services/src/main/java/fr/ird/observe/client/constants/ProgramObservation.java → client-configuration/src/main/java/fr/ird/observe/client/constants/ProgramObservation.java - services/src/main/java/fr/ird/observe/client/constants/ReferentialSynchronizeMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/ReferentialSynchronizeMode.java - services/src/main/java/fr/ird/observe/client/constants/ValidationModelMode.java → client-configuration/src/main/java/fr/ird/observe/client/constants/ValidationModelMode.java - client-core/pom.xml - client-core/src/main/i18n/getters/java-enumeration.getter - 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/ObserveRunner.java - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/ObserveTextGenerator.java - − client-core/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveKeyStrokes.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ReloadStorageAction.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUILauncher.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/validate/ValidateEntityListCellRenderer.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/TripUI.java → client-core/src/main/java/fr/ird/observe/client/ui/content/data/TripUIHelper.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/common/TripUIHandler.java - − client-core/src/main/java/fr/ird/observe/client/ui/storage/package.html - − client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/package.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/62d89690164a62d450bda252fbf… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/62d89690164a62d450bda252fbf… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 27 commits: use config for tests
by Tony CHEMIT Aug. 8, 2019

Aug. 8, 2019

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 791814fd by tchemit at 2019-08-08T00:44:05Z use config for tests - - - - - 2e465de5 by tchemit at 2019-08-08T14:00:50Z Introduce client-db module - - - - - 4bdc1cbd by tchemit at 2019-08-08T14:00:52Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - 9de20cb1 by tchemit at 2019-08-08T14:00:52Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 47495651 by tchemit at 2019-08-08T14:00:52Z Move to new version 9.0-alpha-1 - - - - - 014e3728 by tchemit at 2019-08-08T14:00:52Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - 3cd53789 by tchemit at 2019-08-08T14:00:52Z Module 2 (first flush) - - - - - 44638f28 by tchemit at 2019-08-08T14:00:52Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - b6ed92bb by tchemit at 2019-08-08T14:00:52Z Module 2 - second flush - - - - - 22bcda3b by tchemit at 2019-08-08T14:00:52Z Report from v8 for ps logbook model - - - - - 9c55ab21 by tchemit at 2019-08-08T14:00:52Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 2ccd90b4 by tchemit at 2019-08-08T14:00:52Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - 89002fee by tchemit at 2019-08-08T14:00:52Z Consolidation des champs techniques en base - Realing on v9 - See #1353 - - - - - 09418c9a by tchemit at 2019-08-08T14:00:52Z Insertion des lots de débarquements - See #1259 - - - - - b0e04541 by tchemit at 2019-08-08T14:00:52Z Insertion du plan de cuves - See #1260 - - - - - 88d85694 by tchemit at 2019-08-08T14:00:52Z Insertion de l’échantillonnage au port - See #1261 - - - - - 5291adb6 by tchemit at 2019-08-08T14:00:52Z Création de nouvelles icônes de navigation - Pass for v9 - See #1358 - - - - - bb7d07a3 by tchemit at 2019-08-08T14:00:52Z First realign i18n after develop merge - - - - - a12d7429 by tchemit at 2019-08-08T14:00:52Z Realign Seine model (no more any Seine in any Seine data - - - - - 489784bc by tchemit at 2019-08-08T14:00:52Z optimize i18n - - - - - 60fefe6e by tchemit at 2019-08-08T14:00:52Z Use new ServicesProvider (everything is now generated) (report on v9) - - - - - 3301018e by tchemit at 2019-08-08T14:00:52Z Normalize seine services names - - - - - 09b778d0 by tchemit at 2019-08-08T14:00:52Z Align logbook referential - See #1332 - - - - - f1f55464 by tchemit at 2019-08-08T14:00:52Z realign after big rebase from develop - - - - - 595b5cae by tchemit at 2019-08-08T14:00:52Z Add package priority tag value and generate new package model initializers - - - - - a942ffc0 by tchemit at 2019-08-08T14:00:52Z Refactor decorator service init using new per package model initializer. - - - - - 0cfae924 by tchemit at 2019-08-08T14:00:52Z Clean content ui models (for 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-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - 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/ObserveRunner.java - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/ObserveTextGenerator.java - − client-core/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.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/ObserveMainUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/SelectTransshipmentLandingLonglineUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ff7caa057c50b32df52c53a181… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/ff7caa057c50b32df52c53a181… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: use config for tests
by Tony CHEMIT Aug. 8, 2019

Aug. 8, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 791814fd by tchemit at 2019-08-08T00:44:05Z use config for tests - - - - - 9b42e117 by tchemit at 2019-08-08T01:01:38Z Introduce client-db module - - - - - 30 changed files: - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-core/pom.xml - client-core/src/main/i18n/getters/java.getter - client-core/src/main/java/fr/ird/observe/client/ObserveRunner.java - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/ObserveTextGenerator.java - − client-core/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/main/menu/storage/ReloadStorageAction.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/AdminUILauncher.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/config/ConfigModel.java - client-core/src/main/java/fr/ird/observe/client/ui/admin/consolidate/ConsolidateUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/StorageBackupUILauncher.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/StorageUILauncher.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java - + client-db/.mvn/i18n/parse-java - + client-db/.mvn/pom.gitflow.develop - + client-db/.mvn/pom.gitflow.master - + client-db/.mvn/pom.organizationId - + client-db/.mvn/pom.projectId - + client-db/.mvn/pom.stageId - + client-db/LICENSE.txt - + client-db/README.md - + client-db/pom.xml - + client-db/src/license/THIRD-PARTY.properties - + client-db/src/main/i18n/getters/java.getter - + client-db/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContextSupport.java - client-core/src/main/java/fr/ird/observe/client/ObserveSwingSessionHelper.java → client-db/src/main/java/fr/ird/observe/client/ObserveSwingSessionHelper.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/98bf36c1b78569795424918175… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/98bf36c1b78569795424918175… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Clean content ui models
by Tony CHEMIT Aug. 7, 2019

Aug. 7, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 98bf36c1 by tchemit at 2019-08-07T13:46:57Z Clean content ui models - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/GearUseFeaturesUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripListUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/LandingListUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/LandingPartUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/LandingUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityListUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivitySampleUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/BaitsCompositionUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/BranchlinesCompositionUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/CatchTableModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/CatchUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/FloatlinesCompositionUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/HooksCompositionUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/SamplePartUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/SetGlobalCompositionUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/SetUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/TripSampleListUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/TripSampleUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/ActivityListUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/observation/ActivityUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/98bf36c1b78569795424918175d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/98bf36c1b78569795424918175d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 26 commits: Clean content ui models
by Tony CHEMIT Aug. 7, 2019

Aug. 7, 2019

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 98bf36c1 by tchemit at 2019-08-07T13:46:57Z Clean content ui models - - - - - f0dc4ade by tchemit at 2019-08-07T13:47:10Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - 43bebea0 by tchemit at 2019-08-07T13:47:11Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 3c6cd5fa by tchemit at 2019-08-07T13:47:11Z Move to new version 9.0-alpha-1 - - - - - 6ba73fc8 by tchemit at 2019-08-07T13:47:11Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - 24368389 by tchemit at 2019-08-07T13:47:11Z Module 2 (first flush) - - - - - 33e3e9a1 by tchemit at 2019-08-07T13:47:12Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - 9ad410d1 by tchemit at 2019-08-07T13:47:12Z Module 2 - second flush - - - - - b96d70b1 by tchemit at 2019-08-07T13:47:12Z Report from v8 for ps logbook model - - - - - d830735b by tchemit at 2019-08-07T13:47:12Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 57695be6 by tchemit at 2019-08-07T13:47:12Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - c14eba02 by tchemit at 2019-08-07T13:47:13Z Consolidation des champs techniques en base - Realing on v9 - See #1353 - - - - - d7df4e0f by tchemit at 2019-08-07T13:47:13Z Insertion des lots de débarquements - See #1259 - - - - - 4c545124 by tchemit at 2019-08-07T13:47:14Z Insertion du plan de cuves - See #1260 - - - - - 22623047 by tchemit at 2019-08-07T13:47:14Z Insertion de l’échantillonnage au port - See #1261 - - - - - 34b8821e by tchemit at 2019-08-07T13:47:14Z Création de nouvelles icônes de navigation - Pass for v9 - See #1358 - - - - - fb8f7a31 by tchemit at 2019-08-07T13:47:15Z First realign i18n after develop merge - - - - - 57c79037 by tchemit at 2019-08-07T13:47:15Z Realign Seine model (no more any Seine in any Seine data - - - - - add86767 by tchemit at 2019-08-07T13:47:15Z optimize i18n - - - - - 35ee9412 by tchemit at 2019-08-07T13:47:16Z Use new ServicesProvider (everything is now generated) (report on v9) - - - - - 556e827c by tchemit at 2019-08-07T13:47:16Z Normalize seine services names - - - - - 7e9b4bf9 by tchemit at 2019-08-07T13:47:16Z Align logbook referential - See #1332 - - - - - a7e987c2 by tchemit at 2019-08-07T13:47:16Z realign after big rebase from develop - - - - - 49c1d136 by tchemit at 2019-08-07T13:47:16Z Add package priority tag value and generate new package model initializers - - - - - 07c8685b by tchemit at 2019-08-07T13:47:17Z Refactor decorator service init using new per package model initializer. - - - - - ff7caa05 by tchemit at 2019-08-07T13:48:13Z Clean content ui models (for 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/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/SelectTransshipmentLandingLonglineUIAction.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/move/MoveMultipleTripLonglineLandingUIAction.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/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 The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f60e9dcc3f70b905ff508721bd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f60e9dcc3f70b905ff508721bd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Use DecoratorServiceSupport from toolkit
by Tony CHEMIT Aug. 7, 2019

Aug. 7, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 91937b45 by tchemit at 2019-08-07T12:46:48Z Use DecoratorServiceSupport from toolkit - - - - - c486e213 by tchemit at 2019-08-07T12:46:50Z Use Decorators from toolkit - - - - - 3fc09195 by tchemit at 2019-08-07T13:36:09Z Clean content ui models - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/tree/NavigationConfigUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/edit/ContentEditUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/list/ContentListUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/open/ContentOpenableUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/simple/ContentSimpleUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ContentReferenceUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ref/ReferenceHomeUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/GearUseFeaturesUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripListUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/common/TripUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/LandingListUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/LandingPartUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/landing/LandingUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityListUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivitySampleUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/ActivityUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/BaitsCompositionUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/BranchlinesCompositionUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/CatchTableModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/CatchUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/FloatlinesCompositionUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ll/logbook/HooksCompositionUIModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6dd290604061bd2ddf88e7f832… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/6dd290604061bd2ddf88e7f832… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 28 commits: Use DecoratorServiceSupport from toolkit
by Tony CHEMIT Aug. 7, 2019

Aug. 7, 2019

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 91937b45 by tchemit at 2019-08-07T12:46:48Z Use DecoratorServiceSupport from toolkit - - - - - c486e213 by tchemit at 2019-08-07T12:46:50Z Use Decorators from toolkit - - - - - 3fc09195 by tchemit at 2019-08-07T13:36:09Z Clean content ui models - - - - - 5070eca4 by tchemit at 2019-08-07T13:36:16Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - a8dd3e7a by tchemit at 2019-08-07T13:37:50Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 0682acb0 by tchemit at 2019-08-07T13:37:50Z Move to new version 9.0-alpha-1 - - - - - 6b32d70a by tchemit at 2019-08-07T13:37:50Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - a75b2c64 by tchemit at 2019-08-07T13:37:50Z Module 2 (first flush) - - - - - bcddeb06 by tchemit at 2019-08-07T13:37:51Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - 2aa412d8 by tchemit at 2019-08-07T13:37:51Z Module 2 - second flush - - - - - 6374e0d0 by tchemit at 2019-08-07T13:37:51Z Report from v8 for ps logbook model - - - - - d0ec7875 by tchemit at 2019-08-07T13:37:51Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 7915e182 by tchemit at 2019-08-07T13:37:51Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - 08e13950 by tchemit at 2019-08-07T13:37:52Z Consolidation des champs techniques en base - Realing on v9 - See #1353 - - - - - 240b8e6a by tchemit at 2019-08-07T13:37:52Z Insertion des lots de débarquements - See #1259 - - - - - 71d09949 by tchemit at 2019-08-07T13:37:53Z Insertion du plan de cuves - See #1260 - - - - - 06433848 by tchemit at 2019-08-07T13:37:53Z Insertion de l’échantillonnage au port - See #1261 - - - - - 02d22b13 by tchemit at 2019-08-07T13:37:53Z Création de nouvelles icônes de navigation - Pass for v9 - See #1358 - - - - - 47cd2fd7 by tchemit at 2019-08-07T13:37:53Z First realign i18n after develop merge - - - - - c375dd33 by tchemit at 2019-08-07T13:37:54Z Realign Seine model (no more any Seine in any Seine data - - - - - e7523878 by tchemit at 2019-08-07T13:37:54Z optimize i18n - - - - - 212d1572 by tchemit at 2019-08-07T13:37:54Z Use new ServicesProvider (everything is now generated) (report on v9) - - - - - d064c8e6 by tchemit at 2019-08-07T13:37:54Z Normalize seine services names - - - - - bfdcbbbb by tchemit at 2019-08-07T13:37:54Z Align logbook referential - See #1332 - - - - - 359c5311 by tchemit at 2019-08-07T13:37:55Z realign after big rebase from develop - - - - - c5e15da9 by tchemit at 2019-08-07T13:37:55Z Add package priority tag value and generate new package model initializers - - - - - 92caad87 by tchemit at 2019-08-07T13:37:55Z Refactor decorator service init using new per package model initializer. - - - - - f60e9dcc by tchemit at 2019-08-07T13:44:23Z Clean content ui models (for 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/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.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/UIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/SelectTransshipmentLandingLonglineUIAction.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/move/MoveMultipleTripLonglineLandingUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b71178acf2b41c99ceca293cc4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b71178acf2b41c99ceca293cc4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Use DecoratorServiceSupport from toolkit
by Tony CHEMIT Aug. 7, 2019

Aug. 7, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6eaa38ad by tchemit at 2019-08-07T12:39:36Z Use DecoratorServiceSupport from toolkit - - - - - 6dd29060 by tchemit at 2019-08-07T12:39:37Z Use Decorators from toolkit - - - - - 24 changed files: - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-core/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/tree/NavigationConfigUIActionSupport.java - client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/tree/ObserveTreeNodeSupport.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/NavigationUIHandler.java - client-core/src/main/java/fr/ird/observe/client/validation/ClientValidationContext.java - dto/src/main/i18n/getters/java.getter - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - − dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ObserveDecorator.java - − dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ReferentialReferenceDecorator.java - 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 - services-validation/src/main/java/fr/ird/observe/services/ObserveServicesProviderImpl.java - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/DataReferenceDecorator.java → services-validation/src/main/java/fr/ird/observe/services/ObserveServicesProviderSupport.java - services-validation/src/main/java/fr/ird/observe/validation/validators/TripVesselDtoValidator.java - validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripDto-update-error-validation.xml Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java ===================================== @@ -42,6 +42,7 @@ import fr.ird.observe.navigation.model.edit.ObserveEditModelManager; import fr.ird.observe.navigation.model.select.ObserveSelectModel; import fr.ird.observe.services.ObserveDataSourceConfigurationMainFactory; import fr.ird.observe.services.ObserveServiceMainFactory; +import fr.ird.observe.services.ObserveServicesProvider; import fr.ird.observe.spi.DtoModelHelper; import fr.ird.observe.validation.ValidatorDto; import fr.ird.observe.validation.ValidatorsManager; @@ -216,6 +217,10 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im return ((ValidatorsManager) VALIDATORS_MANAGER.get()).getValidators(); } + public ObserveServicesProvider getServicesProvider() { + return getDataSourcesManager().getMainDataSource(); + } + public ObserveMainUI getMainUI() { return MAIN_UI.get(); } @@ -357,23 +362,23 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext im super.finalize(); } - public void sanitizeIds(ProgressModel progressModel, DtoModelNavigationAggregateModel navigationSelectModel) { - try { - for (DtoModelNavigationModel<?> navigationModel : navigationSelectModel.getModels()) { - for (DtoModelNavigationNode node : navigationModel.getNodesWithIds()) { - if (node.isEnabled()) { - ImmutableSet<String> safeIds = ObserveSwingDataSource.MAIN.getNavigationService().retainExistingIds(ImmutableSet.of(node.getId())); - if (safeIds.isEmpty()) { - node.setId(null); - } - } - progressModel.incrementsCurrentStep(); - } - } - } catch (Exception e) { - log.error("Could not sanitizeIds", e); - } - } +// public void sanitizeIds(ProgressModel progressModel, DtoModelNavigationAggregateModel navigationSelectModel) { +// try { +// for (DtoModelNavigationModel<?> navigationModel : navigationSelectModel.getModels()) { +// for (DtoModelNavigationNode node : navigationModel.getNodesWithIds()) { +// if (node.isEnabled()) { +// ImmutableSet<String> safeIds = ObserveSwingDataSource.MAIN.getNavigationService().retainExistingIds(ImmutableSet.of(node.getId())); +// if (safeIds.isEmpty()) { +// node.setId(null); +// } +// } +// progressModel.incrementsCurrentStep(); +// } +// } +// } catch (Exception e) { +// log.error("Could not sanitizeIds", e); +// } +// } public void saveNavigationToConfig(boolean clearModels) { ===================================== client-core/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java ===================================== @@ -568,10 +568,10 @@ public class ObserveDataSourcesManager implements Closeable { boolean withSelectModel = navigationSelectModel != null; boolean withEditModel = navigationEditModel != null; if (source.canReadData() && withSelectModel) { - applicationContext.sanitizeIds(progressModel, navigationSelectModel); + dataSource.sanitizeIds(progressModel, navigationSelectModel); } if (source.canWriteData() && withEditModel) { - applicationContext.sanitizeIds(progressModel, navigationEditModel); + dataSource.sanitizeIds(progressModel, navigationEditModel); } if (source.canWriteData()) { applicationContext.getFloatingObjectPresetsManager().sanitize(progressModel, source); @@ -583,7 +583,7 @@ public class ObserveDataSourcesManager implements Closeable { applicationContext.getNavigationEdit().load(navigationEditModel); } - mainUI.getInitializer().loadNavigationUI(progressModel); + mainUI.getInitializer().loadNavigationUI(dataSource,progressModel); mainUI.getModel().setMode(ObserveUIMode.DB); progressModel.incrementsCurrentStep(); ===================================== client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java ===================================== @@ -37,9 +37,13 @@ import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.reference.ReferentialDtoReferenceSet; import fr.ird.observe.dto.referential.ReferentialDto; import fr.ird.observe.dto.referential.ReferentialLocale; +import fr.ird.observe.navigation.model.DtoModelNavigationAggregateModel; +import fr.ird.observe.navigation.model.DtoModelNavigationModel; +import fr.ird.observe.navigation.model.DtoModelNavigationNode; import fr.ird.observe.services.ObserveServiceInitializer; import fr.ird.observe.services.ObserveServiceMainFactory; import fr.ird.observe.services.ObserveServicesProvider; +import fr.ird.observe.services.ObserveServicesProviderSupport; import fr.ird.observe.services.configuration.DataSourceCreateConfigurationDto; import fr.ird.observe.services.configuration.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.configuration.IncompatibleDataSourceCreateConfigurationException; @@ -65,14 +69,14 @@ import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.spi.map.ImmutableSetDtoMap; import fr.ird.observe.spi.map.ImmutableSetStringMap; import fr.ird.observe.spi.map.ImmutableTypedMap; +import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; -import org.jdesktop.beans.AbstractSerializableBean; import org.nuiton.version.Version; import javax.swing.JOptionPane; import javax.swing.event.EventListenerList; -import java.io.Closeable; import java.io.File; import java.io.IOException; import java.util.Locale; @@ -84,49 +88,23 @@ import static io.ultreia.java4all.i18n.I18n.t; /** * @author Tony Chemit - dev(a)tchemit.fr */ -public class ObserveSwingDataSource extends AbstractSerializableBean implements Closeable, ObserveServicesProvider { +@GenerateJavaBeanDefinition +public class ObserveSwingDataSource extends ObserveServicesProviderSupport implements JavaBean { - public static final ObserveServicesProvider MAIN = new ObserveServicesProvider(){ - @Override - public void close() { - } - - //FIXME If we do not set this, OGNL can't find it on default implementation on interface :( - @Override - public fr.ird.observe.services.service.data.ll.common.TripService getLlCommonTripService() { - return getService(fr.ird.observe.services.service.data.ll.common.TripService.class); - } - - //FIXME If we do not set this, OGNL can't find it on default implementation on interface :( - @Override - public fr.ird.observe.services.service.data.ps.common.TripService getPsCommonTripService() { - return getService(fr.ird.observe.services.service.data.ps.common.TripService.class); - } - - @Override - public <S extends ObserveService> S getService(Class<S> serviceType) { - return ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource().getService(serviceType); - } - }; - private static final long serialVersionUID = 1L; private static final Logger log = LogManager.getLogger(ObserveSwingDataSource.class); - private final EventListenerList listenerList; + private final EventListenerList listenerList; private final ObserveDataSourceConfiguration configuration; - private final ObserveReferentialCache referentialCache; - private final ObserveServicesProvider servicesProvider; - private ObserveDataSourceConnection connection; - private ProgressModel progressModel; // indique que la connexion a expiré mais que la source n'est pas complétement fermer private boolean expired; - // indique si une modification a été effectuéé sur la base depuis son ouverture private boolean modified; + // indique si l'utilisateur connecté est le propriétaire de la base private boolean owner; public ObserveSwingDataSource(ObserveDataSourceConfiguration configuration) { @@ -582,4 +560,23 @@ public class ObserveSwingDataSource extends AbstractSerializableBean implements public boolean getOwner() { return owner; } + + public void sanitizeIds(ProgressModel progressModel, DtoModelNavigationAggregateModel navigationSelectModel) { + try { + for (DtoModelNavigationModel<?> navigationModel : navigationSelectModel.getModels()) { + for (DtoModelNavigationNode node : navigationModel.getNodesWithIds()) { + if (node.isEnabled()) { + ImmutableSet<String> safeIds = getNavigationService().retainExistingIds(ImmutableSet.of(node.getId())); + if (safeIds.isEmpty()) { + node.setId(null); + } + } + progressModel.incrementsCurrentStep(); + } + } + } catch (Exception e) { + log.error("Could not sanitizeIds", e); + } + } + } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java ===================================== @@ -46,6 +46,7 @@ import fr.ird.observe.dto.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.navigation.model.edit.longline.ObserveLonglineEditModel; import fr.ird.observe.navigation.model.edit.seine.ObserveSeineEditModel; import fr.ird.observe.navigation.model.select.ObserveSelectModel; +import fr.ird.observe.services.ObserveServicesProvider; import io.ultreia.java4all.i18n.I18n; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -356,7 +357,7 @@ public class ObserveMainUIInitializer { // on met à jour le modèle de navigation NavigationTreeModel treeModel = ui.getNavigationUI().getTree().getTreeModel(); treeModel.load(config); - treeModel.populate(); + treeModel.populate(mainStorage); // selection du noeud d'ouverture ui.getNavigationUI().getTree().selectInitialNode(); @@ -563,14 +564,15 @@ public class ObserveMainUIInitializer { * * Note: cette méthode doit être appelée après tout rechargement de modèle de naivgation. * + * @param servicesProvider * @param progressModel the progress model to interact with ui */ - public void loadNavigationUI(ProgressModel progressModel) { + public void loadNavigationUI(ObserveServicesProvider servicesProvider, ProgressModel progressModel) { NavigationTree tree = ui.getNavigationUI().getTree(); NavigationTreeModel treeModel = tree.getTreeModel(); - treeModel.populate(); + treeModel.populate(servicesProvider); progressModel.incrementsCurrentStep(); // select initial node ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/UIActionSupport.java ===================================== @@ -22,12 +22,12 @@ package fr.ird.observe.client.ui.actions; import fr.ird.observe.client.ObserveSwingApplicationContext; -import fr.ird.observe.client.db.ObserveSwingDataSource; import fr.ird.observe.client.ui.ObserveKeyStrokes; import fr.ird.observe.client.ui.ObserveMainUI; import fr.ird.observe.client.ui.content.api.ContentUI; import fr.ird.observe.client.ui.util.UIHelper; import fr.ird.observe.services.ObserveServicesProvider; +import io.ultreia.java4all.util.SingletonSupplier; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jdesktop.jxlayer.JXLayer; @@ -61,6 +61,7 @@ public abstract class UIActionSupport extends AbstractAction { private static final long serialVersionUID = 1L; public static final String DELEGATE_CONTENT_UI = "delegateContentUI"; private final ObserveMainUI mainUI; + private final SingletonSupplier<ObserveServicesProvider> servicesProviderSupplier = SingletonSupplier.of(ObserveSwingApplicationContext.get()::getServicesProvider); public UIActionSupport(ObserveMainUI mainUI, String actionCommandKey, String label, String shortDescription, String actionIcon, KeyStroke acceleratorKey) { this(mainUI, actionCommandKey, label, shortDescription, actionIcon, acceleratorKey, true); @@ -228,7 +229,7 @@ public abstract class UIActionSupport extends AbstractAction { } protected ObserveServicesProvider getServicesProvider() { - return ObserveSwingDataSource.MAIN; + return servicesProviderSupplier.get(); } protected ContentUI getContentUI(ContentUI contentUI) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/tree/NavigationConfigUIActionSupport.java ===================================== @@ -43,6 +43,6 @@ public abstract class NavigationConfigUIActionSupport extends MenuActionSupport @Override protected void doActionPerformed(ActionEvent e) { - getMainUI().getNavigationUI().getHandler().tryToUpdateNavigationTree(); + getMainUI().getNavigationUI().getHandler().tryToUpdateNavigationTree(getServicesProvider()); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java ===================================== @@ -50,6 +50,7 @@ import fr.ird.observe.services.ObserveServicesProvider; import fr.ird.observe.services.service.ObserveService; import fr.ird.observe.spi.DtoModelHelper; import io.ultreia.java4all.bean.JavaBean; +import io.ultreia.java4all.util.SingletonSupplier; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.runtime.JAXXObject; @@ -83,7 +84,6 @@ import java.util.List; import java.util.Objects; import java.util.Optional; -import static fr.ird.observe.client.db.ObserveSwingDataSource.MAIN; import static io.ultreia.java4all.i18n.I18n.t; /** @@ -109,6 +109,8 @@ public abstract class ContentUIHandler implements ObserveSe private ImmutableList<TemperatureEditor> temperatureEditors; private boolean toggleTimeEditorSliderIsChanging; private boolean coordinateFormatChangedIsChanging; + protected boolean resetEdit; + private final SingletonSupplier<ObserveServicesProvider> servicesProviderSupplier; protected ContentUIHandler() { this.focusTraversalPolicy = createFocusTraversalPolicy(); @@ -120,6 +122,7 @@ public abstract class ContentUIHandler implements ObserveSe CoordinateFormat newValue = (CoordinateFormat) evt.getNewValue(); onCoordinateFormatChanged(newValue); }; + this.servicesProviderSupplier = SingletonSupplier.of(ObserveSwingApplicationContext.get()::getServicesProvider); } public static NavigationTree getNavigationTree() { @@ -510,7 +513,6 @@ public abstract class ContentUIHandler implements ObserveSe protected void uninstallValidators() { SwingValidatorUtil.setValidatorBean(ui, null); } - protected boolean resetEdit; public boolean isResetEdit() { return resetEdit; @@ -804,7 +806,7 @@ public abstract class ContentUIHandler implements ObserveSe @Override public <S extends ObserveService> S getService(Class<S> serviceType) { - return MAIN.getService(serviceType); + return servicesProviderSupplier.get().getService(serviceType); } // ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/StorageUIHandler.java ===================================== @@ -618,7 +618,7 @@ public class StorageUIHandler implements UIHandler<StorageUI> { log.info(">>> create initial dump with " + currentDataSource + " in " + f); } try { - SqlScriptProducerService dumpProducerService = ObserveSwingDataSource.MAIN.getSqlScriptProducerService(); + SqlScriptProducerService dumpProducerService = currentDataSource.getSqlScriptProducerService(); backupLocalDatabase(dumpProducerService, f); config.setInitialDumpExist(true); } catch (Exception e) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/ObserveTreeNodeSupport.java ===================================== @@ -22,8 +22,10 @@ package fr.ird.observe.client.ui.tree; * #L% */ +import fr.ird.observe.client.ObserveSwingApplicationContext; import fr.ird.observe.client.db.ObserveSwingDataSource; import fr.ird.observe.services.ObserveServicesProvider; +import io.ultreia.java4all.util.SingletonSupplier; import javax.swing.Icon; import javax.swing.tree.DefaultMutableTreeNode; @@ -37,8 +39,11 @@ import java.awt.Color; */ public abstract class ObserveTreeNodeSupport<O> extends DefaultMutableTreeNode { + private final SingletonSupplier<ObserveServicesProvider> servicesProviderSupplier; + public ObserveTreeNodeSupport(O userObject, boolean allowsChildren) { super(userObject, allowsChildren); + this.servicesProviderSupplier = SingletonSupplier.of(ObserveSwingApplicationContext.get()::getServicesProvider); } public abstract boolean isOpen(); @@ -60,7 +65,7 @@ public abstract class ObserveTreeNodeSupport<O> extends DefaultMutableTreeNode { } protected ObserveServicesProvider getServicesProvider() { - return ObserveSwingDataSource.MAIN; + return servicesProviderSupplier.get(); } } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeModel.java ===================================== @@ -42,6 +42,7 @@ import fr.ird.observe.dto.referential.common.ProgramHelper; import fr.ird.observe.dto.referential.common.ProgramReference; import fr.ird.observe.navigation.model.DtoModelNavigationModel; import fr.ird.observe.navigation.model.ObserveNavigationNode; +import fr.ird.observe.services.ObserveServicesProvider; import fr.ird.observe.services.service.data.NavigationRequest; import fr.ird.observe.services.service.data.NavigationResult; import fr.ird.observe.services.service.data.NavigationService; @@ -103,9 +104,9 @@ public class NavigationTreeModel extends DefaultTreeModel { this.config.load(config); } - public void populate() { + public void populate(ObserveServicesProvider servicesProvider) { - NavigationService navigationService = ObserveSwingDataSource.MAIN.getNavigationService(); + NavigationService navigationService = servicesProvider.getNavigationService(); NavigationRequest navigationRequest = config.toRequest(); NavigationResult navigationResult = navigationService.getNavigation(navigationRequest); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationUIHandler.java ===================================== @@ -28,6 +28,7 @@ import fr.ird.observe.client.configuration.NavigationTreeConfig; import fr.ird.observe.client.ui.actions.UIActionSupport; import fr.ird.observe.client.ui.content.api.spi.ObserveActionMap; import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport; +import fr.ird.observe.services.ObserveServicesProvider; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jdesktop.swingx.decorator.ColorHighlighter; @@ -152,7 +153,7 @@ public class NavigationUIHandler implements UIHandler<NavigationUI> { } - public void tryToUpdateNavigationTree() { + public void tryToUpdateNavigationTree(ObserveServicesProvider servicesProvider) { boolean canContinue = ObserveSwingApplicationContext.get().getContentUIManager().closeSelectedContentUI(); @@ -180,7 +181,7 @@ public class NavigationUIHandler implements UIHandler<NavigationUI> { navigationTreeConfig.setShowReferential(showReferential); navigationTreeConfig.setShowEmptyProgram(showEmptyProgram); treeModel.save(ObserveSwingApplicationContext.get().getConfig()); - treeModel.populate(); + treeModel.populate(servicesProvider); //FIXME repositionner le nœud sélectionné if (!treeModel.getRoot().isLeaf()) { tree.setSelectionRow(0); ===================================== client-core/src/main/java/fr/ird/observe/client/validation/ClientValidationContext.java ===================================== @@ -56,7 +56,7 @@ public class ClientValidationContext extends ValidationContext { } public ObserveServicesProvider getServicesProvider() { - return ObserveSwingDataSource.MAIN; + return ObserveSwingApplicationContext.get().getServicesProvider(); } @Override ===================================== dto/src/main/i18n/getters/java.getter ===================================== @@ -17,8 +17,6 @@ observe.common.gps.activity observe.common.gps.gpsPoint observe.common.inconnu observe.common.no.unit -observe.common.nocode -observe.common.none observe.data.Data.baitHaulingStatus observe.data.Data.captain observe.data.Data.dataQuality ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== @@ -22,16 +22,8 @@ package fr.ird.observe.dto.decoration; * #L% */ -import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator; -import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; -import fr.ird.observe.dto.reference.DataDtoReference; -import fr.ird.observe.dto.reference.DtoReference; -import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferentialLocale; -import org.nuiton.decorator.Decorator; -import org.nuiton.decorator.DecoratorProvider; - -import java.util.Objects; +import fr.ird.observe.spi.model.initializer.ObserveGlobalModelInitializer; /** @@ -40,60 +32,23 @@ import java.util.Objects; * @author Tony Chemit - dev(a)tchemit.fr * @since 1.3 */ -public class DecoratorService extends DecoratorProvider { +public class DecoratorService extends DecoratorServiceSupport<DecoratorServiceInitializer> { public static final String HAULING_IDENTIFIER = "haulingIdentifier"; public static final String TRIP_CONTEXT = "Trip"; public static final String WITH_URL = "WithUrl"; - private final DecoratorServiceInitializer initializer; - private ReferentialLocale referentialLocale; - public DecoratorService(ReferentialLocale referentialLocale) { - this.referentialLocale = Objects.requireNonNull(referentialLocale); - this.initializer = new DecoratorServiceInitializer(this); - loadDecorators(); - } - - public ReferentialLocale getReferentialLocale() { - return referentialLocale; - } - - public void setReferentialLocale(ReferentialLocale referentialLocale) { - this.referentialLocale = referentialLocale; + super(referentialLocale); } @Override - protected void loadDecorators() { - if (referentialLocale == null) { - // on n'enregistre pas les décorateur tant que la locale n'est pas - // positionnée - return; - } - DecoratorServiceInitializer.run(initializer); - } - - public <T extends ReferentialDtoReference> ReferentialReferenceDecorator<T> getReferentialReferenceDecorator(Class<T> referenceType) { - return (ReferentialReferenceDecorator) getDecoratorByType(referenceType); + protected DecoratorServiceInitializer createDecoratorServiceInitializer() { + return new DecoratorServiceInitializer(this); } - public <R extends DataDtoReference> DataReferenceDecorator<R> getDataReferenceDecorator(Class<R> referenceType) { - return (DataReferenceDecorator) getDecoratorByType(referenceType); - } - - public <R extends DataDtoReference> DataReferenceDecorator<R> getDataReferenceDecorator(Class<R> referenceType, String context) { - return (DataReferenceDecorator) getDecoratorByType(referenceType, context); - } - - public <R extends DtoReference> Decorator<R> getReferenceDecorator(Class<R> referenceType) { - Decorator<R> decorator; - - if (DataDtoReference.class.isAssignableFrom(referenceType)) { - decorator = getDataReferenceDecorator((Class) referenceType); - } else { - decorator = getReferentialReferenceDecorator((Class) referenceType); - } - - return decorator; + @Override + protected void init(DecoratorServiceInitializer initializer) { + ObserveGlobalModelInitializer.run(initializer); } } ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ObserveDecorator.java deleted ===================================== @@ -1,140 +0,0 @@ -/* - * #%L - * ObServe :: Dto - * %% - * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.dto.decoration.decorators; - -import fr.ird.observe.dto.reference.DtoReference; -import org.apache.commons.jxpath.JXPathContext; -import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.nuiton.decorator.MultiJXPathDecorator; - -import java.io.Serializable; - -import static io.ultreia.java4all.i18n.I18n.t; - -/** - * Abstract decorator for any complex decorator. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 2.4 - */ -public class ObserveDecorator<E> extends MultiJXPathDecorator<E> implements Cloneable { - - private static final long serialVersionUID = 1L; - - /** Logger. */ - private static final Logger log = LogManager.getLogger(ObserveDecorator.class); - - public static final String DEFAULT_SEPARATOR = "##"; - - public static final String DEFAULT_SEPARATOR_REPLACEMENT = " - "; - - public ObserveDecorator(Class<E> internalClass, String expression) { - super(internalClass, expression, DEFAULT_SEPARATOR, DEFAULT_SEPARATOR_REPLACEMENT); - } - - public ObserveDecorator(Class<E> internalClass, String expression, String separator) { - super(internalClass, expression, DEFAULT_SEPARATOR, separator); - } - - @Override - public final Object clone() throws CloneNotSupportedException { - return super.clone(); - } - - protected Comparable<Comparable<?>> getTokenValue(JXPathContext jxcontext, String token) { - // assume all values are comparable - Comparable<Comparable<?>> value; - - try { - - String[] tokens = token.split("/"); - - Object value0 = jxcontext.getValue(tokens[0]); - - if (value0 instanceof DtoReference) { - - value = getValueFromReference(tokens, (DtoReference<?, ?>) value0, 1); - - } else { - - value = (Comparable<Comparable<?>>) jxcontext.getValue(token); - } - - if (value == null) { - value = (Comparable<Comparable<?>>) getDefaultNullValue(token); - } - - } catch (Exception e) { - value = (Comparable<Comparable<?>>) getDefaultUndefinedValue(token); - } - - return value; - } - - protected Comparable<Comparable<?>> getValueFromReference(String[] tokens, DtoReference<?, ?> referenceBean, int startIndex) { - - for (int i = startIndex, max = tokens.length - 1; i < max; i++) { - - if (referenceBean.getPropertyNames().contains(tokens[i])) { - - Serializable propertyValue = referenceBean.getPropertyValue(tokens[i]); - - if (!(propertyValue instanceof DtoReference)) { - - return (Comparable<Comparable<?>>) getDefaultUndefinedValue(StringUtils.join(tokens, "/")); - - } - - referenceBean = (DtoReference<?, ?>) propertyValue; - } - } - - Comparable<Comparable<?>> value = null; - - String lastToken = tokens[tokens.length - 1]; - if (referenceBean.getPropertyNames().contains(lastToken)) { - value = referenceBean.getPropertyValue(lastToken); - } else { - value = referenceBean.get(lastToken); - } - - return value; - } - - protected Comparable<?> getDefaultUndefinedValue(String token) { - if (log.isDebugEnabled()) { - log.debug("No defined value for token [" + token + "]"); - } - return t("observe.common.none"); - } - - protected Comparable<?> getDefaultNullValue(String token) { - if (log.isDebugEnabled()) { - log.debug("Null value for token [" + token + "]"); - } - return t("observe.common.none"); - } - - -} ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ReferentialReferenceDecorator.java deleted ===================================== @@ -1,102 +0,0 @@ -package fr.ird.observe.dto.decoration.decorators; - -/*- - * #%L - * ObServe :: Dto - * %% - * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.dto.reference.ReferentialDtoReference; -import fr.ird.observe.dto.referential.ReferentialDto; -import org.apache.commons.jxpath.JXPathContext; -import org.apache.commons.lang3.StringUtils; -import org.nuiton.decorator.JXPathDecorator; - -import java.util.List; - -import static io.ultreia.java4all.i18n.I18n.t; - -/** - * @author Kevin Morin (Code Lutin) - */ -public class ReferentialReferenceDecorator<R extends ReferentialDtoReference> extends ObserveDecorator<R> implements Cloneable { - - private static final long serialVersionUID = 1L; - - public ReferentialReferenceDecorator(Class<R> type, String expression) { - super(type, expression); - for (int i = 0; i < nbToken; i++) { - String property = getProperty(i); - if (ReferentialDto.PROPERTY_CODE.equals(property)) { - - // On change le comparateur pour simuler le tri numérique si possible. - contexts[i].setComparator(new JXPathComparator<R>(property) { - - @Override - public void init(JXPathDecorator<R> decorator, List<R> datas) { - clear(); - for (R data : datas) { - JXPathContext jxcontext = JXPathContext.newContext(data); - Comparable<Comparable<?>> key = getTokenValue(jxcontext, ReferentialDto.PROPERTY_CODE); - // on passe en 000000x comme ça si on a des nombres, ils seront bien triés - String value = key == null ? "" : StringUtils.leftPad(key.toString(), 6, "0"); - valueCache.put(data, (Comparable) value); - } - } - }); - break; - } - } - } - - @Override - protected Comparable<Comparable<?>> getTokenValue(JXPathContext jxcontext, String token) { - - - // assume all values are comparable - Comparable<Comparable<?>> value; - - Object contextBean = jxcontext.getContextBean(); - - if (contextBean instanceof ReferentialDtoReference) { - - String[] tokens = token.split("/"); - - value = getValueFromReference(tokens, (ReferentialDtoReference) contextBean, 0); - - if (value == null) { - value = (Comparable<Comparable<?>>) getDefaultNullValue(tokens[0]); - } - - } else { - value = super.getTokenValue(jxcontext, token); - } - - return value; - - } - - @Override - protected Comparable<?> getDefaultNullValue(String token) { - if (token.equals("startDate") || token.equals("endDate")) { - return null; - } - return ReferentialDto.PROPERTY_CODE.equals(token) ? t("observe.common.nocode") : super.getDefaultNullValue(token); - } -} ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -426,8 +426,6 @@ observe.common.inconnu=Unknown observe.common.label=Label observe.common.lengthWeightFormula=Length weight formula observe.common.no.unit=No unit -observe.common.nocode=Nocode -observe.common.none=None observe.common.operation.resume=Summary of operations observe.common.resume=Summary observe.common.saveFile.overwrite=file alreayd exists, would you like to overwrite it? ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -426,8 +426,6 @@ observe.common.inconnu=desconocido observe.common.label=Texto observe.common.lengthWeightFormula=Relación de peso observe.common.no.unit=No unit \#TODO -observe.common.nocode=codigo ausente -observe.common.none=Ninguno observe.common.operation.resume=Resumen de operaciones observe.common.resume=Resumen de la configuración observe.common.saveFile.overwrite=El archivo ya existe. Quiere reemplazar lo ? ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -426,8 +426,6 @@ observe.common.inconnu=inconnu observe.common.label=Libellé observe.common.lengthWeightFormula=Relation Poids observe.common.no.unit=Pas d'unité -observe.common.nocode=code absent -observe.common.none=Aucun observe.common.operation.resume=Résumé des opérations observe.common.resume=Résumé de la configuration observe.common.saveFile.overwrite=Le fichier existe déjà. Voulez-vous le remplacer ? ===================================== services-validation/src/main/java/fr/ird/observe/services/ObserveServicesProviderImpl.java ===================================== @@ -23,7 +23,6 @@ package fr.ird.observe.services; */ import fr.ird.observe.services.service.ObserveService; -import fr.ird.observe.services.service.data.ll.common.TripService; import java.util.Objects; @@ -32,7 +31,7 @@ import java.util.Objects; * * @author Tony Chemit - dev(a)tchemit.fr */ -public class ObserveServicesProviderImpl implements ObserveServicesProvider { +public class ObserveServicesProviderImpl extends ObserveServicesProviderSupport { private final ObserveServiceFactory serviceFactory; private final ObserveServiceInitializer serviceInitializer; @@ -42,22 +41,6 @@ public class ObserveServicesProviderImpl implements ObserveServicesProvider { this.serviceInitializer = Objects.requireNonNull(serviceInitializer); } - @Override - public void close() { - } - - //FIXME If we do not set this, OGNL can't find it on default implementation on interface :( - @Override - public TripService getLlCommonTripService() { - return getService(TripService.class); - } - - //FIXME If we do not set this, OGNL can't find it on default implementation on interface :( - @Override - public fr.ird.observe.services.service.data.ps.common.TripService getPsCommonTripService() { - return getService(fr.ird.observe.services.service.data.ps.common.TripService.class); - } - @Override public <S extends ObserveService> S getService(Class<S> serviceType) { return serviceFactory.newService(serviceInitializer, serviceType); ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/DataReferenceDecorator.java → services-validation/src/main/java/fr/ird/observe/services/ObserveServicesProviderSupport.java ===================================== @@ -1,8 +1,8 @@ -package fr.ird.observe.dto.decoration.decorators; +package fr.ird.observe.services; /*- * #%L - * ObServe :: Dto + * ObServe :: Services Validation API * %% * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io * %% @@ -22,50 +22,24 @@ package fr.ird.observe.dto.decoration.decorators; * #L% */ -import fr.ird.observe.dto.reference.DataDtoReference; -import fr.ird.observe.dto.reference.DtoReference; -import org.apache.commons.jxpath.JXPathContext; +import io.ultreia.java4all.bean.AbstractJavaBean; -/** - * @author Kevin Morin (Code Lutin) - */ -public class DataReferenceDecorator<R extends DataDtoReference> extends ObserveDecorator<R> implements Cloneable { - - private static final long serialVersionUID = 1L; +public abstract class ObserveServicesProviderSupport extends AbstractJavaBean implements ObserveServicesProvider { - public DataReferenceDecorator(Class<R> type, String expression) { - super(type, expression); + @Override + public void close() { + // by default nothing to do on close } + //FIXME If we do not set this, OGNL can't find it on default implementation on interface :( @Override - protected Comparable<Comparable<?>> getTokenValue(JXPathContext jxcontext, String token) { - - // assume all values are comparable - Comparable<Comparable<?>> value; - - Object contextBean = jxcontext.getContextBean(); - - if (contextBean instanceof DtoReference) { - - String[] tokens = token.split("/"); - - value = getValueFromReference(tokens, (DtoReference) contextBean, 0); - - if (value == null) { - value = (Comparable<Comparable<?>>) getDefaultNullValue(tokens[0]); - } - - } else { - value = super.getTokenValue(jxcontext, token); - } - - return value; - + public fr.ird.observe.services.service.data.ll.common.TripService getLlCommonTripService() { + return getService(fr.ird.observe.services.service.data.ll.common.TripService.class); } + //FIXME If we do not set this, OGNL can't find it on default implementation on interface :( @Override - public String toString(Object bean) { - String result = super.toString(bean); - return result == null ? null : result.trim(); + public fr.ird.observe.services.service.data.ps.common.TripService getPsCommonTripService() { + return getService(fr.ird.observe.services.service.data.ps.common.TripService.class); } } ===================================== services-validation/src/main/java/fr/ird/observe/validation/validators/TripVesselDtoValidator.java ===================================== @@ -75,7 +75,7 @@ public class TripVesselDtoValidator extends FieldValidatorSupport { private void validate(Object object, String id, VesselReference vessel, Date startDate, Date endDate) throws ValidationException { - TripService tripService = (TripService) getFieldValue(serviceName, object); + TripService tripService = (TripService) Objects.requireNonNull(getFieldValue(serviceName, object),"Can't find "+serviceName); Set<? extends TripReference> matchingTrips = tripService.getMatchingTripsVesselWithinDateRange(id, vessel.getId(), startDate, ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripDto-create-error-validation.xml ===================================== @@ -39,7 +39,7 @@ <message/> </field-validator> <field-validator type="tripVessel" short-circuit="true"> - <param name="serviceName">servicesProvider.llCommonTripLonglineService</param> + <param name="serviceName">servicesProvider.llCommonTripService</param> <message/> </field-validator> </field> ===================================== validation/src/main/resources/fr/ird/observe/dto/data/ll/common/TripDto-update-error-validation.xml ===================================== @@ -41,7 +41,7 @@ <message/> </field-validator> <field-validator type="tripVessel" short-circuit="true"> - <param name="serviceName">servicesProvider.llCommonTripLonglineService</param> + <param name="serviceName">servicesProvider.llCommonTripService</param> <message/> </field-validator> </field> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/57b501c2a3dde82446521e5962… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/57b501c2a3dde82446521e5962… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 25 commits: Use Decorators from toolkit
by Tony CHEMIT Aug. 6, 2019

Aug. 6, 2019

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 57b501c2 by tchemit at 2019-08-06T21:56:29Z Use Decorators from toolkit - - - - - cbeb7670 by tchemit at 2019-08-06T21:56:42Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - 84168268 by tchemit at 2019-08-06T21:56:42Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - bb819306 by tchemit at 2019-08-06T21:56:42Z Move to new version 9.0-alpha-1 - - - - - 66b75373 by tchemit at 2019-08-06T21:56:43Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - 86558964 by tchemit at 2019-08-06T21:56:43Z Module 2 (first flush) - - - - - b215c3a8 by tchemit at 2019-08-06T21:56:43Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - a7d3f22c by tchemit at 2019-08-06T21:56:44Z Module 2 - second flush - - - - - 9f2e5fdc by tchemit at 2019-08-06T21:56:44Z Report from v8 for ps logbook model - - - - - 36dcd691 by tchemit at 2019-08-06T21:56:44Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - f8f35490 by tchemit at 2019-08-06T21:56:44Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - 4003ce2b by tchemit at 2019-08-06T21:56:44Z Consolidation des champs techniques en base - Realing on v9 - See #1353 - - - - - 9d596e95 by tchemit at 2019-08-06T21:56:45Z Insertion des lots de débarquements - See #1259 - - - - - 06b0f266 by tchemit at 2019-08-06T21:56:45Z Insertion du plan de cuves - See #1260 - - - - - 51703659 by tchemit at 2019-08-06T21:56:46Z Insertion de l’échantillonnage au port - See #1261 - - - - - 61a50121 by tchemit at 2019-08-06T21:56:46Z Création de nouvelles icônes de navigation - Pass for v9 - See #1358 - - - - - 4cedfe3a by tchemit at 2019-08-06T21:56:46Z First realign i18n after develop merge - - - - - 25a618c9 by tchemit at 2019-08-06T21:56:47Z Realign Seine model (no more any Seine in any Seine data - - - - - ed1afa1e by tchemit at 2019-08-06T21:56:47Z optimize i18n - - - - - 7b76d9e4 by tchemit at 2019-08-06T21:56:47Z Use new ServicesProvider (everything is now generated) (report on v9) - - - - - 8616fb7f by tchemit at 2019-08-06T21:56:47Z Normalize seine services names - - - - - 20109228 by tchemit at 2019-08-06T21:56:47Z Align logbook referential - See #1332 - - - - - 185400ad by tchemit at 2019-08-06T21:56:48Z realign after big rebase from develop - - - - - b2b45d94 by tchemit at 2019-08-06T21:56:48Z Add package priority tag value and generate new package model initializers - - - - - b71178ac by tchemit at 2019-08-06T21:56:48Z Refactor decorator service init using new per package model initializer. - - - - - 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/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/SelectTransshipmentLandingLonglineUIAction.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/move/MoveMultipleTripLonglineLandingUIAction.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/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 The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9fadbe423f0f42868c5d6fb479… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9fadbe423f0f42868c5d6fb479… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Use Decorators from toolkit
by Tony CHEMIT Aug. 6, 2019

Aug. 6, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 57b501c2 by tchemit at 2019-08-06T21:56:29Z Use Decorators from toolkit - - - - - 7 changed files: - dto/src/main/i18n/getters/java.getter - − dto/src/main/java/fr/ird/observe/dto/decoration/decorators/DataReferenceDecorator.java - − dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ObserveDecorator.java - − dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ReferentialReferenceDecorator.java - 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: ===================================== dto/src/main/i18n/getters/java.getter ===================================== @@ -17,8 +17,6 @@ observe.common.gps.activity observe.common.gps.gpsPoint observe.common.inconnu observe.common.no.unit -observe.common.nocode -observe.common.none observe.data.Data.baitHaulingStatus observe.data.Data.captain observe.data.Data.dataQuality ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/DataReferenceDecorator.java deleted ===================================== @@ -1,71 +0,0 @@ -package fr.ird.observe.dto.decoration.decorators; - -/*- - * #%L - * ObServe :: Dto - * %% - * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.dto.reference.DataDtoReference; -import fr.ird.observe.dto.reference.DtoReference; -import org.apache.commons.jxpath.JXPathContext; - -/** - * @author Kevin Morin (Code Lutin) - */ -public class DataReferenceDecorator<R extends DataDtoReference> extends ObserveDecorator<R> implements Cloneable { - - private static final long serialVersionUID = 1L; - - public DataReferenceDecorator(Class<R> type, String expression) { - super(type, expression); - } - - @Override - protected Comparable<Comparable<?>> getTokenValue(JXPathContext jxcontext, String token) { - - // assume all values are comparable - Comparable<Comparable<?>> value; - - Object contextBean = jxcontext.getContextBean(); - - if (contextBean instanceof DtoReference) { - - String[] tokens = token.split("/"); - - value = getValueFromReference(tokens, (DtoReference) contextBean, 0); - - if (value == null) { - value = (Comparable<Comparable<?>>) getDefaultNullValue(tokens[0]); - } - - } else { - value = super.getTokenValue(jxcontext, token); - } - - return value; - - } - - @Override - public String toString(Object bean) { - String result = super.toString(bean); - return result == null ? null : result.trim(); - } -} ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ObserveDecorator.java deleted ===================================== @@ -1,140 +0,0 @@ -/* - * #%L - * ObServe :: Dto - * %% - * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.dto.decoration.decorators; - -import fr.ird.observe.dto.reference.DtoReference; -import org.apache.commons.jxpath.JXPathContext; -import org.apache.commons.lang3.StringUtils; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; -import org.nuiton.decorator.MultiJXPathDecorator; - -import java.io.Serializable; - -import static io.ultreia.java4all.i18n.I18n.t; - -/** - * Abstract decorator for any complex decorator. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 2.4 - */ -public class ObserveDecorator<E> extends MultiJXPathDecorator<E> implements Cloneable { - - private static final long serialVersionUID = 1L; - - /** Logger. */ - private static final Logger log = LogManager.getLogger(ObserveDecorator.class); - - public static final String DEFAULT_SEPARATOR = "##"; - - public static final String DEFAULT_SEPARATOR_REPLACEMENT = " - "; - - public ObserveDecorator(Class<E> internalClass, String expression) { - super(internalClass, expression, DEFAULT_SEPARATOR, DEFAULT_SEPARATOR_REPLACEMENT); - } - - public ObserveDecorator(Class<E> internalClass, String expression, String separator) { - super(internalClass, expression, DEFAULT_SEPARATOR, separator); - } - - @Override - public final Object clone() throws CloneNotSupportedException { - return super.clone(); - } - - protected Comparable<Comparable<?>> getTokenValue(JXPathContext jxcontext, String token) { - // assume all values are comparable - Comparable<Comparable<?>> value; - - try { - - String[] tokens = token.split("/"); - - Object value0 = jxcontext.getValue(tokens[0]); - - if (value0 instanceof DtoReference) { - - value = getValueFromReference(tokens, (DtoReference<?, ?>) value0, 1); - - } else { - - value = (Comparable<Comparable<?>>) jxcontext.getValue(token); - } - - if (value == null) { - value = (Comparable<Comparable<?>>) getDefaultNullValue(token); - } - - } catch (Exception e) { - value = (Comparable<Comparable<?>>) getDefaultUndefinedValue(token); - } - - return value; - } - - protected Comparable<Comparable<?>> getValueFromReference(String[] tokens, DtoReference<?, ?> referenceBean, int startIndex) { - - for (int i = startIndex, max = tokens.length - 1; i < max; i++) { - - if (referenceBean.getPropertyNames().contains(tokens[i])) { - - Serializable propertyValue = referenceBean.getPropertyValue(tokens[i]); - - if (!(propertyValue instanceof DtoReference)) { - - return (Comparable<Comparable<?>>) getDefaultUndefinedValue(StringUtils.join(tokens, "/")); - - } - - referenceBean = (DtoReference<?, ?>) propertyValue; - } - } - - Comparable<Comparable<?>> value = null; - - String lastToken = tokens[tokens.length - 1]; - if (referenceBean.getPropertyNames().contains(lastToken)) { - value = referenceBean.getPropertyValue(lastToken); - } else { - value = referenceBean.get(lastToken); - } - - return value; - } - - protected Comparable<?> getDefaultUndefinedValue(String token) { - if (log.isDebugEnabled()) { - log.debug("No defined value for token [" + token + "]"); - } - return t("observe.common.none"); - } - - protected Comparable<?> getDefaultNullValue(String token) { - if (log.isDebugEnabled()) { - log.debug("Null value for token [" + token + "]"); - } - return t("observe.common.none"); - } - - -} ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ReferentialReferenceDecorator.java deleted ===================================== @@ -1,102 +0,0 @@ -package fr.ird.observe.dto.decoration.decorators; - -/*- - * #%L - * ObServe :: Dto - * %% - * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.dto.reference.ReferentialDtoReference; -import fr.ird.observe.dto.referential.ReferentialDto; -import org.apache.commons.jxpath.JXPathContext; -import org.apache.commons.lang3.StringUtils; -import org.nuiton.decorator.JXPathDecorator; - -import java.util.List; - -import static io.ultreia.java4all.i18n.I18n.t; - -/** - * @author Kevin Morin (Code Lutin) - */ -public class ReferentialReferenceDecorator<R extends ReferentialDtoReference> extends ObserveDecorator<R> implements Cloneable { - - private static final long serialVersionUID = 1L; - - public ReferentialReferenceDecorator(Class<R> type, String expression) { - super(type, expression); - for (int i = 0; i < nbToken; i++) { - String property = getProperty(i); - if (ReferentialDto.PROPERTY_CODE.equals(property)) { - - // On change le comparateur pour simuler le tri numérique si possible. - contexts[i].setComparator(new JXPathComparator<R>(property) { - - @Override - public void init(JXPathDecorator<R> decorator, List<R> datas) { - clear(); - for (R data : datas) { - JXPathContext jxcontext = JXPathContext.newContext(data); - Comparable<Comparable<?>> key = getTokenValue(jxcontext, ReferentialDto.PROPERTY_CODE); - // on passe en 000000x comme ça si on a des nombres, ils seront bien triés - String value = key == null ? "" : StringUtils.leftPad(key.toString(), 6, "0"); - valueCache.put(data, (Comparable) value); - } - } - }); - break; - } - } - } - - @Override - protected Comparable<Comparable<?>> getTokenValue(JXPathContext jxcontext, String token) { - - - // assume all values are comparable - Comparable<Comparable<?>> value; - - Object contextBean = jxcontext.getContextBean(); - - if (contextBean instanceof ReferentialDtoReference) { - - String[] tokens = token.split("/"); - - value = getValueFromReference(tokens, (ReferentialDtoReference) contextBean, 0); - - if (value == null) { - value = (Comparable<Comparable<?>>) getDefaultNullValue(tokens[0]); - } - - } else { - value = super.getTokenValue(jxcontext, token); - } - - return value; - - } - - @Override - protected Comparable<?> getDefaultNullValue(String token) { - if (token.equals("startDate") || token.equals("endDate")) { - return null; - } - return ReferentialDto.PROPERTY_CODE.equals(token) ? t("observe.common.nocode") : super.getDefaultNullValue(token); - } -} ===================================== observe-i18n/src/main/i18n/translations/observe_en_GB.properties ===================================== @@ -426,8 +426,6 @@ observe.common.inconnu=Unknown observe.common.label=Label observe.common.lengthWeightFormula=Length weight formula observe.common.no.unit=No unit -observe.common.nocode=Nocode -observe.common.none=None observe.common.operation.resume=Summary of operations observe.common.resume=Summary observe.common.saveFile.overwrite=file alreayd exists, would you like to overwrite it? ===================================== observe-i18n/src/main/i18n/translations/observe_es_ES.properties ===================================== @@ -426,8 +426,6 @@ observe.common.inconnu=desconocido observe.common.label=Texto observe.common.lengthWeightFormula=Relación de peso observe.common.no.unit=No unit \#TODO -observe.common.nocode=codigo ausente -observe.common.none=Ninguno observe.common.operation.resume=Resumen de operaciones observe.common.resume=Resumen de la configuración observe.common.saveFile.overwrite=El archivo ya existe. Quiere reemplazar lo ? ===================================== observe-i18n/src/main/i18n/translations/observe_fr_FR.properties ===================================== @@ -426,8 +426,6 @@ observe.common.inconnu=inconnu observe.common.label=Libellé observe.common.lengthWeightFormula=Relation Poids observe.common.no.unit=Pas d'unité -observe.common.nocode=code absent -observe.common.none=Aucun observe.common.operation.resume=Résumé des opérations observe.common.resume=Résumé de la configuration observe.common.saveFile.overwrite=Le fichier existe déjà. Voulez-vous le remplacer ? View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/57b501c2a3dde82446521e5962e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/57b501c2a3dde82446521e5962e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Use DecoratorServiceSupport from toolkit
by Tony CHEMIT Aug. 6, 2019

Aug. 6, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 993693f2 by tchemit at 2019-08-06T20:38:35Z Use DecoratorServiceSupport from toolkit - - - - - 1 changed file: - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java Changes: ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== @@ -22,16 +22,8 @@ package fr.ird.observe.dto.decoration; * #L% */ -import fr.ird.observe.dto.decoration.decorators.DataReferenceDecorator; -import fr.ird.observe.dto.decoration.decorators.ReferentialReferenceDecorator; -import fr.ird.observe.dto.reference.DataDtoReference; -import fr.ird.observe.dto.reference.DtoReference; -import fr.ird.observe.dto.reference.ReferentialDtoReference; import fr.ird.observe.dto.referential.ReferentialLocale; -import org.nuiton.decorator.Decorator; -import org.nuiton.decorator.DecoratorProvider; - -import java.util.Objects; +import fr.ird.observe.spi.model.initializer.ObserveGlobalModelInitializer; /** @@ -40,60 +32,23 @@ import java.util.Objects; * @author Tony Chemit - dev(a)tchemit.fr * @since 1.3 */ -public class DecoratorService extends DecoratorProvider { +public class DecoratorService extends DecoratorServiceSupport<DecoratorServiceInitializer> { public static final String HAULING_IDENTIFIER = "haulingIdentifier"; public static final String TRIP_CONTEXT = "Trip"; public static final String WITH_URL = "WithUrl"; - private final DecoratorServiceInitializer initializer; - private ReferentialLocale referentialLocale; - public DecoratorService(ReferentialLocale referentialLocale) { - this.referentialLocale = Objects.requireNonNull(referentialLocale); - this.initializer = new DecoratorServiceInitializer(this); - loadDecorators(); - } - - public ReferentialLocale getReferentialLocale() { - return referentialLocale; - } - - public void setReferentialLocale(ReferentialLocale referentialLocale) { - this.referentialLocale = referentialLocale; + super(referentialLocale); } @Override - protected void loadDecorators() { - if (referentialLocale == null) { - // on n'enregistre pas les décorateur tant que la locale n'est pas - // positionnée - return; - } - DecoratorServiceInitializer.run(initializer); - } - - public <T extends ReferentialDtoReference> ReferentialReferenceDecorator<T> getReferentialReferenceDecorator(Class<T> referenceType) { - return (ReferentialReferenceDecorator) getDecoratorByType(referenceType); + protected DecoratorServiceInitializer createDecoratorServiceInitializer() { + return new DecoratorServiceInitializer(this); } - public <R extends DataDtoReference> DataReferenceDecorator<R> getDataReferenceDecorator(Class<R> referenceType) { - return (DataReferenceDecorator) getDecoratorByType(referenceType); - } - - public <R extends DataDtoReference> DataReferenceDecorator<R> getDataReferenceDecorator(Class<R> referenceType, String context) { - return (DataReferenceDecorator) getDecoratorByType(referenceType, context); - } - - public <R extends DtoReference> Decorator<R> getReferenceDecorator(Class<R> referenceType) { - Decorator<R> decorator; - - if (DataDtoReference.class.isAssignableFrom(referenceType)) { - decorator = getDataReferenceDecorator((Class) referenceType); - } else { - decorator = getReferentialReferenceDecorator((Class) referenceType); - } - - return decorator; + @Override + protected void init(DecoratorServiceInitializer initializer) { + ObserveGlobalModelInitializer.run(initializer); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/993693f25d43ccbfbf7a491a976… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/993693f25d43ccbfbf7a491a976… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 25 commits: Use DecoratorServiceSupport from toolkit
by Tony CHEMIT Aug. 6, 2019

Aug. 6, 2019

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: 993693f2 by tchemit at 2019-08-06T20:38:35Z Use DecoratorServiceSupport from toolkit - - - - - 5680349d by tchemit at 2019-08-06T20:38:56Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - ee971c76 by tchemit at 2019-08-06T20:38:56Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - c093ee8c by tchemit at 2019-08-06T20:38:56Z Move to new version 9.0-alpha-1 - - - - - 35807bf8 by tchemit at 2019-08-06T20:38:56Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - 5e013021 by tchemit at 2019-08-06T20:38:57Z Module 2 (first flush) - - - - - a82ad11f by tchemit at 2019-08-06T20:38:57Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - a66772be by tchemit at 2019-08-06T20:38:57Z Module 2 - second flush - - - - - e5270f68 by tchemit at 2019-08-06T20:38:57Z Report from v8 for ps logbook model - - - - - 3b6d96db by tchemit at 2019-08-06T20:38:57Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 8f0b42c5 by tchemit at 2019-08-06T20:38:57Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - cfabeb43 by tchemit at 2019-08-06T20:38:58Z Consolidation des champs techniques en base - Realing on v9 - See #1353 - - - - - 44e5b105 by tchemit at 2019-08-06T20:38:58Z Insertion des lots de débarquements - See #1259 - - - - - bc0f193a by tchemit at 2019-08-06T20:38:59Z Insertion du plan de cuves - See #1260 - - - - - 423a5e0b by tchemit at 2019-08-06T20:38:59Z Insertion de l’échantillonnage au port - See #1261 - - - - - 84b794e3 by tchemit at 2019-08-06T20:38:59Z Création de nouvelles icônes de navigation - Pass for v9 - See #1358 - - - - - 5bf94b9c by tchemit at 2019-08-06T20:39:00Z First realign i18n after develop merge - - - - - abede883 by tchemit at 2019-08-06T20:39:00Z Realign Seine model (no more any Seine in any Seine data - - - - - acc228fe by tchemit at 2019-08-06T20:39:00Z optimize i18n - - - - - 61272478 by tchemit at 2019-08-06T20:39:00Z Use new ServicesProvider (everything is now generated) (report on v9) - - - - - a369bbaf by tchemit at 2019-08-06T20:39:00Z Normalize seine services names - - - - - 4b99cdb6 by tchemit at 2019-08-06T20:39:01Z Align logbook referential - See #1332 - - - - - 9a67dac6 by tchemit at 2019-08-06T20:39:01Z realign after big rebase from develop - - - - - ac77f0f9 by tchemit at 2019-08-06T20:39:01Z Add package priority tag value and generate new package model initializers - - - - - 9fadbe42 by tchemit at 2019-08-06T20:39:01Z Refactor decorator service init using new per package model initializer. - - - - - 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/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/SelectTransshipmentLandingLonglineUIAction.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/move/MoveMultipleTripLonglineLandingUIAction.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/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 The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/aae984f1538d09c73e358e7bf6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/aae984f1538d09c73e358e7bf6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 26 commits: Add package priority tag value and generate new package model initializers
by Tony CHEMIT Aug. 6, 2019

Aug. 6, 2019

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: edff8e6d by tchemit at 2019-08-06T16:25:05Z Add package priority tag value and generate new package model initializers - - - - - ecbc7cda by tchemit at 2019-08-06T16:48:10Z Refactor decorator service init using new per package model initializer. - - - - - ba66172d by tchemit at 2019-08-06T16:54:51Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - e0cadc3e by tchemit at 2019-08-06T16:55:11Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - c2ef3e86 by tchemit at 2019-08-06T16:55:11Z Move to new version 9.0-alpha-1 - - - - - d91cbd66 by tchemit at 2019-08-06T16:55:11Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - bea2c935 by tchemit at 2019-08-06T16:59:07Z Module 2 (first flush) - - - - - 5435a725 by tchemit at 2019-08-06T16:59:55Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - e479331f by tchemit at 2019-08-06T16:59:56Z Module 2 - second flush - - - - - d497799d by tchemit at 2019-08-06T16:59:56Z Report from v8 for ps logbook model - - - - - f713e7b8 by tchemit at 2019-08-06T16:59:56Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - c7d3e281 by tchemit at 2019-08-06T16:59:56Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - 0c7a88bc by tchemit at 2019-08-06T16:59:56Z Consolidation des champs techniques en base - Realing on v9 - See #1353 - - - - - d319a80d by tchemit at 2019-08-06T17:00:12Z Insertion des lots de débarquements - See #1259 - - - - - e9aa5d7e by tchemit at 2019-08-06T17:00:27Z Insertion du plan de cuves - See #1260 - - - - - d63200a6 by tchemit at 2019-08-06T17:00:42Z Insertion de l’échantillonnage au port - See #1261 - - - - - b0646d72 by tchemit at 2019-08-06T17:00:42Z Création de nouvelles icônes de navigation - Pass for v9 - See #1358 - - - - - 30eb2e3d by tchemit at 2019-08-06T17:00:56Z First realign i18n after develop merge - - - - - 11e4c9a0 by tchemit at 2019-08-06T17:01:10Z Realign Seine model (no more any Seine in any Seine data - - - - - 82b96ca7 by tchemit at 2019-08-06T17:01:10Z optimize i18n - - - - - 0d072e1e by tchemit at 2019-08-06T17:01:10Z Use new ServicesProvider (everything is now generated) (report on v9) - - - - - 947590f0 by tchemit at 2019-08-06T17:01:10Z Normalize seine services names - - - - - 431f08ce by tchemit at 2019-08-06T17:01:24Z Align logbook referential - See #1332 - - - - - d578562a by tchemit at 2019-08-06T17:01:36Z realign after big rebase from develop - - - - - 6f561da8 by tchemit at 2019-08-06T17:01:36Z Add package priority tag value and generate new package model initializers - - - - - aae984f1 by tchemit at 2019-08-06T17:02:09Z Refactor decorator service init using new per package model initializer. - - - - - 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/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/SelectTransshipmentLandingLonglineUIAction.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/move/MoveMultipleTripLonglineLandingUIAction.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/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 The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4f279c6c45ea0a183ab8c983cd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4f279c6c45ea0a183ab8c983cd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: realign validation context (miss two functions)
by Tony CHEMIT Aug. 6, 2019

Aug. 6, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d3c3d80c by tchemit at 2019-08-06T10:41:04Z realign validation context (miss two functions) - - - - - edff8e6d by tchemit at 2019-08-06T16:25:05Z Add package priority tag value and generate new package model initializers - - - - - ecbc7cda by tchemit at 2019-08-06T16:48:10Z Refactor decorator service init using new per package model initializer. - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/validation/ClientValidationContext.java - dto/pom.xml - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - + dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorServiceInitializer.java - + dto/src/main/java/fr/ird/observe/dto/decoration/init/DataLlCommonModelDecoratorInitializer.java - + dto/src/main/java/fr/ird/observe/dto/decoration/init/DataLlLandingModelDecoratorInitializer.java - + dto/src/main/java/fr/ird/observe/dto/decoration/init/DataLlLogbookModelDecoratorInitializer.java - + dto/src/main/java/fr/ird/observe/dto/decoration/init/DataLlObservationModelDecoratorInitializer.java - + dto/src/main/java/fr/ird/observe/dto/decoration/init/DataPsCommonModelDecoratorInitializer.java - + dto/src/main/java/fr/ird/observe/dto/decoration/init/DataPsObservationModelDecoratorInitializer.java - + dto/src/main/java/fr/ird/observe/dto/decoration/init/ModelDecoratorInitializerSupport.java - + dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialCommonModelDecoratorInitializer.java - + dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialLlCommonModelDecoratorInitializer.java - + dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialLlLandingModelDecoratorInitializer.java - + dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialLlObservationModelDecoratorInitializer.java - + dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialPsCommonModelDecoratorInitializer.java - + dto/src/main/java/fr/ird/observe/dto/decoration/init/ReferentialPsObservationModelDecoratorInitializer.java - dto/src/main/models/Observe-01-referential-common.model - dto/src/main/models/Observe-02-referential-ps-common.model - dto/src/main/models/Observe-03-referential-ps-observation.model - dto/src/main/models/Observe-10-referential-ll-common.model - dto/src/main/models/Observe-11-referential-ll-observation.model - dto/src/main/models/Observe-12-referential-ll-logbook.model - dto/src/main/models/Observe-13-referential-ll-landing.model - dto/src/main/models/Observe-20-data-ps-observation.model - dto/src/main/models/Observe-25-data-ps.model - dto/src/main/models/Observe-30-data-ll-observation.model - dto/src/main/models/Observe-31-data-ll-logbook.model - dto/src/main/models/Observe-32-data-ll-landing.model - dto/src/main/models/Observe-35-data-ll.model The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/48bb8ae891bfe9a4b4d8cc332d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/48bb8ae891bfe9a4b4d8cc332d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 23 commits: realign validation context (miss two functions)
by Tony CHEMIT Aug. 6, 2019

Aug. 6, 2019

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: d3c3d80c by tchemit at 2019-08-06T10:41:04Z realign validation context (miss two functions) - - - - - d67db735 by tchemit at 2019-08-06T10:41:13Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - bda13134 by tchemit at 2019-08-06T10:41:13Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 1a90c921 by tchemit at 2019-08-06T10:41:13Z Move to new version 9.0-alpha-1 - - - - - 5baf8812 by tchemit at 2019-08-06T10:41:13Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - af215864 by tchemit at 2019-08-06T10:43:51Z Module 2 (first flush) - - - - - 107db27d by tchemit at 2019-08-06T10:43:52Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - 86a95259 by tchemit at 2019-08-06T10:43:52Z Module 2 - second flush - - - - - 1f0c35e0 by tchemit at 2019-08-06T10:43:52Z Report from v8 for ps logbook model - - - - - bb23e606 by tchemit at 2019-08-06T10:43:52Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 84eefdee by tchemit at 2019-08-06T10:43:52Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - 596a29f9 by tchemit at 2019-08-06T10:43:53Z Consolidation des champs techniques en base - Realing on v9 - See #1353 - - - - - 182ba795 by tchemit at 2019-08-06T10:43:53Z Insertion des lots de débarquements - See #1259 - - - - - 8a9f5882 by tchemit at 2019-08-06T10:43:53Z Insertion du plan de cuves - See #1260 - - - - - 6d3bf510 by tchemit at 2019-08-06T10:43:54Z Insertion de l’échantillonnage au port - See #1261 - - - - - b0bd300c by tchemit at 2019-08-06T10:43:54Z Création de nouvelles icônes de navigation - Pass for v9 - See #1358 - - - - - 93fcf3f7 by tchemit at 2019-08-06T10:43:54Z First realign i18n after develop merge - - - - - e7027d9c by tchemit at 2019-08-06T10:43:55Z Realign Seine model (no more any Seine in any Seine data - - - - - 6912515a by tchemit at 2019-08-06T10:43:55Z optimize i18n - - - - - ebbc17a1 by tchemit at 2019-08-06T10:43:55Z Use new ServicesProvider (everything is now generated) (report on v9) - - - - - 5a4fe84f by tchemit at 2019-08-06T10:43:55Z Normalize seine services names - - - - - d66e99d3 by tchemit at 2019-08-06T10:43:56Z Align logbook referential - See #1332 - - - - - 4f279c6c by tchemit at 2019-08-06T10:43:56Z realign after big rebase from develop - - - - - 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/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/SelectTransshipmentLandingLonglineUIAction.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/move/MoveMultipleTripLonglineLandingUIAction.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/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 The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c21f2f94d153b7e9e57b35c25e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c21f2f94d153b7e9e57b35c25e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 24 commits: realign ll service names
by Tony CHEMIT Aug. 5, 2019

Aug. 5, 2019

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: b909b0c3 by tchemit at 2019-08-05T21:39:40Z realign ll service names - - - - - 48bb8ae8 by tchemit at 2019-08-05T22:21:00Z realign validation context - - - - - d5cccecc by tchemit at 2019-08-05T23:01:31Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - 1d262997 by tchemit at 2019-08-05T23:03:54Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 5bdcbfde by tchemit at 2019-08-05T23:03:54Z Move to new version 9.0-alpha-1 - - - - - 8088b494 by tchemit at 2019-08-05T23:03:54Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - d25f7cb8 by tchemit at 2019-08-05T23:17:48Z Module 2 (first flush) - - - - - cad6b51b by tchemit at 2019-08-05T23:17:48Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - 6489108b by tchemit at 2019-08-05T23:17:49Z Module 2 - second flush - - - - - d92db324 by tchemit at 2019-08-05T23:19:02Z Report from v8 for ps logbook model - - - - - 19c78eac by tchemit at 2019-08-05T23:19:02Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - 7a1bb8bf by tchemit at 2019-08-05T23:19:02Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - fab56bd2 by tchemit at 2019-08-05T23:19:02Z Consolidation des champs techniques en base - Realing on v9 - See #1353 - - - - - 0d179456 by tchemit at 2019-08-05T23:19:03Z Insertion des lots de débarquements - See #1259 - - - - - 6f7554af by tchemit at 2019-08-05T23:19:03Z Insertion du plan de cuves - See #1260 - - - - - fbc204f7 by tchemit at 2019-08-05T23:19:04Z Insertion de l’échantillonnage au port - See #1261 - - - - - a7f90ea5 by tchemit at 2019-08-05T23:19:04Z Création de nouvelles icônes de navigation - Pass for v9 - See #1358 - - - - - 00a9ad19 by tchemit at 2019-08-05T23:19:04Z First realign i18n after develop merge - - - - - 4a5e3330 by tchemit at 2019-08-05T23:23:25Z Realign Seine model (no more any Seine in any Seine data - - - - - 85081080 by tchemit at 2019-08-05T23:23:25Z optimize i18n - - - - - c61738de by tchemit at 2019-08-05T23:25:08Z Use new ServicesProvider (everything is now generated) (report on v9) - - - - - 277f7826 by tchemit at 2019-08-05T23:26:59Z Normalize seine services names - - - - - a9815afd by tchemit at 2019-08-05T23:26:59Z Align logbook referential - See #1332 - - - - - c21f2f94 by tchemit at 2019-08-05T23:38:43Z realign after big rebase from develop - - - - - 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/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/SelectTransshipmentLandingLonglineUIAction.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/DeleteActivityUIAction.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/1c2e6c0db08191db7ae67b7838… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/1c2e6c0db08191db7ae67b7838… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: realign ll service names
by Tony CHEMIT Aug. 5, 2019

Aug. 5, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b909b0c3 by tchemit at 2019-08-05T21:39:40Z realign ll service names - - - - - 48bb8ae8 by tchemit at 2019-08-05T22:21:00Z realign validation context - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.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/DeleteActivityLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityUIAction.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/DeleteTripLonglineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripSampleUIAction.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/MoveMultipleActivityUIAction.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/MoveMultipleTripLonglineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripSampleUIAction.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/MoveSingleActivityUIAction.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/MoveSingleTripLonglineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleTripSampleUIAction.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/SaveActivityLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveActivityUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveLonglineDetailCompositionObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveLonglineGlobalCompositionLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveLonglineGlobalCompositionObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/SaveSetLonglineLogbookUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b4d562570850fa628747ad3a13… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b4d562570850fa628747ad3a13… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update toolkit version
by Tony CHEMIT Aug. 5, 2019

Aug. 5, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: b4d56257 by tchemit at 2019-08-04T23:24:57Z update toolkit version - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -159,7 +159,7 @@ <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> - <observeToolkitVersion>4.16-SNAPSHOT</observeToolkitVersion> + <observeToolkitVersion>4.16</observeToolkitVersion> <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>  <lib.version.h2>1.4.196</lib.version.h2> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b4d562570850fa628747ad3a134… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/b4d562570850fa628747ad3a134… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9] 34 commits: Realign LL model - See #1332
by Tony CHEMIT Aug. 5, 2019

Aug. 5, 2019

Tony CHEMIT pushed to branch develop-9 at ultreiaio / ird-observe Commits: a79209c2 by tchemit at 2019-08-04T14:21:17Z Realign LL model - See #1332 - - - - - 42865344 by tchemit at 2019-08-04T14:21:19Z update changelog [skip ci] - - - - - fe790840 by tchemit at 2019-08-04T14:21:19Z when sanitize is not ok, let's just continue - - - - - 781fcc31 by tchemit at 2019-08-04T14:21:19Z [UI][REFERENTIEL] L'icône 'voir toutes les utilisations de ce référentiel' ne fonctionne pas - Closes #1370 - - - - - b32ca653 by tchemit at 2019-08-04T15:27:37Z [CARTO] Petits ajustement sur la carte - Closes #1368 - - - - - f25d6134 by tchemit at 2019-08-04T15:27:39Z [SERVEUR] observe-server.conf / observeweb.host - Closes #1369 - - - - - 864e14da by tchemit at 2019-08-04T23:12:22Z Missing some fields on ShipOwner form - - - - - 68ea268f by tchemit at 2019-08-04T23:15:05Z Missing some labels on form - - - - - 9b9e8247 by tchemit at 2019-08-04T23:15:06Z Ajout d'une méthode pour récupérer les clef naturels sur un référentiel - - - - - 8815c15f by tchemit at 2019-08-04T23:15:06Z [UI][REFERENTIEL] Icône 'Toutes les clés métier de ce référentiel' - Closes #1371 - - - - - 896b08bb by tchemit at 2019-08-04T23:19:35Z update changelog [skip ci] - - - - - b4d56257 by tchemit at 2019-08-04T23:24:57Z update toolkit version - - - - - 8948074a by tchemit at 2019-08-04T23:43:36Z [CARTE] Symboles de cartes pour V8 et V9 - Refactor code - See #1343 - - - - - d9b69833 by tchemit at 2019-08-05T14:53:17Z Réorganisation des données d’observation PS - Réorganisation des captures et échantillons de cible et bycatch observés - See #1254 - - - - - 3dcc52d1 by tchemit at 2019-08-05T14:53:17Z Move to new version 9.0-alpha-1 - - - - - 705f602a by tchemit at 2019-08-05T14:53:17Z Réorganisation des données d’observation PS - Re localisation dans la hiérarchie - Closes #1252 - - - - - 346edae1 by tchemit at 2019-08-05T18:05:07Z Module 2 (first flush) - - - - - 10db143c by tchemit at 2019-08-05T18:08:20Z [PS] Contenu des onglets spécifiques observations et logbooks et le formulaire marée - See #1300 - - - - - d6b2ae79 by tchemit at 2019-08-05T18:09:14Z Module 2 - second flush - - - - - c1d5b5d2 by tchemit at 2019-08-05T18:09:14Z Report from v8 for ps logbook model - - - - - 47d182c7 by tchemit at 2019-08-05T18:09:14Z Choix de nouvelles couleurs pour les symboles de la carte LL - Closes #1293 - - - - - c0699049 by tchemit at 2019-08-05T18:10:12Z [CARTE] Symboles de cartes pour V8 et V9 - Realign for Ps model - See #1343 - - - - - 747f36af by tchemit at 2019-08-05T18:10:12Z Consolidation des champs techniques en base - Realing on v9 - See #1353 - - - - - 5dda78d9 by tchemit at 2019-08-05T18:13:45Z Insertion des lots de débarquements - See #1259 - - - - - 312eafc3 by tchemit at 2019-08-05T18:14:00Z Insertion du plan de cuves - See #1260 - - - - - 52d7a4c0 by tchemit at 2019-08-05T18:14:25Z Insertion de l’échantillonnage au port - See #1261 - - - - - b1b52cf1 by tchemit at 2019-08-05T18:14:25Z Création de nouvelles icônes de navigation - Pass for v9 - See #1358 - - - - - 16c35153 by tchemit at 2019-08-05T18:16:11Z First realign i18n after develop merge - - - - - 49bda8c2 by tchemit at 2019-08-05T18:24:43Z Realign Seine model (no more any Seine in any Seine data - - - - - 7daa8b63 by tchemit at 2019-08-05T18:24:43Z optimize i18n - - - - - c53e72bf by tchemit at 2019-08-05T18:26:28Z Use new ServicesProvider (everything is now generated) (report on v9) - - - - - 958fce54 by tchemit at 2019-08-05T18:27:14Z Normalize seine services names - - - - - 91722d53 by tchemit at 2019-08-05T18:31:03Z Align logbook referential - See #1332 - - - - - 1c2e6c0d by tchemit at 2019-08-05T21:08:40Z realign after big rebase from develop - - - - - 30 changed files: - .mvn/gitlab-cache/milestones/370039-issues.json - .mvn/gitlab-cache/milestones/532584-issues.json - .mvn/gitlab-cache/milestones/595831-issues.json - .mvn/gitlab-cache/milestones/647608-issues.json - .mvn/gitlab-cache/milestones/921497-issues.json - .mvn/gitlab-cache/milestones/921497.json - .mvn/gitlab-cache/milestones/925832-issues.json - .mvn/gitlab-cache/milestones/925832.json - + .mvn/gitlab-cache/milestones/958566-artifacts.json - + .mvn/gitlab-cache/milestones/958566-issues.json - + .mvn/gitlab-cache/milestones/958566.json - + .mvn/gitlab-cache/milestones/959266-issues.json - + .mvn/gitlab-cache/milestones/959266.json - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - CHANGELOG.md - 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 The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c896939558437b208e140c084a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c896939558437b208e140c084a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update changelog [skip ci]
by Tony CHEMIT Aug. 4, 2019

Aug. 4, 2019

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 896b08bb by tchemit at 2019-08-04T23:19:35Z update changelog [skip ci] - - - - - 5 changed files: - .mvn/gitlab-cache/milestones/921497-issues.json - .mvn/gitlab-cache/milestones/921497.json - + .mvn/gitlab-cache/milestones/959266-issues.json - + .mvn/gitlab-cache/milestones/959266.json - CHANGELOG.md Changes: ===================================== .mvn/gitlab-cache/milestones/921497-issues.json ===================================== @@ -17,8 +17,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -46,7 +47,7 @@ "_external": false, "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, - "userNotesCount": 1, + "userNotesCount": 2, "upVotes": 0, "downVotes": 0, "confidential": false, @@ -54,9 +55,10 @@ "timeEstimate": 0, "totalTimeSpent": 0 }, - "state": "opened", - "updatedAt": "Jul 29, 2019 4:35:28 PM", + "state": "closed", + "updatedAt": "Aug 3, 2019 8:27:32 PM", "createdAt": "Jul 29, 2019 3:31:02 PM", + "closedAt": "Aug 3, 2019 8:27:32 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1372" }, { @@ -76,8 +78,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -138,8 +141,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -200,8 +204,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -237,9 +242,10 @@ "timeEstimate": 0, "totalTimeSpent": 0 }, - "state": "opened", - "updatedAt": "Jul 29, 2019 3:10:40 PM", + "state": "closed", + "updatedAt": "Aug 3, 2019 8:26:36 PM", "createdAt": "Jul 29, 2019 3:10:40 PM", + "closedAt": "Aug 3, 2019 8:26:36 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1370" }, { @@ -261,8 +267,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -320,8 +327,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -383,8 +391,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -444,8 +453,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -473,7 +483,7 @@ "_external": false, "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, - "userNotesCount": 0, + "userNotesCount": 1, "upVotes": 0, "downVotes": 0, "confidential": false, @@ -481,9 +491,10 @@ "timeEstimate": 0, "totalTimeSpent": 0 }, - "state": "opened", - "updatedAt": "Jul 29, 2019 3:17:42 PM", + "state": "closed", + "updatedAt": "Aug 5, 2019 1:16:49 AM", "createdAt": "Jul 29, 2019 3:17:42 PM", + "closedAt": "Aug 5, 2019 1:15:20 AM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1371" }, { @@ -494,6 +505,7 @@ "description": "Le fichier observe-server.conf demande le paramètre observeweb.host, qui doit contenir l\u0027adresse (http ou https) du serveur.\n\nSi cette adresse est indiquée incorrectement, le test de connexion dans le gestionnaire connexions indique que la connexion est valide, mais la connexion échoue ensuite lors d\u0027une tentative de connexion réelle.\n\nSerait-il possible de se passer de ce paramètre ?\n\nSinon, serait-il possible que le test de connexion invalide le profil si jamais le observeweb.host n\u0027est pas correct ?", "labels": [ "Bas", + "Evolution", "IRD-2018-01-V8" ], "milestone": { @@ -503,8 +515,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -532,7 +545,7 @@ "_external": false, "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" }, - "userNotesCount": 0, + "userNotesCount": 1, "upVotes": 0, "downVotes": 0, "confidential": false, @@ -540,9 +553,10 @@ "timeEstimate": 0, "totalTimeSpent": 0 }, - "state": "opened", - "updatedAt": "Jul 29, 2019 1:05:44 PM", + "state": "closed", + "updatedAt": "Aug 4, 2019 4:48:52 PM", "createdAt": "Jul 29, 2019 1:05:44 PM", + "closedAt": "Aug 4, 2019 4:48:52 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1369" }, { @@ -563,8 +577,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -624,8 +639,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -686,8 +702,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -729,66 +746,6 @@ "closedAt": "Jul 16, 2019 6:42:45 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1349" }, - { - "id": 18519309, - "iid": 1237, - "projectId": 2722779, - "title": "Rafraichissement de la page \u0027A propos\u0027", - "description": "Supprimer les logos d\u0027ObServe et de l\u0027IRD\n\nMettre :\n* Nouveau logo IRD : ![logo-ird-2016](/uploads/f9d9b1214417dc9c6ec941b495e8bedc/logo-ird-2016.png)\n* Logo Ob7 : ![logo_obs7_rvb_300dpi](/uploads/a084234f58b04482878041c358acf18d/logo_obs7_rvb_300dpi.png)\n* Logo FEAMP (financement UE) : ![Logo_l_Europe_s_engage_FEAMP](/uploads/4c462e26a581404d97d0b52fbc125f1f/Logo_l_Europe_s_engage_FEAMP.png)\n* Logo SFA (en attente d\u0027un logo avec transparence) : ![logo_sfa_high_resolution](/uploads/fe872d782e73a3c158f0ed42771df3a3/logo_sfa_high_resolution.jpg)\n* Logo CRO (en attente d\u0027un logo avec transparence) : ![logo_CRO_Couleur_haute_résolution](/uploads/4d30fda473961d4ad022eda7bbea69bc/logo_CRO_Couleur_haute_résolution.jpeg)\n\nNouveau texte :\n\nObServe\n\nSystème informatique de gestion de données d\u0027observations embarquées de pêche à la senne et à la palangre.\n\nCe projet a été initiée par l\u0027IRD en 2009. Les contributeurs financiers sont : \n* Institut de Recherche pour le Développement (IRD)\n* Fond Européen pour les Affaires Maritimes et la Pêche (FEAMP)\n* Seychelles Fishing Authority (SFA)\n* AZTI Tecnalia\n* Orthongel\n\nIl est réalisé par les sociétés Code Lutin et Ultreia.io depuis 2009.\n \nPour plus d\u0027informations, veuillez visiter le site du projet.", - "labels": [ - "Bas", - "Evolution", - "À facturer" - ], - "milestone": { - "id": 921497, - "iid": 146, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-RC-4", - "description": "", - "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" - }, - "assignees": [ - { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - } - ], - "assignee": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "author": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "userNotesCount": 2, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "opened", - "updatedAt": "Jul 2, 2019 9:41:47 AM", - "createdAt": "Feb 22, 2019 4:32:32 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1237" - }, { "id": 23199140, "iid": 1368, @@ -806,8 +763,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -843,9 +801,10 @@ "timeEstimate": 0, "totalTimeSpent": 0 }, - "state": "opened", - "updatedAt": "Jul 29, 2019 4:37:01 PM", + "state": "closed", + "updatedAt": "Aug 4, 2019 4:21:49 PM", "createdAt": "Jul 26, 2019 3:50:33 PM", + "closedAt": "Aug 4, 2019 4:21:49 PM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1368" }, { @@ -865,8 +824,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -926,8 +886,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -985,8 +946,9 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" }, "assignees": [ { @@ -1022,68 +984,10 @@ "timeEstimate": 0, "totalTimeSpent": 0 }, - "state": "opened", - "updatedAt": "Aug 2, 2019 4:54:07 PM", + "state": "closed", + "updatedAt": "Aug 5, 2019 1:17:09 AM", "createdAt": "Jun 12, 2019 3:44:04 PM", + "closedAt": "Aug 5, 2019 1:17:09 AM", "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1332" - }, - { - "id": 21224725, - "iid": 1299, - "projectId": 2722779, - "title": "[V8][V9] Pour l\u0027algorithme d\u0027appariement d\u0027activités (LL comme PS), décider du comportement vis-à-vis de l\u0027absence d\u0027heures sur les activités (cas très fréquent sur les logbooks)", - "description": "[V8][V9] Pour l\u0027algorithme d\u0027appariement d\u0027activités LL/PS, décider du comportement vis-à-vis de l\u0027absence d\u0027heures sur les activités (cas très fréquent sur les logbooks)", - "labels": [ - "Evolution", - "IRD-2018-01-V8" - ], - "milestone": { - "id": 921497, - "iid": 146, - "projectId": 2722779, - "groupId": 0, - "title": "8.0-RC-4", - "description": "", - "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" - }, - "assignees": [ - { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - } - ], - "assignee": { - "_id": 166231, - "_username": "tchemit", - "_name": "Tony CHEMIT", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" - }, - "author": { - "_id": 1111318, - "_username": "pcauquil", - "_name": "Pascal Cauquil", - "_state": "active", - "_external": false, - "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" - }, - "userNotesCount": 2, - "upVotes": 0, - "downVotes": 0, - "confidential": false, - "timeStats": { - "timeEstimate": 0, - "totalTimeSpent": 0 - }, - "state": "opened", - "updatedAt": "Jul 19, 2019 3:46:23 PM", - "createdAt": "May 23, 2019 4:23:51 PM", - "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1299" } ] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/921497.json ===================================== @@ -5,6 +5,7 @@ "groupId": 0, "title": "8.0-RC-4", "description": "", + "dueDate": "Aug 5, 2019 2:00:00 AM", "startDate": "Jul 3, 2019 2:00:00 AM", - "state": "active" + "state": "closed" } \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/959266-issues.json ===================================== @@ -0,0 +1,119 @@ +[ + { + "id": 18519309, + "iid": 1237, + "projectId": 2722779, + "title": "Rafraichissement de la page \u0027A propos\u0027", + "description": "Supprimer les logos d\u0027ObServe et de l\u0027IRD\n\nMettre :\n* Nouveau logo IRD : ![logo-ird-2016](/uploads/f9d9b1214417dc9c6ec941b495e8bedc/logo-ird-2016.png)\n* Logo Ob7 : ![logo_obs7_rvb_300dpi](/uploads/a084234f58b04482878041c358acf18d/logo_obs7_rvb_300dpi.png)\n* Logo FEAMP (financement UE) : ![Logo_l_Europe_s_engage_FEAMP](/uploads/4c462e26a581404d97d0b52fbc125f1f/Logo_l_Europe_s_engage_FEAMP.png)\n* Logo SFA (en attente d\u0027un logo avec transparence) : ![logo_sfa_high_resolution](/uploads/fe872d782e73a3c158f0ed42771df3a3/logo_sfa_high_resolution.jpg)\n* Logo CRO (en attente d\u0027un logo avec transparence) : ![logo_CRO_Couleur_haute_résolution](/uploads/4d30fda473961d4ad022eda7bbea69bc/logo_CRO_Couleur_haute_résolution.jpeg)\n\nNouveau texte :\n\nObServe\n\nSystème informatique de gestion de données d\u0027observations embarquées de pêche à la senne et à la palangre.\n\nCe projet a été initiée par l\u0027IRD en 2009. Les contributeurs financiers sont : \n* Institut de Recherche pour le Développement (IRD)\n* Fond Européen pour les Affaires Maritimes et la Pêche (FEAMP)\n* Seychelles Fishing Authority (SFA)\n* AZTI Tecnalia\n* Orthongel\n\nIl est réalisé par les sociétés Code Lutin et Ultreia.io depuis 2009.\n \nPour plus d\u0027informations, veuillez visiter le site du projet.", + "labels": [ + "Bas", + "Evolution", + "À facturer" + ], + "milestone": { + "id": 959266, + "iid": 149, + "projectId": 2722779, + "groupId": 0, + "title": "8.0", + "description": "", + "state": "active" + }, + "assignees": [ + { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + } + ], + "assignee": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "userNotesCount": 2, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Aug 3, 2019 8:44:15 PM", + "createdAt": "Feb 22, 2019 4:32:32 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1237" + }, + { + "id": 21224725, + "iid": 1299, + "projectId": 2722779, + "title": "[V8][V9] Pour l\u0027algorithme d\u0027appariement d\u0027activités (LL comme PS), décider du comportement vis-à-vis de l\u0027absence d\u0027heures sur les activités (cas très fréquent sur les logbooks)", + "description": "[V8][V9] Pour l\u0027algorithme d\u0027appariement d\u0027activités LL/PS, décider du comportement vis-à-vis de l\u0027absence d\u0027heures sur les activités (cas très fréquent sur les logbooks)", + "labels": [ + "Evolution", + "IRD-2018-01-V8" + ], + "milestone": { + "id": 959266, + "iid": 149, + "projectId": 2722779, + "groupId": 0, + "title": "8.0", + "description": "", + "state": "active" + }, + "assignees": [ + { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + } + ], + "assignee": { + "_id": 166231, + "_username": "tchemit", + "_name": "Tony CHEMIT", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/2a915aa9a1df35c8b609ff2f750d5dac?s\u003d…" + }, + "author": { + "_id": 1111318, + "_username": "pcauquil", + "_name": "Pascal Cauquil", + "_state": "active", + "_external": false, + "_avatarUrl": "https://secure.gravatar.com/avatar/b4ae117bd93e10d96298fa4d885208ea?s\u003d…" + }, + "userNotesCount": 2, + "upVotes": 0, + "downVotes": 0, + "confidential": false, + "timeStats": { + "timeEstimate": 0, + "totalTimeSpent": 0 + }, + "state": "opened", + "updatedAt": "Aug 3, 2019 8:44:15 PM", + "createdAt": "May 23, 2019 4:23:51 PM", + "webUrl": "https://gitlab.com/ultreiaio/ird-observe/issues/1299" + } +] \ No newline at end of file ===================================== .mvn/gitlab-cache/milestones/959266.json ===================================== @@ -0,0 +1,9 @@ +{ + "id": 959266, + "iid": 149, + "projectId": 2722779, + "groupId": 0, + "title": "8.0", + "description": "", + "state": "active" +} \ No newline at end of file ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,30 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2019-08-03 13:38. + * Last generated at 2019-08-05 01:18. + +## Version [8.0-RC-4](https://gitlab.com/ultreiaio/ird-observe/milestones/146) + +**Closed at 2019-08-05.** + +### Download +* [Application (observe-8.0-RC-4.zip)](http://repo1.maven.org/maven2/fr/ird/observe/observe…) +* [Serveur (observe-8.0-RC-4.war)](http://repo1.maven.org/maven2/fr/ird/observe/observe…) + +### Issues + * [[Anomalie 1359]](https://gitlab.com/ultreiaio/ird-observe/issues/1359) **Impossible de créer une activité LL logbook** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1361]](https://gitlab.com/ultreiaio/ird-observe/issues/1361) **Impossible de supprimer une activité LL** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1362]](https://gitlab.com/ultreiaio/ird-observe/issues/1362) **[LL] Activité logbook : petits ajustements** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1370]](https://gitlab.com/ultreiaio/ird-observe/issues/1370) **[UI][REFERENTIEL] L'icône 'voir toutes les utilisations de ce référentiel' ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1371]](https://gitlab.com/ultreiaio/ird-observe/issues/1371) **[UI][REFERENTIEL] Icône 'Toutes les clés métier de ce référentiel'** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Anomalie 1372]](https://gitlab.com/ultreiaio/ird-observe/issues/1372) **[UI][REFERENTIEL] [Mode Serveur] La suppression de tous les référentiels ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1349]](https://gitlab.com/ultreiaio/ird-observe/issues/1349) **Renommer champs vessel.iattcid et vessel.ctoiid** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1358]](https://gitlab.com/ultreiaio/ird-observe/issues/1358) **Création de nouvelles icônes de navigation** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1360]](https://gitlab.com/ultreiaio/ird-observe/issues/1360) **Assouplir un contrôle de saisie** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1365]](https://gitlab.com/ultreiaio/ird-observe/issues/1365) **[LL][LOGBOOKS] Plage de taille d'un échantillon** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1366]](https://gitlab.com/ultreiaio/ird-observe/issues/1366) **[LL][LOGBOOKS] Echantillons, ajouter l'unité °** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1368]](https://gitlab.com/ultreiaio/ird-observe/issues/1368) **[CARTO] Petits ajustement sur la carte** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Evolution 1369]](https://gitlab.com/ultreiaio/ird-observe/issues/1369) **[SERVEUR] observe-server.conf / observeweb.host** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [8.0-RC-3](https://gitlab.com/ultreiaio/ird-observe/milestones/143) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/896b08bb3ce5cc15cc0be25c72b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/896b08bb3ce5cc15cc0be25c72b… You're receiving this email because of your account on gitlab.com.

1 0