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

[Git][ultreiaio/ird-observe][develop] 5 commits: Introduce Service SPI and now let's generate most of data services (this means...
by Tony CHEMIT Oct. 25, 2020

Oct. 25, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 310a8577 by Tony Chemit at 2020-10-17T16:34:01+02:00 Introduce Service SPI and now let's generate most of data services (this means developer has only to write specific method and only them)! - - - - - a6966b69 by Tony Chemit at 2020-10-18T20:35:59+02:00 Improve ContentUI actions (using new Service SPI)) - - - - - c04cc31f by Tony Chemit at 2020-10-20T01:15:15+02:00 stash - - - - - 4f7d6c87 by Tony Chemit at 2020-10-21T15:34:45+02:00 Introduce NavigationScope and his friend to have only one way to get Navigation and ContentUI metadata! - - - - - daf444f8 by Tony Chemit at 2020-10-25T19:53:21+01:00 stash new navigation api - - - - - 30 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/i18n/getters/jaxx.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/move/MoveExecutor.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/actions/move/MoveExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/move/MoveRequest.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/actions/move/MoveRequest.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/move/MoveRequestBuilder.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/actions/move/MoveRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/move/tree/DefaultMultipleMoveTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/actions/move/tree/DefaultMultipleMoveTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/move/tree/DefaultSingleMoveTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/actions/move/tree/DefaultSingleMoveTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/move/tree/MoveTreeAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/actions/move/tree/MoveTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/actions/Reset.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/actions/reset/DefaultResetAdapter.java - services/api/src/main/java/fr/ird/observe/services/service/data/ps/observation/KeptTargetCatchService.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/actions/reset/ResetAdapter.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/data/ps/observation/DiscardedTargetCatchServiceLocal.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/actions/reset/ResetExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/save/SaveAdapter.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/actions/save/SaveAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/save/SaveExecutor.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/actions/save/SaveExecutor.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/save/SaveRequest.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/actions/save/SaveRequest.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationContext.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationHandler.java - models/dto/src/main/java/fr/ird/observe/dto/data/ps/observation/KeptTargetCatchDto.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/navigation/nodes/NavigationTreeNodeSupport.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/actions/SaveEntry.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationNodes.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationScope.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/NavigationScopes.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/navigation/nodes/WithChildsToReload.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/WithChildsToReload.java - models/dto/src/main/java/fr/ird/observe/dto/data/ps/observation/KeptTargetSampleDto.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/WithReference.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/nodes/RootNavigationContext.java - services/api/src/main/java/fr/ird/observe/services/service/data/ps/observation/DiscardedTargetCatchService.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/nodes/RootNavigationHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/nodes/RootNavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/navigation/nodes/RootNavigationTreeNode.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/nodes/RootNavigationNode.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/579d46e8017f539105c0c8fd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/579d46e8017f539105c0c8fd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Still some code to remove from services-local
by Tony CHEMIT Oct. 16, 2020

Oct. 16, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 5b097333 by Tony Chemit at 2020-10-16T16:31:36+02:00 Still some code to remove from services-local - - - - - 579d46e8 by Tony Chemit at 2020-10-16T21:14:10+02:00 Introduce SaveExecutor to get some nice save actions without having to write a full class. Now just do a Save.installAction with good parameters :) - - - - - 30 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/move/MoveExecutor.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/actions/SetUISave.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/save/SaveAdapter.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/BranchlineUISave.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/save/SaveExecutor.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/logbook/actions/SetUICopyValuesAndSave.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/save/SaveRequest.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/DeleteSingle.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/DeleteEdit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/MoveSingle.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/MoveEdit.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/SaveEdit.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/SaveActionSupport.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/SaveEditUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/actions/CloseOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/actions/CreateNew.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/actions/DeleteMultiple.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/actions/OpenClose.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/ContentOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/CloseOpen.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/CloseOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/CreateNew.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/CreateNewOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/DeleteSingle.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/DeleteOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/MoveSingle.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/MoveOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/OpenClose.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/OpenOpenable.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/SaveOpenable.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/SaveActionSupport.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/SaveOpenableUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/simple/ContentSimpleUIModel.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/simple/actions/SaveSimple.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/simple/actions/SaveActionSupport.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/simple/actions/SaveSimpleUIAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/table/ContentTableUITableModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/actions/Delete.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripUIHandler.java - − client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/actions/TripUISave.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/landing/LandingUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/66d4b8b6db2b1d4b3425d683… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/66d4b8b6db2b1d4b3425d683… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 15 commits: Add nice method to avoid java generic erasure :)
by Tony CHEMIT Oct. 16, 2020

Oct. 16, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 972120ec by Tony Chemit at 2020-10-12T21:06:38+02:00 Add nice method to avoid java generic erasure :) - - - - - 541c8229 by Tony Chemit at 2020-10-13T02:38:44+02:00 On ne demande plus de créer la base locale au démarrage si elle n'existe pas. - - - - - ce2bdda3 by Tony Chemit at 2020-10-13T03:06:40+02:00 Les mesures d'équipements ne sont pas enregistrées tant que le formulaire globale ne l'est pas! - - - - - a4e36e6f by Tony Chemit at 2020-10-13T03:08:16+02:00 Nettoyage sur les paramètres et noms dans méthodes dans les services - - - - - 6a25fc37 by Tony Chemit at 2020-10-13T03:13:04+02:00 Réusinage des actions, encore des tests à faire... - - - - - ed8ae8d8 by Tony Chemit at 2020-10-13T16:40:35+02:00 Add new method to exclude on reference - - - - - 1055b243 by Tony Chemit at 2020-10-13T16:41:01+02:00 Add missing constant property - - - - - 3d54436b by Tony Chemit at 2020-10-14T16:36:03+02:00 Association parent can also be on a referential (See Trip for example) - - - - - ad738471 by Tony Chemit at 2020-10-14T16:36:54+02:00 Improve DtoReferenceCollection API - - - - - 88369353 by Tony Chemit at 2020-10-14T16:38:25+02:00 Introduce TripAwareTopiaDao contract and improve TripAware API to mutualise code (sse next commit) - - - - - 5134accb by Tony Chemit at 2020-10-14T18:47:02+02:00 update pom - - - - - f9152ef3 by Tony Chemit at 2020-10-14T19:04:46+02:00 Introduce OpenableDataService, save us a lots of code for the future and also normalize service method names. Should declare to or three more such services to avoid any boilerplate code :) - - - - - b1f787b0 by Tony Chemit at 2020-10-16T14:55:42+02:00 Improve ProjectPackagesDefinition API (now just a simple bean loaded from a properties file) → This makes us free to remove one module: modesl-dto-psi Move to toolkit-dto SimpleDto and common type translators Introduce new WithDataFile API (to have a common code for this) Introduce new data service contracts (now any data service inherits from one of them) Implements data service local and reduce all the service local at the very strict minimum (only specific code!!!) - - - - - b985f0e5 by Tony Chemit at 2020-10-16T14:57:00+02:00 Review Move API Introduce common WithDataFile actions - - - - - 66d4b8b6 by Tony Chemit at 2020-10-16T15:50:48+02:00 Remove as done for dto, models-persistence-spi maven module :) - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/util/ObserveKeyStrokesSupport.java - − client/core/src/main/resources/icons/action-move-activities.png - − client/core/src/main/resources/icons/action-move-landings.png - − client/core/src/main/resources/icons/action-move-routes.png - − client/core/src/main/resources/icons/action-move-samples.png - − client/core/src/main/resources/icons/action-move-trips.png - + client/core/src/main/resources/icons/action-move.png - client/core/src/main/resources/observe-ui.properties - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorHelper.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/move/MoveExecutor.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/move/MoveRequest.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/move/MoveRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/actions/DefaultMoveMultipleDataRequest.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/move/tree/DefaultMultipleMoveTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/DefaultMoveSingleDataRequest.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/move/tree/DefaultSingleMoveTreeAdapter.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/move/tree/MoveTreeAdapter.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/actions/SelectNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/actions/ShowTechnicalInformation.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUIModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/SensorUsedUIActionSupport.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/ContentEditUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/DeleteActionSupport.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/DeleteSingle.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/MoveSingle.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/SaveActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/ContentListUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/ContentListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/ContentListUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/ContentListUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/ui/ContentListUIObserveLayoutFocusTraversalPolicy.java → client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/list/ContentListUIObserveLayoutFocusTraversalPolicy.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/af0065c96901dc45db09c484… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/af0065c96901dc45db09c484… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Review tree api layout (prepare for new ui generation)...
by Tony CHEMIT Oct. 9, 2020

Oct. 9, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 71aad4d9 by Tony Chemit at 2020-10-06T18:26:43+02:00 Review tree api layout (prepare for new ui generation)... - - - - - 43da725c by Tony Chemit at 2020-10-09T17:16:15+02:00 Use last stable of jaxx - - - - - af0065c9 by Tony Chemit at 2020-10-09T17:16:15+02:00 First pass of generating ui i18n keys - - - - - 30 changed files: - client/core/src/main/i18n/getters/java.getter - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/actions/SelectData.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Prepare.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePane.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePaneHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/DataSelectionTreePaneActionSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/RegisterCopy.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/RegisterDelete.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/ObsoleteReferentialReferenceListCellRenderer.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/SynchroUIActionSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/task/SwingReferentialSynchronizeTask.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/actions/RegisterTaskActionSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/node/ReferentialTypeSynchroNode.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateEntityListCellRenderer.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/Start.java - client/datasource/editor/api/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0e3ee07f4dce1bbbb02e5fbb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/0e3ee07f4dce1bbbb02e5fbb… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Missing disabled programs in selection tree
by Tony CHEMIT Oct. 6, 2020

Oct. 6, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6d9202de by Tony Chemit at 2020-10-06T13:31:33+02:00 Missing disabled programs in selection tree - - - - - 669278c9 by Tony Chemit at 2020-10-06T13:31:46+02:00 oups this file should not be persisted - - - - - 467d7ed1 by Tony Chemit at 2020-10-06T14:58:50+02:00 Make public BusinessProject API - - - - - 395919ea by Tony Chemit at 2020-10-06T15:02:27+02:00 Clean server-i18n bundle - - - - - bdc9cf22 by Tony Chemit at 2020-10-06T15:08:42+02:00 Realign i18n on ui tree before generating everything :) - - - - - 0e3ee07f by Tony Chemit at 2020-10-06T17:43:19+02:00 Review tree api layout (prepare for new ui generation)... - - - - - 30 changed files: - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUI.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/actions/SelectData.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Prepare.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/DataSynchroUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePane.jaxx - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/DataSelectionTreePaneHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/DataSelectionTreePaneActionSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/RegisterCopy.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/tree/actions/RegisterDelete.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/Start.java - − client/datasource/actions/target/generated-sources/i18n/fr/ird/observe/ClientDatasourceActionsI18nModuleDefinition.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditor.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/DataSourceEditorHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/actions/ContentUIActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/actions/GoDown.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/actions/GoUp.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/actions/Reset.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/actions/SelectNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/DeleteActionSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/SaveActionSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bbd49a0ddb72e3600f82ff2a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bbd49a0ddb72e3600f82ff2a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Fix template
by Tony CHEMIT Oct. 6, 2020

