October 2021 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] Note d'information sur le form Activité - Closes #2041
by Tony CHEMIT (＠tchemit) 17 Oct '21

17 Oct '21

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 @@  <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/23a14653fd22740b56ca1ab1f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/23a14653fd22740b56ca1ab1f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Note d'information sur le form Activité - Closes #2041
by Tony CHEMIT (＠tchemit) 17 Oct '21

17 Oct '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 643e48aa by Tony Chemit at 2021-10-17T16:45:09+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()}"> + <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 @@  <row> <cell anchor='west' columns="2"> - <JLabel id='vesselActivityInformation' styleClass="skipI18n information"/> + <JPanel layout="{new GridLayout()}"> + <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,28 @@ 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(); + } + } + + 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.Common.vesselActivity.comment", label6, label13); + ui.getVesselActivityInformation2().setText(text13); + ui.getVesselActivityInformation2().setToolTipText(text13); } @Override @@ -54,14 +74,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/643e48aae3736a65eab15b73c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/643e48aae3736a65eab15b73c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 10 commits: Le classement alphabétique des bateaux semble ne pas fonctionner - Closes #2037
by Tony CHEMIT (＠tchemit) 17 Oct '21

17 Oct '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8f91f6fc by Tony Chemit at 2021-10-17T13:25:03+02:00 Le classement alphabétique des bateaux semble ne pas fonctionner - Closes #2037 - - - - - 692d9264 by Tony Chemit at 2021-10-17T13:25:03+02:00 Afficher le type bateau sur le liste du gestionnaire bateaux - Closes #2035 - - - - - 9608e571 by Tony Chemit at 2021-10-17T13:34:33+02:00 Visibilité des types de bateaux - Closes #2036 - - - - - 962e96a3 by Tony Chemit at 2021-10-17T13:48:37+02:00 Ajout de personnes - Closes #2039 - - - - - 4328adbf by Tony Chemit at 2021-10-17T14:46:01+02:00 Petites améliorations sur la migration V9 des zones FPA - Closes #2042 - - - - - 4f434a17 by Tony Chemit at 2021-10-17T14:47:05+02:00 Peaufinage validation du form PS logbook échantillon - Closes #2046 - - - - - 3e7ec800 by Tony Chemit at 2021-10-17T14:47:05+02:00 Petit défaut d'affichage sur Marché local - Closes #2048 - - - - - f1feaaed by Tony Chemit at 2021-10-17T14:50:24+02:00 Libellé form plan de cuves - Closes #2044 - - - - - 88ebb96a by Tony Chemit at 2021-10-17T15:24:10+02:00 Organisation du form PS/Logbook/Activité - Closes #2043 - - - - - f2d45309 by Tony Chemit at 2021-10-17T15:41:40+02:00 Ajout de 2 colonnes dates sur Vessel - Closes #2040 - - - - - 30 changed files: - client/configuration/src/main/config/Client.ini - client/core/src/main/java/fr/ird/observe/client/datasource/api/cache/ReferencesCache.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/navigation/tree/NavigationContext.java - client/datasource/editor/common/src/main/java/fr/ird/observe/client/datasource/editor/common/referential/common/VesselUI.jaxx - client/datasource/editor/ps/src/main/i18n/getters/jaxx.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/logbook/ActivityUI.jcss - client/runner/src/main/resources/META-INF/configuration/ClientConfig.md - client/runner/src/main/resources/META-INF/configuration/ClientConfig.properties - models/definition/src/main/models/Observe/dto/01-referential-common.model - models/definition/src/main/models/Observe/dto/attribute/mayNotNull.properties - models/definition/src/main/models/Observe/dto/attribute/notNullIf.properties - models/definition/src/main/models/Observe/dto/class/decorator.properties - models/definition/src/main/models/Observe/dto/class/i18nLabels.properties - models/definition/src/main/models/Observe/dto/class/references.properties - models/definition/src/main/models/Observe/persistence/01-referential-common.model - models/definition/src/main/models/Observe/persistence/attribute/hibernateAttributeType.java.util.Date.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/data/ps/logbook/SampleDto.java - models/dto/java/src/main/java/fr/ird/observe/dto/referential/common/GearCharacteristicTypeAware.java - models/dto/java/src/main/java/fr/ird/observe/spi/decoration/ObserveI18nLabelsBuilder.java - models/dto/java/src/test/resources/fixtures/dto.properties - models/persistence/avdth/src/main/java/fr/ird/observe/persistence/avdth/referential/interceptors/FpaZoneInterceptor.java - models/persistence/java/src/test/resources/fixtures/persistence.properties - models/persistence/migration/src/main/java/fr/ird/observe/entities/migration/v8/DataSourceMigrationForVersion_8_1.java - models/persistence/migration/src/main/resources/db/migration/v8/8.1/00_update_referential_common_Vessel-H2.sql - models/persistence/migration/src/main/resources/db/migration/v8/8.1/00_update_referential_common_Vessel-PG.sql The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/35e4efbf5c7c996b0f34661b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/35e4efbf5c7c996b0f34661b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 11 commits: Revue de l'affichage des indicateurs dans l'arbre de navigation - Closes #2033
by Tony CHEMIT (＠tchemit) 15 Oct '21

15 Oct '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 99e39a7b by Tony Chemit at 2021-10-14T21:43:53+02:00 Revue de l'affichage des indicateurs dans l'arbre de navigation - Closes #2033 - - - - - 520ce343 by Tony Chemit at 2021-10-14T21:43:53+02:00 Fix reference generation - - - - - c1872060 by Tony Chemit at 2021-10-14T21:43:53+02:00 Improve parent reference management in navigation node, now offers it from his parent to never reload it ever). - - - - - 77bc68ca by Tony Chemit at 2021-10-14T21:43:53+02:00 Gestion de showData dans les ContentListUI - - - - - 3b3ad29f by Tony Chemit at 2021-10-15T13:10:49+02:00 Gestion de showData dans les ContentTableUI - - - - - 93c7e450 by Tony Chemit at 2021-10-15T13:10:49+02:00 improve menu accessibility - - - - - 07dcc19a by Tony Chemit at 2021-10-15T13:10:49+02:00 Improve default focus on list and table when not reading - - - - - d0863cd3 by Tony Chemit at 2021-10-15T13:10:49+02:00 Flip de deux champs (pour refléter l'arbre de navigation) - - - - - 629f22c8 by Tony Chemit at 2021-10-15T13:10:49+02:00 Auto-chargement des nœuds fils, le retour... Au final on charge toujours les fils d'un enfant si il est unique et de type reference ou conteneur de références. - - - - - 2cfcfdeb by Tony Chemit at 2021-10-15T13:10:49+02:00 Le focus peut ouvrir un menu d'action désormais depuis la liste des messages. - - - - - 35e4efbf by Tony Chemit at 2021-10-15T16:31:26+02:00 Revue de l'action déplacer et assainissement du service de récupération des parents - - - - - 30 changed files: - client/core/src/main/java/fr/ird/observe/client/datasource/validation/ObserveValidatorMessageMouseListener.java - client/core/src/main/java/fr/ird/observe/client/main/focus/FocusDispatcher.java - client/core/src/main/java/fr/ird/observe/client/util/UIHelper.java - client/core/src/main/resources/fr/ird/observe/client/ui/ObserveCommon.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/ContentUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/ConfigureMenuAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/InsertMenuAction.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/create/CreateNewPredicate.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/mode/ChangeMode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/move/MoveRequestBuilder.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/actions/open/ContentOpen.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUINavigationNode.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationInitializer.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/actions/FixData.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUIModelStates.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationInitializer.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationNode.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b786e85bd9361eda9b5f085b… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/b786e85bd9361eda9b5f085b… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 16 commits: Amélioration rendu ps.common.AcquisitionStatus
by Tony CHEMIT (＠tchemit) 13 Oct '21

