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
-
364e76a5
by Tony Chemit at 2023-02-12T13:35:46+01:00
-
395e074c
by Tony Chemit at 2023-02-12T13:57:23+01:00
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:
| ... | ... | @@ -20,7 +20,7 @@ |
| 20 | 20 | # #L%
|
| 21 | 21 | ###
|
| 22 | 22 | #Generated by org.nuiton.i18n.plugin.GenerateI18nLabelsMojo
|
| 23 | -#Fri Dec 23 08:00:24 CET 2022
|
|
| 23 | +#Sun Feb 12 12:28:43 CET 2023
|
|
| 24 | 24 | observe.Business.createDate=observe.Common.createDate
|
| 25 | 25 | observe.Business.homeId=observe.Common.homeId
|
| 26 | 26 | observe.Business.id=observe.Common.id
|
| ... | ... | @@ -1488,6 +1488,8 @@ observe.data.ps.logbook.FloatingObjectPart.id=observe.Common.id |
| 1488 | 1488 | observe.data.ps.logbook.FloatingObjectPart.label=observe.Common.label
|
| 1489 | 1489 | observe.data.ps.logbook.FloatingObjectPart.lastUpdateDate=observe.Common.lastUpdateDate
|
| 1490 | 1490 | observe.data.ps.logbook.FloatingObjectPart.version=observe.Common.version
|
| 1491 | +observe.data.ps.logbook.FloatingObjectPart.whenArriving=observe.Common.whenArriving
|
|
| 1492 | +observe.data.ps.logbook.FloatingObjectPart.whenLeaving=observe.Common.whenLeaving
|
|
| 1491 | 1493 | observe.data.ps.logbook.Route.comment=observe.Common.comment
|
| 1492 | 1494 | observe.data.ps.logbook.Route.createDate=observe.Common.createDate
|
| 1493 | 1495 | observe.data.ps.logbook.Route.homeId=observe.Common.homeId
|
| ... | ... | @@ -1663,6 +1665,8 @@ observe.data.ps.observation.FloatingObjectPart.id=observe.Common.id |
| 1663 | 1665 | observe.data.ps.observation.FloatingObjectPart.label=observe.Common.label
|
| 1664 | 1666 | observe.data.ps.observation.FloatingObjectPart.lastUpdateDate=observe.Common.lastUpdateDate
|
| 1665 | 1667 | observe.data.ps.observation.FloatingObjectPart.version=observe.Common.version
|
| 1668 | +observe.data.ps.observation.FloatingObjectPart.whenArriving=observe.Common.whenArriving
|
|
| 1669 | +observe.data.ps.observation.FloatingObjectPart.whenLeaving=observe.Common.whenLeaving
|
|
| 1666 | 1670 | observe.data.ps.observation.NonTargetCatchRelease.comment=observe.Common.comment
|
| 1667 | 1671 | observe.data.ps.observation.NonTargetCatchRelease.comment.short=observe.Common.comment.short
|
| 1668 | 1672 | observe.data.ps.observation.NonTargetCatchRelease.createDate=observe.Common.createDate
|
| ... | ... | @@ -40,6 +40,7 @@ import java.sql.ResultSet; |
| 40 | 40 | import java.sql.SQLException;
|
| 41 | 41 | import java.util.List;
|
| 42 | 42 | import java.util.Map;
|
| 43 | +import java.util.TreeMap;
|
|
| 43 | 44 | |
| 44 | 45 | /**
|
| 45 | 46 | * Created on 22/05/2021.
|
| ... | ... | @@ -80,6 +81,15 @@ public class DestinationInterceptor extends ReferentialInterceptor<Destination, |
| 80 | 81 | super(context, Destination.SPI);
|
| 81 | 82 | }
|
| 82 | 83 | |
| 84 | + @Override
|
|
| 85 | + protected Map<String, Destination> existingIndex(ObserveTopiaPersistenceContext persistenceContext) {
|
|
| 86 | + Map<String, Destination> result = new TreeMap<>(super.existingIndex(persistenceContext));
|
|
| 87 | + //Warning: This is added in 9.0.x to simulate a missing referential added in 9.1.x
|
|
| 88 | + result.put("28", result.get("1"));
|
|
| 89 | + result.put("29", result.get("1"));
|
|
| 90 | + return result;
|
|
| 91 | + }
|
|
| 92 | + |
|
| 83 | 93 | @Override
|
| 84 | 94 | public Destination read(ResultSet resultSet, Map<String, Destination> existingIndex, SqlScriptWriter sqlWriter) throws SQLException {
|
| 85 | 95 | Destination entity = super.read(resultSet, existingIndex, sqlWriter);
|
| ... | ... | @@ -73,6 +73,7 @@ data.ps.logbook.Activity=date,observedSystem.available,observedSystem.selected,c |
| 73 | 73 | data.ps.logbook.ActivityStub=date,comment,latitude,longitude,number,quadrant,seaSurfaceTemperature,time,vesselActivity
|
| 74 | 74 | data.ps.logbook.Catch=comment,species,speciesFate,weight,weightCategory,weightMeasureMethod,well,weight.validation.required,weightMeasureMethod.validation.required
|
| 75 | 75 | data.ps.logbook.FloatingObject=materialsValid,objectOperation,quadrant,supportVesselName,country,vessel,computedBiodegradable,computedNonEntangling,computedSimplifiedObjectType,computedValues,generalTab,buoysTab,materialsTab,notComputed,type.short
|
| 76 | +data.ps.logbook.FloatingObjectPart=whenArriving,whenLeaving
|
|
| 76 | 77 | data.ps.logbook.Route=activity,comment,date,fishingTime,timeAtSea
|
| 77 | 78 | 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
|
| 78 | 79 | data.ps.logbook.SampleActivity=activity,weightedWeight
|
| ... | ... | @@ -84,6 +85,7 @@ data.ps.logbook.WellPlan=activity,species,weight,weightCategory,well,wellSamplin |
| 84 | 85 | 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
|
| 85 | 86 | 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
|
| 86 | 87 | data.ps.observation.FloatingObject=materialsValid,objectOperation,supportVesselName,country,vessel,computedBiodegradable,computedNonEntangling,computedSimplifiedObjectType,computedValues,generalTab,buoysTab,materialsTab,notComputed,type.short
|
| 88 | +data.ps.observation.FloatingObjectPart=whenArriving,whenLeaving
|
|
| 87 | 89 | data.ps.observation.NonTargetCatchRelease=comment,conformity,count,length,lengthMeasureMethod,releasingTime,sex,status,species,speciesGroupReleaseMode,message.cantAdd
|
| 88 | 90 | data.ps.observation.ObjectObservedSpecies=count,species,speciesStatus
|
| 89 | 91 | data.ps.observation.ObjectSchoolEstimate=species,totalWeight,weightMeasureMethod
|
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 | <parent>
|
| 24 | 24 | <groupId>io.ultreia.maven</groupId>
|
| 25 | 25 | <artifactId>pom</artifactId>
|
| 26 | - <version>2023.5</version>
|
|
| 26 | + <version>2023.6</version>
|
|
| 27 | 27 | </parent>
|
| 28 | 28 | <groupId>fr.ird.observe</groupId>
|
| 29 | 29 | <artifactId>ird-observe</artifactId>
|