Oct. 6, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 47338f88 by Tony Chemit at 2020-10-06T11:43:25+02:00 Fix template - - - - - bbd49a0d by Tony Chemit at 2020-10-06T13:10:32+02:00 Review maven module layout extreme! but keep same logic everywhere. - - - - - 30 changed files: - .gitignore - client/configuration/pom.xml - client/core/pom.xml - client/core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl - client/core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - client/core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl - − client/datasource-actions/pom.xml - − client/datasource-actions/src/main/i18n/templates/validationReport_en_GB.ftl - − client/datasource-actions/src/main/i18n/templates/validationReport_es_ES.ftl - − client/datasource-actions/src/main/i18n/templates/validationReport_fr_FR.ftl - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminActionModel.java - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminActionWorker.java - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminActionWorkerListener.java - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminStep.java - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jaxx - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUI.jcss - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminTabUIHandler.java - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jaxx - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUI.jcss - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIHandler.java - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIModel.java - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminTabUIActionSupport.java - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/AdminUIActionSupport.java - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/Cancel.java - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/Close.java - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/CopyToClipBoard.java - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/NextStep.java - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/PreviousStep.java - − client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/ConfigModel.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f3d6030a0a8e6e6759577c16… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f3d6030a0a8e6e6759577c16… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Review Persistence SPI API (No more DbModelHelper, replaced by PersistenceBusinessProject
by Tony CHEMIT Oct. 6, 2020

Oct. 6, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f3d6030a by Tony Chemit at 2020-10-06T11:29:48+02:00 Review Persistence SPI API (No more DbModelHelper, replaced by PersistenceBusinessProject - - - - - 30 changed files: - models/dto/pom.xml - models/persistence/pom.xml - models/persistence/src/main/java/fr/ird/observe/entities/referential/DuplicateLengthLengthParameterException.java - models/persistence/src/main/java/fr/ird/observe/entities/referential/DuplicateLengthWeightParameterException.java - models/persistence/src/main/java/fr/ird/observe/entities/referential/LengthLengthParameterNotFoundException.java - models/persistence/src/test/java/fr/ird/observe/dto/decoration/DecoratorServiceTest.java - models/persistence/src/test/java/fr/ird/observe/entities/ObserveTopiaApplicationContextTest.java - models/persistence/src/test/java/fr/ird/observe/entities/spi/AssociationsTest.java - models/persistence/src/test/java/fr/ird/observe/entities/spi/EntitySqlDescriptorTest.java - models/persistence/src/test/java/fr/ird/observe/entities/spi/DbModelHelperTest.java → models/persistence/src/test/java/fr/ird/observe/entities/spi/ObservePersistenceBusinessProjectTest.java - models/persistence/src/test/java/fr/ird/observe/entities/spi/TablesTest.java - − models/persistence/src/test/java/fr/ird/observe/spi/DbModelHelperTest.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/LastUpdateDateServiceLocal.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/ObserveServiceLocal.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceLocal.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlListRequestBuilder.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/sql/WithCascadeStatementGenerator.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/actions/validate/EntityInterceptor.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocal.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocal.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/referential/ReferentialShellBuilder.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/sql/SqlScriptProducerServiceLocal.java - services/local-impl/src/main/java/fr/ird/observe/services/local/service/usage/UsageServiceLocal.java - services/local-impl/src/test/java/fr/ird/observe/services/local/service/ServiceLocalTestSupport.java - services/local-impl/src/test/java/fr/ird/observe/services/local/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java - services/local-impl/src/test/java/fr/ird/observe/services/local/service/referential/ReferentialServiceLocalTest.java - toolkit/dto/src/main/java/fr/ird/observe/dto/reference/DtoReference.java - toolkit/persistence/pom.xml - toolkit/persistence/src/main/java/fr/ird/observe/entities/Entity.java - toolkit/persistence/src/main/java/fr/ird/observe/entities/EntityHelper.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f3d6030a0a8e6e6759577c16d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/f3d6030a0a8e6e6759577c16d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Remove Generics on DtoReference API (so lighter :))
by Tony CHEMIT Oct. 5, 2020

Oct. 5, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 20bb7764 by Tony Chemit at 2020-10-05T21:08:59+02:00 Remove Generics on DtoReference API (so lighter :)) Now we should make a last pass, since since some different ways of mapping dto and references... we should uniformize this. - - - - - 30 changed files: - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataModel.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/pairing/ll/tree/ActivityLlPairingTreeTable.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Apply.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/actions/Start.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/data/task/DataSynchronizeTaskSupport.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/ObsoleteReferentialReference.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeUIHandler.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/Apply.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroModel.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchronizeResources.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/task/SwingWithReplaceDataTask.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/actions/RegisterDeactivateWithReplacement.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/actions/RegisterDelete.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/actions/RegisterTaskActionSupport.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateModel.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateUI.jaxx - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/ValidateUIHandler.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/validate/actions/Start.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIInitializer.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/actions/SelectNode.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUI.jaxx - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUIHandler.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUIInitializer.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUILayoutFocusTraversalPolicy.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUIModel.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/DeleteActionSupport.java - − client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/DeleteActionSupport.java_95141346949899 The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/20bb7764df5e55142690a4410… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/20bb7764df5e55142690a4410… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Remove DtoModelHelper and improve BusinessProject to replace it.
by Tony CHEMIT Oct. 5, 2020

Oct. 5, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 59fe52a4 by Tony Chemit at 2020-10-05T16:33:31+02:00 Remove DtoModelHelper and improve BusinessProject to replace it. Still need to do the same on persistence module - - - - - 30 changed files: - client/configuration/src/main/resources/log4j2.xml - client/configuration/src/main/resources/observe-log4j2.xml - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroModel.java - client/datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIHandler.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/ContentEditUIModel.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/edit/actions/SaveActionSupport.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/MoveSingleActionSupport.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/open/actions/SaveActionSupport.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/data/simple/ContentSimpleUIModel.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferentialUIHandler.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ContentReferentialUIModel.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/actions/Delete.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/actions/Save.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/usage/UsageUIHandlerSupport.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/spi/ContentUIReferenceCache.java - client/datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/NavigationTree.java - client/datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/data/TripActionHelper.java - client/datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/CatchUIHandler.java - client/datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/SetDetailCompositionUIHandler.java - client/datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/observation/actions/BranchlineUISave.java - client/datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIModel.java - client/datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/NonTargetCatchUIHandler.java - client/datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetCatchUIHandler.java - client/datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetDiscardCatchUIHandler.java - client/datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/TargetSampleUIHandler.java - models/dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripDto.java - models/dto/src/main/java/fr/ird/observe/dto/data/ps/observation/RouteDto.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/59fe52a42a2c7cd07584b2905… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/59fe52a42a2c7cd07584b2905… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Review maven modules layout :
by Tony CHEMIT Oct. 4, 2020

Oct. 4, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 64426cb5 by Tony Chemit at 2020-10-04T13:32:36+02:00 Review maven modules layout : * one module for tests * one module for models * one module for services * one module for client * one module for server - - - - - 30 changed files: - .gitignore - − client-configuration/pom.xml - − client-configuration/src/main/filtered-resources/observe-application.properties - − client-configuration/src/main/i18n/templates/about_en_GB.ftl - − client-configuration/src/main/i18n/templates/about_es_ES.ftl - − client-configuration/src/main/i18n/templates/about_fr_FR.ftl - − client-configuration/src/main/java/fr/ird/observe/client/ClientConfigFinderInstance.java - − client-configuration/src/main/java/fr/ird/observe/client/ObServeSwingSessionConfig.java - − client-configuration/src/main/java/fr/ird/observe/client/ObserveClientResourceManager.java - − client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - − client-configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfigFinder.java - − client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfig.java - − client-configuration/src/main/java/fr/ird/observe/client/configuration/NavigationTreeConfigBean.java - − client-configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/AcquisitionMode.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/CatchAcquisitionMode.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/ConnexionStatus.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/CreationMode.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/DbMode.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/ProgramObservation.java - − client-configuration/src/main/java/fr/ird/observe/client/constants/ValidationModelMode.java - − client-configuration/src/main/java/fr/ird/observe/client/datasource/dcp/FloatingObjectPresetsManager.java - − client-configuration/src/main/resources/log4j2.xml - − client-configuration/src/main/resources/observe-log4j2.xml - − client-configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - − client-core/pom.xml - − client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl - − client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl - − client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl - − client-core/src/main/i18n/templates/initStorage_en_GB.ftl The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/64426cb52cfdd92000fa24d44… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/64426cb52cfdd92000fa24d44… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Remove unused API (replaced by BusinessProject API)
by Tony CHEMIT Oct. 4, 2020

