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

Commits:

19 changed files:

Changes:

  • client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/ObjectSchoolEstimateUIModel.java
    ... ... @@ -22,13 +22,17 @@ package fr.ird.observe.client.datasource.editor.content.data.ps.observation;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import fr.ird.observe.client.datasource.api.ObserveDataSourcesManagerApplicationComponent;
    26 
    +import fr.ird.observe.client.datasource.api.ObserveSwingDataSource;
    25 27 
     import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableMeta;
    26 28 
     import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableModel;
    27 29 
     import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUI;
    28 30 
     import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUIModel;
    31 
    +import fr.ird.observe.dto.ProtectedIds;
    29 32 
     import fr.ird.observe.dto.data.ps.observation.FloatingObjectSchoolEstimateDto;
    30 33 
     import fr.ird.observe.dto.data.ps.observation.ObjectSchoolEstimateDto;
    31 34 
     import fr.ird.observe.dto.data.ps.observation.ObjectSchoolEstimateHelper;
    35 
    +import fr.ird.observe.dto.referential.common.WeightMeasureMethodReference;
    32 36
    33 37 
     import java.util.Arrays;
    34 38 
     import java.util.Collection;
    ... ... @@ -41,7 +45,7 @@ import java.util.List;
    41 45 
      * @since XXX
    42 46 
      */
    43 47 
     public class ObjectSchoolEstimateUIModel extends ContentTableUIModel<FloatingObjectSchoolEstimateDto, ObjectSchoolEstimateDto> {
    44 
    -
    48 
    +    private final WeightMeasureMethodReference defaultWeightMeasureMethod;
    45 49 
         public ObjectSchoolEstimateUIModel(ObjectSchoolEstimateUI ui) {
    46 50
    47 51 
             super(FloatingObjectSchoolEstimateDto.class,
    ... ... @@ -51,8 +55,12 @@ public class ObjectSchoolEstimateUIModel extends ContentTableUIModel<FloatingObj
    51 55 
                           FloatingObjectSchoolEstimateDto.PROPERTY_COMMENT},
    52 56 
                   new String[]{
    53 57 
                           ObjectSchoolEstimateDto.PROPERTY_SPECIES,
    54 
    -                      ObjectSchoolEstimateDto.PROPERTY_TOTAL_WEIGHT}
    58 
    +                      ObjectSchoolEstimateDto.PROPERTY_TOTAL_WEIGHT,
    59 
    +                      ObjectSchoolEstimateDto.PROPERTY_WEIGHT_MEASURE_METHOD
    60 
    +              }
    55 61 
             );
    62 
    +        ObserveSwingDataSource dataSource = ObserveDataSourcesManagerApplicationComponent.value().getMainDataSource();
    63 
    +        defaultWeightMeasureMethod = dataSource.getReferentialReferenceSet(WeightMeasureMethodReference.class).tryGetReferenceById(ProtectedIds.PS_OBSERVATION_SCHOOL_ESTIMATE_DEFAULT_WEIGHT_MEASURE_METHOD_ID).orElseThrow(IllegalStateException::new);
    56 64
    57 65 
             List<ContentTableMeta<ObjectSchoolEstimateDto>> metas = Arrays.asList(
    58 66 
                     ContentTableModel.newTableMeta(ObjectSchoolEstimateDto.class, ObjectSchoolEstimateDto.PROPERTY_SPECIES, false),
    ... ... @@ -86,4 +94,15 @@ public class ObjectSchoolEstimateUIModel extends ContentTableUIModel<FloatingObj
    86 94 
                 }
    87 95 
             };
    88 96 
         }
    97 
    +
    98 
    +    @Override
    99 
    +    public ObjectSchoolEstimateDto newTableEditBean() {
    100 
    +        ObjectSchoolEstimateDto result = super.newTableEditBean();
    101 
    +        result.setWeightMeasureMethod(getDefaultWeightMeasureMethod());
    102 
    +        return result;
    103 
    +    }
    104 
    +
    105 
    +    public WeightMeasureMethodReference getDefaultWeightMeasureMethod() {
    106 
    +        return defaultWeightMeasureMethod;
    107 
    +    }
    89 108 
     }

  • client-datasource-editor-ps/src/main/java/fr/ird/observe/client/datasource/editor/content/data/ps/observation/SchoolEstimateUIModel.java
    ... ... @@ -22,13 +22,17 @@ package fr.ird.observe.client.datasource.editor.content.data.ps.observation;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    +import fr.ird.observe.client.datasource.api.ObserveDataSourcesManagerApplicationComponent;
    26 
    +import fr.ird.observe.client.datasource.api.ObserveSwingDataSource;
    25 27 
     import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableMeta;
    26 28 
     import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableModel;
    27 29 
     import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUI;
    28 30 
     import fr.ird.observe.client.datasource.editor.content.data.table.ContentTableUIModel;
    31 
    +import fr.ird.observe.dto.ProtectedIds;
    29 32 
     import fr.ird.observe.dto.data.ps.observation.SchoolEstimateDto;
    30 33 
     import fr.ird.observe.dto.data.ps.observation.SchoolEstimateHelper;
    31 34 
     import fr.ird.observe.dto.data.ps.observation.SetSchoolEstimateDto;
    35 
    +import fr.ird.observe.dto.referential.common.WeightMeasureMethodReference;
    32 36
    33 37 
     import java.util.Arrays;
    34 38 
     import java.util.Collection;
    ... ... @@ -41,6 +45,7 @@ import java.util.List;
    41 45 
      * @since XXX
    42 46 
      */
    43 47 
     public class SchoolEstimateUIModel extends ContentTableUIModel<SetSchoolEstimateDto, SchoolEstimateDto> {
    48 
    +    private final WeightMeasureMethodReference defaultWeightMeasureMethod;
    44 49
    45 50 
         public SchoolEstimateUIModel(SchoolEstimateUI ui) {
    46 51
    ... ... @@ -52,8 +57,12 @@ public class SchoolEstimateUIModel extends ContentTableUIModel<SetSchoolEstimate
    52 57 
                   new String[]{
    53 58 
                           SchoolEstimateDto.PROPERTY_SPECIES,
    54 59 
                           SchoolEstimateDto.PROPERTY_TOTAL_WEIGHT,
    55 
    -                      SchoolEstimateDto.PROPERTY_MEAN_WEIGHT}
    60 
    +                      SchoolEstimateDto.PROPERTY_MEAN_WEIGHT,
    61 
    +                      SchoolEstimateDto.PROPERTY_WEIGHT_MEASURE_METHOD
    62 
    +              }
    56 63 
             );
    64 
    +        ObserveSwingDataSource dataSource = ObserveDataSourcesManagerApplicationComponent.value().getMainDataSource();
    65 
    +        defaultWeightMeasureMethod = dataSource.getReferentialReferenceSet(WeightMeasureMethodReference.class).tryGetReferenceById(ProtectedIds.PS_OBSERVATION_SCHOOL_ESTIMATE_DEFAULT_WEIGHT_MEASURE_METHOD_ID).orElseThrow(IllegalStateException::new);
    57 66
    58 67 
             List<ContentTableMeta<SchoolEstimateDto>> metas = Arrays.asList(
    59 68 
                     ContentTableModel.newTableMeta(SchoolEstimateDto.class, SchoolEstimateDto.PROPERTY_SPECIES, false),
    ... ... @@ -88,4 +97,15 @@ public class SchoolEstimateUIModel extends ContentTableUIModel<SetSchoolEstimate
    88 97 
                 }
    89 98 
             };
    90 99 
         }
    100 
    +
    101 
    +    @Override
    102 
    +    public SchoolEstimateDto newTableEditBean() {
    103 
    +        SchoolEstimateDto result = super.newTableEditBean();
    104 
    +        result.setWeightMeasureMethod(getDefaultWeightMeasureMethod());
    105 
    +        return result;
    106 
    +    }
    107 
    +
    108 
    +    public WeightMeasureMethodReference getDefaultWeightMeasureMethod() {
    109 
    +        return defaultWeightMeasureMethod;
    110 
    +    }
    91 111 
     }

  • dto/pom.xml
    ... ... @@ -204,6 +204,12 @@
    204 204 
                   <artifactId>java-util</artifactId>
    205 205 
                   <version>${lib.version.java4all.java-util}</version>
    206 206 
                 </dependency>
    207 
    +            <dependency>
    208 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    209 
    +              <artifactId>jaxx-runtime-spi</artifactId>
    210 
    +              <version>${lib.version.java4all.jaxx}</version>
    211 
    +            </dependency>
    212 
    +
    207 213 
               </dependencies>
    208 214 
             </plugin>
    209 215 
             <plugin>

  • dto/src/main/java/fr/ird/observe/dto/ProtectedIds.java
    ... ... @@ -145,6 +145,8 @@ public class ProtectedIds {
    145 145 
         public static final Set<String> PS_OBSERVATION_FOB_OBSERVED_SYSTEM_EXCLUDE_OPERATIONS = ImmutableSet.of("fr.ird.referential.ps.common.ObjectOperation#0#10", "fr.ird.referential.ps.common.ObjectOperation#0#1");
    146 146 
         //FIXME-PROTECTED-ID
    147 147 
         public static final String PS_COMMON_TRANSMITTING_BUOY_OPERATION_POSE = "fr.ird.referential.ps.common.TransmittingBuoyOperation#1239832686238#0.4755624782839416";
    148 
    +    //FIXME-PROTECTED-ID
    149 
    +    public static final String PS_OBSERVATION_SCHOOL_ESTIMATE_DEFAULT_WEIGHT_MEASURE_METHOD_ID = "fr.ird.referential.common.WeightMeasureMethod#666#04";
    148 150
    149 151 
         private ProtectedIds() {
    150 152 
             // avoid instance

  • observe-i18n/src/main/i18n/translations/observe_en_GB.properties
    ... ... @@ -837,7 +837,7 @@ observe.data.ll.common.Trip.departureHarbour=Departure harbour
    837 837 
     observe.data.ll.common.Trip.endDate=End date
    838 838 
     observe.data.ll.common.Trip.ersId=Id ERS
    839 839 
     observe.data.ll.common.Trip.generalComment=Comment
    840 
    -observe.data.ll.common.Trip.generalTab=Characteristics
    840 
    +observe.data.ll.common.Trip.generalTab=Common characteristics
    841 841 
     observe.data.ll.common.Trip.homeId=Home id
    842 842 
     observe.data.ll.common.Trip.landingHarbour=Landing harbour
    843 843 
     observe.data.ll.common.Trip.logbookAvailability=Logbook
    ... ... @@ -1055,7 +1055,7 @@ observe.data.ll.logbook.Catch.action.new=New catch
    1055 1055 
     observe.data.ll.logbook.Catch.action.new.tip=Create a new catch
    1056 1056 
     observe.data.ll.logbook.Catch.action.reset.photoReferences.tip=Reset photo references
    1057 1057 
     observe.data.ll.logbook.Catch.availablePredator=Avaiable predators
    1058 
    -observe.data.ll.logbook.Catch.beatDiameter=Beat diameter
    1058 
    +observe.data.ll.logbook.Catch.beatDiameter=Beat diameter (cm)
    1059 1059 
     observe.data.ll.logbook.Catch.branchlineTab=Branchline
    1060 1060 
     observe.data.ll.logbook.Catch.caracteristicTab=Caracteristics
    1061 1061 
     observe.data.ll.logbook.Catch.catchFate=Fate
    ... ... @@ -1064,7 +1064,7 @@ observe.data.ll.logbook.Catch.comment=Comment
    1064 1064 
     observe.data.ll.logbook.Catch.count=Count
    1065 1065 
     observe.data.ll.logbook.Catch.countDepredated=Count depredated
    1066 1066 
     observe.data.ll.logbook.Catch.depredated=Depredated
    1067 
    -observe.data.ll.logbook.Catch.depredatedProportion=Depredated proportion
    1067 
    +observe.data.ll.logbook.Catch.depredatedProportion=Depredated proportion (%)
    1068 1068 
     observe.data.ll.logbook.Catch.depredatedTab=Depredation
    1069 1069 
     observe.data.ll.logbook.Catch.discardHealthStatus=Discard health status
    1070 1070 
     observe.data.ll.logbook.Catch.foodAndSexualTab=Food and sexual maturity
    ... ... @@ -1208,9 +1208,9 @@ observe.data.ll.logbook.Set.haulingStartTimeStamp=Start timestamp
    1208 1208 
     observe.data.ll.logbook.Set.haulingTab=Hauling
    1209 1209 
     observe.data.ll.logbook.Set.homeId=Home id
    1210 1210 
     observe.data.ll.logbook.Set.lengthBetweenBranchlines=Length between branchlines (m)
    1211 
    -observe.data.ll.logbook.Set.lightsticksColor=Lightsticks color
    1211 
    +observe.data.ll.logbook.Set.lightsticksColor=Majority lightsticks color
    1212 1212 
     observe.data.ll.logbook.Set.lightsticksTab=Lightsticks
    1213 
    -observe.data.ll.logbook.Set.lightsticksType=Lightsticks type
    1213 
    +observe.data.ll.logbook.Set.lightsticksType=Majority lightsticks type
    1214 1214 
     observe.data.ll.logbook.Set.lightsticksUsed=Lightsticks used
    1215 1215 
     observe.data.ll.logbook.Set.lineType=Line type
    1216 1216 
     observe.data.ll.logbook.Set.maxDepthTargeted=Max depth targeted (m)
    ... ... @@ -1410,9 +1410,9 @@ observe.data.ll.observation.Catch.action.deleteSelectedWeightMeasure.tip=Delete
    1410 1410 
     observe.data.ll.observation.Catch.action.new=New catch
    1411 1411 
     observe.data.ll.observation.Catch.action.new.tip=Create a new catch
    1412 1412 
     observe.data.ll.observation.Catch.action.reset.photoReferences.tip=Reset photo references
    1413 
    -observe.data.ll.observation.Catch.availablePredator=Avaiable predators
    1413 
    +observe.data.ll.observation.Catch.availablePredator=Available predators
    1414 1414 
     observe.data.ll.observation.Catch.basket=Basket
    1415 
    -observe.data.ll.observation.Catch.beatDiameter=Beat diameter
    1415 
    +observe.data.ll.observation.Catch.beatDiameter=Beat diameter (cm)
    1416 1416 
     observe.data.ll.observation.Catch.branchline=Branchline
    1417 1417 
     observe.data.ll.observation.Catch.branchlineTab=Branchline
    1418 1418 
     observe.data.ll.observation.Catch.caracteristicTab=Caracteristics

  • observe-i18n/src/main/i18n/translations/observe_es_ES.properties
    ... ... @@ -837,7 +837,7 @@ observe.data.ll.common.Trip.departureHarbour=Puerto de embarque
    837 837 
     observe.data.ll.common.Trip.endDate=Fecha de fin
    838 838 
     observe.data.ll.common.Trip.ersId=Id ERS
    839 839 
     observe.data.ll.common.Trip.generalComment=Comentarios
    840 
    -observe.data.ll.common.Trip.generalTab=Características
    840 
    +observe.data.ll.common.Trip.generalTab=General características
    841 841 
     observe.data.ll.common.Trip.homeId=Id de negocio
    842 842 
     observe.data.ll.common.Trip.landingHarbour=Puerto de desembarque
    843 843 
     observe.data.ll.common.Trip.logbookAvailability=Logbook \#TODO
    ... ... @@ -1055,7 +1055,7 @@ observe.data.ll.logbook.Catch.action.new=Nueva captura
    1055 1055 
     observe.data.ll.logbook.Catch.action.new.tip=Crear una nueva captura
    1056 1056 
     observe.data.ll.logbook.Catch.action.reset.photoReferences.tip=Reiniciar las referencias photo
    1057 1057 
     observe.data.ll.logbook.Catch.availablePredator=Deprepadaores disponibles
    1058 
    -observe.data.ll.logbook.Catch.beatDiameter=Diametro de la mordedura
    1058 
    +observe.data.ll.logbook.Catch.beatDiameter=Diametro de la mordedura (cm)
    1059 1059 
     observe.data.ll.logbook.Catch.branchlineTab=Arponcillo
    1060 1060 
     observe.data.ll.logbook.Catch.caracteristicTab=Características
    1061 1061 
     observe.data.ll.logbook.Catch.catchFate=Devenir
    ... ... @@ -1064,7 +1064,7 @@ observe.data.ll.logbook.Catch.comment=Comentario
    1064 1064 
     observe.data.ll.logbook.Catch.count=Numéro
    1065 1065 
     observe.data.ll.logbook.Catch.countDepredated=Count depredated \#TODO
    1066 1066 
     observe.data.ll.logbook.Catch.depredated=Victima de depredación
    1067 
    -observe.data.ll.logbook.Catch.depredatedProportion=Depredación propertion \#TODO
    1067 
    +observe.data.ll.logbook.Catch.depredatedProportion=Depredación propertion (%) \#TODO
    1068 1068 
     observe.data.ll.logbook.Catch.depredatedTab=Depredación
    1069 1069 
     observe.data.ll.logbook.Catch.discardHealthStatus=Salud al rechazo
    1070 1070 
     observe.data.ll.logbook.Catch.foodAndSexualTab=Alimentación y maturidad sexual
    ... ... @@ -1208,12 +1208,12 @@ observe.data.ll.logbook.Set.haulingStartTimeStamp=Timestamp del inicio
    1208 1208 
     observe.data.ll.logbook.Set.haulingTab=Arrastre
    1209 1209 
     observe.data.ll.logbook.Set.homeId=Id de negocio
    1210 1210 
     observe.data.ll.logbook.Set.lengthBetweenBranchlines=Length between branchlines (m) \#TODO
    1211 
    -observe.data.ll.logbook.Set.lightsticksColor=Color de barrita de luz
    1211 
    +observe.data.ll.logbook.Set.lightsticksColor=Mayoritario color de barrita de luz #TODO
    1212 1212 
     observe.data.ll.logbook.Set.lightsticksTab=Lightsticks \#TODO
    1213 
    -observe.data.ll.logbook.Set.lightsticksType=Tipo de barrita de luz
    1213 
    +observe.data.ll.logbook.Set.lightsticksType=Mayoritario tipo de barrita de luz #TODO
    1214 1214 
     observe.data.ll.logbook.Set.lightsticksUsed=Lightsticks used \#TODO
    1215 1215 
     observe.data.ll.logbook.Set.lineType=Tipo de línea
    1216 
    -observe.data.ll.logbook.Set.maxDepthTargeted=Profundidad máxima deseada
    1216 
    +observe.data.ll.logbook.Set.maxDepthTargeted=Profundidad máxima deseada (m)
    1217 1217 
     observe.data.ll.logbook.Set.message.creating=Lance en proceso de creación.
    1218 1218 
     observe.data.ll.logbook.Set.message.updating=La operación de pesca está en proceso de modificación.
    1219 1219 
     observe.data.ll.logbook.Set.monitored=Instrumentada
    ... ... @@ -1412,7 +1412,7 @@ observe.data.ll.observation.Catch.action.new.tip=Crear una nueva captura
    1412 1412 
     observe.data.ll.observation.Catch.action.reset.photoReferences.tip=Reiniciar las referencias photo
    1413 1413 
     observe.data.ll.observation.Catch.availablePredator=Deprepadaores disponibles
    1414 1414 
     observe.data.ll.observation.Catch.basket=cesta
    1415 
    -observe.data.ll.observation.Catch.beatDiameter=Diametro de la mordedura
    1415 
    +observe.data.ll.observation.Catch.beatDiameter=Diametro de la mordedura (cm)
    1416 1416 
     observe.data.ll.observation.Catch.branchline=Arponcillo
    1417 1417 
     observe.data.ll.observation.Catch.branchlineTab=Arponcillo
    1418 1418 
     observe.data.ll.observation.Catch.caracteristicTab=Características

  • observe-i18n/src/main/i18n/translations/observe_fr_FR.properties
    ... ... @@ -837,7 +837,7 @@ observe.data.ll.common.Trip.departureHarbour=Port de départ
    837 837 
     observe.data.ll.common.Trip.endDate=Date fin
    838 838 
     observe.data.ll.common.Trip.ersId=Id ERS
    839 839 
     observe.data.ll.common.Trip.generalComment=Commentaire
    840 
    -observe.data.ll.common.Trip.generalTab=Caractéristiques
    840 
    +observe.data.ll.common.Trip.generalTab=Caractéristiques communes
    841 841 
     observe.data.ll.common.Trip.homeId=Id métier
    842 842 
     observe.data.ll.common.Trip.landingHarbour=Port d'arrivée
    843 843 
     observe.data.ll.common.Trip.logbookAvailability=Logbook
    ... ... @@ -1055,7 +1055,7 @@ observe.data.ll.logbook.Catch.action.new=Nouvelle capture
    1055 1055 
     observe.data.ll.logbook.Catch.action.new.tip=Créer une nouvelle capture
    1056 1056 
     observe.data.ll.logbook.Catch.action.reset.photoReferences.tip=Réinitialiser les références photo
    1057 1057 
     observe.data.ll.logbook.Catch.availablePredator=Prédateurs disponibles
    1058 
    -observe.data.ll.logbook.Catch.beatDiameter=Diamètre de la morsure
    1058 
    +observe.data.ll.logbook.Catch.beatDiameter=Diamètre de la morsure (cm)
    1059 1059 
     observe.data.ll.logbook.Catch.branchlineTab=Avançon
    1060 1060 
     observe.data.ll.logbook.Catch.caracteristicTab=Caractéristiques
    1061 1061 
     observe.data.ll.logbook.Catch.catchFate=Devenir
    ... ... @@ -1064,7 +1064,7 @@ observe.data.ll.logbook.Catch.comment=Commentaire
    1064 1064 
     observe.data.ll.logbook.Catch.count=Nombre
    1065 1065 
     observe.data.ll.logbook.Catch.countDepredated=Nombre déprédatés
    1066 1066 
     observe.data.ll.logbook.Catch.depredated=Victime de déprédation
    1067 
    -observe.data.ll.logbook.Catch.depredatedProportion=Proportion de deprédaté
    1067 
    +observe.data.ll.logbook.Catch.depredatedProportion=Proportion de deprédaté (%)
    1068 1068 
     observe.data.ll.logbook.Catch.depredatedTab=Déprédation
    1069 1069 
     observe.data.ll.logbook.Catch.discardHealthStatus=Santé au rejet
    1070 1070 
     observe.data.ll.logbook.Catch.foodAndSexualTab=Alimentation et maturité sexuelle
    ... ... @@ -1208,12 +1208,12 @@ observe.data.ll.logbook.Set.haulingStartTimeStamp=Horodatage début
    1208 1208 
     observe.data.ll.logbook.Set.haulingTab=Virage
    1209 1209 
     observe.data.ll.logbook.Set.homeId=Id métier
    1210 1210 
     observe.data.ll.logbook.Set.lengthBetweenBranchlines=Distance entre avançons (m)
    1211 
    -observe.data.ll.logbook.Set.lightsticksColor=Couleur de cyalumes
    1211 
    +observe.data.ll.logbook.Set.lightsticksColor=Couleur de cyalumes majoritaire
    1212 1212 
     observe.data.ll.logbook.Set.lightsticksTab=Cyalumes
    1213 
    -observe.data.ll.logbook.Set.lightsticksType=Type de cyalumes
    1213 
    +observe.data.ll.logbook.Set.lightsticksType=Type de cyalumes majoritaire
    1214 1214 
     observe.data.ll.logbook.Set.lightsticksUsed=Utilisation des Cyalumes
    1215 1215 
     observe.data.ll.logbook.Set.lineType=Type de ligne
    1216 
    -observe.data.ll.logbook.Set.maxDepthTargeted=Profondeur maximum ciblée
    1216 
    +observe.data.ll.logbook.Set.maxDepthTargeted=Profondeur maximum ciblée (m)
    1217 1217 
     observe.data.ll.logbook.Set.message.creating=L'opération de pêche est en cours de création.
    1218 1218 
     observe.data.ll.logbook.Set.message.updating=L'opération de pêche est en cours de modification.
    1219 1219 
     observe.data.ll.logbook.Set.monitored=Instrumentée
    ... ... @@ -1412,7 +1412,7 @@ observe.data.ll.observation.Catch.action.new.tip=Créer une nouvelle capture
    1412 1412 
     observe.data.ll.observation.Catch.action.reset.photoReferences.tip=Réinitialiser les références photo
    1413 1413 
     observe.data.ll.observation.Catch.availablePredator=Prédateurs disponibles
    1414 1414 
     observe.data.ll.observation.Catch.basket=Panier
    1415 
    -observe.data.ll.observation.Catch.beatDiameter=Diamètre de la morsure
    1415 
    +observe.data.ll.observation.Catch.beatDiameter=Diamètre de la morsure (cm)
    1416 1416 
     observe.data.ll.observation.Catch.branchline=Avançon
    1417 1417 
     observe.data.ll.observation.Catch.branchlineTab=Avançon
    1418 1418 
     observe.data.ll.observation.Catch.caracteristicTab=Caractéristiques

  • persistence/pom.xml
    ... ... @@ -303,6 +303,11 @@
    303 303 
                   <artifactId>application-context</artifactId>
    304 304 
                   <version>${lib.version.java4all.application-context}</version>
    305 305 
                 </dependency>
    306 
    +            <dependency>
    307 
    +              <groupId>io.ultreia.java4all.jaxx</groupId>
    308 
    +              <artifactId>jaxx-runtime-spi</artifactId>
    309 
    +              <version>${lib.version.java4all.jaxx}</version>
    310 
    +            </dependency>
    306 311 
                 <dependency>
    307 312 
                   <groupId>com.google.auto.service</groupId>
    308 313 
                   <artifactId>auto-service</artifactId>

  • persistence/src/main/resources/db/migration/8.0/11_add_weight_measure_method-common.sql
    ... ... @@ -26,6 +26,7 @@ INSERT INTO observe_common.LASTUPDATEDATE(topiaId, topiaversion, topiacreatedate
    26 26 
     INSERT INTO observe_common.WeightMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.WeightMeasureMethod#666#01' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'Peson',             'Peson', 'Peson #TODO');
    27 27 
     INSERT INTO observe_common.WeightMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.WeightMeasureMethod#666#02' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'Scale',             'Balance', 'Balance #TODO');
    28 28 
     INSERT INTO observe_common.WeightMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.WeightMeasureMethod#666#03' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'Visual estimation', 'Estimation visuelle', 'Estimation visuelle #TODO');
    29 
    +INSERT INTO observe_common.WeightMeasureMethod(topiaid, topiaversion, topiacreatedate, lastupdatedate, status, needComment, label1, label2, label3) values ('fr.ird.observe.entities.referentiel.WeightMeasureMethod#666#04' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, 1, false, 'Estimate with sounder', 'Estimation au sondeur', 'Estimación con la ecosonda');
    29 30
    30 31 
     ALTER TABLE observe_seine.nontargetcatch ADD COLUMN weightMeasureMethod VARCHAR(255);
    31 32 
     ALTER TABLE observe_seine.nontargetlength ADD COLUMN weightMeasureMethod VARCHAR(255);

  • pom.xml
    ... ... @@ -24,7 +24,7 @@
    24 24 
       <parent>
    25 25 
         <groupId>io.ultreia.maven</groupId>
    26 26 
         <artifactId>pom</artifactId>
    27 
    -    <version>2020.33</version>
    27 
    +    <version>2020.34</version>
    28 28 
       </parent>
    29 29
    30 30 
       <groupId>fr.ird.observe</groupId>
    ... ... @@ -162,7 +162,7 @@
    162 162 
         <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>
    163 163 
         <buildDate>${maven.build.timestamp}</buildDate>
    164 164
    165 
    -    <lib.version.toolkit>4.32</lib.version.toolkit>
    165 
    +    <lib.version.toolkit>4.33</lib.version.toolkit>
    166 166 
         <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>
    167 167 
         <!--can't use 1.4.197 (date has changed + blob also)-->
    168 168 
         <lib.version.h2>1.4.196</lib.version.h2>
    ... ... @@ -170,7 +170,7 @@
    170 170
    171 171 
         <!--    <lib.version.java4all.topia>1.17</lib.version.java4all.topia>-->
    172 172 
         <!--<lib.version.java4all.eugene>3.0<-alpha-22</lib.version.java4all.eugene>-->
    173 
    -<!--    <lib.version.java4all.jaxx>3.0-alpha-70-SNAPSHOT</lib.version.java4all.jaxx>-->
    173 
    +<!--    <lib.version.java4all.jaxx>3.0-alpha-71-SNAPSHOT</lib.version.java4all.jaxx>-->
    174 174 
         <!--<lib.version.java4all.application-context>1.0.3-SNAPSHOT</lib.version.java4all.application-context>-->
    175 175 
         <!--<lib.version.java4all.application-template>1.0.2-SNAPSHOT</lib.version.java4all.application-template>-->
    176 176 
         <!--<lib.version.java4all.i18n>4.0-beta-3-SNAPSHOT</lib.version.java4all.i18n>-->

  • server-core/pom.xml
    ... ... @@ -253,6 +253,12 @@
    253 253 
                 <artifactId>guava</artifactId>
    254 254 
                 <version>${lib.version.google.guava}</version>
    255 255 
               </dependency>
    256 
    +          <dependency>
    257 
    +            <groupId>io.ultreia.java4all.jaxx</groupId>
    258 
    +            <artifactId>jaxx-runtime-spi</artifactId>
    259 
    +            <version>${lib.version.java4all.jaxx}</version>
    260 
    +          </dependency>
    261 
    +
    256 262 
             </dependencies>
    257 263 
           </plugin>
    258 264 
         </plugins>

  • services-client/pom.xml
    ... ... @@ -170,6 +170,11 @@
    170 170 
                 <artifactId>services</artifactId>
    171 171 
                 <version>${project.version}</version>
    172 172 
               </dependency>
    173 
    +          <dependency>
    174 
    +            <groupId>io.ultreia.java4all.jaxx</groupId>
    175 
    +            <artifactId>jaxx-runtime-spi</artifactId>
    176 
    +            <version>${lib.version.java4all.jaxx}</version>
    177 
    +          </dependency>
    173 178 
             </dependencies>
    174 179 
           </plugin>
    175 180 
         </plugins>

  • services-local/src/main/java/fr/ird/observe/services/local/service/DataSourceServiceLocal.java
    ... ... @@ -54,6 +54,7 @@ import fr.ird.observe.services.service.sql.SqlScriptProducerService;
    54 54 
     import fr.ird.observe.spi.DbModelHelper;
    55 55 
     import org.apache.logging.log4j.LogManager;
    56 56 
     import org.apache.logging.log4j.Logger;
    57 
    +import org.nuiton.topia.persistence.TopiaMigrationServiceException;
    57 58 
     import org.nuiton.topia.persistence.jdbc.JdbcHelper;
    58 59 
     import org.nuiton.topia.persistence.jdbc.JdbcPostgresHelper;
    59 60 
     import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity;
    ... ... @@ -611,10 +612,12 @@ public class DataSourceServiceLocal extends ObserveServiceLocal implements DataS
    611 612 
         public void migrateData(ObserveDataSourceConfiguration dataSourceConfiguration) {
    612 613 
             Path temporaryDirectory = getTemporaryDirectory(dataSourceConfiguration);
    613 614 
             log.debug("Will use temporary directory: " + temporaryDirectory);
    614 
    -
    615 
    -        try (ObserveTopiaApplicationContext topiaApplicationContext = ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext((ObserveDataSourceConfigurationTopiaSupport) dataSourceConfiguration)) {
    616 
    -            //FIXME: Si ca plante il faut bien nettoyer les topia context, la base semble ne pas bien etre fermee
    615 
    +        ObserveTopiaApplicationContext topiaApplicationContext = ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext((ObserveDataSourceConfigurationTopiaSupport) dataSourceConfiguration);
    616 
    +        try {
    617 617 
                 topiaApplicationContext.getMigrationService().runSchemaMigration();
    618 
    +        } catch (Exception e) {
    619 
    +            close((ObserveDataSourceConfigurationTopiaSupport) dataSourceConfiguration, topiaApplicationContext);
    620 
    +            throw e;
    618 621 
             }
    619 622 
         }
    620 623

  • services-local/src/test/java/fr/ird/observe/services/local/service/referential/differential/DifferentialModelTest.java
    ... ... @@ -87,7 +87,7 @@ public class DifferentialModelTest extends ServiceLocalTestSupport {
    87 87 
             DifferentialList rightSideDifferentialList = result.getRightSideDifferentialList();
    88 88 
             Assert.assertNotNull(rightSideDifferentialList);
    89 89 
             Assert.assertNotNull(rightSideDifferentialList.getStates());
    90 
    -        Assert.assertEquals(3016, rightSideDifferentialList.getStates().size());
    90 
    +        Assert.assertEquals(3017, rightSideDifferentialList.getStates().size());
    91 91 
             Assert.assertTrue(rightSideDifferentialList.getStates().stream().allMatch(s -> DifferentialType.ADDED.equals(s.getDifferentialType())));
    92 92
    93 93 
         }

  • src/site/site_fr.xml
    ... ... @@ -29,7 +29,7 @@
    29 29 
       <skin>
    30 30 
         <groupId>org.apache.maven.skins</groupId>
    31 31 
         <artifactId>maven-fluido-skin</artifactId>
    32 
    -    <version>1.8</version>
    32 
    +    <version>1.9</version>
    33 33 
       </skin>
    34 34
    35 35 
       <custom>

  • test/src/main/resources/db/8.0/dataForTestLongline.sql.gz
    No preview for this file type
  • test/src/main/resources/db/8.0/dataForTestSeine.sql.gz
    No preview for this file type
  • test/src/main/resources/db/8.0/referentiel.sql.gz
    No preview for this file type
  • test/src/main/resources/fixtures/count-referential-common.properties
    ... ... @@ -48,6 +48,6 @@ common.specieslist=8
    48 48 
     common.vessel=1172
    49 49 
     common.vesselsizecategory=13
    50 50 
     common.vesseltype=16
    51 
    -common.weightmeasuremethod=3
    51 
    +common.weightmeasuremethod=4
    52 52 
     common.weightmeasuretype=3
    53 53 
     common.wind=13

    • —
    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.