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> - <!-- 0.0 <= branchlinesPerBasketCount <= 50.0 --> + <!-- 0.0 <= branchlinesPerBasketCount <= 1000.0 --> <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> - <!-- 0.0 <= branchlinesPerBasketCount <= 50.0 --> + <!-- 0.0 <= branchlinesPerBasketCount <= 1000.0 --> <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> - <!-- 0.0 <= branchlinesPerBasketCount <= 50.0 --> + <!-- 0.0 <= branchlinesPerBasketCount <= 1000.0 --> <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> - <!-- 0.0 <= branchlinesPerBasketCount <= 50.0 --> + <!-- 0.0 <= branchlinesPerBasketCount <= 1000.0 --> <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> - <!-- 0.0 <= branchlinesPerBasketCount <= 50.0 --> + <!-- 0.0 <= branchlinesPerBasketCount <= 1000.0 --> <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> - <!-- 0.0 <= branchlinesPerBasketCount <= 50.0 --> + <!-- 0.0 <= branchlinesPerBasketCount <= 1000.0 --> <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> - <!-- 0.0 <= branchlinesPerBasketCount <= 50.0 --> + <!-- 0.0 <= branchlinesPerBasketCount <= 1000.0 --> <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> - <!-- 0.0 <= branchlinesPerBasketCount <= 50.0 --> + <!-- 0.0 <= branchlinesPerBasketCount <= 1000.0 --> <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/3ed637ff8096b2579af602898... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3ed637ff8096b2579af602898... You're receiving this email because of your account on gitlab.com.