| 320,15 → 320,16 |
|---|
| StructureConservation conservationCollectee = (StructureConservation) conservation.cloner(new StructureConservation()); |
| |
| // FORMATION |
| if (formationMarkRGrpChp.getValue() != null) { |
| conservationCollectee.setFormation(formationMarkRGrpChp.getValue().getValueAttribute()); |
| } |
| conservationCollectee.setFormation(formationMarkRGrpChp.getValue() == null ? |
| null : |
| formationMarkRGrpChp.getValue().getValueAttribute()); |
| |
| // FORMATION INFO |
| conservationCollectee.setFormationInfo(formationChp.getValue()); |
| // FORMATION INTERET |
| if (interetFormationMarkRGrpChp.getValue() != null) { |
| conservationCollectee.setFormationInteret(interetFormationMarkRGrpChp.getValue().getValueAttribute()); |
| } |
| conservationCollectee.setFormationInteret(interetFormationMarkRGrpChp.getValue() == null ? |
| null : |
| interetFormationMarkRGrpChp.getValue().getValueAttribute()); |
| |
| // STOCKAGE LOCAL |
| conservationCollectee.setStockageLocal(creerChaineDenormalisee(localStockageTrukCacGrpChp.getValues())); |
| 484,11 → 485,16 |
|---|
| if (formulaireCourant.mode.equals(Formulaire.MODE_MODIFIER) && conservation != null) { |
| // FORMATION |
| // Bouton oui, à toujours l'index 0 donc on teste en fonction... |
| ((Radio) formationMarkRGrpChp.get((conservation.getFormation().equals("1") ? 0 : 1))).setValue(true); |
| if(conservation.getFormation() != null) { |
| ((Radio) formationMarkRGrpChp.get(conservation.getFormation())).setValue(true); |
| } |
| |
| // FORMATION INFO |
| formationChp.setValue(conservation.getFormationInfo()); |
| // FORMATION INTERET |
| ((Radio) interetFormationMarkRGrpChp.get((conservation.getFormationInteret().equals("1") ? 0 : 1))).setValue(true); |
| if(conservation.getFormationInteret() != null) { |
| ((Radio) interetFormationMarkRGrpChp.get(conservation.getFormationInteret())).setValue(true); |
| } |
| |
| // STOCKAGE LOCAL |
| peuplerCasesACocher(conservation.getStockageLocal(), localStockageTrukCacGrpChp,localStockageAutreChp); |