Oct. 4, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 366e6b1f by Tony Chemit at 2020-10-04T09:35:27+02:00 Remove unused API (replaced by BusinessProject API) - - - - - 3 changed files: - − common-dto/src/main/java/fr/ird/observe/dto/model/AggregateDtoModel.java - − common-dto/src/main/java/fr/ird/observe/dto/model/DtoModel.java - − common-dto/src/main/java/fr/ird/observe/dto/model/DtoModelSupport.java Changes: ===================================== common-dto/src/main/java/fr/ird/observe/dto/model/AggregateDtoModel.java deleted ===================================== @@ -1,82 +0,0 @@ -package fr.ird.observe.dto.model; - -/*- - * #%L - * ObServe Toolkit :: Common Dto - * %% - * Copyright (C) 2008 - 2020 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 com.google.common.collect.ImmutableSet; -import fr.ird.observe.dto.data.DataDto; -import fr.ird.observe.dto.referential.ReferentialDto; -import io.ultreia.java4all.util.ServiceLoaders; - -import java.util.ServiceLoader; - -/** - * Created by tchemit on 26/05/2018. - * - * @author Tony Chemit - dev(a)tchemit.fr - */ -public abstract class AggregateDtoModel implements DtoModel { - - private static AggregateDtoModel instance; - private final String name; - private final ImmutableSet<DtoModel> models; - private final ImmutableSet<Class<? extends ReferentialDto>> referentialTypes; - private final ImmutableSet<Class<? extends DataDto>> dataTypes; - - protected AggregateDtoModel(String name) { - this.name = name; - ImmutableSet.Builder<DtoModel> modelsBuilder = ImmutableSet.builder(); - ImmutableSet.Builder<Class<? extends ReferentialDto>> referentialTypes = ImmutableSet.builder(); - ImmutableSet.Builder<Class<? extends DataDto>> dataTypes = ImmutableSet.builder(); - for (DtoModel dtoModel : ServiceLoader.load(DtoModel.class)) { - modelsBuilder.add(dtoModel); - referentialTypes.addAll(dtoModel.getReferentialTypes()); - dataTypes.addAll(dtoModel.getDataTypes()); - } - this.referentialTypes = referentialTypes.build(); - this.dataTypes = dataTypes.build(); - this.models = modelsBuilder.build(); - } - - public static synchronized AggregateDtoModel get() { - return instance == null ? instance = ServiceLoaders.loadUniqueService(AggregateDtoModel.class) : instance; - } - - @Override - public String getName() { - return name; - } - - @Override - public ImmutableSet<Class<? extends ReferentialDto>> getReferentialTypes() { - return referentialTypes; - } - - @Override - public ImmutableSet<Class<? extends DataDto>> getDataTypes() { - return dataTypes; - } - - public ImmutableSet<DtoModel> getModels() { - return models; - } -} ===================================== common-dto/src/main/java/fr/ird/observe/dto/model/DtoModel.java deleted ===================================== @@ -1,41 +0,0 @@ -package fr.ird.observe.dto.model; - -/*- - * #%L - * ObServe Toolkit :: Common Dto - * %% - * Copyright (C) 2008 - 2020 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 com.google.common.collect.ImmutableSet; -import fr.ird.observe.dto.data.DataDto; -import fr.ird.observe.dto.referential.ReferentialDto; - -/** - * Created by tchemit on 26/05/2018. - * - * @author Tony Chemit - dev(a)tchemit.fr - */ -public interface DtoModel { - - String getName(); - - ImmutableSet<Class<? extends ReferentialDto>> getReferentialTypes(); - - ImmutableSet<Class<? extends DataDto>> getDataTypes(); -} ===================================== common-dto/src/main/java/fr/ird/observe/dto/model/DtoModelSupport.java deleted ===================================== @@ -1,61 +0,0 @@ -package fr.ird.observe.dto.model; - -/*- - * #%L - * ObServe Toolkit :: Common Dto - * %% - * Copyright (C) 2008 - 2020 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 com.google.common.collect.ImmutableSet; -import fr.ird.observe.dto.data.DataDto; -import fr.ird.observe.dto.referential.ReferentialDto; - -/** - * Created by tchemit on 26/05/2018. - * - * @author Tony Chemit - dev(a)tchemit.fr - */ -public class DtoModelSupport implements DtoModel { - - private final String name; - - private final ImmutableSet<Class<? extends ReferentialDto>> referentialTypes; - private final ImmutableSet<Class<? extends DataDto>> dataTypes; - - public DtoModelSupport(String name, ImmutableSet<Class<? extends ReferentialDto>> referentialTypes, ImmutableSet<Class<? extends DataDto>> dataTypes) { - this.name = name; - this.referentialTypes = referentialTypes; - this.dataTypes = dataTypes; - } - - @Override - public String getName() { - return name; - } - - @Override - public ImmutableSet<Class<? extends ReferentialDto>> getReferentialTypes() { - return referentialTypes; - } - - @Override - public ImmutableSet<Class<? extends DataDto>> getDataTypes() { - return dataTypes; - } -} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/366e6b1ff9a29a0b8b47d7f84… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/366e6b1ff9a29a0b8b47d7f84… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Introduce, generate and use BusinessProject API.
by Tony CHEMIT Oct. 3, 2020

Oct. 3, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 223f1d1b by Tony Chemit at 2020-10-03T18:10:58+02:00 Introduce, generate and use BusinessProject API. This replace hardcoded types lists (that you should update when adding new dto types :)) This must be finished by replacing old DtoModelHelper by the new brand generated BusinessProject with just method to get some types mapping, so no more usage of an application component (this will simplify a lots of things). Stash/stash - - - - - 30 changed files: - client-core/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/Start.java - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/Start.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ContentUIModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ReferentialHomeUIModel.java - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/selection/SelectionTreeModel.java - client-datasource-editor-common/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/common/ReferentialHomeCommonUIModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ll/common/TripMapContentBuilder.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ll/common/ReferentialHomeUIModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ll/landing/ReferentialHomeUIModel.java - client-datasource-editor-ll/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ll/observation/ReferentialHomeUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/TripMapContentBuilder.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/common/ReferentialHomeSeineCommonUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/observation/ReferentialHomeSeineObsUIModel.java - common-dto/src/main/java/fr/ird/observe/dto/decoration/I18nDecoratorHelper.java - common-dto/src/main/java/fr/ird/observe/spi/ProjectPackagesDefinition.java - + common-dto/src/main/java/fr/ird/observe/spi/module/BusinessDataPackage.java - + common-dto/src/main/java/fr/ird/observe/spi/module/BusinessModule.java - + common-dto/src/main/java/fr/ird/observe/spi/module/BusinessPackage.java - + common-dto/src/main/java/fr/ird/observe/spi/module/BusinessProject.java - + common-dto/src/main/java/fr/ird/observe/spi/module/BusinessReferentialPackage.java - + common-dto/src/main/java/fr/ird/observe/spi/module/BusinessSubModule.java - dto/src/main/java/fr/ird/observe/dto/data/TripAware.java - − dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - dto/src/test/java/fr/ird/observe/spi/DtoModelHelperTest.java → dto/src/test/java/fr/ird/observe/spi/module/ObserveBusinessProjectTest.java - persistence/src/test/java/fr/ird/observe/dto/decoration/DecoratorServiceTest.java - persistence/src/test/java/fr/ird/observe/entities/spi/DbModelHelperTest.java - persistence/src/test/java/fr/ird/observe/spi/DbModelHelperTest.java - services-api/src/main/java/fr/ird/observe/services/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeEngine.java - services-local/src/main/java/fr/ird/observe/services/local/service/LastUpdateDateServiceLocal.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/223f1d1b173704d70152f8f80… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/223f1d1b173704d70152f8f80… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Optimisation de la migration 8.0 - Closes #1623
by Tony CHEMIT Oct. 1, 2020

Oct. 1, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f9ecef15 by Tony Chemit at 2020-10-01T16:28:03+02:00 Optimisation de la migration 8.0 - Closes #1623 - - - - - 33d9fc7d by Tony Chemit at 2020-10-01T16:28:03+02:00 Figer tous les lastUpdate et topiaCreateDate dans les scripts de migration - See #1593 On pose au 1er octobre 2020 pour la v8.0 (See also #1623) - - - - - 30 changed files: - client-datasource-editor-api/src/main/java/fr/ird/observe/client/datasource/editor/tree/selection/nodes/TripSeineSelectionTreeNode.java - client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/03-update-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/observation/01-deployment-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/observation/02-removal-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/observation/03-update-preset.yml - client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/TripUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/common/TripUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/dcp/FloatingObjectPartLegendTreeCellRenderer.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/dcp/FloatingObjectPartsTreeNode.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/dcp/FloatingObjectPartsTreeTable.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/dcp/FloatingObjectPartsTreeTableModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/observation/ObjectMaterialUI.jaxx → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/common/ObjectMaterialUI.jaxx - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/observation/ObjectMaterialUI.jcss → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/common/ObjectMaterialUI.jcss - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/observation/ObjectMaterialUIHandler.java → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/common/ObjectMaterialUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/observation/ObjectMaterialUIModel.java → client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/ref/ps/common/ObjectMaterialUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/tree/navigation/nodes/data/ps/common/TripSeineNavigationTreeNode.java - dto/src/main/i18n/getters/eugene.getter - dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripDto.java - dto/src/main/java/fr/ird/observe/dto/data/ps/dcp/FloatingObjectPreset.java - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ps/observation/ObjectMaterialReferenceDecorator.java → dto/src/main/java/fr/ird/observe/dto/decoration/decorators/ps/common/ObjectMaterialReferenceDecorator.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/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialDto.java → dto/src/main/java/fr/ird/observe/dto/referential/ps/common/ObjectMaterialDto.java - dto/src/main/java/fr/ird/observe/dto/referential/ps/observation/ObjectMaterialHelper.java → dto/src/main/java/fr/ird/observe/dto/referential/ps/common/ObjectMaterialHelper.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9841ce6310f020f1003c0df4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9841ce6310f020f1003c0df4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Figer tous les lastUpdate et topiaCreateDate dans les scripts de migration - See #1593
by Tony CHEMIT Oct. 1, 2020

