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

Commits:

7 changed files:

Changes:

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

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

  • client-core/src/main/i18n/templates/dataSourceInformation_fr_FR.ftl
    ... ... @@ -36,7 +36,7 @@
    36 36 
         <#else>
    37 37 
           <li><strong>URL du service web : </strong>${configuration.serverUrl}</li>
    38 38 
           <li><strong>Utilisateur : </strong>${configuration.login}</li>
    39 
    -      <#if configuration.optionalDatabaseName.present??>
    39 
    +      <#if configuration.withDatabaseName()>
    40 40 
             <li><strong>Alias de la base : </strong>${configuration.optionalDatabaseName.get()}</li>
    41 41 
           </#if>
    42 42 
         </#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;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    -import java.util.ArrayList;
    25 
    +import java.util.Comparator;
    26 26 
     import java.util.Date;
    27 27 
     import java.util.List;
    28 
    -import java.util.Map;
    29 
    -import java.util.TreeMap;
    30 28 
     import java.util.concurrent.TimeUnit;
    29 
    +import java.util.stream.Collectors;
    31 30
    32 31 
     public class TripLonglineHelper extends GeneratedTripLonglineHelper {
    33 32
    34 33 
         public static List<TripLonglineReference> sort(List<TripLonglineReference> data) {
    35 
    -        Map<Object, TripLonglineReference> map = new TreeMap<>();
    36 
    -        for (TripLonglineReference datum : data) {
    37 
    -            map.put(datum.getStartDate(), datum);
    38 
    -        }
    39 
    -        return new ArrayList<>(map.values());
    34 
    +        return data
    35 
    +                .stream()
    36 
    +                .sorted(Comparator.comparing(TripLonglineReference::getStartDate)
    37 
    +                                .thenComparing(TripLonglineReference::getEndDate)
    38 
    +                                .thenComparing(TripLonglineReference::getVesselLabel))
    39 
    +                .collect(Collectors.toList());
    40 40 
         }
    41 41
    42 42 
         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;
    22 22 
      * #L%
    23 23 
      */
    24 24
    25 
    -import java.util.ArrayList;
    25 
    +import java.util.Comparator;
    26 26 
     import java.util.List;
    27 
    -import java.util.Map;
    28 
    -import java.util.TreeMap;
    27 
    +import java.util.stream.Collectors;
    29 28
    30 29 
     public class TripSeineHelper extends GeneratedTripSeineHelper {
    31 30
    32 31 
         public static List<TripSeineReference> sort(List<TripSeineReference> data) {
    33 
    -        Map<Object, TripSeineReference> map = new TreeMap<>();
    34 
    -        for (TripSeineReference datum : data) {
    35 
    -            map.put(datum.getStartDate(), datum);
    36 
    -        }
    37 
    -        return new ArrayList<>(map.values());
    32 
    +        return data
    33 
    +                .stream()
    34 
    +                .sorted(Comparator.comparing(TripSeineReference::getStartDate)
    35 
    +                                .thenComparing(TripSeineReference::getEndDate)
    36 
    +                                .thenComparing(TripSeineReference::getVesselLabel))
    37 
    +                .collect(Collectors.toList());
    38 38 
         }
    39 39 
     }

  • persistence/src/main/java/fr/ird/observe/entities/data/ll/common/TripLonglineTopiaDao.java
    ... ... @@ -26,7 +26,6 @@ import com.google.common.collect.Lists;
    26 26 
     import fr.ird.observe.dto.data.TripMapPoint;
    27 27 
     import fr.ird.observe.dto.data.TripMapPointType;
    28 28 
     import fr.ird.observe.entities.referential.common.Harbour;
    29 
    -import fr.ird.observe.entities.referential.common.Program;
    30 29 
     import org.nuiton.topia.persistence.support.TopiaSqlQuery;
    31 30 
     import org.nuiton.topia.persistence.support.TopiaSqlSupport;
    32 31 
     import org.nuiton.util.DateUtil;
    ... ... @@ -50,21 +49,6 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl
    50 49 
         //FIXME-PROTECTED-ID
    51 50 
         public static final String ACTIVITY_LOGBOOK_STATION_ID= "fr.ird.referential.ll.common.VesselActivityLongline#1239832686138#0.3";
    52 51
    53 
    -    public int findPositionByProgramId(String programId, String tripId) {
    54 
    -        int result = 0;
    55 
    -        //FIXME Bien vérifier que cela fonctionne
    56 
    -        List<TripLongline> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()).findAll();
    57 
    -        for (TripLongline e : list) {
    58 
    -            if (tripId.equals(e.getTopiaId())) {
    59 
    -                return result;
    60 
    -            }
    61 
    -            result++;
    62 
    -        }
    63 
    -
    64 
    -        // not found
    65 
    -        return -1;
    66 
    -    }
    67 
    -
    68 52 
         public LinkedHashSet<TripMapPoint> extractTripMapActivityPoints(String tripId, boolean addObservation, boolean addLogbook) {
    69 53
    70 54 
             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;
    25 25 
     import fr.ird.observe.dto.data.TripMapPointType;
    26 26 
     import fr.ird.observe.dto.data.ps.SchoolType;
    27 27 
     import fr.ird.observe.entities.referential.common.Harbour;
    28 
    -import fr.ird.observe.entities.referential.common.Program;
    29 28 
     import org.nuiton.topia.persistence.support.TopiaSqlQuery;
    30 29 
     import org.nuiton.topia.persistence.support.TopiaSqlSupport;
    31 30 
     import org.nuiton.util.DateUtil;
    ... ... @@ -36,7 +35,6 @@ import java.sql.ResultSet;
    36 35 
     import java.sql.SQLException;
    37 36 
     import java.util.Date;
    38 37 
     import java.util.LinkedHashSet;
    39 
    -import java.util.List;
    40 38
    41 39 
     /**
    42 40 
      * Add some user methods.
    ... ... @@ -48,21 +46,6 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> {
    48 46 
         //FIXME-PROTECTED-ID
    49 47 
         public static final String ACTIVITY_HARBOUR_ID= "fr.ird.referential.ps.common.VesselActivitySeine#1239832675349#0.363119635949572";
    50 48
    51 
    -    public int findPositionByProgramId(String programId, String tripId) {
    52 
    -        int result = 0;
    53 
    -        //FIXME Bien vérifier que cela fonctionne
    54 
    -        List<TripSeine> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()).findAll();
    55 
    -        for (TripSeine e : list) {
    56 
    -            if (tripId.equals(e.getTopiaId())) {
    57 
    -                return result;
    58 
    -            }
    59 
    -            result++;
    60 
    -        }
    61 
    -
    62 
    -        // not found
    63 
    -        return -1;
    64 
    -    }
    65 
    -
    66 49 
         public LinkedHashSet<TripMapPoint> extractTripMapActivityPoints(String tripId) {
    67 50
    68 51 
             TripSeine tripSeine = forTopiaIdEquals(tripId).findUnique();

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.