13 Oct '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 57e5ae35 by Tony Chemit at 2021-10-10T13:42:38+02:00 Amélioration rendu ps.common.AcquisitionStatus - - - - - efa41e4c by Tony Chemit at 2021-10-11T15:30:41+02:00 reduce i18n keys for Trip - - - - - 6724054c by Tony Chemit at 2021-10-11T15:30:41+02:00 Lecture des messages longs - Closes #2028 - - - - - 37ed54ef by Tony Chemit at 2021-10-12T22:46:41+02:00 update pom - - - - - fe561861 by Tony Chemit at 2021-10-12T22:46:41+02:00 Stockage en base locale de la date de dernière mise à jour du référentiel - See ultreiaio/ird-observe#1511 - - - - - 7c425026 by Tony Chemit at 2021-10-12T22:46:41+02:00 Improve referential synchronize API : * always use replication order to build diff and generate sql * review how to deal with missing ids * improve builder design See ultreiaio/ird-observe#2029 - - - - - 4c091301 by Tony Chemit at 2021-10-12T22:46:41+02:00 Navigation tree with no minimum size (otherwise tree has not a lot of space on screen) - - - - - 91c09c64 by Tony Chemit at 2021-10-12T22:46:41+02:00 no need DecoratorService inside differential nodes - - - - - 6934ff32 by Tony Chemit at 2021-10-12T22:46:41+02:00 Que faire des référentiels plus à jour dans la base locale lors d'une synchronisation de référentiel simple - See ultreiaio/ird-observe#2030 - - - - - 77af232c by Tony Chemit at 2021-10-12T22:46:41+02:00 Review DifferentialModel API - - - - - deb06822 by Tony Chemit at 2021-10-13T10:39:36+02:00 improve persistence stack API : * make application context builder of DifferentialMetaModel * improve TopiaEntitySqlModelSupport - - - - - 1080014c by Tony Chemit at 2021-10-13T10:40:07+02:00 remove LastUpdateDate entity from referential replication at last. - - - - - 5be8aa2f by Tony Chemit at 2021-10-13T10:42:49+02:00 Improve how to get DifferentialModelBuilder from admin actions. - - - - - 418e922c by Tony Chemit at 2021-10-13T12:55:19+02:00 Logs de l'import AVDTH - Closes #2026 - - - - - 232319c5 by Tony Chemit at 2021-10-13T12:55:19+02:00 Amélioration interface de l'import AVDTH - Closes #2031 - - - - - b786e85b by Tony Chemit at 2021-10-13T17:25:08+02:00 Revue de l'affichage des indicateurs dans l'arbre de navigation - Closes #2033 - - - - - 30 changed files: - client/configuration/src/main/filtered-resources/log4j2.xml - client/configuration/src/main/filtered-resources/observe-log4j2.xml - client/datasource/api/src/main/i18n/templates/ObserveSwingDataSource_en_GB.ftl → client/core/src/main/i18n/templates/ObserveSwingDataSource_en_GB.ftl - client/datasource/api/src/main/i18n/templates/ObserveSwingDataSource_es_ES.ftl → client/core/src/main/i18n/templates/ObserveSwingDataSource_es_ES.ftl - client/datasource/api/src/main/i18n/templates/ObserveSwingDataSource_fr_FR.ftl → client/core/src/main/i18n/templates/ObserveSwingDataSource_fr_FR.ftl - client/core/src/main/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSource.java - client/core/src/main/java/fr/ird/observe/client/util/init/UIInitHelper.java - client/datasource/actions/src/main/i18n/getters/java.getter - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminActionModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/legacy/actions/SynchroUIActionSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/ReferentialSynchroModel.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/Apply.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/actions/Start.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSelectionTreeCellRenderer.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/node/ReferentialPropertyUpdatedNode.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/node/ReferentialSynchroNodeSupport.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/node/ReferentialTypeSynchroNode.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/node/RootSynchroNode.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/synchronize/referential/ng/tree/node/SynchroNodeSupport.java - client/datasource/api/src/test/java/fr/ird/observe/client/datasource/api/ObserveSwingDataSourceTest.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialog.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/ImportDialogModel.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/avdth/actions/Extract.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/edit/ContentEditUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/list/ContentListUINavigationHandler.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/open/ContentOpenableUINavigationHandler.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3c5e4a1dcfa7510b1e538719… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/3c5e4a1dcfa7510b1e538719… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/tree_without_program
by Tony CHEMIT (＠tchemit) 11 Oct '21

11 Oct '21

Tony CHEMIT pushed new branch feature/tree_without_program at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/feature/tree_without_program You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 3 commits: ll_landing.landingpart.weight NOT NULL ? - See ultreiaio/ird-observe#2027
by Tony CHEMIT (＠tchemit) 10 Oct '21