Oct. 1, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9841ce63 by Tony Chemit at 2020-10-01T14:40:51+02:00 Figer tous les lastUpdate et topiaCreateDate dans les scripts de migration - See #1593 On pose au 1er octobre 2020 pour la v8.0 (See also #1623) - - - - - 27 changed files: - persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_0.java - persistence/src/main/resources/db/migration/8.0/01_move_wind_referential-H2.sql - persistence/src/main/resources/db/migration/8.0/01_move_wind_referential-PG.sql - persistence/src/main/resources/db/migration/8.0/02_wind_i18n-common.sql - persistence/src/main/resources/db/migration/8.0/03_update_vesseltype-common.sql - persistence/src/main/resources/db/migration/8.0/04_update_person2-common.sql - persistence/src/main/resources/db/migration/8.0/05_rename_tripType-common.sql - persistence/src/main/resources/db/migration/8.0/06_fill_vessel_activity-common.sql - persistence/src/main/resources/db/migration/8.0/07_add_weight_determination_method-common.sql - persistence/src/main/resources/db/migration/8.0/08_add_weight_category-common.sql - persistence/src/main/resources/db/migration/8.0/09_add_compagnies-common.sql - persistence/src/main/resources/db/migration/8.0/10_add_length_measure_method-common.sql - persistence/src/main/resources/db/migration/8.0/11_add_weight_measure_method-common.sql - persistence/src/main/resources/db/migration/8.0/12_add_conservation-common.sql - persistence/src/main/resources/db/migration/8.0/13_add_on_board_processing-common.sql - persistence/src/main/resources/db/migration/8.0/14_add_data_source-common.sql - persistence/src/main/resources/db/migration/8.0/16_rename_seine_weight_category-common.sql - persistence/src/main/resources/db/migration/8.0/17_add_trip_type-common.sql - persistence/src/main/resources/db/migration/8.0/19_add_longline_trip_species_list-common.sql - persistence/src/main/resources/db/migration/8.0/20_update_referential_longline_line_type-common.sql - persistence/src/main/resources/db/migration/8.0/40_ps_common_fill-common.sql - persistence/src/main/resources/db/migration/8.0/80_ll_logbook_create-common.sql - persistence/src/main/resources/db/migration/8.0/90_ll_landing_fill-common.sql - persistence/src/main/resources/db/migration/8.0/90_ll_landing_finalize-common.sql - test/src/main/resources/db/8.0/dataForTestLongline.sql.gz - test/src/main/resources/db/8.0/dataForTestSeine.sql.gz - test/src/main/resources/db/8.0/referentiel.sql.gz Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_8_0.java ===================================== @@ -44,7 +44,7 @@ public class DataSourceMigrationForVersion_8_0 extends MigrationVersionResource public DataSourceMigrationForVersion_8_0() { super(Versions.valueOf("8.0")); - ObserveTopiaMigrationServiceAskUserToMigrate.createResourceScriptVariables(this, "2020-08-01", "2020-08-01 10:57:53.455000"); + ObserveTopiaMigrationServiceAskUserToMigrate.createResourceScriptVariables(this, "2020-10-01", "2020-10-01 00:00:00.000000"); } @Override ===================================== persistence/src/main/resources/db/migration/8.0/01_move_wind_referential-H2.sql ===================================== @@ -32,7 +32,7 @@ ALTER TABLE OBSERVE_COMMON.Wind ALTER COLUMN NEEDCOMMENT SET NOT NULL; ALTER TABLE OBSERVE_COMMON.Wind ADD CONSTRAINT PK_WIND PRIMARY KEY(topiaid); UPDATE OBSERVE_COMMON.Wind SET TOPIAVERSION = TOPIAVERSION +1; -UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET LASTUPDATEDATE = CURRENT_TIMESTAMP WHERE TYPE ='fr.ird.observe.entities.referentiel.Wind'; +UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET LASTUPDATEDATE = ${CURRENT_TIMESTAMP} WHERE TYPE ='fr.ird.observe.entities.referentiel.Wind'; DROP INDEX IF EXISTS idx_observe_seine_activity_wind; UPDATE OBSERVE_SEINE.Activity SET Wind = replace(Wind, '.seine', ''); ===================================== persistence/src/main/resources/db/migration/8.0/01_move_wind_referential-PG.sql ===================================== @@ -24,7 +24,7 @@ ALTER TABLE OBSERVE_SEINE.Wind SET SCHEMA OBSERVE_COMMON; UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET TYPE = replace(TYPE, '.seine.Wind', '.Wind'); UPDATE OBSERVE_COMMON.Wind SET TOPIAVERSION = TOPIAVERSION +1; -UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET LASTUPDATEDATE = CURRENT_TIMESTAMP WHERE TYPE ='fr.ird.observe.entities.referentiel.Wind'; +UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET LASTUPDATEDATE = ${CURRENT_TIMESTAMP} WHERE TYPE ='fr.ird.observe.entities.referentiel.Wind'; DROP INDEX IF EXISTS idx_observe_seine_activity_wind; UPDATE OBSERVE_SEINE.Activity SET Wind = replace(Wind, '.seine', ''); ===================================== persistence/src/main/resources/db/migration/8.0/02_wind_i18n-common.sql ===================================== @@ -33,4 +33,4 @@ UPDATE Observe_common.Wind SET LABEL2='Tempête (Très grosses lames, visibilit UPDATE Observe_common.Wind SET LABEL2='Violente tempête (Lames exceptionnellement hautes, visibilité très réduite)', LABEL1='Violent storm', LABEL3='Temporal muy duro (Olas excepcionalmente grandes, mar completamente blanca, visibilidad muy reducida)' WHERE CODE='11'; UPDATE Observe_common.Wind SET LABEL2='Ouragan (Mer blanche, air plein d''écume, visibilité nulle)', LABEL1='Hurricane force', LABEL3='Temporal huracanado (Olas excepcionalmente grandes, mar blanca, visibilidad nula)' WHERE CODE='12'; UPDATE Observe_common.Wind SET TOPIAVERSION = TOPIAVERSION +1; -UPDATE Observe_common.LASTUPDATEDATE SET LASTUPDATEDATE = CURRENT_TIMESTAMP WHERE TYPE ='fr.ird.observe.entities.referentiel.Wind'; +UPDATE Observe_common.LASTUPDATEDATE SET LASTUPDATEDATE = ${CURRENT_TIMESTAMP} WHERE TYPE ='fr.ird.observe.entities.referentiel.Wind'; ===================================== persistence/src/main/resources/db/migration/8.0/03_update_vesseltype-common.sql ===================================== @@ -19,5 +19,5 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -INSERT INTO observe_common.VesselType(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.VesselType#666#1' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, null,'Industrial longliner', 'Palangrier industriel','Palangrero industrial'); -INSERT INTO observe_common.VesselType(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.VesselType#666#2' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, null,'Semi industrial longliner', 'Palangrier semi industriel','Palangreros semindustriales'); +INSERT INTO observe_common.VesselType(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.VesselType#666#1' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, null,'Industrial longliner', 'Palangrier industriel','Palangrero industrial'); +INSERT INTO observe_common.VesselType(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.VesselType#666#2' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, null,'Semi industrial longliner', 'Palangrier semi industriel','Palangreros semindustriales'); ===================================== persistence/src/main/resources/db/migration/8.0/04_update_person2-common.sql ===================================== @@ -19,29 +19,29 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#01' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Stephen', 'Andy', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#02' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Vidot', 'Agnes', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#03' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Boniface', 'Breta', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#04' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Theresine', 'Bernard', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#05' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Valentin', 'Bahiri', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#06' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Julienne', 'Cynthia', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#07' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Melanie', 'Cindy', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#08' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Sopha', 'Davis', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#09' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Augustin', 'Emilie', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#10' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Rose', 'Hendricka', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#11' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Melanie', 'Julienne', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#12' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Sinon', 'James', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#13' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Sinon', 'Marie-Claire', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#14' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Savy', 'Marie Stella', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#15' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Bamboche', 'Nattyfa', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#16' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Pothin', 'Nikita', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#17' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Dogley', 'Ruby', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#18' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Quatre', 'Ron', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#19' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Ramkalawan', 'Relix', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#20' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Claude', 'Samantha', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#21' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Pillay', 'Sandra', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#22' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Labrosse', 'Valentina', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#23' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Lagrenade', 'Vanessa', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#24' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Savy', 'Vincent', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); -INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#25' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, true, 'Perikanan', 'Pengawas', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Stephen', 'Andy', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Vidot', 'Agnes', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#03' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Boniface', 'Breta', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#04' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Theresine', 'Bernard', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#05' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Valentin', 'Bahiri', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#06' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Julienne', 'Cynthia', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#07' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Melanie', 'Cindy', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#08' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Sopha', 'Davis', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#09' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Augustin', 'Emilie', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#10' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Rose', 'Hendricka', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#11' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Melanie', 'Julienne', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#12' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Sinon', 'James', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#13' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Sinon', 'Marie-Claire', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#14' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Savy', 'Marie Stella', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#15' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Bamboche', 'Nattyfa', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#16' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Pothin', 'Nikita', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#17' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Dogley', 'Ruby', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#18' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Quatre', 'Ron', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#19' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Ramkalawan', 'Relix', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#20' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Claude', 'Samantha', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#21' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Pillay', 'Sandra', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#22' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Labrosse', 'Valentina', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#23' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Lagrenade', 'Vanessa', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#24' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Savy', 'Vincent', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); +INSERT INTO observe_common.Person(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, dataSource, lastname, firstname, country) values ('fr.ird.observe.entities.referentiel.Person#666#25' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, true, 'Perikanan', 'Pengawas', 'fr.ird.observe.entities.referentiel.Country#1239832675593#0.3601938043845213'); ===================================== persistence/src/main/resources/db/migration/8.0/05_rename_tripType-common.sql ===================================== @@ -24,7 +24,7 @@ UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET TYPE = replace(TYPE, '.longline.TripTyp ALTER TABLE OBSERVE_LONGLINE.TripType RENAME TO ObservationMethod; ALTER TABLE observe_longline.ObservationMethod ADD CONSTRAINT PK_ObservationMethod PRIMARY KEY(topiaid); UPDATE OBSERVE_LONGLINE.ObservationMethod SET TOPIAVERSION = TOPIAVERSION + 1; -UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET LASTUPDATEDATE = CURRENT_TIMESTAMP WHERE TYPE ='fr.ird.observe.entities.referentiel.longline.ObservationMethod'; +UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET LASTUPDATEDATE = ${CURRENT_TIMESTAMP} WHERE TYPE ='fr.ird.observe.entities.referentiel.longline.ObservationMethod'; DROP INDEX IF EXISTS idx_observe_longline_trip_tripType; UPDATE OBSERVE_LONGLINE.Trip SET tripType = replace(tripType, '.TripType', '.ObservationMethod'); ===================================== persistence/src/main/resources/db/migration/8.0/06_fill_vessel_activity-common.sql ===================================== @@ -19,11 +19,11 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -INSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#666#01' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'CRUISE', 'Cruising', 'Route','Route #TODO'); -INSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#666#02' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'DRIFT', 'Drifting', 'En dérive','En dérive #TODO'); -INSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#666#03' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'PORT', 'At port', 'Au port','Au port #TODO'); -INSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#666#04' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'OUTZEE', 'Out of national EEZ', 'Hors ZEE nationale','Hors ZEE nationale #TODO'); -INSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#666#05' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'REPAIR', 'Under repair', 'En réparation','En réparation #TODO'); -INSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#666#06' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'TRANSSHIP', 'Transshipment', 'Transbordement','Transbordement #TODO'); -INSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#666#07' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'UNK', 'Unknown', 'Inconnue','Inconnue #TODO'); -UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET LASTUPDATEDATE = CURRENT_TIMESTAMP WHERE TYPE ='fr.ird.observe.entities.referentiel.longline.VesselActivityLongline'; +INSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#666#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'CRUISE', 'Cruising', 'Route','Route #TODO'); +INSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#666#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'DRIFT', 'Drifting', 'En dérive','En dérive #TODO'); +INSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#666#03' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'PORT', 'At port', 'Au port','Au port #TODO'); +INSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#666#04' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'OUTZEE', 'Out of national EEZ', 'Hors ZEE nationale','Hors ZEE nationale #TODO'); +INSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#666#05' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'REPAIR', 'Under repair', 'En réparation','En réparation #TODO'); +INSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#666#06' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'TRANSSHIP', 'Transshipment', 'Transbordement','Transbordement #TODO'); +INSERT INTO observe_longline.vesselactivity(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#666#07' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'UNK', 'Unknown', 'Inconnue','Inconnue #TODO'); +UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET LASTUPDATEDATE = ${CURRENT_TIMESTAMP} WHERE TYPE ='fr.ird.observe.entities.referentiel.longline.VesselActivityLongline'; ===================================== persistence/src/main/resources/db/migration/8.0/07_add_weight_determination_method-common.sql ===================================== @@ -21,4 +21,4 @@ --- CREATE TABLE observe_longline.WeightDeterminationMethod(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255)); ALTER TABLE observe_longline.WeightDeterminationMethod ADD CONSTRAINT PK_WeightDeterminationMethod PRIMARY KEY(topiaid); -INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1004', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.longline.WeightDeterminationMethod', CURRENT_TIMESTAMP); +INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1004', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.referentiel.longline.WeightDeterminationMethod', ${CURRENT_TIMESTAMP}); ===================================== persistence/src/main/resources/db/migration/8.0/08_add_weight_category-common.sql ===================================== @@ -21,4 +21,4 @@ --- CREATE TABLE observe_longline.WeightCategory(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255)); ALTER TABLE observe_longline.WeightCategory ADD CONSTRAINT PK_WeightCategory PRIMARY KEY(topiaid); -INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1005', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.longline.WeightCategoryLongline', CURRENT_TIMESTAMP); +INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1005', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.referentiel.longline.WeightCategoryLongline', ${CURRENT_TIMESTAMP}); ===================================== persistence/src/main/resources/db/migration/8.0/09_add_compagnies-common.sql ===================================== @@ -21,4 +21,4 @@ --- CREATE TABLE observe_common.Compagnies(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255)); ALTER TABLE observe_common.Compagnies ADD CONSTRAINT PK_Compagnies PRIMARY KEY(topiaid); -INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1006', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.Compagnies', CURRENT_TIMESTAMP); +INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1006', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.referentiel.Compagnies', ${CURRENT_TIMESTAMP}); ===================================== persistence/src/main/resources/db/migration/8.0/10_add_length_measure_method-common.sql ===================================== @@ -21,12 +21,12 @@ --- CREATE TABLE observe_common.LengthMeasureMethod(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255)); ALTER TABLE observe_common.LengthMeasureMethod ADD CONSTRAINT PK_LengthMeasureMethod PRIMARY KEY(topiaid); -INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1007', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.LengthMeasureMethod', CURRENT_TIMESTAMP); +INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1007', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.referentiel.LengthMeasureMethod', ${CURRENT_TIMESTAMP}); -INSERT INTO observe_common.LengthMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.LengthMeasureMethod#666#01' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'Caliper', 'Pied à coulisse', 'Pied à coulisse #TODO'); -INSERT INTO observe_common.LengthMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.LengthMeasureMethod#666#02' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'Ruler', 'Règle', 'Règle #TODO'); -INSERT INTO observe_common.LengthMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.LengthMeasureMethod#666#03' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'Mesuring tape', 'Mètre ruban', 'Mètre ruban #TODO'); -INSERT INTO observe_common.LengthMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.LengthMeasureMethod#666#04' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'Visual estimation', 'Estimation visuelle', 'Estimation visuelle #TODO'); +INSERT INTO observe_common.LengthMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.LengthMeasureMethod#666#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'Caliper', 'Pied à coulisse', 'Pied à coulisse #TODO'); +INSERT INTO observe_common.LengthMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.LengthMeasureMethod#666#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'Ruler', 'Règle', 'Règle #TODO'); +INSERT INTO observe_common.LengthMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.LengthMeasureMethod#666#03' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'Mesuring tape', 'Mètre ruban', 'Mètre ruban #TODO'); +INSERT INTO observe_common.LengthMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.LengthMeasureMethod#666#04' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'Visual estimation', 'Estimation visuelle', 'Estimation visuelle #TODO'); ALTER TABLE observe_seine.nontargetcatch ADD COLUMN lengthMeasureMethod VARCHAR(255); ALTER TABLE observe_seine.nontargetcatchrelease ADD COLUMN lengthMeasureMethod VARCHAR(255); ===================================== persistence/src/main/resources/db/migration/8.0/11_add_weight_measure_method-common.sql ===================================== @@ -21,12 +21,12 @@ --- CREATE TABLE observe_common.WeightMeasureMethod(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255)); ALTER TABLE observe_common.WeightMeasureMethod ADD CONSTRAINT PK_WeightMeasureMethod PRIMARY KEY(topiaid); -INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1008', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.WeightMeasureMethod', CURRENT_TIMESTAMP); +INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1008', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.referentiel.WeightMeasureMethod', ${CURRENT_TIMESTAMP}); -INSERT INTO observe_common.WeightMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.WeightMeasureMethod#666#01' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'Hanging scale', 'Peson', 'Dinamómetro'); -INSERT INTO observe_common.WeightMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.WeightMeasureMethod#666#02' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'Weighting Scale', 'Balance', 'Balanza'); -INSERT INTO observe_common.WeightMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.WeightMeasureMethod#666#03' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'Visual estimate', 'Estimation visuelle', 'Estimación visual'); -INSERT INTO observe_common.WeightMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.WeightMeasureMethod#666#04' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'Estimate with sounder', 'Estimation au sondeur', 'Estimación con la ecosonda'); +INSERT INTO observe_common.WeightMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.WeightMeasureMethod#666#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'Hanging scale', 'Peson', 'Dinamómetro'); +INSERT INTO observe_common.WeightMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.WeightMeasureMethod#666#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'Weighting Scale', 'Balance', 'Balanza'); +INSERT INTO observe_common.WeightMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.WeightMeasureMethod#666#03' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'Visual estimate', 'Estimation visuelle', 'Estimación visual'); +INSERT INTO observe_common.WeightMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.WeightMeasureMethod#666#04' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'Estimate with sounder', 'Estimation au sondeur', 'Estimación con la ecosonda'); ALTER TABLE observe_seine.nontargetcatch ADD COLUMN weightMeasureMethod VARCHAR(255); ALTER TABLE observe_seine.nontargetlength ADD COLUMN weightMeasureMethod VARCHAR(255); ===================================== persistence/src/main/resources/db/migration/8.0/12_add_conservation-common.sql ===================================== @@ -22,8 +22,8 @@ CREATE TABLE observe_longline.Conservation(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255)); ALTER TABLE observe_longline.Conservation ADD CONSTRAINT PK_Conservation PRIMARY KEY(topiaid); -INSERT INTO observe_longline.Conservation(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.Conservation#666#01' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'FRESH', 'Fresh', 'Frais', 'Frais #TODO'); -INSERT INTO observe_longline.Conservation(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.Conservation#666#02' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'FROZEN', 'Frozen', 'Congelé', 'Congelé #TODO'); -INSERT INTO observe_longline.Conservation(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.Conservation#666#03' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'DRIED', 'Dried', 'Séché', 'Secado'); +INSERT INTO observe_longline.Conservation(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.Conservation#666#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'FRESH', 'Fresh', 'Frais', 'Frais #TODO'); +INSERT INTO observe_longline.Conservation(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.Conservation#666#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'FROZEN', 'Frozen', 'Congelé', 'Congelé #TODO'); +INSERT INTO observe_longline.Conservation(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.Conservation#666#03' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'DRIED', 'Dried', 'Séché', 'Secado'); -INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1009', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.longline.Conservation', CURRENT_TIMESTAMP); +INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1009', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.referentiel.longline.Conservation', ${CURRENT_TIMESTAMP}); ===================================== persistence/src/main/resources/db/migration/8.0/13_add_on_board_processing-common.sql ===================================== @@ -21,10 +21,10 @@ --- CREATE TABLE observe_longline.OnBoardProcessing(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255)); ALTER TABLE observe_longline.OnBoardProcessing ADD CONSTRAINT PK_OnBoardProcessing PRIMARY KEY(topiaid); -INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1010', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.longline.OnBoardProcessing', CURRENT_TIMESTAMP); +INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1010', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.referentiel.longline.OnBoardProcessing', ${CURRENT_TIMESTAMP}); -INSERT INTO observe_longline.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.OnBoardProcessing#666#01' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'WL', 'Whole fish', 'Poisson entier', 'Poisson entier #TODO'); -INSERT INTO observe_longline.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.OnBoardProcessing#666#02' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'H', 'Headed', 'Etêté', 'Etêté #TODO'); -INSERT INTO observe_longline.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.OnBoardProcessing#666#03' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'HG', 'Headed and gutted', 'Etêté et vidé', 'Etêté et vidé #TODO'); -INSERT INTO observe_longline.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.OnBoardProcessing#666#04' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'GG', 'Gilled and gutted', 'Vidé et sans branchies', 'Vidé et sans branchies #TODO'); -INSERT INTO observe_longline.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.OnBoardProcessing#666#05' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'L', 'Loins', 'Longes', 'Longes #TODO'); +INSERT INTO observe_longline.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.OnBoardProcessing#666#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'WL', 'Whole fish', 'Poisson entier', 'Poisson entier #TODO'); +INSERT INTO observe_longline.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.OnBoardProcessing#666#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'H', 'Headed', 'Etêté', 'Etêté #TODO'); +INSERT INTO observe_longline.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.OnBoardProcessing#666#03' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'HG', 'Headed and gutted', 'Etêté et vidé', 'Etêté et vidé #TODO'); +INSERT INTO observe_longline.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.OnBoardProcessing#666#04' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'GG', 'Gilled and gutted', 'Vidé et sans branchies', 'Vidé et sans branchies #TODO'); +INSERT INTO observe_longline.OnBoardProcessing(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.OnBoardProcessing#666#05' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'L', 'Loins', 'Longes', 'Longes #TODO'); ===================================== persistence/src/main/resources/db/migration/8.0/14_add_data_source-common.sql ===================================== @@ -21,25 +21,25 @@ --- CREATE TABLE observe_longline.DataSource(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255)); ALTER TABLE observe_longline.DataSource ADD CONSTRAINT PK_DataSource PRIMARY KEY(topiaid); -INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1011', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.longline.DataSource', CURRENT_TIMESTAMP); +INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1011', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.referentiel.longline.DataSource', ${CURRENT_TIMESTAMP}); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#01' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Customs' ,'Douanes', 'Douanes #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#02' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Auto-Calculated from Database Logbooks' ,'Auto-calculé depuis la BDD logbooks', 'Auto-calculé depuis la BDD logbooks #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#03' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Deep Sea Tuna Longline Association' ,'Deep Sea Tuna Longline Association', 'Deep Sea Tuna Longline Association #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#04' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Directorate General Of Capture' ,'Directorate General Of Capture', 'Directorate General Of Capture #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#05' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Fisheries Indonesia' ,'Fisheries Indonesia', 'Fisheries Indonesia #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#06' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Fariska Savy' ,'Fariska Savy', 'Fariska Savy #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#07' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Fishmongers (incl. Adam)' ,'Fishmongers (incl. Adam)', 'Fishmongers (incl. Adam) #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#08' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Hotel' ,'Hôtel', 'Hôtel #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#09' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'IOTC Transhipment Form' ,'Formulaire de transbordement CTOI', 'Formulaire de transbordement CTOI #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#10' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Industrial Longline Length Frequency Form' ,'Formulaire d''échantillonnage des palangriers industriels', 'Formulaire d''échantillonnage des palangriers industriels #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#11' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Captain Logbook' ,'Logbook du capitaine', 'Logbook du capitaine #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#12' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Email from MCS Section' ,'Email de la section MSC', 'Email de la section MSC #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#13' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Port Authority' ,'Autorité du port', 'Autorité du port #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#14' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Port Interview' ,'Enquête au port', 'Enquête au port #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#15' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Processing Plant' ,'Usine de traitement', 'Usine de traitement #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#16' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Restaurant' ,'Restaurant', 'Restaurant #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#17' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'SFA Application for Authorisation' ,'?', '? #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#18' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Transfer of old database system' ,'Transfert d''une ancienne BDD', 'Transfert d''une ancienne BDD #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#19' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Labrosse (?)' ,'Labrosse (?)', 'Labrosse (?) #TODO'); -INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#20' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false,'Unknown' ,'Inconnue', 'Inconnue #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Customs' ,'Douanes', 'Douanes #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Auto-Calculated from Database Logbooks' ,'Auto-calculé depuis la BDD logbooks', 'Auto-calculé depuis la BDD logbooks #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#03' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Deep Sea Tuna Longline Association' ,'Deep Sea Tuna Longline Association', 'Deep Sea Tuna Longline Association #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#04' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Directorate General Of Capture' ,'Directorate General Of Capture', 'Directorate General Of Capture #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#05' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Fisheries Indonesia' ,'Fisheries Indonesia', 'Fisheries Indonesia #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#06' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Fariska Savy' ,'Fariska Savy', 'Fariska Savy #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#07' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Fishmongers (incl. Adam)' ,'Fishmongers (incl. Adam)', 'Fishmongers (incl. Adam) #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#08' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Hotel' ,'Hôtel', 'Hôtel #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#09' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'IOTC Transhipment Form' ,'Formulaire de transbordement CTOI', 'Formulaire de transbordement CTOI #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#10' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Industrial Longline Length Frequency Form' ,'Formulaire d''échantillonnage des palangriers industriels', 'Formulaire d''échantillonnage des palangriers industriels #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#11' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Captain Logbook' ,'Logbook du capitaine', 'Logbook du capitaine #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#12' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Email from MCS Section' ,'Email de la section MSC', 'Email de la section MSC #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#13' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Port Authority' ,'Autorité du port', 'Autorité du port #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#14' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Port Interview' ,'Enquête au port', 'Enquête au port #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#15' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Processing Plant' ,'Usine de traitement', 'Usine de traitement #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#16' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Restaurant' ,'Restaurant', 'Restaurant #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#17' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'SFA Application for Authorisation' ,'?', '? #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#18' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Transfer of old database system' ,'Transfert d''une ancienne BDD', 'Transfert d''une ancienne BDD #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#19' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Labrosse (?)' ,'Labrosse (?)', 'Labrosse (?) #TODO'); +INSERT INTO observe_longline.DataSource(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.DataSource#666#20' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false,'Unknown' ,'Inconnue', 'Inconnue #TODO'); ===================================== persistence/src/main/resources/db/migration/8.0/16_rename_seine_weight_category-common.sql ===================================== @@ -23,7 +23,7 @@ UPDATE OBSERVE_SEINE.WeightCategory SET TOPIAID = replace(TOPIAID, '.WeightCateg UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET TYPE = replace(TYPE, '.seine.WeightCategory', '.seine.WeightCategorySeine'); UPDATE OBSERVE_SEINE.WeightCategory SET TOPIAVERSION = TOPIAVERSION + 1; -UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET LASTUPDATEDATE = CURRENT_TIMESTAMP WHERE TYPE ='fr.ird.observe.entities.referentiel.seine.WeightCategorySeine'; +UPDATE OBSERVE_COMMON.LASTUPDATEDATE SET LASTUPDATEDATE = ${CURRENT_TIMESTAMP} WHERE TYPE ='fr.ird.observe.entities.referentiel.seine.WeightCategorySeine'; DROP INDEX IF EXISTS idx_OBSERVE_SEINE_targetCatch_WeightCategory; UPDATE OBSERVE_SEINE.TargetCatch SET WeightCategory = replace(WeightCategory, '.WeightCategory', '.WeightCategorySeine'); ===================================== persistence/src/main/resources/db/migration/8.0/17_add_trip_type-common.sql ===================================== @@ -21,6 +21,6 @@ --- CREATE TABLE observe_longline.TripType(topiaid VARCHAR(255) NOT NULL,topiaversion BIGINT NOT NULL, topiacreatedate DATE, lastupdatedate TIMESTAMP NOT NULL, code VARCHAR(255), status INTEGER DEFAULT 1, needComment BOOLEAN DEFAULT false, uri VARCHAR(255), label1 VARCHAR(255), label2 VARCHAR(255), label3 VARCHAR(255),label4 VARCHAR(255),label5 VARCHAR(255),label6 VARCHAR(255),label7 VARCHAR(255),label8 VARCHAR(255)); ALTER TABLE observe_longline.TripType ADD CONSTRAINT PK_TripType PRIMARY KEY(topiaid); -INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1013', 0,CURRENT_DATE, 'fr.ird.observe.entities.referentiel.longline.TripType', CURRENT_TIMESTAMP); -INSERT INTO observe_longline.TripType(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.TripType#666#01' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'SC', 'Scientific trip', 'Marée scientifique', 'Marea experimental'); -INSERT INTO observe_longline.TripType(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.TripType#666#02' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'CM', 'Commercial trip', 'Marée de pêche commerciale', 'Marea commercial'); +INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.observe.entities.LastUpdateDate#666#1013', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.referentiel.longline.TripType', ${CURRENT_TIMESTAMP}); +INSERT INTO observe_longline.TripType(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.TripType#666#01' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'SC', 'Scientific trip', 'Marée scientifique', 'Marea experimental'); +INSERT INTO observe_longline.TripType(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.TripType#666#02' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'CM', 'Commercial trip', 'Marée de pêche commerciale', 'Marea commercial'); ===================================== persistence/src/main/resources/db/migration/8.0/19_add_longline_trip_species_list-common.sql ===================================== @@ -19,4 +19,4 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -INSERT INTO observe_common.SpeciesList(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.7' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'LL - Trip', 'LL - Marée', 'LL - Marea'); +INSERT INTO observe_common.SpeciesList(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.SpeciesList#1239832675370#0.7' , 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'LL - Trip', 'LL - Marée', 'LL - Marea'); ===================================== persistence/src/main/resources/db/migration/8.0/20_update_referential_longline_line_type-common.sql ===================================== @@ -19,5 +19,5 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -INSERT INTO observe_longline.linetype (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.LineType#1239832686157#0.9', 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'UNK', 'Unknown', 'Inconnu', 'Desconocido'); -UPDATE observe_common.LASTUPDATEDATE SET lastupdatedate = CURRENT_TIMESTAMP WHERE topiaId = 'fr.ird.observe.entities.LastUpdateDate#1236861982132#0.48'; +INSERT INTO observe_longline.linetype (topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, code, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.longline.LineType#1239832686157#0.9', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, 1, false, 'UNK', 'Unknown', 'Inconnu', 'Desconocido'); +UPDATE observe_common.LASTUPDATEDATE SET lastupdatedate = ${CURRENT_TIMESTAMP} WHERE topiaId = 'fr.ird.observe.entities.LastUpdateDate#1236861982132#0.48'; ===================================== persistence/src/main/resources/db/migration/8.0/40_ps_common_fill-common.sql ===================================== @@ -44,12 +44,12 @@ UPDATE ps_common.GearUseFeaturesMeasurement SET topiaid = REPLACE(REPLACE(topiai UPDATE ps_common.GearUseFeatures SET topiaid = REPLACE(REPLACE(topiaid, 'observe.entities.seine', 'data.ps.common'), 'Seine',''), topiaversion = topiaversion + 1, trip = REPLACE(REPLACE(trip, 'observe.entities.seine.', 'data.ps.common.'), 'Seine',''), gear = REPLACE(gear, 'observe.entities.referentiel.', 'referential.common.'); UPDATE ps_common.Trip SET topiaid = REPLACE(REPLACE(topiaid, 'observe.entities.seine', 'data.ps.common'), 'Seine',''), topiaversion = topiaversion + 1, ocean = REPLACE(ocean, 'observe.entities.referentiel', 'referential.common'), vessel = REPLACE(vessel, 'observe.entities.referentiel', 'referential.common'), program = REPLACE(program, 'observe.entities.referentiel', 'referential.common'), observer = REPLACE(observer, 'observe.entities.referentiel', 'referential.common'), captain = REPLACE(captain, 'observe.entities.referentiel', 'referential.common'), dataEntryOperator = REPLACE(dataEntryOperator, 'observe.entities.referentiel', 'referential.common'), departureHarbour = REPLACE(departureHarbour, 'observe.entities.referentiel', 'referential.common'), landingHarbour = REPLACE(landingHarbour, 'observe.entities.referentiel', 'referential.common'), dataQuality = REPLACE(dataQuality, 'observe.entities.referentiel', 'referential.common'); -INSERT INTO ps_common.SchoolType(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, needcomment, lastupdatedate) values ('fr.ird.referential.ps.common.SchoolType#0#0' , 0, CURRENT_DATE, '0', null ,1, 'Undefined school type', 'Banc indéterminé', 'Banco indeterminado', false, CURRENT_TIMESTAMP); -INSERT INTO ps_common.SchoolType(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, needcomment, lastupdatedate) values ('fr.ird.referential.ps.common.SchoolType#0#1' , 0, CURRENT_DATE, '1', null ,1, 'Object school type', 'Banc objet', 'Banco a objeto', false, CURRENT_TIMESTAMP); -INSERT INTO ps_common.SchoolType(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, needcomment, lastupdatedate) values ('fr.ird.referential.ps.common.SchoolType#0#2' , 0, CURRENT_DATE, '2', null ,1, 'Free school type', 'Banc libre', 'Banco libre', false, CURRENT_TIMESTAMP); +INSERT INTO ps_common.SchoolType(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, needcomment, lastupdatedate) values ('fr.ird.referential.ps.common.SchoolType#0#0' , 0, ${CURRENT_DATE}, '0', null ,1, 'Undefined school type', 'Banc indéterminé', 'Banco indeterminado', false, ${CURRENT_TIMESTAMP}); +INSERT INTO ps_common.SchoolType(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, needcomment, lastupdatedate) values ('fr.ird.referential.ps.common.SchoolType#0#1' , 0, ${CURRENT_DATE}, '1', null ,1, 'Object school type', 'Banc objet', 'Banco a objeto', false, ${CURRENT_TIMESTAMP}); +INSERT INTO ps_common.SchoolType(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, needcomment, lastupdatedate) values ('fr.ird.referential.ps.common.SchoolType#0#2' , 0, ${CURRENT_DATE}, '2', null ,1, 'Free school type', 'Banc libre', 'Banco libre', false, ${CURRENT_TIMESTAMP}); -INSERT INTO ps_common.TransmittingBuoyOwnership(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, needcomment, lastupdatedate) values ('fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' , 0, CURRENT_DATE, '0', null ,1, 'Unknown', 'À un bateau inconnu', 'Desconocido', false, CURRENT_TIMESTAMP); -INSERT INTO ps_common.TransmittingBuoyOwnership(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, needcomment, lastupdatedate) values ('fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#1' , 0, CURRENT_DATE, '1', null ,0, 'This vessel', 'À ce bateau ou à son armement', 'Este barco o un barco del mismo armador', false, CURRENT_TIMESTAMP); -INSERT INTO ps_common.TransmittingBuoyOwnership(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, needcomment, lastupdatedate) values ('fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#2' , 0, CURRENT_DATE, '2', null ,1, 'Other vessel', 'À un autre armement', 'Barco ajeno', false, CURRENT_TIMESTAMP); -INSERT INTO ps_common.TransmittingBuoyOwnership(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, needcomment, lastupdatedate) values ('fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' , 0, CURRENT_DATE, '3', null ,1, 'This vessel', 'À ce bateau', 'Este barco', false, CURRENT_TIMESTAMP); -INSERT INTO ps_common.TransmittingBuoyOwnership(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, needcomment, lastupdatedate) values ('fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#4' , 0, CURRENT_DATE, '4', null ,1, 'Another vessel', 'À un autre bateau du même armement', 'Barco ajeno del mismo armador', false, CURRENT_TIMESTAMP); +INSERT INTO ps_common.TransmittingBuoyOwnership(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, needcomment, lastupdatedate) values ('fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' , 0, ${CURRENT_DATE}, '0', null ,1, 'Unknown', 'À un bateau inconnu', 'Desconocido', false, ${CURRENT_TIMESTAMP}); +INSERT INTO ps_common.TransmittingBuoyOwnership(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, needcomment, lastupdatedate) values ('fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#1' , 0, ${CURRENT_DATE}, '1', null ,0, 'This vessel', 'À ce bateau ou à son armement', 'Este barco o un barco del mismo armador', false, ${CURRENT_TIMESTAMP}); +INSERT INTO ps_common.TransmittingBuoyOwnership(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, needcomment, lastupdatedate) values ('fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#2' , 0, ${CURRENT_DATE}, '2', null ,1, 'Other vessel', 'À un autre armement', 'Barco ajeno', false, ${CURRENT_TIMESTAMP}); +INSERT INTO ps_common.TransmittingBuoyOwnership(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, needcomment, lastupdatedate) values ('fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' , 0, ${CURRENT_DATE}, '3', null ,1, 'This vessel', 'À ce bateau', 'Este barco', false, ${CURRENT_TIMESTAMP}); +INSERT INTO ps_common.TransmittingBuoyOwnership(topiaid, topiaversion, topiacreatedate, code, uri, status, label1, label2, label3, needcomment, lastupdatedate) values ('fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#4' , 0, ${CURRENT_DATE}, '4', null ,1, 'Another vessel', 'À un autre bateau du même armement', 'Barco ajeno del mismo armador', false, ${CURRENT_TIMESTAMP}); ===================================== persistence/src/main/resources/db/migration/8.0/80_ll_logbook_create-common.sql ===================================== @@ -130,13 +130,13 @@ CREATE INDEX idx_ll_logbook_sample_lastupdatedate ON ll_logbook.sample(lastupdat CREATE INDEX idx_ll_logbook_samplepart_lastupdatedate ON ll_logbook.samplepart(lastupdatedate); CREATE INDEX idx_ll_logbook_activity_lastupdatedate ON ll_logbook.activity(lastupdatedate); -INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1014', 0,CURRENT_DATE, 'fr.ird.observe.entities.data.ll.logbook.Activity', CURRENT_TIMESTAMP); -INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1015', 0,CURRENT_DATE, 'fr.ird.observe.entities.data.ll.logbook.BaitsComposition', CURRENT_TIMESTAMP); -INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1016', 0,CURRENT_DATE, 'fr.ird.observe.entities.data.ll.logbook.BranchlinesComposition', CURRENT_TIMESTAMP); -INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1017', 0,CURRENT_DATE, 'fr.ird.observe.entities.data.ll.logbook.Catch', CURRENT_TIMESTAMP); -INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1018', 0,CURRENT_DATE, 'fr.ird.observe.entities.data.ll.logbook.FloatlinesComposition', CURRENT_TIMESTAMP); -INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1019', 0,CURRENT_DATE, 'fr.ird.observe.entities.data.ll.logbook.HooksComposition', CURRENT_TIMESTAMP); -INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1020', 0,CURRENT_DATE, 'fr.ird.observe.entities.data.ll.logbook.Set', CURRENT_TIMESTAMP); -INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1023', 0,CURRENT_DATE, 'fr.ird.observe.entities.data.ll.logbook.Sample', CURRENT_TIMESTAMP); -INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1024', 0,CURRENT_DATE, 'fr.ird.observe.entities.data.ll.logbook.SamplePart', CURRENT_TIMESTAMP); +INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1014', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.data.ll.logbook.Activity', ${CURRENT_TIMESTAMP}); +INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1015', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.data.ll.logbook.BaitsComposition', ${CURRENT_TIMESTAMP}); +INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1016', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.data.ll.logbook.BranchlinesComposition', ${CURRENT_TIMESTAMP}); +INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1017', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.data.ll.logbook.Catch', ${CURRENT_TIMESTAMP}); +INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1018', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.data.ll.logbook.FloatlinesComposition', ${CURRENT_TIMESTAMP}); +INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1019', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.data.ll.logbook.HooksComposition', ${CURRENT_TIMESTAMP}); +INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1020', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.data.ll.logbook.Set', ${CURRENT_TIMESTAMP}); +INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1023', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.data.ll.logbook.Sample', ${CURRENT_TIMESTAMP}); +INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1024', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.data.ll.logbook.SamplePart', ${CURRENT_TIMESTAMP}); ===================================== persistence/src/main/resources/db/migration/8.0/90_ll_landing_fill-common.sql ===================================== @@ -29,33 +29,33 @@ UPDATE ll_landing.conservation SET topiaid = REPLACE(topiaid, 'observe.entities. UPDATE ll_landing.datasource SET topiaid = REPLACE(topiaid, 'observe.entities.referentiel.longline', 'referential.ll.landing'), topiaversion = topiaversion + 1; -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.01', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'AFM', 'FINSS-00003638', '[type: Unknown] Amedee [id:n/a]', '[type: Unknown] Amedee [id:n/a]', '[type: Unknown] Amedee [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.02', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'AMIRANTES', 'FINSS-00003643', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.03', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'AMO', 'FINSS-00003557', '[type: Person] Mondon Antoine [id:n/a]', '[type: Person] Mondon Antoine [id:n/a]', '[type: Person] Mondon Antoine [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.04', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'ARC', 'FINSS-00003662', '[type: Organization] ARCHIPEL HOTEL [id:n/a]', '[type: Organization] ARCHIPEL HOTEL [id:n/a]', '[type: Organization] ARCHIPEL HOTEL [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.05', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'B&E', 'FINSS-00000096', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.06', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'BFR', 'FINSS-00003535', '[type: Person] Fred Benson,Frederick [id:n/a]', '[type: Person] Fred Benson,Frederick [id:n/a]', '[type: Person] Fred Benson,Frederick [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.07', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'DCE', 'FINSS-00003473', '[type: Person] Cedras David,Welton [id:n/a]', '[type: Person] Cedras David,Welton [id:n/a]', '[type: Person] Cedras David,Welton [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.08', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'Ephelia', 'FINSS-00003634', '[type: Unknown] Ephelia Constance Hotel [id:n/a]', '[type: Unknown] Ephelia Constance Hotel [id:n/a]', '[type: Unknown] Ephelia Constance Hotel [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.09', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'FSS', 'FINSS-00003651', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.10', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'FTE', 'FINSS-00003663', '[type: Unknown] FISH TECH [id:n/a]', '[type: Unknown] FISH TECH [id:n/a]', '[type: Unknown] FISH TECH [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.11', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'GFM', 'FINSS-00003640', '[type: Unknown] George Fishmonger [id:n/a]', '[type: Unknown] George Fishmonger [id:n/a]', '[type: Unknown] George Fishmonger [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.12', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'GPO', 'FINSS-00000098', '[type: Person] PORT LOUIS GERARD [id:n/a]', '[type: Person] PORT LOUIS GERARD [id:n/a]', '[type: Person] PORT LOUIS GERARD [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.13', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'GRA', 'FINSS-00003347', '[type: Person] Rassool Gilbert,Christophe [id:n/a]', '[type: Person] Rassool Gilbert,Christophe [id:n/a]', '[type: Person] Rassool Gilbert,Christophe [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.14', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'HOTEL&REST', 'FINSS-00003624', '[type: Unknown] Hotels and Restaurants [id:n/a]', '[type: Unknown] Hotels and Restaurants [id:n/a]', '[type: Unknown] Hotels and Restaurants [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.15', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'IFM', 'FINSS-00003639', '[type: Unknown] ISPC [id:n/a]', '[type: Unknown] ISPC [id:n/a]', '[type: Unknown] ISPC [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.16', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'JAMES LESP', 'FINSS-00000129', '[type: Person] LESPERANCE JAMES [id:n/a]', '[type: Person] LESPERANCE JAMES [id:n/a]', '[type: Person] LESPERANCE JAMES [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.17', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'JHL', 'FINSS-00003652', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.18', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'kalanda', 'FINSS-00000177', '[type: Person] Kalandarishvili [id:n/a]', '[type: Person] Kalandarishvili [id:n/a]', '[type: Person] Kalandarishvili [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.19', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'LE MURIA', 'FINSS-00003633', '[type: Unknown] LEMEURIA HOTEL [id:n/a]', '[type: Unknown] LEMEURIA HOTEL [id:n/a]', '[type: Unknown] LEMEURIA HOTEL [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.20', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'MARINE INV', 'FINSS-00000099', '[type: Organization] MARINE INVESTMENT [id:n/a]', '[type: Organization] MARINE INVESTMENT [id:n/a]', '[type: Organization] MARINE INVESTMENT [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.21', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'MGE', 'FINSS-00000128', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.22', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'OCEAN ', 'FINSS-00003629', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.23', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'OCEAN HARV', 'FINSS-00000065', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.24', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'OCEANA', 'FINSS-00000094', '[type: Organization] OCEANA FISHERIES [id:n/a]', '[type: Organization] OCEANA FISHERIES [id:n/a]', '[type: Organization] OCEANA FISHERIES [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.25', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SANS SOUCI', 'FINSS-00000100', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.26', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SEA HARVES', 'FINSS-00000132', '[type: Organization] SEA HARVEST [id:n/a]', '[type: Organization] SEA HARVEST [id:n/a]', '[type: Organization] SEA HARVEST [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.27', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SEASTAR', 'FINSS-00000511', '[type: Unknown] SEASTAR [id:n/a]', '[type: Unknown] SEASTAR [id:n/a]', '[type: Unknown] SEASTAR [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.28', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'SFA', 'FINSS-00000101', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.29', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'TROPICALTU', 'FINSS-00003654', '[type: Unknown] Tropical Tuna [id:n/a]', '[type: Unknown] Tropical Tuna [id:n/a]', '[type: Unknown] Tropical Tuna [id:n/a]'); -INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.30', 0,'2019-01-15', 1, FALSE, CURRENT_TIMESTAMP ,'UNK', 'FINSS-00000000', '[type: Organization] Unknown [id:n/a]', '[type: Organization] Unknown [id:n/a]', '[type: Organization] Unknown [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.01', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'AFM', 'FINSS-00003638', '[type: Unknown] Amedee [id:n/a]', '[type: Unknown] Amedee [id:n/a]', '[type: Unknown] Amedee [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.02', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'AMIRANTES', 'FINSS-00003643', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]', '[type: Unknown] AMIRANTES FISHERIES [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.03', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'AMO', 'FINSS-00003557', '[type: Person] Mondon Antoine [id:n/a]', '[type: Person] Mondon Antoine [id:n/a]', '[type: Person] Mondon Antoine [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.04', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'ARC', 'FINSS-00003662', '[type: Organization] ARCHIPEL HOTEL [id:n/a]', '[type: Organization] ARCHIPEL HOTEL [id:n/a]', '[type: Organization] ARCHIPEL HOTEL [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.05', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'B&E', 'FINSS-00000096', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]', '[type: Organization] B&E ENTERPRISE (PTY) LTD [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.06', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'BFR', 'FINSS-00003535', '[type: Person] Fred Benson,Frederick [id:n/a]', '[type: Person] Fred Benson,Frederick [id:n/a]', '[type: Person] Fred Benson,Frederick [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.07', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'DCE', 'FINSS-00003473', '[type: Person] Cedras David,Welton [id:n/a]', '[type: Person] Cedras David,Welton [id:n/a]', '[type: Person] Cedras David,Welton [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.08', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'Ephelia', 'FINSS-00003634', '[type: Unknown] Ephelia Constance Hotel [id:n/a]', '[type: Unknown] Ephelia Constance Hotel [id:n/a]', '[type: Unknown] Ephelia Constance Hotel [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.09', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'FSS', 'FINSS-00003651', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]', '[type: Unknown] Fresh Seafood Seychelles PTY (LTD) [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.10', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'FTE', 'FINSS-00003663', '[type: Unknown] FISH TECH [id:n/a]', '[type: Unknown] FISH TECH [id:n/a]', '[type: Unknown] FISH TECH [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.11', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'GFM', 'FINSS-00003640', '[type: Unknown] George Fishmonger [id:n/a]', '[type: Unknown] George Fishmonger [id:n/a]', '[type: Unknown] George Fishmonger [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.12', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'GPO', 'FINSS-00000098', '[type: Person] PORT LOUIS GERARD [id:n/a]', '[type: Person] PORT LOUIS GERARD [id:n/a]', '[type: Person] PORT LOUIS GERARD [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.13', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'GRA', 'FINSS-00003347', '[type: Person] Rassool Gilbert,Christophe [id:n/a]', '[type: Person] Rassool Gilbert,Christophe [id:n/a]', '[type: Person] Rassool Gilbert,Christophe [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.14', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'HOTEL&REST', 'FINSS-00003624', '[type: Unknown] Hotels and Restaurants [id:n/a]', '[type: Unknown] Hotels and Restaurants [id:n/a]', '[type: Unknown] Hotels and Restaurants [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.15', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'IFM', 'FINSS-00003639', '[type: Unknown] ISPC [id:n/a]', '[type: Unknown] ISPC [id:n/a]', '[type: Unknown] ISPC [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.16', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'JAMES LESP', 'FINSS-00000129', '[type: Person] LESPERANCE JAMES [id:n/a]', '[type: Person] LESPERANCE JAMES [id:n/a]', '[type: Person] LESPERANCE JAMES [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.17', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'JHL', 'FINSS-00003652', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]', '[type: Unknown] JHL GROUP (PTY) Ltd [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.18', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'kalanda', 'FINSS-00000177', '[type: Person] Kalandarishvili [id:n/a]', '[type: Person] Kalandarishvili [id:n/a]', '[type: Person] Kalandarishvili [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.19', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'LE MURIA', 'FINSS-00003633', '[type: Unknown] LEMEURIA HOTEL [id:n/a]', '[type: Unknown] LEMEURIA HOTEL [id:n/a]', '[type: Unknown] LEMEURIA HOTEL [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.20', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'MARINE INV', 'FINSS-00000099', '[type: Organization] MARINE INVESTMENT [id:n/a]', '[type: Organization] MARINE INVESTMENT [id:n/a]', '[type: Organization] MARINE INVESTMENT [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.21', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'MGE', 'FINSS-00000128', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]', '[type: Person] MICHEL GEORGE [id:963-0695-1-1-64]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.22', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'OCEAN ', 'FINSS-00003629', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]', '[type: Unknown] OCEAN LONG LINERS LTD [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.23', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'OCEAN HARV', 'FINSS-00000065', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]', '[type: Organization] OCEAN HARVEST FISHERY LTD. [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.24', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'OCEANA', 'FINSS-00000094', '[type: Organization] OCEANA FISHERIES [id:n/a]', '[type: Organization] OCEANA FISHERIES [id:n/a]', '[type: Organization] OCEANA FISHERIES [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.25', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'SANS SOUCI', 'FINSS-00000100', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]', '[type: Organization] SANS SOUCI FISHERIES (PTY) LTD [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.26', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'SEA HARVES', 'FINSS-00000132', '[type: Organization] SEA HARVEST [id:n/a]', '[type: Organization] SEA HARVEST [id:n/a]', '[type: Organization] SEA HARVEST [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.27', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'SEASTAR', 'FINSS-00000511', '[type: Unknown] SEASTAR [id:n/a]', '[type: Unknown] SEASTAR [id:n/a]', '[type: Unknown] SEASTAR [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.28', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'SFA', 'FINSS-00000101', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]', '[type: Organization] SEYCHELLES FISHERIES AUTHORITY [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.29', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'TROPICALTU', 'FINSS-00003654', '[type: Unknown] Tropical Tuna [id:n/a]', '[type: Unknown] Tropical Tuna [id:n/a]', '[type: Unknown] Tropical Tuna [id:n/a]'); +INSERT INTO ll_landing.compagnies(topiaid, topiaversion, topiacreatedate, status, needComment, lastUpdateDate, code, homeId, label1, label2, label3) VALUES ('fr.ird.referential.ll.landing.Compagnies#1464000000000#0.30', 0,'2019-01-15', 1, FALSE, ${CURRENT_TIMESTAMP} ,'UNK', 'FINSS-00000000', '[type: Organization] Unknown [id:n/a]', '[type: Organization] Unknown [id:n/a]', '[type: Organization] Unknown [id:n/a]'); ===================================== persistence/src/main/resources/db/migration/8.0/90_ll_landing_finalize-common.sql ===================================== @@ -51,8 +51,8 @@ CREATE INDEX idx_ll_landing_datasource_lastupdatedate ON ll_landing.datasource(l CREATE INDEX idx_ll_landing_landingpart_lastupdatedate ON ll_landing.landingpart(lastupdatedate); CREATE INDEX idx_ll_landing_landing_lastupdatedate ON ll_landing.landing(lastupdatedate); -INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1021', 0,CURRENT_DATE, 'fr.ird.observe.entities.data.ll.landing.Landing', CURRENT_TIMESTAMP); -INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1022', 0,CURRENT_DATE, 'fr.ird.observe.entities.data.ll.landing.LandingPart', CURRENT_TIMESTAMP); +INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1021', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.data.ll.landing.Landing', ${CURRENT_TIMESTAMP}); +INSERT INTO common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate, TYPE , LASTUPDATEDATE) values ('fr.ird.common.LastUpdateDate#666#1022', 0,${CURRENT_DATE}, 'fr.ird.observe.entities.data.ll.landing.LandingPart', ${CURRENT_TIMESTAMP}); UPDATE common.LASTUPDATEDATE SET TYPE = REPLACE(TYPE, 'referentiel.Compagnies' , 'referential.ll.landing.Compagnies'); UPDATE common.LASTUPDATEDATE SET TYPE = replace(TYPE, 'referentiel.longline.Conservation', 'referential.ll.landing.Conservation'); ===================================== test/src/main/resources/db/8.0/dataForTestLongline.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz and b/test/src/main/resources/db/8.0/dataForTestLongline.sql.gz differ ===================================== test/src/main/resources/db/8.0/dataForTestSeine.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz and b/test/src/main/resources/db/8.0/dataForTestSeine.sql.gz differ ===================================== test/src/main/resources/db/8.0/referentiel.sql.gz ===================================== Binary files a/test/src/main/resources/db/8.0/referentiel.sql.gz and b/test/src/main/resources/db/8.0/referentiel.sql.gz differ View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9841ce6310f020f1003c0df41… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9841ce6310f020f1003c0df41… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Merge back from v8.1.0.
by Tony CHEMIT Oct. 1, 2020

