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

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.2.1-SNAPSHOT)
by Tony CHEMIT (＠tchemit) Nov. 13, 2023

Nov. 13, 2023

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: da37e13c by Tony Chemit at 2023-11-13T16:12:38+01:00 Site checkin for project ObServe (version 9.2.1-SNAPSHOT) - - - - - 8 changed files: - + 9.2.1-SNAPSHOT/CHANGELOG.html - + 9.2.1-SNAPSHOT/architecture-logicielle.html - + 9.2.1-SNAPSHOT/avdth/common.html - + 9.2.1-SNAPSHOT/avdth/index.html - + 9.2.1-SNAPSHOT/avdth/landing.html - + 9.2.1-SNAPSHOT/avdth/local_market.html - + 9.2.1-SNAPSHOT/avdth/logbook.html - + 9.2.1-SNAPSHOT/avdth/referential.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/da37e13cf872830846a3698ed… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/da37e13cf872830846a3698ed… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Précisions sur les déductions AVDTH ASSOC vers FloatingObject et ObjectMaterial - Closes #2802
by Tony CHEMIT (＠tchemit) Nov. 13, 2023

Nov. 13, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 0698ab90 by Tony Chemit at 2023-11-13T12:50:00+01:00 Précisions sur les déductions AVDTH ASSOC vers FloatingObject et ObjectMaterial - Closes #2802 - - - - - 4 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java - src/site/markdown/avdth/logbook.md - src/site/markdown/avdth/referential.md Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -131,6 +131,7 @@ public class ImportReferentialContext { private ObjectMaterial objectMaterialANLOG; private ObjectMaterial objectMaterialHALOG; private ObjectMaterial objectMaterialVNLOG; + private ObjectMaterial objectMaterialCarrion; private ObservedSystem observedSystem0; private SpeciesCache speciesCache; private ObservedSystem observedSystem20; @@ -225,6 +226,7 @@ public class ImportReferentialContext { transmittingBuoyType98 = transmittingBuoyType.get("98"); objectMaterialFOB = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#1.3"); objectMaterialNLOG = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.51"); + objectMaterialCarrion = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.57"); objectMaterialDFAD = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.2"); objectMaterialALOG = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.59"); objectMaterialAFAD = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.46"); @@ -328,6 +330,10 @@ public class ImportReferentialContext { return objectMaterialNLOG; } + public ObjectMaterial getObjectMaterialCarrion() { + return objectMaterialCarrion; + } + public ObjectMaterial getObjectMaterialDFAD() { return objectMaterialDFAD; } ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java ===================================== @@ -207,7 +207,7 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { /** * Observed system from {@code ACT_ASSOC} which can create a Floating object. */ - public static final Set<String> OBSERVED_SYTEM_CODES_WITH_DCP = Set.of("20", "21", "22", "23", "24", "25"); + public static final Set<String> OBSERVED_SYTEM_CODES_WITH_DCP = Set.of("20", "21", "22", "23", "24", "25", "81"); /** * We need to remove thoses observed system at the end when writing them to activity. * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2548">issue 2548</a> @@ -323,6 +323,10 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { if (observedSystem != null) { activity.addObservedSystem(observedSystem); } + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2802 + if (observedSystemCodes.contains("81")) { + activity.addObservedSystem(dataContext.getObservedSystem20()); + } boolean addBuoyFromObservedSystem = addFloatingObjectMaterials(dataContext, resultSet, @@ -380,12 +384,12 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialFOB(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; } else if (observedSystemCodes.contains("21")) { - // add ObjectMaterial 2-1 NLOG - addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialNLOG(), whenArriving, whenLeaving, entity); + // add ObjectMaterial 2-1-1 VNLOG + addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialVNLOG(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; } else if (observedSystemCodes.contains("22")) { - // add ObjectMaterial 2-1 NLOG + 1-1 DFAD - addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialNLOG(), whenArriving, whenLeaving, entity); + // add ObjectMaterial 2-1-1 VNLOG + 1-1 DFAD + addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialVNLOG(), whenArriving, whenLeaving, entity); addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialDFAD(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; addBuoyFromObservedSystem = true; @@ -394,8 +398,7 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialALOG(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; } else if (observedSystemCodes.contains("24")) { - // add ObjectMaterial 2-2 ALOG + 1-1 DFAD - addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialALOG(), whenArriving, whenLeaving, entity); + // add ObjectMaterial 1-1 DFAD addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialDFAD(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; addBuoyFromObservedSystem = true; @@ -403,6 +406,10 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { // add ObjectMaterial 1-2 AFAD addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialAFAD(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; + } else if (observedSystemCodes.contains("81")) { + // add ObjectMaterial 2-1-2-1 Carrion + addObjectMaterial(vesselActivityCode, objectMaterialUsed, dataContext.getObjectMaterialCarrion(), whenArriving, whenLeaving, entity); + addDefaultObjectMaterialOnUnknownObjectType = false; } if (floatingObjectExistsInAvdth) { // simple mapping ===================================== src/site/markdown/avdth/logbook.md ===================================== @@ -138,7 +138,7 @@ Dans **AVDTH**, il existe trois notions à considéder : 1. ```ACTIVITE.C_TYP_OBJET``` donne le type de DCP (la valeur ```NULL``` ou ```999``` indique pas de DCP déclaré dans **AVDTH**) 2. ```ACTIVITE.C_TYP_BALISE``` donne le type de balise (la valeur ```NULL``` ou ```999``` indique pas de bouée délcarée dans **AVDTH**) -3. Les valeurs ```20,21,22,23,24,25``` de la table ```ACT_ASSOC.C_ASSOC``` permettent de définir aussi un DCP (et de renseigner les matériaux associés) +3. Les valeurs ```20,21,22,23,24,25,81``` de la table ```ACT_ASSOC.C_ASSOC``` permettent de définir aussi un DCP (et de renseigner les matériaux associés) On va alors interdire l'ajout d'un DCP, si aucune des trois notions précédentes n'est satisfaite, en clair on ne peut pas ajouté un DPC si : @@ -249,11 +249,12 @@ tableau suivant : | ACT_ASSOC.C_ASSOC | ObjectMaterial | |:------------------|:---------------| | 20 | FOB | -| 21 | NLOG | -| 22 [1](#n_6_1) | NLOG + DFAD | +| 21 | VNLOG | +| 22 [1](#n_6_1) | VNLOG + DFAD | | 23 | ALOG | -| 24 [1](#n_6_1) | ALOG DFAD | +| 24 [1](#n_6_1) | DFAD | | 25 | AFAD | +| 81 | Carrion | * Note 1 <a name="n_6_1"></a> ===================================== src/site/markdown/avdth/referential.md ===================================== @@ -184,7 +184,7 @@ Pour transposer tous les codes **ACT_ASSOC.C_ASSOC** en code **ps_common.Observe | 73 | 73 | | 74 | 74 | | 80 | 80 | -| 81 | 81 | +| 81 | 81 + 20 | | 90 | 90 | | 91 | 91 | | 92 | 92 | View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0698ab90d0d70c21c34fe07da… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/0698ab90d0d70c21c34fe07da… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Ajout d'un code à transcoder OPERA vers VesselActivity - Closes #2803
by Tony CHEMIT (＠tchemit) Nov. 13, 2023

