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

Commits:

7 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java
    ... ... @@ -373,9 +373,9 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa
    373 373 
             addReferentialFilter(NonTargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto>) incomingReferences -> {
    374 374
    375 375 
                 String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineNonTargetCatchId();
    376 
    -            String tripLonglineId = getDataContext().getSelectedTripLonglineId();
    376 
    +            String tripId = getDataContext().getSelectedTripSeineId();
    377 377
    378 
    -            List<ReferentialReference<SpeciesDto>> result = getTripSeineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId);
    378 
    +            List<ReferentialReference<SpeciesDto>> result = getTripSeineService().getSpeciesByListAndTrip(tripId, speciesListId);
    379 379
    380 380 
                 return ReferentialReferences.filterEnabled(result);
    381 381

  • client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java
    ... ... @@ -189,13 +189,19 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS
    189 189 
         protected void initTableUI(DefaultTableCellRenderer renderer) {
    190 190 
             JTable table = getUi().getTable();
    191 191
    192 
    -        UIHelper.fixTableColumnWidth(table, 1, 100);
    192 
    +        UIHelper.fixTableColumnWidth(table, 1, 200);
    193 193 
             UIHelper.fixTableColumnWidth(table, 2, 100);
    194 
    +        UIHelper.fixTableColumnWidth(table, 3, 100);
    195 
    +        UIHelper.fixTableColumnWidth(table, 4, 75);
    196 
    +        UIHelper.fixTableColumnWidth(table, 4, 75);
    197 
    +        UIHelper.fixTableColumnWidth(table, 5, 150);
    194 198
    195 199 
             UIHelper.setI18nTableHeaderRenderer(
    196 200 
                     table,
    197 
    -                n("observe.content.nonTargetSample.table.speciesFaune"),
    198 
    -                n("observe.content.nonTargetSample.table.speciesFaune.tip"),
    201 
    +                n("observe.content.nonTargetSample.table.nonTargetSpecies"),
    202 
    +                n("observe.content.nonTargetSample.table.nonTargetSpecies.tip"),
    203 
    +                n("observe.content.nonTargetSample.table.sizeMeasureType"),
    204 
    +                n("observe.content.nonTargetSample.table.sizeMeasureType.tip"),
    199 205 
                     n("observe.content.nonTargetSample.table.length"),
    200 206 
                     n("observe.content.nonTargetSample.table.length.tip"),
    201 207 
                     n("observe.content.nonTargetSample.table.meanWeight"),
    ... ... @@ -208,11 +214,12 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS
    208 214 
                     n("observe.content.nonTargetSample.table.picturesReferences.tip"));
    209 215
    210 216 
             UIHelper.setTableColumnRenderer(table, 0, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SpeciesDto.class));
    211 
    -        UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer));
    217 
    +        UIHelper.setTableColumnRenderer(table, 1, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SizeMeasureTypeDto.class));
    212 218 
             UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer));
    213 219 
             UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer));
    214 
    -        UIHelper.setTableColumnRenderer(table, 4, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SexDto.class));
    215 
    -        UIHelper.setTableColumnRenderer(table, 5, renderer);
    220 
    +        UIHelper.setTableColumnRenderer(table, 4, UIHelper.newEmptyNumberTableCellRenderer(renderer));
    221 
    +        UIHelper.setTableColumnRenderer(table, 5, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SexDto.class));
    222 
    +        UIHelper.setTableColumnRenderer(table, 6, renderer);
    216 223 
         }
    217 224
    218 225 
         @Override
    ... ... @@ -244,10 +251,10 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS
    244 251 
          * @param newMode le nouveau de mode de saisie à utiliser
    245 252 
          * @since 3.0
    246 253 
          */
    247 
    -    void updateModeSaisie(AcquisitionMode newMode) {
    254 
    +    void updateAcquisitionMode(AcquisitionMode newMode) {
    248 255
    249 256 
             if (log.isDebugEnabled()) {
    250 
    -            log.debug("Change mode saisie to " + newMode);
    257 
    +            log.debug(String.format("Change acquisition mode to %s", newMode));
    251 258 
             }
    252 259 
             if (newMode == null) {
    253 260

  • client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIModel.java
    ... ... @@ -70,11 +70,13 @@ public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSampleD
    70 70 
                           NonTargetLengthDto.PROPERTY_COUNT,
    71 71 
                           NonTargetLengthDto.PROPERTY_SPECIES_FATE,
    72 72 
                           NonTargetLengthDto.PROPERTY_ACQUISITION_MODE,
    73 
    +                      NonTargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE,
    73 74 
                           NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES
    74 75 
                   });
    75 76
    76 77 
             List<ContentTableMeta<NonTargetLengthDto>> metas = Arrays.asList(
    77 78 
                     ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_SPECIES, false),
    79 
    +                ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, false),
    78 80 
                     ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_LENGTH, false),
    79 81 
                     ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_WEIGHT, false),
    80 82 
                     ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_COUNT, false),
    ... ... @@ -127,6 +129,7 @@ public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSampleD
    127 129
    128 130 
         @Override
    129 131 
         public <R extends ReferentialDto> Optional<Set<ReferentialReference<R>>> tryToGetReferentialReferenceSet(String propertyName) {
    132 
    +        //noinspection unchecked
    130 133 
             ReferentialReferenceSet<R> referenceSet = (ReferentialReferenceSet) this.referentialReferenceSetsByPropertyName.get(propertyName);
    131 134 
             Set<ReferentialReference<R>> references = null;
    132 135 
             if (referenceSet != null) {

  • client/src/main/resources/i18n/client_en_GB.properties
    ... ... @@ -1002,10 +1002,12 @@ observe.content.nonTargetSample.table.length=Length
    1002 1002 
     observe.content.nonTargetSample.table.length.tip=Length
    1003 1003 
     observe.content.nonTargetSample.table.meanWeight=Indiv. Weight
    1004 1004 
     observe.content.nonTargetSample.table.meanWeight.tip=Individual weight (en Kg)
    1005 
    +observe.content.nonTargetSample.table.nonTargetSpecies=Species
    1006 
    +observe.content.nonTargetSample.table.nonTargetSpecies.tip=Non target species
    1005 1007 
     observe.content.nonTargetSample.table.picturesReferences=Pictures references
    1006 1008 
     observe.content.nonTargetSample.table.picturesReferences.tip=Pictures references
    1007 
    -observe.content.nonTargetSample.table.speciesFaune=Species
    1008 
    -observe.content.nonTargetSample.table.speciesFaune.tip=Non target species
    1009 
    +observe.content.nonTargetSample.table.sizeMeasureType=Measure type
    1010 
    +observe.content.nonTargetSample.table.sizeMeasureType.tip=Size measure type
    1009 1011 
     observe.content.objectObservedSpecies.table.count=Count
    1010 1012 
     observe.content.objectObservedSpecies.table.count.tip=Count
    1011 1013 
     observe.content.objectObservedSpecies.table.speciesFaune=Species

  • client/src/main/resources/i18n/client_es_ES.properties
    ... ... @@ -1002,10 +1002,12 @@ observe.content.nonTargetSample.table.length=Talla
    1002 1002 
     observe.content.nonTargetSample.table.length.tip=Talla
    1003 1003 
     observe.content.nonTargetSample.table.meanWeight=Peso
    1004 1004 
     observe.content.nonTargetSample.table.meanWeight.tip=Peso del individuo
    1005 
    +observe.content.nonTargetSample.table.nonTargetSpecies=Especie
    1006 
    +observe.content.nonTargetSample.table.nonTargetSpecies.tip=Especie
    1005 1007 
     observe.content.nonTargetSample.table.picturesReferences=Ref. foto
    1006 1008 
     observe.content.nonTargetSample.table.picturesReferences.tip=Referencia foto
    1007 
    -observe.content.nonTargetSample.table.speciesFaune=Especie
    1008 
    -observe.content.nonTargetSample.table.speciesFaune.tip=Especie
    1009 
    +observe.content.nonTargetSample.table.sizeMeasureType=Typo de medida
    1010 
    +observe.content.nonTargetSample.table.sizeMeasureType.tip=Typo de medida
    1009 1011 
     observe.content.objectObservedSpecies.table.count=Número
    1010 1012 
     observe.content.objectObservedSpecies.table.count.tip=Número
    1011 1013 
     observe.content.objectObservedSpecies.table.speciesFaune=Especie

  • client/src/main/resources/i18n/client_fr_FR.properties
    ... ... @@ -1002,10 +1002,12 @@ observe.content.nonTargetSample.table.length=Longueur
    1002 1002 
     observe.content.nonTargetSample.table.length.tip=Longueur
    1003 1003 
     observe.content.nonTargetSample.table.meanWeight=Poids ind.
    1004 1004 
     observe.content.nonTargetSample.table.meanWeight.tip=Poids individuel (en Kg)
    1005 
    +observe.content.nonTargetSample.table.nonTargetSpecies=Espèce faune
    1006 
    +observe.content.nonTargetSample.table.nonTargetSpecies.tip=Espèce faune
    1005 1007 
     observe.content.nonTargetSample.table.picturesReferences=Ref photo
    1006 1008 
     observe.content.nonTargetSample.table.picturesReferences.tip=référence photo
    1007 
    -observe.content.nonTargetSample.table.speciesFaune=Espèce faune
    1008 
    -observe.content.nonTargetSample.table.speciesFaune.tip=Espèce faune
    1009 
    +observe.content.nonTargetSample.table.sizeMeasureType=Type de mensuration
    1010 
    +observe.content.nonTargetSample.table.sizeMeasureType.tip=Le type de mensuration utilisé (LF ou LD1)
    1009 1011 
     observe.content.objectObservedSpecies.table.count=Nombre
    1010 1012 
     observe.content.objectObservedSpecies.table.count.tip=Nombre
    1011 1013 
     observe.content.objectObservedSpecies.table.speciesFaune=Espèce de faune

  • services/src/main/java/fr/ird/observe/services/validation/validators/AbstractSpeciesFieldDtoValidator.java
    ... ... @@ -148,7 +148,9 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup
    148 148
    149 149 
                 if (this.enable != enable) {
    150 150
    151 
    -                log.info("Skip speed validation");
    151 
    +                if (log.isDebugEnabled()) {
    152 
    +                    log.debug("Skip speed validation");
    153 
    +                }
    152 154 
                     return false;
    153 155 
                 }
    154 156
    ... ... @@ -208,8 +210,8 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup
    208 210 
                 log.debug("data to validate : " + data);
    209 211 
             }
    210 212
    211 
    -        // l'species associée
    212 
    -        ReferentialReference<SpeciesDto> speciesRef = (ReferentialReference<SpeciesDto>) getFieldValue(speciesFieldName, object);
    213 
    +        //noinspection unchecked
    214 
    +        ReferentialReference<SpeciesDto> speciesRef = (ReferentialReference) getFieldValue(speciesFieldName, object);
    213 215
    214 216 
             if (speciesRef == null) {
    215 217
    ... ... @@ -218,7 +220,7 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup
    218 220 
             }
    219 221
    220 222 
             if (log.isDebugEnabled()) {
    221 
    -            log.debug("Espece to validate : " + speciesRef);
    223 
    +            log.debug("Species to validate : " + speciesRef);
    222 224 
             }
    223 225
    224 226 
             SpeciesDto speciesDto = (SpeciesDto) stack.findValue("getSpecies(\"" + speciesRef.getId() + "\")");
    ... ... @@ -226,7 +228,7 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup
    226 228 
             Bound bound = getBound(speciesDto);
    227 229
    228 230 
             if (log.isDebugEnabled()) {
    229 
    -            log.debug("Espece Bound to validate : " + bound);
    231 
    +            log.debug("Species Bound to validate : " + bound);
    230 232 
             }
    231 233
    232 234 
             if (bound == null) {
    ... ... @@ -237,10 +239,10 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup
    237 239
    238 240 
             Bound boundWithRatio = bound.applyRatio(ratio);
    239 241
    240 
    -        if (log.isInfoEnabled()) {
    241 
    -            log.info("Bound             : " + bound);
    242 
    -            log.info("Ratio to validate : " + ratio);
    243 
    -            log.info("Bound with ratio  : " + boundWithRatio);
    242 
    +        if (log.isDebugEnabled()) {
    243 
    +            log.debug("Bound             : " + bound);
    244 
    +            log.debug("Ratio to validate : " + ratio);
    245 
    +            log.debug("Bound with ratio  : " + boundWithRatio);
    244 246 
             }
    245 247
    246 248 
             boolean valid = validateBound(data, boundWithRatio);

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