Oct. 1, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f22a12e9 by Tony Chemit at 2020-10-01T14:17:54+02:00 Merge back from v8.1.0. Need serious tests - - - - - aa472017 by Tony Chemit at 2020-10-01T14:17:54+02:00 Move back to develop - - - - - 73430058 by Tony Chemit at 2020-10-01T14:17:54+02:00 Optimisation de la migration 8.0 - Closes #1623 - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client-core/.mvn/pom.gitflow.develop - client-core/.mvn/pom.gitflow.master - client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client-core/src/main/java/fr/ird/observe/client/util/DtoIconHelper.java - client-datasource-actions/.mvn/pom.gitflow.develop - client-datasource-actions/.mvn/pom.gitflow.master - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client-datasource-editor-api/.mvn/pom.gitflow.develop - client-datasource-editor-api/.mvn/pom.gitflow.master - client-datasource-editor-common/.mvn/pom.gitflow.develop - client-datasource-editor-common/.mvn/pom.gitflow.master - client-datasource-editor-ll/.mvn/pom.gitflow.develop - client-datasource-editor-ll/.mvn/pom.gitflow.master - client-datasource-editor-ps/.mvn/pom.gitflow.develop - client-datasource-editor-ps/.mvn/pom.gitflow.master - client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/03-update-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/observation/01-deployment-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/observation/02-removal-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/observation/03-update-preset.yml - client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/dcp/FloatingObjectPartLegendTreeCellRenderer.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/152054b068159fdb54dcd57d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/152054b068159fdb54dcd57d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Merge back from v8.1.0.
by Tony CHEMIT Oct. 1, 2020

