[Git][ultreiaio/ird-observe][develop] 3 commits: Les informations sur la source de données ne peuvent pa être affichées - Closes #1186 - Observe-commits

2 Jan 2019


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


Commits:
cde737d5 by tchemit at 2019-01-02T14:41:00Z
Les informations sur la source de données ne peuvent pa être affichées - Closes #1186

- - - - -
d0cd3c4b by tchemit at 2019-01-02T14:42:59Z
[PS] Marées non visibles dans l'arbre après insertion - Closes #1187

- - - - -
ef398d0a by tchemit at 2019-01-02T14:45:12Z
Déplacement de marée intempestif dans l'arbre - Closes #1189

- - - - -


7 changed files:

- client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl
- client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl
- client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl
- dto/src/main/java/fr/ird/observe/dto/data/ll/common/TripLonglineHelper.java
- dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripSeineHelper.java
- persistence/src/main/java/fr/ird/observe/entities/data/ll/common/TripLonglineTopiaDao.java
- persistence/src/main/java/fr/ird/observe/entities/data/ps/common/TripSeineTopiaDao.java


Changes:

=====================================
client-core/src/main/i18n/templates/dataSourceInformation_en_GB.ftl
=====================================
@@ -36,7 +36,7 @@
     <#else>
       <li><strong>Web service url: </strong>${configuration.serverUrl}</li>
       <li><strong>User: </strong>${configuration.login}</li>
-      <#if configuration.optionalDatabaseName.present??>
+      <#if configuration.withDatabaseName()>
         <li><strong>Database alias: </strong>${configuration.optionalDatabaseName.get()}</li>
       </#if>
     </#if>


=====================================
client-core/src/main/i18n/templates/dataSourceInformation_es_ES.ftl
=====================================
@@ -36,7 +36,7 @@
     <#else>
       <li><strong>URL del servicio web: </strong>${configuration.serverUrl}</li>
       <li><strong>Usuario: </strong>${configuration.login}</li>
-      <#if configuration.optionalDatabaseName.present??>
+      <#if configuration.withDatabaseName()>
         <li><strong>Alias de la base: </strong>${configuration.optionalDatabaseName.get()}</li>
       </#if>
     </#if>


=====================================
client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl
=====================================
@@ -36,7 +36,7 @@
     <#else>
       <li><strong>URL du service web : </strong>${configuration.serverUrl}</li>
       <li><strong>Utilisateur : </strong>${configuration.login}</li>
-      <#if configuration.optionalDatabaseName.present??>
+      <#if configuration.withDatabaseName()>
         <li><strong>Alias de la base : </strong>${configuration.optionalDatabaseName.get()}</li>
       </#if>
     </#if>


=====================================
dto/src/main/java/fr/ird/observe/dto/data/ll/common/TripLonglineHelper.java
=====================================
@@ -22,21 +22,21 @@ package fr.ird.observe.dto.data.ll.common;
  * #L%
  */
 
