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

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.3.1 [skip CI]
by Tony CHEMIT (＠tchemit) 30 Apr '24

30 Apr '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6c0e0c9d by Tony Chemit at 2024-04-30T10:18:16+02:00 Update changelog for v.9.3.1 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,27 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2024-04-25 09:34. + * Last generated at 2024-04-30 10:17. + +## Version [9.3.1](https://gitlab.com/ultreiaio/ird-observe/-/milestones/277) + +**Closed at 2024-04-30.** + +### Download +* [Client (observe-9.3.1-client.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) +* [Serveur (observe-9.3.1.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) +* [Serveur (observe-9.3.1-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) + +### Issues + * [[Type::Anomalie 2868]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2868) **Lorsque l'on crée une marée dans un programme depuis l'arbre, le programme en question n'est plus sélectionné par défaut** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2872]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2872) **Impossible d'effacer une marée (PS ou LL) en mode serveur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2873]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2873) **La sauvegarde en sql.gz ne fonctionne pas** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2876]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2876) **Le form PS logbook a perdu sa valeur Data quality par défaut lorsque la marée est créée par le programme logbook** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2877]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2877) **Il est possible de sauver un FOB sans lui avoir donné de type d'opération, et cela plante** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2869]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2869) **En mode classement par bateau, il est possible de créer une marée PS avec un bateau LL, de plus avec un bateau désactivé** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) + * [[Type::Evolution 2871]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2871) **Augmenter la valeur d'un contrôle de formulaire LL Logbook** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2874]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2874) **Encore une borne de poids à augmenter, sur PS localmarket batch** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Evolution 2879]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2879) **Suppression des valeurs balise pays et bateau si l'appartenance à désactiver ces champs** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) ## Version [9.3.0](https://gitlab.com/ultreiaio/ird-observe/-/milestones/271) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6c0e0c9d0322deed7d7bb1628… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/6c0e0c9d0322deed7d7bb1628… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Suppression des valeurs balise pays et bateau si l'appartenance à désactiver...
by Tony CHEMIT (＠tchemit) 30 Apr '24

