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

[Git][ultreiaio/ird-observe][feature/issue_avdth_dcp] AVDTH - Review and clarify dcp migration
by Tony CHEMIT (＠tchemit) Dec. 13, 2022

Dec. 13, 2022

Tony CHEMIT pushed to branch feature/issue_avdth_dcp at ultreiaio / ird-observe Commits: 20e1ed4b by Tony Chemit at 2022-12-13T14:39:06+01:00 AVDTH - Review and clarify dcp migration - - - - - 3 changed files: - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java - core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java - src/site/markdown/avdth/logbook.md Changes: ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/ImportReferentialContext.java ===================================== @@ -58,7 +58,6 @@ import fr.ird.observe.entities.referential.ps.logbook.SetSuccessStatus; import fr.ird.observe.entities.referential.ps.logbook.WellContentStatus; import fr.ird.observe.entities.referential.ps.logbook.WellSamplingConformity; import fr.ird.observe.entities.referential.ps.logbook.WellSamplingStatus; -import fr.ird.observe.persistence.avdth.data.logbook.FloatingObjectReader; import fr.ird.observe.persistence.avdth.data.logbook.WellPlanReader; import fr.ird.observe.persistence.avdth.referential.AvdthReferentialImportResult; import fr.ird.observe.persistence.avdth.referential.SpeciesCache; @@ -80,10 +79,8 @@ import java.util.function.Consumer; * @author Tony Chemit - dev(a)tchemit.fr * @since 9.0.0 */ -@SuppressWarnings("SpellCheckingInspection") public class ImportReferentialContext { - private Map<String, WeightCategory> landingCategories; private Map<String, Destination> destinations; private Map<String, WeightCategory> wellCategories; @@ -127,6 +124,7 @@ public class ImportReferentialContext { private ObjectMaterial objectMaterialDFAD; private ObjectMaterial objectMaterialALOG; private ObjectMaterial objectMaterialAFAD; + private ObjectMaterial objectMaterialBiodegradable; private ObjectMaterial objectMaterialAlone; private ObjectMaterial objectMaterialLOG; private ObjectMaterial objectMaterialFALOG; @@ -228,6 +226,7 @@ public class ImportReferentialContext { objectMaterialHALOG = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.67"); objectMaterialVNLOG = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.52"); objectMaterialAlone = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#1561561977652#0.5876332198776647"); + objectMaterialBiodegradable = objectMaterial.get("fr.ird.referential.ps.common.ObjectMaterial#0#0.69"); // catch catchCategories = new TreeMap<>(); @@ -333,6 +332,26 @@ public class ImportReferentialContext { return objectMaterialAFAD; } + public ObjectMaterial getObjectMaterialLOG() { + return objectMaterialLOG; + } + + public ObjectMaterial getObjectMaterialFALOG() { + return objectMaterialFALOG; + } + + public ObjectMaterial getObjectMaterialHALOG() { + return objectMaterialHALOG; + } + + public ObjectMaterial getObjectMaterialVNLOG() { + return objectMaterialVNLOG; + } + + public ObjectMaterial getObjectMaterialBiodegradable() { + return objectMaterialBiodegradable; + } + public ObjectMaterial getObjectMaterialAlone() { return objectMaterialAlone; } @@ -529,79 +548,29 @@ public class ImportReferentialContext { entity.addObservedSystem(getObservedSystem("102")); } - public ObjectOperation getObjectOperationByVesselActivityCode(String vesselActivityCode) { - String objectOperationCode = FloatingObjectReader.DCP_OBJECT_OPERATION_CODE_MAPPING.get(vesselActivityCode); - if (objectOperationCode == null) { - return null; - } + public ObjectOperation getObjectOperation(String objectOperationCode) { return objectOperation.get(objectOperationCode); } - public TransmittingBuoyOperation getTransmittingBuoyOperationByVesselActivityCode(String vesselActivityCode) { - String transmittingBuoyTypeCode = FloatingObjectReader.TRANSMITTING_BUOY_OPERATION_CODE_MAPPING.get(vesselActivityCode); + public TransmittingBuoyOperation getTransmittingBuoyOperation(String transmittingBuoyTypeCode) { if (transmittingBuoyTypeCode == null) { return null; } return transmittingBuoyOperation.get(transmittingBuoyTypeCode); } - public TransmittingBuoyType getTransmittingBuoyTypeByBuoyTypeCode(String buoyTypeCode) { - String transmittingBuoyTypeCode = FloatingObjectReader.TRANSMITTING_BUOY_TYPE_CODE_MAPPING.get(buoyTypeCode); - if (transmittingBuoyTypeCode == null) { - transmittingBuoyTypeCode = "999"; - } - TransmittingBuoyType transmittingBuoyType = this.transmittingBuoyType.get(transmittingBuoyTypeCode); - return Objects.requireNonNull(transmittingBuoyType, String.format("Can't find transmittingBuoyType with code: %s", buoyTypeCode)); + public TransmittingBuoyType getTransmittingBuoyType(String transmittingBuoyTypeCode) { + TransmittingBuoyType result = transmittingBuoyType.get(transmittingBuoyTypeCode); + return Objects.requireNonNull(result, String.format("Can't find result with code: %s", transmittingBuoyTypeCode)); } - public TransmittingBuoyOwnership getTransmittingBuoyOwnership(String buoyOwnershipCode) { - if (buoyOwnershipCode == null) { - return null; - } - String transmittingBuoyOwnershipCode = FloatingObjectReader.TRANSMITTING_BUOY_OWNERSHIP_CODE_MAPPING.get(buoyOwnershipCode); + public TransmittingBuoyOwnership getTransmittingBuoyOwnership(String transmittingBuoyOwnershipCode) { if (transmittingBuoyOwnershipCode == null) { return null; } return transmittingBuoyOwnership.get(transmittingBuoyOwnershipCode); } - public ObservedSystem getObservedSystem(String objectTypeCode, String buoyTypeCode) { - if (objectTypeCode.equals("999")) { - if (buoyTypeCode.equals("999")) { - return getObservedSystem0(); - } - return getObservedSystem20(); - } - String observedSystemCode = FloatingObjectReader.OBSERVED_SYSTEM_CODE_MAPPING.get(objectTypeCode); - return getObservedSystem(observedSystemCode, false); - } - - /** - * To get objectMaterial id associated by a DCP from avdth ACTIVITE.C_TYP_OBJET code. - * - * @param objectTypeCode ACTIVITE.C_TYP_OBJET - * @return material or null - */ - public ObjectMaterial getObjectMaterialByObjectTypeCode(String objectTypeCode) { - switch (objectTypeCode) { - case "1": - return objectMaterialAFAD; - case "2": - return objectMaterialDFAD; - case "3": - return objectMaterialLOG; - case "9": - return objectMaterialFOB; - case "10": - return objectMaterialFALOG; - case "11": - return objectMaterialHALOG; - case "13": - return objectMaterialVNLOG; - } - return null; - } - public WeightCategory getWellWeightCategory(String weightCategoryCode) { String categoryCode = "W-" + weightCategoryCode; WeightCategory weightCategory = wellCategories.get(categoryCode); @@ -611,4 +580,5 @@ public class ImportReferentialContext { public VesselActivity getVesselActivity6() { return vesselActivity6; } + } ===================================== core/persistence/resources/src/main/java/fr/ird/observe/persistence/avdth/data/logbook/FloatingObjectReader.java ===================================== @@ -23,6 +23,7 @@ package fr.ird.observe.persistence.avdth.data.logbook; */ import com.google.common.collect.ImmutableMap; +import fr.ird.observe.entities.data.ps.logbook.Activity; import fr.ird.observe.entities.data.ps.logbook.FloatingObject; import fr.ird.observe.entities.data.ps.logbook.FloatingObjectPart; import fr.ird.observe.entities.data.ps.logbook.TransmittingBuoy; @@ -232,54 +233,113 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { @Override public FloatingObject read(ImportDataContext dataContext, ResultSet resultSet) throws SQLException { - String vesselActivityCode = resultSet.getString(13); - VesselActivity vesselActivity = dataContext.getVesselActivity(vesselActivityCode); + // Get the current activity where to add the optional floating object + Activity activity = dataContext.getActivity(); + + // Get his vessel activity + VesselActivity vesselActivity = activity.getVesselActivity(); + + // Avdth observed system codes associated to the current activity (need them to compute ex nihilo floating object) Set<String> observedSystemCodes = dataContext.getObservedSystemCodes(); - if (!Objects.equals(vesselActivity.getCode(), "13")) { - boolean noDcpInObservedSystems = observedSystemCodes.stream().noneMatch(OBSERVED_SYTEM_CODES_WITH_DCP::contains); - if (noDcpInObservedSystems) { - reset(dataContext); - return null; - } - } - FloatingObject entity = newEntity(FloatingObject.SPI); + // We need to get the original vessel activity code from AVDTH (to compute some mapping) + String vesselActivityCode = resultSet.getString(13); - ObjectOperation objectOperation = dataContext.getObjectOperationByVesselActivityCode(vesselActivityCode); - entity.setObjectOperation(Objects.requireNonNull(objectOperation, String.format("Can't find objectOperation with code: %s", vesselActivityCode))); - boolean addCoordinate = "11".equals(objectOperation.getCode()); - boolean whenArriving = WHEN_ARRIVING_CODE.contains(vesselActivityCode); - boolean whenLeaving = WHEN_LEAVING_CODE.contains(vesselActivityCode); + // Is the floating object can be created by the observed systems? + boolean floatingObjectCreatedByObservedSystem = observedSystemCodes.stream().anyMatch(OBSERVED_SYTEM_CODES_WITH_DCP::contains); + + // Is the current vessel activity accept to create Floating object? + boolean vesselActivityAllowFad = vesselActivity.isAllowFad(); + + // Get object type code String objectTypeCode = resultSet.getString(28); if (objectTypeCode == null) { - //FIXME should fail ? + // If null, then consider it as not found in avdth objectTypeCode = "999"; } - //FIXME 29 - F_DCP_ECO -// int dcpEcoCode = resultSet.getInt(29); - String buoyOwnershipCode = resultSet.getString(30); + + // Is floating object exists in avdth? + boolean floatingObjectExistsInAvdth = !objectTypeCode.equals("999"); + + //FIXME Improve this condition + if (!vesselActivityAllowFad && !floatingObjectCreatedByObservedSystem) { + // do not create the floating object + reset(dataContext); + return null; + } + + FloatingObject entity = newEntity(FloatingObject.SPI); + + // Get floating object operation + ObjectOperation objectOperation = getObjectOperationByVesselActivityCode(dataContext, vesselActivityCode); + entity.setObjectOperation(Objects.requireNonNull(objectOperation, String.format("Can't find objectOperation with ACTIVITE.C_OPERA: %s", vesselActivityCode))); + String buoyTypeCode = resultSet.getString(31); if (buoyTypeCode == null) { - //FIXME should fail? + // If null, then consider it as not found in avdth buoyTypeCode = "999"; } - String buoyId = resultSet.getString(32); - String dcpWeight = resultSet.getString(33); - if (dcpWeight != null) { - //FIXME Check if ok - entity.setComment(String.format("ACTIVITE.POIDS_ESTIM_DCP value from avdth: %s", dcpWeight)); - } - ObservedSystem observedSystem = dataContext.getObservedSystem(objectTypeCode, buoyTypeCode); + // IS buoy exists in avdth? + boolean buoyExistsInAvdth = !"999".equals(buoyTypeCode); + + ObservedSystem observedSystem = getObservedSystem(dataContext, objectTypeCode, floatingObjectExistsInAvdth, buoyExistsInAvdth); if (observedSystem != null) { - dataContext.getActivity().addObservedSystem(observedSystem); + activity.addObservedSystem(observedSystem); + } + + boolean addBuoyFromObservedSystem = addFloatingObjectMaterials(dataContext, + resultSet, + vesselActivityCode, + objectTypeCode, + observedSystemCodes, + entity, + floatingObjectExistsInAvdth, + buoyExistsInAvdth); + + TransmittingBuoy transmittingBuoy = null; + if (buoyExistsInAvdth) { + transmittingBuoy = getBuoyFromAvdthActivity(dataContext, resultSet, buoyTypeCode, vesselActivityCode, objectOperation, activity); + } else if (addBuoyFromObservedSystem) { + transmittingBuoy = getBuoyFromObservedSystem(dataContext); } - // avdth data has a buoy - boolean willCreateBuoy = !"999".equals(buoyTypeCode); + if (transmittingBuoy != null) { + // only add buoy if buoy type known + entity.addTransmittingBuoy(transmittingBuoy); + } + reset(dataContext); + return entity; + } + + private boolean addFloatingObjectMaterials(ImportDataContext dataContext, + ResultSet resultSet, + String vesselActivityCode, + String objectTypeCode, + Set<String> observedSystemCodes, + FloatingObject entity, + boolean floatingObjectExistsInAvdth, + boolean buoyExistsInAvdth) throws SQLException { + boolean whenArriving = WHEN_ARRIVING_CODE.contains(vesselActivityCode); + boolean whenLeaving = WHEN_LEAVING_CODE.contains(vesselActivityCode); + // to add default material if there is a declared buoy and no object material created by ObservedSystem boolean addDefaultObjectMaterialOnUnknownObjectType = true; // should create a buoy from ObservedSystem boolean addBuoyFromObservedSystem = false; Set<String> objectMaterialUsed = new TreeSet<>(); + + if (floatingObjectExistsInAvdth) { + String dcpWeight = resultSet.getString(33); + if (dcpWeight != null) { + //FIXME Check if ok + entity.setComment(String.format("ACTIVITE.POIDS_ESTIM_DCP value from avdth: %s", dcpWeight)); + } + Object dcpEcoCode = resultSet.getObject(29); + if (dcpEcoCode != null && Objects.equals(2, dcpEcoCode)) { + // add material 4-1 (Biodegradable materials) + addObjectMaterial(objectMaterialUsed, dataContext.getObjectMaterialBiodegradable(), whenArriving, whenLeaving, entity); + } + } + if (observedSystemCodes.contains("20")) { // add ObjectMaterial FOB addObjectMaterial(objectMaterialUsed, dataContext.getObjectMaterialFOB(), whenArriving, whenLeaving, entity); @@ -309,47 +369,52 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { addObjectMaterial(objectMaterialUsed, dataContext.getObjectMaterialAFAD(), whenArriving, whenLeaving, entity); addDefaultObjectMaterialOnUnknownObjectType = false; } - if ("999".equals(objectTypeCode)) { - if (willCreateBuoy && addDefaultObjectMaterialOnUnknownObjectType) { - // add ObjectMaterial 2-2-4-4 - addObjectMaterial(objectMaterialUsed, dataContext.getObjectMaterialAlone(), whenArriving, whenLeaving, entity); + if (floatingObjectExistsInAvdth) { + // simple mapping + ObjectMaterial objectMaterial = getObjectMaterialByObjectTypeCode(dataContext, objectTypeCode); + if (objectMaterial != null) { + addObjectMaterial(objectMaterialUsed, objectMaterial, whenArriving, whenLeaving, entity); } } else { - // simple mapping - ObjectMaterial objectMaterial1 = dataContext.getObjectMaterialByObjectTypeCode(objectTypeCode); - if (objectMaterial1 != null) { - addObjectMaterial(objectMaterialUsed, objectMaterial1, whenArriving, whenLeaving, entity); + if (buoyExistsInAvdth && addDefaultObjectMaterialOnUnknownObjectType) { + // add ObjectMaterial 2-2-4-4 + addObjectMaterial(objectMaterialUsed, dataContext.getObjectMaterialAlone(), whenArriving, whenLeaving, entity); } } - if (willCreateBuoy) { - // only add buoy if buoy type known - TransmittingBuoyType transmittingBuoyType = dataContext.getTransmittingBuoyTypeByBuoyTypeCode(buoyTypeCode); - TransmittingBuoyOperation transmittingBuoyOperation = dataContext.getTransmittingBuoyOperationByVesselActivityCode(vesselActivityCode); - if (transmittingBuoyOperation != null) { - TransmittingBuoy transmittingBuoy = newEntity(TransmittingBuoy.SPI, transmittingBuoyCount); - transmittingBuoy.setTransmittingBuoyOperation(transmittingBuoyOperation); - transmittingBuoy.setTransmittingBuoyType(transmittingBuoyType); - transmittingBuoy.setCode(buoyId); - if (addCoordinate) { - transmittingBuoy.setLatitude(dataContext.getActivity().getLatitude()); - transmittingBuoy.setLongitude(dataContext.getActivity().getLongitude()); - } - TransmittingBuoyOwnership transmittingBuoyOwnership = dataContext.getTransmittingBuoyOwnership(buoyOwnershipCode); - transmittingBuoy.setTransmittingBuoyOwnership(transmittingBuoyOwnership); - entity.addTransmittingBuoy(transmittingBuoy); - } - } else if (addBuoyFromObservedSystem) { - // only add buoy if observed system ask for it (22 and 24) - TransmittingBuoyType transmittingBuoyType = dataContext.getTransmittingBuoyType98(); - TransmittingBuoyOperation transmittingBuoyOperation = dataContext.getTransmittingBuoyOperation1(); + return addBuoyFromObservedSystem; + } + + private TransmittingBuoy getBuoyFromAvdthActivity(ImportDataContext dataContext, ResultSet resultSet, String buoyTypeCode, String vesselActivityCode, ObjectOperation objectOperation, Activity activity) throws SQLException { + boolean addCoordinate = "11".equals(objectOperation.getCode()); + TransmittingBuoyType transmittingBuoyType = getTransmittingBuoyTypeByBuoyTypeCode(dataContext, buoyTypeCode); + TransmittingBuoyOperation transmittingBuoyOperation = getTransmittingBuoyOperationByVesselActivityCode(dataContext, vesselActivityCode); + if (transmittingBuoyOperation != null) { + String buoyOwnershipCode = resultSet.getString(30); + String buoyId = resultSet.getString(32); TransmittingBuoy transmittingBuoy = newEntity(TransmittingBuoy.SPI, transmittingBuoyCount); transmittingBuoy.setTransmittingBuoyOperation(transmittingBuoyOperation); transmittingBuoy.setTransmittingBuoyType(transmittingBuoyType); - transmittingBuoy.setCode(null); - entity.addTransmittingBuoy(transmittingBuoy); + transmittingBuoy.setCode(buoyId); + if (addCoordinate) { + transmittingBuoy.setLatitude(activity.getLatitude()); + transmittingBuoy.setLongitude(activity.getLongitude()); + } + TransmittingBuoyOwnership transmittingBuoyOwnership = getTransmittingBuoyOwnership(dataContext, buoyOwnershipCode); + transmittingBuoy.setTransmittingBuoyOwnership(transmittingBuoyOwnership); + return transmittingBuoy; } - reset(dataContext); - return entity; + return null; + } + + private TransmittingBuoy getBuoyFromObservedSystem(ImportDataContext dataContext) { + // only add buoy if observed system ask for it (22 and 24) + TransmittingBuoyType transmittingBuoyType = dataContext.getTransmittingBuoyType98(); + TransmittingBuoyOperation transmittingBuoyOperation = dataContext.getTransmittingBuoyOperation1(); + TransmittingBuoy transmittingBuoy = newEntity(TransmittingBuoy.SPI, transmittingBuoyCount); + transmittingBuoy.setTransmittingBuoyOperation(transmittingBuoyOperation); + transmittingBuoy.setTransmittingBuoyType(transmittingBuoyType); + transmittingBuoy.setCode(null); + return transmittingBuoy; } private void reset(ImportDataContext dataContext) { @@ -380,4 +445,74 @@ public class FloatingObjectReader extends DataReader<FloatingObject> { return floatingObjectPartCount.intValue(); } + private ObjectOperation getObjectOperationByVesselActivityCode(ImportDataContext dataContext, String vesselActivityCode) { + String objectOperationCode = DCP_OBJECT_OPERATION_CODE_MAPPING.get(vesselActivityCode); + return dataContext.getObjectOperation(Objects.requireNonNull(objectOperationCode, String.format("Can't find objectOperation with ACTIVITE.C_OPERA: %s", vesselActivityCode))); + } + + private ObservedSystem getObservedSystem(ImportDataContext dataContext, String objectTypeCode, boolean floatingObjectExistsInAvdth,boolean buoyExistsInAvdth) { + if (!floatingObjectExistsInAvdth) { + if (!buoyExistsInAvdth) { + return dataContext.getObservedSystem0(); + } + return dataContext.getObservedSystem20(); + } + String observedSystemCode = OBSERVED_SYSTEM_CODE_MAPPING.get(objectTypeCode); + return dataContext.getObservedSystem(observedSystemCode, false); + } + + private TransmittingBuoyOwnership getTransmittingBuoyOwnership(ImportDataContext dataContext, String buoyOwnershipCode) { + if (buoyOwnershipCode == null) { + return null; + } + String transmittingBuoyOwnershipCode = TRANSMITTING_BUOY_OWNERSHIP_CODE_MAPPING.get(buoyOwnershipCode); + if (transmittingBuoyOwnershipCode == null) { + return null; + } + return dataContext.getTransmittingBuoyOwnership(transmittingBuoyOwnershipCode); + } + + private TransmittingBuoyOperation getTransmittingBuoyOperationByVesselActivityCode(ImportDataContext dataContext, String vesselActivityCode) { + String transmittingBuoyTypeCode = TRANSMITTING_BUOY_OPERATION_CODE_MAPPING.get(vesselActivityCode); + if (transmittingBuoyTypeCode == null) { + return null; + } + return dataContext.getTransmittingBuoyOperation(transmittingBuoyTypeCode); + } + + + private TransmittingBuoyType getTransmittingBuoyTypeByBuoyTypeCode(ImportDataContext dataContext, String buoyTypeCode) { + String transmittingBuoyTypeCode = TRANSMITTING_BUOY_TYPE_CODE_MAPPING.get(buoyTypeCode); + if (transmittingBuoyTypeCode == null) { + transmittingBuoyTypeCode = "999"; + } + TransmittingBuoyType transmittingBuoyType = dataContext.getTransmittingBuoyType(transmittingBuoyTypeCode); + return Objects.requireNonNull(transmittingBuoyType, String.format("Can't find transmittingBuoyType with code: %s", buoyTypeCode)); + } + + /** + * To get objectMaterial id associated by a DCP from avdth ACTIVITE.C_TYP_OBJET code. + * + * @param objectTypeCode ACTIVITE.C_TYP_OBJET + * @return material or null + */ + private ObjectMaterial getObjectMaterialByObjectTypeCode(ImportDataContext dataContext, String objectTypeCode) { + switch (objectTypeCode) { + case "1": + return dataContext.getObjectMaterialAFAD(); + case "2": + return dataContext.getObjectMaterialDFAD(); + case "3": + return dataContext.getObjectMaterialLOG(); + case "9": + return dataContext.getObjectMaterialFOB(); + case "10": + return dataContext.getObjectMaterialFALOG(); + case "11": + return dataContext.getObjectMaterialHALOG(); + case "13": + return dataContext.getObjectMaterialVNLOG(); + } + return null; + } } ===================================== src/site/markdown/avdth/logbook.md ===================================== @@ -46,7 +46,7 @@ La table est déversée dans plusieurs tables : | ACTIVITE_26 | V_VENT_DIR | Activity.windDirection | | | ACTIVITE_27 | V_VENT_VIT | Activity.wind | [9](#n_0_9) | | ACTIVITE_28 | C_TYP_OBJET | | [10](#n_0_10) | -| ACTIVITE_29 | F_DCP_ECO | ??? | | +| ACTIVITE_29 | F_DCP_ECO | Dcp écologique | [10](#n_0_10) | | ACTIVITE_30 | F_PROP_BALISE | TransmittingBuoy.transmittingBuoyOwnerShip | [10](#n_0_10) | | ACTIVITE_31 | C_TYP_BALISE | | [10](#n_0_10) | | ACTIVITE_32 | V_ID_BALISE | TransmittingBuoy.code | | @@ -218,6 +218,7 @@ Pour le **simple mapping** on utilise la translation : | 3 | fr.ird.referential.ps.common.ObjectMaterial#0#0.50 | 2 LOG | | 9 | fr.ird.referential.ps.common.ObjectMaterial#0#1.3 | FOB | +Enfin si la valeur du champs **ACTIVITE.F_DCP_ECO** vaut **2**, alors on ajoute le matériel **4-1** (*Matériaux biodégradables*). * ```FloatingObject.transmittingBuoy``` View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/20e1ed4b8e2424842d91f97d3… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/20e1ed4b8e2424842d91f97d3… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue_avdth_dcp] 11 commits: Report - review ComputeDynamicHeader code (if incoming matrix is empty, was not working)
by Tony CHEMIT (＠tchemit) Dec. 12, 2022

Dec. 12, 2022

Tony CHEMIT pushed to branch feature/issue_avdth_dcp at ultreiaio / ird-observe Commits: 6c949030 by Tony Chemit at 2022-12-12T18:48:14+01:00 Report - review ComputeDynamicHeader code (if incoming matrix is empty, was not working) - - - - - 3be5c67c by Tony Chemit at 2022-12-12T18:58:23+01:00 Lorsque que l'on utilise la fonction Précédent de l'assistants rapports, il est possible de lancer les rapports sur des marées non calculées - Closes #2550 - - - - - c9e2bc87 by Tony Chemit at 2022-12-12T19:29:30+01:00 UI Navigation - Improve when open children nodes need to be rebuild - - - - - a00a0827 by Tony Chemit at 2022-12-12T19:32:26+01:00 Update changelog for v.9.0.22 [skip CI] - - - - - fe5e9fbc by Tony Chemit at 2022-12-12T19:33:42+01:00 [jgitflow-maven-plugin]updating poms for 9.0.23-SNAPSHOT development[skip ci] - - - - - ba0ed2ac by Tony Chemit at 2022-12-12T19:34:07+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.22' with non-snapshot versions[skip ci] - - - - - c2573c84 by Tony Chemit at 2022-12-12T20:24:40+01:00 [jgitflow-maven-plugin]merging 'release/9.0.22' into 'master-9.0.x' - - - - - 7fe3e3c3 by Tony Chemit at 2022-12-12T20:24:50+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - f4ae314d by Tony Chemit at 2022-12-12T20:24:52+01:00 [jgitflow-maven-plugin]merging 'master-9.0.x' into 'develop-9.0.x' - - - - - 2328882e by Tony Chemit at 2022-12-12T20:24:55+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - eacbe919 by Tony Chemit at 2022-12-12T20:42:15+01:00 Do be continued... - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/NodeChildrenUpdate.java - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUIHandler.java - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIHandler.java - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b21143bc3899e51dc7539719… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b21143bc3899e51dc7539719… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue_2573] 11 commits: Report - review ComputeDynamicHeader code (if incoming matrix is empty, was not working)
by Tony CHEMIT (＠tchemit) Dec. 12, 2022

Dec. 12, 2022

Tony CHEMIT pushed to branch feature/issue_2573 at ultreiaio / ird-observe Commits: 6c949030 by Tony Chemit at 2022-12-12T18:48:14+01:00 Report - review ComputeDynamicHeader code (if incoming matrix is empty, was not working) - - - - - 3be5c67c by Tony Chemit at 2022-12-12T18:58:23+01:00 Lorsque que l'on utilise la fonction Précédent de l'assistants rapports, il est possible de lancer les rapports sur des marées non calculées - Closes #2550 - - - - - c9e2bc87 by Tony Chemit at 2022-12-12T19:29:30+01:00 UI Navigation - Improve when open children nodes need to be rebuild - - - - - a00a0827 by Tony Chemit at 2022-12-12T19:32:26+01:00 Update changelog for v.9.0.22 [skip CI] - - - - - fe5e9fbc by Tony Chemit at 2022-12-12T19:33:42+01:00 [jgitflow-maven-plugin]updating poms for 9.0.23-SNAPSHOT development[skip ci] - - - - - ba0ed2ac by Tony Chemit at 2022-12-12T19:34:07+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.22' with non-snapshot versions[skip ci] - - - - - c2573c84 by Tony Chemit at 2022-12-12T20:24:40+01:00 [jgitflow-maven-plugin]merging 'release/9.0.22' into 'master-9.0.x' - - - - - 7fe3e3c3 by Tony Chemit at 2022-12-12T20:24:50+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - f4ae314d by Tony Chemit at 2022-12-12T20:24:52+01:00 [jgitflow-maven-plugin]merging 'master-9.0.x' into 'develop-9.0.x' - - - - - 2328882e by Tony Chemit at 2022-12-12T20:24:55+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - df145667 by Tony Chemit at 2022-12-12T20:41:54+01:00 to be continued - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/NodeChildrenUpdate.java - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUIHandler.java - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIHandler.java - client/datasource/editor/spi/pom.xml - client/datasource/pom.xml - client/pom.xml - client/runner/pom.xml - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/api/dto/pom.xml - core/api/pom.xml - core/api/services/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/deeff0f3c4d1d521b1d6e93b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/deeff0f3c4d1d521b1d6e93b… 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.0.22)
by Tony CHEMIT (＠tchemit) Dec. 12, 2022

Dec. 12, 2022

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

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.0.22
by Tony CHEMIT (＠tchemit) Dec. 12, 2022

Dec. 12, 2022

Tony CHEMIT deleted branch release/9.0.22 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.0.22
by Tony CHEMIT (＠tchemit) Dec. 12, 2022

Dec. 12, 2022

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

1 0

[Git][ultreiaio/ird-observe][release/9.0.22] [jgitflow-maven-plugin]updating poms for branch'release/9.0.22' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) Dec. 12, 2022

Dec. 12, 2022

Tony CHEMIT pushed to branch release/9.0.22 at ultreiaio / ird-observe Commits: ba0ed2ac by Tony Chemit at 2022-12-12T19:34:07+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.22' 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/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ba0ed2ac55d218613495fe77a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/ba0ed2ac55d218613495fe77a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][master-9.0.x] 46 commits: [jgitflow-maven-plugin]updating poms for 9.0.22-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) Dec. 12, 2022

Dec. 12, 2022

Tony CHEMIT pushed to branch master-9.0.x at ultreiaio / ird-observe Commits: 000c7b83 by Tony Chemit at 2022-11-30T18:27:19+01:00 [jgitflow-maven-plugin]updating poms for 9.0.22-SNAPSHOT development[skip ci] - - - - - 5ac7ef9f by Tony Chemit at 2022-11-30T18:50:39+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 7462ee61 by Tony Chemit at 2022-11-30T18:50:40+01:00 [jgitflow-maven-plugin]merging 'master-9.0.x' into 'develop-9.0.x' - - - - - a8764d8b by Tony Chemit at 2022-11-30T18:50:41+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 2f1f273f by Tony Chemit at 2022-12-02T13:15:31+01:00 Rapport LB - Vérification croisée des débarquements, colonnes cuves vides erronées - Closes #2551 - - - - - 63e0cfb5 by Tony Chemit at 2022-12-05T13:55:28+01:00 Gestion des codes AVDTH 40 et 41 par le migrateur AVDTH - Closes #2568 - - - - - 6afd1b3b by Tony Chemit at 2022-12-05T15:06:26+01:00 Report - Ajouter la valeur nulle possible sur la méthode computeIndexList (utilisé pour l'opération ComputeDynamicHeader et ExecuteRequestAndReorganizeCountByRepeatVariable) - - - - - 4fb73312 by Tony Chemit at 2022-12-05T15:06:42+01:00 Report - Adaptation du report Dénombrement des captures par devenir, filtrés par groupe pour y inclure tous les devenirs existants dans le référentiel - - - - - 1ef23720 by Tony Chemit at 2022-12-05T15:06:53+01:00 Report - Adaptation du report Distribution des tailles par espèces et type de mesure pour y inclure tous les devenirs existants dans le référentiel - - - - - be2abbc1 by Tony Chemit at 2022-12-05T15:45:30+01:00 Merge branch 'feature/issue_2553' into develop-9.0.x Rapport Observations - Dénombrement des captures par devenir, filtrés par groupe - Closes #2553 - - - - - 43323ca5 by Tony Chemit at 2022-12-05T17:21:15+01:00 Report - ajout du report psObservationCatchWeightByGroup - - - - - a99f1129 by Tony Chemit at 2022-12-05T19:37:35+01:00 Report - renommage du report psObservationCatchByGroup en psObservationCatchTotalCountByGroup - - - - - 75f969b6 by Tony Chemit at 2022-12-05T19:38:02+01:00 Merge branch 'feature/issue_2554' into develop-9.0.x Besoin d'un rapport Observations fournissant les captures par devenir, en poids - Closes #2554 - - - - - ca079e35 by Tony Chemit at 2022-12-05T20:56:57+01:00 Report - ajout du report psObservationCatchWeightByGroupPerReasonForDiscard - - - - - ab5114b6 by Tony Chemit at 2022-12-05T20:56:57+01:00 Report - fix psObservationCatchWeightByGroup speciesGroup variable request - - - - - b5016a38 by Tony Chemit at 2022-12-05T21:06:30+01:00 Report - ajout du report psObservationCatchTotalCountByGroupPerReasonForDiscard - - - - - 8cd8df10 by Tony Chemit at 2022-12-05T21:06:30+01:00 Report - renommage du report psObservationCatchTotalCountByGroup en psObservationCatchTotalCountByGroupPerSpeciesFate - - - - - 50f213e9 by Tony Chemit at 2022-12-05T21:06:30+01:00 Report - renommage du report psObservationCatchWeightByGroup en psObservationCatchWeightByGroupPerSpeciesFate - - - - - 067791dd by Tony Chemit at 2022-12-05T21:06:30+01:00 Report - renommage opération ExecuteRequestAndReorganizeCountByRepeatVariable en ExecuteRequestAndReorganizeDataByRepeatVariable - - - - - c5bb361b by Tony Chemit at 2022-12-05T21:21:55+01:00 Merge branch 'feature/issue_2555' into develop-9.0.x Besoin d'un rapport Observations fournissant les poids par raisons de rejets - Closes #2555 - - - - - efb91ec2 by Tony Chemit at 2022-12-05T21:48:51+01:00 AVDTH - Gestion de la propriété de la balise en situation de migration AVDTH - Closes #2569 - - - - - b7a5669d by Tony Chemit at 2022-12-05T22:07:57+01:00 AVDTH - Mise à jour de la documentation - - - - - 50fba486 by Tony Chemit at 2022-12-11T00:53:28+01:00 update pom - - - - - ecdd2cb1 by Tony Chemit at 2022-12-11T00:54:29+01:00 Report - Fix SumColumn and SumRow total cell condition - - - - - 1468180f by Tony Chemit at 2022-12-11T00:54:29+01:00 Report - Fix syntax.columnsHeader assert - - - - - 5c2b1603 by Tony Chemit at 2022-12-11T00:54:29+01:00 Report - Fix SumColumn and SumRow total cell condition (on psLogbookWellPlanCheck report) - - - - - 93400706 by Tony Chemit at 2022-12-11T00:54:29+01:00 Report - Improve how to detect a variable in a request (can have :xxx,) - - - - - 44481e34 by Tony Chemit at 2022-12-11T00:54:49+01:00 Report - Add possible Boolean report variable - - - - - 8e765653 by Tony Chemit at 2022-12-11T00:54:49+01:00 Report - Add report psObservationCatchWeightByGroupAndSpeciesFateDiscardPerAssociation - - - - - f17fd8a8 by Tony Chemit at 2022-12-11T00:54:49+01:00 Report - Add report psObservationCatchTotalCountByGroupAndSpeciesFateDiscardPerAssociation - - - - - cdb6a6f0 by Tony Chemit at 2022-12-11T00:54:49+01:00 Persistence - be able to add a null parameter in a query - - - - - a9c52d35 by Tony Chemit at 2022-12-11T00:55:31+01:00 Merge branch 'feature/issue_2552' into develop-9.0.x Optimisation des rapports Captures de thons selon le type d'association et Rejets de thons selon le type d'association - Closes #2552 - - - - - da7e2c08 by Tony Chemit at 2022-12-11T20:12:32+01:00 UI - When saving open data, only update reference once - - - - - 339a82ff by Tony Chemit at 2022-12-11T20:14:00+01:00 UI - Use now two method to fill NodeUpdater (using the same does not work for the after update since we just ask the property on dto, but we also need to know if there is a such data!) - - - - - 3206ff59 by Tony Chemit at 2022-12-11T20:14:45+01:00 UI - Use correct property name in ps-logbook-Activity (use now catches instead of set) - - - - - 59bb8013 by Tony Chemit at 2022-12-11T20:16:07+01:00 Service - Always add statistics in any Activity.set reference when using a such decorator - - - - - 20f4df02 by Tony Chemit at 2022-12-11T20:41:37+01:00 Merge branch 'feature/issue_2574_tree' into develop-9.0.x Lors de la sauvegarde d'une activité, l'arbre est replié mais surtout on perd sur ces fils les statistiques - Closes #2574 - - - - - 296bd417 by Tony Chemit at 2022-12-12T14:11:35+01:00 Une BD sql.gz qui génère une corruption de données systématique - Notre espoir de comprendre le problème ? - Closes #2571 - - - - - 5a4d1662 by Tony Chemit at 2022-12-12T14:57:16+01:00 Report - correction de certain totaux (exprimé en int au lieu d'en float pour les poids) + revue de certains libellés - - - - - d177f9ff by Tony Chemit at 2022-12-12T15:05:07+01:00 Report - suppression des reports psObservationTargetCatchByAssociation et psObservationTargetDiscardedByAssociation - - - - - 6c949030 by Tony Chemit at 2022-12-12T18:48:14+01:00 Report - review ComputeDynamicHeader code (if incoming matrix is empty, was not working) - - - - - 3be5c67c by Tony Chemit at 2022-12-12T18:58:23+01:00 Lorsque que l'on utilise la fonction Précédent de l'assistants rapports, il est possible de lancer les rapports sur des marées non calculées - Closes #2550 - - - - - c9e2bc87 by Tony Chemit at 2022-12-12T19:29:30+01:00 UI Navigation - Improve when open children nodes need to be rebuild - - - - - a00a0827 by Tony Chemit at 2022-12-12T19:32:26+01:00 Update changelog for v.9.0.22 [skip CI] - - - - - ba0ed2ac by Tony Chemit at 2022-12-12T19:34:07+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.22' with non-snapshot versions[skip ci] - - - - - c2573c84 by Tony Chemit at 2022-12-12T20:24:40+01:00 [jgitflow-maven-plugin]merging 'release/9.0.22' into 'master-9.0.x' - - - - - 30 changed files: - CHANGELOG.md - client/configuration/pom.xml - client/core/pom.xml - client/datasource/actions/pom.xml - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/config/SelectDataUIHandler.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/ConsolidateModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/consolidate/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/report/ReportUIHandler.java - client/datasource/editor/api-test/pom.xml - client/datasource/editor/api/pom.xml - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/save/NodeChildrenUpdate.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationNode.java - client/datasource/editor/common/pom.xml - client/datasource/editor/ll/pom.xml - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/ActivityUISavePredicate.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/ActivityUISavePredicate.java - client/datasource/editor/pom.xml - client/datasource/editor/ps/pom.xml - client/datasource/editor/ps/src/main/capabilities/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.capabilities - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUISavePredicate.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIHandler.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUISavePredicate.java - client/datasource/editor/spi/pom.xml - client/datasource/editor/spi/src/main/java/fr/ird/observe/client/datasource/editor/spi/content/CapabilityDescriptor.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fcbe88faad328602e8621088… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fcbe88faad328602e8621088… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] 5 commits: [jgitflow-maven-plugin]updating poms for branch'release/9.0.22' with non-snapshot versions[skip ci]
by Tony CHEMIT (＠tchemit) Dec. 12, 2022

Dec. 12, 2022

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: ba0ed2ac by Tony Chemit at 2022-12-12T19:34:07+01:00 [jgitflow-maven-plugin]updating poms for branch'release/9.0.22' with non-snapshot versions[skip ci] - - - - - c2573c84 by Tony Chemit at 2022-12-12T20:24:40+01:00 [jgitflow-maven-plugin]merging 'release/9.0.22' into 'master-9.0.x' - - - - - 7fe3e3c3 by Tony Chemit at 2022-12-12T20:24:50+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - f4ae314d by Tony Chemit at 2022-12-12T20:24:52+01:00 [jgitflow-maven-plugin]merging 'master-9.0.x' into 'develop-9.0.x' - - - - - 2328882e by Tony Chemit at 2022-12-12T20:24:55+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fe5e9fbc2bce4f09172f1358… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/fe5e9fbc2bce4f09172f1358… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-9.0.x] [jgitflow-maven-plugin]updating poms for 9.0.23-SNAPSHOT development[skip ci]
by Tony CHEMIT (＠tchemit) Dec. 12, 2022

Dec. 12, 2022

Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: fe5e9fbc by Tony Chemit at 2022-12-12T19:33:42+01:00 [jgitflow-maven-plugin]updating poms for 9.0.23-SNAPSHOT development[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/pom.xml - core/api/pom.xml - core/api/services/pom.xml - core/api/tree/pom.xml - core/api/validation/pom.xml - core/persistence/java/pom.xml - core/persistence/pom.xml - core/persistence/resources/pom.xml - core/persistence/test/pom.xml - core/pom.xml - core/services/client/pom.xml - core/services/i18n/pom.xml - core/services/local/pom.xml - core/services/pom.xml - core/services/test/pom.xml - model/pom.xml - observe/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fe5e9fbc2bce4f09172f1358f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/fe5e9fbc2bce4f09172f1358f… You're receiving this email because of your account on gitlab.com.

1 0