[Git][ultreiaio/ird-observe][develop] 2 commits: [PS][FOB] Le calcul du type simplifié et des propriétés maillant/biodégradable...

22 Apr 2019


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


Commits:
7cf97303 by tchemit at 2019-04-22T11:16:19Z
[PS][FOB] Le calcul du type simplifié et des propriétés maillant/biodégradable ne se fait pas en passant l'algorithme de calcul - Closes #1268

- - - - -
2b31018f by tchemit at 2019-04-22T11:20:15Z
Try to fix navigation tree cell renderer

- - - - -


5 changed files:

- client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java
- persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/ActivitySeineImpl.java
- persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/ActivitySeines.java
- persistence/src/main/models/Observe-20-data-ps-observation.model
- services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java


Changes:

=====================================
client-core/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTreeCellRenderer.java
=====================================
@@ -26,6 +26,7 @@ import fr.ird.observe.client.ui.tree.navigation.nodes.NavigationTreeNodeSupport;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jdesktop.swingx.renderer.StringValue;
+import org.jdesktop.swingx.tree.DefaultXTreeCellRenderer;
 
 import javax.swing.Icon;
 import javax.swing.JLabel;
@@ -41,7 +42,7 @@ import java.awt.Dimension;
  * @author Tony Chemit - dev@tchemit.fr
  * @since 6.0
  */
-public class NavigationTreeCellRenderer extends DefaultTreeCellRenderer implements StringValue {
+public class NavigationTreeCellRenderer extends DefaultXTreeCellRenderer implements StringValue {
 
     /** Logger */
     private static final Logger log = LogManager.getLogger(NavigationTreeCellRenderer.class);


=====================================
persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/ActivitySeineImpl.java
=====================================
@@ -37,11 +37,6 @@ public class ActivitySeineImpl extends ActivitySeineAbstract {
 
     private static final String PROPERTY_CHANGED_ZONE_OPERATION = "changedZoneOperation";
 
-    @Override
-    public boolean isDCPOperation() {
-        return vesselActivitySeine != null && ActivitySeines.DCP_OPERATIONS.contains(vesselActivitySeine.getCode());
-    }
-
     @Override
     public boolean isSetOperation() {
         return vesselActivitySeine != null && ActivitySeines.CALEE_OPERATIONS.contains(vesselActivitySeine.getCode());


=====================================
persistence/src/main/java/fr/ird/observe/entities/data/ps/observation/ActivitySeines.java
=====================================
@@ -57,8 +57,6 @@ public class ActivitySeines {
     public static final String ACTIVITY_FIN_DE_PECHE = "6";
     public static final List<String> CALEE_OPERATIONS = Collections.singletonList(ACTIVITY_FIN_DE_PECHE);
     public static final String ACTIVITY_CHANGED_ZONE = "21";
-    public static final List<String> DCP_OPERATIONS = Arrays.asList("13", "14", "15");
-
 
     /** Logger. */
     private static final Logger log = LogManager.getLogger(ActivitySeines.class);


=====================================
persistence/src/main/models/Observe-20-data-ps-observation.model
=====================================
@@ -31,7 +31,6 @@ currentFpaZone {*:0..1} referential.common.FpaZone
 previousFpaZone {*:0..1} referential.common.FpaZone
 nextFpaZone {*:0..1} referential.common.FpaZone
 dataQuality {*:0..1} referential.common.DataQuality
-isDCPOperation() boolean
 isSetOperation() boolean
 isObservedSystemOperation() boolean
 getSchoolType() !fr.ird.observe.dto.data.ps.SchoolType


=====================================
services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java
=====================================
@@ -227,9 +227,10 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements
 
                 String activityPrefix = String.format("%s - Activity [%s/%s] ", routePrefix, ++activityIndex, activityMax);
 
-                if (!activitySeine.isSetOperation() && !activitySeine.isDCPOperation()) {
-                    log.info(String.format("%s Skip activity (No set nor dcp): %s", activityPrefix, activitySeine.getTopiaId()));
-                    continue;
+                boolean floatingObjectEmpty = activitySeine.isFloatingObjectEmpty();
+                if (!activitySeine.isSetOperation() && floatingObjectEmpty) {
+                        log.info(String.format("%s Skip activity (No set nor dcp found): %s", activityPrefix, activitySeine.getTopiaId()));
+                        continue;
                 }
 
                 ConsolidateActivitySeineDataResultBuilder resultBuilder = new ConsolidateActivitySeineDataResultBuilder(applicationLocale, referenceLocale, activitySeine.getTopiaId(), ActivitySeines.decorate(referenceLocale.ordinal(), activitySeine));



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b135087c920de7be5f49e078e75...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/b135087c920de7be5f49e078e75...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT

tags

participants (1)