30 Apr '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d03d66f9 by Tony Chemit at 2024-04-30T10:15:06+02:00 Suppression des valeurs balise pays et bateau si l'appartenance à désactiver ces champs - Closes #2879 - - - - - 603ddcb9 by Tony Chemit at 2024-04-30T10:15:06+02:00 update pom - - - - - 8 changed files: - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java - − core/persistence/migration/src/main/resources/db/migration/v9/9.3/01_issue-2044-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.3/01_issue-2879-common.sql - core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common.json - core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-ps.json - model/src/main/resources/fixtures/global.properties - pom.xml Changes: ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java ===================================== @@ -40,7 +40,7 @@ public class DataSourceMigrationForVersion_9_3 extends ByMajorMigrationVersionRe public DataSourceMigrationForVersion_9_3() { super(Version.valueOf("9.3"), false); - createResourceScriptVariables(this, "2024-04-29", "2023-12-01 00:00:00.000000"); + createResourceScriptVariables(this, "2024-05-01", "2024-05-01 00:00:00.000000"); } @Override @@ -48,7 +48,7 @@ public class DataSourceMigrationForVersion_9_3 extends ByMajorMigrationVersionRe boolean withIds = executor.findSingleResult(SqlQuery.wrap("SELECT COUNT (*) FROM common.person", r -> r.getInt(1) > 0)); if (withIds) { // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2044 - executor.addScript("01", "issue-2044"); + executor.addScript("01", "issue-2879"); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2857 executor.addScript("02", "issue-2857"); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2869 ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.3/01_issue-2044-common.sql deleted ===================================== @@ -1,27 +0,0 @@ ---- --- #%L --- ObServe Core :: Persistence :: Migration --- %% --- Copyright (C) 2008 - 2023 IRD, 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% ---- --- Unknown vessel → no vessel -UPDATE ps_observation.TransmittingBuoy SET vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0'; -UPDATE ps_logbook.TransmittingBuoy SET vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0'; --- This vessel → no country, nor vessel -UPDATE ps_observation.TransmittingBuoy SET country = NULL, vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3'; -UPDATE ps_logbook.TransmittingBuoy SET country = NULL, vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3'; ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.3/01_issue-2879-common.sql ===================================== @@ -0,0 +1,52 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2023 IRD, 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% +--- +INSERT INTO ps_common.TransmittingBuoyOwnership (topiaId, topiaVersion, topiaCreateDate, lastUpdateDate, code, uri, homeid, needComment, status, label1, label2, label3, label4, label5, label6, label7, label8) VALUES ('fr.ird.referential.ps.common.TransmittingBuoyOwnership#${REFERENTIAL_PREFIX}5', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '5', null, null, false, 1, 'Other vessel, company not precised', 'A un autre bateau, armement non précisé', 'Barco ajeno, armador no especificado', null, null, null, null, null); +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.ps.common.TransmittingBuoyOwnership'; + +-- This vessel +UPDATE ps_observation.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL, vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel IS NOT NULL AND (SELECT t.vessel FROM ps_common.Trip t JOIN ps_observation.Route r ON r.trip = t.topiaId JOIN ps_observation.Activity a ON a.route = r.topiaId JOIN ps_observation.FloatingObject f ON f.activity = a.topiaId JOIN ps_observation.TransmittingBuoy tb ON tb.floatingObject = f.topiaId ) = vessel; +UPDATE ps_logbook.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL, vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel IS NOT NULL AND (SELECT t.vessel FROM ps_common.Trip t JOIN ps_logbook.Route r ON r.trip = t.topiaId JOIN ps_logbook.Activity a ON a.route = r.topiaId JOIN ps_logbook.FloatingObject f ON f.activity = a.topiaId JOIN ps_logbook.TransmittingBuoy tb ON tb.floatingObject = f.topiaId ) = vessel; + +UPDATE ps_observation.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel = NULL; +UPDATE ps_logbook.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel = NULL; + +UPDATE ps_observation.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, vessel = NULL, transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel IS NOT NULL AND (SELECT v.code FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT v.code FROM common.Vessel v WHERE v.topiaId = vessel) <= 1000 AND (SELECT t.code FROM ps_common.TransmittingBuoyOperation t WHERE t.topiaId = transmittingBuoyOperation) IN ('1', '2', '99'); +UPDATE ps_logbook.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, vessel = NULL, transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel IS NOT NULL AND (SELECT v.code FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT v.code FROM common.Vessel v WHERE v.topiaId = vessel) <= 1000 AND (SELECT t.code FROM ps_common.TransmittingBuoyOperation t WHERE t.topiaId = transmittingBuoyOperation) IN ('1', '2', '99'); + +UPDATE ps_observation.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, vessel = NULL, country = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel IS NOT NULL AND (SELECT v.code FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT v.code FROM common.Vessel v WHERE v.topiaId = vessel) <= 1000 AND (SELECT t.code FROM ps_common.TransmittingBuoyOperation t WHERE t.topiaId = transmittingBuoyOperation) IN ('3', '4', '5'); +UPDATE ps_logbook.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, vessel = NULL, country = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel IS NOT NULL AND (SELECT v.code FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT v.code FROM common.Vessel v WHERE v.topiaId = vessel) <= 1000 AND (SELECT t.code FROM ps_common.TransmittingBuoyOperation t WHERE t.topiaId = transmittingBuoyOperation) IN ('3', '4', '5'); + +UPDATE ps_observation.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL, transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#${REFERENTIAL_PREFIX}5' WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel IS NOT NULL AND (SELECT t.vessel FROM ps_common.Trip t JOIN ps_observation.Route r ON r.trip = t.topiaId JOIN ps_observation.Activity a ON a.route = r.topiaId JOIN ps_observation.FloatingObject f ON f.activity = a.topiaId JOIN ps_observation.TransmittingBuoy tb ON tb.floatingObject = f.topiaId ) != vessel; +UPDATE ps_logbook.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL, transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#${REFERENTIAL_PREFIX}5' WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' AND vessel IS NOT NULL AND (SELECT t.vessel FROM ps_common.Trip t JOIN ps_logbook.Route r ON r.trip = t.topiaId JOIN ps_logbook.Activity a ON a.route = r.topiaId JOIN ps_logbook.FloatingObject f ON f.activity = a.topiaId JOIN ps_logbook.TransmittingBuoy tb ON tb.floatingObject = f.topiaId ) != vessel; + +-- Unknown vessel +UPDATE ps_observation.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL, vessel = NULL, transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' AND vessel IS NOT NULL AND (SELECT t.vessel FROM ps_common.Trip t JOIN ps_observation.Route r ON r.trip = t.topiaId JOIN ps_observation.Activity a ON a.route = r.topiaId JOIN ps_observation.FloatingObject f ON f.activity = a.topiaId JOIN ps_observation.TransmittingBuoy tb ON tb.floatingObject = f.topiaId ) = vessel; +UPDATE ps_logbook.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL, vessel = NULL, transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#3' WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' AND vessel IS NOT NULL AND (SELECT t.vessel FROM ps_common.Trip t JOIN ps_logbook.Route r ON r.trip = t.topiaId JOIN ps_logbook.Activity a ON a.route = r.topiaId JOIN ps_logbook.FloatingObject f ON f.activity = a.topiaId JOIN ps_logbook.TransmittingBuoy tb ON tb.floatingObject = f.topiaId ) = vessel; + +UPDATE ps_observation.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' AND vessel IS NOT NULL AND (SELECT v.code FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT v.code FROM common.Vessel v WHERE v.topiaId = vessel) <= 1000; +UPDATE ps_logbook.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, vessel = NULL WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' AND vessel IS NOT NULL AND (SELECT v.code FROM common.Vessel v WHERE v.topiaId = vessel) >= 993 AND (SELECT v.code FROM common.Vessel v WHERE v.topiaId = vessel) <= 1000; + +UPDATE ps_observation.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL, transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#${REFERENTIAL_PREFIX}5' WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' AND vessel IS NOT NULL AND (SELECT t.vessel FROM ps_common.Trip t JOIN ps_observation.Route r ON r.trip = t.topiaId JOIN ps_observation.Activity a ON a.route = r.topiaId JOIN ps_observation.FloatingObject f ON f.activity = a.topiaId JOIN ps_observation.TransmittingBuoy tb ON tb.floatingObject = f.topiaId ) != vessel; +UPDATE ps_logbook.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL, transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#${REFERENTIAL_PREFIX}5' WHERE transmittingBuoyOwnership = 'fr.ird.referential.ps.common.TransmittingBuoyOwnership#0#0' AND vessel IS NOT NULL AND (SELECT t.vessel FROM ps_common.Trip t JOIN ps_logbook.Route r ON r.trip = t.topiaId JOIN ps_logbook.Activity a ON a.route = r.topiaId JOIN ps_logbook.FloatingObject f ON f.activity = a.topiaId JOIN ps_logbook.TransmittingBuoy tb ON tb.floatingObject = f.topiaId ) != vessel; + +UPDATE ps_observation.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL WHERE country != NULL AND vessel != NULL; +UPDATE ps_logbook.TransmittingBuoy SET lastUpdateDate = ${CURRENT_TIMESTAMP}, topiaVersion = topiaVersion + 1, country = NULL WHERE country != NULL AND vessel != NULL; ===================================== core/persistence/test/src/test/resources/fixtures/persistence/table_count/referential.properties ===================================== @@ -88,7 +88,7 @@ ps_common.sampleType=6 ps_common.schoolType=4 ps_common.speciesFate=15 ps_common.transmittingBuoyOperation=6 -ps_common.transmittingBuoyOwnership=5 +ps_common.transmittingBuoyOwnership=6 ps_common.transmittingBuoyType=62 ps_common.vesselActivity=39 ps_common.weightCategory=137 ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-common.json ===================================== @@ -90400,7 +90400,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675737#0.43324169605639407", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90431,7 +90431,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1308149641588#0.8724092935671164", "topiaVersion": 6, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90462,7 +90462,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675737#0.3189669579867931", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90493,7 +90493,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675737#0.03138158577140615", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90524,7 +90524,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1308149718650#0.791946073811996", "topiaVersion": 6, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90555,7 +90555,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1464000000000#0.16", "topiaVersion": 1, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90576,7 +90576,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1464000000000#0.17", "topiaVersion": 1, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90597,7 +90597,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675734#0.24685054061673772", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90628,7 +90628,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1308149674400#0.8030832839591066", "topiaVersion": 6, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90654,7 +90654,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675734#0.4191950326431938", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90680,7 +90680,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675735#0.7380146830307519", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90711,7 +90711,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675735#0.9086075071905084", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90737,7 +90737,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675735#0.307197212385357", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90763,7 +90763,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675736#0.8708229847859869", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90789,7 +90789,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832686137#0.1", "topiaVersion": 3, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90815,7 +90815,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1464000000000#0.14", "topiaVersion": 1, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90831,7 +90831,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1464000000000#0.15", "topiaVersion": 1, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { @@ -90847,7 +90847,7 @@ "type": "fr.ird.observe.dto.referential.common.VesselTypeDto", "id": "fr.ird.referential.common.VesselType#1239832675735#0.044156847891821505", "topiaVersion": 15, - "lastUpdateDate": "2023-12-01T00:00:00.000Z" + "lastUpdateDate": "2024-05-01T00:00:00.000Z" }, "messages": [ { ===================================== core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ValidateService-referentialResult-ps.json ===================================== @@ -6322,6 +6322,22 @@ } ] }, + { + "datum": { + "text": "5##A un autre bateau, armement non précisé", + "type": "fr.ird.observe.dto.referential.ps.common.TransmittingBuoyOwnershipDto", + "id": "fr.ird.referential.ps.common.TransmittingBuoyOwnership#1464000000000#5", + "topiaVersion": 0, + "lastUpdateDate": "2024-05-01T00:00:00.000Z" + }, + "messages": [ + { + "fieldName": "uri", + "scope": "WARNING", + "message": "Le champ n'est pas renseigné." + } + ] + }, { "datum": { "text": "1##Radiogoniomètre##[0-9]{1,10}", ===================================== model/src/main/resources/fixtures/global.properties ===================================== @@ -25,4 +25,4 @@ REFERENCE_DATA_COUNT=68 ENTITIES_LIMIT_SIZE=100 # fr.ird.observe.services.service.referential.ReferentialService # fr.ird.observe.services.local.service.referential.DifferentialModelTest -REFERENTIAL_COUNT=4368 +REFERENTIAL_COUNT=4369 ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.22</version> + <version>2024.23</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/74b1a777eed4041b10c03ed0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/74b1a777eed4041b10c03ed0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: Le form PS logbook a perdu sa valeur Data quality par défaut lorsque la marée...
by Tony CHEMIT (＠tchemit) 27 Apr '24

