Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
5 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
- persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java
- persistence/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java
Changes:
| ... | ... | @@ -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>
|
| ... | ... | @@ -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>
|
| ... | ... | @@ -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>
|
| ... | ... | @@ -48,8 +48,9 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl |
| 48 | 48 |
|
| 49 | 49 |
public int findPositionByProgramId(String programId, String tripId) {
|
| 50 | 50 |
int result = 0;
|
| 51 |
- //FIXME Bien vérifier que cela fonctionne
|
|
| 52 |
- List<TripLongline> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()).findAll();
|
|
| 51 |
+ List<TripLongline> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique())
|
|
| 52 |
+ .setOrderByArguments(TripLongline.PROPERTY_START_DATE + " ASC")
|
|
| 53 |
+ .findAll();
|
|
| 53 | 54 |
for (TripLongline e : list) {
|
| 54 | 55 |
if (tripId.equals(e.getTopiaId())) {
|
| 55 | 56 |
return result;
|
| ... | ... | @@ -50,8 +50,9 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { |
| 50 | 50 |
|
| 51 | 51 |
public int findPositionByProgramId(String programId, String tripId) {
|
| 52 | 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();
|
|
| 53 |
+ List<TripSeine> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique())
|
|
| 54 |
+ .setOrderByArguments(TripSeine.PROPERTY_START_DATE + " ASC")
|
|
| 55 |
+ .findAll();
|
|
| 55 | 56 |
for (TripSeine e : list) {
|
| 56 | 57 |
if (tripId.equals(e.getTopiaId())) {
|
| 57 | 58 |
return result;
|