Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
a057723b
by Tony Chemit at 2023-06-15T19:49:00+02:00
7 changed files:
- core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ps/logbook/ActivityStubDtoWithRouteDecoratorDefinition.java
- core/api/dto/src/main/i18n/getters/java.getter
- core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/ActivityStubDto.java
- core/services/i18n/src/main/i18n/translations/services_en_GB.properties
- core/services/i18n/src/main/i18n/translations/services_es_ES.properties
- core/services/i18n/src/main/i18n/translations/services_fr_FR.properties
- model/src/main/models/Observe/dto/class/decoratorWithClassifier.properties
Changes:
| ... | ... | @@ -36,7 +36,7 @@ import javax.annotation.Generated; |
| 36 | 36 | public final class ActivityStubDtoWithRouteDecoratorDefinition extends DecoratorDefinition<ActivityStubDto, ObserveDtoDecoratorRenderer<ActivityStubDto>> {
|
| 37 | 37 | |
| 38 | 38 | public ActivityStubDtoWithRouteDecoratorDefinition() {
|
| 39 | - super(ActivityStubDto.class, "WithRoute", "##", " - ", new ObserveDtoDecoratorRenderer<>(ActivityStubDto.class), "date", "time", "vesselActivity");
|
|
| 39 | + super(ActivityStubDto.class, "WithRoute", "##", " - ", new ObserveDtoDecoratorRenderer<>(ActivityStubDto.class), "date", "time", "number", "vesselActivity");
|
|
| 40 | 40 | }
|
| 41 | 41 | |
| 42 | 42 | @Override
|
| ... | ... | @@ -47,6 +47,8 @@ public final class ActivityStubDtoWithRouteDecoratorDefinition extends Decorator |
| 47 | 47 | case 1:
|
| 48 | 48 | return renderer.niceTime(locale, source.getTime());
|
| 49 | 49 | case 2:
|
| 50 | + return renderer.onNullValue("number", locale, source.getNumber());
|
|
| 51 | + case 3:
|
|
| 50 | 52 | return renderer.label(locale, source.getVesselActivity());
|
| 51 | 53 | default:
|
| 52 | 54 | throw new IllegalStateException("No index with value: " + index);
|
| ... | ... | @@ -55,7 +57,7 @@ public final class ActivityStubDtoWithRouteDecoratorDefinition extends Decorator |
| 55 | 57 | |
| 56 | 58 | @Override
|
| 57 | 59 | public final String decorate(Locale locale, Object source, String rendererSeparator, int index) {
|
| 58 | - return decoratorForContextCountEquals3(locale, source, rendererSeparator, index);
|
|
| 60 | + return decoratorForContextCountEquals4(locale, source, rendererSeparator, index);
|
|
| 59 | 61 | }
|
| 60 | 62 | |
| 61 | 63 | } |
| ... | ... | @@ -8,6 +8,7 @@ observe.data.ll.pairing.ActivityPairingResultItem.type |
| 8 | 8 | observe.data.pairing.ActivityPairingResultItem.computedTimeAfter
|
| 9 | 9 | observe.data.pairing.ActivityPairingResultItem.computedTimeBefore
|
| 10 | 10 | observe.data.pairing.ActivityPairingResultItem.computedTimeEquals
|
| 11 | +observe.data.ps.logbook.ActivityStub.type
|
|
| 11 | 12 | observe.data.ps.observation.SpeciesFateDiscardMode.falseValue
|
| 12 | 13 | observe.data.ps.observation.SpeciesFateDiscardMode.nullValue
|
| 13 | 14 | observe.data.ps.observation.SpeciesFateDiscardMode.trueValue
|
| ... | ... | @@ -23,6 +23,7 @@ package fr.ird.observe.dto.data.ps.logbook; |
| 23 | 23 | */
|
| 24 | 24 | |
| 25 | 25 | import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition;
|
| 26 | +import io.ultreia.java4all.i18n.I18n;
|
|
| 26 | 27 | import io.ultreia.java4all.util.Dates;
|
| 27 | 28 | |
| 28 | 29 | import java.util.Date;
|
| ... | ... | @@ -36,6 +37,10 @@ import java.util.Date; |
| 36 | 37 | @GenerateJavaBeanDefinition
|
| 37 | 38 | public class ActivityStubDto extends GeneratedActivityStubDto implements TimeAndNumberAware {
|
| 38 | 39 | |
| 40 | + static {
|
|
| 41 | + I18n.n("observe.data.ps.logbook.ActivityStub.type");
|
|
| 42 | + }
|
|
| 43 | + |
|
| 39 | 44 | public Date getTimeSecond() {
|
| 40 | 45 | return Dates.getTime(time, false, false);
|
| 41 | 46 | }
|
| ... | ... | @@ -51,7 +56,7 @@ public class ActivityStubDto extends GeneratedActivityStubDto implements TimeAnd |
| 51 | 56 | }
|
| 52 | 57 | |
| 53 | 58 | public boolean skipValidate() {
|
| 54 | - return getLatitude()==null || getLongitude()==null;
|
|
| 59 | + return getLatitude() == null || getLongitude() == null;
|
|
| 55 | 60 | }
|
| 56 | 61 | |
| 57 | 62 |
| ... | ... | @@ -1105,6 +1105,7 @@ observe.data.ps.logbook.ActivityCatch.type=Activity catches |
| 1105 | 1105 | observe.data.ps.logbook.ActivityStub.date=Date
|
| 1106 | 1106 | observe.data.ps.logbook.ActivityStub.number=Number
|
| 1107 | 1107 | observe.data.ps.logbook.ActivityStub.time=Observation time
|
| 1108 | +observe.data.ps.logbook.ActivityStub.type=Activity
|
|
| 1108 | 1109 | observe.data.ps.logbook.Catch.action.create=Create a new catch
|
| 1109 | 1110 | observe.data.ps.logbook.Catch.action.save=Insert this catch
|
| 1110 | 1111 | observe.data.ps.logbook.Catch.action.save.tip=Insert this catch
|
| ... | ... | @@ -1105,6 +1105,7 @@ observe.data.ps.logbook.ActivityCatch.type=ActivityCatch |
| 1105 | 1105 | observe.data.ps.logbook.ActivityStub.date=Date
|
| 1106 | 1106 | observe.data.ps.logbook.ActivityStub.number=Number
|
| 1107 | 1107 | observe.data.ps.logbook.ActivityStub.time=Hora de la observación
|
| 1108 | +observe.data.ps.logbook.ActivityStub.type=Actividad
|
|
| 1108 | 1109 | observe.data.ps.logbook.Catch.action.create=Crear una captura
|
| 1109 | 1110 | observe.data.ps.logbook.Catch.action.save=Insertar captura
|
| 1110 | 1111 | observe.data.ps.logbook.Catch.action.save.tip=Insertar captura
|
| ... | ... | @@ -1105,6 +1105,7 @@ observe.data.ps.logbook.ActivityCatch.type=Capture |
| 1105 | 1105 | observe.data.ps.logbook.ActivityStub.date=Date
|
| 1106 | 1106 | observe.data.ps.logbook.ActivityStub.number=Numéro d'ordre
|
| 1107 | 1107 | observe.data.ps.logbook.ActivityStub.time=Heure d'observation
|
| 1108 | +observe.data.ps.logbook.ActivityStub.type=Activité
|
|
| 1108 | 1109 | observe.data.ps.logbook.Catch.action.create=Nouvelle capture
|
| 1109 | 1110 | observe.data.ps.logbook.Catch.action.save=Insérer cette capture
|
| 1110 | 1111 | observe.data.ps.logbook.Catch.action.save.tip=Insérer cette capture
|
| ... | ... | @@ -24,7 +24,7 @@ data.ll.observation.Branchline=OnlyHaulingIdentifier|${haulingIdentifier} |
| 24 | 24 | data.ll.observation.Section=OnlyHaulingIdentifier|${haulingIdentifier}
|
| 25 | 25 | data.ps.common.Trip=TripLocalmarket|$(observe.data.ps.common.TripLocalmarket.type)##( ${localmarketBatchStat::stat}##${localmarketSurveyStat::stat}##${localmarketSampleStat::stat} )~TripLogbook|$(observe.data.ps.common.TripLogbook.type)##( ${routeLogbookStat::stat}##${sampleStat::stat}##${wellStat::stat} )
|
| 26 | 26 | data.ps.logbook.Activity=WithRoute|${date::date}##${time::niceTime}##${number}##${vesselActivity::label}
|
| 27 | -data.ps.logbook.ActivityStub=WithRoute|${date::date}##${time::niceTime}##${vesselActivity::label}
|
|
| 27 | +data.ps.logbook.ActivityStub=WithRoute|${date::date}##${time::niceTime}##${number}##${vesselActivity::label}
|
|
| 28 | 28 | data.ps.observation.Activity=WithRoute|${date::date}##${time::niceTime}##${vesselActivity::label}
|
| 29 | 29 | presets.RemoteDataSourceConfiguration=WithUrl|${name}##${url}
|
| 30 | 30 | presets.ServerDataSourceConfiguration=WithUrl|${name}##${url}
|