Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 284ca5c6 by Tony Chemit at 2021-10-20T08:49:21+02:00 Nouvelle marée : onglet focusé - Closes #2050 - - - - - 73332d7e by Tony Chemit at 2021-10-20T09:11:54+02:00 add missing Trip.departureWellContentStatus not null if validation - - - - - 6 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - models/definition/src/main/models/Observe/dto/attribute/notNullIf.properties - 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/validation-messages.getter Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java ===================================== @@ -98,6 +98,9 @@ public abstract class TripUIHelper<D extends OpenableDto, U extends ContentOpena // Re-set mapTab enabled state ui.processDataBinding("mapTab.enabled"); ui.getMainTabbedPane().setEnabledAt(ui.getMainTabbedPane().getTabCount() - 1, ui.getMapTab().isEnabled()); + if (ui.getModel().getStates().isCreatingMode()) { + ui.getMainTabbedPane().setSelectedIndex(0); + } } private void buildTripMap() { ===================================== models/definition/src/main/models/Observe/dto/attribute/notNullIf.properties ===================================== @@ -31,6 +31,7 @@ data.ll.logbook.SamplePart.attribute.sizeMeasureType=length == null data.ll.logbook.SamplePart.attribute.weight=acquisitionMode == 0 || length != null data.ll.logbook.SamplePart.attribute.weightMeasureType=weight == null data.ll.observation.Catch.attribute.count=acquisitionMode == 0 +data.ps.common.Trip.attribute.departureWellContentStatus=!logbookEnabled data.ps.common.Trip.attribute.landingWellContentStatus=!logbookEnabled data.ps.common.Trip.attribute.logbookDataEntryOperator=!logbookCommonEnabled data.ps.common.Trip.attribute.logbookDataQuality=!logbookCommonEnabled ===================================== services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -914,6 +914,7 @@ observe.data.ps.common.Trip.action.openLinkFormsUrl.tip=View forms in a web brow observe.data.ps.common.Trip.action.openLinkReportsUrl.tip=View reports in a web browser observe.data.ps.common.Trip.advancedSamplingAcquisitionStatus=Advanced sampling observe.data.ps.common.Trip.departureWellContentStatus=Departure well content status +observe.data.ps.common.Trip.departureWellContentStatus.validation.required=Required departure well content status if logbook data is selected. observe.data.ps.common.Trip.fishingTime=Fishing time (h) observe.data.ps.common.Trip.landingAcquisitionStatus=Landing sheet collection observe.data.ps.common.Trip.landingAcquisitionStatusLabel.tip=Only choices that indicate existence of data allow acquisition for landing ===================================== services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -914,6 +914,7 @@ observe.data.ps.common.Trip.action.openLinkFormsUrl.tip=Acceder a los formulario observe.data.ps.common.Trip.action.openLinkReportsUrl.tip=Accéder aux rapports dans un navigateur web observe.data.ps.common.Trip.advancedSamplingAcquisitionStatus=Advanced sampling TODO observe.data.ps.common.Trip.departureWellContentStatus=État de remplissage des cuves au départ \#TODO +observe.data.ps.common.Trip.departureWellContentStatus.validation.required=Required departure well content status if logbook data is selected. \#TODO observe.data.ps.common.Trip.fishingTime=Heures de peche \#TODO observe.data.ps.common.Trip.landingAcquisitionStatus=Landing sheet collection \#TODO observe.data.ps.common.Trip.landingAcquisitionStatusLabel.tip=Only choices that indicate existence of data allow acquisition for landing ===================================== services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -914,6 +914,7 @@ observe.data.ps.common.Trip.action.openLinkFormsUrl.tip=Accéder aux formulaires observe.data.ps.common.Trip.action.openLinkReportsUrl.tip=Accéder aux rapports dans un navigateur web observe.data.ps.common.Trip.advancedSamplingAcquisitionStatus=Échantillonnage avancé observe.data.ps.common.Trip.departureWellContentStatus=État de remplissage des cuves au départ +observe.data.ps.common.Trip.departureWellContentStatus.validation.required=Champs obligatoire si données livre de bord est sélectionné. observe.data.ps.common.Trip.fishingTime=Heures de pêche observe.data.ps.common.Trip.landingAcquisitionStatus=Collecte du bon de débarquement observe.data.ps.common.Trip.landingAcquisitionStatusLabel.tip=Seuls les choix reflétant l'existence des données permettront la collecte du bon de débarquement ===================================== services/validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -69,6 +69,7 @@ observe.data.ps.Route.validation.invalid.quadrant observe.data.ps.Route.validation.invalid.time observe.data.ps.Route.validation.unclosed.activity observe.data.ps.SampleSpecies.validation.mismatch.measuredCount +observe.data.ps.common.Trip.departureWellContentStatus.validation.required observe.data.ps.common.Trip.landingWellContentStatus.validation.required observe.data.ps.landing.Landing.validation.date.after.currentTrip.endDate observe.data.ps.landing.Landing.validation.date.after.currentTrip.startDate View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bad538ef1e512e1969a4e24d3... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/bad538ef1e512e1969a4e24d3... You're receiving this email because of your account on gitlab.com.