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

[Git][ultreiaio/ird-observe][develop-9.x] 3 commits: update pom
by Tony CHEMIT 14 Dec '18

14 Dec '18

Tony CHEMIT pushed to branch develop-9.x at ultreiaio / ird-observe Commits: 54af2737 by tchemit at 2018-12-14T14:18:06Z update pom - - - - - dfcac004 by tchemit at 2018-12-14T14:18:43Z prepare version 9.0 branch - - - - - 8548d6c4 by tchemit at 2018-12-14T14:18:43Z stash new model - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/pom.xml - client-core/pom.xml - client-runner/pom.xml - dto/pom.xml - observe-i18n/pom.xml - observe/pom.xml - persistence/pom.xml - persistence/src/main/models/Observe-01-referential-common.model - + persistence/src/main/models/Observe-04-referentiel-seine-logbook.model - + persistence/src/main/models/Observe-05-referentiel-seine-landing.model - + persistence/src/main/models/Observe-06-referentiel-seine-wellplan.model - + persistence/src/main/models/Observe-07-referentiel-seine-localmarket.model - + persistence/src/main/models/Observe-21-data-seine-logbook.model - + persistence/src/main/models/Observe-22-data-seine-landing.model - + persistence/src/main/models/Observe-23-data-seine-wellplan.model - + persistence/src/main/models/Observe-24-data-seine-localmarket.model - + persistence/src/main/models/Observe-40-data-common.model - pom.xml - server-configuration/pom.xml - server-core/pom.xml - server-runner/pom.xml - services-client/pom.xml - services-local/pom.xml - services/pom.xml - test/.mvn/pom.gitflow.develop - test/.mvn/pom.gitflow.master - test/pom.xml - validation/pom.xml Changes: ===================================== .mvn/pom.gitflow.develop ===================================== @@ -1 +1 @@ -develop \ No newline at end of file +develop-9.x \ No newline at end of file ===================================== .mvn/pom.gitflow.master ===================================== @@ -1 +1 @@ -master \ No newline at end of file +master-9.x \ No newline at end of file ===================================== client-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>client-configuration</artifactId> ===================================== client-core/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>client-core</artifactId> ===================================== client-runner/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>client-runner</artifactId> ===================================== dto/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>dto</artifactId> ===================================== observe-i18n/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>observe-i18n</artifactId> ===================================== observe/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== persistence/src/main/models/Observe-01-referential-common.model ===================================== @@ -186,3 +186,8 @@ referential.common.WeightMeasureType > referential.I18nReferentialEntity | entit referential.common.Wind > referential.I18nReferentialEntity | entity speedRange + {*:1} String waveHeight + {*:1} String + +referentiel.TransmittingBuoyOwnership > referentiel.I18nReferentialEntity | entity + +referentiel.SchoolType > referentiel.I18nReferentialEntity | entity + ===================================== persistence/src/main/models/Observe-04-referentiel-seine-logbook.model ===================================== @@ -0,0 +1,20 @@ +package fr.ird.observe.entities.referentiel.seine.logbook | dbSchema=ps_logbook + +referentiel.seine.logbook.ObjectMaterial > referentiel.I18nReferentialEntity | entity +legacyCode + {*:1} String | hibernateAttributeType=text +standardCode + {*:1} String +biodegradable + {*:1} Boolean +nonEntangling + {*:1} Boolean +childrenMultiSelectable + {*:1} boolean | notNull +childSelectionMandatory + {*:1} boolean | notNull +parent {*:0..1} referentiel.seine.ObjectMaterial +objectMaterialType {*:1} referentiel.seine.logbook.ObjectMaterialType | lazy=false +validation + {*:1} String +getSimplifiedObjectMaterial() referentiel.seine.logbook.ObjectMaterial +getSimplifiedParentObjectMaterial() referentiel.seine.logbook.ObjectMaterial + +referentiel.seine.logbook.ObjectMaterialType > referentiel.I18nReferentialEntity | entity + +referentiel.seine.logbook.ObjectOperation > referentiel.I18nReferentialEntity | entity +whenArriving + {*:1} boolean | notNull +whenLeaving + {*:1} boolean | notNull ===================================== persistence/src/main/models/Observe-05-referentiel-seine-landing.model ===================================== @@ -0,0 +1,6 @@ +package fr.ird.observe.entities.referentiel.seine.landing | dbSchema=ps_landing + +referentiel.seine.landing.WeightCategory > referentiel.I18nReferentialEntity | entity +species {*:1} referentiel.Species | lazy=false + +referentiel.seine.landing.Fate > referentiel.I18nReferentialEntity | entity ===================================== persistence/src/main/models/Observe-06-referentiel-seine-wellplan.model ===================================== @@ -0,0 +1,4 @@ +package fr.ird.observe.entities.referentiel.seine.wellplan | dbSchema=ps_wellplan + +referentiel.seine.wellplan.WeightCategory > referentiel.I18nReferentialEntity | entity +species {*:1} referentiel.Species | lazy=false \ No newline at end of file ===================================== persistence/src/main/models/Observe-07-referentiel-seine-localmarket.model ===================================== @@ -0,0 +1,5 @@ +package fr.ird.observe.entities.referentiel.seine.localmarket | dbSchema=ps_localmarket + +referentiel.seine.localmarket.PackagingType > referentiel.I18nReferentialEntity | entity + +referentiel.seine.localmarket.Packaging > referentiel.I18nReferentialEntity | entity \ No newline at end of file ===================================== persistence/src/main/models/Observe-21-data-seine-logbook.model ===================================== @@ -0,0 +1 @@ +package fr.ird.observe.entities.data.seine.logbook | dbSchema=ps_logbook ===================================== persistence/src/main/models/Observe-22-data-seine-landing.model ===================================== @@ -0,0 +1 @@ +package fr.ird.observe.entities.data.seine.landing | dbSchema=ps_landing \ No newline at end of file ===================================== persistence/src/main/models/Observe-23-data-seine-wellplan.model ===================================== @@ -0,0 +1 @@ +package fr.ird.observe.entities.data.seine.wellplan | dbSchema=ps_wellplan \ No newline at end of file ===================================== persistence/src/main/models/Observe-24-data-seine-localmarket.model ===================================== @@ -0,0 +1 @@ +package fr.ird.observe.entities.data.seine.localmarket | dbSchema=ps_localmarket \ No newline at end of file ===================================== persistence/src/main/models/Observe-40-data-common.model ===================================== ===================================== pom.xml ===================================== @@ -26,12 +26,12 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.8.11</version> + <version>2018.8.12</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe :: Pom</name> @@ -156,7 +156,7 @@ <buildDate>${maven.build.timestamp}</buildDate> <observeToolkitVersion>4.10-SNAPSHOT</observeToolkitVersion> - <lib.version.java4all.topia>1.2-SNAPSHOT</lib.version.java4all.topia> +     @@ -201,6 +201,10 @@ <license.excludes>**/templates/*.template,**/translations/*.properties,**/THIRD-PARTY.properties,**/*.sh</license.excludes> +  + <jgitflow.masterBranchName>master-9.x</jgitflow.masterBranchName> + <jgitflow.developBranchName>develop-9.x</jgitflow.developBranchName> + </properties> <dependencyManagement> ===================================== server-configuration/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>server-configuration</artifactId> ===================================== server-core/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>server-core</artifactId> ===================================== server-runner/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>server-runner</artifactId> ===================================== services-client/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>services-client</artifactId> ===================================== services-local/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>services-local</artifactId> ===================================== services/pom.xml ===================================== @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/.mvn/pom.gitflow.develop ===================================== @@ -1 +1 @@ -develop \ No newline at end of file +develop-9.x \ No newline at end of file ===================================== test/.mvn/pom.gitflow.master ===================================== @@ -1 +1 @@ -master \ No newline at end of file +master-9.x \ No newline at end of file ===================================== test/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== validation/pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> - <version>8.0-alpha-5-SNAPSHOT</version> + <version>9.0.0-SNAPSHOT</version> </parent> <artifactId>validation</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/8b95978bff366b9bace336bbe7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/8b95978bff366b9bace336bbe7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update pom
by Tony CHEMIT 14 Dec '18

14 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 54af2737 by tchemit at 2018-12-14T14:18:06Z update pom - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2018.8.11</version> + <version>2018.8.12</version> </parent> <groupId>fr.ird.observe</groupId> @@ -156,7 +156,7 @@ <buildDate>${maven.build.timestamp}</buildDate> <observeToolkitVersion>4.10-SNAPSHOT</observeToolkitVersion> - <lib.version.java4all.topia>1.2-SNAPSHOT</lib.version.java4all.topia> +     View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/54af27370ce6fb7f2d5e8323cbe… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/54af27370ce6fb7f2d5e8323cbe… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.x] 11 commits: [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-4' with...
by Tony CHEMIT 14 Dec '18

14 Dec '18

Tony CHEMIT pushed to branch develop-9.x at ultreiaio / ird-observe Commits: 94df9191 by Tony CHEMIT at 2018-12-10T15:56:11Z [jgitflow-maven-plugin]updating poms for branch'release/8.0-alpha-4' with non-snapshot versions[skip ci] - - - - - 929b221b by Tony CHEMIT at 2018-12-10T16:06:19Z release merge - - - - - 176e29ef by Tony CHEMIT at 2018-12-10T16:06:54Z [jgitflow-maven-plugin]merging 'release/8.0-alpha-4' into 'master' - - - - - ecce5753 by Tony CHEMIT at 2018-12-10T16:06:57Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 32729bda by Tony CHEMIT at 2018-12-10T16:06:58Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - a1b62511 by Tony CHEMIT at 2018-12-10T16:06:59Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - cfc5fee9 by tchemit at 2018-12-11T20:34:02Z [V8][DATA MODEL] Retours sur le modèle V8 alpha - Close #1166 - Now entityEnum use schema name (next step is to move entities to specific packages - - - - - d95cc9c3 by tchemit at 2018-12-14T12:00:23Z Mutualiser les topiaid t3 et ObServe - Closes #970 - - - - - 3e383a05 by tchemit at 2018-12-14T13:49:32Z fix some ui handler errors - - - - - 6e35ded5 by tchemit at 2018-12-14T14:01:47Z prepare version 9.0 branch - - - - - 8b95978b by tchemit at 2018-12-14T14:03:14Z stash new model - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/pom.xml - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client-core/pom.xml - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/table/SaveTableDataUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/DeleteReferentialUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/SaveReferentialUIAction.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/LonglineDetailCompositionDeleteAllSectionsAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/LonglineDetailCompositionGenerateAllSectionsAction.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/add/AddActivityLonglineLogbookSampleUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/add/AddActivityLonglineLogbookSetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/add/AddActivityLonglineObsSetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineObsUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSampleLonglineLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSetLonglineLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSetLonglineObsUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineLandingUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineSampleLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleActivityLonglineLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleActivityLonglineObsUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleLonglineSampleLogbookRequest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bdbecacd443a22db012e1f0742… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/bdbecacd443a22db012e1f0742… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] fix some ui handler errors
by Tony CHEMIT 14 Dec '18

14 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3e383a05 by tchemit at 2018-12-14T13:49:32Z fix some ui handler errors - - - - - 9 changed files: - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/table/SaveTableDataUIAction.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/data/table/ContentTableUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUIModel.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetSampleCaptureUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetSampleRejeteUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetSampleUIHandler.java - client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetSampleUIModel.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/data/table/SaveTableDataUIAction.java ===================================== @@ -71,8 +71,10 @@ public class SaveTableDataUIAction<D extends DataDto, C extends DataDto, U exten ContentTableModel<D, C> tableModel = ui.getTableModel(); if (model.isModified() || model.isCanSaveRow()) { - // flush modified line to model - tableModel.updateRowFromEditBean(); + // flush modified line to model if table not empty + if (!tableModel.isEmpty()) { + tableModel.updateRowFromEditBean(); + } } List<C> objets = tableModel.getData(); ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/ContentUIHandler.java ===================================== @@ -59,25 +59,27 @@ import fr.ird.observe.services.service.actions.synchro.referential.ng.Referentia import fr.ird.observe.services.service.actions.validate.ValidateService; import fr.ird.observe.services.service.data.NavigationService; import fr.ird.observe.services.service.data.TripManagementService; -import fr.ird.observe.services.service.data.longline.obs.ActivityLongLineObsEncounterService; -import fr.ird.observe.services.service.data.longline.obs.ActivityLongLineObsSensorUsedService; +import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService; +import fr.ird.observe.services.service.data.longline.TripLonglineSampleLogbookService; +import fr.ird.observe.services.service.data.longline.TripLonglineService; +import fr.ird.observe.services.service.data.longline.landing.TripLonglineLandingService; import fr.ird.observe.services.service.data.longline.logbook.ActivityLonglineLogbookSampleService; import fr.ird.observe.services.service.data.longline.logbook.ActivityLonglineLogbookService; -import fr.ird.observe.services.service.data.longline.obs.ActivityLonglineObsService; -import fr.ird.observe.services.service.data.longline.obs.BranchlineObsService; import fr.ird.observe.services.service.data.longline.logbook.SetLonglineLogbookCatchService; import fr.ird.observe.services.service.data.longline.logbook.SetLonglineLogbookGlobalCompositionService; import fr.ird.observe.services.service.data.longline.logbook.SetLonglineLogbookService; +import fr.ird.observe.services.service.data.longline.obs.ActivityLongLineObsEncounterService; +import fr.ird.observe.services.service.data.longline.obs.ActivityLongLineObsSensorUsedService; +import fr.ird.observe.services.service.data.longline.obs.ActivityLonglineObsService; +import fr.ird.observe.services.service.data.longline.obs.BranchlineObsService; import fr.ird.observe.services.service.data.longline.obs.SetLonglineObsCatchService; import fr.ird.observe.services.service.data.longline.obs.SetLonglineObsDetailCompositionService; import fr.ird.observe.services.service.data.longline.obs.SetLonglineObsGlobalCompositionService; import fr.ird.observe.services.service.data.longline.obs.SetLonglineObsService; import fr.ird.observe.services.service.data.longline.obs.TdrObsService; -import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService; -import fr.ird.observe.services.service.data.longline.landing.TripLonglineLandingService; -import fr.ird.observe.services.service.data.longline.TripLonglineSampleLogbookService; -import fr.ird.observe.services.service.data.longline.TripLonglineService; import fr.ird.observe.services.service.data.longline.pairing.ActivityLonglinePairingService; +import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; +import fr.ird.observe.services.service.data.seine.TripSeineService; import fr.ird.observe.services.service.data.seine.obs.ActivitySeineService; import fr.ird.observe.services.service.data.seine.obs.FloatingObjectService; import fr.ird.observe.services.service.data.seine.obs.NonTargetCatchReleaseService; @@ -91,8 +93,6 @@ import fr.ird.observe.services.service.data.seine.obs.SetSeineService; import fr.ird.observe.services.service.data.seine.obs.TargetCatchService; import fr.ird.observe.services.service.data.seine.obs.TargetSampleService; import fr.ird.observe.services.service.data.seine.obs.TransmittingBuoyOperationService; -import fr.ird.observe.services.service.data.seine.TripSeineGearUseService; -import fr.ird.observe.services.service.data.seine.TripSeineService; import fr.ird.observe.services.service.referential.ReferentialService; import fr.ird.observe.services.service.sql.SqlScriptProducerService; import fr.ird.observe.spi.DtoModelHelper; @@ -387,6 +387,9 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe } final void destroyUI() { + if (ui==null) { + return; + } UIHelper.removeAllDataBindings(getUi()); getModel().destroy(); UIHelper.destroy(getUi()); @@ -608,6 +611,11 @@ public abstract class ContentUIHandler<U extends ContentUI> implements ObserveSe // } final boolean closeUI() { + if (ui == null) { + // When a error was found while loading the previous screen + // If we do nothing, then we can't ever qui the data source + return true; + } boolean b = checkEdit(ui); log.debug(prefix + "Can close " + ui.getClass() + " : " + b); if (b) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/api/data/table/ContentTableUIModel.java ===================================== @@ -118,13 +118,26 @@ public abstract class ContentTableUIModel<D extends DataDto, C extends DataDto> @Override protected ContentMode computeMode(boolean canWrite) { - if (!canWrite || !showData) { + if (!canWrite) { return ContentMode.READ; } + ContentMode result; if (getSelectedNode().getType().equals(getEditNode().getType())) { - return getContentModeFromSelf(); + result = getContentModeFromSelf(); + return result; } - return getContentModeFromParent(); + result = getContentModeFromParent(); + boolean showData = computeShowData(result); + setShowData(showData); + if (!showData) { + result = ContentMode.READ; + } + return result; + } + + protected boolean computeShowData(ContentMode contentMode) { + // by default can show data + return true; } @Override @@ -209,9 +222,8 @@ public abstract class ContentTableUIModel<D extends DataDto, C extends DataDto> } public void setShowData(boolean showData) { - boolean oldValue = this.showData; this.showData = showData; - firePropertyChange(PROPERTY_SHOW_DATA, oldValue, showData); + firePropertyChange(PROPERTY_SHOW_DATA, showData); } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUIHandler.java ===================================== @@ -68,6 +68,23 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS return ui.getModel(); } + @Override + public void beforeInit(NonTargetSampleUI ui) { + super.beforeInit(ui); + } + + @Override + public void afterInit(NonTargetSampleUI ui) { + super.afterInit(ui); + } + + @Override + protected void onOpenBeforeOpenModel() { + super.onOpenBeforeOpenModel(); + // We can't add filter since it uses the model.form, so add them now + onAfterInitAddReferentialFilters(getModel().getReferenceCache()); + } + @Override protected ObserveLayoutFocusTraversalPolicy<NonTargetSampleUI> createFocusTraversalPolicy() { return new ObserveLayoutFocusTraversalPolicy<NonTargetSampleUI>() { @@ -93,6 +110,9 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS @Override protected void onAfterInitAddReferentialFilters(ContentUIReferenceCache referenceCache) { + if (getModel().getForm() == null) { + return; + } referenceCache.addReferentialFilter(NonTargetLengthDto.PROPERTY_SPECIES, incomingReferences -> { ReferentialDtoReferenceSet<SpeciesReference> sampleSpecies = getNonTargetSampleService().getSampleSpecies(getModel().getSelectedId()); return new LinkedList<>(sampleSpecies.toSet()); @@ -166,8 +186,10 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS protected void loadEditBean(String beanId) { Form<NonTargetSampleDto> form = getNonTargetSampleService().loadForm(beanId); // FIXME + NonTargetSampleUIModel model = getModel(); - model.setForm(form); +// model.getReferenceCache().loadReferentialReferenceSetsInModel(form); +// model.setForm(form); model.openForm(form); // // on a besoin du formulaire dans cette méthode // loadReferentialReferenceSetsInModel(form); @@ -242,7 +264,7 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS @Override public void doPersist(NonTargetSampleDto bean) { - SaveResultDto saveResult = getNonTargetSampleService().save(getModel().getSelectedParentId(), bean); + SaveResultDto saveResult = getNonTargetSampleService().save(getModel().getSelectedId(), bean); saveResult.toDto(bean); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/NonTargetSampleUIModel.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.data.ps.observation; * #L% */ +import fr.ird.observe.client.ui.content.api.ContentMode; import fr.ird.observe.client.ui.content.api.data.table.ContentTableMeta; import fr.ird.observe.client.ui.content.api.data.table.ContentTableModel; import fr.ird.observe.client.ui.content.api.data.table.ContentTableUI; @@ -122,6 +123,12 @@ public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSampleD firePropertyChange(PROPERTY_DEFAULT_SIZE_MEASURE_TYPE, oldValue, defaultSizeMeasureType); } + @Override + protected boolean computeShowData(ContentMode contentMode) { + String selectedId = getSelectedId(); + return ui.getDataSource().getNonTargetSampleService().canUseNonTargetSample(selectedId); + } + //FIXME Voir pourquoi c'est le seul modèle qui surcharge ça ??? // @Override // public <D extends ReferentialDto, R extends ReferentialDtoReference<D, R>> Optional<Set<R>> tryToGetReferentialReferenceSet(String propertyName) { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetSampleCaptureUIHandler.java ===================================== @@ -39,16 +39,16 @@ public class TargetSampleCaptureUIHandler extends TargetSampleUIHandler implemen TargetSampleCaptureUIHandler() { super(false); } -// -// @Override -// public void beforeInit(TargetSampleCaptureUI ui) { -// super.beforeInit(ui); -// } -// -// @Override -// public void afterInit(TargetSampleCaptureUI ui) { -// super.afterInit(ui); -// } + + @Override + public void beforeInit(TargetSampleCaptureUI ui) { + super.beforeInit(ui); + } + + @Override + public void afterInit(TargetSampleCaptureUI ui) { + super.afterInit(ui); + } @Override ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetSampleRejeteUIHandler.java ===================================== @@ -40,15 +40,15 @@ public class TargetSampleRejeteUIHandler extends TargetSampleUIHandler implement super(true); } -// @Override -// public void beforeInit(TargetSampleRejeteUI targetSampleRejeteUI) { -// super.beforeInit(targetSampleRejeteUI); -// } -// -// @Override -// public void afterInit(TargetSampleRejeteUI targetSampleRejeteUI) { -// super.afterInit(targetSampleRejeteUI); -// } + @Override + public void beforeInit(TargetSampleRejeteUI targetSampleRejeteUI) { + super.beforeInit(targetSampleRejeteUI); + } + + @Override + public void afterInit(TargetSampleRejeteUI targetSampleRejeteUI) { + super.afterInit(targetSampleRejeteUI); + } @Override protected ObserveLayoutFocusTraversalPolicy createFocusTraversalPolicy() { ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetSampleUIHandler.java ===================================== @@ -39,6 +39,7 @@ import fr.ird.observe.dto.referential.common.SizeMeasureTypeReference; import fr.ird.observe.dto.referential.common.SpeciesDto; import fr.ird.observe.dto.referential.common.SpeciesReference; import fr.ird.observe.dto.result.SaveResultDto; +import fr.ird.observe.spi.DtoModelHelper; import org.nuiton.validator.NuitonValidatorScope; import javax.swing.JComponent; @@ -130,6 +131,10 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar } } + boolean isDiscarded() { + return discarded; + } + @Override protected ObserveLayoutFocusTraversalPolicy<U> createFocusTraversalPolicy() { return null; @@ -183,6 +188,8 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar List<SizeMeasureTypeReference> sizeMeasureTypes = getReferentialReferences(SizeMeasureTypeReference.class); List<SizeMeasureTypeReference> data = SizeMeasureTypeHelper.filterForSeine(sizeMeasureTypes); log.info(prefix + "Using " + data.size() + " size measure type(s)."); + // We need to fill the referential cache (normally this is done in onOpenModel method) + getModel().getReferenceCache().loadReferentialReferenceSetsInModel(DtoModelHelper.getOptionalFormDefinition(TargetSampleDto.class).get(), true); loadSizeMeasureTypes(); checkSizeMeasureTypes(data); ((TargetSampleUI) ui).getSizeMeasureType().setData(data); @@ -224,7 +231,7 @@ public class TargetSampleUIHandler<U extends ContentTableUI<TargetSampleDto, Tar @Override public void doPersist(TargetSampleDto bean) { - SaveResultDto saveResult = getTargetSampleService().save(getModel().getSelectedParentId(), bean); + SaveResultDto saveResult = getTargetSampleService().save(getModel().getSelectedId(), bean); saveResult.toDto(bean); } ===================================== client-core/src/main/java/fr/ird/observe/client/ui/content/data/ps/observation/TargetSampleUIModel.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.ui.content.data.ps.observation; * #L% */ +import fr.ird.observe.client.ui.content.api.ContentMode; import fr.ird.observe.client.ui.content.api.data.table.ContentTableMeta; import fr.ird.observe.client.ui.content.api.data.table.ContentTableModel; import fr.ird.observe.client.ui.content.api.data.table.ContentTableUI; @@ -104,6 +105,12 @@ public class TargetSampleUIModel extends ContentTableUIModel<TargetSampleDto, Ta }; } + @Override + protected boolean computeShowData(ContentMode contentMode) { + String selectedId = getSelectedId(); + return ui.getDataSource().getTargetSampleService().canUseTargetSample(selectedId,((TargetSampleUI)ui).getHandler().isDiscarded()); + } + public SizeMeasureTypeReference getDefaultSizeMeasureType() { return defaultSizeMeasureType; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3e383a05ca58b562062ab6fc77c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3e383a05ca58b562062ab6fc77c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Mutualiser les topiaid t3 et ObServe - Closes #970
by Tony CHEMIT 14 Dec '18