10 Oct '21

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ea447671 by Tony Chemit at 2021-10-10T11:00:14+02:00 ll_landing.landingpart.weight NOT NULL ? - See ultreiaio/ird-observe#2027 - - - - - 1a4ba00b by Tony Chemit at 2021-10-10T12:35:21+02:00 Revue layout formulaire LL_logbook.Sample - - - - - 3c5e4a1d by Tony Chemit at 2021-10-10T12:35:41+02:00 Revue layout formulaire LL_landing.Landing - - - - - 19 changed files: - + client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUITableModel.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/actions/LandingUISelectTransshipment.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUITableModel.java - models/definition/src/main/models/Observe/dto/attribute/notNull.properties - models/definition/src/main/models/Observe/dto/attribute/notNullIf.properties - models/definition/src/main/models/Observe/persistence/attribute/notNull.properties - models/persistence/migration/src/main/resources/db/migration/v9/9.0/14_add_missing_not_null-common.sql - models/persistence/migration/src/main/resources/db/migration/v9/9.0/observe_create-schema-H2.sql - models/persistence/migration/src/main/resources/db/migration/v9/9.0/observe_create-schema-PG.sql - models/persistence/migration/src/main/resources/db/migration/v9/9.0/observe_full-schema-H2.sql - models/persistence/migration/src/main/resources/db/migration/v9/9.0/observe_full-schema-PG.sql - 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 - services/validation/src/main/i18n/getters/eugene.getter - services/validation/src/main/i18n/getters/validation-messages.getter Changes: ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingPartUITableModel.java ===================================== @@ -0,0 +1,53 @@ +package fr.ird.observe.client.datasource.editor.ll.data.landing; + +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: LL + * %% + * Copyright (C) 2008 - 2021 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.datasource.editor.api.content.EditableContentUI; +import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.data.ll.landing.LandingDto; + +import javax.swing.JTable; + +/** + * Created on 10/10/2021. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.0.0 + */ +public class LandingPartUITableModel extends GeneratedLandingPartUITableModel { + + private static final long serialVersionUID = 1L; + + public LandingPartUITableModel(EditableContentUI<LandingDto> parentUi, LandingPartUI ui, LandingPartUIModel model) { + super(parentUi, ui, model); + } + + @Override + public void initTableUISize(JTable table) { + super.initTableUISize(table); + UIHelper.fixTableColumnWidth(table, 1, 75); + UIHelper.fixTableColumnWidth(table, 2, 75); + UIHelper.fixTableColumnWidth(table, 3, 75); + UIHelper.fixTableColumnWidth(table, 4, 75); + } +} ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUI.jaxx ===================================== @@ -18,159 +18,138 @@ #L% --> <fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUI - beanScope="bean" i18n="fr.ird.observe.dto.data.ll.landing.LandingDto" superGenericType='LandingDto, LandingUI'> + beanScope="bean" i18n="fr.ird.observe.dto.data.ll.landing.LandingDto" superGenericType='LandingDto, LandingUI'> - <import> - fr.ird.observe.dto.data.ll.landing.LandingDto - fr.ird.observe.dto.data.ll.landing.LandingPartDto - fr.ird.observe.dto.referential.common.DataQualityReference - fr.ird.observe.dto.referential.common.HarbourReference - fr.ird.observe.dto.referential.common.PersonReference - fr.ird.observe.dto.referential.common.SpeciesReference - fr.ird.observe.dto.referential.common.VesselReference - fr.ird.observe.dto.referential.ll.landing.DataSourceReference - fr.ird.observe.dto.referential.ll.landing.CompanyReference + <import> + fr.ird.observe.dto.data.ll.landing.LandingDto + fr.ird.observe.dto.data.ll.landing.LandingPartDto + fr.ird.observe.dto.referential.common.DataQualityReference + fr.ird.observe.dto.referential.common.HarbourReference + fr.ird.observe.dto.referential.common.PersonReference + fr.ird.observe.dto.referential.common.SpeciesReference + fr.ird.observe.dto.referential.common.VesselReference + fr.ird.observe.dto.referential.ll.landing.DataSourceReference + fr.ird.observe.dto.referential.ll.landing.CompanyReference - fr.ird.observe.client.ObserveSwingApplicationContext - org.nuiton.jaxx.widgets.datetime.DateEditor + fr.ird.observe.client.ObserveSwingApplicationContext + org.nuiton.jaxx.widgets.datetime.DateEditor - org.nuiton.jaxx.widgets.text.BigTextEditor - org.nuiton.jaxx.widgets.number.NumberEditor - io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox - java.util.Collection + org.nuiton.jaxx.widgets.text.BigTextEditor + org.nuiton.jaxx.widgets.number.NumberEditor + io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox + java.util.Collection - static fr.ird.observe.client.util.UIHelper.getStringValue - static io.ultreia.java4all.i18n.I18n.n - </import> + static fr.ird.observe.client.util.UIHelper.getStringValue + static io.ultreia.java4all.i18n.I18n.n + </import> - <LandingUIModel id='model' constructorParams='@override:getNavigationSource(this)'/> - <LandingUIModelStates id='states'/> - <LandingDto id='bean'/> - <BeanValidator id='validator' context='update' autoField='true' - beanClass='fr.ird.observe.dto.data.ll.landing.LandingDto' - errorTableModel='{getErrorTableModel()}'> - <field name='landingPart' component='landingPartPanel'/> - </BeanValidator> + <LandingUIModel id='model' constructorParams='@override:getNavigationSource(this)'/> + <LandingUIModelStates id='states'/> + <LandingDto id='bean'/> + <BeanValidator id='validator' context='update' autoField='true' + beanClass='fr.ird.observe.dto.data.ll.landing.LandingDto' + errorTableModel='{getErrorTableModel()}'> + <field name='landingPart' component='landingPartPanel'/> + </BeanValidator> - <JPanel id="contentBody" layout='{new BorderLayout()}'> - <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> - <row> - <cell weightx="1" weighty="1"> - <JTabbedPane id='mainTabbedPane'> - <tab id='characteristicsTab' i18nProperty=""> - <JScrollPane id="characteristicsTabScrollPane"> - <Table fill='both' insets="0"> + <JPanel id="contentBody" layout='{new BorderLayout()}'> + <Table insets="0" fill="both" constraints='BorderLayout.CENTER'> + <row> + <cell weightx="1" weighty="1"> + <JTabbedPane id='mainTabbedPane'> + <tab id='characteristicsTab' i18nProperty=""> + <Table fill='both'> + <row> + <cell> + <JLabel id='dataSourceLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='dataSource' genericType='DataSourceReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='personLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='person' genericType='PersonReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='processingCompanyLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='processingCompany' genericType='CompanyReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='shippingCompanyLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='shippingCompany' genericType='CompanyReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='brokerageCompanyLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='brokerageCompany' genericType='CompanyReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='harbourLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='harbour' genericType='HarbourReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='vesselLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='vessel' genericType='VesselReference'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='startDateLabel'/> + </cell> + <cell anchor='east' weightx="1"> + <DateEditor id='startDate'/> + </cell> + </row> + <row> + <cell anchor='west'> + <JLabel id='endDateLabel'/> + </cell> + <cell anchor='east' weightx="1"> + <DateEditor id='endDate'/> + </cell> + </row> + <row> + <cell fill="both" weighty="1" columns="2"> + <BigTextEditor id="comment"/> + </cell> + </row> + </Table> + </tab> + <tab id='landingPartTab' i18nProperty=""> + <JPanel id="landingPartPanel" layout='{new BorderLayout()}'> + <LandingPartUI id="landingPartUI" constructorParams="newContext()"/> + </JPanel> + </tab> + </JTabbedPane> + </cell> + </row> + </Table> + </JPanel> -  - <row> - <cell> - <JLabel id='dataSourceLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='dataSource' genericType='DataSourceReference'/> - </cell> - </row> - -  - <row> - <cell> - <JLabel id='personLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='person' genericType='PersonReference'/> - </cell> - </row> - -  - <row> - <cell> - <JLabel id='processingCompanyLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='processingCompany' genericType='CompanyReference'/> - </cell> - </row> - -  - <row> - <cell> - <JLabel id='shippingCompanyLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='shippingCompany' genericType='CompanyReference'/> - </cell> - </row> -  - <row> - <cell> - <JLabel id='brokerageCompanyLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='brokerageCompany' genericType='CompanyReference'/> - </cell> - </row> - -  - <row> - <cell> - <JLabel id='harbourLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JPanel layout="{new BorderLayout()}"> - <JaxxComboBox id='harbour' genericType='HarbourReference' constraints='BorderLayout.CENTER'/> - <JButton id='selectTransshipment' constraints='BorderLayout.EAST'/> - </JPanel> - </cell> - </row> - -  - <row> - <cell> - <JLabel id='vesselLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='vessel' genericType='VesselReference'/> - </cell> - </row> - -  - <row> - <cell anchor='west'> - <JLabel id='startDateLabel'/> - </cell> - <cell anchor='east' weightx="1"> - <DateEditor id='startDate'/> - </cell> - </row> - -  - <row> - <cell anchor='west'> - <JLabel id='endDateLabel'/> - </cell> - <cell anchor='east' weightx="1"> - <DateEditor id='endDate'/> - </cell> - </row> - <row> - <cell fill="both" weighty="1" weightx="1" columns="2"> - <BigTextEditor id="comment"/> - </cell> - </row> - </Table> - </JScrollPane> - </tab> - <tab id='landingPartTab' i18nProperty=""> - <JPanel id="landingPartPanel" layout='{new BorderLayout()}'> - <LandingPartUI id="landingPartUI" constructorParams="newContext()"/> - </JPanel> - </tab> - </JTabbedPane> - </cell> - </row> - </Table> - </JPanel> - - <Object id="delegateContentUI" initializer="mainTabbedPane"/> - <LandingPartUIModelStates id='landingPartStates' initializer="landingPartUI.getModel().getStates()"/> + <Object id="delegateContentUI" initializer="mainTabbedPane"/> + <LandingPartUIModelStates id='landingPartStates' initializer="landingPartUI.getModel().getStates()"/> + <JButton id='selectTransshipment'/> </fr.ird.observe.client.datasource.editor.api.content.data.open.ContentOpenableUI> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/LandingUIHandler.java ===================================== @@ -52,6 +52,7 @@ class LandingUIHandler extends GeneratedLandingUIHandler { public void onInit(LandingUI ui) { super.onInit(ui); getContentOpen().initTabUI(ui.getLandingPartUI(), ui.getLandingPartPanel(), 1); + ui.getHarbour().getToolbarRight().add(ui.getSelectTransshipment()); } @Override ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/landing/actions/LandingUISelectTransshipment.java ===================================== @@ -39,7 +39,7 @@ import static io.ultreia.java4all.i18n.I18n.n; public class LandingUISelectTransshipment extends ContentUIActionSupport<LandingUI> { public LandingUISelectTransshipment() { - super(n("observe.data.ll.landing.Landing.action.selectTransshipment"), n("observe.data.ll.landing.Landing.action.selectTransshipment"), "data-calcule", ObserveLLKeyStrokes.KEY_STROKE_SELECT_TRANSSHIPMENT); + super("", n("observe.data.ll.landing.Landing.action.selectTransshipment"), "data-calcule", ObserveLLKeyStrokes.KEY_STROKE_SELECT_TRANSSHIPMENT); } @Override ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUI.jaxx ===================================== @@ -23,141 +23,130 @@ superGenericType='SampleDto, SamplePartDto, SamplePartUI' implements='fr.ird.observe.client.datasource.editor.api.content.NotStandaloneContentUI<SampleDto>, fr.ird.observe.client.datasource.editor.api.content.data.table.sortable.SortableTableUI'> - <style source="classpath:/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss"/> + <style source="classpath:/fr/ird/observe/client/datasource/editor/api/content/data/sample/CommonSample.jcss"/> - <import> - fr.ird.observe.dto.referential.common.SexReference - fr.ird.observe.dto.referential.common.SizeMeasureTypeReference - fr.ird.observe.dto.referential.common.LengthMeasureMethodReference - fr.ird.observe.dto.referential.common.WeightMeasureTypeReference - fr.ird.observe.dto.referential.common.WeightMeasureMethodReference - fr.ird.observe.dto.referential.common.SpeciesReference - fr.ird.observe.dto.data.ll.logbook.SamplePartDto - fr.ird.observe.dto.data.ll.logbook.SampleDto - fr.ird.observe.dto.data.AcquisitionMode - fr.ird.observe.client.datasource.editor.api.content.data.table.* + <import> + fr.ird.observe.dto.referential.common.SexReference + fr.ird.observe.dto.referential.common.SizeMeasureTypeReference + fr.ird.observe.dto.referential.common.LengthMeasureMethodReference + fr.ird.observe.dto.referential.common.WeightMeasureTypeReference + fr.ird.observe.dto.referential.common.WeightMeasureMethodReference + fr.ird.observe.dto.referential.common.SpeciesReference + fr.ird.observe.dto.data.ll.logbook.SamplePartDto + fr.ird.observe.dto.data.ll.logbook.SampleDto + fr.ird.observe.dto.data.AcquisitionMode + fr.ird.observe.client.datasource.editor.api.content.data.table.* - org.nuiton.jaxx.widgets.number.NumberEditor - io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox - org.nuiton.jaxx.widgets.text.BigTextEditor - org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel - java.awt.Dimension + org.nuiton.jaxx.widgets.number.NumberEditor + io.ultreia.java4all.jaxx.widgets.combobox.JaxxComboBox + org.nuiton.jaxx.widgets.text.BigTextEditor + org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel + java.awt.Dimension - static fr.ird.observe.client.util.UIHelper.getStringValue - static io.ultreia.java4all.i18n.I18n.n - </import> + static fr.ird.observe.client.util.UIHelper.getStringValue + static io.ultreia.java4all.i18n.I18n.n + </import> - <script><![CDATA[ + <script><![CDATA[ @Override public ObserveSwingValidator<SampleDto> getValidator() { return getParentUI().getValidator(); } ]]></script> - <SamplePartUIModel id='model' initializer="getContextValue(SamplePartUIModel.class)"/> - <SamplePartUIModelStates id='states'/> - <SamplePartUITableModel id='tableModel' initializer="getContextValue(SamplePartUITableModel.class)"/> - <SampleDto id='bean'/> - <SamplePartDto id='tableEditBean'/> + <SamplePartUIModel id='model' initializer="getContextValue(SamplePartUIModel.class)"/> + <SamplePartUIModelStates id='states'/> + <SamplePartUITableModel id='tableModel' initializer="getContextValue(SamplePartUITableModel.class)"/> + <SampleDto id='bean'/> + <SamplePartDto id='tableEditBean'/> - <BeanValidator id='validatorTable' autoField='true' beanClass='fr.ird.observe.dto.data.ll.logbook.SamplePartDto' - errorTableModel='{getErrorTableModel()}' context='update'> - </BeanValidator> + <BeanValidator id='validatorTable' autoField='true' beanClass='fr.ird.observe.dto.data.ll.logbook.SamplePartDto' + errorTableModel='{getErrorTableModel()}' context='update'> + </BeanValidator> - <ButtonGroup id='acquisitionModeGroup'/> + <ButtonGroup id='acquisitionModeGroup'/> - <Table id='editorPanel' fill='both' insets='1' beanScope="tableEditBean"> - -  - <row> - <cell columns="4"> - <JPanel id="modeAndCodePanel" layout='{new BorderLayout()}'> - <JPanel id='acquisitionModePanel' constraints="BorderLayout.CENTER" layout="{new GridLayout(0, 1)}"> - <JRadioButton id='acquisitionModeNumber'/> - <JRadioButton id='acquisitionModeIndividual'/> - </JPanel> - <Table id='speciesAndMeasureTypesPanel' fill='both' insets='1' constraints="BorderLayout.EAST"> - <row> - <cell> - <JLabel id='speciesLabel' styleClass="i18n"/> - </cell> - <cell weightx='1'> - <JaxxComboBox id='species' genericType='SpeciesReference'/> - </cell> - </row> - <row> - <cell> - <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/> - </cell> - <cell> - <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/> - </cell> - </row> - <row> - <cell> - <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/> - </cell> - <cell> - <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/> - </cell> - </row> - </Table> - </JPanel> - </cell> - </row> - -  -  - <row> - <cell> - <JLabel id='countLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <NumberEditor id='count' styleClass="int6"/> - </cell> + <Table id='editorPanel' fill='both' beanScope="tableEditBean"> + <row> + <cell columns="2"> + <JPanel id='acquisitionModePanel' layout="{new GridLayout(0, 1)}"> + <JRadioButton id='acquisitionModeNumber'/> + <JRadioButton id='acquisitionModeIndividual'/> + </JPanel> + </cell> + <cell columns="2"> + <Table id='speciesAndMeasureTypesPanel' fill='both'> + <row> <cell> - <JLabel id='sexLabel'/> + <JLabel id='speciesLabel' styleClass="i18n"/> </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='sex' genericType='SexReference'/> + <cell weightx="1"> + <JaxxComboBox id='species' genericType='SpeciesReference'/> </cell> - </row> - -  -  - <row> + </row> + <row> <cell> - <JLabel id='lengthLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <NumberEditor id='length' styleClass="float1"/> + <JLabel id='sizeMeasureTypeLabel' styleClass="i18n"/> </cell> <cell> - <JLabel id='lengthMeasureMethodLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='lengthMeasureMethod' genericType='LengthMeasureMethodReference'/> + <JaxxComboBox id='sizeMeasureType' genericType='SizeMeasureTypeReference'/> </cell> - </row> - -  -  - <row> + </row> + <row> <cell> - <JLabel id='weightLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <NumberEditor id='weight' styleClass="float2"/> + <JLabel id='weightMeasureTypeLabel' styleClass="i18n"/> </cell> <cell> - <JLabel id='weightMeasureMethodLabel'/> - </cell> - <cell weightx='1' anchor='east'> - <JaxxComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/> + <JaxxComboBox id='weightMeasureType' genericType='WeightMeasureTypeReference'/> </cell> - </row> - </Table> - <JPanel id="invisible"> - <JButton id="defaultSizeMeasureType"/> - <JButton id="defaultWeightMeasureType"/> - </JPanel> + </row> + </Table> + </cell> + </row> + <row> + <cell> + <JLabel id='countLabel'/> + </cell> + <cell anchor='east'> + <NumberEditor id='count' styleClass="int6" minimumSize="{new java.awt.Dimension(100,24)}"/> + </cell> + <cell> + <JLabel id='sexLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='sex' genericType='SexReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='lengthLabel'/> + </cell> + <cell anchor='east'> + <NumberEditor id='length' styleClass="float1"/> + </cell> + <cell> + <JLabel id='lengthMeasureMethodLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='lengthMeasureMethod' genericType='LengthMeasureMethodReference'/> + </cell> + </row> + <row> + <cell> + <JLabel id='weightLabel'/> + </cell> + <cell anchor='east'> + <NumberEditor id='weight' styleClass="float2"/> + </cell> + <cell> + <JLabel id='weightMeasureMethodLabel'/> + </cell> + <cell weightx='1' anchor='east'> + <JaxxComboBox id='weightMeasureMethod' genericType='WeightMeasureMethodReference'/> + </cell> + </row> + </Table> + <JPanel id="invisible"> + <JButton id="defaultSizeMeasureType"/> + <JButton id="defaultWeightMeasureType"/> + </JPanel> </fr.ird.observe.client.datasource.editor.api.content.data.table.ContentTableUI> ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/logbook/SamplePartUITableModel.java ===================================== @@ -23,9 +23,12 @@ package fr.ird.observe.client.datasource.editor.ll.data.logbook; */ import fr.ird.observe.client.datasource.editor.api.content.EditableContentUI; +import fr.ird.observe.client.util.UIHelper; import fr.ird.observe.dto.data.ll.logbook.SampleDto; import fr.ird.observe.dto.data.ll.logbook.SamplePartDto; +import javax.swing.JTable; + public class SamplePartUITableModel extends GeneratedSamplePartUITableModel { private static final long serialVersionUID = 1L; @@ -34,6 +37,14 @@ public class SamplePartUITableModel extends GeneratedSamplePartUITableModel { super(parentUI, ui, model); } + @Override + public void initTableUISize(JTable table) { + super.initTableUISize(table); + UIHelper.fixTableColumnWidth(table, 1, 55); + UIHelper.fixTableColumnWidth(table, 3, 55); + UIHelper.fixTableColumnWidth(table, 5, 55); + } + @Override protected void onSelectedRowChanged(SamplePartUI ui, int editingRow, SamplePartDto tableEditBean, SamplePartDto previousRowBean, boolean notPersisted, boolean newRow) { ui.getHandler().onSelectedRowChanged(tableEditBean, previousRowBean, notPersisted, newRow); ===================================== models/definition/src/main/models/Observe/dto/attribute/notNull.properties ===================================== @@ -33,7 +33,6 @@ data.ll.common.Trip.attribute.tripType=true data.ll.common.Trip.attribute.vessel=true data.ll.landing.Landing.attribute.harbour=true data.ll.landing.LandingPart.attribute.species=true -data.ll.landing.LandingPart.attribute.weight=true data.ll.logbook.Activity.attribute.startTimeStamp=true data.ll.logbook.Activity.attribute.vesselActivity=true data.ll.logbook.ActivitySample.attribute.timeStamp=true ===================================== models/definition/src/main/models/Observe/dto/attribute/notNullIf.properties ===================================== @@ -21,6 +21,8 @@ ### data.ll.common.Trip.attribute.logbookDataEntryOperator=!logbookAvailability data.ll.common.Trip.attribute.observer=!observationsAvailability +data.ll.landing.LandingPart.attribute.count=weight != null && weight > 0 +data.ll.landing.LandingPart.attribute.weight=count != null && count > 0 data.ll.landing.LandingPart.attribute.weightMeasureMethod=weight == null || weight == 0 data.ll.logbook.Catch.attribute.count=acquisitionMode == 1 && totalWeight != null data.ll.logbook.Catch.attribute.totalWeight=acquisitionMode == 1 && count != null ===================================== models/definition/src/main/models/Observe/persistence/attribute/notNull.properties ===================================== @@ -34,7 +34,6 @@ data.ll.common.Trip.attribute.tripType=true data.ll.common.Trip.attribute.vessel=true data.ll.landing.Landing.attribute.harbour=true data.ll.landing.LandingPart.attribute.species=true -data.ll.landing.LandingPart.attribute.weight=true data.ll.logbook.Activity.attribute.startTimeStamp=true data.ll.logbook.Activity.attribute.vesselActivity=true data.ll.logbook.BaitsComposition.attribute.baitType=true ===================================== models/persistence/migration/src/main/resources/db/migration/v9/9.0/14_add_missing_not_null-common.sql ===================================== @@ -65,7 +65,6 @@ ALTER TABLE ll_common.Trip ALTER COLUMN tripType SET NOT NULL; ALTER TABLE ll_common.Trip ALTER COLUMN vessel SET NOT NULL; ALTER TABLE ll_landing.Landing ALTER COLUMN harbour SET NOT NULL; ALTER TABLE ll_landing.LandingPart ALTER COLUMN species SET NOT NULL; -ALTER TABLE ll_landing.LandingPart ALTER COLUMN weight SET NOT NULL; ALTER TABLE ll_logbook.Activity ALTER COLUMN startTimeStamp SET NOT NULL; ALTER TABLE ll_logbook.Activity ALTER COLUMN vesselActivity SET NOT NULL; ALTER TABLE ll_logbook.BaitsComposition ALTER COLUMN baitType SET NOT NULL; ===================================== models/persistence/migration/src/main/resources/db/migration/v9/9.0/observe_create-schema-H2.sql ===================================== @@ -85,7 +85,7 @@ create table ll_landing.company (topiaId varchar(255) not null, topiaVersion big create table ll_landing.conservation (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table ll_landing.dataSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table ll_landing.landing (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), startDate date, endDate date, dataSource varchar(255), processingCompany varchar(255), shippingCompany varchar(255), brokerageCompany varchar(255), person varchar(255), harbour varchar(255) not null, vessel varchar(255), trip varchar(255) not null, primary key (topiaId)); -create table ll_landing.landingPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, dataQuality varchar(255), categoryMin numeric, categoryMax numeric, onBoardProcessing varchar(255), conservation varchar(255), count integer, weight numeric not null, weightMeasureMethod varchar(255), landing varchar(255) not null, primary key (topiaId)); +create table ll_landing.landingPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, dataQuality varchar(255), categoryMin numeric, categoryMax numeric, onBoardProcessing varchar(255), conservation varchar(255), count integer, weight numeric, weightMeasureMethod varchar(255), landing varchar(255) not null, primary key (topiaId)); create table ll_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), startTimeStamp timestamp not null, endTimeStamp timestamp, latitude numeric, longitude numeric, seaSurfaceTemperature numeric, wind varchar(255), windDirection integer, currentSpeed numeric, currentDirection integer, vesselActivity varchar(255) not null, dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255) not null, primary key (topiaId)); create table ll_logbook.baitsComposition (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), proportion integer not null, individualSize integer, individualWeight numeric, baitSettingStatus varchar(255), baitType varchar(255) not null, set varchar(255) not null, primary key (topiaId)); create table ll_logbook.branchlinesComposition (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), length numeric not null, proportion integer not null, tracelineLength numeric, topType varchar(255) not null, tracelineType varchar(255) not null, set varchar(255) not null, primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/v9/9.0/observe_create-schema-PG.sql ===================================== @@ -85,7 +85,7 @@ create table ll_landing.company (topiaId varchar(255) not null, topiaVersion big create table ll_landing.conservation (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table ll_landing.dataSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table ll_landing.landing (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), startDate date, endDate date, dataSource varchar(255), processingCompany varchar(255), shippingCompany varchar(255), brokerageCompany varchar(255), person varchar(255), harbour varchar(255) not null, vessel varchar(255), trip varchar(255) not null, primary key (topiaId)); -create table ll_landing.landingPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, dataQuality varchar(255), categoryMin numeric, categoryMax numeric, onBoardProcessing varchar(255), conservation varchar(255), count integer, weight numeric not null, weightMeasureMethod varchar(255), landing varchar(255) not null, primary key (topiaId)); +create table ll_landing.landingPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, dataQuality varchar(255), categoryMin numeric, categoryMax numeric, onBoardProcessing varchar(255), conservation varchar(255), count integer, weight numeric, weightMeasureMethod varchar(255), landing varchar(255) not null, primary key (topiaId)); create table ll_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), startTimeStamp timestamp not null, endTimeStamp timestamp, latitude numeric, longitude numeric, seaSurfaceTemperature numeric, wind varchar(255), windDirection integer, currentSpeed numeric, currentDirection integer, vesselActivity varchar(255) not null, dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255) not null, primary key (topiaId)); create table ll_logbook.baitsComposition (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), proportion integer not null, individualSize integer, individualWeight numeric, baitSettingStatus varchar(255), baitType varchar(255) not null, set varchar(255) not null, primary key (topiaId)); create table ll_logbook.branchlinesComposition (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), length numeric not null, proportion integer not null, tracelineLength numeric, topType varchar(255) not null, tracelineType varchar(255) not null, set varchar(255) not null, primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/v9/9.0/observe_full-schema-H2.sql ===================================== @@ -85,7 +85,7 @@ create table ll_landing.company (topiaId varchar(255) not null, topiaVersion big create table ll_landing.conservation (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table ll_landing.dataSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table ll_landing.landing (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), startDate date, endDate date, dataSource varchar(255), processingCompany varchar(255), shippingCompany varchar(255), brokerageCompany varchar(255), person varchar(255), harbour varchar(255) not null, vessel varchar(255), trip varchar(255) not null, primary key (topiaId)); -create table ll_landing.landingPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, dataQuality varchar(255), categoryMin numeric, categoryMax numeric, onBoardProcessing varchar(255), conservation varchar(255), count integer, weight numeric not null, weightMeasureMethod varchar(255), landing varchar(255) not null, primary key (topiaId)); +create table ll_landing.landingPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, dataQuality varchar(255), categoryMin numeric, categoryMax numeric, onBoardProcessing varchar(255), conservation varchar(255), count integer, weight numeric, weightMeasureMethod varchar(255), landing varchar(255) not null, primary key (topiaId)); create table ll_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), startTimeStamp timestamp not null, endTimeStamp timestamp, latitude numeric, longitude numeric, seaSurfaceTemperature numeric, wind varchar(255), windDirection integer, currentSpeed numeric, currentDirection integer, vesselActivity varchar(255) not null, dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255) not null, primary key (topiaId)); create table ll_logbook.baitsComposition (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), proportion integer not null, individualSize integer, individualWeight numeric, baitSettingStatus varchar(255), baitType varchar(255) not null, set varchar(255) not null, primary key (topiaId)); create table ll_logbook.branchlinesComposition (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), length numeric not null, proportion integer not null, tracelineLength numeric, topType varchar(255) not null, tracelineType varchar(255) not null, set varchar(255) not null, primary key (topiaId)); ===================================== models/persistence/migration/src/main/resources/db/migration/v9/9.0/observe_full-schema-PG.sql ===================================== @@ -85,7 +85,7 @@ create table ll_landing.company (topiaId varchar(255) not null, topiaVersion big create table ll_landing.conservation (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table ll_landing.dataSource (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, code varchar(255), uri varchar(255), homeId varchar(255), needComment boolean default false not null, status integer not null, label1 varchar(255) not null, label2 varchar(255) not null, label3 varchar(255) not null, label4 varchar(255), label5 varchar(255), label6 varchar(255), label7 varchar(255), label8 varchar(255), primary key (topiaId)); create table ll_landing.landing (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), startDate date, endDate date, dataSource varchar(255), processingCompany varchar(255), shippingCompany varchar(255), brokerageCompany varchar(255), person varchar(255), harbour varchar(255) not null, vessel varchar(255), trip varchar(255) not null, primary key (topiaId)); -create table ll_landing.landingPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, dataQuality varchar(255), categoryMin numeric, categoryMax numeric, onBoardProcessing varchar(255), conservation varchar(255), count integer, weight numeric not null, weightMeasureMethod varchar(255), landing varchar(255) not null, primary key (topiaId)); +create table ll_landing.landingPart (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), species varchar(255) not null, dataQuality varchar(255), categoryMin numeric, categoryMax numeric, onBoardProcessing varchar(255), conservation varchar(255), count integer, weight numeric, weightMeasureMethod varchar(255), landing varchar(255) not null, primary key (topiaId)); create table ll_logbook.activity (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), comment varchar(8192), startTimeStamp timestamp not null, endTimeStamp timestamp, latitude numeric, longitude numeric, seaSurfaceTemperature numeric, wind varchar(255), windDirection integer, currentSpeed numeric, currentDirection integer, vesselActivity varchar(255) not null, dataQuality varchar(255), fpaZone varchar(255), relatedObservedActivity varchar(255), set varchar(255), sample varchar(255), trip varchar(255) not null, primary key (topiaId)); create table ll_logbook.baitsComposition (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), proportion integer not null, individualSize integer, individualWeight numeric, baitSettingStatus varchar(255), baitType varchar(255) not null, set varchar(255) not null, primary key (topiaId)); create table ll_logbook.branchlinesComposition (topiaId varchar(255) not null, topiaVersion bigint not null, topiaCreateDate timestamp not null, lastUpdateDate timestamp default CURRENT_TIMESTAMP not null, homeId varchar(255), length numeric not null, proportion integer not null, tracelineLength numeric, topType varchar(255) not null, tracelineType varchar(255) not null, set varchar(255) not null, primary key (topiaId)); ===================================== services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -608,11 +608,13 @@ observe.data.ll.landing.LandingPart.action.save=Insert this landing part observe.data.ll.landing.LandingPart.action.save.tip=Insert this landing part observe.data.ll.landing.LandingPart.count=Count observe.data.ll.landing.LandingPart.count.short=Count +observe.data.ll.landing.LandingPart.count.validation.required=Count or weight must be filled. observe.data.ll.landing.LandingPart.title=Landing observe.data.ll.landing.LandingPart.type=Lnading part observe.data.ll.landing.LandingPart.validation.bound.categoryWeight=Max category must be strictly greater than min category. observe.data.ll.landing.LandingPart.weight=Weight (Kg) observe.data.ll.landing.LandingPart.weight.short=Weight +observe.data.ll.landing.LandingPart.weight.validation.required=Count or weight must be filled. observe.data.ll.landing.LandingPart.weightCategoryMinMax=Catégorie de poids min - max observe.data.ll.logbook.Activity.action.create=Next activity observe.data.ll.logbook.Activity.action.move=Change trip @@ -693,12 +695,12 @@ observe.data.ll.logbook.SamplePart.action.save.tip=Insert this sample part observe.data.ll.logbook.SamplePart.count=Count observe.data.ll.logbook.SamplePart.count.short=Count observe.data.ll.logbook.SamplePart.length=Length (cm) -observe.data.ll.logbook.SamplePart.length.short=Length (cm) +observe.data.ll.logbook.SamplePart.length.short=Length observe.data.ll.logbook.SamplePart.length.validation.required=Size must be filled. observe.data.ll.logbook.SamplePart.title=Sample observe.data.ll.logbook.SamplePart.type=Sample part observe.data.ll.logbook.SamplePart.weight=Weight (kg) -observe.data.ll.logbook.SamplePart.weight.short=Weight (kg) +observe.data.ll.logbook.SamplePart.weight.short=Weight observe.data.ll.logbook.SamplePart.weight.validation.required=Size or weight must be filled. observe.data.ll.logbook.Set.action.add=Add the fishing operation observe.data.ll.logbook.Set.action.add.tip=Add the fishing operation associated with this activity ===================================== services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -608,11 +608,13 @@ observe.data.ll.landing.LandingPart.action.save=Insertar este landing part \#TOD observe.data.ll.landing.LandingPart.action.save.tip=Créer un nouveau Débarquement observe.data.ll.landing.LandingPart.count=Nombre observe.data.ll.landing.LandingPart.count.short=Nombre +observe.data.ll.landing.LandingPart.count.validation.required=Count or weight must be filled. observe.data.ll.landing.LandingPart.title=Landing observe.data.ll.landing.LandingPart.type=LandingPart observe.data.ll.landing.LandingPart.validation.bound.categoryWeight=Max category must be strictly greater than min category. observe.data.ll.landing.LandingPart.weight=Peso (Kg) observe.data.ll.landing.LandingPart.weight.short=Poids +observe.data.ll.landing.LandingPart.weight.validation.required=Count or weight must be filled. observe.data.ll.landing.LandingPart.weightCategoryMinMax=Catégorie de poids min - max observe.data.ll.logbook.Activity.action.create=Actividad siguiente observe.data.ll.logbook.Activity.action.move=Cambiar de marea @@ -693,12 +695,12 @@ observe.data.ll.logbook.SamplePart.action.save.tip=Insert this sample part\#TODO observe.data.ll.logbook.SamplePart.count=Numero observe.data.ll.logbook.SamplePart.count.short=Count \#TODO observe.data.ll.logbook.SamplePart.length=Talla (cm) -observe.data.ll.logbook.SamplePart.length.short=Length (cm) \#TODO +observe.data.ll.logbook.SamplePart.length.short=Length \#TODO observe.data.ll.logbook.SamplePart.length.validation.required=Size or weight must be filled. \#TODO observe.data.ll.logbook.SamplePart.title=Samples \#TODO observe.data.ll.logbook.SamplePart.type=SamplePart observe.data.ll.logbook.SamplePart.weight=Peso (kg) -observe.data.ll.logbook.SamplePart.weight.short=Weight (kg) \#TODO +observe.data.ll.logbook.SamplePart.weight.short=Weight \#TODO observe.data.ll.logbook.SamplePart.weight.validation.required=Size or weight must be filled. \#TODO observe.data.ll.logbook.Set.action.add=Añadir la operación de pesca observe.data.ll.logbook.Set.action.add.tip=Añadir la operación de pesca asociada a esta actividad ===================================== services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -608,11 +608,13 @@ observe.data.ll.landing.LandingPart.action.save=Insérer cette donnée observe.data.ll.landing.LandingPart.action.save.tip=Insérer cette donnée observe.data.ll.landing.LandingPart.count=Nombre observe.data.ll.landing.LandingPart.count.short=Nombre +observe.data.ll.landing.LandingPart.count.validation.required=Le nombre ou le poids est obligatoire. observe.data.ll.landing.LandingPart.title=Débarquements observe.data.ll.landing.LandingPart.type=Donnée de débarquement observe.data.ll.landing.LandingPart.validation.bound.categoryWeight=La catégorie de poids max doit être strictement supérieur à la catégorie min. observe.data.ll.landing.LandingPart.weight=Poids (Kg) observe.data.ll.landing.LandingPart.weight.short=Poids +observe.data.ll.landing.LandingPart.weight.validation.required=Le nombre ou le poids est obligatoire. observe.data.ll.landing.LandingPart.weightCategoryMinMax=Catégorie de poids min - max observe.data.ll.logbook.Activity.action.create=Activité suivante observe.data.ll.logbook.Activity.action.move=Changer de marée @@ -693,12 +695,12 @@ observe.data.ll.logbook.SamplePart.action.save.tip=Insérer cette donnée observe.data.ll.logbook.SamplePart.count=Effectif observe.data.ll.logbook.SamplePart.count.short=Effectif observe.data.ll.logbook.SamplePart.length=Taille (cm) -observe.data.ll.logbook.SamplePart.length.short=Taille (cm) +observe.data.ll.logbook.SamplePart.length.short=Taille observe.data.ll.logbook.SamplePart.length.validation.required=Au moins une des valeurs (taille / poids) doit être renseignée. observe.data.ll.logbook.SamplePart.title=Échantillons observe.data.ll.logbook.SamplePart.type=Donnée d'échantillonage observe.data.ll.logbook.SamplePart.weight=Poids (kg) -observe.data.ll.logbook.SamplePart.weight.short=Poids (kg) +observe.data.ll.logbook.SamplePart.weight.short=Poids observe.data.ll.logbook.SamplePart.weight.validation.required=Au moins une des valeurs (taille / poids) doit être renseignée. observe.data.ll.logbook.Set.action.add=Ajouter l'opération de pêche observe.data.ll.logbook.Set.action.add.tip=Ajouter l'opération de pêche associée à cette activité ===================================== services/validation/src/main/i18n/getters/eugene.getter ===================================== @@ -200,6 +200,7 @@ observe.data.ll.common.Trip.species observe.data.ll.common.Trip.tripType observe.data.ll.landing.Landing.dataSource observe.data.ll.landing.Landing.person +observe.data.ll.landing.LandingPart.count observe.data.ll.landing.LandingPart.weight observe.data.ll.logbook.ActivitySample.samplePart observe.data.ll.logbook.BranchlinesComposition.length ===================================== services/validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -49,7 +49,9 @@ observe.data.ll.Set.validation.duplicated.number observe.data.ll.Set.validation.haulingEndTimeStamp.after.haulingStartTimeStamp observe.data.ll.Set.validation.haulingStartTimeStamp.after.settingEndTimeStamp observe.data.ll.Set.validation.settingEndTimeStamp.after.settingStartTimeStamp +observe.data.ll.landing.LandingPart.count.validation.required observe.data.ll.landing.LandingPart.validation.bound.categoryWeight +observe.data.ll.landing.LandingPart.weight.validation.required observe.data.ll.logbook.Catch.count.validation.required observe.data.ll.logbook.Catch.totalWeight.validation.required observe.data.ll.logbook.SamplePart.length.validation.required View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/320cbfff223296b4ec470926… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/320cbfff223296b4ec470926… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe (version 9.0.0-RC-16)
by Tony CHEMIT (＠tchemit) 08 Oct '21

08 Oct '21

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 4c01edcf by Tony Chemit at 2021-10-08T16:32:43+02:00 Site checkin for project ObServe (version 9.0.0-RC-16) - - - - - 1 changed file: - + 9.0.0-RC-16/CHANGELOG.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4c01edcfa2453cc8ab0884bca… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/4c01edcfa2453cc8ab0884bca… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/9.0.0-RC-16
by Tony CHEMIT (＠tchemit) 08 Oct '21

08 Oct '21

Tony CHEMIT deleted branch release/9.0.0-RC-16 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v9.0.0-RC-16
by Tony CHEMIT (＠tchemit) 08 Oct '21

08 Oct '21

Tony CHEMIT pushed new tag v9.0.0-RC-16 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/v9.0.0-RC-16 You're receiving this email because of your account on gitlab.com.

1 0