[Git][ultreiaio/ird-observe][develop] Sur PS / Logbook / Echantillon et Plan de cuves, afficher le ne numéro...

15 Jun 2023


      Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe


Commits:
a057723b by Tony Chemit at 2023-06-15T19:49:00+02:00
Sur PS / Logbook / Echantillon et Plan de cuves, afficher le ne numéro d'activité dans la liste déroulante des activités - Closes #2732

- - - - -


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:

=====================================
core/api/dto-decoration/src/main/java/fr/ird/observe/dto/data/ps/logbook/ActivityStubDtoWithRouteDecoratorDefinition.java
=====================================
@@ -36,7 +36,7 @@ import javax.annotation.Generated;
 public final class ActivityStubDtoWithRouteDecoratorDefinition extends DecoratorDefinition<ActivityStubDto, ObserveDtoDecoratorRenderer<ActivityStubDto>> {
 
     public ActivityStubDtoWithRouteDecoratorDefinition() {
-        super(ActivityStubDto.class, "WithRoute", "##", " - ", new ObserveDtoDecoratorRenderer<>(ActivityStubDto.class), "date", "time", "vesselActivity");
+        super(ActivityStubDto.class, "WithRoute", "##", " - ", new ObserveDtoDecoratorRenderer<>(ActivityStubDto.class), "date", "time", "number", "vesselActivity");
     }
 
     @Override
@@ -47,6 +47,8 @@ public final class ActivityStubDtoWithRouteDecoratorDefinition extends Decorator
             case 1:
               return renderer.niceTime(locale, source.getTime());
             case 2:
+              return renderer.onNullValue("number", locale, source.getNumber());
+            case 3:
               return renderer.label(locale, source.getVesselActivity());
             default:
                 throw new IllegalStateException("No index with value: " + index);
@@ -55,7 +57,7 @@ public final class ActivityStubDtoWithRouteDecoratorDefinition extends Decorator
 
     @Override
     public final String decorate(Locale locale, Object source, String rendererSeparator, int index) {
-        return decoratorForContextCountEquals3(locale, source, rendererSeparator, index);
+        return decoratorForContextCountEquals4(locale, source, rendererSeparator, index);
     }
 
 }


=====================================
core/api/dto/src/main/i18n/getters/java.getter
=====================================
@@ -8,6 +8,7 @@ observe.data.ll.pairing.ActivityPairingResultItem.type
 observe.data.pairing.ActivityPairingResultItem.computedTimeAfter
 observe.data.pairing.ActivityPairingResultItem.computedTimeBefore
 observe.data.pairing.ActivityPairingResultItem.computedTimeEquals
+observe.data.ps.logbook.ActivityStub.type
 observe.data.ps.observation.SpeciesFateDiscardMode.falseValue
 observe.data.ps.observation.SpeciesFateDiscardMode.nullValue
 observe.data.ps.observation.SpeciesFateDiscardMode.trueValue


=====================================
core/api/dto/src/main/java/fr/ird/observe/dto/data/ps/logbook/ActivityStubDto.java
=====================================
@@ -23,6 +23,7 @@ package fr.ird.observe.dto.data.ps.logbook;
  */
 
 import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition;
+import io.ultreia.java4all.i18n.I18n;
 import io.ultreia.java4all.util.Dates;
 
 import java.util.Date;
@@ -36,6 +37,10 @@ import java.util.Date;
 @GenerateJavaBeanDefinition
 public class ActivityStubDto extends GeneratedActivityStubDto implements TimeAndNumberAware {
 
+    static {
+        I18n.n("observe.data.ps.logbook.ActivityStub.type");
+    }
+
     public Date getTimeSecond() {
         return Dates.getTime(time, false, false);
     }
@@ -51,7 +56,7 @@ public class ActivityStubDto extends GeneratedActivityStubDto implements TimeAnd
     }
 
     public boolean skipValidate() {
-        return getLatitude()==null || getLongitude()==null;
+        return getLatitude() == null || getLongitude() == null;
     }
 
 


=====================================
core/services/i18n/src/main/i18n/translations/services_en_GB.properties
=====================================
@@ -1105,6 +1105,7 @@ observe.data.ps.logbook.ActivityCatch.type=Activity catches
 observe.data.ps.logbook.ActivityStub.date=Date
 observe.data.ps.logbook.ActivityStub.number=Number
 observe.data.ps.logbook.ActivityStub.time=Observation time
+observe.data.ps.logbook.ActivityStub.type=Activity
 observe.data.ps.logbook.Catch.action.create=Create a new catch
 observe.data.ps.logbook.Catch.action.save=Insert this catch
 observe.data.ps.logbook.Catch.action.save.tip=Insert this catch


=====================================
core/services/i18n/src/main/i18n/translations/services_es_ES.properties
=====================================
@@ -1105,6 +1105,7 @@ observe.data.ps.logbook.ActivityCatch.type=ActivityCatch
 observe.data.ps.logbook.ActivityStub.date=Date
 observe.data.ps.logbook.ActivityStub.number=Number
 observe.data.ps.logbook.ActivityStub.time=Hora de la observación
+observe.data.ps.logbook.ActivityStub.type=Actividad
 observe.data.ps.logbook.Catch.action.create=Crear una captura
 observe.data.ps.logbook.Catch.action.save=Insertar captura
 observe.data.ps.logbook.Catch.action.save.tip=Insertar captura


=====================================
core/services/i18n/src/main/i18n/translations/services_fr_FR.properties
=====================================
@@ -1105,6 +1105,7 @@ observe.data.ps.logbook.ActivityCatch.type=Capture
 observe.data.ps.logbook.ActivityStub.date=Date
 observe.data.ps.logbook.ActivityStub.number=Numéro d'ordre
 observe.data.ps.logbook.ActivityStub.time=Heure d'observation
+observe.data.ps.logbook.ActivityStub.type=Activité
 observe.data.ps.logbook.Catch.action.create=Nouvelle capture
 observe.data.ps.logbook.Catch.action.save=Insérer cette capture
 observe.data.ps.logbook.Catch.action.save.tip=Insérer cette capture


=====================================
model/src/main/models/Observe/dto/class/decoratorWithClassifier.properties
=====================================
@@ -24,7 +24,7 @@ data.ll.observation.Branchline=OnlyHaulingIdentifier|${haulingIdentifier}
 data.ll.observation.Section=OnlyHaulingIdentifier|${haulingIdentifier}
 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} )
 data.ps.logbook.Activity=WithRoute|${date::date}##${time::niceTime}##${number}##${vesselActivity::label}
-data.ps.logbook.ActivityStub=WithRoute|${date::date}##${time::niceTime}##${vesselActivity::label}
+data.ps.logbook.ActivityStub=WithRoute|${date::date}##${time::niceTime}##${number}##${vesselActivity::label}
 data.ps.observation.Activity=WithRoute|${date::date}##${time::niceTime}##${vesselActivity::label}
 presets.RemoteDataSourceConfiguration=WithUrl|${name}##${url}
 presets.ServerDataSourceConfiguration=WithUrl|${name}##${url}



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a057723b741495da5ffae25203...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/a057723b741495da5ffae25203...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT (＠tchemit)

tags

participants (1)