27 Apr '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4d1534e0 by Tony Chemit at 2024-04-27T10:24:54+02:00 Le form PS logbook a perdu sa valeur Data quality par défaut lorsque la marée est créée par le programme logbook - Closes #2876 - - - - - 41034cbe by Tony Chemit at 2024-04-27T12:29:56+02:00 Il est possible de sauver un FOB sans lui avoir donné de type d'opération, et cela plante - Closes #2877 - - - - - 74b1a777 by Tony Chemit at 2024-04-27T12:30:37+02:00 Remove FloatingObjectUI.jcss and only use FloatingObjectUICommon.jcss - - - - - 30 changed files: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/FloatingObjectUICommon.jcss - − client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUI.jcss - − client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jcss - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/FloatingObjectDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/FloatingObjectDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/FloatingObjectDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/FloatingObjectDto-update-error-validation.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlUsageModel.json - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/logbook/FloatingObjectImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/observation/FloatingObjectImpl.hbm.xml - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.3/04_issue-2877-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.3/empty-schema-H2.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.3/empty-schema-PG.sql - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/FloatingObject/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/FloatingObject/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/FloatingObject/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/FloatingObject/validation-update.json - model/src/main/models/Observe/dto/attribute/notNull.properties - model/src/main/models/Observe/persistence/attribute/notNull.properties - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/FloatingObject/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/FloatingObject/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/FloatingObject/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/logbook/FloatingObject/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ps/observation/FloatingObject/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/observation/FloatingObject/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/observation/FloatingObject/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/observation/FloatingObject/validation-update.json Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/dcp/FloatingObjectUICommon.jcss ===================================== @@ -194,3 +194,12 @@ i18nProperty:comment; } +#coordinate1Label { + text:"observe.Common.coordinate"; +} + +#coordinate1 { + propertyLatitude:{TransmittingBuoyDto.PROPERTY_LATITUDE}; + propertyLongitude:{TransmittingBuoyDto.PROPERTY_LONGITUDE}; + propertyQuadrant:{TransmittingBuoyDto.PROPERTY_QUADRANT}; +} ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/FloatingObjectUI.jcss deleted ===================================== @@ -1,31 +0,0 @@ -/* - * #%L - * ObServe Client :: DataSource :: Editor :: PS - * %% - * Copyright (C) 2008 - 2023 IRD, 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% - */ - -#coordinate1Label { - text:"observe.Common.coordinate"; -} - -#coordinate1 { - propertyLatitude:{TransmittingBuoyDto.PROPERTY_LATITUDE}; - propertyLongitude:{TransmittingBuoyDto.PROPERTY_LONGITUDE}; - propertyQuadrant:{TransmittingBuoyDto.PROPERTY_QUADRANT}; -} ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/FloatingObjectUI.jcss deleted ===================================== @@ -1,31 +0,0 @@ -/* - * #%L - * ObServe Client :: DataSource :: Editor :: PS - * %% - * Copyright (C) 2008 - 2023 IRD, 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% - */ - -#coordinate1Label { - text:"observe.Common.coordinate"; -} - -#coordinate1 { - propertyLatitude:{TransmittingBuoyDto.PROPERTY_LATITUDE}; - propertyLongitude:{TransmittingBuoyDto.PROPERTY_LONGITUDE}; - propertyQuadrant:{TransmittingBuoyDto.PROPERTY_QUADRANT}; -} ===================================== core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json ===================================== @@ -10844,7 +10844,8 @@ { "name": "objectOperation", "comments": [ - "check if referential objectOperation is disabled (only if validation is strong)" + "check if referential objectOperation is disabled (only if validation is strong)", + "objectOperation is mandatory" ] }, { @@ -10897,7 +10898,8 @@ { "name": "objectOperation", "comments": [ - "check if referential objectOperation is disabled (only if validation is strong)" + "check if referential objectOperation is disabled (only if validation is strong)", + "objectOperation is mandatory" ] }, { @@ -13267,7 +13269,8 @@ { "name": "objectOperation", "comments": [ - "check if referential objectOperation is disabled (only if validation is strong)" + "check if referential objectOperation is disabled (only if validation is strong)", + "objectOperation is mandatory" ] }, { @@ -13320,7 +13323,8 @@ { "name": "objectOperation", "comments": [ - "check if referential objectOperation is disabled (only if validation is strong)" + "check if referential objectOperation is disabled (only if validation is strong)", + "objectOperation is mandatory" ] }, { ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/FloatingObjectDto-create-error-validation.xml ===================================== @@ -60,6 +60,11 @@ </field> <field name="objectOperation"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/logbook/FloatingObjectDto-update-error-validation.xml ===================================== @@ -60,6 +60,11 @@ </field> <field name="objectOperation"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/FloatingObjectDto-create-error-validation.xml ===================================== @@ -60,6 +60,11 @@ </field> <field name="objectOperation"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/observation/FloatingObjectDto-update-error-validation.xml ===================================== @@ -60,6 +60,11 @@ </field> <field name="objectOperation"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java ===================================== @@ -42,6 +42,7 @@ import fr.ird.observe.entities.data.DataEntity; import fr.ird.observe.entities.data.ps.landing.Landing; import fr.ird.observe.entities.data.ps.logbook.Activity; import fr.ird.observe.entities.data.ps.logbook.Route; +import fr.ird.observe.entities.referential.common.DataQuality; import fr.ird.observe.entities.referential.common.Ocean; import fr.ird.observe.entities.referential.common.Species; import fr.ird.observe.entities.referential.common.SpeciesList; @@ -113,17 +114,22 @@ public class TripSpi extends GeneratedTripSpi { } AcquisitionStatus acquisitionStatus = AcquisitionStatus.loadEntity(context, ProtectedIdsPs.PS_COMMON_DEFAULT_ACQUISITION_STATUS_ID); AcquisitionStatus acquisitionStatusDone = AcquisitionStatus.loadEntity(context, ProtectedIdsPs.PS_COMMON_DONE_ACQUISITION_STATUS_ID); - if (preCreated.getObservationsProgram() != null) { + if (preCreated.getObservationsProgram() == null) { + preCreated.setObservationsAcquisitionStatus(acquisitionStatus); + } else { //FIXME Should we add some default values? preCreated.setObservationsAcquisitionStatus(acquisitionStatusDone); - } else { - preCreated.setObservationsAcquisitionStatus(acquisitionStatus); + } - if (preCreated.getLogbookProgram() != null) { - //FIXME Should we add some default values? - preCreated.setLogbookAcquisitionStatus(acquisitionStatusDone); - }else { + if (preCreated.getLogbookProgram() == null) { preCreated.setLogbookAcquisitionStatus(acquisitionStatus); + } else { + preCreated.setLogbookAcquisitionStatus(acquisitionStatusDone); + WellContentStatus wellContentStatus = WellContentStatus.loadEntity(context, ProtectedIdsPs.PS_LOGBOOK_DEFAULT_WELL_CONTENT_STATUS_ID); + preCreated.setDepartureWellContentStatus(wellContentStatus); + preCreated.setLandingWellContentStatus(wellContentStatus); + DataQuality dataQuality = DataQuality.loadEntity(context, ProtectedIdsPs.PS_LOGBOOK_TRIP_DEFAULT_DATA_QUALITY_ID); + preCreated.setLogbookDataQuality(dataQuality); } preCreated.setTargetWellsSamplingAcquisitionStatus(acquisitionStatus); preCreated.setLandingAcquisitionStatus(acquisitionStatus); @@ -131,10 +137,6 @@ public class TripSpi extends GeneratedTripSpi { preCreated.setLocalMarketWellsSamplingAcquisitionStatus(acquisitionStatus); preCreated.setLocalMarketSurveySamplingAcquisitionStatus(acquisitionStatus); preCreated.setAdvancedSamplingAcquisitionStatus(acquisitionStatus); - - WellContentStatus wellContentStatus = WellContentStatus.loadEntity(context, ProtectedIdsPs.PS_LOGBOOK_DEFAULT_WELL_CONTENT_STATUS_ID); - preCreated.setDepartureWellContentStatus(wellContentStatus); - preCreated.setLandingWellContentStatus(wellContentStatus); preCreated.setActivitiesAcquisitionMode(ActivitiesAcquisitionMode.BY_TIME); return super.preCreate(context, preCreated); } ===================================== core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlUsageModel.json ===================================== @@ -808,7 +808,7 @@ ] }, "fr.ird.observe.entities.referential.ps.common.ObjectOperation": { - "reverseCompositions": [ + "reverseMandatoryCompositions": [ "fr.ird.observe.entities.data.ps.observation.FloatingObject~objectOperation", "fr.ird.observe.entities.data.ps.logbook.FloatingObject~objectOperation" ] ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/logbook/FloatingObjectImpl.hbm.xml ===================================== @@ -38,7 +38,7 @@ <property name="comment" access="field" type="java.lang.String" length="8192"> <column length="8192" name="comment"/> </property> - <many-to-one name="objectOperation" class="fr.ird.observe.entities.referential.ps.common.ObjectOperationImpl" column="objectOperation" foreign-key="fk_ps_logbook_floatingobject_objectoperation" /> + <many-to-one name="objectOperation" class="fr.ird.observe.entities.referential.ps.common.ObjectOperationImpl" column="objectOperation" foreign-key="fk_ps_logbook_floatingobject_objectoperation" not-null="true" /> <property name="supportVesselName" access="field" type="java.lang.String" length="32"> <column length="32" name="supportVesselName"/> </property> ===================================== core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/observation/FloatingObjectImpl.hbm.xml ===================================== @@ -46,7 +46,7 @@ <key column="floatingObject" foreign-key="fk_ps_observation_floatingobject_objectobservedspecies" not-null="true" /> <one-to-many class="fr.ird.observe.entities.data.ps.observation.ObjectObservedSpeciesImpl"/> </set> - <many-to-one name="objectOperation" class="fr.ird.observe.entities.referential.ps.common.ObjectOperationImpl" column="objectOperation" foreign-key="fk_ps_observation_floatingobject_objectoperation" /> + <many-to-one name="objectOperation" class="fr.ird.observe.entities.referential.ps.common.ObjectOperationImpl" column="objectOperation" foreign-key="fk_ps_observation_floatingobject_objectoperation" not-null="true" /> <property name="supportVesselName" access="field" type="java.lang.String" length="32"> <column length="32" name="supportVesselName"/> </property> ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java ===================================== @@ -40,7 +40,7 @@ public class DataSourceMigrationForVersion_9_3 extends ByMajorMigrationVersionRe public DataSourceMigrationForVersion_9_3() { super(Version.valueOf("9.3"), false); - createResourceScriptVariables(this, "2024-04-26", "2023-12-01 00:00:00.000000"); + createResourceScriptVariables(this, "2024-04-29", "2023-12-01 00:00:00.000000"); } @Override @@ -53,6 +53,8 @@ public class DataSourceMigrationForVersion_9_3 extends ByMajorMigrationVersionRe executor.addScript("02", "issue-2857"); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2869 executor.addScript("03", "issue-2869"); + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2877 + executor.addScript("04", "issue-2877"); } } ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.3/04_issue-2877-common.sql ===================================== @@ -0,0 +1,23 @@ +--- +-- #%L +-- ObServe Core :: Persistence :: Migration +-- %% +-- Copyright (C) 2008 - 2024 IRD, 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% +--- +ALTER TABLE ps_logbook.FloatingObject ALTER COLUMN objectOperation SET NOT NULL; +ALTER TABLE ps_observation.FloatingObject ALTER COLUMN objectOperation SET NOT NULL; ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.3/empty-schema-H2.sql ===================================== @@ -162,7 +162,7 @@ create table ps_localmarket.surveyPart (topiaId varchar(255) not null, topiaVers 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, longitude numeric, 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), currentFpaZone varchar(255), previousFpaZone varchar(255), nextFpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), reasonForNoFishing varchar(255), setSuccessStatus varchar(255), reasonForNullSet 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, count integer, weightMeasureMethod varchar(255), 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.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) not null, 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) not null, 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)); create table ps_logbook.route (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), date date not null, timeAtSea integer, fishingTime integer, trip varchar(255) not null, primary key (topiaId)); @@ -184,7 +184,7 @@ create table ps_observation.activity (topiaId varchar(255) not null, topiaVersio create table ps_observation.activity_observedSystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); create table ps_observation.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), catchWeight numeric, catchWeightComputedSource integer, minWeight numeric, meanWeight numeric, maxWeight numeric, meanWeightComputedSource integer, meanLength numeric, meanLengthComputedSource integer, totalCount integer, totalCountComputedSource integer, well varchar(255), reasonForDiscard varchar(255), informationSource varchar(255) not null, species varchar(255) not null, weightMeasureMethod varchar(255), sizeMeasureMethod varchar(255), speciesFate varchar(255) not null, set varchar(255) not null, set_idx integer, primary key (topiaId)); create table ps_observation.detectionMode (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255) not null, 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)); -create table ps_observation.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_observation.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) not null, 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_observation.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_observation.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255) not null, 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)); create table ps_observation.nonTargetCatchRelease (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), length numeric, count integer not null, brailNumber integer, acquisitionMode integer, species varchar(255) not null, status varchar(255) not null, sex varchar(255) not null, speciesGroupReleaseMode varchar(255) not null, conformity varchar(255), handlingPlace varchar(255), releasingTime varchar(255), sizeMeasureMethod varchar(255), set varchar(255) not null, set_idx integer, primary key (topiaId)); ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.3/empty-schema-PG.sql ===================================== @@ -162,7 +162,7 @@ create table ps_localmarket.surveyPart (topiaId varchar(255) not null, topiaVers 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, longitude numeric, 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), currentFpaZone varchar(255), previousFpaZone varchar(255), nextFpaZone varchar(255), dataQuality varchar(255), informationSource varchar(255), reasonForNoFishing varchar(255), setSuccessStatus varchar(255), reasonForNullSet 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, count integer, weightMeasureMethod varchar(255), 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.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) not null, 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) not null, 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)); create table ps_logbook.route (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), date date not null, timeAtSea integer, fishingTime integer, trip varchar(255) not null, primary key (topiaId)); @@ -184,7 +184,7 @@ create table ps_observation.activity (topiaId varchar(255) not null, topiaVersio create table ps_observation.activity_observedSystem (activity varchar(255) not null, observedSystem varchar(255) not null, primary key (activity, observedSystem)); create table ps_observation.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), catchWeight numeric, catchWeightComputedSource integer, minWeight numeric, meanWeight numeric, maxWeight numeric, meanWeightComputedSource integer, meanLength numeric, meanLengthComputedSource integer, totalCount integer, totalCountComputedSource integer, well varchar(255), reasonForDiscard varchar(255), informationSource varchar(255) not null, species varchar(255) not null, weightMeasureMethod varchar(255), sizeMeasureMethod varchar(255), speciesFate varchar(255) not null, set varchar(255) not null, set_idx integer, primary key (topiaId)); create table ps_observation.detectionMode (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255) not null, 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)); -create table ps_observation.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_observation.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) not null, 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_observation.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_observation.informationSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255) not null, 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)); create table ps_observation.nonTargetCatchRelease (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), length numeric, count integer not null, brailNumber integer, acquisitionMode integer, species varchar(255) not null, status varchar(255) not null, sex varchar(255) not null, speciesGroupReleaseMode varchar(255) not null, conformity varchar(255), handlingPlace varchar(255), releasingTime varchar(255), sizeMeasureMethod varchar(255), set varchar(255) not null, set_idx integer, primary key (topiaId)); ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/FloatingObject/validation-create.json ===================================== @@ -18,7 +18,8 @@ }, "objectOperation": { "errors": [ - "check if referential objectOperation is disabled (only if validation is strong)" + "check if referential objectOperation is disabled (only if validation is strong)", + "objectOperation is mandatory" ], "warnings": [ "check if referential objectOperation is disabled (only if validation is not strong)" ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/logbook/FloatingObject/validation-update.json ===================================== @@ -18,7 +18,8 @@ }, "objectOperation": { "errors": [ - "check if referential objectOperation is disabled (only if validation is strong)" + "check if referential objectOperation is disabled (only if validation is strong)", + "objectOperation is mandatory" ], "warnings": [ "check if referential objectOperation is disabled (only if validation is not strong)" ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/FloatingObject/validation-create.json ===================================== @@ -18,7 +18,8 @@ }, "objectOperation": { "errors": [ - "check if referential objectOperation is disabled (only if validation is strong)" + "check if referential objectOperation is disabled (only if validation is strong)", + "objectOperation is mandatory" ], "warnings": [ "check if referential objectOperation is disabled (only if validation is not strong)" ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/observation/FloatingObject/validation-update.json ===================================== @@ -18,7 +18,8 @@ }, "objectOperation": { "errors": [ - "check if referential objectOperation is disabled (only if validation is strong)" + "check if referential objectOperation is disabled (only if validation is strong)", + "objectOperation is mandatory" ], "warnings": [ "check if referential objectOperation is disabled (only if validation is not strong)" ===================================== model/src/main/models/Observe/dto/attribute/notNull.properties ===================================== @@ -147,6 +147,7 @@ data.ps.logbook.Activity.attribute.observedSystem=true data.ps.logbook.Activity.attribute.vesselActivity=true data.ps.logbook.Catch.attribute.species=true data.ps.logbook.Catch.attribute.speciesFate=true +data.ps.logbook.FloatingObject.attribute.objectOperation=true data.ps.logbook.FloatingObjectPart.attribute.objectMaterial=true data.ps.logbook.Route.attribute.date=true data.ps.logbook.Sample.attribute.number=true @@ -181,6 +182,7 @@ data.ps.observation.Activity.attribute.vesselActivity=true data.ps.observation.Catch.attribute.informationSource=true data.ps.observation.Catch.attribute.species=true data.ps.observation.Catch.attribute.speciesFate=true +data.ps.observation.FloatingObject.attribute.objectOperation=true data.ps.observation.FloatingObjectPart.attribute.objectMaterial=true data.ps.observation.NonTargetCatchRelease.attribute.count=true data.ps.observation.NonTargetCatchRelease.attribute.sex=true ===================================== model/src/main/models/Observe/persistence/attribute/notNull.properties ===================================== @@ -151,6 +151,7 @@ data.ps.logbook.Activity.attribute.vesselActivity=true data.ps.logbook.Activity.attribute.vmsDivergent=true data.ps.logbook.Catch.attribute.species=true data.ps.logbook.Catch.attribute.speciesFate=true +data.ps.logbook.FloatingObject.attribute.objectOperation=true data.ps.logbook.FloatingObjectPart.attribute.objectMaterial=true data.ps.logbook.Route.attribute.date=true data.ps.logbook.Sample.attribute.number=true @@ -184,6 +185,7 @@ data.ps.observation.Activity.attribute.vesselActivity=true data.ps.observation.Catch.attribute.informationSource=true data.ps.observation.Catch.attribute.species=true data.ps.observation.Catch.attribute.speciesFate=true +data.ps.observation.FloatingObject.attribute.objectOperation=true data.ps.observation.FloatingObjectPart.attribute.objectMaterial=true data.ps.observation.NonTargetCatchRelease.attribute.count=true data.ps.observation.NonTargetCatchRelease.attribute.sex=true ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/FloatingObject/validation-create-error.xml ===================================== @@ -60,6 +60,11 @@ </field> <field name="objectOperation"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/FloatingObject/validation-create.json ===================================== @@ -18,7 +18,8 @@ }, "objectOperation": { "errors": [ - "check if referential objectOperation is disabled (only if validation is strong)" + "check if referential objectOperation is disabled (only if validation is strong)", + "objectOperation is mandatory" ], "warnings": [ "check if referential objectOperation is disabled (only if validation is not strong)" ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/FloatingObject/validation-update-error.xml ===================================== @@ -60,6 +60,11 @@ </field> <field name="objectOperation"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/logbook/FloatingObject/validation-update.json ===================================== @@ -18,7 +18,8 @@ }, "objectOperation": { "errors": [ - "check if referential objectOperation is disabled (only if validation is strong)" + "check if referential objectOperation is disabled (only if validation is strong)", + "objectOperation is mandatory" ], "warnings": [ "check if referential objectOperation is disabled (only if validation is not strong)" ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/observation/FloatingObject/validation-create-error.xml ===================================== @@ -60,6 +60,11 @@ </field> <field name="objectOperation"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/observation/FloatingObject/validation-create.json ===================================== @@ -18,7 +18,8 @@ }, "objectOperation": { "errors": [ - "check if referential objectOperation is disabled (only if validation is strong)" + "check if referential objectOperation is disabled (only if validation is strong)", + "objectOperation is mandatory" ], "warnings": [ "check if referential objectOperation is disabled (only if validation is not strong)" ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/observation/FloatingObject/validation-update-error.xml ===================================== @@ -60,6 +60,11 @@ </field> <field name="objectOperation"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> +  <field-validator type="checkDisabledReferentialOnErrorScope"> <message/> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/observation/FloatingObject/validation-update.json ===================================== @@ -18,7 +18,8 @@ }, "objectOperation": { "errors": [ - "check if referential objectOperation is disabled (only if validation is strong)" + "check if referential objectOperation is disabled (only if validation is strong)", + "objectOperation is mandatory" ], "warnings": [ "check if referential objectOperation is disabled (only if validation is not strong)" View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bb506c43d63dc97c1f0db0d3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bb506c43d63dc97c1f0db0d3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Encore une borne de poids à augmenter, sur PS localmarket batch - Closes #2874
by Tony CHEMIT (＠tchemit) 26 Apr '24

