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

[Git][ultreiaio/ird-observe][develop] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-15' with...
by Tony CHEMIT (＠tchemit) Oct. 3, 2021

Oct. 3, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 34bf5ca0 by Tony Chemit at 2021-10-03T15:00:03+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.0-RC-15' with non-snapshot versions[skip ci] - - - - - 6ba2928d by Tony Chemit at 2021-10-03T15:12:00+02:00 [jgitflow-maven-plugin]merging 'release/9.0.0-RC-15' into 'master' - - - - - 5f50085e by Tony Chemit at 2021-10-03T15:12:04+02:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 6b6452ff by Tony Chemit at 2021-10-03T15:12:05+02:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 7e5a93b3 by Tony Chemit at 2021-10-03T15:12:06+02:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8ebad669894bebb24f049112… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8ebad669894bebb24f049112… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 9.0.0-RC-16-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) Oct. 3, 2021

Oct. 3, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8ebad669 by Tony Chemit at 2021-10-03T14:59:10+02:00 [jgitflow-maven-plugin]updating poms for 9.0.0-RC-16-SNAPSHOT development[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/api/pom.xml - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/i18n/pom.xml - client/pom.xml - client/runner/pom.xml - models/definition/pom.xml - models/dto/i18n/pom.xml - models/dto/java/pom.xml - models/dto/pom.xml - models/navigation/descriptor/pom.xml - models/navigation/id/pom.xml - models/navigation/pom.xml - models/navigation/tree/pom.xml - models/persistence/avdth/pom.xml - models/persistence/java/pom.xml - models/persistence/migration/pom.xml - models/persistence/pom.xml - models/persistence/test-api/pom.xml - models/persistence/test-impl/pom.xml - models/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8ebad669894bebb24f0491122… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8ebad669894bebb24f0491122… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/9.0.0-RC-15
by Tony CHEMIT (＠tchemit) Oct. 3, 2021

Oct. 3, 2021

Tony CHEMIT pushed new branch release/9.0.0-RC-15 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/release/9.0.0-RC-15 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 57 commits: L'UI Confirmation pour insérer les référentiels manquants ne rentre pas dans l'écran - Closes #2004
by Tony CHEMIT (＠tchemit) Oct. 3, 2021

Oct. 3, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9fbbc88c by Tony Chemit at 2021-10-02T17:45:03+02:00 L'UI Confirmation pour insérer les référentiels manquants ne rentre pas dans l'écran - Closes #2004 - - - - - c506cd1f by Tony Chemit at 2021-10-02T17:45:05+02:00 [PS][Logbook] Champ nombre capturés - Closes ultreiaio/ird-observe#1796 - - - - - 92664950 by Tony Chemit at 2021-10-02T17:45:05+02:00 Affichage des poids, Empêcher l'affichage en puissances de 10 - Closes #2006 - - - - - 0a84974d by Tony Chemit at 2021-10-02T17:45:05+02:00 improve fixture api - - - - - c2eab21b by Tony Chemit at 2021-10-02T17:45:05+02:00 remplacement de RouteStubDto par RouteReference - - - - - d9fb6522 by Tony Chemit at 2021-10-02T17:45:05+02:00 ajout decoratoeur manquant (pour ps_observation.activityReference avec date de route) - - - - - e93457c2 by Tony Chemit at 2021-10-02T17:45:05+02:00 Ne pas exposer le paramètre validationMode dans les services - See ultreiaio/ird-observe#2007 - - - - - c53bf5f0 by Tony Chemit at 2021-10-02T17:45:05+02:00 Ajout de plus de tests sur les réferentiels, toute l'api publique est testée, mais il faudrait définir plus de cas. - - - - - 91109d67 by Tony Chemit at 2021-10-02T17:45:05+02:00 Ne pas effectuer certaines validation si la configuration n'est pas connue (See #2008) - - - - - 7bb5525c by Tony Chemit at 2021-10-02T17:45:05+02:00 Bien libérer le validateur après validation - - - - - c75143f5 by Tony Chemit at 2021-10-02T17:45:05+02:00 Faire fonctionner la validation sur une grappe de données non persistées. - - - - - 9b1071d4 by Tony Chemit at 2021-10-02T17:45:05+02:00 [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook - See ultreiaio/ird-observe#1616 - - - - - 14df38a5 by Tony Chemit at 2021-10-02T17:45:05+02:00 add validation observe.data.ps.Route.validation.date.before.currentTrip.endDate - - - - - 1b97a969 by Tony Chemit at 2021-10-02T17:45:05+02:00 we can reuse old way to render property (injected in component client properties) - - - - - 9127148b by Tony Chemit at 2021-10-02T17:45:05+02:00 default init for DateEditor in DefaultUIInitializer - - - - - e7552c6f by Tony Chemit at 2021-10-02T17:45:05+02:00 Disable program node is program is disabled - - - - - 640e54b0 by Tony Chemit at 2021-10-02T17:45:05+02:00 Disable trip create action if program is disabled - - - - - d1d2df7e by Tony Chemit at 2021-10-02T17:45:05+02:00 Do not load trip map on trip form opening - - - - - cf71f035 by Tony Chemit at 2021-10-02T17:45:05+02:00 Can't delete ps_logbook route with multiple activities (with well plan) - - - - - 96173de9 by Tony Chemit at 2021-10-02T17:45:05+02:00 ouverture api - - - - - a1b15c1a by Tony Chemit at 2021-10-02T17:45:05+02:00 ne pas charger un data reference lits if noLoad tag - - - - - 19957512 by Tony Chemit at 2021-10-02T17:45:05+02:00 be able to fix dialog size - - - - - 594d4f6a by Tony Chemit at 2021-10-02T17:45:05+02:00 update pom - - - - - 05a2cdf5 by Tony Chemit at 2021-10-03T14:07:30+02:00 Ajouter une info 'type d'échantillon' sur les échantillons de marché local - See ultreiaio/ird-observe#1978 - - - - - 56375284 by Tony Chemit at 2021-10-03T14:07:30+02:00 Mapping associations AVDTH - See #1864 - - - - - 0e79ecba by Tony Chemit at 2021-10-03T14:07:30+02:00 Add default observed system if none found (avdth import) - - - - - f9781c1d by Tony Chemit at 2021-10-03T14:07:30+02:00 Revue du code de migration avdth - - - - - 913df7d7 by Tony Chemit at 2021-10-03T14:07:30+02:00 add niceTime in DefaultDecoratorRenderer - - - - - 272e8e98 by Tony Chemit at 2021-10-03T14:07:30+02:00 reduce avdth import dialog size - - - - - 390ae639 by Tony Chemit at 2021-10-03T14:07:30+02:00 review longline element decorator in table renderers (always used the one with only hauling identifier) - - - - - b49b680f by Tony Chemit at 2021-10-03T14:07:30+02:00 improve activty layout - - - - - 6b4f4d76 by Tony Chemit at 2021-10-03T14:07:30+02:00 Problème mapping ACTIVITE.C_TYP_OBJET vers ObservedSystem - Closes #2010 - - - - - b75b4ecc by Tony Chemit at 2021-10-03T14:07:30+02:00 update CHANGELOG [skip ci] - - - - - eeb4e3f8 by Tony Chemit at 2021-10-03T14:07:30+02:00 update fixtures - - - - - 1ae0ef5d by Tony Chemit at 2021-10-03T14:07:30+02:00 clean avdth tests - - - - - 3a2c81fb by Tony Chemit at 2021-10-03T14:07:30+02:00 ajout d'un port manquant 94 dans la migration - - - - - acbd5573 by Tony Chemit at 2021-10-03T14:07:30+02:00 amélioration des messages de référentiels manquants lors d'un import avdth. - - - - - e4f868ed by Tony Chemit at 2021-10-03T14:07:30+02:00 ajout d'une option de configuration pour pouvoir lancer l'import meme si certaines données ne seront pas importées - - - - - 02d8b8e2 by Tony Chemit at 2021-10-03T14:07:30+02:00 Amélioration de la migration des référentiels - Closes #2013 - - - - - a916f7b1 by Tony Chemit at 2021-10-03T14:07:30+02:00 add referential column label for weight categories - - - - - ea69287b by Tony Chemit at 2021-10-03T14:07:30+02:00 avoid unnecessary binding while selecting data for reports - - - - - 2d7673a6 by Tony Chemit at 2021-10-03T14:07:30+02:00 improve avdth import messages (and remove some heavy logs in ui) - - - - - 377f0e71 by Tony Chemit at 2021-10-03T14:07:30+02:00 always use the same method to execute scripts, some were still doing it one by one... - - - - - be1a155e by Tony Chemit at 2021-10-03T14:07:30+02:00 Mauvais tri des marées et routes - See ultreiaio/ird-observe#2014 - - - - - f1d1c099 by Tony Chemit at 2021-10-03T14:57:45+02:00 update pom - - - - - 58254946 by Tony Chemit at 2021-10-03T14:57:45+02:00 avoid double sorting in ContentListUI - - - - - bcd11bce by Tony Chemit at 2021-10-03T14:57:45+02:00 Amélioration performance arbre de navigation - - - - - 2af37977 by Tony Chemit at 2021-10-03T14:57:45+02:00 Amélioration performance liste avec beaucoup d'entrées - - - - - 6c8461c6 by Tony Chemit at 2021-10-03T14:57:45+02:00 Improve TopiaUsageSupport using a unique list as result with no other any copies - Closes ultreiaio/topia-extension#89 - - - - - e60a60df by Tony Chemit at 2021-10-03T14:57:45+02:00 La sauvegarde du référentiel ne fonctionne pas après un calcul de données (les services ont été fermés). - - - - - e864088f by Tony Chemit at 2021-10-03T14:57:45+02:00 remove asap the engine (and add a nice message for any NPE) - - - - - 23132382 by Tony Chemit at 2021-10-03T14:57:45+02:00 better progress after action (not before) - - - - - f7e38008 by Tony Chemit at 2021-10-03T14:57:45+02:00 Problème lors de l'export, cinématique avec la mise à jour de référentiel en cause. - Closes #2015 - - - - - 651372e0 by Tony Chemit at 2021-10-03T14:57:45+02:00 Fix order of properties on update task in referential advanced synchronization. - - - - - 49daf0d7 by Tony Chemit at 2021-10-03T14:57:45+02:00 change selectAll-unselectAll keystroke - - - - - fbef4ef0 by Tony Chemit at 2021-10-03T14:57:45+02:00 Les dates de dernière mises à jour ne sont pas augmentées lors d'un remplacement de référentiel - Closes ultreiaio/ird-observe#1859 - - - - - 21f1c62b by Tony Chemit at 2021-10-03T14:58:36+02:00 update CHANGELOG [skip ci] - - - - - 30 changed files: - CHANGELOG.md - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/export/actions/Start.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/save/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/SynchronizeModel.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/tree/actions/RegisterTaskActionSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/node/ReferentialPropertyUpdatedNode.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Extract.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripActionHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/699edcf6011813e4415a3483… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/699edcf6011813e4415a3483… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 29 commits: [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook -...
by Tony CHEMIT (＠tchemit) Oct. 1, 2021

Oct. 1, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 63250e0d by Tony Chemit at 2021-10-01T16:14:10+02:00 [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook - See ultreiaio/ird-observe#1616 - - - - - 3fed768a by Tony Chemit at 2021-10-01T16:14:13+02:00 add validation observe.data.ps.Route.validation.date.before.currentTrip.endDate - - - - - a9b8bdf5 by Tony Chemit at 2021-10-01T16:14:13+02:00 we can reuse old way to render property (injected in component client properties) - - - - - 595bb96a by Tony Chemit at 2021-10-01T16:14:13+02:00 default init for DateEditor in DefaultUIInitializer - - - - - 14f8967a by Tony Chemit at 2021-10-01T16:14:13+02:00 Disable program node is program is disabled - - - - - c4013923 by Tony Chemit at 2021-10-01T16:14:13+02:00 Disable trip create action if program is disabled - - - - - 54500d85 by Tony Chemit at 2021-10-01T16:14:13+02:00 Do not load trip map on trip form opening - - - - - 57d8d388 by Tony Chemit at 2021-10-01T16:14:13+02:00 Can't delete ps_logbook route with multiple activities (with well plan) - - - - - b92d987b by Tony Chemit at 2021-10-01T16:14:13+02:00 ouverture api - - - - - 7e43606e by Tony Chemit at 2021-10-01T16:14:13+02:00 ne pas charger un data reference lits if noLoad tag - - - - - e684f9a9 by Tony Chemit at 2021-10-01T16:14:17+02:00 be able to fix dialog size - - - - - ab159dfe by Tony Chemit at 2021-10-01T16:14:19+02:00 update pom - - - - - d03fb6ff by Tony Chemit at 2021-10-01T16:14:19+02:00 Ajouter une info 'type d'échantillon' sur les échantillons de marché local - See ultreiaio/ird-observe#1978 - - - - - d1a7e367 by Tony Chemit at 2021-10-01T16:14:19+02:00 Mapping associations AVDTH - See #1864 - - - - - 4c2b6846 by Tony Chemit at 2021-10-01T16:14:19+02:00 Add default observed system if none found (avdth import) - - - - - 9e2693dc by Tony Chemit at 2021-10-01T16:14:19+02:00 Revue du code de migration avdth - - - - - db50636b by Tony Chemit at 2021-10-01T16:14:19+02:00 add niceTime in DefaultDecoratorRenderer - - - - - 8aa4f789 by Tony Chemit at 2021-10-01T16:14:19+02:00 reduce avdth import dialog size - - - - - 7052cf27 by Tony Chemit at 2021-10-01T16:14:19+02:00 review longline element decorator in table renderers (always used the one with only hauling identifier) - - - - - 16825c1f by Tony Chemit at 2021-10-01T16:14:19+02:00 improve activty layout - - - - - 3b5d463a by Tony Chemit at 2021-10-01T16:14:19+02:00 Problème mapping ACTIVITE.C_TYP_OBJET vers ObservedSystem - Closes #2010 - - - - - 2704e932 by Tony Chemit at 2021-10-01T16:30:30+02:00 update CHANGELOG [skip ci] - - - - - 857b9d8e by Tony Chemit at 2021-10-01T16:30:30+02:00 update fixtures - - - - - d072c865 by Tony Chemit at 2021-10-01T16:30:30+02:00 clean avdth tests - - - - - e3a8b665 by Tony Chemit at 2021-10-01T16:30:30+02:00 ajout d'un port manquant 94 dans la migration - - - - - b0b9f208 by Tony Chemit at 2021-10-01T16:30:30+02:00 amélioration des messages de référentiels manquants lors d'un import avdth. - - - - - b7f164d3 by Tony Chemit at 2021-10-01T16:30:30+02:00 ajout d'une option de configuration pour pouvoir lancer l'import meme si certaines données ne seront pas importées - - - - - 99a79a64 by Tony Chemit at 2021-10-01T16:30:30+02:00 Amélioration de la migration des référentiels - Closes #2013 - - - - - 699edcf6 by Tony Chemit at 2021-10-01T16:30:30+02:00 add referential column label for weight categories - - - - - 30 changed files: - CHANGELOG.md - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Extract.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripActionHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/validation/ContentMessageTableRenderer.java - + client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/LonglinePositionAware.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetTdrUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetTdrUI.jcss - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/ObservePsKeyStrokes.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/LightActivityUI.jaxx The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a81441f7853967c0414941fd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/a81441f7853967c0414941fd… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] update fixtures
by Tony CHEMIT (＠tchemit) Sept. 30, 2021

Sept. 30, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a81441f7 by Tony Chemit at 2021-09-30T22:18:51+02:00 update fixtures - - - - - 2 changed files: - models/persistence/test-impl/src/main/resources/fixtures/persistence/table_count/referential.properties - tests/test/src/main/resources/fixtures/global.properties Changes: ===================================== models/persistence/test-impl/src/main/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -79,7 +79,7 @@ ll_observation.sensortype=4 ll_observation.stomachfullness=7 ps_common.objectmaterial=83 ps_common.objectmaterialtype=4 -ps_common.objectoperation=11 +ps_common.objectoperation=12 ps_common.observedsystem=61 ps_common.schooltype=3 ps_common.speciesfate=14 ===================================== tests/test/src/main/resources/fixtures/global.properties ===================================== @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=66 ENTITIES_LIMIT_SIZE=100 # fr.ird.observe.services.service.referential.ReferentialService # fr.ird.observe.services.local.service.referential.differential.DifferentialModelTest -REFERENTIAL_COUNT=4106 +REFERENTIAL_COUNT=4107 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a81441f7853967c0414941fd0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a81441f7853967c0414941fd0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 26 commits: [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook -...
by Tony CHEMIT (＠tchemit) Sept. 30, 2021

Sept. 30, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 9f607e5f by Tony Chemit at 2021-09-30T14:41:22+02:00 [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook - See ultreiaio/ird-observe#1616 - - - - - 7f27a616 by Tony Chemit at 2021-09-30T14:41:22+02:00 add validation observe.data.ps.Route.validation.date.before.currentTrip.endDate - - - - - 645c8710 by Tony Chemit at 2021-09-30T14:41:22+02:00 we can reuse old way to render property (injected in component client properties) - - - - - 80bade1e by Tony Chemit at 2021-09-30T14:41:22+02:00 default init for DateEditor in DefaultUIInitializer - - - - - fe933a1b by Tony Chemit at 2021-09-30T14:41:22+02:00 Disable program node is program is disabled - - - - - 228d7408 by Tony Chemit at 2021-09-30T14:41:22+02:00 Disable trip create action if program is disabled - - - - - fb843830 by Tony Chemit at 2021-09-30T14:41:22+02:00 Do not load trip map on trip form opening - - - - - c5534f85 by Tony Chemit at 2021-09-30T14:41:22+02:00 Can't delete ps_logbook route with multiple activities (with well plan) - - - - - e314946d by Tony Chemit at 2021-09-30T14:41:22+02:00 ouverture api - - - - - 2090f75c by Tony Chemit at 2021-09-30T14:41:22+02:00 ne pas charger un data reference lits if noLoad tag - - - - - 67b551b0 by Tony Chemit at 2021-09-30T14:41:22+02:00 be able to fix dialog size - - - - - 7a8e70e4 by Tony Chemit at 2021-09-30T21:44:56+02:00 update pom - - - - - 1c798ad0 by Tony Chemit at 2021-09-30T21:44:56+02:00 Ajouter une info 'type d'échantillon' sur les échantillons de marché local - See ultreiaio/ird-observe#1978 - - - - - d93d215d by Tony Chemit at 2021-09-30T21:44:56+02:00 Mapping associations AVDTH - See #1864 - - - - - 2ca291c6 by Tony Chemit at 2021-09-30T21:44:56+02:00 Add default observed system if none found (avdth import) - - - - - d007c4a3 by Tony Chemit at 2021-09-30T21:44:56+02:00 Revue du code de migration avdth - - - - - 31c69410 by Tony Chemit at 2021-09-30T21:44:56+02:00 add niceTime in DefaultDecoratorRenderer - - - - - f10dfc63 by Tony Chemit at 2021-09-30T21:44:56+02:00 reduce avdth import dialog size - - - - - c925888f by Tony Chemit at 2021-09-30T21:44:56+02:00 review longline element decorator in table renderers (always used the one with only hauling identifier) - - - - - 751a447e by Tony Chemit at 2021-09-30T21:44:56+02:00 [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook - Closes #1616 - - - - - a18a0bd3 by Tony Chemit at 2021-09-30T21:44:56+02:00 improve activty layout - - - - - 907bf7a1 by Tony Chemit at 2021-09-30T21:44:56+02:00 Revue du code de migration avdth - - - - - f64da9b1 by Tony Chemit at 2021-09-30T21:44:56+02:00 [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook - Closes #1616 - - - - - 51a76b92 by Tony Chemit at 2021-09-30T21:44:56+02:00 Problème mapping ACTIVITE.C_TYP_OBJET vers ObservedSystem - Closes #2010 - - - - - 0e02ec09 by Tony Chemit at 2021-09-30T21:44:56+02:00 Problème mapping ACTIVITE.C_TYP_OBJET vers ObservedSystem - Closes #2010 - - - - - 046e6687 by Tony Chemit at 2021-09-30T21:44:56+02:00 update CHANGELOG [skip ci] - - - - - 30 changed files: - CHANGELOG.md - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripActionHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/validation/ContentMessageTableRenderer.java - + client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/LonglinePositionAware.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUI.jcss - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetTdrUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetTdrUI.jcss - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/ObservePsKeyStrokes.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/localmarket/SampleUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/LightActivityUI.jaxx - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/LightActivityUI.jcss - + client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/LightActivityUIHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/de7d75e0f84dbb95f056ee23… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/de7d75e0f84dbb95f056ee23… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 43 commits: Revue de la modélisation ps logbook Sample - See ultreiaio/ird-observe#2001
by Tony CHEMIT (＠tchemit) Sept. 29, 2021

Sept. 29, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 35984888 by Tony Chemit at 2021-09-29T15:33:16+02:00 Revue de la modélisation ps logbook Sample - See ultreiaio/ird-observe#2001 - - - - - a415b1a1 by Tony Chemit at 2021-09-29T15:33:16+02:00 Définition des reports PS logbooks tabulaires [sample] - See #1969 - - - - - 45281bd7 by Tony Chemit at 2021-09-29T15:33:16+02:00 update public api doc - - - - - a8ad70c8 by Tony Chemit at 2021-09-29T15:33:16+02:00 fix Survey decorator - - - - - e226a162 by Tony Chemit at 2021-09-29T15:33:16+02:00 Ajout d'une action nouvel import - Closes #2002 - - - - - f869c745 by Tony Chemit at 2021-09-29T15:33:16+02:00 Remplir les données depuis AVDTH - See #1866 ne pas conserver les échantillon marhcé local qui sont en fait vides. - - - - - e613ec25 by Tony Chemit at 2021-09-29T15:33:16+02:00 amélioration report psLogbookTrip - - - - - 712f60b0 by Tony Chemit at 2021-09-29T15:33:16+02:00 Amélioration du rendu visuel d'une activité - Closes #1610 et gestion de la nullité de ps_logbook.Activity.time - - - - - d9324916 by Tony Chemit at 2021-09-29T15:33:16+02:00 use tck db for more tests - - - - - 56ea3d8e by Tony Chemit at 2021-09-29T15:33:16+02:00 improve layout and reduce some actions texts - - - - - dea027d7 by Tony Chemit at 2021-09-29T15:33:16+02:00 fix log - - - - - 06c51b68 by Tony Chemit at 2021-09-29T15:33:16+02:00 La synchro simple de marées ne marche pas - See ultreiaio/ird-observe#2003 - - - - - 222dea70 by Tony Chemit at 2021-09-29T15:33:16+02:00 update pom - - - - - 041f373d by Tony Chemit at 2021-09-29T15:33:16+02:00 Add FIXME (See #1999) - - - - - e571666e by Tony Chemit at 2021-09-29T15:33:16+02:00 L'UI Confirmation pour insérer les référentiels manquants ne rentre pas dans l'écran - Closes #2004 - - - - - 54f87cf9 by Tony Chemit at 2021-09-29T15:33:16+02:00 [PS][Logbook] Champ nombre capturés - Closes ultreiaio/ird-observe#1796 - - - - - ec8a442e by Tony Chemit at 2021-09-29T15:33:16+02:00 Affichage des poids, Empêcher l'affichage en puissances de 10 - Closes #2006 - - - - - 1ccf6da1 by Tony Chemit at 2021-09-29T15:33:16+02:00 improve fixture api - - - - - 83941151 by Tony Chemit at 2021-09-29T15:33:16+02:00 remplacement de RouteStubDto par RouteReference - - - - - 69092b44 by Tony Chemit at 2021-09-29T15:33:16+02:00 ajout decoratoeur manquant (pour ps_observation.activityReference avec date de route) - - - - - c7bcb9d5 by Tony Chemit at 2021-09-29T15:33:16+02:00 Ne pas exposer le paramètre validationMode dans les services - See ultreiaio/ird-observe#2007 - - - - - f4c001ce by Tony Chemit at 2021-09-29T15:33:16+02:00 Ajout de plus de tests sur les réferentiels, toute l'api publique est testée, mais il faudrait définir plus de cas. - - - - - 758d0922 by Tony Chemit at 2021-09-29T15:33:16+02:00 Ne pas effectuer certaines validation si la configuration n'est pas connue (See #2008) - - - - - 5e79e1d8 by Tony Chemit at 2021-09-29T15:33:16+02:00 Bien libérer le validateur après validation - - - - - f9580c83 by Tony Chemit at 2021-09-29T15:33:16+02:00 Faire fonctionner la validation sur une grappe de données non persistées. - - - - - c3b0894c by Tony Chemit at 2021-09-29T15:33:16+02:00 [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook - See ultreiaio/ird-observe#1616 - - - - - 1ed9e57b by Tony Chemit at 2021-09-29T15:33:16+02:00 add validation observe.data.ps.Route.validation.date.before.currentTrip.endDate - - - - - 06853c7c by Tony Chemit at 2021-09-29T15:33:16+02:00 we can reuse old way to render property (injected in component client properties) - - - - - 039e4d81 by Tony Chemit at 2021-09-29T15:33:16+02:00 default init for DateEditor in DefaultUIInitializer - - - - - 68d08030 by Tony Chemit at 2021-09-29T15:33:16+02:00 Disable program node is program is disabled - - - - - 0fd0245f by Tony Chemit at 2021-09-29T15:33:16+02:00 Disable trip create action if program is disabled - - - - - bb6d5313 by Tony Chemit at 2021-09-29T15:33:16+02:00 Do not load trip map on trip form opening - - - - - 22e97f3f by Tony Chemit at 2021-09-29T15:33:16+02:00 Can't delete ps_logbook route with multiple activities (with well plan) - - - - - b47e40fe by Tony Chemit at 2021-09-29T15:33:16+02:00 ouverture api - - - - - fdf3287f by Tony Chemit at 2021-09-29T15:33:16+02:00 ne pas charger un data reference lits if noLoad tag - - - - - ff463d29 by Tony Chemit at 2021-09-29T15:33:16+02:00 be able to fix dialog size - - - - - 4988ef0c by Tony Chemit at 2021-09-29T15:41:48+02:00 update pom - - - - - 5195ecf3 by Tony Chemit at 2021-09-29T16:21:34+02:00 Ajouter une info 'type d'échantillon' sur les échantillons de marché local - See ultreiaio/ird-observe#1978 - - - - - c6afe28f by Tony Chemit at 2021-09-29T17:58:54+02:00 Mapping associations AVDTH - See #1864 - - - - - b9cdf39b by Tony Chemit at 2021-09-29T19:07:00+02:00 [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook - Closes #1616 - - - - - 182f20d2 by Tony Chemit at 2021-09-29T19:12:11+02:00 [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook - Closes #1616 - - - - - b59bab5c by Tony Chemit at 2021-09-29T19:13:24+02:00 [PS][Logbooks] Gestion de la relation entre le plan de cuves et le logbook - Closes #1616 - - - - - de7d75e0 by Tony Chemit at 2021-09-29T19:13:41+02:00 Add default observed system if none found (avdth import) - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/core/src/main/java/fr/ird/observe/client/ClientUIContext.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesFilterHelper.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/core/src/main/java/fr/ird/observe/client/util/init/DefaultUIInitializer.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/core/src/main/java/fr/ird/observe/client/util/table/JXTableUtil.java - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Import.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/NewImport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripActionHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/ShowUsagesReferential.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDeleteUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDesactivateUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDisplayUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsagePanel.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageUIHandlerSupport.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7d41cbb8021dd8d49e70eb69… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/7d41cbb8021dd8d49e70eb69… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 5 commits: update pom
by Tony CHEMIT (＠tchemit) Sept. 28, 2021

Sept. 28, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1f41a89c by Tony Chemit at 2021-09-28T12:43:34+02:00 update pom - - - - - b76bcad5 by Tony Chemit at 2021-09-28T12:43:34+02:00 Add FIXME (See #1999) - - - - - 88dc959c by Tony Chemit at 2021-09-28T12:43:34+02:00 L'UI Confirmation pour insérer les référentiels manquants ne rentre pas dans l'écran - Closes #2004 - - - - - 2c9028fe by Tony Chemit at 2021-09-28T12:43:34+02:00 L'UI Confirmation pour insérer les référentiels manquants ne rentre pas dans l'écran - Closes #2004 - - - - - 7d41cbb8 by Tony Chemit at 2021-09-28T12:43:34+02:00 [PS][Logbook] Champ nombre capturés - Closes ultreiaio/ird-observe#1796 - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/actions/DataManager.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/actions/ShowUsagesReferential.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDeleteUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDesactivateUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageForDisplayUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsagePanel.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/referential/usage/UsageUIHandlerSupport.java - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUI.jaxx - models/definition/src/main/models/Observe/dto/21-data-ps-logbook.model - models/definition/src/main/models/Observe/dto/attribute/strictlyPositiveNumber.properties - models/definition/src/main/models/Observe/dto/class/containerChildDataDtoProperties.properties - models/definition/src/main/models/Observe/persistence/21-data-ps-logbook.model - models/dto/i18n/src/main/i18n/getters/labels.getter - models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-PG.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_full-schema-ps_logbook-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_full-schema-ps_logbook-PG.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_create-schema-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_create-schema-PG.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_full-schema-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_full-schema-PG.sql - pom.xml - services/client-impl/pom.xml - services/i18n/src/main/i18n/translations/services_en_GB.properties - services/i18n/src/main/i18n/translations/services_es_ES.properties The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/931568c8d63cd17f94c7788d… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/931568c8d63cd17f94c7788d… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] [PS][Logbook] Champ nombre capturés - Closes ultreiaio/ird-observe#1796
by Tony CHEMIT (＠tchemit) Sept. 28, 2021

Sept. 28, 2021

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 931568c8 by Tony Chemit at 2021-09-28T11:47:24+02:00 [PS][Logbook] Champ nombre capturés - Closes ultreiaio/ird-observe#1796 - - - - - 20 changed files: - client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter - client/datasource/editor/ps/src/main/i18n/getters/navigation.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUI.jaxx - models/definition/src/main/models/Observe/dto/21-data-ps-logbook.model - models/definition/src/main/models/Observe/dto/attribute/strictlyPositiveNumber.properties - models/definition/src/main/models/Observe/dto/class/containerChildDataDtoProperties.properties - models/definition/src/main/models/Observe/persistence/21-data-ps-logbook.model - models/dto/i18n/src/main/i18n/getters/labels.getter - models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-PG.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_full-schema-ps_logbook-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/05_full-schema-ps_logbook-PG.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_create-schema-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_create-schema-PG.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_full-schema-H2.sql - models/persistence/migration/src/main/resources/db/migration/9.0/observe_full-schema-PG.sql - services/i18n/src/main/i18n/translations/services_en_GB.properties - services/i18n/src/main/i18n/translations/services_es_ES.properties - services/i18n/src/main/i18n/translations/services_fr_FR.properties - services/validation/src/main/i18n/getters/eugene.getter Changes: ===================================== client/datasource/editor/ps/src/main/i18n/getters/jaxx.getter ===================================== @@ -151,6 +151,7 @@ observe.data.ps.logbook.Activity.setCount observe.data.ps.logbook.Activity.time observe.data.ps.logbook.Activity.totalWeight observe.data.ps.logbook.Activity.vmsDivergent +observe.data.ps.logbook.Catch.count observe.data.ps.logbook.Catch.weight observe.data.ps.logbook.FloatingObject.buoysTab observe.data.ps.logbook.FloatingObject.materialsTab ===================================== client/datasource/editor/ps/src/main/i18n/getters/navigation.getter ===================================== @@ -106,6 +106,8 @@ observe.data.ps.logbook.Activity.type observe.data.ps.logbook.Catch.action.create observe.data.ps.logbook.Catch.action.save observe.data.ps.logbook.Catch.action.save.tip +observe.data.ps.logbook.Catch.count +observe.data.ps.logbook.Catch.count.short observe.data.ps.logbook.Catch.speciesFate.short observe.data.ps.logbook.Catch.title observe.data.ps.logbook.Catch.type ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityCatchUI.jaxx ===================================== @@ -107,6 +107,15 @@ <JaxxComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/> </cell> </row> +  + <row> + <cell anchor='west'> + <JLabel id='countLabel'/> + </cell> + <cell anchor='east' weightx="1" fill="both"> + <NormalTextEditor id='count'/> + </cell> + </row>  <row> <cell> ===================================== models/definition/src/main/models/Observe/dto/21-data-ps-logbook.model ===================================== @@ -43,6 +43,7 @@ number + {*:1} Integer data.ps.logbook.Catch > data.ContainerChild >> data.WellIdAware data.WithSimpleComment comment + {*:1} String weight + {*:1} Float +count + {*:1} Integer well + {*:1} String speciesFate {*:0..1} referential.ps.common.SpeciesFateReference species {*:1} referential.common.SpeciesReference ===================================== models/definition/src/main/models/Observe/dto/attribute/strictlyPositiveNumber.properties ===================================== @@ -28,6 +28,7 @@ data.ps.localmarket.SampleSpeciesMeasure.attribute.sizeClass=true data.ps.localmarket.Survey.attribute.number=true data.ps.logbook.Activity.attribute.number=true data.ps.logbook.Activity.attribute.seaSurfaceTemperature=true +data.ps.logbook.Catch.attribute.count=true data.ps.logbook.Sample.attribute.number=true data.ps.logbook.SampleSpeciesMeasure.attribute.count=true data.ps.logbook.SampleSpeciesMeasure.attribute.sizeClass=true ===================================== models/definition/src/main/models/Observe/dto/class/containerChildDataDtoProperties.properties ===================================== @@ -40,7 +40,7 @@ data.ps.landing.Landing=species,weightCategory,weight,destination,fate,fateVesse data.ps.localmarket.Batch=species,packaging,count,weight data.ps.localmarket.SampleSpecies=species,sizeMeasureType,measuredCount,comment data.ps.localmarket.SurveyPart=species,proportion -data.ps.logbook.Catch=species,speciesFate,weightCategory,well,weight,comment +data.ps.logbook.Catch=species,speciesFate,weightCategory,well,weight,count,comment data.ps.logbook.SampleSpecies=subSampleNumber,species,sizeMeasureType,measuredCount,totalCount,comment data.ps.logbook.WellPlan=activity,well,species,weightCategory,weight data.ps.observation.Catch=species,speciesFate,reasonForDiscard,well,catchWeight,totalCount,meanWeight,meanLength,comment ===================================== models/definition/src/main/models/Observe/persistence/21-data-ps-logbook.model ===================================== @@ -36,6 +36,7 @@ species {*:1} referential.common.Species weightCategory {*:0..1} referential.ps.logbook.WeightCategory speciesFate {*:0..1} referential.ps.common.SpeciesFate weight + {*:1} Float +count + {*:1} Integer weightMeasureMethod {*:0..1} referential.common.WeightMeasureMethod well + {*:1} String ===================================== models/dto/i18n/src/main/i18n/getters/labels.getter ===================================== @@ -877,6 +877,7 @@ observe.data.ps.logbook.Activity.vmsDivergent observe.data.ps.logbook.Catch.action.create observe.data.ps.logbook.Catch.action.save observe.data.ps.logbook.Catch.action.save.tip +observe.data.ps.logbook.Catch.count.short observe.data.ps.logbook.Catch.speciesFate.short observe.data.ps.logbook.Catch.title observe.data.ps.logbook.Catch.type ===================================== models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-H2.sql ===================================== @@ -22,7 +22,7 @@ CREATE SCHEMA ps_logbook; create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId)); create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId)); create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/9.0/05_create-schema-ps_logbook-PG.sql ===================================== @@ -22,7 +22,7 @@ CREATE SCHEMA ps_logbook; create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId)); create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId)); create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/9.0/05_full-schema-ps_logbook-H2.sql ===================================== @@ -22,7 +22,7 @@ CREATE SCHEMA ps_logbook; create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId)); create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId)); create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/9.0/05_full-schema-ps_logbook-PG.sql ===================================== @@ -22,7 +22,7 @@ CREATE SCHEMA ps_logbook; create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId)); create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId)); create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/9.0/observe_create-schema-H2.sql ===================================== @@ -155,7 +155,7 @@ create table ps_localmarket.survey (topiaId varchar(255) not null, topiaVersion create table ps_localmarket.surveyPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, proportion integer not null, survey varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId)); create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId)); create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/9.0/observe_create-schema-PG.sql ===================================== @@ -155,7 +155,7 @@ create table ps_localmarket.survey (topiaId varchar(255) not null, topiaVersion create table ps_localmarket.surveyPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, proportion integer not null, survey varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId)); create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId)); create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/9.0/observe_full-schema-H2.sql ===================================== @@ -155,7 +155,7 @@ create table ps_localmarket.survey (topiaId varchar(255) not null, topiaVersion create table ps_localmarket.surveyPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, proportion integer not null, survey varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId)); create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId)); create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/9.0/observe_full-schema-PG.sql ===================================== @@ -155,7 +155,7 @@ create table ps_localmarket.survey (topiaId varchar(255) not null, topiaVersion create table ps_localmarket.surveyPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, proportion integer not null, survey varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), time time, latitude numeric not null, longitude numeric not null, latitudeOriginal numeric, longitudeOriginal numeric, originalDataModified boolean default false not null, vmsDivergent boolean default false not null, positionCorrected boolean default false not null, number integer not null, setCount integer, seaSurfaceTemperature numeric, windDirection integer, vesselActivity varchar(255) not null, wind varchar(255), totalWeight numeric, currentSpeed numeric, currentDirection integer, schoolType varchar(255), relatedObservedActivity varchar(255), fpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), route varchar(255) not null, primary key (topiaId)); create table ps_logbook.activity_observedsystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); -create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); +create table ps_logbook.catch (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), species varchar(255) not null, weightCategory varchar(255), speciesFate varchar(255) not null, weight numeric not null, count integer, weightMeasureMethod varchar(255) not null, well varchar(255), activity varchar(255) not null, activity_idx integer, primary key (topiaId)); create table ps_logbook.floatingObject (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), objectOperation varchar(255), supportVesselName varchar(32), computedWhenArrivingBiodegradable varchar(255), computedWhenArrivingNonEntangling varchar(255), computedWhenArrivingSimplifiedObjectType varchar(255), computedWhenLeavingBiodegradable varchar(255), computedWhenLeavingNonEntangling varchar(255), computedWhenLeavingSimplifiedObjectType varchar(255), activity varchar(255) not null, primary key (topiaId)); create table ps_logbook.floatingObjectPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), whenArriving varchar(255), whenLeaving varchar(255), objectMaterial varchar(255) not null, floatingObject varchar(255) not null, primary key (topiaId)); create table ps_logbook.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); ===================================== services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -1053,6 +1053,8 @@ observe.data.ps.logbook.Activity.vmsDivergent=Vms divergent? observe.data.ps.logbook.Catch.action.create=Create a new catch observe.data.ps.logbook.Catch.action.save=Insert this catch observe.data.ps.logbook.Catch.action.save.tip=Insert this catch +observe.data.ps.logbook.Catch.count=Count +observe.data.ps.logbook.Catch.count.short=Count observe.data.ps.logbook.Catch.speciesFate.short=Species fate observe.data.ps.logbook.Catch.title=Catches observe.data.ps.logbook.Catch.type=Catch ===================================== services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -1053,6 +1053,8 @@ observe.data.ps.logbook.Activity.vmsDivergent=Vms divergent?\#TODO observe.data.ps.logbook.Catch.action.create=Crear una captura observe.data.ps.logbook.Catch.action.save=Insertar captura observe.data.ps.logbook.Catch.action.save.tip=Insertar captura +observe.data.ps.logbook.Catch.count=Count +observe.data.ps.logbook.Catch.count.short=Count observe.data.ps.logbook.Catch.speciesFate.short=Devenir observe.data.ps.logbook.Catch.title=Captura observe.data.ps.logbook.Catch.type=Captura ===================================== services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -1053,6 +1053,8 @@ observe.data.ps.logbook.Activity.vmsDivergent=Divergence Vms ? observe.data.ps.logbook.Catch.action.create=Nouvelle capture observe.data.ps.logbook.Catch.action.save=Insérer cette capture observe.data.ps.logbook.Catch.action.save.tip=Insérer cette capture +observe.data.ps.logbook.Catch.count=Nombre d'individus +observe.data.ps.logbook.Catch.count.short=Nombre observe.data.ps.logbook.Catch.speciesFate.short=Devenir observe.data.ps.logbook.Catch.title=Captures observe.data.ps.logbook.Catch.type=Captures ===================================== services/validation/src/main/i18n/getters/eugene.getter ===================================== @@ -256,6 +256,7 @@ observe.data.ps.logbook.Activity.floatingObjectEmpty observe.data.ps.logbook.Activity.number observe.data.ps.logbook.Activity.time observe.data.ps.logbook.Activity.totalWeight +observe.data.ps.logbook.Catch.count observe.data.ps.logbook.Catch.weight observe.data.ps.logbook.FloatingObject.materialsValid observe.data.ps.logbook.FloatingObjectPart.objectMaterial View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/931568c8d63cd17f94c7788dd… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/931568c8d63cd17f94c7788dd… You're receiving this email because of your account on gitlab.com.

1 0