Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c636d115 by Tony CHEMIT at 2017-08-15T16:33:09+02:00 [PS][Echantillons] Afficher le type de mensuration utilisé dans le tableau d'empilement des échantillons (See #836) - - - - - 7 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIModel.java - client/src/main/resources/i18n/client_en_GB.properties - client/src/main/resources/i18n/client_es_ES.properties - client/src/main/resources/i18n/client_fr_FR.properties - services/src/main/java/fr/ird/observe/services/validation/validators/AbstractSpeciesFieldDtoValidator.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/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 addReferentialFilter(NonTargetCatchDto.PROPERTY_SPECIES, (ReferentialReferencesFilter<SpeciesDto>) incomingReferences -> { String speciesListId = ObserveSwingApplicationContext.get().getConfig().getSpeciesListSeineNonTargetCatchId(); - String tripLonglineId = getDataContext().getSelectedTripLonglineId(); + String tripId = getDataContext().getSelectedTripSeineId(); - List<ReferentialReference<SpeciesDto>> result = getTripSeineService().getSpeciesByListAndTrip(tripLonglineId, speciesListId); + List<ReferentialReference<SpeciesDto>> result = getTripSeineService().getSpeciesByListAndTrip(tripId, speciesListId); return ReferentialReferences.filterEnabled(result); ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIHandler.java +++ b/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 protected void initTableUI(DefaultTableCellRenderer renderer) { JTable table = getUi().getTable(); - UIHelper.fixTableColumnWidth(table, 1, 100); + UIHelper.fixTableColumnWidth(table, 1, 200); UIHelper.fixTableColumnWidth(table, 2, 100); + UIHelper.fixTableColumnWidth(table, 3, 100); + UIHelper.fixTableColumnWidth(table, 4, 75); + UIHelper.fixTableColumnWidth(table, 4, 75); + UIHelper.fixTableColumnWidth(table, 5, 150); UIHelper.setI18nTableHeaderRenderer( table, - n("observe.content.nonTargetSample.table.speciesFaune"), - n("observe.content.nonTargetSample.table.speciesFaune.tip"), + n("observe.content.nonTargetSample.table.nonTargetSpecies"), + n("observe.content.nonTargetSample.table.nonTargetSpecies.tip"), + n("observe.content.nonTargetSample.table.sizeMeasureType"), + n("observe.content.nonTargetSample.table.sizeMeasureType.tip"), n("observe.content.nonTargetSample.table.length"), n("observe.content.nonTargetSample.table.length.tip"), n("observe.content.nonTargetSample.table.meanWeight"), @@ -208,11 +214,12 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS n("observe.content.nonTargetSample.table.picturesReferences.tip")); UIHelper.setTableColumnRenderer(table, 0, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SpeciesDto.class)); - UIHelper.setTableColumnRenderer(table, 1, UIHelper.newEmptyNumberTableCellRenderer(renderer)); + UIHelper.setTableColumnRenderer(table, 1, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SizeMeasureTypeDto.class)); UIHelper.setTableColumnRenderer(table, 2, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); - UIHelper.setTableColumnRenderer(table, 4, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SexDto.class)); - UIHelper.setTableColumnRenderer(table, 5, renderer); + UIHelper.setTableColumnRenderer(table, 4, UIHelper.newEmptyNumberTableCellRenderer(renderer)); + UIHelper.setTableColumnRenderer(table, 5, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SexDto.class)); + UIHelper.setTableColumnRenderer(table, 6, renderer); } @Override @@ -244,10 +251,10 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS * @param newMode le nouveau de mode de saisie à utiliser * @since 3.0 */ - void updateModeSaisie(AcquisitionMode newMode) { + void updateAcquisitionMode(AcquisitionMode newMode) { if (log.isDebugEnabled()) { - log.debug("Change mode saisie to " + newMode); + log.debug(String.format("Change acquisition mode to %s", newMode)); } if (newMode == null) { ===================================== client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/table/impl/seine/NonTargetSampleUIModel.java +++ b/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 NonTargetLengthDto.PROPERTY_COUNT, NonTargetLengthDto.PROPERTY_SPECIES_FATE, NonTargetLengthDto.PROPERTY_ACQUISITION_MODE, + NonTargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES }); List<ContentTableMeta<NonTargetLengthDto>> metas = Arrays.asList( ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_SPECIES, false), + ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_SIZE_MEASURE_TYPE, false), ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_LENGTH, false), ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_WEIGHT, false), ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_COUNT, false), @@ -127,6 +129,7 @@ public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSampleD @Override public <R extends ReferentialDto> Optional<Set<ReferentialReference<R>>> tryToGetReferentialReferenceSet(String propertyName) { + //noinspection unchecked ReferentialReferenceSet<R> referenceSet = (ReferentialReferenceSet) this.referentialReferenceSetsByPropertyName.get(propertyName); Set<ReferentialReference<R>> references = null; if (referenceSet != null) { ===================================== client/src/main/resources/i18n/client_en_GB.properties ===================================== --- a/client/src/main/resources/i18n/client_en_GB.properties +++ b/client/src/main/resources/i18n/client_en_GB.properties @@ -1002,10 +1002,12 @@ observe.content.nonTargetSample.table.length=Length observe.content.nonTargetSample.table.length.tip=Length observe.content.nonTargetSample.table.meanWeight=Indiv. Weight observe.content.nonTargetSample.table.meanWeight.tip=Individual weight (en Kg) +observe.content.nonTargetSample.table.nonTargetSpecies=Species +observe.content.nonTargetSample.table.nonTargetSpecies.tip=Non target species observe.content.nonTargetSample.table.picturesReferences=Pictures references observe.content.nonTargetSample.table.picturesReferences.tip=Pictures references -observe.content.nonTargetSample.table.speciesFaune=Species -observe.content.nonTargetSample.table.speciesFaune.tip=Non target species +observe.content.nonTargetSample.table.sizeMeasureType=Measure type +observe.content.nonTargetSample.table.sizeMeasureType.tip=Size measure type observe.content.objectObservedSpecies.table.count=Count observe.content.objectObservedSpecies.table.count.tip=Count observe.content.objectObservedSpecies.table.speciesFaune=Species ===================================== client/src/main/resources/i18n/client_es_ES.properties ===================================== --- a/client/src/main/resources/i18n/client_es_ES.properties +++ b/client/src/main/resources/i18n/client_es_ES.properties @@ -1002,10 +1002,12 @@ observe.content.nonTargetSample.table.length=Talla observe.content.nonTargetSample.table.length.tip=Talla observe.content.nonTargetSample.table.meanWeight=Peso observe.content.nonTargetSample.table.meanWeight.tip=Peso del individuo +observe.content.nonTargetSample.table.nonTargetSpecies=Especie +observe.content.nonTargetSample.table.nonTargetSpecies.tip=Especie observe.content.nonTargetSample.table.picturesReferences=Ref. foto observe.content.nonTargetSample.table.picturesReferences.tip=Referencia foto -observe.content.nonTargetSample.table.speciesFaune=Especie -observe.content.nonTargetSample.table.speciesFaune.tip=Especie +observe.content.nonTargetSample.table.sizeMeasureType=Typo de medida +observe.content.nonTargetSample.table.sizeMeasureType.tip=Typo de medida observe.content.objectObservedSpecies.table.count=Número observe.content.objectObservedSpecies.table.count.tip=Número observe.content.objectObservedSpecies.table.speciesFaune=Especie ===================================== client/src/main/resources/i18n/client_fr_FR.properties ===================================== --- a/client/src/main/resources/i18n/client_fr_FR.properties +++ b/client/src/main/resources/i18n/client_fr_FR.properties @@ -1002,10 +1002,12 @@ observe.content.nonTargetSample.table.length=Longueur observe.content.nonTargetSample.table.length.tip=Longueur observe.content.nonTargetSample.table.meanWeight=Poids ind. observe.content.nonTargetSample.table.meanWeight.tip=Poids individuel (en Kg) +observe.content.nonTargetSample.table.nonTargetSpecies=Espèce faune +observe.content.nonTargetSample.table.nonTargetSpecies.tip=Espèce faune observe.content.nonTargetSample.table.picturesReferences=Ref photo observe.content.nonTargetSample.table.picturesReferences.tip=référence photo -observe.content.nonTargetSample.table.speciesFaune=Espèce faune -observe.content.nonTargetSample.table.speciesFaune.tip=Espèce faune +observe.content.nonTargetSample.table.sizeMeasureType=Type de mensuration +observe.content.nonTargetSample.table.sizeMeasureType.tip=Le type de mensuration utilisé (LF ou LD1) observe.content.objectObservedSpecies.table.count=Nombre observe.content.objectObservedSpecies.table.count.tip=Nombre observe.content.objectObservedSpecies.table.speciesFaune=Espèce de faune ===================================== services/src/main/java/fr/ird/observe/services/validation/validators/AbstractSpeciesFieldDtoValidator.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/validation/validators/AbstractSpeciesFieldDtoValidator.java +++ b/services/src/main/java/fr/ird/observe/services/validation/validators/AbstractSpeciesFieldDtoValidator.java @@ -148,7 +148,9 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup if (this.enable != enable) { - log.info("Skip speed validation"); + if (log.isDebugEnabled()) { + log.debug("Skip speed validation"); + } return false; } @@ -208,8 +210,8 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup log.debug("data to validate : " + data); } - // l'species associée - ReferentialReference<SpeciesDto> speciesRef = (ReferentialReference<SpeciesDto>) getFieldValue(speciesFieldName, object); + //noinspection unchecked + ReferentialReference<SpeciesDto> speciesRef = (ReferentialReference) getFieldValue(speciesFieldName, object); if (speciesRef == null) { @@ -218,7 +220,7 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup } if (log.isDebugEnabled()) { - log.debug("Espece to validate : " + speciesRef); + log.debug("Species to validate : " + speciesRef); } SpeciesDto speciesDto = (SpeciesDto) stack.findValue("getSpecies(\"" + speciesRef.getId() + "\")"); @@ -226,7 +228,7 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup Bound bound = getBound(speciesDto); if (log.isDebugEnabled()) { - log.debug("Espece Bound to validate : " + bound); + log.debug("Species Bound to validate : " + bound); } if (bound == null) { @@ -237,10 +239,10 @@ public abstract class AbstractSpeciesFieldDtoValidator extends FieldValidatorSup Bound boundWithRatio = bound.applyRatio(ratio); - if (log.isInfoEnabled()) { - log.info("Bound : " + bound); - log.info("Ratio to validate : " + ratio); - log.info("Bound with ratio : " + boundWithRatio); + if (log.isDebugEnabled()) { + log.debug("Bound : " + bound); + log.debug("Ratio to validate : " + ratio); + log.debug("Bound with ratio : " + boundWithRatio); } boolean valid = validateBound(data, boundWithRatio); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c636d115f82cb2d2132b904e3ce1... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/c636d115f82cb2d2132b904e3ce1... You're receiving this email because of your account on gitlab.com.