26 Apr '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 46dcf544 by Tony Chemit at 2024-04-26T17:59:14+02:00 Encore une borne de poids à augmenter, sur PS localmarket batch - Closes #2874 - - - - - bb506c43 by Tony Chemit at 2024-04-26T17:59:14+02:00 update VesselType public api doc - - - - - 18 changed files: - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/BatchDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/BatchDto-update-error-validation.xml - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/Batch/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/Batch/validation-update.json - model/src/main/models/Observe/dto/attribute/boundNumber.properties - server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-update.json - server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/GetSome/index.html - server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/definition.json - server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-create-warning.xml - server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-create.json - server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-update-warning.xml - server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-update.json Changes: ===================================== core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json ===================================== @@ -9087,7 +9087,7 @@ { "name": "weight", "comments": [ - "0.0001 <= weight <= 100.0 except if !countOrWeightValid", + "0.0001 <= weight <= 1500.0 except if !countOrWeightValid", "weight is a strictly positive number", "weight is mandatory except if countOrWeightValid" ] @@ -9186,7 +9186,7 @@ { "name": "weight", "comments": [ - "0.0001 <= weight <= 100.0 except if !countOrWeightValid", + "0.0001 <= weight <= 1500.0 except if !countOrWeightValid", "weight is a strictly positive number", "weight is mandatory except if countOrWeightValid" ] ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/BatchDto-create-error-validation.xml ===================================== @@ -116,11 +116,11 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="skip"><![CDATA[ !countOrWeightValid ]]></param> <param name="min">0.0001</param> - <param name="max">100.0</param> + <param name="max">1500.0</param> <message/> </field-validator> </field> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ps/localmarket/BatchDto-update-error-validation.xml ===================================== @@ -116,11 +116,11 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="skip"><![CDATA[ !countOrWeightValid ]]></param> <param name="min">0.0001</param> - <param name="max">100.0</param> + <param name="max">1500.0</param> <message/> </field-validator> </field> ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/Batch/validation-create.json ===================================== @@ -58,7 +58,7 @@ }, "weight": { "errors": [ - "0.0001 <= weight <= 100.0 except if !countOrWeightValid", + "0.0001 <= weight <= 1500.0 except if !countOrWeightValid", "weight is a strictly positive number", "weight is mandatory except if countOrWeightValid" ] ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ps/localmarket/Batch/validation-update.json ===================================== @@ -58,7 +58,7 @@ }, "weight": { "errors": [ - "0.0001 <= weight <= 100.0 except if !countOrWeightValid", + "0.0001 <= weight <= 1500.0 except if !countOrWeightValid", "weight is a strictly positive number", "weight is mandatory except if countOrWeightValid" ] ===================================== model/src/main/models/Observe/dto/attribute/boundNumber.properties ===================================== @@ -61,7 +61,7 @@ data.ps.common.Trip.attribute.landingTotalWeight=0.0:2000.0:!targetWellsSampling data.ps.common.Trip.attribute.localMarketTotalWeight=0.0:1500.0:!localmarketWellsSamplingEnabled && !localmarketSurveySamplingEnabled data.ps.common.Trip.attribute.timeAtSea=10:2400:!logbookEnabled data.ps.landing.Landing.attribute.weight=0.0:2000.0 -data.ps.localmarket.Batch.attribute.weight=0.0001:100.0:!countOrWeightValid +data.ps.localmarket.Batch.attribute.weight=0.0001:1500.0:!countOrWeightValid data.ps.localmarket.SurveyPart.attribute.proportion=0.0:100.0 data.ps.logbook.Activity.attribute.currentDirection=0:359 data.ps.logbook.Activity.attribute.currentSpeed=0.0:40.0 ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-create-error.xml ===================================== @@ -116,11 +116,11 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="skip"><![CDATA[ !countOrWeightValid ]]></param> <param name="min">0.0001</param> - <param name="max">100.0</param> + <param name="max">1500.0</param> <message/> </field-validator> </field> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-create.json ===================================== @@ -58,7 +58,7 @@ }, "weight": { "errors": [ - "0.0001 <= weight <= 100.0 except if !countOrWeightValid", + "0.0001 <= weight <= 1500.0 except if !countOrWeightValid", "weight is a strictly positive number", "weight is mandatory except if countOrWeightValid" ] ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-update-error.xml ===================================== @@ -116,11 +116,11 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="skip"><![CDATA[ !countOrWeightValid ]]></param> <param name="min">0.0001</param> - <param name="max">100.0</param> + <param name="max">1500.0</param> <message/> </field-validator> </field> ===================================== server/runner/src/main/webResources/doc/api/public/data/ps/localmarket/Batch/validation-update.json ===================================== @@ -58,7 +58,7 @@ }, "weight": { "errors": [ - "0.0001 <= weight <= 100.0 except if !countOrWeightValid", + "0.0001 <= weight <= 1500.0 except if !countOrWeightValid", "weight is a strictly positive number", "weight is mandatory except if countOrWeightValid" ] ===================================== server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/GetSome/index.html ===================================== @@ -269,6 +269,13 @@ <td>[equals, not_equals, null, not_null, min, max]</td> <td>See documentation for filter type: <code>Timestamp</code>.</td> </tr> + <tr> + <td>longline</td> + <td>boolean</td> + <td><code>false|true</code></td> + <td>[equals, not_equals]</td> + <td>See documentation for filter type: <code>boolean</code>.</td> + </tr> <tr> <td>needComment</td> <td>boolean</td> @@ -276,6 +283,13 @@ <td>[equals, not_equals]</td> <td>See documentation for filter type: <code>boolean</code>.</td> </tr> + <tr> + <td>seine</td> + <td>boolean</td> + <td><code>false|true</code></td> + <td>[equals, not_equals]</td> + <td>See documentation for filter type: <code>boolean</code>.</td> + </tr> <tr> <td>status</td> <td>ReferenceStatus</td> ===================================== server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/definition.json ===================================== @@ -11,5 +11,7 @@ "label5": "String", "label6": "String", "label7": "String", - "label8": "String" + "label8": "String", + "longline": "boolean", + "seine": "boolean" } \ No newline at end of file ===================================== server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-create-error.xml ===================================== @@ -124,6 +124,20 @@ </field-validator> </field> + <field name="longline"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + </field> + + <field name="seine"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="uri">  <field-validator type="notBlankString" short-circuit="true"> ===================================== server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-create-warning.xml ===================================== @@ -24,6 +24,14 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + <field name="atLeastOneSelected"> +  + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> <![CDATA[ atLeastOneSelected ]]> </param> + <message>observe.referential.common.VesselType.validation.atLeastOneSelected</message> + </field-validator> + </field> + <field name="label1">  <field-validator type="fieldexpression"> ===================================== server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-create.json ===================================== @@ -1,4 +1,9 @@ { + "atLeastOneSelected": { + "warnings": [ + "At least one of the following properties must be selected (longline,seine)" + ] + }, "code": { "errors": [ "code (if not null) is not a blank string", @@ -64,6 +69,16 @@ "label8 (if not null) is not a blank string" ] }, + "longline": { + "errors": [ + "longline is mandatory" + ] + }, + "seine": { + "errors": [ + "seine is mandatory" + ] + }, "status": { "warnings": [ "referential is enabled" ===================================== server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-update-error.xml ===================================== @@ -124,6 +124,20 @@ </field-validator> </field> + <field name="longline"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + </field> + + <field name="seine"> +  + <field-validator type="mandatory" short-circuit="true"> + <message/> + </field-validator> + </field> + <field name="uri">  <field-validator type="notBlankString" short-circuit="true"> ===================================== server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-update-warning.xml ===================================== @@ -24,6 +24,14 @@ "http://struts.apache.org/dtds/xwork-validator-1.0.3.dtd"> <validators> + <field name="atLeastOneSelected"> +  + <field-validator type="fieldexpression" short-circuit="true"> + <param name="expression"> <![CDATA[ atLeastOneSelected ]]> </param> + <message>observe.referential.common.VesselType.validation.atLeastOneSelected</message> + </field-validator> + </field> + <field name="label1">  <field-validator type="fieldexpression"> ===================================== server/runner/src/main/webResources/doc/api/public/referential/common/common/VesselType/validation-update.json ===================================== @@ -1,4 +1,9 @@ { + "atLeastOneSelected": { + "warnings": [ + "At least one of the following properties must be selected (longline,seine)" + ] + }, "code": { "errors": [ "code (if not null) is not a blank string", @@ -64,6 +69,16 @@ "label8 (if not null) is not a blank string" ] }, + "longline": { + "errors": [ + "longline is mandatory" + ] + }, + "seine": { + "errors": [ + "seine is mandatory" + ] + }, "status": { "warnings": [ "referential is enabled" View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/463453dd9e4660e0741d5e45… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/463453dd9e4660e0741d5e45… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 6 commits: Ajout des deux nouveaux drapeaux sur le référentiel VesselType (longline et seine)
by Tony CHEMIT (＠tchemit) 26 Apr '24