14 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d95cc9c3 by tchemit at 2018-12-14T12:00:23Z Mutualiser les topiaid t3 et ObServe - Closes #970 - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/DeleteReferentialUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/SaveReferentialUIAction.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/LonglineDetailCompositionDeleteAllSectionsAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/LonglineDetailCompositionGenerateAllSectionsAction.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/add/AddActivityLonglineLogbookSampleUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/add/AddActivityLonglineLogbookSetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/add/AddActivityLonglineObsSetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineObsUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSampleLonglineLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSetLonglineLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSetLonglineObsUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineLandingUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineSampleLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleActivityLonglineLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleActivityLonglineObsUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleLonglineSampleLogbookRequest.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineLandingUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineSampleLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripUIActionSupport.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleActivityLonglineLogbookUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d95cc9c3f967a78773b8be6710e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d95cc9c3f967a78773b8be6710e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Mutualiser les topiaid t3 et ObServe - Closes #970
by Tony CHEMIT 14 Dec '18

14 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 38ded687 by tchemit at 2018-12-14T11:48:32Z Mutualiser les topiaid t3 et ObServe - Closes #970 - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/DeleteReferentialUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/SaveReferentialUIAction.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/LonglineDetailCompositionDeleteAllSectionsAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/LonglineDetailCompositionGenerateAllSectionsAction.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/add/AddActivityLonglineLogbookSampleUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/add/AddActivityLonglineLogbookSetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/add/AddActivityLonglineObsSetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineObsUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSampleLonglineLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSetLonglineLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSetLonglineObsUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineLandingUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineSampleLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleActivityLonglineLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleActivityLonglineObsUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleLonglineSampleLogbookRequest.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineLandingUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineSampleLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripUIActionSupport.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleActivityLonglineLogbookUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/38ded6873fb00aac12d2688e659… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/38ded6873fb00aac12d2688e659… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Refactor packages - part 2 (review ps model id)
by Tony CHEMIT 14 Dec '18