Oct. 1, 2020

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 99fcca21 by Tony Chemit at 2020-10-01T11:03:28+02:00 Merge back from v8.1.0. Need serious tests - - - - - 7ade5d51 by Tony Chemit at 2020-10-01T11:03:28+02:00 Move back to develop - - - - - 152054b0 by Tony Chemit at 2020-10-01T12:51:29+02:00 Optimisation de la migration 8.0 - Closes #1623 - - - - - 30 changed files: - .mvn/pom.gitflow.develop - .mvn/pom.gitflow.master - client-configuration/.mvn/pom.gitflow.develop - client-configuration/.mvn/pom.gitflow.master - client-core/.mvn/pom.gitflow.develop - client-core/.mvn/pom.gitflow.master - client-core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client-core/src/main/java/fr/ird/observe/client/util/DtoIconHelper.java - client-datasource-actions/.mvn/pom.gitflow.develop - client-datasource-actions/.mvn/pom.gitflow.master - client-datasource-actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client-datasource-editor-api/.mvn/pom.gitflow.develop - client-datasource-editor-api/.mvn/pom.gitflow.master - client-datasource-editor-common/.mvn/pom.gitflow.develop - client-datasource-editor-common/.mvn/pom.gitflow.master - client-datasource-editor-ll/.mvn/pom.gitflow.develop - client-datasource-editor-ll/.mvn/pom.gitflow.master - client-datasource-editor-ps/.mvn/pom.gitflow.develop - client-datasource-editor-ps/.mvn/pom.gitflow.master - client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/01-deployment-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/02-removal-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/03-update-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/logbook/04-abandonned-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/observation/01-deployment-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/observation/02-removal-preset.yml - client-datasource-editor-ps/src/main/dcp-presets/ps/observation/03-update-preset.yml - client-datasource-editor-ps/src/main/i18n/getters/jaxx.getter - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIHandler.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/FloatingObjectUIModel.java - client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/dcp/FloatingObjectPartLegendTreeCellRenderer.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8df36d064fcac8af1541eaf9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8df36d064fcac8af1541eaf9… You're receiving this email because of your account on gitlab.com.

1 0