26 Apr '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 51de4e12 by Tony Chemit at 2024-04-26T17:42:45+02:00 Ajout des deux nouveaux drapeaux sur le référentiel VesselType (longline et seine) - - - - - 7a5943e0 by Tony Chemit at 2024-04-26T17:42:45+02:00 Ajout de la migration - - - - - f854d709 by Tony Chemit at 2024-04-26T17:42:45+02:00 Utilisation des nouveaux drapeaux pour filtrer les navire dans les formulaires marée - - - - - 3c9d72f4 by Tony Chemit at 2024-04-26T17:42:45+02:00 Suppression des options de configuration dédiées aux filtre des navires pour les formulaires marée - - - - - 7541a511 by Tony Chemit at 2024-04-26T17:43:12+02:00 Utilisation des nouveaux drapeaux pour filtrer les navire dans l'arbre de navigation - - - - - 463453dd by Tony Chemit at 2024-04-26T17:46:18+02:00 Merge branch 'feature/issue-2869' into develop En mode classement par bateau, il est possible de créer une marée PS avec un bateau LL, de plus avec un bateau désactivé - Closes #2869 - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/test/java/fr/ird/observe/client/configuration/ClientConfigTest.java - client/datasource/editor/common/src/main/i18n/getters/jaxx.getter - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/VesselTypeUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripUIModelStates.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java - core/api/dto-decoration/src/main/i18n/getters/labels.getter - core/api/services/src/main/resources/META-INF/services/Observe/DifferentialMetaModel.json - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/i18n/getters/eugene.getter - core/api/validation/src/main/i18n/getters/validation-messages.getter - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/VesselTypeDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/VesselTypeDto-create-warning-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/VesselTypeDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/referential/common/VesselTypeDto-update-warning-validation.xml - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlCopyPlanModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlModel.json - core/persistence/java/src/main/resources/META-INF/persistence/Observe/TopiaEntitySqlReplicatePlanModel.json - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ll/common/TripImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/data/ps/common/TripImpl.hbm.xml - core/persistence/java/src/main/resources/fr/ird/observe/entities/referential/common/VesselTypeImpl.hbm.xml - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.3/03_issue-2869-common.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.3/empty-schema-H2.sql - core/persistence/migration/src/main/resources/db/migration/v9/9.3/empty-schema-PG.sql - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/common/VesselType/definition.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/common/VesselType/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/referential/common/VesselType/validation-update.json - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/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/55bb8fceaf3b58673eeb6fb9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/55bb8fceaf3b58673eeb6fb9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: La sauvegarde en sql.gz ne fonctionne pas - Closes #2873
by Tony CHEMIT (＠tchemit) 26 Apr '24

