Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 1663a048 by Tony CHEMIT at 2017-08-03T00:20:50+02:00 improve user configuration actions - - - - - a2029feb by Tony CHEMIT at 2017-08-03T00:21:26+02:00 Ajout de la consolidation des dcp (See #810) - fix some bugs to make this works... - - - - - 6 changed files: - client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java - client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java - client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/SimplifiedObjectTypeManager.java Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseRemoteConfigurationUIAction.java @@ -78,7 +78,9 @@ public class UseRemoteConfigurationUIAction extends AbstractUIAction { SwingUtilities.invokeLater(() -> { configUI.getTestRemoteAction().doClick(); if (ConnexionStatus.SUCCESS == configUI.getModel().getConnexionStatus()) { - parentContainer.getNextAction().doClick(); + if (parentContainer.getModel().getNextStep()!=null) { + parentContainer.getNextAction().doClick(); + } if (getMainUI() != null) { parentContainer.getApplyAction().doClick(); } ===================================== client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java +++ b/client/src/main/java/fr/ird/observe/client/ui/actions/storage/UseServerConfigurationUIAction.java @@ -79,7 +79,9 @@ public class UseServerConfigurationUIAction extends AbstractUIAction { SwingUtilities.invokeLater(() -> { configUI.getTestRemoteAction().doClick(); if (ConnexionStatus.SUCCESS == configUI.getModel().getConnexionStatus()) { - parentContainer.getNextAction().doClick(); + if (parentContainer.getModel().getNextStep() != null) { + parentContainer.getNextAction().doClick(); + } if (getMainUI() != null) { parentContainer.getApplyAction().doClick(); } ===================================== client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java +++ b/client/src/main/java/fr/ird/observe/client/ui/content/impl/seine/FloatingObjectUIModel.java @@ -30,6 +30,7 @@ import fr.ird.observe.common.constants.seine.DcpComputedValue; import fr.ird.observe.services.binder.ReferenceBinderEngine; import fr.ird.observe.services.dto.FloatingObjectReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.form.Form; import fr.ird.observe.services.dto.referential.seine.ObjectMaterialDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.FloatingObjectPartDto; @@ -136,6 +137,9 @@ public class FloatingObjectUIModel extends ContentUIModel<FloatingObjectDto> { public void reset() { whenArriving.clear(); whenLeaving.clear(); + firePropertyChange("computedBiodegradableValue", getComputedBiodegradableValue()); + firePropertyChange("computedNonEntanglingValue", getComputedNonEntanglingValue()); + firePropertyChange("computedSimplifiedObjectTypeValue", getComputedSimplifiedObjectTypeValue()); } public Map<ObjectMaterialDto, String> getWhenArriving() { ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java @@ -84,7 +84,7 @@ public class ConsolidateActivitySeineDataResultBuilder { void flushDcpModification(FloatingObject dcp, String... propertyNamesModified) { - String dcpLabel = activitySeine.getVesselActivitySeine().getLabel2() + "[" + activitySeine.getTime() + "]" + " - " + dcp.getObjectOperation().getLabel2(); + String dcpLabel = activitySeine.getVesselActivitySeine().getLabel2() + "[" + activitySeine.getTime() + "]" + " - " + (dcp.getObjectOperation() == null ? "" : dcp.getObjectOperation().getLabel2()); for (String modifiedProperty : propertyNamesModified) { switch (modifiedProperty) { case FloatingObject.PROPERTY_COMPUTED_BIODEGRADABLE: { ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java @@ -131,9 +131,9 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements for (ActivitySeine activitySeine : route.getActivitySeine()) { - if (!activitySeine.isSetOperation()) { + if (!activitySeine.isSetOperation() && !activitySeine.isDCPOperation()) { if (log.isDebugEnabled()) { - log.debug("No set on activity " + activitySeine); + log.debug("No set nor dcp on activity " + activitySeine); } continue; } ===================================== services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/SimplifiedObjectTypeManager.java ===================================== --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/SimplifiedObjectTypeManager.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/SimplifiedObjectTypeManager.java @@ -59,6 +59,10 @@ class SimplifiedObjectTypeManager { // get highest level first availableNodes.sort(Comparator.comparing(SimplifiedObjectTypeNode::getLevel).reversed()); + if (availableNodes.isEmpty()) { + return getNodeForStandardCode("FOB").getStandardCode(); + } + // remove from available nodes, all nodes in the path of other ones List<SimplifiedObjectTypeNode> mainNodes = new LinkedList<>(availableNodes); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4c44fbe53bca2b03b3d226c4474... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/4c44fbe53bca2b03b3d226c4474... You're receiving this email because of your account on gitlab.com.