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

Commits:

2 changed files:

Changes:

  • client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIHandler.java
    ... ... @@ -194,6 +194,7 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS
    194 194
             UIHelper.fixTableColumnWidth(table, 4, 75);
    
    195 195
             UIHelper.fixTableColumnWidth(table, 4, 75);
    
    196 196
             UIHelper.fixTableColumnWidth(table, 5, 150);
    
    197
    +        UIHelper.fixTableColumnWidth(table, 6, 200);
    
    197 198
     
    
    198 199
             UIHelper.setI18nTableHeaderRenderer(
    
    199 200
                     table,
    
    ... ... @@ -209,6 +210,8 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS
    209 210
                     n("observe.common.NonTargetLengthDto.table.count.tip"),
    
    210 211
                     n("observe.common.NonTargetLengthDto.table.gender"),
    
    211 212
                     n("observe.common.NonTargetLengthDto.table.gender.tip"),
    
    213
    +                n("observe.common.NonTargetLengthDto.speciesFate"),
    
    214
    +                n("observe.common.NonTargetLengthDto.speciesFate"),
    
    212 215
                     n("observe.common.NonTargetLengthDto.table.picturesReferences"),
    
    213 216
                     n("observe.common.NonTargetLengthDto.table.picturesReferences.tip"));
    
    214 217
     
    
    ... ... @@ -218,7 +221,8 @@ public class NonTargetSampleUIHandler extends AbstractSampleUIHandler<NonTargetS
    218 221
             UIHelper.setTableColumnRenderer(table, 3, UIHelper.newEmptyNumberTableCellRenderer(renderer));
    
    219 222
             UIHelper.setTableColumnRenderer(table, 4, UIHelper.newEmptyNumberTableCellRenderer(renderer));
    
    220 223
             UIHelper.setTableColumnRenderer(table, 5, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SexReference.class));
    
    221
    -        UIHelper.setTableColumnRenderer(table, 6, renderer);
    
    224
    +        UIHelper.setTableColumnRenderer(table, 6, UIHelper.newReferentialReferenceDecorateTableCellRenderer(renderer, SpeciesFateReference.class));
    
    225
    +        UIHelper.setTableColumnRenderer(table, 7, renderer);
    
    222 226
         }
    
    223 227
     
    
    224 228
         @Override
    

  • client/src/main/java/fr/ird/observe/client/ui/content/data/seine/NonTargetSampleUIModel.java
    ... ... @@ -90,6 +90,7 @@ public class NonTargetSampleUIModel extends ContentTableUIModel<NonTargetSampleD
    90 90
                             return bean.getSex() != null;
    
    91 91
                         }
    
    92 92
                     },
    
    93
    +                ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_SPECIES_FATE, false),
    
    93 94
                     ContentTableModel.newTableMeta(NonTargetLengthDto.class, NonTargetLengthDto.PROPERTY_PICTURES_REFERENCES, false));
    
    94 95
     
    
    95 96
             initModel(ui, metas);