Tony CHEMIT pushed to branch develop-9.0.x at ultreiaio / ird-observe Commits: de629db7 by Tony Chemit at 2023-02-12T13:35:42+01:00 Avdth - add fallback for Destination that does not exist in version 9.0.x - - - - - 364e76a5 by Tony Chemit at 2023-02-12T13:35:46+01:00 update pom Retirer observe.exe qui ne fonctionne pas et induit les utilisateurs en erreur - Closes #2616 - - - - - 395e074c by Tony Chemit at 2023-02-12T13:57:23+01:00 I18n - use common label for FloatingObjectPart.whenXXX properties - - - - - 4 changed files: - core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties - core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/DestinationInterceptor.java - model/src/main/models/Observe/dto/class/i18nLabels.properties - pom.xml Changes: ===================================== core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties ===================================== @@ -20,7 +20,7 @@ # #L% ### #Generated by org.nuiton.i18n.plugin.GenerateI18nLabelsMojo -#Fri Dec 23 08:00:24 CET 2022 +#Sun Feb 12 12:28:43 CET 2023 observe.Business.createDate=observe.Common.createDate observe.Business.homeId=observe.Common.homeId observe.Business.id=observe.Common.id @@ -1488,6 +1488,8 @@ observe.data.ps.logbook.FloatingObjectPart.id=observe.Common.id observe.data.ps.logbook.FloatingObjectPart.label=observe.Common.label observe.data.ps.logbook.FloatingObjectPart.lastUpdateDate=observe.Common.lastUpdateDate observe.data.ps.logbook.FloatingObjectPart.version=observe.Common.version +observe.data.ps.logbook.FloatingObjectPart.whenArriving=observe.Common.whenArriving +observe.data.ps.logbook.FloatingObjectPart.whenLeaving=observe.Common.whenLeaving observe.data.ps.logbook.Route.comment=observe.Common.comment observe.data.ps.logbook.Route.createDate=observe.Common.createDate observe.data.ps.logbook.Route.homeId=observe.Common.homeId @@ -1663,6 +1665,8 @@ observe.data.ps.observation.FloatingObjectPart.id=observe.Common.id observe.data.ps.observation.FloatingObjectPart.label=observe.Common.label observe.data.ps.observation.FloatingObjectPart.lastUpdateDate=observe.Common.lastUpdateDate observe.data.ps.observation.FloatingObjectPart.version=observe.Common.version +observe.data.ps.observation.FloatingObjectPart.whenArriving=observe.Common.whenArriving +observe.data.ps.observation.FloatingObjectPart.whenLeaving=observe.Common.whenLeaving observe.data.ps.observation.NonTargetCatchRelease.comment=observe.Common.comment observe.data.ps.observation.NonTargetCatchRelease.comment.short=observe.Common.comment.short observe.data.ps.observation.NonTargetCatchRelease.createDate=observe.Common.createDate ===================================== core/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/DestinationInterceptor.java ===================================== @@ -40,6 +40,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.List; import java.util.Map; +import java.util.TreeMap; /** * Created on 22/05/2021. @@ -80,6 +81,15 @@ public class DestinationInterceptor extends ReferentialInterceptor<Destination, super(context, Destination.SPI); } + @Override + protected Map<String, Destination> existingIndex(ObserveTopiaPersistenceContext persistenceContext) { + Map<String, Destination> result = new TreeMap<>(super.existingIndex(persistenceContext)); + //Warning: This is added in 9.0.x to simulate a missing referential added in 9.1.x + result.put("28", result.get("1")); + result.put("29", result.get("1")); + return result; + } + @Override public Destination read(ResultSet resultSet, Map<String, Destination> existingIndex, SqlScriptWriter sqlWriter) throws SQLException { Destination entity = super.read(resultSet, existingIndex, sqlWriter); ===================================== model/src/main/models/Observe/dto/class/i18nLabels.properties ===================================== @@ -73,6 +73,7 @@ data.ps.logbook.Activity=date,observedSystem.available,observedSystem.selected,c data.ps.logbook.ActivityStub=date,comment,latitude,longitude,number,quadrant,seaSurfaceTemperature,time,vesselActivity data.ps.logbook.Catch=comment,species,speciesFate,weight,weightCategory,weightMeasureMethod,well,weight.validation.required,weightMeasureMethod.validation.required data.ps.logbook.FloatingObject=materialsValid,objectOperation,quadrant,supportVesselName,country,vessel,computedBiodegradable,computedNonEntangling,computedSimplifiedObjectType,computedValues,generalTab,buoysTab,materialsTab,notComputed,type.short +data.ps.logbook.FloatingObjectPart=whenArriving,whenLeaving data.ps.logbook.Route=activity,comment,date,fishingTime,timeAtSea data.ps.logbook.Sample=number,activity,bigsWeight,comment,person,sampleQuality,sampleType,smallsWeight,superSample,totalWeight,well,generalTab,activityTab,notSuperSample.with.moreThanOne.sampleSpecies.message,notSuperSample.with.moreThanOne.sampleSpecies.title,personTab,psSampler.available,psSampler.selected data.ps.logbook.SampleActivity=activity,weightedWeight @@ -84,6 +85,7 @@ data.ps.logbook.WellPlan=activity,species,weight,weightCategory,well,wellSamplin data.ps.observation.Activity=date,coordinate,observedSystem.available,observedSystem.selected,comment,comment2,currentFpaZone,dataQuality,detectionMode,ersId,floatingObjectEmpty,latitude,longitude,nextFpaZone,nonTargetCatchSpecies,observedSystem,observedSystemDistance,previousFpaZone,quadrant,reasonForNoFishing,seaSurfaceTemperature,surroundingActivity,time,vesselActivity,vesselSpeed,wind,generalTab,error.no.activity.6,measurementsTab,observedSystemTab data.ps.observation.Catch=catchWeight,catchWeightTotalCount,meanWeightMeanLength,comment,informationSource,lengthMeasureMethod,meanLength,minWeight,maxWeight,meanWeight,minMaxWeight,reasonForDiscard,species,speciesFate,totalCount,weightMeasureMethod,well,catchWeightComputed.computed.tip,catchWeightComputed.observed.tip,meanLengthComputed.computed.tip,meanLengthComputed.observed.tip,meanWeightComputed.computed.tip,meanWeightComputed.observed.tip,totalCountComputed.computed.tip,totalCountComputed.observed.tip data.ps.observation.FloatingObject=materialsValid,objectOperation,supportVesselName,country,vessel,computedBiodegradable,computedNonEntangling,computedSimplifiedObjectType,computedValues,generalTab,buoysTab,materialsTab,notComputed,type.short +data.ps.observation.FloatingObjectPart=whenArriving,whenLeaving data.ps.observation.NonTargetCatchRelease=comment,conformity,count,length,lengthMeasureMethod,releasingTime,sex,status,species,speciesGroupReleaseMode,message.cantAdd data.ps.observation.ObjectObservedSpecies=count,species,speciesStatus data.ps.observation.ObjectSchoolEstimate=species,totalWeight,weightMeasureMethod ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.5</version> + <version>2023.6</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/996ddb15bf24c8d8c7e795ea3... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/996ddb15bf24c8d8c7e795ea3... You're receiving this email because of your account on gitlab.com.