26 Apr '24

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 6f65d79d by Tony Chemit at 2024-04-25T20:59:12+02:00 La sauvegarde en sql.gz ne fonctionne pas - Closes #2873 - - - - - 710a5ccf by Tony Chemit at 2024-04-25T20:59:39+02:00 Impossible d'effacer une marée (PS ou LL) en mode serveur - Closes #2872 - - - - - 597bc1ad by Tony Chemit at 2024-04-26T10:29:11+02:00 Augmenter la valeur d'un contrôle de formulaire LL Logbook - Closes #2871 - - - - - 55bb8fce by Tony Chemit at 2024-04-26T10:48:11+02:00 Lorsque l'on crée une marée dans un programme depuis l'arbre, le programme en question n'est plus sélectionné par défaut - Closes #2868 - - - - - 24 changed files: - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java - core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsPs.java - core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetDto-update-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDto-create-error-validation.xml - core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDto-update-error-validation.xml - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Set/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Set/validation-update.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/Set/validation-create.json - core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/Set/validation-update.json - model/src/main/models/Observe/dto/attribute/boundNumber.properties - pom.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/Set/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/Set/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/Set/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/logbook/Set/validation-update.json - server/runner/src/main/webResources/doc/api/public/data/ll/observation/Set/validation-create-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/observation/Set/validation-create.json - server/runner/src/main/webResources/doc/api/public/data/ll/observation/Set/validation-update-error.xml - server/runner/src/main/webResources/doc/api/public/data/ll/observation/Set/validation-update.json - toolkit/persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcHelper.java - toolkit/persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcHelperH2.java Changes: ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripUIModelStates.java ===================================== @@ -105,10 +105,6 @@ public class TripUIModelStates extends GeneratedTripUIModelStates { @Override protected void copyFormToBean(Form<TripDto> form) { super.copyFormToBean(form); - if (isCreatingMode()) { - // reset logbook default values - setDefaultLogbookValues(true); - } // set end date to current day if necessary if (isUpdatingMode() && getBean().getEndDate() == null) { Date date = Dates.getEndOfDay(new Date()); ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsPs.java ===================================== @@ -63,6 +63,7 @@ public interface ProtectedIdsPs { String PS_COMMON_REASON_FOR_NUL_SET_0 = "fr.ird.referential.ps.common.ReasonForNullSet#1239832683529#0.10743661058036036"; String PS_COMMON_ACTIVITY_HARBOUR_ID = "fr.ird.referential.ps.common.VesselActivity#1239832675349#0.363119635949572"; String PS_COMMON_DEFAULT_ACQUISITION_STATUS_ID = "fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#099"; + String PS_COMMON_DONE_ACQUISITION_STATUS_ID = "fr.ird.referential.ps.common.AcquisitionStatus#1464000000000#001"; String PS_LOGBOOK_DEFAULT_WELL_CONTENT_STATUS_ID = "fr.ird.referential.ps.logbook.WellContentStatus#1464000000000#03"; String PS_OBSERVATION_FOB_OBSERVED_SYSTEM = "fr.ird.referential.ps.common.ObservedSystem#0#1.2"; Set<String> PS_OBSERVATION_FOB_OBSERVED_SYSTEM_EXCLUDE_OPERATIONS = Set.of("fr.ird.referential.ps.common.ObjectOperation#0#10", "fr.ird.referential.ps.common.ObjectOperation#0#1"); ===================================== core/api/validation/src/main/filtered-resources/META-INF/validators/validation.json ===================================== @@ -3042,7 +3042,7 @@ { "name": "branchlinesPerBasketCount", "comments": [ - "0.0 <= branchlinesPerBasketCount <= 50.0", + "0.0 <= branchlinesPerBasketCount <= 1000.0", "branchlinesPerBasketCount is a positive number" ] }, @@ -3455,7 +3455,7 @@ { "name": "branchlinesPerBasketCount", "comments": [ - "0.0 <= branchlinesPerBasketCount <= 50.0", + "0.0 <= branchlinesPerBasketCount <= 1000.0", "branchlinesPerBasketCount is a positive number" ] }, @@ -6179,7 +6179,7 @@ { "name": "branchlinesPerBasketCount", "comments": [ - "0.0 <= branchlinesPerBasketCount <= 50.0", + "0.0 <= branchlinesPerBasketCount <= 1000.0", "branchlinesPerBasketCount is a positive number", "branchlinesPerBasketCount is mandatory" ] @@ -6505,7 +6505,7 @@ { "name": "branchlinesPerBasketCount", "comments": [ - "0.0 <= branchlinesPerBasketCount <= 50.0", + "0.0 <= branchlinesPerBasketCount <= 1000.0", "branchlinesPerBasketCount is a positive number", "branchlinesPerBasketCount is mandatory" ] ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetDto-create-error-validation.xml ===================================== @@ -51,10 +51,10 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="min">0.0</param> - <param name="max">50.0</param> + <param name="max">1000.0</param> <message/> </field-validator> </field> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/logbook/SetDto-update-error-validation.xml ===================================== @@ -51,10 +51,10 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="min">0.0</param> - <param name="max">50.0</param> + <param name="max">1000.0</param> <message/> </field-validator> </field> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDto-create-error-validation.xml ===================================== @@ -55,10 +55,10 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="min">0.0</param> - <param name="max">50.0</param> + <param name="max">1000.0</param> <message/> </field-validator> </field> ===================================== core/api/validation/src/main/resources/fr/ird/observe/dto/data/ll/observation/SetDto-update-error-validation.xml ===================================== @@ -55,10 +55,10 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="min">0.0</param> - <param name="max">50.0</param> + <param name="max">1000.0</param> <message/> </field-validator> </field> ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripSpi.java ===================================== @@ -111,15 +111,20 @@ public class TripSpi extends GeneratedTripSpi { preCreated.setStartDate(date); preCreated.setEndDate(date); } + AcquisitionStatus acquisitionStatus = AcquisitionStatus.loadEntity(context, ProtectedIdsPs.PS_COMMON_DEFAULT_ACQUISITION_STATUS_ID); + AcquisitionStatus acquisitionStatusDone = AcquisitionStatus.loadEntity(context, ProtectedIdsPs.PS_COMMON_DONE_ACQUISITION_STATUS_ID); if (preCreated.getObservationsProgram() != null) { //FIXME Should we add some default values? + preCreated.setObservationsAcquisitionStatus(acquisitionStatusDone); + } else { + preCreated.setObservationsAcquisitionStatus(acquisitionStatus); } if (preCreated.getLogbookProgram() != null) { //FIXME Should we add some default values? + preCreated.setLogbookAcquisitionStatus(acquisitionStatusDone); + }else { + preCreated.setLogbookAcquisitionStatus(acquisitionStatus); } - AcquisitionStatus acquisitionStatus = AcquisitionStatus.loadEntity(context, ProtectedIdsPs.PS_COMMON_DEFAULT_ACQUISITION_STATUS_ID); - preCreated.setObservationsAcquisitionStatus(acquisitionStatus); - preCreated.setLogbookAcquisitionStatus(acquisitionStatus); preCreated.setTargetWellsSamplingAcquisitionStatus(acquisitionStatus); preCreated.setLandingAcquisitionStatus(acquisitionStatus); preCreated.setLocalMarketAcquisitionStatus(acquisitionStatus); ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Set/validation-create.json ===================================== @@ -15,7 +15,7 @@ }, "branchlinesPerBasketCount": { "errors": [ - "0.0 <= branchlinesPerBasketCount <= 50.0", + "0.0 <= branchlinesPerBasketCount <= 1000.0", "branchlinesPerBasketCount is a positive number" ], "warnings": [ ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/logbook/Set/validation-update.json ===================================== @@ -15,7 +15,7 @@ }, "branchlinesPerBasketCount": { "errors": [ - "0.0 <= branchlinesPerBasketCount <= 50.0", + "0.0 <= branchlinesPerBasketCount <= 1000.0", "branchlinesPerBasketCount is a positive number" ], "warnings": [ ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/Set/validation-create.json ===================================== @@ -8,7 +8,7 @@ }, "branchlinesPerBasketCount": { "errors": [ - "0.0 <= branchlinesPerBasketCount <= 50.0", + "0.0 <= branchlinesPerBasketCount <= 1000.0", "branchlinesPerBasketCount is a positive number", "branchlinesPerBasketCount is mandatory" ] ===================================== core/persistence/resources/src/main/resources/fr/ird/observe/entities/data/ll/observation/Set/validation-update.json ===================================== @@ -8,7 +8,7 @@ }, "branchlinesPerBasketCount": { "errors": [ - "0.0 <= branchlinesPerBasketCount <= 50.0", + "0.0 <= branchlinesPerBasketCount <= 1000.0", "branchlinesPerBasketCount is a positive number", "branchlinesPerBasketCount is mandatory" ] ===================================== model/src/main/models/Observe/dto/attribute/boundNumber.properties ===================================== @@ -27,7 +27,7 @@ data.ll.logbook.BaitsComposition.attribute.individualWeight=0.0:5.0 data.ll.logbook.Catch.attribute.depredatedProportion=1.0:100.0 data.ll.logbook.HooksComposition.attribute.hookOffset=0.0:100.0 data.ll.logbook.Set.attribute.basketsPerSectionCount=0.0:100.0 -data.ll.logbook.Set.attribute.branchlinesPerBasketCount=0.0:50.0 +data.ll.logbook.Set.attribute.branchlinesPerBasketCount=0.0:1000.0 data.ll.logbook.Set.attribute.settingVesselSpeed=0.0:30.0 data.ll.logbook.Set.attribute.shooterSpeed=0.0:15.0 data.ll.logbook.Set.attribute.snapWeight=0.0:0.2 @@ -44,7 +44,7 @@ data.ll.observation.Branchline.attribute.swivelWeight=0.0:0.2 data.ll.observation.Catch.attribute.gonadeWeight=0.0:2000.0 data.ll.observation.HooksComposition.attribute.hookOffset=0.0:100.0 data.ll.observation.Set.attribute.basketsPerSectionCount=0.0:100.0 -data.ll.observation.Set.attribute.branchlinesPerBasketCount=0.0:50.0 +data.ll.observation.Set.attribute.branchlinesPerBasketCount=0.0:1000.0 data.ll.observation.Set.attribute.lightsticksPerBasketCount=0.0:50.0 data.ll.observation.Set.attribute.settingVesselSpeed=0.0:30.0 data.ll.observation.Set.attribute.shooterSpeed=0.0:15.0 ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.21</version> + <version>2024.22</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> ===================================== server/runner/src/main/webResources/doc/api/public/data/ll/logbook/Set/validation-create-error.xml ===================================== @@ -51,10 +51,10 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="min">0.0</param> - <param name="max">50.0</param> + <param name="max">1000.0</param> <message/> </field-validator> </field> ===================================== server/runner/src/main/webResources/doc/api/public/data/ll/logbook/Set/validation-create.json ===================================== @@ -15,7 +15,7 @@ }, "branchlinesPerBasketCount": { "errors": [ - "0.0 <= branchlinesPerBasketCount <= 50.0", + "0.0 <= branchlinesPerBasketCount <= 1000.0", "branchlinesPerBasketCount is a positive number" ], "warnings": [ ===================================== server/runner/src/main/webResources/doc/api/public/data/ll/logbook/Set/validation-update-error.xml ===================================== @@ -51,10 +51,10 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="min">0.0</param> - <param name="max">50.0</param> + <param name="max">1000.0</param> <message/> </field-validator> </field> ===================================== server/runner/src/main/webResources/doc/api/public/data/ll/logbook/Set/validation-update.json ===================================== @@ -15,7 +15,7 @@ }, "branchlinesPerBasketCount": { "errors": [ - "0.0 <= branchlinesPerBasketCount <= 50.0", + "0.0 <= branchlinesPerBasketCount <= 1000.0", "branchlinesPerBasketCount is a positive number" ], "warnings": [ ===================================== server/runner/src/main/webResources/doc/api/public/data/ll/observation/Set/validation-create-error.xml ===================================== @@ -55,10 +55,10 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="min">0.0</param> - <param name="max">50.0</param> + <param name="max">1000.0</param> <message/> </field-validator> </field> ===================================== server/runner/src/main/webResources/doc/api/public/data/ll/observation/Set/validation-create.json ===================================== @@ -8,7 +8,7 @@ }, "branchlinesPerBasketCount": { "errors": [ - "0.0 <= branchlinesPerBasketCount <= 50.0", + "0.0 <= branchlinesPerBasketCount <= 1000.0", "branchlinesPerBasketCount is a positive number", "branchlinesPerBasketCount is mandatory" ] ===================================== server/runner/src/main/webResources/doc/api/public/data/ll/observation/Set/validation-update-error.xml ===================================== @@ -55,10 +55,10 @@ <message/> </field-validator> -  +  <field-validator type="boundNumber"> <param name="min">0.0</param> - <param name="max">50.0</param> + <param name="max">1000.0</param> <message/> </field-validator> </field> ===================================== server/runner/src/main/webResources/doc/api/public/data/ll/observation/Set/validation-update.json ===================================== @@ -8,7 +8,7 @@ }, "branchlinesPerBasketCount": { "errors": [ - "0.0 <= branchlinesPerBasketCount <= 50.0", + "0.0 <= branchlinesPerBasketCount <= 1000.0", "branchlinesPerBasketCount is a positive number", "branchlinesPerBasketCount is mandatory" ] ===================================== toolkit/persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcHelper.java ===================================== @@ -171,6 +171,18 @@ public abstract class JdbcHelper { } } + public void runQuery(String sql) { + try { + consume(connection -> { + try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) { + preparedStatement.executeQuery(); + } + }); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + public void consume(SqlWork consumer) throws SQLException { try (Connection connection = openConnection()) { consumer.execute(connection); ===================================== toolkit/persistence/src/main/java/org/nuiton/topia/persistence/jdbc/JdbcHelperH2.java ===================================== @@ -78,11 +78,11 @@ public class JdbcHelperH2 extends JdbcHelper { * @param compress if true then use gzip to compress file */ public void backup(File file, boolean compress) { - String options = " BLOCKSIZE 2048 CHARSET 'UTF-8'"; + String options = ""; if (compress) { options += " COMPRESSION GZIP"; } - runUpdate("SCRIPT TO '" + file.getAbsolutePath() + "'" + options); + runQuery("SCRIPT NOPASSWORDS NOSETTINGS BLOCKSIZE 2048 TO '" + file.getAbsolutePath() + "'" + options); } /** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3ed637ff8096b2579af60289… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3ed637ff8096b2579af60289… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.3.0)
by Tony CHEMIT (＠tchemit) 25 Apr '24