Nov. 13, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: dc95c50b by Tony Chemit at 2023-11-13T12:19:19+01:00 Ajout d'un code à transcoder OPERA vers VesselActivity - Closes #2803 - - - - - 2 changed files: - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/VesselActivityInterceptor.java Changes: ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -539,7 +539,7 @@ public class ImportReferentialContext { } public VesselActivity getVesselActivity(String code) { - String observeVesselActivityCode = VesselActivityInterceptor.CODE_MAPPING.get(code); + String observeVesselActivityCode = VesselActivityInterceptor.getObserveCode(code); VesselActivity result = vesselActivity.get(observeVesselActivityCode); return Objects.requireNonNull(result, String.format("Can't find vessel activity wth code: %s", code)); } ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/VesselActivityInterceptor.java ===================================== @@ -122,14 +122,32 @@ public class VesselActivityInterceptor extends ReferentialInterceptor<VesselActi } } + /** + * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2803">2803</a> + * + * @param code the avdth code + * @return the observe code + */ + public static String getObserveCode(String code) { + String realCode = CODE_MAPPING.get(code); + if (realCode == null) { + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2803 + int codeAsInteger = Integer.parseInt(code); + if (codeAsInteger >= 52) { + realCode = code; + } + } + return Objects.requireNonNull(realCode, String.format("Can't find vessel activity wth code: %s", code)); + } + public VesselActivityInterceptor(AvdthReferentialImportContext context) { super(context, VesselActivity.SPI); } @Override protected VesselActivity read(Map<String, VesselActivity> existingIndex, String code) { - String realCode = CODE_MAPPING.get(code); - VesselActivity entity = super.read(existingIndex, Objects.requireNonNull(realCode)); + String realCode = getObserveCode(code); + VesselActivity entity = super.read(existingIndex, realCode); entity.setCode(code); return entity; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dc95c50b12f9c4532d3d44062… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/dc95c50b12f9c4532d3d44062… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Erreur de migration sur bases AZTI locales - Closes #2800
by Tony CHEMIT (＠tchemit) Nov. 13, 2023

Nov. 13, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: bf41e7c3 by Tony Chemit at 2023-11-13T11:09:58+01:00 Erreur de migration sur bases AZTI locales - Closes #2800 - - - - - 4 changed files: - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_1.java - + core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_22-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_72-common.sql - + core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_finalize-common.sql Changes: ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_1.java ===================================== @@ -302,6 +302,10 @@ public class DataSourceMigrationForVersion_9_1 extends ByMajorMigrationVersionRe executor.addScript("09", "adapt_table-common_vessel-add-fields"); // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2646 executor.addScript("10", "adapt_table-common_vessel-rename-field"); + if (withIds) { + // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2800 + addCountries(executor); + } // See https://gitlab.com/ultreiaio/ird-observe/-/issues/2659 executor.addScript("11", "adapt_table-common_fpazone-add-fields"); if (withIds) { @@ -367,6 +371,22 @@ public class DataSourceMigrationForVersion_9_1 extends ByMajorMigrationVersionRe } } + private void addCountries(MigrationVersionResourceExecutor executor) { + Set<String> existingCodes = executor.findMultipleResultAstSet(SqlQuery.wrap("SELECT topiaId FROM common.Country", resultSet -> resultSet.getString(1))); + Set<String> newCodes = new LinkedHashSet<>(); + if (!existingCodes.contains("fr.ird.referential.common.Country#1239832675593#0.24921769452411147")) { + executor.addScript("10_2", "add_referential_common_Country_22"); + newCodes.add("22"); + } + if (!existingCodes.contains("fr.ird.referential.common.Country#1464000000000#0.00072")) { + executor.addScript("10_2", "add_referential_common_Country_72"); + newCodes.add("72"); + } + if (!newCodes.isEmpty()) { + executor.addScript("10_2", "add_referential_common_Country_finalize"); + } + } + private Map<String, List<WellPlanStructure>> splitByTrip(List<WellPlanStructure> existingWellPlan) { String tripId = null; List<WellPlanStructure> forTrip = null; ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_22-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%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 common.country (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, iso2code, iso3code) VALUES ('fr.ird.referential.common.Country#1239832675593#0.24921769452411147', 22, '2009-04-15 00:00:00.014000', '2020-03-06 16:01:25.630000', '22', null, null, false, 1, 'Mauritius', 'Maurice', 'Mauricio', null, null, null, null, null, 'MU', 'MUS'); \ No newline at end of file ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_72-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%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 common.country (topiaid, topiaversion, topiacreatedate, lastupdatedate, code, uri, homeid, needcomment, status, label1, label2, label3, label4, label5, label6, label7, label8, iso2code, iso3code) VALUES ('fr.ird.referential.common.Country#1464000000000#0.00072', 3, '2018-06-13 18:31:03.000000', '2020-03-06 16:21:07.403000', '72', null, null, false, 1, 'Namibia', 'Namibie', 'Namibia', null, null, null, null, null, 'NA', 'NAM'); \ No newline at end of file ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.1/10_2_add_referential_common_Country_finalize-common.sql ===================================== @@ -0,0 +1,22 @@ +--- +-- #%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% +--- +UPDATE common.LastUpdateDate SET lastUpdateDate = ${CURRENT_TIMESTAMP} WHERE type ='fr.ird.observe.entities.referential.common.Country'; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bf41e7c3772e26fcdd2184dae… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/bf41e7c3772e26fcdd2184dae… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: update pom
by Tony CHEMIT (＠tchemit) Nov. 13, 2023

Nov. 13, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 489f0113 by Tony Chemit at 2023-11-13T10:09:00+01:00 update pom - - - - - 1aca8fce by Tony Chemit at 2023-11-13T10:27:06+01:00 Erreur migration 9.1 vers 9.2 de la base centrale AZTI - Closes #2801 - - - - - 2 changed files: - core/persistence/migration/src/main/resources/db/migration/v9/9.2/13_issue-2787-common.sql - pom.xml Changes: ===================================== core/persistence/migration/src/main/resources/db/migration/v9/9.2/13_issue-2787-common.sql ===================================== @@ -23,30 +23,50 @@ INSERT INTO common.GearCharacteristic (TOPIAID, TOPIAVERSION, TOPIACREATEDATE, LASTUPDATEDATE, CODE, URI, HOMEID, NEEDCOMMENT, STATUS, LABEL1, LABEL2, LABEL3, LABEL4, LABEL5, LABEL6, LABEL7, LABEL8, UNIT, GEARCHARACTERISTICTYPE) VALUES ('fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027', 0, ${CURRENT_DATE}, ${CURRENT_TIMESTAMP}, '27', null, null, false, 1, 'Electric power', 'Puissance électrique', 'Energia electrica', null, null, null, null, null, 'kW', 'fr.ird.referential.common.GearCharacteristicType#1239832686123#0.3'); -- add characteristic (4, 5, 15 and 27) to gear 2 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.1' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.1' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.1' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.1' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ( 'fr.ird.referential.common.Gear#1239832686125#0.1', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); -- add characteristic (4, 5, 15 and 27) to gear 3 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.2' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.2' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.2' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.2' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.2', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); -- add characteristic (4, 5, 15 and 27) to gear 4 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.3' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.3' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.3' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.3' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.3', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); -- add characteristic (4, 5, 15 and 27) to gear 5 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.4' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.4' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.4' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.4' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); --- INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); +INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.4', 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'); -- add characteristic (4, 5, 15 and 27) to gear 6 +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.5' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.5' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.5' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'; +DELETE FROM common.gear_allowedGearCharacteristic WHERE gear = 'fr.ird.referential.common.Gear#1239832686125#0.5' AND gearCharacteristic = 'fr.ird.referential.common.GearCharacteristic#${REFERENTIAL_PREFIX}027'; INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.4'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.5'); INSERT INTO common.gear_allowedGearCharacteristic(gear, gearCharacteristic) VALUES ('fr.ird.referential.common.Gear#1239832686125#0.5', 'fr.ird.referential.common.GearCharacteristic#1239832686124#0.1'); ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.45</version> + <version>2023.47</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -547,7 +547,7 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-text</artifactId> - <version>1.10.0</version> + <version>${lib.version.commons-text}</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8af50c621b21654c6f252ad7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/8af50c621b21654c6f252ad7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve cache usage in gears (See #2793)
by Tony CHEMIT (＠tchemit) Oct. 18, 2023

Oct. 18, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8af50c62 by Tony Chemit at 2023-10-18T15:38:30+02:00 Improve cache usage in gears (See #2793) - - - - - 1 changed file: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java ===================================== @@ -33,7 +33,6 @@ import fr.ird.observe.client.util.table.EditableTableModelWithCache; import fr.ird.observe.client.util.table.JXTableUtil; import fr.ird.observe.dto.BusinessDto; import fr.ird.observe.dto.data.ContainerChildDto; -import fr.ird.observe.dto.data.ContainerDto; import fr.ird.observe.dto.data.GearUseFeaturesAware; import fr.ird.observe.dto.data.GearUseFeaturesMeasurementAware; import fr.ird.observe.dto.referential.common.GearCharacteristicListItemReference; @@ -47,7 +46,6 @@ import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.validator.swing.SwingValidator; import javax.swing.JScrollPane; -import javax.swing.JTable; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -108,23 +106,6 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus super(listProperty); } - @Override - public void onBeforeResetRow(String prefix, int editingRow, JTable table) { - if (!isEditable()) { - return; - } - log.info(String.format("%sBefore reset edit bean at row: %d", prefix, editingRow)); - UIHelper.cancelEditing(table); - @SuppressWarnings("unchecked") ContainerDto containerBean = (ContainerDto) ui.getBean(); - List children = containerBean.getChildren(); - P bean = children.get(editingRow); - @SuppressWarnings("unchecked") List<E> gearUseFeaturesMeasurement = (List<E>) bean.getGearUseFeaturesMeasurement(); - cache().replace(editingRow, gearUseFeaturesMeasurement); - List<E> newData = cache().get(editingRow); - setData(newData); - validate(); - } - private void onGearChanged(ContentTableUI<?, P, ?> ui, ContentTableUITableModel<?, P, ?> tableModel, GearReference newGear, boolean selectionRowChanged) { if (!tableModel.isEditable()) { return; @@ -177,8 +158,7 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus public void setDefaultMeasurementsOnSelectedRow(String gearId, int editingRow) { List<E> measurements = getDefaultGearUseFeaturesMeasurement(gearId); log.info(String.format("User mode, use default measurements: %d", measurements.size())); - //FIXME Error no list for row -1 - cache().replace(editingRow, measurements); + cache().update(editingRow, measurements); setData(measurements); setModified(false); listProperty().set(measurements); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8af50c621b21654c6f252ad74… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/8af50c621b21654c6f252ad74… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Improve cache usage in gears (need more test)
by Tony CHEMIT (＠tchemit) Oct. 14, 2023

Oct. 14, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 77125d4a by Tony Chemit at 2023-10-14T11:19:37+02:00 Improve cache usage in gears (need more test) - - - - - 1 changed file: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/GearUseFeaturesMeasurementsTableModelSupport.java ===================================== @@ -33,7 +33,6 @@ import fr.ird.observe.client.util.table.EditableTableModelWithCache; import fr.ird.observe.client.util.table.JXTableUtil; import fr.ird.observe.dto.BusinessDto; import fr.ird.observe.dto.data.ContainerChildDto; -import fr.ird.observe.dto.data.ContainerDto; import fr.ird.observe.dto.data.GearUseFeaturesAware; import fr.ird.observe.dto.data.GearUseFeaturesMeasurementAware; import fr.ird.observe.dto.referential.common.GearCharacteristicListItemReference; @@ -47,7 +46,6 @@ import org.apache.logging.log4j.Logger; import org.nuiton.jaxx.validator.swing.SwingValidator; import javax.swing.JScrollPane; -import javax.swing.JTable; import java.util.ArrayList; import java.util.List; import java.util.Objects; @@ -108,22 +106,22 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus super(listProperty); } - @Override - public void onBeforeResetRow(String prefix, int editingRow, JTable table) { - if (!isEditable()) { - return; - } - log.info(String.format("%sBefore reset edit bean at row: %d", prefix, editingRow)); - UIHelper.cancelEditing(table); - @SuppressWarnings("unchecked") ContainerDto containerBean = (ContainerDto) ui.getBean(); - List children = containerBean.getChildren(); - P bean = children.get(editingRow); - @SuppressWarnings("unchecked") List<E> gearUseFeaturesMeasurement = (List<E>) bean.getGearUseFeaturesMeasurement(); - cache().replace(editingRow, gearUseFeaturesMeasurement); - List<E> newData = cache().get(editingRow); - setData(newData); - validate(); - } +// @Override +// public void onBeforeResetRow(String prefix, int editingRow, JTable table) { +// if (!isEditable()) { +// return; +// } +// log.info(String.format("%sBefore reset edit bean at row: %d", prefix, editingRow)); +// UIHelper.cancelEditing(table); +// @SuppressWarnings("unchecked") ContainerDto containerBean = (ContainerDto) ui.getBean(); +// List children = containerBean.getChildren(); +// P bean = children.get(editingRow); +// @SuppressWarnings("unchecked") List<E> gearUseFeaturesMeasurement = (List<E>) bean.getGearUseFeaturesMeasurement(); +// cache().replace(editingRow, gearUseFeaturesMeasurement); +// List<E> newData = cache().get(editingRow); +// setData(newData); +// validate(); +// } private void onGearChanged(ContentTableUI<?, P, ?> ui, ContentTableUITableModel<?, P, ?> tableModel, GearReference newGear, boolean selectionRowChanged) { if (!tableModel.isEditable()) { @@ -178,7 +176,7 @@ public abstract class GearUseFeaturesMeasurementsTableModelSupport<E extends Bus List<E> measurements = getDefaultGearUseFeaturesMeasurement(gearId); log.info(String.format("User mode, use default measurements: %d", measurements.size())); //FIXME Error no list for row -1 - cache().replace(editingRow, measurements); + cache().update(editingRow, measurements); setData(measurements); setModified(false); listProperty().set(measurements); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/77125d4a876113bff9f3f2e85… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/77125d4a876113bff9f3f2e85… 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.2.0)
by Tony CHEMIT (＠tchemit) Oct. 9, 2023

Oct. 9, 2023

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: fa5b11a7 by Tony Chemit at 2023-10-09T13:06:29+02:00 Site checkin for project ObServe (version 9.2.0) - - - - - 1 changed file: - − 9.2.0-SNAPSHOT/avdth/index.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fa5b11a7dcce7c13622ee34d7… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fa5b11a7dcce7c13622ee34d7… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update changelog for v.9.2.0 [skip CI]
by Tony CHEMIT (＠tchemit) Oct. 9, 2023

Oct. 9, 2023

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3a5523c0 by Tony Chemit at 2023-10-09T12:12:57+02:00 Update changelog for v.9.2.0 [skip CI] - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== @@ -1,7 +1,7 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2023-10-09 11:10. + * Last generated at 2023-10-09 12:12. ## Version [9.2.0](https://gitlab.com/ultreiaio/ird-observe/-/milestones/269) @@ -12,7 +12,6 @@ * [Serveur (observe-9.2.0.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9…) * [Serveur (observe-9.2.0-server.zip)](https://repo1.maven.org/maven2/fr/ird/observe/ob…) - ### Issues * [[Type::Anomalie 2761]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2761) **Validation d'une activité 13 sans heure** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Anomalie 2768]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2768) **On ne voit pas les toolTip dans les arbres des assistants de synchronisation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) @@ -23,6 +22,7 @@ * [[Type::Anomalie 2779]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2779) **La valeur null du champs de type time est altérée lors de l'ouverture des formulaires** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Anomalie 2786]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2786) **Lors de la suppression d'une donnée, il faut mettre à jour le champ lastUpdateDate sur les entités qui remontent jusqu'à la marée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Anomalie 2792]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2792) **Une incompatibilité empêche l'ouverture de l'application sous Java 21** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) + * [[Type::Anomalie 2793]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2793) **L'UI équipement n'interdit pas d'associer à un équipement une caractéristique qui ne lui est pas destinée** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Evolution 2211]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2211) **Revoir la validation pour produire un résultat en forme d'arbre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2215]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2215) **Améliorer le rapport de validation** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2449]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2449) **Nouveaux flags allowSet et fpaZoneMode sur les types d'activités bateau** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil) @@ -51,6 +51,7 @@ * [[Type::Evolution 2785]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2785) **Sur le déplacement d'un activité, il faut recalculer les numéros d'ordre des activités sur la route origine et la route destination du déplacement.** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2787]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2787) **Ajout de caractéristiques autorisées sur des équipements** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) * [[Type::Evolution 2788]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2788) **Supprimer les valeurs ```None``` des identifiants de balises via la migration classique.** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Type::Evolution 2794]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2794) **Elargir l'affichage du panneau Caractéristiques (d'un équipement)** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) * [[Type::Tâche 2791]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2791) **Problème de connexion au serveur IEO** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [9.1.6](https://gitlab.com/ultreiaio/ird-observe/-/milestones/270) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3a5523c0a1056781411ddf7ce… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/3a5523c0a1056781411ddf7ce… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.2.0
by Tony CHEMIT (＠tchemit) Oct. 9, 2023

Oct. 9, 2023

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

1 0