14 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ed938462 by tchemit at 2018-12-13T16:10:46Z Refactor packages - part 2 (review ps model id) - - - - - 49550386 by tchemit at 2018-12-13T22:19:04Z Refactor packages - part 3 (review ll model id) - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - 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/LonglineDetailCompositionDeleteAllSectionsAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/LonglineDetailCompositionGenerateAllSectionsAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/add/AddActivityLonglineLogbookSampleUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSampleLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSetLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSetLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineLandingUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineSampleLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleActivityLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleActivityLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleLonglineSampleLogbookRequest.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineLandingUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineSampleLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleActivityLonglineLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleActivityLonglineObsUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleActivityLonglineSampleLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleLonglineSampleLogbookRequest.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleTripLonglineLandingUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleTripLonglineSampleLogbookUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleTripLonglineUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/save/CopyValuesAndSaveSetLonglineLogbookUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/993b288dbbc8c80cc18039140e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/993b288dbbc8c80cc18039140e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Refactor packages - part 1
by Tony CHEMIT 13 Dec '18

13 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 574cdea7 by tchemit at 2018-12-12T11:29:23Z Refactor packages - part 1 - - - - - 993b288d by tchemit at 2018-12-13T10:33:23Z Refactor packages - part 2 (start review id) - - - - - 30 changed files: - client-configuration/src/main/config/Client.ini - client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client-core/src/main/java/fr/ird/observe/client/navigation/RouteCloseCallback.java - client-core/src/main/java/fr/ird/observe/client/ui/ObserveMainUI.jaxx - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/DeleteReferentialUIAction.java - client-core/src/main/java/fr/ird/observe/client/ui/actions/content/api/ref/SaveReferentialUIAction.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/LonglineDetailCompositionDeleteAllSectionsAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/LonglineDetailCompositionGenerateAllSectionsAction.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/add/AddActivityLonglineLogbookSampleUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/add/AddActivityLonglineLogbookSetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/add/AddActivityLonglineObsSetUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteActivityLonglineObsUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSampleLonglineLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSetLonglineLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteSetLonglineObsUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineLandingUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineSampleLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/delete/DeleteTripLonglineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleActivityLonglineLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleActivityLonglineObsUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleLonglineSampleLogbookRequest.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineLandingUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineSampleLogbookUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripLonglineUIAction.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveMultipleTripUIActionSupport.java - + client-core/src/main/java/fr/ird/observe/client/ui/actions/content/data/ll/move/MoveSingleActivityLonglineLogbookUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cfc5fee9b8cfdd4a738446138c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/cfc5fee9b8cfdd4a738446138c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.x] stash new model
by Tony CHEMIT 12 Dec '18

