Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
03b6f290
by Tony Chemit at 2020-06-27T19:16:58+02:00
1 changed file:
Changes:
| ... | ... | @@ -236,27 +236,24 @@ public class CatchUIHandler extends ContentTableUIHandler<SetCatchDto, CatchDto, |
| 236 | 236 |
switch (newMode) {
|
| 237 | 237 |
case GROUPED:
|
| 238 | 238 |
if (createMode) {
|
| 239 |
-// editBean.setTotalWeight(null);
|
|
| 240 |
-// editBean.setWeightMeasureMethod(null);
|
|
| 241 | 239 |
editBean.setCount(null);
|
| 242 | 240 |
editBean.setTagNumber(null);
|
| 241 |
+ editBean.setNumber(null);
|
|
| 243 | 242 |
}
|
| 244 | 243 |
break;
|
| 245 | 244 |
case INDIVIDUAL:
|
| 246 | 245 |
if (createMode) {
|
| 247 |
- editBean.setTotalWeight(null);
|
|
| 248 |
- editBean.setWeightMeasureMethod(null);
|
|
| 249 |
- |
|
| 250 |
- // on positionne le count à 1 (seule valeur possible)
|
|
| 246 |
+ // This is the only possible value
|
|
| 251 | 247 |
editBean.setCount(1);
|
| 252 | 248 |
}
|
| 253 | 249 |
break;
|
| 254 | 250 |
}
|
| 255 | 251 |
|
| 256 | 252 |
boolean isGrouped = CatchAcquisitionMode.GROUPED.equals(newMode);
|
| 257 |
- ui.getTotalWeight().setEnabled(isGrouped);
|
|
| 258 |
- ui.getWeightMeasureMethod().setEnabled(isGrouped);
|
|
| 253 |
+ boolean isIndividual = !isGrouped;
|
|
| 259 | 254 |
ui.getCount().setEnabled(isGrouped);
|
| 255 |
+ ui.getNumber().setEnabled(isIndividual);
|
|
| 256 |
+ ui.getTagNumber().setEnabled(isIndividual);
|
|
| 260 | 257 |
}
|
| 261 | 258 |
|
| 262 | 259 |
private void setTableModelCreate(Boolean oldValue, Boolean newValue) {
|