Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 23a14653 by Tony Chemit at 2021-10-17T17:09:25+02:00 Note d'information sur le form Activité - Closes #2041 - - - - - 12 changed files: - client/datasource/editor/ps/src/main/i18n/getters/java.getter - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/logbook/ActivityUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUI.jaxx - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUIHandler.java - models/definition/src/main/models/Observe/dto/class/i18nLabels.properties - models/dto/i18n/src/main/i18n/getters/labels.getter - models/dto/i18n/src/main/resources/META-INF/i18n/Observe-labels.properties - models/dto/java/src/main/java/fr/ird/observe/dto/ProtectedIdsPs.java - models/dto/java/src/main/java/fr/ird/observe/spi/decoration/ObserveI18nLabelsBuilder.java - services/i18n/src/main/i18n/translations/services_en_GB.properties - services/i18n/src/main/i18n/translations/services_es_ES.properties - services/i18n/src/main/i18n/translations/services_fr_FR.properties Changes: ===================================== client/datasource/editor/ps/src/main/i18n/getters/java.getter ===================================== @@ -14,7 +14,6 @@ observe.data.ps.logbook.Activity.error.no.activity.6 observe.data.ps.logbook.Sample.notSuperSample.with.moreThanOne.sampleSpecies.message observe.data.ps.logbook.Sample.notSuperSample.with.moreThanOne.sampleSpecies.title observe.data.ps.logbook.WellPlan.create.activity.tip -observe.data.ps.observation.Activity.error.no.activity.6 observe.data.ps.observation.Catch.catchWeightComputed.computed.tip observe.data.ps.observation.Catch.catchWeightComputed.observed.tip 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 @@ </row> <row> <cell anchor='west' columns="4"> - <JLabel id='vesselActivityInformation' styleClass="skipI18n information"/> + <JPanel layout="{new GridLayout(0, 1)}"> + <JLabel id='vesselActivityInformation' styleClass="skipI18n information"/> + <JLabel id='vesselActivityInformation2' styleClass="skipI18n information"/> + </JPanel> </cell> </row> <row> ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/observation/ActivityUI.jaxx ===================================== @@ -91,7 +91,10 @@ <!-- activity vessel --> <row> <cell anchor='west' columns="2"> - <JLabel id='vesselActivityInformation' styleClass="skipI18n information"/> + <JPanel layout="{new GridLayout(0, 1)}"> + <JLabel id='vesselActivityInformation' styleClass="skipI18n information"/> + <JLabel id='vesselActivityInformation2' styleClass="skipI18n information"/> + </JPanel> </cell> </row> <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; import fr.ird.observe.client.datasource.editor.api.content.actions.save.SaveAction; import fr.ird.observe.client.datasource.editor.api.content.data.open.actions.SaveContentOpenableUIAdapter; +import fr.ird.observe.dto.ProtectedIdsPs; import fr.ird.observe.dto.data.ps.observation.ActivityDto; import fr.ird.observe.dto.referential.ps.common.VesselActivityReference; import java.util.List; +import java.util.Objects; import static io.ultreia.java4all.i18n.I18n.t; @@ -39,10 +41,29 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { @Override public void onInit(ActivityUI ui) { super.onInit(ui); - String label = getActivity6Label(); - String text = t("observe.Common.vesselActivity.comment", label); - ui.vesselActivityInformation.setText(text); - ui.vesselActivityInformation.setToolTipText(text); + String label6 = null; + String label13 = null; + List<VesselActivityReference> activities = getReferentialReferences(VesselActivityReference.class); + for (VesselActivityReference vesselActivity : activities) { + String id = vesselActivity.getId(); + if (ProtectedIdsPs.PS_COMMON_VESSEL_ACTIVITY_ID_FOR_SET.equals(id)) { + label6 = vesselActivity.toString(); + continue; + } + if (ProtectedIdsPs.PS_COMMON_VESSEL_ACTIVITY_ID_FOR_DCP.equals(id)) { + label13 = vesselActivity.toString(); + label13 = label13.substring(0, label13.indexOf(" (")); + } + } + + Objects.requireNonNull(label6, "Can't find vessel activity with id: " + ProtectedIdsPs.PS_COMMON_VESSEL_ACTIVITY_ID_FOR_SET); + Objects.requireNonNull(label6, "Can't find vessel activity with id: " + ProtectedIdsPs.PS_COMMON_VESSEL_ACTIVITY_ID_FOR_DCP); + String text6 = t("observe.Common.vesselActivity.comment", label6); + ui.getVesselActivityInformation().setText(text6); + ui.getVesselActivityInformation().setToolTipText(text6); + String text13 = t("observe.data.Activity.comment2", label6, label13); + ui.getVesselActivityInformation2().setText(text13); + ui.getVesselActivityInformation2().setToolTipText(text13); } @Override @@ -54,14 +75,5 @@ class ActivityUIHandler extends GeneratedActivityUIHandler { .install(ui.getSave()); } - private String getActivity6Label() { - List<VesselActivityReference> activities = getReferentialReferences(VesselActivityReference.class); - for (VesselActivityReference vesselActivity : activities) { - if (ActivityDto.isFishingOperation(vesselActivity)) { - return vesselActivity.toString(); - } - } - throw new IllegalStateException(t("observe.data.ps.observation.Activity.error.no.activity.6")); - } //FIXME:Focus Time/VesselSpeed/ObservedSystem } ===================================== models/definition/src/main/models/Observe/dto/class/i18nLabels.properties ===================================== @@ -67,7 +67,7 @@ data.ps.localmarket.SampleSpeciesMeasure=count,sizeClass data.ps.localmarket.Survey=number,batches.available,comment,date,surveyPart,generalTab,surveyPartTab,batches.available,batches.selected data.ps.localmarket.SurveyPart=species data.ps.localmarket.WellId=well -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 +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 data.ps.logbook.Catch=comment,species,speciesFate,weight,weightCategory,weightMeasureMethod,well data.ps.logbook.FloatingObject=materialsValid,objectOperation,quadrant,supportVesselName,country,vessel,computedBiodegradable,computedNonEntangling,computedSimplifiedObjectType,computedValues,generalTab,buoysTab,materialsTab,notComputed,type.short data.ps.logbook.Route=activity,comment,date,fishingTime,timeAtSea @@ -78,7 +78,7 @@ data.ps.logbook.SampleSpecies=comment,measuredCount,sampleSpeciesMeasure,sizeMea data.ps.logbook.SampleSpeciesMeasure=count,sizeClass data.ps.logbook.TransmittingBuoy=comment,code,transmittingBuoyOwnership,transmittingBuoyType,transmittingBuoyOperation,country,vessel,latitude,longitude,quadrant data.ps.logbook.WellPlan=activity,species,weight,weightCategory,well,wellSamplingConformity,wellSamplingStatus -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 +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,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 data.ps.observation.FloatingObject=materialsValid,objectOperation,supportVesselName,country,vessel,computedBiodegradable,computedNonEntangling,computedSimplifiedObjectType,computedValues,generalTab,buoysTab,materialsTab,notComputed,type.short 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 observe.Common.whenLeaving observe.Common.wind observe.Common.windDirection +observe.data.Activity.comment2 observe.data.GearUseFeatures.action.create observe.data.GearUseFeatures.action.save observe.data.GearUseFeatures.action.save.tip ===================================== models/dto/i18n/src/main/resources/META-INF/i18n/Observe-labels.properties ===================================== @@ -20,7 +20,7 @@ # #L% ### #Generated by org.nuiton.i18n.plugin.GenerateI18nLabelsMojo -#Sun Oct 17 15:31:35 CEST 2021 +#Sun Oct 17 16:07:51 CEST 2021 observe.Business.createDate=observe.Common.createDate observe.Business.homeId=observe.Common.homeId observe.Business.id=observe.Common.id @@ -224,6 +224,7 @@ observe.data.ll.landing.LandingPart.species.short=observe.Common.species.short observe.data.ll.landing.LandingPart.version=observe.Common.version observe.data.ll.landing.LandingPart.weightMeasureMethod=observe.Common.weightMeasureMethod observe.data.ll.logbook.Activity.comment=observe.Common.comment +observe.data.ll.logbook.Activity.comment2=observe.data.Activity.comment2 observe.data.ll.logbook.Activity.createDate=observe.Common.createDate observe.data.ll.logbook.Activity.currentDirection=observe.Common.currentDirection observe.data.ll.logbook.Activity.currentSpeed=observe.Common.currentSpeed @@ -473,6 +474,7 @@ observe.data.ll.logbook.SetStub.id=observe.Common.id observe.data.ll.logbook.SetStub.lastUpdateDate=observe.Common.lastUpdateDate observe.data.ll.logbook.SetStub.version=observe.Common.version observe.data.ll.observation.Activity.comment=observe.Common.comment +observe.data.ll.observation.Activity.comment2=observe.data.Activity.comment2 observe.data.ll.observation.Activity.coordinate=observe.Common.coordinate observe.data.ll.observation.Activity.createDate=observe.Common.createDate observe.data.ll.observation.Activity.dataQuality=observe.Common.dataQuality @@ -1161,6 +1163,7 @@ observe.data.ps.localmarket.WellId.version=observe.Common.version observe.data.ps.localmarket.WellId.well=observe.Common.well observe.data.ps.localmarket.WellId.well.short=observe.Common.well.short observe.data.ps.logbook.Activity.comment=observe.Common.comment +observe.data.ps.logbook.Activity.comment2=observe.data.Activity.comment2 observe.data.ps.logbook.Activity.coordinate=observe.Common.coordinate observe.data.ps.logbook.Activity.createDate=observe.Common.createDate observe.data.ps.logbook.Activity.currentDirection=observe.Common.currentDirection @@ -1337,6 +1340,7 @@ observe.data.ps.logbook.WellPlan.weightCategory.short=observe.Common.weightCateg observe.data.ps.logbook.WellPlan.well=observe.Common.well observe.data.ps.logbook.WellPlan.well.short=observe.Common.well.short observe.data.ps.observation.Activity.comment=observe.Common.comment +observe.data.ps.observation.Activity.comment2=observe.data.Activity.comment2 observe.data.ps.observation.Activity.coordinate=observe.Common.coordinate observe.data.ps.observation.Activity.createDate=observe.Common.createDate 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 { String PS_COMMON_SCHOOL_TYPE_FREE_ID = "fr.ird.referential.ps.common.SchoolType#0#2"; String PS_COMMON_SCHOOL_TYPE_OBJECT_ID = "fr.ird.referential.ps.common.SchoolType#0#1"; String PS_COMMON_VESSEL_ACTIVITY_ID_FOR_SET = "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586"; + String PS_COMMON_VESSEL_ACTIVITY_ID_FOR_DCP = "fr.ird.referential.ps.common.VesselActivity#1239832675370#0.9125190289998782"; String PS_COMMON_VESSEL_ACTIVITY_ID_FOR_WELL_PLAN = "fr.ird.referential.ps.common.VesselActivity#1464000000000#32"; String PS_COMMON_VESSEL_ACTIVITY_ID_FOR_END_OF_SEARCHING = "fr.ird.referential.ps.common.VesselActivity#1239832675372#0.21399033380125898"; 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; import fr.ird.observe.dto.CommonDto; import fr.ird.observe.dto.IdDto; import fr.ird.observe.dto.WithStartEndDate; +import fr.ird.observe.dto.data.ActivityAware; import fr.ird.observe.dto.data.GearUseFeaturesAware; import fr.ird.observe.dto.data.GearUseFeaturesMeasurementAware; import fr.ird.observe.dto.data.InlineDataDto; @@ -126,6 +127,7 @@ import static io.ultreia.java4all.i18n.I18n.n; "weightMeasureMethod", "weightMeasureMethod", "weightMeasureType", "weightMeasureType.short", "weightedSnap", "weightedSwivel", "well", "well.short", "whenArriving", "whenLeaving", "wind", "windDirection"}), @RegisterI18nLabel(target = IdDto.class, properties = {"id", "lastUpdateDate", "version", "createDate"}), + @RegisterI18nLabel(target = ActivityAware.class, properties = {"comment2"}), @RegisterI18nLabel(target = BusinessDto.class, properties = {"homeId"}), @RegisterI18nLabel(target = OpenableDto.class, offers = {"action.close.tip", "action.create.tip", "action.editable.tip", "action.notEditable.tip", "action.reopen.tip", "action.update.tip"}), @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 observe.constant.ValidationModelMode.DATA.description=Only data observe.constant.ValidationModelMode.REFERENTIEL=Only referential observe.constant.ValidationModelMode.REFERENTIEL.description=Only referential +observe.data.Activity.comment2=Only activity of type %s and %s allows you to fill DCPs. observe.data.Activity.validation.duplicated.number=There is already another activity with this number. observe.data.Activity.validation.duplicated.time=There is already another activity at this time. 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 observe.constant.ValidationModelMode.DATA.description=Datos del observador observe.constant.ValidationModelMode.REFERENTIEL=Referencial observe.constant.ValidationModelMode.REFERENTIEL.description=Todos los referenciales +observe.data.Activity.comment2=Solo la actividad %1$s or %2$s permite introducir un DCPs. observe.data.Activity.validation.duplicated.number=There is already another activity with this number. \#TODO observe.data.Activity.validation.duplicated.time=Ya existe una actividad a esa hora. 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 observe.constant.ValidationModelMode.DATA.description=Données observées observe.constant.ValidationModelMode.REFERENTIEL=Référentiel observe.constant.ValidationModelMode.REFERENTIEL.description=Tous les référentiels +observe.data.Activity.comment2=Seule l'activité %1$s ou %2$s permet de saisir des objets flottants. observe.data.Activity.validation.duplicated.number=Il existe déjà une autre activité avec ce numéro. observe.data.Activity.validation.duplicated.time=Il existe déjà une autre activité à cette heure. observe.data.GearUseFeatures.action.create=Nouvel équipement View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/23a14653fd22740b56ca1ab1fe... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/23a14653fd22740b56ca1ab1fe... You're receiving this email because of your account on gitlab.com.