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

Commits:

6 changed files:

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
    98 98 
             // Re-set mapTab enabled state
    99 99 
             ui.processDataBinding("mapTab.enabled");
    100 100 
             ui.getMainTabbedPane().setEnabledAt(ui.getMainTabbedPane().getTabCount() - 1, ui.getMapTab().isEnabled());
    101 
    +        if (ui.getModel().getStates().isCreatingMode()) {
    102 
    +            ui.getMainTabbedPane().setSelectedIndex(0);
    103 
    +        }
    101 104 
         }
    102 105
    103 106 
         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
    31 31 
     data.ll.logbook.SamplePart.attribute.weight=acquisitionMode == 0 || length != null
    32 32 
     data.ll.logbook.SamplePart.attribute.weightMeasureType=weight == null
    33 33 
     data.ll.observation.Catch.attribute.count=acquisitionMode == 0
    34 
    +data.ps.common.Trip.attribute.departureWellContentStatus=!logbookEnabled
    34 35 
     data.ps.common.Trip.attribute.landingWellContentStatus=!logbookEnabled
    35 36 
     data.ps.common.Trip.attribute.logbookDataEntryOperator=!logbookCommonEnabled
    36 37 
     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
    914 914 
     observe.data.ps.common.Trip.action.openLinkReportsUrl.tip=View reports in a web browser
    915 915 
     observe.data.ps.common.Trip.advancedSamplingAcquisitionStatus=Advanced sampling
    916 916 
     observe.data.ps.common.Trip.departureWellContentStatus=Departure well content status
    917 
    +observe.data.ps.common.Trip.departureWellContentStatus.validation.required=Required departure well content status if logbook data is selected.
    917 918 
     observe.data.ps.common.Trip.fishingTime=Fishing time (h)
    918 919 
     observe.data.ps.common.Trip.landingAcquisitionStatus=Landing sheet collection
    919 920 
     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
    914 914 
     observe.data.ps.common.Trip.action.openLinkReportsUrl.tip=Accéder aux rapports dans un navigateur web
    915 915 
     observe.data.ps.common.Trip.advancedSamplingAcquisitionStatus=Advanced sampling TODO
    916 916 
     observe.data.ps.common.Trip.departureWellContentStatus=État de remplissage des cuves au départ \#TODO
    917 
    +observe.data.ps.common.Trip.departureWellContentStatus.validation.required=Required departure well content status if logbook data is selected. \#TODO
    917 918 
     observe.data.ps.common.Trip.fishingTime=Heures de peche \#TODO
    918 919 
     observe.data.ps.common.Trip.landingAcquisitionStatus=Landing sheet collection \#TODO
    919 920 
     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
    914 914 
     observe.data.ps.common.Trip.action.openLinkReportsUrl.tip=Accéder aux rapports dans un navigateur web
    915 915 
     observe.data.ps.common.Trip.advancedSamplingAcquisitionStatus=Échantillonnage avancé
    916 916 
     observe.data.ps.common.Trip.departureWellContentStatus=État de remplissage des cuves au départ
    917 
    +observe.data.ps.common.Trip.departureWellContentStatus.validation.required=Champs obligatoire si données livre de bord est sélectionné.
    917 918 
     observe.data.ps.common.Trip.fishingTime=Heures de pêche
    918 919 
     observe.data.ps.common.Trip.landingAcquisitionStatus=Collecte du bon de débarquement
    919 920 
     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
    69 69 
     observe.data.ps.Route.validation.invalid.time
    70 70 
     observe.data.ps.Route.validation.unclosed.activity
    71 71 
     observe.data.ps.SampleSpecies.validation.mismatch.measuredCount
    72 
    +observe.data.ps.common.Trip.departureWellContentStatus.validation.required
    72 73 
     observe.data.ps.common.Trip.landingWellContentStatus.validation.required
    73 74 
     observe.data.ps.landing.Landing.validation.date.after.currentTrip.endDate
    74 75 
     observe.data.ps.landing.Landing.validation.date.after.currentTrip.startDate

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