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

Commits:

12 changed files:

Changes:

  • client/datasource/editor/ps/src/main/i18n/getters/java.getter
    ... ... @@ -14,7 +14,6 @@ observe.data.ps.logbook.Activity.error.no.activity.6
    14 14 
     observe.data.ps.logbook.Sample.notSuperSample.with.moreThanOne.sampleSpecies.message
    15 15 
     observe.data.ps.logbook.Sample.notSuperSample.with.moreThanOne.sampleSpecies.title
    16 16 
     observe.data.ps.logbook.WellPlan.create.activity.tip
    17 
    -observe.data.ps.observation.Activity.error.no.activity.6
    18 17 
     observe.data.ps.observation.Catch.catchWeightComputed.computed.tip
    19 18 
     observe.data.ps.observation.Catch.catchWeightComputed.observed.tip
    20 19 
     observe.data.ps.observation.Catch.meanLengthComputed.computed.tip

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jaxx
    ... ... @@ -94,7 +94,10 @@
    94 94 
                     </row>
    95 95 
                     <row>
    96 96 
                       <cell anchor='west' columns="4">
    97 
    -                    <JLabel id='vesselActivityInformation' styleClass="skipI18n information"/>
    97 
    +                    <JPanel layout="{new GridLayout(0, 1)}">
    98 
    +                      <JLabel id='vesselActivityInformation' styleClass="skipI18n information"/>
    99 
    +                      <JLabel id='vesselActivityInformation2' styleClass="skipI18n information"/>
    100 
    +                    </JPanel>
    98 101 
                       </cell>
    99 102 
                     </row>
    100 103 
                     <row>

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUI.jaxx
    ... ... @@ -91,7 +91,10 @@
    91 91 
                                     <!-- activity vessel -->
    92 92 
                                     <row>
    93 93 
                                         <cell anchor='west' columns="2">
    94 
    -                                        <JLabel id='vesselActivityInformation' styleClass="skipI18n information"/>
    94 
    +                                        <JPanel layout="{new GridLayout(0, 1)}">
    95 
    +                                            <JLabel id='vesselActivityInformation' styleClass="skipI18n information"/>
    96 
    +                                            <JLabel id='vesselActivityInformation2' styleClass="skipI18n information"/>
    97 
    +                                        </JPanel>
    95 98 
                                         </cell>
    96 99 
                                     </row>
    97 100 
                                     <row>

  • client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIHandler.java
    ... ... @@ -23,10 +23,12 @@ package fr.ird.observe.client.datasource.editor.ps.data.observation;
    23 23
    24 24 
     import fr.ird.observe.client.datasource.editor.api.content.actions.save.SaveAction;
    25 25 
     import fr.ird.observe.client.datasource.editor.api.content.data.open.actions.SaveContentOpenableUIAdapter;
    26 
    +import fr.ird.observe.dto.ProtectedIdsPs;
    26 27 
     import fr.ird.observe.dto.data.ps.observation.ActivityDto;
    27 28 
     import fr.ird.observe.dto.referential.ps.common.VesselActivityReference;
    28 29
    29 30 
     import java.util.List;
    31 
    +import java.util.Objects;
    30 32
    31 33 
     import static io.ultreia.java4all.i18n.I18n.t;
    32 34
    ... ... @@ -39,10 +41,29 @@ class ActivityUIHandler extends GeneratedActivityUIHandler {
    39 41 
         @Override
    40 42 
         public void onInit(ActivityUI ui) {
    41 43 
             super.onInit(ui);
    42 
    -        String label = getActivity6Label();
    43 
    -        String text = t("observe.Common.vesselActivity.comment", label);
    44 
    -        ui.vesselActivityInformation.setText(text);
    45 
    -        ui.vesselActivityInformation.setToolTipText(text);
    44 
    +        String label6 = null;
    45 
    +        String label13 = null;
    46 
    +        List<VesselActivityReference> activities = getReferentialReferences(VesselActivityReference.class);
    47 
    +        for (VesselActivityReference vesselActivity : activities) {
    48 
    +            String id = vesselActivity.getId();
    49 
    +            if (ProtectedIdsPs.PS_COMMON_VESSEL_ACTIVITY_ID_FOR_SET.equals(id)) {
    50 
    +                label6 = vesselActivity.toString();
    51 
    +                continue;
    52 
    +            }
    53 
    +            if (ProtectedIdsPs.PS_COMMON_VESSEL_ACTIVITY_ID_FOR_DCP.equals(id)) {
    54 
    +                label13 = vesselActivity.toString();
    55 
    +                label13 = label13.substring(0, label13.indexOf(" ("));
    56 
    +            }
    57 
    +        }
    58 
    +
    59 
    +        Objects.requireNonNull(label6, "Can't find vessel activity with id: " + ProtectedIdsPs.PS_COMMON_VESSEL_ACTIVITY_ID_FOR_SET);
    60 
    +        Objects.requireNonNull(label6, "Can't find vessel activity with id: " + ProtectedIdsPs.PS_COMMON_VESSEL_ACTIVITY_ID_FOR_DCP);
    61 
    +        String text6 = t("observe.Common.vesselActivity.comment", label6);
    62 
    +        ui.getVesselActivityInformation().setText(text6);
    63 
    +        ui.getVesselActivityInformation().setToolTipText(text6);
    64 
    +        String text13 = t("observe.data.Activity.comment2", label6, label13);
    65 
    +        ui.getVesselActivityInformation2().setText(text13);
    66 
    +        ui.getVesselActivityInformation2().setToolTipText(text13);
    46 67 
         }
    47 68
    48 69 
         @Override
    ... ... @@ -54,14 +75,5 @@ class ActivityUIHandler extends GeneratedActivityUIHandler {
    54 75 
                     .install(ui.getSave());
    55 76 
         }
    56 77
    57 
    -    private String getActivity6Label() {
    58 
    -        List<VesselActivityReference> activities = getReferentialReferences(VesselActivityReference.class);
    59 
    -        for (VesselActivityReference vesselActivity : activities) {
    60 
    -            if (ActivityDto.isFishingOperation(vesselActivity)) {
    61 
    -                return vesselActivity.toString();
    62 
    -            }
    63 
    -        }
    64 
    -        throw new IllegalStateException(t("observe.data.ps.observation.Activity.error.no.activity.6"));
    65 
    -    }
    66 78 
         //FIXME:Focus Time/VesselSpeed/ObservedSystem
    67 79 
     }

  • models/definition/src/main/models/Observe/dto/class/i18nLabels.properties
    ... ... @@ -67,7 +67,7 @@ data.ps.localmarket.SampleSpeciesMeasure=count,sizeClass
    67 67 
     data.ps.localmarket.Survey=number,batches.available,comment,date,surveyPart,generalTab,surveyPartTab,batches.available,batches.selected
    68 68 
     data.ps.localmarket.SurveyPart=species
    69 69 
     data.ps.localmarket.WellId=well
    70 
    -data.ps.logbook.Activity=date,observedSystem.available,observedSystem.selected,comment,coordinate,coordinateOriginal,currentDirection,currentSpeed,dataQuality,floatingObjectEmpty,fpaZone,informationSource,latitude,latitudeOriginal,longitude,longitudeOriginal,number,observedSystem,originalDataModified,quadrant,quadrantOriginal,relatedObservedActivity,schoolType,seaSurfaceTemperature,setCount,time,totalWeight,vesselActivity,vmsDivergent,wind,windDirection,generalTab,measurementsTab,observedSystemTab,error.no.activity.6,physicalMeasurements,setMeasurements
    70 
    +data.ps.logbook.Activity=date,observedSystem.available,observedSystem.selected,comment,comment2,coordinate,coordinateOriginal,currentDirection,currentSpeed,dataQuality,floatingObjectEmpty,fpaZone,informationSource,latitude,latitudeOriginal,longitude,longitudeOriginal,number,observedSystem,originalDataModified,quadrant,quadrantOriginal,relatedObservedActivity,schoolType,seaSurfaceTemperature,setCount,time,totalWeight,vesselActivity,vmsDivergent,wind,windDirection,generalTab,measurementsTab,observedSystemTab,error.no.activity.6,physicalMeasurements,setMeasurements
    71 71 
     data.ps.logbook.Catch=comment,species,speciesFate,weight,weightCategory,weightMeasureMethod,well
    72 72 
     data.ps.logbook.FloatingObject=materialsValid,objectOperation,quadrant,supportVesselName,country,vessel,computedBiodegradable,computedNonEntangling,computedSimplifiedObjectType,computedValues,generalTab,buoysTab,materialsTab,notComputed,type.short
    73 73 
     data.ps.logbook.Route=activity,comment,date,fishingTime,timeAtSea
    ... ... @@ -78,7 +78,7 @@ data.ps.logbook.SampleSpecies=comment,measuredCount,sampleSpeciesMeasure,sizeMea
    78 78 
     data.ps.logbook.SampleSpeciesMeasure=count,sizeClass
    79 79 
     data.ps.logbook.TransmittingBuoy=comment,code,transmittingBuoyOwnership,transmittingBuoyType,transmittingBuoyOperation,country,vessel,latitude,longitude,quadrant
    80 80 
     data.ps.logbook.WellPlan=activity,species,weight,weightCategory,well,wellSamplingConformity,wellSamplingStatus
    81 
    -data.ps.observation.Activity=date,coordinate,observedSystem.available,observedSystem.selected,comment,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
    81 
    +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
    82 82 
     data.ps.observation.Catch=catchWeight,comment,informationSource,lengthMeasureMethod,meanLength,meanWeight,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,message.will.delete.sub.data,message.will.delete.sub.data.for.species
    83 83 
     data.ps.observation.FloatingObject=materialsValid,objectOperation,supportVesselName,country,vessel,computedBiodegradable,computedNonEntangling,computedSimplifiedObjectType,computedValues,generalTab,buoysTab,materialsTab,notComputed,type.short
    84 84 
     data.ps.observation.NonTargetCatchRelease=comment,conformity,count,length,lengthMeasureMethod,releasingTime,sex,status,species,speciesGroupReleaseMode,message.cantAdd

  • models/dto/i18n/src/main/i18n/getters/labels.getter
    ... ... @@ -382,6 +382,7 @@ observe.Common.whenArriving
    382 382 
     observe.Common.whenLeaving
    383 383 
     observe.Common.wind
    384 384 
     observe.Common.windDirection
    385 
    +observe.data.Activity.comment2
    385 386 
     observe.data.GearUseFeatures.action.create
    386 387 
     observe.data.GearUseFeatures.action.save
    387 388 
     observe.data.GearUseFeatures.action.save.tip

  • models/dto/i18n/src/main/resources/META-INF/i18n/Observe-labels.properties
    ... ... @@ -20,7 +20,7 @@
    20 20 
     # #L%
    21 21 
     ###
    22 22 
     #Generated by org.nuiton.i18n.plugin.GenerateI18nLabelsMojo
    23 
    -#Sun Oct 17 15:31:35 CEST 2021
    23 
    +#Sun Oct 17 16:07:51 CEST 2021
    24 24 
     observe.Business.createDate=observe.Common.createDate
    25 25 
     observe.Business.homeId=observe.Common.homeId
    26 26 
     observe.Business.id=observe.Common.id
    ... ... @@ -224,6 +224,7 @@ observe.data.ll.landing.LandingPart.species.short=observe.Common.species.short
    224 224 
     observe.data.ll.landing.LandingPart.version=observe.Common.version
    225 225 
     observe.data.ll.landing.LandingPart.weightMeasureMethod=observe.Common.weightMeasureMethod
    226 226 
     observe.data.ll.logbook.Activity.comment=observe.Common.comment
    227 
    +observe.data.ll.logbook.Activity.comment2=observe.data.Activity.comment2
    227 228 
     observe.data.ll.logbook.Activity.createDate=observe.Common.createDate
    228 229 
     observe.data.ll.logbook.Activity.currentDirection=observe.Common.currentDirection
    229 230 
     observe.data.ll.logbook.Activity.currentSpeed=observe.Common.currentSpeed
    ... ... @@ -473,6 +474,7 @@ observe.data.ll.logbook.SetStub.id=observe.Common.id
    473 474 
     observe.data.ll.logbook.SetStub.lastUpdateDate=observe.Common.lastUpdateDate
    474 475 
     observe.data.ll.logbook.SetStub.version=observe.Common.version
    475 476 
     observe.data.ll.observation.Activity.comment=observe.Common.comment
    477 
    +observe.data.ll.observation.Activity.comment2=observe.data.Activity.comment2
    476 478 
     observe.data.ll.observation.Activity.coordinate=observe.Common.coordinate
    477 479 
     observe.data.ll.observation.Activity.createDate=observe.Common.createDate
    478 480 
     observe.data.ll.observation.Activity.dataQuality=observe.Common.dataQuality
    ... ... @@ -1161,6 +1163,7 @@ observe.data.ps.localmarket.WellId.version=observe.Common.version
    1161 1163 
     observe.data.ps.localmarket.WellId.well=observe.Common.well
    1162 1164 
     observe.data.ps.localmarket.WellId.well.short=observe.Common.well.short
    1163 1165 
     observe.data.ps.logbook.Activity.comment=observe.Common.comment
    1166 
    +observe.data.ps.logbook.Activity.comment2=observe.data.Activity.comment2
    1164 1167 
     observe.data.ps.logbook.Activity.coordinate=observe.Common.coordinate
    1165 1168 
     observe.data.ps.logbook.Activity.createDate=observe.Common.createDate
    1166 1169 
     observe.data.ps.logbook.Activity.currentDirection=observe.Common.currentDirection
    ... ... @@ -1337,6 +1340,7 @@ observe.data.ps.logbook.WellPlan.weightCategory.short=observe.Common.weightCateg
    1337 1340 
     observe.data.ps.logbook.WellPlan.well=observe.Common.well
    1338 1341 
     observe.data.ps.logbook.WellPlan.well.short=observe.Common.well.short
    1339 1342 
     observe.data.ps.observation.Activity.comment=observe.Common.comment
    1343 
    +observe.data.ps.observation.Activity.comment2=observe.data.Activity.comment2
    1340 1344 
     observe.data.ps.observation.Activity.coordinate=observe.Common.coordinate
    1341 1345 
     observe.data.ps.observation.Activity.createDate=observe.Common.createDate
    1342 1346 
     observe.data.ps.observation.Activity.dataQuality=observe.Common.dataQuality

  • models/dto/java/src/main/java/fr/ird/observe/dto/ProtectedIdsPs.java
    ... ... @@ -37,6 +37,7 @@ public interface ProtectedIdsPs {
    37 37 
         String PS_COMMON_SCHOOL_TYPE_FREE_ID = "fr.ird.referential.ps.common.SchoolType#0#2";
    38 38 
         String PS_COMMON_SCHOOL_TYPE_OBJECT_ID = "fr.ird.referential.ps.common.SchoolType#0#1";
    39 39 
         String PS_COMMON_VESSEL_ACTIVITY_ID_FOR_SET = "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586";
    40 
    +    String PS_COMMON_VESSEL_ACTIVITY_ID_FOR_DCP = "fr.ird.referential.ps.common.VesselActivity#1239832675370#0.9125190289998782";
    40 41 
         String PS_COMMON_VESSEL_ACTIVITY_ID_FOR_WELL_PLAN = "fr.ird.referential.ps.common.VesselActivity#1464000000000#32";
    41 42 
         String PS_COMMON_VESSEL_ACTIVITY_ID_FOR_END_OF_SEARCHING = "fr.ird.referential.ps.common.VesselActivity#1239832675372#0.21399033380125898";
    42 43 
         String PS_COMMON_VESSEL_ACTIVITY_ID_CHANGED_ZONE = "fr.ird.referential.ps.common.VesselActivity#1379684416896#0.38648073770690594";

  • models/dto/java/src/main/java/fr/ird/observe/spi/decoration/ObserveI18nLabelsBuilder.java
    ... ... @@ -27,6 +27,7 @@ import fr.ird.observe.dto.BusinessDto;
    27 27 
     import fr.ird.observe.dto.CommonDto;
    28 28 
     import fr.ird.observe.dto.IdDto;
    29 29 
     import fr.ird.observe.dto.WithStartEndDate;
    30 
    +import fr.ird.observe.dto.data.ActivityAware;
    30 31 
     import fr.ird.observe.dto.data.GearUseFeaturesAware;
    31 32 
     import fr.ird.observe.dto.data.GearUseFeaturesMeasurementAware;
    32 33 
     import fr.ird.observe.dto.data.InlineDataDto;
    ... ... @@ -126,6 +127,7 @@ import static io.ultreia.java4all.i18n.I18n.n;
    126 127 
                     "weightMeasureMethod", "weightMeasureMethod", "weightMeasureType", "weightMeasureType.short", "weightedSnap", "weightedSwivel",
    127 128 
                     "well", "well.short", "whenArriving", "whenLeaving", "wind", "windDirection"}),
    128 129 
             @RegisterI18nLabel(target = IdDto.class, properties = {"id", "lastUpdateDate", "version", "createDate"}),
    130 
    +        @RegisterI18nLabel(target = ActivityAware.class, properties = {"comment2"}),
    129 131 
             @RegisterI18nLabel(target = BusinessDto.class, properties = {"homeId"}),
    130 132 
             @RegisterI18nLabel(target = OpenableDto.class, offers = {"action.close.tip", "action.create.tip", "action.editable.tip", "action.notEditable.tip", "action.reopen.tip", "action.update.tip"}),
    131 133 
             @RegisterI18nLabel(target = WithStartEndDate.class, properties = {"startDate", "endDate", "validityRangeLabel"}),

  • services/i18n/src/main/i18n/translations/services_en_GB.properties
    ... ... @@ -479,6 +479,7 @@ observe.constant.ValidationModelMode.DATA=Only data
    479 479 
     observe.constant.ValidationModelMode.DATA.description=Only data
    480 480 
     observe.constant.ValidationModelMode.REFERENTIEL=Only referential
    481 481 
     observe.constant.ValidationModelMode.REFERENTIEL.description=Only referential
    482 
    +observe.data.Activity.comment2=Only activity of type %s and %s allows you to fill DCPs.
    482 483 
     observe.data.Activity.validation.duplicated.number=There is already another activity with this number.
    483 484 
     observe.data.Activity.validation.duplicated.time=There is already another activity at this time.
    484 485 
     observe.data.GearUseFeatures.action.create=Create a new gear use feature

  • services/i18n/src/main/i18n/translations/services_es_ES.properties
    ... ... @@ -479,6 +479,7 @@ observe.constant.ValidationModelMode.DATA=Datos del observador
    479 479 
     observe.constant.ValidationModelMode.DATA.description=Datos del observador
    480 480 
     observe.constant.ValidationModelMode.REFERENTIEL=Referencial
    481 481 
     observe.constant.ValidationModelMode.REFERENTIEL.description=Todos los referenciales
    482 
    +observe.data.Activity.comment2=Solo la actividad %1$s or %2$s permite introducir un DCPs.
    482 483 
     observe.data.Activity.validation.duplicated.number=There is already another activity with this number. \#TODO
    483 484 
     observe.data.Activity.validation.duplicated.time=Ya existe una actividad a esa hora.
    484 485 
     observe.data.GearUseFeatures.action.create=Crear una nueva equipo

  • services/i18n/src/main/i18n/translations/services_fr_FR.properties
    ... ... @@ -479,6 +479,7 @@ observe.constant.ValidationModelMode.DATA=Données observées
    479 479 
     observe.constant.ValidationModelMode.DATA.description=Données observées
    480 480 
     observe.constant.ValidationModelMode.REFERENTIEL=Référentiel
    481 481 
     observe.constant.ValidationModelMode.REFERENTIEL.description=Tous les référentiels
    482 
    +observe.data.Activity.comment2=Seule l'activité %1$s ou %2$s permet de saisir des objets flottants.
    482 483 
     observe.data.Activity.validation.duplicated.number=Il existe déjà une autre activité avec ce numéro.
    483 484 
     observe.data.Activity.validation.duplicated.time=Il existe déjà une autre activité à cette heure.
    484 485 
     observe.data.GearUseFeatures.action.create=Nouvel équipement

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.