Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 5492b59e by tchemit at 2018-12-31T20:52:40Z Les informations sur la source de données ne peuvent pa être affichées - Closes #1186 - - - - - defa2ca0 by tchemit at 2018-12-31T21:22:19Z Déplacement de marée intempestif dans l'arbre - Closes #1189 - - - - - 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: ===================================== 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> ===================================== persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java ===================================== @@ -48,8 +48,9 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl 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(); + List<TripLongline> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()) + .setOrderByArguments(TripLongline.PROPERTY_START_DATE + " ASC") + .findAll(); for (TripLongline e : list) { if (tripId.equals(e.getTopiaId())) { return result; ===================================== persistence/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java ===================================== @@ -50,8 +50,9 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { 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(); + List<TripSeine> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()) + .setOrderByArguments(TripSeine.PROPERTY_START_DATE + " ASC") + .findAll(); for (TripSeine e : list) { if (tripId.equals(e.getTopiaId())) { return result; View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9171243371ca8f725b03ed3cc84... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/9171243371ca8f725b03ed3cc84... You're receiving this email because of your account on gitlab.com.