Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 959062c7 by Tony CHEMIT at 2017-09-06T22:06:16+00:00 [PS] Sur le formulaire Echantillon non cible, afficher dans le tableau la propriété 'devenir' (See #866) - - - - - 2 changed files: - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIModel.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java @@ -194,6 +194,7 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS UIHelper.fixTableColumnWidth(table, 4, 75); UIHelper.fixTableColumnWidth(table, 4, 75); UIHelper.fixTableColumnWidth(table, 5, 150); + UIHelper.fixTableColumnWidth(table, 6, 200); UIHelper.setI18nTableHeaderRenderer( table, @@ -209,6 +210,8 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS n("observe.common.NonTargetLengthDto.table.count.tip"), n("observe.common.NonTargetLengthDto.table.gender"), n("observe.common.NonTargetLengthDto.table.gender.tip"), + n("observe.common.NonTargetLengthDto.speciesFate"), + n("observe.common.NonTargetLengthDto.speciesFate"), n("observe.common.NonTargetLengthDto.table.picturesReferences"), n("observe.common.NonTargetLengthDto.table.picturesReferences.tip")); @@ -218,7 +221,8 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 4, UIHelper.newEmptyNumberTableCellRenderer(renderer)); UIHelper.setTableColumnRenderer(table, 5, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SexReference.class)); - UIHelper.setTableColumnRenderer(table, 6, renderer); + UIHelper.setTableColumnRenderer(table, 6, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SpeciesFateReference.class)); + UIHelper.setTableColumnRenderer(table, 7, renderer); } @Override ===================================== client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIModel.java @@ -90,6 +90,7 @@ public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSampleD return bean.getSex() != null; } }, + ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_SPECIES_FATE, false), ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES, false)); initModel(ui, metas); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/959062c7b939e9d3d6589f6fe16e... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/959062c7b939e9d3d6589f6fe16e... You're receiving this email because of your account on gitlab.com.