25 Apr '24

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 826214fc by Tony Chemit at 2024-04-25T10:05:26+02:00 Site checkin for project ObServe (version 9.3.0) - - - - - 8 changed files: - + 9.3.0/CHANGELOG.html - + 9.3.0/architecture-logicielle.html - + 9.3.0/avdth/common.html - + 9.3.0/avdth/index.html - + 9.3.0/avdth/landing.html - + 9.3.0/avdth/local_market.html - + 9.3.0/avdth/logbook.html - + 9.3.0/avdth/referential.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/826214fc633cdbbcdf2bbb5e2… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/826214fc633cdbbcdf2bbb5e2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.3.0
by Tony CHEMIT (＠tchemit) 25 Apr '24

25 Apr '24

Tony CHEMIT deleted branch release/9.3.0 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v9.3.0
by Tony CHEMIT (＠tchemit) 25 Apr '24

25 Apr '24

Tony CHEMIT pushed new tag v9.3.0 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v9.3.0 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][release/9.3.0] [jgitflow-maven-plugin]updating poms for branch'release/9.3.0' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) 25 Apr '24

25 Apr '24

Tony CHEMIT pushed to branch release/9.3.0 at ultreiaio / ird-observe Commits: 8e68b9a0 by Tony Chemit at 2024-04-25T09:35:32+02:00 [jgitflow-maven-plugin]updating poms for branch'release/9.3.0' with non-snapshot versions[skip ci] - - - - - 30 changed files: - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/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/pom.xml - client/runner/pom.xml - core/api/dto-consolidation/pom.xml - core/api/dto-decoration/pom.xml - core/api/dto-pairing/pom.xml - core/api/dto-validation/pom.xml - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/avdth/pom.xml - core/persistence/consolidation/pom.xml - core/persistence/decoration/pom.xml - core/persistence/java/pom.xml - core/persistence/migration/pom.xml - core/persistence/pom.xml - core/persistence/report/pom.xml - core/persistence/resources/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8e68b9a043b76ba26e2af24eb… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8e68b9a043b76ba26e2af24eb… You're receiving this email because of your account on gitlab.com.

1 0