Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
-
a037ee9d
by tchemit at 2019-06-27T05:06:00Z
1 changed file:
Changes:
| ... | ... | @@ -43,7 +43,6 @@ import fr.ird.observe.dto.data.seine.FloatingObjectReference; |
| 43 | 43 |
import fr.ird.observe.dto.data.seine.ObjectMaterialHierarchyDto;
|
| 44 | 44 |
import fr.ird.observe.dto.form.Form;
|
| 45 | 45 |
import fr.ird.observe.dto.referential.seine.ObjectMaterialDto;
|
| 46 |
-import fr.ird.observe.dto.referential.seine.ObjectMaterialTypeReference;
|
|
| 47 | 46 |
import fr.ird.observe.dto.referential.seine.ObjectOperationReference;
|
| 48 | 47 |
import fr.ird.observe.dto.result.SaveResultDto;
|
| 49 | 48 |
import fr.ird.observe.services.service.actions.consolidate.dcp.ConsolidateFloatingObjectRequest;
|
| ... | ... | @@ -310,12 +309,6 @@ public class FloatingObjectUIHandler extends ContentUIHandler<FloatingObjectDto, |
| 310 | 309 |
|
| 311 | 310 |
ObjectMaterialHierarchyDto detailedForm = getFloatingObjectService().getObjectMaterialHierarchy();
|
| 312 | 311 |
|
| 313 |
- ObjectMaterialTypeReference booleanType = getReferentialReferences(ObjectMaterialTypeReference.class).stream().filter(e -> e.getTopiaId().equals("fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0")).findFirst().orElseThrow(IllegalStateException::new);
|
|
| 314 |
- for (ObjectMaterialHierarchyDto objectMaterialHierarchyDto : detailedForm.getChildren()) {
|
|
| 315 |
- if (objectMaterialHierarchyDto.isEnabled()) {
|
|
| 316 |
- objectMaterialHierarchyDto.setObjectMaterialType(booleanType);
|
|
| 317 |
- }
|
|
| 318 |
- }
|
|
| 319 | 312 |
Map<String, ObjectMaterialDto> allMap = new TreeMap<>();
|
| 320 | 313 |
detailedForm.getAllDtos().forEach(s -> allMap.putIfAbsent(s.getId(), s));
|
| 321 | 314 |
|