12 Dec '18

Tony CHEMIT pushed to branch develop-9.x at ultreiaio / ird-observe Commits: bdbecacd by tchemit at 2018-12-11T12:40:22Z stash new model - - - - - 14 changed files: - persistence/src/main/models/Observe-01-referential-common.model - persistence/src/main/models/Observe-03-referential-seine-obs.model - + persistence/src/main/models/Observe-04-referentiel-seine-logbook.model - + persistence/src/main/models/Observe-05-referentiel-seine-landing.model - + persistence/src/main/models/Observe-06-referentiel-seine-wellplan.model - + persistence/src/main/models/Observe-07-referentiel-seine-localmarket.model - persistence/src/main/models/Observe-11-referential-longline-obs.model - persistence/src/main/models/Observe-13-referential-longline-landing.model - + persistence/src/main/models/Observe-21-data-seine-logbook.model - + persistence/src/main/models/Observe-22-data-seine-landing.model - + persistence/src/main/models/Observe-23-data-seine-wellplan.model - + persistence/src/main/models/Observe-24-data-seine-localmarket.model - + persistence/src/main/models/Observe-40-data-common.model - pom.xml Changes: ===================================== persistence/src/main/models/Observe-01-referential-common.model ===================================== @@ -187,3 +187,8 @@ referentiel.WeightMeasureType > referentiel.I18nReferentialEntity | entity referentiel.Wind > referentiel.I18nReferentialEntity | entity speedRange + {*:1} String waveHeight + {*:1} String + +referentiel.TransmittingBuoyOwnership > referentiel.I18nReferentialEntity | entity + +referentiel.SchoolType > referentiel.I18nReferentialEntity | entity + ===================================== persistence/src/main/models/Observe-03-referential-seine-obs.model ===================================== @@ -1,17 +1,18 @@ +package fr.ird.observe.entities.referentiel.seine.obs | dbSchema=ps_observation enum !fr.ird.observe.dto.data.seine.NonTargetCatchReleaseStatus enum !fr.ird.observe.dto.data.seine.SchoolType -referentiel.seine.DetectionMode > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.DetectionMode > referentiel.I18nReferentialEntity | entity -referentiel.seine.NonTargetCatchReleaseConformity > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.NonTargetCatchReleaseConformity > referentiel.I18nReferentialEntity | entity -referentiel.seine.NonTargetCatchReleaseStatus > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.NonTargetCatchReleaseStatus > referentiel.I18nReferentialEntity | entity -referentiel.seine.NonTargetCatchReleasingTime > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.NonTargetCatchReleasingTime > referentiel.I18nReferentialEntity | entity -referentiel.seine.ObjectMaterial > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.ObjectMaterial > referentiel.I18nReferentialEntity | entity legacyCode + {*:1} String | hibernateAttributeType=text standardCode + {*:1} String biodegradable + {*:1} Boolean @@ -19,32 +20,32 @@ nonEntangling + {*:1} Boolean childrenMultiSelectable + {*:1} boolean | notNull childSelectionMandatory + {*:1} boolean | notNull parent {*:0..1} referentiel.seine.ObjectMaterial -objectMaterialType {*:1} referentiel.seine.ObjectMaterialType | lazy=false +objectMaterialType {*:1} referentiel.seine.obs.ObjectMaterialType | lazy=false validation + {*:1} String -getSimplifiedObjectMaterial() referentiel.seine.ObjectMaterial -getSimplifiedParentObjectMaterial() referentiel.seine.ObjectMaterial +getSimplifiedObjectMaterial() referentiel.seine.obs.ObjectMaterial +getSimplifiedParentObjectMaterial() referentiel.seine.obs.ObjectMaterial -referentiel.seine.ObjectMaterialType > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.ObjectMaterialType > referentiel.I18nReferentialEntity | entity -referentiel.seine.ObjectOperation > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.ObjectOperation > referentiel.I18nReferentialEntity | entity whenArriving + {*:1} boolean | notNull whenLeaving + {*:1} boolean | notNull -referentiel.seine.ObservedSystem > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.ObservedSystem > referentiel.I18nReferentialEntity | entity schoolType + {*:1} !fr.ird.observe.dto.data.seine.SchoolType -referentiel.seine.ReasonForDiscard > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.ReasonForDiscard > referentiel.I18nReferentialEntity | entity -referentiel.seine.ReasonForNoFishing > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.ReasonForNoFishing > referentiel.I18nReferentialEntity | entity -referentiel.seine.ReasonForNullSet > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.ReasonForNullSet > referentiel.I18nReferentialEntity | entity -referentiel.seine.SpeciesStatus > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.SpeciesStatus > referentiel.I18nReferentialEntity | entity -referentiel.seine.SurroundingActivity > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation +referentiel.seine.obs.SurroundingActivity > referentiel.I18nReferentialEntity | entity -referentiel.seine.VesselActivitySeine > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation dbName=VesselActivity +referentiel.seine.obs.VesselActivitySeine > referentiel.I18nReferentialEntity | entity dbName=VesselActivity allowFad + {*:1} boolean -referentiel.seine.WeightCategorySeine > referentiel.I18nReferentialEntity | entity dbSchema=ps_observation dbName=WeightCategory +referentiel.seine.obs.WeightCategorySeine > referentiel.I18nReferentialEntity | entity dbName=WeightCategory species {*:1} referentiel.Species | lazy=false ===================================== persistence/src/main/models/Observe-04-referentiel-seine-logbook.model ===================================== @@ -0,0 +1,20 @@ +package fr.ird.observe.entities.referentiel.seine.logbook | dbSchema=ps_logbook + +referentiel.seine.logbook.ObjectMaterial > referentiel.I18nReferentialEntity | entity +legacyCode + {*:1} String | hibernateAttributeType=text +standardCode + {*:1} String +biodegradable + {*:1} Boolean +nonEntangling + {*:1} Boolean +childrenMultiSelectable + {*:1} boolean | notNull +childSelectionMandatory + {*:1} boolean | notNull +parent {*:0..1} referentiel.seine.ObjectMaterial +objectMaterialType {*:1} referentiel.seine.logbook.ObjectMaterialType | lazy=false +validation + {*:1} String +getSimplifiedObjectMaterial() referentiel.seine.logbook.ObjectMaterial +getSimplifiedParentObjectMaterial() referentiel.seine.logbook.ObjectMaterial + +referentiel.seine.logbook.ObjectMaterialType > referentiel.I18nReferentialEntity | entity + +referentiel.seine.logbook.ObjectOperation > referentiel.I18nReferentialEntity | entity +whenArriving + {*:1} boolean | notNull +whenLeaving + {*:1} boolean | notNull ===================================== persistence/src/main/models/Observe-05-referentiel-seine-landing.model ===================================== @@ -0,0 +1,6 @@ +package fr.ird.observe.entities.referentiel.seine.landing | dbSchema=ps_landing + +referentiel.seine.landing.WeightCategory > referentiel.I18nReferentialEntity | entity +species {*:1} referentiel.Species | lazy=false + +referentiel.seine.landing.Fate > referentiel.I18nReferentialEntity | entity ===================================== persistence/src/main/models/Observe-06-referentiel-seine-wellplan.model ===================================== @@ -0,0 +1,4 @@ +package fr.ird.observe.entities.referentiel.seine.wellplan | dbSchema=ps_wellplan + +referentiel.seine.wellplan.WeightCategory > referentiel.I18nReferentialEntity | entity +species {*:1} referentiel.Species | lazy=false \ No newline at end of file ===================================== persistence/src/main/models/Observe-07-referentiel-seine-localmarket.model ===================================== @@ -0,0 +1,5 @@ +package fr.ird.observe.entities.referentiel.seine.localmarket | dbSchema=ps_localmarket + +referentiel.seine.localmarket.PackagingType > referentiel.I18nReferentialEntity | entity + +referentiel.seine.localmarket.Packaging > referentiel.I18nReferentialEntity | entity \ No newline at end of file ===================================== persistence/src/main/models/Observe-11-referential-longline-obs.model ===================================== @@ -1,24 +1,25 @@ +package fr.ird.observe.entities.referentiel.longline.obs | dbSchema=ll_observation -referentiel.longline.BaitHaulingStatus > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.BaitHaulingStatus > referentiel.I18nReferentialEntity | entity -referentiel.longline.EncounterType > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.EncounterType > referentiel.I18nReferentialEntity | entity -referentiel.longline.HookPosition > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.HookPosition > referentiel.I18nReferentialEntity | entity -referentiel.longline.ItemHorizontalPosition > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.ItemHorizontalPosition > referentiel.I18nReferentialEntity | entity -referentiel.longline.ItemVerticalPosition > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.ItemVerticalPosition > referentiel.I18nReferentialEntity | entity -referentiel.longline.MaturityStatus > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.MaturityStatus > referentiel.I18nReferentialEntity | entity lowerValue + {*:1} String upperValue + {*:1} String -referentiel.longline.SensorBrand > referentiel.ObserveReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.SensorBrand > referentiel.ObserveReferentialEntity | entity brandName + {*:1} String -referentiel.longline.SensorDataFormat > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.SensorDataFormat > referentiel.I18nReferentialEntity | entity -referentiel.longline.SensorType > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.SensorType > referentiel.I18nReferentialEntity | entity -referentiel.longline.StomacFullness > referentiel.I18nReferentialEntity | entity dbSchema=ll_observation +referentiel.longline.obs.StomacFullness > referentiel.I18nReferentialEntity | entity ===================================== persistence/src/main/models/Observe-13-referential-longline-landing.model ===================================== @@ -1,3 +1,5 @@ -referentiel.longline.Conservation > referentiel.I18nReferentialEntity | entity dbSchema=ll_landing +package fr.ird.observe.entities.referentiel.longline.landing | dbSchema=ll_landing -referentiel.longline.DataSource > referentiel.I18nReferentialEntity | entity dbSchema=ll_landing +referentiel.longline.landing.Conservation > referentiel.I18nReferentialEntity | entity + +referentiel.longline.landing.DataSource > referentiel.I18nReferentialEntity | entity ===================================== persistence/src/main/models/Observe-21-data-seine-logbook.model ===================================== @@ -0,0 +1 @@ +package fr.ird.observe.entities.data.seine.logbook | dbSchema=ps_logbook ===================================== persistence/src/main/models/Observe-22-data-seine-landing.model ===================================== @@ -0,0 +1 @@ +package fr.ird.observe.entities.data.seine.landing | dbSchema=ps_landing \ No newline at end of file ===================================== persistence/src/main/models/Observe-23-data-seine-wellplan.model ===================================== @@ -0,0 +1 @@ +package fr.ird.observe.entities.data.seine.wellplan | dbSchema=ps_wellplan \ No newline at end of file ===================================== persistence/src/main/models/Observe-24-data-seine-localmarket.model ===================================== @@ -0,0 +1 @@ +package fr.ird.observe.entities.data.seine.localmarket | dbSchema=ps_localmarket \ No newline at end of file ===================================== persistence/src/main/models/Observe-40-data-common.model ===================================== ===================================== pom.xml ===================================== @@ -156,7 +156,7 @@ <buildDate>${maven.build.timestamp}</buildDate> <observeToolkitVersion>4.9</observeToolkitVersion> -  + <lib.version.java4all.topia>1.1.10-SNAPSHOT</lib.version.java4all.topia>    View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bdbecacd443a22db012e1f07423… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bdbecacd443a22db012e1f07423… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [V8][DATA MODEL] Retours sur le modèle V8 alpha - Close #1166 - Now entityEnum…
by Tony CHEMIT 11 Dec '18

