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

Commits:

15 changed files:

Changes:

  • client/datasource/editor/ll/src/main/i18n/getters/jaxx.getter
    ... ... @@ -224,15 +224,12 @@ observe.data.ll.observation.Set.monitored
    224 224 
     observe.data.ll.observation.Set.number
    225 225 
     observe.data.ll.observation.Set.settingCharacteristicsTab
    226 226 
     observe.data.ll.observation.Set.settingTab
    227 
    -observe.data.ll.observation.SetDetailComposition.baskets
    228 227 
     observe.data.ll.observation.SetDetailComposition.branchlineTab
    229 
    -observe.data.ll.observation.SetDetailComposition.branchlines
    230 228 
     observe.data.ll.observation.SetDetailComposition.canGenerate
    231 229 
     observe.data.ll.observation.SetDetailComposition.compositionTab
    232 230 
     observe.data.ll.observation.SetDetailComposition.generateTab
    233 231 
     observe.data.ll.observation.SetDetailComposition.hookAndBaitTab
    234 232 
     observe.data.ll.observation.SetDetailComposition.noBranchlineSelected
    235 
    -observe.data.ll.observation.SetDetailComposition.sections
    236 233 
     observe.data.ll.observation.SetDetailComposition.templateInformation
    237 234 
     observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab
    238 235 
     observe.data.ll.observation.SetGlobalComposition.branchlinesCompositionTab

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIHandler.java
    ... ... @@ -261,6 +261,7 @@ public class SetCatchUIHandler extends GeneratedSetCatchUIHandler {
    261 261 
                         editBean.setSection(null);
    262 262 
                         editBean.setBasket(null);
    263 263 
                         editBean.setBranchline(null);
    264 
    +                    editBean.setWeightMeasureMethod(ui.getModel().getStates().getDefaultWeightMeasureMethod());
    264 265 
                     }
    265 266 
                     break;
    266 267

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetCatchUIModelStates.java
    ... ... @@ -23,6 +23,7 @@ package fr.ird.observe.client.datasource.editor.ll.data.observation;
    23 23 
      */
    24 24
    25 25 
     import fr.ird.observe.client.configuration.ClientConfig;
    26 
    +import fr.ird.observe.client.datasource.api.ObserveSwingDataSource;
    26 27 
     import fr.ird.observe.client.datasource.api.cache.ReferencesCache;
    27 28 
     import fr.ird.observe.client.datasource.api.cache.ReferencesFilterHelper;
    28 29 
     import fr.ird.observe.client.datasource.editor.api.content.ContentUI;
    ... ... @@ -36,6 +37,7 @@ import fr.ird.observe.dto.data.ll.observation.BranchlineDto;
    36 37 
     import fr.ird.observe.dto.data.ll.observation.CatchDto;
    37 38 
     import fr.ird.observe.dto.data.ll.observation.SetCatchDto;
    38 39 
     import fr.ird.observe.dto.form.Form;
    40 
    +import fr.ird.observe.dto.referential.common.WeightMeasureMethodReference;
    39 41 
     import fr.ird.observe.dto.referential.ll.common.CatchFateReference;
    40 42 
     import fr.ird.observe.navigation.id.Project;
    41 43 
     import fr.ird.observe.services.ObserveServicesProvider;
    ... ... @@ -48,6 +50,18 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates {
    48 50 
          * Branchline edit bean.
    49 51 
          */
    50 52 
         private final BranchlineDto branchlineBean;
    53 
    +    /**
    54 
    +     * Default acquisition mode to use.
    55 
    +     * <p>
    56 
    +     * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2671">issue 2671</a>
    57 
    +     */
    58 
    +    private final CatchAcquisitionMode defaultAcquisitionMode;
    59 
    +    /**
    60 
    +     * Default weight measure method to use for new data.
    61 
    +     * <p>
    62 
    +     * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2907">issue 2907</a>
    63 
    +     */
    64 
    +    private final WeightMeasureMethodReference defaultWeightMeasureMethod;
    51 65 
         /**
    52 66 
          * Position helper.
    53 67 
          */
    ... ... @@ -57,16 +71,15 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates {
    57 71 
          */
    58 72 
         protected boolean showIndividualTabs;
    59 73
    60 
    -    /**
    61 
    -     * Default acquisition mode to use.
    62 
    -     * <p>
    63 
    -     * See <a href="https://gitlab.com/ultreiaio/ird-observe/-/issues/2671">issue 2671</a>
    64 
    -     */
    65 
    -    private CatchAcquisitionMode defaultAcquisitionMode;
    66 
    -
    67 74 
         public SetCatchUIModelStates(GeneratedSetCatchUIModel model) {
    68 75 
             super(model);
    69 76 
             this.branchlineBean = new BranchlineDto();
    77 
    +        ObserveSwingDataSource mainDataSource = model.getSource().getContext().getMainDataSource();
    78 
    +        this.defaultWeightMeasureMethod = mainDataSource.getReferentialReferenceSet(WeightMeasureMethodReference.class).tryGetReferenceById(ProtectedIdsLl.LL_OBSERVATION_CATCH_DEFAULT_WEIGHT_MEASURE_METHOD_ID).orElseThrow(IllegalStateException::new);
    79 
    +        TripUINavigationNode tripNode = (TripUINavigationNode) model.getSource().upToReferenceNode(TripReference.class);
    80 
    +        TripReference tripReference = tripNode.getReference();
    81 
    +        String observationMethodId = tripReference.getObservationMethodId();
    82 
    +        this.defaultAcquisitionMode = ProtectedIdsLl.LL_OBSERVATION_GROUPED_OBSERVATION_METHOD_ID.equals(observationMethodId) ? CatchAcquisitionMode.GROUPED : CatchAcquisitionMode.INDIVIDUAL;
    70 83 
         }
    71 84
    72 85 
         @Override
    ... ... @@ -74,10 +87,10 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates {
    74 87 
             super.init(ui, initializerResult);
    75 88 
             SetCatchUI ui1 = (SetCatchUI) ui;
    76 89 
             positionHelper = new LonglinePositionHelper<>(ui1.getSection(), ui1.getBasket(), ui1.getBranchline(), ui1.getTableEditBean());
    77 
    -        TripUINavigationNode tripNode = (TripUINavigationNode) ui1.getModel().getSource().upToReferenceNode(TripReference.class);
    78 
    -        TripReference tripReference = tripNode.getReference();
    79 
    -        String observationMethodId = tripReference.getObservationMethodId();
    80 
    -        this.defaultAcquisitionMode = ProtectedIdsLl.LL_OBSERVATION_GROUPED_OBSERVATION_METHOD_ID.equals(observationMethodId) ? CatchAcquisitionMode.GROUPED : CatchAcquisitionMode.INDIVIDUAL;
    90 
    +//        TripUINavigationNode tripNode = (TripUINavigationNode) ui1.getModel().getSource().upToReferenceNode(TripReference.class);
    91 
    +//        TripReference tripReference = tripNode.getReference();
    92 
    +//        String observationMethodId = tripReference.getObservationMethodId();
    93 
    +//        this.defaultAcquisitionMode = ProtectedIdsLl.LL_OBSERVATION_GROUPED_OBSERVATION_METHOD_ID.equals(observationMethodId) ? CatchAcquisitionMode.GROUPED : CatchAcquisitionMode.INDIVIDUAL;
    81 94 
         }
    82 95
    83 96 
         @Override
    ... ... @@ -103,12 +116,17 @@ public class SetCatchUIModelStates extends GeneratedSetCatchUIModelStates {
    103 116 
         public void initDefault(CatchDto newTableBean) {
    104 117 
             super.initDefault(newTableBean);
    105 118 
             newTableBean.setAcquisitionMode(defaultAcquisitionMode.ordinal());
    119 
    +        newTableBean.setWeightMeasureMethod(defaultWeightMeasureMethod);
    106 120 
         }
    107 121
    108 122 
         public CatchAcquisitionMode getDefaultAcquisitionMode() {
    109 123 
             return defaultAcquisitionMode;
    110 124 
         }
    111 125
    126 
    +    public WeightMeasureMethodReference getDefaultWeightMeasureMethod() {
    127 
    +        return defaultWeightMeasureMethod;
    128 
    +    }
    129 
    +
    112 130 
         public BranchlineDto getBranchlineBean() {
    113 131 
             return branchlineBean;
    114 132 
         }

  • client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/observation/SetDetailCompositionUI.jcss
    ... ... @@ -73,7 +73,7 @@ EditableTable {
    73 73 
     }
    74 74
    75 75 
     #sectionsPanel {
    76 
    -  i18nProperty:sections;
    76 
    +  i18nProperty:section;
    77 77 
       _doNotTranslateFieldName: true;
    78 78 
     }
    79 79
    ... ... @@ -86,11 +86,11 @@ EditableTableModel {
    86 86 
     }
    87 87
    88 88 
     #basketsPanel {
    89 
    -  i18nProperty:baskets;
    89 
    +  i18nProperty:basket;
    90 90 
     }
    91 91
    92 92 
     #branchlinesPanel {
    93 
    -  i18nProperty:branchlines;
    93 
    +  i18nProperty:branchline;
    94 94 
     }
    95 95
    96 96 
     /* ***************************************************************************** */

  • core/api/dto-decoration/src/main/i18n/getters/labels.getter
    ... ... @@ -750,11 +750,9 @@ observe.data.ll.observation.SetDetailComposition.action.insertBeforeSelectedSect
    750 750 
     observe.data.ll.observation.SetDetailComposition.basket.cant.delete.message
    751 751 
     observe.data.ll.observation.SetDetailComposition.basket.cant.delete.title
    752 752 
     observe.data.ll.observation.SetDetailComposition.basket.invalid.nextFloatline1Length
    753 
    -observe.data.ll.observation.SetDetailComposition.baskets
    754 753 
     observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.message
    755 754 
     observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.title
    756 755 
     observe.data.ll.observation.SetDetailComposition.branchlineTab
    757 
    -observe.data.ll.observation.SetDetailComposition.branchlines
    758 756 
     observe.data.ll.observation.SetDetailComposition.canGenerate
    759 757 
     observe.data.ll.observation.SetDetailComposition.compositionTab
    760 758 
     observe.data.ll.observation.SetDetailComposition.firstTemplate.template.notCompliant.basketCount
    ... ... @@ -765,7 +763,6 @@ observe.data.ll.observation.SetDetailComposition.section.cant.delete.message
    765 763 
     observe.data.ll.observation.SetDetailComposition.section.cant.delete.title
    766 764 
     observe.data.ll.observation.SetDetailComposition.section.delete.message
    767 765 
     observe.data.ll.observation.SetDetailComposition.sectionTemplate.delete
    768 
    -observe.data.ll.observation.SetDetailComposition.sections
    769 766 
     observe.data.ll.observation.SetDetailComposition.title.section.cant.use.firstTemplate
    770 767 
     observe.data.ll.observation.SetDetailComposition.type
    771 768 
     observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab

  • core/api/dto-decoration/src/main/resources/META-INF/i18n/Observe-labels.properties
    ... ... @@ -20,7 +20,7 @@
    20 20 
     # #L%
    21 21 
     ###
    22 22 
     #Generated by org.nuiton.i18n.plugin.GenerateI18nLabelsMojo
    23 
    -#Thu Sep 12 13:39:42 CEST 2024
    23 
    +#Fri Sep 13 14:33:58 CEST 2024
    24 24 
     observe.Business.createDate=observe.Common.createDate
    25 25 
     observe.Business.homeId=observe.Common.homeId
    26 26 
     observe.Business.id=observe.Common.id
    ... ... @@ -953,7 +953,9 @@ observe.data.ll.observation.SetCatch.version=observe.Common.version
    953 953 
     observe.data.ll.observation.SetDetailComposition.baitHaulingStatus=observe.Common.baitHaulingStatus
    954 954 
     observe.data.ll.observation.SetDetailComposition.baitSettingStatus=observe.Common.baitSettingStatus
    955 955 
     observe.data.ll.observation.SetDetailComposition.baitType=observe.Common.baitType
    956 
    +observe.data.ll.observation.SetDetailComposition.basket=observe.Common.basket
    956 957 
     observe.data.ll.observation.SetDetailComposition.basketsPerSectionCount=observe.Common.basketsPerSectionCount
    958 
    +observe.data.ll.observation.SetDetailComposition.branchline=observe.Common.branchline
    957 959 
     observe.data.ll.observation.SetDetailComposition.branchlinesPerBasketCount=observe.Common.branchlinesPerBasketCount
    958 960 
     observe.data.ll.observation.SetDetailComposition.comment=observe.Common.comment
    959 961 
     observe.data.ll.observation.SetDetailComposition.createDate=observe.Common.createDate

  • core/api/dto/src/main/java/fr/ird/observe/dto/ProtectedIdsLl.java
    ... ... @@ -35,6 +35,7 @@ public interface ProtectedIdsLl {
    35 35 
         String LL_COMMON_ACTIVITY_HARBOUR_ID = "fr.ird.referential.ll.common.VesselActivity#666#03";
    36 36
    37 37 
         String LL_OBSERVATION_GROUPED_OBSERVATION_METHOD_ID = "fr.ird.referential.ll.common.ObservationMethod#1239832686136#0.1";
    38 
    +    String LL_OBSERVATION_CATCH_DEFAULT_WEIGHT_MEASURE_METHOD_ID = "fr.ird.referential.common.WeightMeasureMethod#666#03";
    38 39 
         String LL_OBSERVATION_CATCH_DISCARDED_CATCH_FATE_ID = "fr.ird.referential.ll.common.CatchFate#1239832686125#0.3";
    39 40 
         String LL_LOGBOOK_ACTIVITY_DEFAULT_DATA_QUALITY_ID = "fr.ird.referential.common.DataQuality#0#1";
    40 41 
         String LL_LOGBOOK_LANDING_PART_DEFAULT_DATA_QUALITY_ID = "fr.ird.referential.common.DataQuality#0#5";

  • core/services/i18n/src/main/i18n/translations/services_en_GB.properties
    ... ... @@ -906,11 +906,9 @@ observe.data.ll.observation.SetDetailComposition.action.insertBeforeSelectedSect
    906 906 
     observe.data.ll.observation.SetDetailComposition.basket.cant.delete.message=The current basket can not be deleted since it used by other data.
    907 907 
     observe.data.ll.observation.SetDetailComposition.basket.cant.delete.title=Can't delete basket
    908 908 
     observe.data.ll.observation.SetDetailComposition.basket.invalid.nextFloatline1Length=The floatline 2 (%s) is not equals to the floatline 1 of the next basket(%s)
    909 
    -observe.data.ll.observation.SetDetailComposition.baskets=Baskets
    910 909 
     observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.message=The current branchline can not be deleted since it used by other data.
    911 910 
     observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.title=Can't delete branchline
    912 911 
     observe.data.ll.observation.SetDetailComposition.branchlineTab=Branchline detail
    913 
    -observe.data.ll.observation.SetDetailComposition.branchlines=Branchlines
    914 912 
     observe.data.ll.observation.SetDetailComposition.canGenerate=Can generate
    915 913 
     observe.data.ll.observation.SetDetailComposition.compositionTab=Composition
    916 914 
     observe.data.ll.observation.SetDetailComposition.firstTemplate.template.notCompliant.basketCount=Template %s is not compliant with the number of baskets per section (%s)
    ... ... @@ -921,7 +919,6 @@ observe.data.ll.observation.SetDetailComposition.section.cant.delete.message=The
    921 919 
     observe.data.ll.observation.SetDetailComposition.section.cant.delete.title=Can't delete section
    922 920 
     observe.data.ll.observation.SetDetailComposition.section.delete.message=Confirm to delete all sections.
    923 921 
     observe.data.ll.observation.SetDetailComposition.sectionTemplate.delete=Confirm to delete current template.
    924 
    -observe.data.ll.observation.SetDetailComposition.sections=Sections
    925 922 
     observe.data.ll.observation.SetDetailComposition.title.section.cant.use.firstTemplate=Can't use the first template while generating
    926 923 
     observe.data.ll.observation.SetDetailComposition.type=Detailed composition
    927 924 
     observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab=Baits

  • core/services/i18n/src/main/i18n/translations/services_es_ES.properties
    ... ... @@ -906,11 +906,9 @@ observe.data.ll.observation.SetDetailComposition.action.insertBeforeSelectedSect
    906 906 
     observe.data.ll.observation.SetDetailComposition.basket.cant.delete.message=La cesta no puede ser eliminada porque está uilizada en los datos.
    907 907 
     observe.data.ll.observation.SetDetailComposition.basket.cant.delete.title=Impossible de eliminar la cesta
    908 908 
     observe.data.ll.observation.SetDetailComposition.basket.invalid.nextFloatline1Length=La longitud de orinque 2 (%s) no es igual a la longitud del orinque 1 de la cesta que sigue (%s)
    909 
    -observe.data.ll.observation.SetDetailComposition.baskets=Cestas
    910 909 
     observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.message=El arponcillo no puede ser eliminado porque está uilizado en los datos.
    911 910 
     observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.title=Impossible de eliminar el arponcillo
    912 911 
     observe.data.ll.observation.SetDetailComposition.branchlineTab=Detalle del arponcillo
    913 
    -observe.data.ll.observation.SetDetailComposition.branchlines=Arponcillos
    914 912 
     observe.data.ll.observation.SetDetailComposition.canGenerate=Autorizar la generación
    915 913 
     observe.data.ll.observation.SetDetailComposition.compositionTab=Composición
    916 914 
     observe.data.ll.observation.SetDetailComposition.firstTemplate.template.notCompliant.basketCount=el template a utilizar %s no es compatible con el número de cestas por sección (%s)
    ... ... @@ -921,7 +919,6 @@ observe.data.ll.observation.SetDetailComposition.section.cant.delete.message=La
    921 919 
     observe.data.ll.observation.SetDetailComposition.section.cant.delete.title=Impossible de eliminar la sección
    922 920 
     observe.data.ll.observation.SetDetailComposition.section.delete.message=Confirmar la eliminación de todas las secciones.
    923 921 
     observe.data.ll.observation.SetDetailComposition.sectionTemplate.delete=Confirmar la eliminación del template seleccionada.
    924 
    -observe.data.ll.observation.SetDetailComposition.sections=Secciones
    925 922 
     observe.data.ll.observation.SetDetailComposition.title.section.cant.use.firstTemplate=Impossible de utilizar el primer modelo durante la generación
    926 923 
     observe.data.ll.observation.SetDetailComposition.type=Composiciones detalladas
    927 924 
     observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab=Cebos

  • core/services/i18n/src/main/i18n/translations/services_fr_FR.properties
    ... ... @@ -105,8 +105,8 @@ observe.Common.description=Description
    105 105 
     observe.Common.destination=Destination
    106 106 
     observe.Common.destination.short=Destination
    107 107 
     observe.Common.directory=Répertoire
    108 
    -observe.Common.discardHealthStatus=Santé au rejet
    109 
    -observe.Common.discardHealthStatus.short=Santé au rejet
    108 
    +observe.Common.discardHealthStatus=État au rejet
    109 
    +observe.Common.discardHealthStatus.short=État au rejet
    110 110 
     observe.Common.distance=Distance (m)
    111 111 
     observe.Common.distance.short=Distance (m)
    112 112 
     observe.Common.enabled=Actif
    ... ... @@ -906,11 +906,9 @@ observe.data.ll.observation.SetDetailComposition.action.insertBeforeSelectedSect
    906 906 
     observe.data.ll.observation.SetDetailComposition.basket.cant.delete.message=Le panier ne peut pas être supprimé car il est utilisé dans des données.
    907 907 
     observe.data.ll.observation.SetDetailComposition.basket.cant.delete.title=Impossible de supprimer le panier
    908 908 
     observe.data.ll.observation.SetDetailComposition.basket.invalid.nextFloatline1Length=La longueur d'orin 2 (%s) n'est pas égale à la longueur d'orin 1 du panier suivant (%s)
    909 
    -observe.data.ll.observation.SetDetailComposition.baskets=Paniers
    910 909 
     observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.message=L'avançon ne peut pas être supprimé car il est utilisé dans des données.
    911 910 
     observe.data.ll.observation.SetDetailComposition.branchLine.cant.delete.title=Impossible de supprimer l'avançon
    912 911 
     observe.data.ll.observation.SetDetailComposition.branchlineTab=Détail avançon
    913 
    -observe.data.ll.observation.SetDetailComposition.branchlines=Avançons
    914 912 
     observe.data.ll.observation.SetDetailComposition.canGenerate=Autoriser la génération
    915 913 
     observe.data.ll.observation.SetDetailComposition.compositionTab=Composition
    916 914 
     observe.data.ll.observation.SetDetailComposition.firstTemplate.template.notCompliant.basketCount=Le patron à utiliser %s n'est pas compatible avec le nombre de paniers par section (%s)
    ... ... @@ -921,7 +919,6 @@ observe.data.ll.observation.SetDetailComposition.section.cant.delete.message=La
    921 919 
     observe.data.ll.observation.SetDetailComposition.section.cant.delete.title=Impossible de supprimer la section
    922 920 
     observe.data.ll.observation.SetDetailComposition.section.delete.message=Confirmer la suppression de toutes les sections.
    923 921 
     observe.data.ll.observation.SetDetailComposition.sectionTemplate.delete=Confirmer la suppression du patron sélectionné.
    924 
    -observe.data.ll.observation.SetDetailComposition.sections=Sections
    925 922 
     observe.data.ll.observation.SetDetailComposition.title.section.cant.use.firstTemplate=Impossible d'utiliser le premier modèle lors de la génération
    926 923 
     observe.data.ll.observation.SetDetailComposition.type=Composition détaillée
    927 924 
     observe.data.ll.observation.SetGlobalComposition.baitsCompositionTab=Appâts

  • core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookSampleMeasures.properties
    ... ... @@ -19,7 +19,7 @@
    19 19 
     # <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 20 
     # #L%
    21 21 
     ###
    22 
    -result.0=483^CAP BOJADOR^30/03/2019^08/04/2019^45.0^null^null^1.2^3T^1^Non^0^2FOD^Total Length^12^10
    22 
    +result.0=483^CAP BOJADOR^30/03/2019^08/04/2019^null^null^null^1.2^3T^1^Non^0^2FOD^Total Length^12^10
    23 23 
     result.columns=16
    24 24 
     result.rows=1
    25 25 
     syntax.columns=16

  • core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookSampleSet.properties
    ... ... @@ -19,7 +19,7 @@
    19 19 
     # <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 20 
     # #L%
    21 21 
     ###
    22 
    -result.0=483^CAP BOJADOR^30/03/2019^08/04/2019^45.0^null^null^1.2^3T^1^Non^30/03/2019^15:12^1^3.0^-4.0^null^1.2
    22 
    +result.0=483^CAP BOJADOR^30/03/2019^08/04/2019^null^null^null^1.2^3T^1^Non^30/03/2019^15:12^1^3.0^-4.0^null^1.2
    23 23 
     result.columns=18
    24 24 
     result.rows=1
    25 25 
     syntax.columns=18

  • core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookSampleSpeciesMeasures.properties
    ... ... @@ -19,7 +19,7 @@
    19 19 
     # <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 20 
     # #L%
    21 21 
     ###
    22 
    -result.0=483^CAP BOJADOR^30/03/2019^08/04/2019^45.0^null^null^1.2^3T^1^Non^0^2FOD^Total Length^12^10
    22 
    +result.0=483^CAP BOJADOR^30/03/2019^08/04/2019^null^null^null^1.2^3T^1^Non^0^2FOD^Total Length^12^10
    23 23 
     result.columns=16
    24 24 
     result.rows=1
    25 25 
     syntax.columns=16

  • core/services/test/src/main/resources/fixtures/fr/ird/observe/services/service/ReportService-psLogbookSampleSpeciesMeasuresCount.properties
    ... ... @@ -19,7 +19,7 @@
    19 19 
     # <http://www.gnu.org/licenses/gpl-3.0.html>.
    20 20 
     # #L%
    21 21 
     ###
    22 
    -result.0=483^CAP BOJADOR^30/03/2019^08/04/2019^45.0^null^null^1.2^3T^1^Non^0^10^12^12
    22 
    +result.0=483^CAP BOJADOR^30/03/2019^08/04/2019^null^null^null^1.2^3T^1^Non^0^10^12^12
    23 23 
     result.columns=15
    24 24 
     result.rows=1
    25 25 
     syntax.columns=15

  • model/src/main/models/Observe/dto/class/i18nLabels.properties
    ... ... @@ -49,7 +49,7 @@ data.ll.observation.Section=basket,haulingIdentifier,settingIdentifier,sectionTe
    49 49 
     data.ll.observation.SectionTemplate=floatlineLengths,id,validation.invalid.pattern,validation.required.id,validation.required.pattern
    50 50 
     data.ll.observation.SensorUsed=sensorBrand,sensorDataFormat,sensorSerialNo,sensorType,hasData.short
    51 51 
     data.ll.observation.Set=basketsPerSectionCount,branchlinesPerBasketCount,haulingBreaks,haulingDirectionSameAsSetting,haulingEndLatitude,haulingEndLongitude,haulingEndQuadrant,haulingEndTimeStamp,haulingEndDate,haulingStartLatitude,haulingStartLongitude,haulingStartQuadrant,haulingStartTimeStamp,haulingStartDate,lightsticksColor,lightsticksPerBasketCount,lightsticksType,lineType,maxDepthTargeted,monitored,number,settingEndLatitude,settingEndLongitude,settingEndQuadrant,settingEndTimeStamp,settingEndDate,settingShape,settingStartLatitude,settingStartLongitude,settingStartQuadrant,settingStartTimeStamp,settingStartDate,settingVesselSpeed,shooterSpeed,shooterUsed,snapWeight,swivelWeight,timeBetweenHooks,totalBasketsCount,totalHooksCount,totalSectionsCount,weightedSnap,weightedSwivel,haulingTab,settingCharacteristicsTab,settingTab
    52 
    -data.ll.observation.SetDetailComposition=mitigationType,totalSectionsCount,basketsPerSectionCount,branchlinesPerBasketCount,haulingDirectionSameAsSetting,haulingBreaks,haulingStartTimeStamp,baitHaulingStatus,baitSettingStatus,baitType,baskets,branchlines,depthRecorder,hookLost,hookOffset,hookSize,hookType,section,sections,snapWeight,swivelWeight,timeSinceContact,timer,timerTimeOnBoard,topType,traceCutOff,tracelineType,weightedSnap,weightedSwivel,action.deleteAllSections,action.deleteAllSections.tip,action.deleteSelectedBasket,action.deleteSelectedBasket.tip,action.deleteSelectedBranchline,action.deleteSelectedBranchline.tip,action.deleteSelectedSection,action.deleteSelectedSection.tip,action.deleteSelectedSectionTemplate,action.deleteSelectedSectionTemplate.tip,action.generateAllSections,action.generateAllSections.tip,action.insertAfterSelectedBasket,action.insertAfterSelectedBasket.tip,action.insertAfterSelectedBranchline,action.insertAfterSelectedBranchline.tip,action.insertAfterSelectedSection,action.insertAfterSelectedSection.tip,action.insertAfterSelectedSectionTemplate,action.insertAfterSelectedSectionTemplate.tip,action.insertBeforeSelectedBasket,action.insertBeforeSelectedBasket.tip,action.insertBeforeSelectedBranchline,action.insertBeforeSelectedBranchline.tip,action.insertBeforeSelectedSection,action.insertBeforeSelectedSection.tip,action.insertBeforeSelectedSectionTemplate,action.insertBeforeSelectedSectionTemplate.tip,basket.cant.delete.message,basket.cant.delete.title,basket.invalid.nextFloatline1Length,branchLine.cant.delete.message,branchLine.cant.delete.title,branchlineTab,canGenerate,compositionTab,firstTemplate.template.notCompliant.basketCount,generalTab,generateTab,hookAndBaitTab,noBranchlineSelected,section.cant.delete.message,section.cant.delete.title,section.delete.message,sectionTemplate.delete,title.section.cant.use.firstTemplate
    52 
    +data.ll.observation.SetDetailComposition=mitigationType,totalSectionsCount,basketsPerSectionCount,branchlinesPerBasketCount,haulingDirectionSameAsSetting,haulingBreaks,haulingStartTimeStamp,baitHaulingStatus,baitSettingStatus,baitType,basket,branchline,depthRecorder,hookLost,hookOffset,hookSize,hookType,section,snapWeight,swivelWeight,timeSinceContact,timer,timerTimeOnBoard,topType,traceCutOff,tracelineType,weightedSnap,weightedSwivel,action.deleteAllSections,action.deleteAllSections.tip,action.deleteSelectedBasket,action.deleteSelectedBasket.tip,action.deleteSelectedBranchline,action.deleteSelectedBranchline.tip,action.deleteSelectedSection,action.deleteSelectedSection.tip,action.deleteSelectedSectionTemplate,action.deleteSelectedSectionTemplate.tip,action.generateAllSections,action.generateAllSections.tip,action.insertAfterSelectedBasket,action.insertAfterSelectedBasket.tip,action.insertAfterSelectedBranchline,action.insertAfterSelectedBranchline.tip,action.insertAfterSelectedSection,action.insertAfterSelectedSection.tip,action.insertAfterSelectedSectionTemplate,action.insertAfterSelectedSectionTemplate.tip,action.insertBeforeSelectedBasket,action.insertBeforeSelectedBasket.tip,action.insertBeforeSelectedBranchline,action.insertBeforeSelectedBranchline.tip,action.insertBeforeSelectedSection,action.insertBeforeSelectedSection.tip,action.insertBeforeSelectedSectionTemplate,action.insertBeforeSelectedSectionTemplate.tip,basket.cant.delete.message,basket.cant.delete.title,basket.invalid.nextFloatline1Length,branchLine.cant.delete.message,branchLine.cant.delete.title,branchlineTab,canGenerate,compositionTab,firstTemplate.template.notCompliant.basketCount,generalTab,generateTab,hookAndBaitTab,noBranchlineSelected,section.cant.delete.message,section.cant.delete.title,section.delete.message,sectionTemplate.delete,title.section.cant.use.firstTemplate
    53 53 
     data.ll.observation.SetGlobalComposition=mitigationType,baitsCompositionTab,branchlinesCompositionTab,floatlinesCompositionTab,hooksCompositionTab,mitigationTypeTab,mitigationType.available,mitigationType.selected
    54 54 
     data.ll.observation.SizeMeasure=size,sizeMeasureType
    55 55 
     data.ll.observation.Tdr=basket,branchline,deploymentEnd,deploymentStart,fishingEnd,fishingEndDepth,fishingStart,fishingStartDepth,floatline1Length,floatline2Length,itemHorizontalPosition,itemVerticalPosition,maxFishingDepth,meanDeploymentDepth,meanFishingDepth,medianDeploymentDepth,medianFishingDepth,minFishingDepth,section,sensorBrand,serialNo,species,characteristicsTab,enableTimestamp,enableTimestamp.tip,hasData.short,keyDataTab,localisationTab,speciesTab,timestampTab,species.available,species.selected

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. Manage all notifications · Help