-import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 public class TripLonglineHelper extends GeneratedTripLonglineHelper {
 
     public static List<TripLonglineReference> sort(List<TripLonglineReference> data) {
-        Map<Object, TripLonglineReference> map = new TreeMap<>();
-        for (TripLonglineReference datum : data) {
-            map.put(datum.getStartDate(), datum);
-        }
-        return new ArrayList<>(map.values());
+        return data
+                .stream()
+                .sorted(Comparator.comparing(TripLonglineReference::getStartDate)
+                                .thenComparing(TripLonglineReference::getEndDate)
+                                .thenComparing(TripLonglineReference::getVesselLabel))
+                .collect(Collectors.toList());
     }
 
     public static int createNoOfDay(Date startDate, Date endDate) {


=====================================
dto/src/main/java/fr/ird/observe/dto/data/ps/common/TripSeineHelper.java
=====================================
@@ -22,18 +22,18 @@ package fr.ird.observe.dto.data.ps.common;
  * #L%
  */
 
-import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
+import java.util.stream.Collectors;
 
 public class TripSeineHelper extends GeneratedTripSeineHelper {
 
     public static List<TripSeineReference> sort(List<TripSeineReference> data) {
-        Map<Object, TripSeineReference> map = new TreeMap<>();
-        for (TripSeineReference datum : data) {
-            map.put(datum.getStartDate(), datum);
-        }
-        return new ArrayList<>(map.values());
+        return data
+                .stream()
+                .sorted(Comparator.comparing(TripSeineReference::getStartDate)
+                                .thenComparing(TripSeineReference::getEndDate)
+                                .thenComparing(TripSeineReference::getVesselLabel))
+                .collect(Collectors.toList());
     }
 }


=====================================
persistence/src/main/java/fr/ird/observe/entities/data/ll/common/TripLonglineTopiaDao.java
=====================================
@@ -26,7 +26,6 @@ import com.google.common.collect.Lists;
 import fr.ird.observe.dto.data.TripMapPoint;
 import fr.ird.observe.dto.data.TripMapPointType;
 import fr.ird.observe.entities.referential.common.Harbour;
-import fr.ird.observe.entities.referential.common.Program;
 import org.nuiton.topia.persistence.support.TopiaSqlQuery;
 import org.nuiton.topia.persistence.support.TopiaSqlSupport;
 import org.nuiton.util.DateUtil;
@@ -50,21 +49,6 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl
     //FIXME-PROTECTED-ID
     public static final String ACTIVITY_LOGBOOK_STATION_ID= "fr.ird.referential.ll.common.VesselActivityLongline#1239832686138#0.3";
 
-    public int findPositionByProgramId(String programId, String tripId) {
-        int result = 0;
-        //FIXME Bien vérifier que cela fonctionne
-        List<TripLongline> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()).findAll();
-        for (TripLongline e : list) {
-            if (tripId.equals(e.getTopiaId())) {
-                return result;
-            }
-            result++;
-        }
-
-        // not found
-        return -1;
-    }
-
     public LinkedHashSet<TripMapPoint> extractTripMapActivityPoints(String tripId, boolean addObservation, boolean addLogbook) {
 
         TripLongline tripLongline = forTopiaIdEquals(tripId).findUnique();


=====================================
persistence/src/main/java/fr/ird/observe/entities/data/ps/common/TripSeineTopiaDao.java
=====================================
@@ -25,7 +25,6 @@ import fr.ird.observe.dto.data.TripMapPoint;
 import fr.ird.observe.dto.data.TripMapPointType;
 import fr.ird.observe.dto.data.ps.SchoolType;
 import fr.ird.observe.entities.referential.common.Harbour;
-import fr.ird.observe.entities.referential.common.Program;
 import org.nuiton.topia.persistence.support.TopiaSqlQuery;
 import org.nuiton.topia.persistence.support.TopiaSqlSupport;
 import org.nuiton.util.DateUtil;
@@ -36,7 +35,6 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.Date;
 import java.util.LinkedHashSet;
-import java.util.List;
 
 /**
  * Add some user methods.
@@ -48,21 +46,6 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> {
     //FIXME-PROTECTED-ID
     public static final String ACTIVITY_HARBOUR_ID= "fr.ird.referential.ps.common.VesselActivitySeine#1239832675349#0.363119635949572";
 
-    public int findPositionByProgramId(String programId, String tripId) {
-        int result = 0;
-        //FIXME Bien vérifier que cela fonctionne
-        List<TripSeine> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()).findAll();
-        for (TripSeine e : list) {
-            if (tripId.equals(e.getTopiaId())) {
-                return result;
-            }
-            result++;
-        }
-
-        // not found
-        return -1;
-    }
-
     public LinkedHashSet<TripMapPoint> extractTripMapActivityPoints(String tripId) {
 
         TripSeine tripSeine = forTopiaIdEquals(tripId).findUnique();



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

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

    

[Git][ultreiaio/ird-observe][develop] 3 commits: Les informations sur la source de données ne peuvent pa être affichées - Closes #1186

Tony CHEMIT

tags

participants (1)