11 Dec '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: cfc5fee9 by tchemit at 2018-12-11T20:34:02Z [V8][DATA MODEL] Retours sur le modèle V8 alpha - Close #1166 - Now entityEnum use schema name (next step is to move entities to specific packages - - - - - 8 changed files: - persistence/src/main/java/fr/ird/observe/entities/referentiel/SpeciesTopiaDao.java - persistence/src/main/java/fr/ird/observe/persistence/Entities.java - persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java - pom.xml - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/sql/SqlScriptProducerServiceLocal.java - services-local/src/test/java/fr/ird/observe/services/local/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java - test/src/main/resources/fixtures/count-referential-longline.properties Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/referentiel/SpeciesTopiaDao.java ===================================== @@ -45,7 +45,7 @@ public class SpeciesTopiaDao extends AbstractSpeciesTopiaDao<Species> { " WHERE main.topiaId=secondary.catch AND secondary.predator='" + entity.getTopiaId() + "'"; List<CatchLonglineObs> list = hibernateSession .createSQLQuery(sql) - .addEntity("main", ObserveEntityEnum.CatchLonglineObs.getImplementation()) + .addEntity("main", ObserveEntityEnum.ll_observation_CatchLonglineObs.getImplementation()) .list(); for (CatchLonglineObs item : list) { ===================================== persistence/src/main/java/fr/ird/observe/persistence/Entities.java ===================================== @@ -46,139 +46,139 @@ public class Entities { public static final ObserveEntityEnum[] REFERENCE_ENTITIES = new ObserveEntityEnum[]{ - ObserveEntityEnum.VesselSizeCategory, - ObserveEntityEnum.Country, - ObserveEntityEnum.Compagnies, - ObserveEntityEnum.LengthMeasureMethod, - ObserveEntityEnum.WeightMeasureMethod, - ObserveEntityEnum.DataQuality, - ObserveEntityEnum.ShipOwner, - ObserveEntityEnum.Harbour, - ObserveEntityEnum.VesselType, - ObserveEntityEnum.Vessel, - ObserveEntityEnum.NonTargetCatchReleaseConformity, - ObserveEntityEnum.NonTargetCatchReleaseStatus, - ObserveEntityEnum.NonTargetCatchReleasingTime, - ObserveEntityEnum.SpeciesGroupReleaseMode, - ObserveEntityEnum.SpeciesGroup, - ObserveEntityEnum.Ocean, - ObserveEntityEnum.SizeMeasureType, - ObserveEntityEnum.WeightMeasureType, - ObserveEntityEnum.Wind, - ObserveEntityEnum.Species, - ObserveEntityEnum.Sex, - ObserveEntityEnum.FpaZone, - ObserveEntityEnum.SpeciesList, - ObserveEntityEnum.Person, - ObserveEntityEnum.Organism, - ObserveEntityEnum.LengthLengthParameter, - ObserveEntityEnum.LengthWeightParameter, - ObserveEntityEnum.Program, - ObserveEntityEnum.GearCaracteristicType, - ObserveEntityEnum.GearCaracteristic, - ObserveEntityEnum.Gear, - ObserveEntityEnum.LastUpdateDate, + ObserveEntityEnum.common_VesselSizeCategory, + ObserveEntityEnum.common_Country, + ObserveEntityEnum.common_Compagnies, + ObserveEntityEnum.common_LengthMeasureMethod, + ObserveEntityEnum.common_WeightMeasureMethod, + ObserveEntityEnum.common_DataQuality, + ObserveEntityEnum.common_ShipOwner, + ObserveEntityEnum.common_Harbour, + ObserveEntityEnum.common_VesselType, + ObserveEntityEnum.common_Vessel, + ObserveEntityEnum.ps_observation_NonTargetCatchReleaseConformity, + ObserveEntityEnum.ps_observation_NonTargetCatchReleaseStatus, + ObserveEntityEnum.ps_observation_NonTargetCatchReleasingTime, + ObserveEntityEnum.common_SpeciesGroupReleaseMode, + ObserveEntityEnum.common_SpeciesGroup, + ObserveEntityEnum.common_Ocean, + ObserveEntityEnum.common_SizeMeasureType, + ObserveEntityEnum.common_WeightMeasureType, + ObserveEntityEnum.common_Wind, + ObserveEntityEnum.common_Species, + ObserveEntityEnum.common_Sex, + ObserveEntityEnum.common_FpaZone, + ObserveEntityEnum.common_SpeciesList, + ObserveEntityEnum.common_Person, + ObserveEntityEnum.common_Organism, + ObserveEntityEnum.common_LengthLengthParameter, + ObserveEntityEnum.common_LengthWeightParameter, + ObserveEntityEnum.common_Program, + ObserveEntityEnum.common_GearCaracteristicType, + ObserveEntityEnum.common_GearCaracteristic, + ObserveEntityEnum.common_Gear, + ObserveEntityEnum.common_LastUpdateDate, - ObserveEntityEnum.VesselActivitySeine, - ObserveEntityEnum.SurroundingActivity, - ObserveEntityEnum.ReasonForNullSet, - ObserveEntityEnum.ReasonForNoFishing, - ObserveEntityEnum.SpeciesFate, - ObserveEntityEnum.WeightCategorySeine, - ObserveEntityEnum.DetectionMode, - ObserveEntityEnum.TransmittingBuoyOperation, - ObserveEntityEnum.ObjectOperation, - ObserveEntityEnum.ObjectMaterialType, - ObserveEntityEnum.ObjectMaterial, - ObserveEntityEnum.ReasonForDiscard, - ObserveEntityEnum.SpeciesStatus, - ObserveEntityEnum.ObservedSystem, - ObserveEntityEnum.TransmittingBuoyType, + ObserveEntityEnum.ps_observation_VesselActivitySeine, + ObserveEntityEnum.ps_observation_SurroundingActivity, + ObserveEntityEnum.ps_observation_ReasonForNullSet, + ObserveEntityEnum.ps_observation_ReasonForNoFishing, + ObserveEntityEnum.ps_common_SpeciesFate, + ObserveEntityEnum.ps_observation_WeightCategorySeine, + ObserveEntityEnum.ps_observation_DetectionMode, + ObserveEntityEnum.ps_common_TransmittingBuoyOperation, + ObserveEntityEnum.ps_observation_ObjectOperation, + ObserveEntityEnum.ps_observation_ObjectMaterialType, + ObserveEntityEnum.ps_observation_ObjectMaterial, + ObserveEntityEnum.ps_observation_ReasonForDiscard, + ObserveEntityEnum.ps_observation_SpeciesStatus, + ObserveEntityEnum.ps_observation_ObservedSystem, + ObserveEntityEnum.ps_common_TransmittingBuoyType, - ObserveEntityEnum.BaitHaulingStatus, - ObserveEntityEnum.BaitSettingStatus, - ObserveEntityEnum.BaitType, - ObserveEntityEnum.CatchFateLongline, - ObserveEntityEnum.EncounterType, - ObserveEntityEnum.Healthness, - ObserveEntityEnum.HookPosition, - ObserveEntityEnum.HookSize, - ObserveEntityEnum.HookType, - ObserveEntityEnum.ItemVerticalPosition, - ObserveEntityEnum.ItemHorizontalPosition, - ObserveEntityEnum.LightsticksColor, - ObserveEntityEnum.LightsticksType, - ObserveEntityEnum.LineType, - ObserveEntityEnum.MaturityStatus, - ObserveEntityEnum.MitigationType, - ObserveEntityEnum.ObservationMethod, - ObserveEntityEnum.SensorBrand, - ObserveEntityEnum.SensorDataFormat, - ObserveEntityEnum.SensorType, - ObserveEntityEnum.SettingShape, - ObserveEntityEnum.StomacFullness, - ObserveEntityEnum.WeightCategoryLongline, - ObserveEntityEnum.WeightDeterminationMethod, - ObserveEntityEnum.VesselActivityLongline, - ObserveEntityEnum.Conservation, - ObserveEntityEnum.OnBoardProcessing, - ObserveEntityEnum.DataSource, - ObserveEntityEnum.TripType + ObserveEntityEnum.ll_observation_BaitHaulingStatus, + ObserveEntityEnum.ll_common_BaitSettingStatus, + ObserveEntityEnum.ll_common_BaitType, + ObserveEntityEnum.ll_common_CatchFateLongline, + ObserveEntityEnum.ll_observation_EncounterType, + ObserveEntityEnum.ll_common_Healthness, + ObserveEntityEnum.ll_observation_HookPosition, + ObserveEntityEnum.ll_common_HookSize, + ObserveEntityEnum.ll_common_HookType, + ObserveEntityEnum.ll_observation_ItemVerticalPosition, + ObserveEntityEnum.ll_observation_ItemHorizontalPosition, + ObserveEntityEnum.ll_common_LightsticksColor, + ObserveEntityEnum.ll_common_LightsticksType, + ObserveEntityEnum.ll_common_LineType, + ObserveEntityEnum.ll_observation_MaturityStatus, + ObserveEntityEnum.ll_common_MitigationType, + ObserveEntityEnum.ll_common_ObservationMethod, + ObserveEntityEnum.ll_observation_SensorBrand, + ObserveEntityEnum.ll_observation_SensorDataFormat, + ObserveEntityEnum.ll_observation_SensorType, + ObserveEntityEnum.ll_common_SettingShape, + ObserveEntityEnum.ll_observation_StomacFullness, + ObserveEntityEnum.ll_common_WeightCategoryLongline, + ObserveEntityEnum.ll_common_WeightDeterminationMethod, + ObserveEntityEnum.ll_common_VesselActivityLongline, + ObserveEntityEnum.ll_landing_Conservation, + ObserveEntityEnum.ll_common_OnBoardProcessing, + ObserveEntityEnum.ll_landing_DataSource, + ObserveEntityEnum.ll_common_TripType }; public static final List<ObserveEntityEnum> REFERENCE_ENTITIES_LIST = Collections.unmodifiableList(Arrays.asList(REFERENCE_ENTITIES)); public static final ObserveEntityEnum[] DATA_ENTITIES = new ObserveEntityEnum[]{ - ObserveEntityEnum.TargetSample, - ObserveEntityEnum.TargetLength, - ObserveEntityEnum.NonTargetSample, - ObserveEntityEnum.NonTargetLength, - ObserveEntityEnum.NonTargetCatchRelease, - ObserveEntityEnum.NonTargetCatch, - ObserveEntityEnum.SetSeine, - ObserveEntityEnum.TargetCatch, - ObserveEntityEnum.TransmittingBuoy, - ObserveEntityEnum.ObjectObservedSpecies, - ObserveEntityEnum.SchoolEstimate, - ObserveEntityEnum.ObjectSchoolEstimate, - ObserveEntityEnum.FloatingObjectPart, - ObserveEntityEnum.FloatingObject, - ObserveEntityEnum.ActivitySeine, - ObserveEntityEnum.Route, - ObserveEntityEnum.GearUseFeaturesMeasurementSeine, - ObserveEntityEnum.GearUseFeaturesSeine, - ObserveEntityEnum.TripSeine, + ObserveEntityEnum.ps_observation_TargetSample, + ObserveEntityEnum.ps_observation_TargetLength, + ObserveEntityEnum.ps_observation_NonTargetSample, + ObserveEntityEnum.ps_observation_NonTargetLength, + ObserveEntityEnum.ps_observation_NonTargetCatchRelease, + ObserveEntityEnum.ps_observation_NonTargetCatch, + ObserveEntityEnum.ps_observation_SetSeine, + ObserveEntityEnum.ps_observation_TargetCatch, + ObserveEntityEnum.ps_observation_TransmittingBuoy, + ObserveEntityEnum.ps_observation_ObjectObservedSpecies, + ObserveEntityEnum.ps_observation_SchoolEstimate, + ObserveEntityEnum.ps_observation_ObjectSchoolEstimate, + ObserveEntityEnum.ps_observation_FloatingObjectPart, + ObserveEntityEnum.ps_observation_FloatingObject, + ObserveEntityEnum.ps_observation_ActivitySeine, + ObserveEntityEnum.ps_observation_Route, + ObserveEntityEnum.ps_common_GearUseFeaturesMeasurementSeine, + ObserveEntityEnum.ps_common_GearUseFeaturesSeine, + ObserveEntityEnum.ps_common_TripSeine, - ObserveEntityEnum.HooksCompositionObs, - ObserveEntityEnum.BranchlinesCompositionObs, - ObserveEntityEnum.BaitsCompositionObs, - ObserveEntityEnum.FloatlinesCompositionObs, - ObserveEntityEnum.HooksCompositionLogbook, - ObserveEntityEnum.BranchlinesCompositionLogbook, - ObserveEntityEnum.BaitsCompositionLogbook, - ObserveEntityEnum.FloatlinesCompositionLogbook, - ObserveEntityEnum.SizeMeasureObs, - ObserveEntityEnum.WeightMeasureObs, - ObserveEntityEnum.SetLonglineObs, - ObserveEntityEnum.SamplePartLogbook, - ObserveEntityEnum.SampleLogbook, - ObserveEntityEnum.SetLonglineLogbook, - ObserveEntityEnum.BranchlineObs, - ObserveEntityEnum.BasketObs, - ObserveEntityEnum.SectionObs, - ObserveEntityEnum.CatchLonglineObs, - ObserveEntityEnum.CatchLonglineLogbook, - ObserveEntityEnum.TdrObs, - ObserveEntityEnum.EncounterObs, - ObserveEntityEnum.SensorUsedObs, - ObserveEntityEnum.LandingPartLongline, - ObserveEntityEnum.LandingLongline, - ObserveEntityEnum.ActivityLonglineObs, - ObserveEntityEnum.ActivityLonglineLogbook, - ObserveEntityEnum.TdrRecordObs, - ObserveEntityEnum.GearUseFeaturesMeasurementLongline, - ObserveEntityEnum.GearUseFeaturesLongline, - ObserveEntityEnum.TripLongline + ObserveEntityEnum.ll_observation_HooksCompositionObs, + ObserveEntityEnum.ll_observation_BranchlinesCompositionObs, + ObserveEntityEnum.ll_observation_BaitsCompositionObs, + ObserveEntityEnum.ll_observation_FloatlinesCompositionObs, + ObserveEntityEnum.ll_logbook_HooksCompositionLogbook, + ObserveEntityEnum.ll_logbook_BranchlinesCompositionLogbook, + ObserveEntityEnum.ll_logbook_BaitsCompositionLogbook, + ObserveEntityEnum.ll_logbook_FloatlinesCompositionLogbook, + ObserveEntityEnum.ll_observation_SizeMeasureObs, + ObserveEntityEnum.ll_observation_WeightMeasureObs, + ObserveEntityEnum.ll_observation_SetLonglineObs, + ObserveEntityEnum.ll_logbook_SamplePartLogbook, + ObserveEntityEnum.ll_logbook_SampleLogbook, + ObserveEntityEnum.ll_logbook_SetLonglineLogbook, + ObserveEntityEnum.ll_observation_BranchlineObs, + ObserveEntityEnum.ll_observation_BasketObs, + ObserveEntityEnum.ll_observation_SectionObs, + ObserveEntityEnum.ll_observation_CatchLonglineObs, + ObserveEntityEnum.ll_logbook_CatchLonglineLogbook, + ObserveEntityEnum.ll_observation_TdrObs, + ObserveEntityEnum.ll_observation_EncounterObs, + ObserveEntityEnum.ll_observation_SensorUsedObs, + ObserveEntityEnum.ll_landing_LandingPartLongline, + ObserveEntityEnum.ll_landing_LandingLongline, + ObserveEntityEnum.ll_observation_ActivityLonglineObs, + ObserveEntityEnum.ll_logbook_ActivityLonglineLogbook, + ObserveEntityEnum.ll_observation_TdrRecordObs, + ObserveEntityEnum.ll_common_GearUseFeaturesMeasurementLongline, + ObserveEntityEnum.ll_common_GearUseFeaturesLongline, + ObserveEntityEnum.ll_common_TripLongline }; /** * FIXME : cela n'est pas vrai !!! (voir l'algortihme de replication qui ===================================== persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java ===================================== @@ -272,7 +272,7 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat if (tripSeineTables == null) { log.debug("Loading tripSeineTables."); - tripSeineTables = topiaSqlTablesFactory.newReplicateEntityTables(new TripReplicateTablesPredicate(), ObserveEntityEnum.TripSeine); + tripSeineTables = topiaSqlTablesFactory.newReplicateEntityTables(new TripReplicateTablesPredicate(), ObserveEntityEnum.ps_common_TripSeine); log.info(String.format("For TripSeine, found %d tables to use.", tripSeineTables.size())); } return tripSeineTables; @@ -282,7 +282,7 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat if (tripLonglineTables == null) { log.debug("Loading tripLonglineTables."); - tripLonglineTables = topiaSqlTablesFactory.newReplicateEntityTables(new TripReplicateTablesPredicate(), ObserveEntityEnum.TripLongline); + tripLonglineTables = topiaSqlTablesFactory.newReplicateEntityTables(new TripReplicateTablesPredicate(), ObserveEntityEnum.ll_common_TripLongline); log.info(String.format("For TripLongline, found %d tables to use.", tripLonglineTables.size())); TopiaSqlTable basketTable = tripLonglineTables.getTable("ll_observation.basket"); @@ -341,12 +341,12 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat private final Set<TopiaMetadataEntity> dones = new LinkedHashSet<>(); private final Set<String> sections = ImmutableSet.of( - ObserveEntityEnum.BranchlineObs.name(), - ObserveEntityEnum.BasketObs.name(), - ObserveEntityEnum.SectionObs.name()); + ObserveEntityEnum.ll_observation_BranchlineObs.name(), + ObserveEntityEnum.ll_observation_BasketObs.name(), + ObserveEntityEnum.ll_observation_SectionObs.name()); private final Set<String> sectionsHolders = ImmutableSet.of( - ObserveEntityEnum.CatchLonglineObs.name(), - ObserveEntityEnum.TdrObs.name()); + ObserveEntityEnum.ll_observation_CatchLonglineObs.name(), + ObserveEntityEnum.ll_observation_TdrObs.name()); @Override public boolean acceptEntity(TopiaMetadataEntity metadataEntity) { @@ -360,7 +360,7 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat @Override public boolean acceptReversedAssociation(TopiaMetadataEntity metadataEntity, String propertyName, TopiaMetadataEntity propertyType) { - return !(ObserveEntityEnum.ActivityLonglineObs.name().equals(propertyType.getType()) && ObserveEntityEnum.ActivityLonglineLogbook.name().equals(metadataEntity.getType())); + return !(ObserveEntityEnum.ll_observation_ActivityLonglineObs.name().equals(propertyType.getType()) && ObserveEntityEnum.ll_logbook_ActivityLonglineLogbook.name().equals(metadataEntity.getType())); } ===================================== pom.xml ===================================== @@ -156,7 +156,7 @@ <buildDate>${maven.build.timestamp}</buildDate> <observeToolkitVersion>4.9</observeToolkitVersion> -  + <lib.version.java4all.topia>1.2-SNAPSHOT</lib.version.java4all.topia>    ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceLocal.java ===================================== @@ -109,7 +109,7 @@ public class ReferentialSynchronizeDiffServiceLocal extends ObserveServiceLocal ReferentialDataSourceStates referentialStates = new ReferentialDataSourceStates(); for (ObserveEntityEnum referenceEntity : Entities.REFERENCE_ENTITIES) { - if (ObserveEntityEnum.LastUpdateDate.equals(referenceEntity)) { + if (ObserveEntityEnum.common_LastUpdateDate.equals(referenceEntity)) { continue; } //noinspection unchecked ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/sql/SqlScriptProducerServiceLocal.java ===================================== @@ -117,7 +117,7 @@ public class SqlScriptProducerServiceLocal extends ObserveServiceLocal implement ListMultimap<Class<? extends ReferentialDtoReference>, String> referentialIds = request.getReferentialIds(); for (ObserveEntityEnum entityEnum : REFERENCE_ENTITIES_LIST) { - if (ObserveEntityEnum.LastUpdateDate.equals(entityEnum)) { + if (ObserveEntityEnum.common_LastUpdateDate.equals(entityEnum)) { continue; } Class entityType = entityEnum.getContract(); ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java ===================================== @@ -99,21 +99,21 @@ public class UnidirectionalSynchronizeReferentialTest extends ServiceLocalTestSu Assert.assertFalse(referentialNames.isEmpty()); for (ObserveEntityEnum referenceEntity : Entities.REFERENCE_ENTITIES) { - if (ObserveEntityEnum.LastUpdateDate.equals(referenceEntity)) { + if (ObserveEntityEnum.common_LastUpdateDate.equals(referenceEntity)) { continue; } - if (ObserveEntityEnum.LengthLengthParameter.equals(referenceEntity)) { + if (ObserveEntityEnum.common_LengthLengthParameter.equals(referenceEntity)) { //empty continue; } - if (ObserveEntityEnum.WeightDeterminationMethod.equals(referenceEntity)) { + if (ObserveEntityEnum.ll_common_WeightDeterminationMethod.equals(referenceEntity)) { //empty continue; - }if (ObserveEntityEnum.WeightCategoryLongline.equals(referenceEntity)) { + }if (ObserveEntityEnum.ll_common_WeightCategoryLongline.equals(referenceEntity)) { //empty continue; } - if (ObserveEntityEnum.Compagnies.equals(referenceEntity)) { + if (ObserveEntityEnum.common_Compagnies.equals(referenceEntity)) { //empty continue; } @@ -145,7 +145,7 @@ public class UnidirectionalSynchronizeReferentialTest extends ServiceLocalTestSu Assert.assertTrue(referentialNames.isEmpty()); for (ObserveEntityEnum referenceEntity : Entities.REFERENCE_ENTITIES) { - if (ObserveEntityEnum.LastUpdateDate.equals(referenceEntity)) { + if (ObserveEntityEnum.common_LastUpdateDate.equals(referenceEntity)) { continue; } Class<? extends ReferentialDto> dtoType = DbModelHelper.fromReferentialEntity(referenceEntity).toDtoType(); ===================================== test/src/main/resources/fixtures/count-referential-longline.properties ===================================== @@ -35,13 +35,13 @@ ll_common.lightstickstype=2 ll_common.linetype=9 ll_observation.maturitystatus=12 ll_common.mitigationtype=15 -ll_common.observationMethod=2 +ll_common.observationmethod=2 ll_observation.sensorbrand=4 ll_observation.sensordataformat=2 ll_observation.sensortype=4 ll_common.settingshape=6 ll_observation.stomacfullness=7 -ll_common.vesselActivity=12 +ll_common.vesselactivity=12 ll_common.weightcategory=0 ll_landing.datasource=20 ll_common.triptype=2 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/cfc5fee9b8cfdd4a738446138cb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/cfc5fee9b8cfdd4a738446138cb… You're receiving this email because of your account on gitlab.com.

1 0