This is an automated email from the git hooks/post-receive script. New commit to branch feature/8429 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 6035bd0df1eb1d03428e59561f1fab6607ba4388 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Nov 14 09:11:25 2016 +0100 Ajout de Program.tripCount pour optimiser le chargement dans l'arbre de naigation --- .../observe/entities/referentiel/ProgramImpl.java | 16 +++++++++++++--- .../entities/referentiel/ProgramTopiaDao.java | 3 +++ entities/src/main/xmi/observe-common.zargo | Bin 45678 -> 45811 bytes .../ReferentialReferenceSetDefinitions.java | 3 ++- .../src/main/xmi/observe-services-dto-common.zargo | Bin 48945 -> 49022 bytes .../topia/binder/referential/ProgramBinder.java | 9 ++++++--- 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java index 559da72..7cc5f0a 100644 --- a/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java +++ b/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java @@ -26,16 +26,26 @@ public class ProgramImpl extends ProgramAbstract { private static final long serialVersionUID = 3546129729498396258L; + /** Nombre de marées rattaché à ce programme. */ + private int tripCount; + @Override public String getGearTypePrefix() { - - return gearType==null?null:gearType.getPrefix(); - + return gearType == null ? null : gearType.getPrefix(); } // Nécessaire pour les binders, mais non utilisé2 @Override public void setGearTypePrefix(String gearTypePrefix) { + } + @Override + public int getTripCount() { + return tripCount; + } + + @Override + public void setTripCount(int tripCount) { + this.tripCount = tripCount; } } diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java index 1d64a9c..3e7775a 100644 --- a/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java +++ b/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramTopiaDao.java @@ -73,6 +73,7 @@ public class ProgramTopiaDao extends AbstractProgramTopiaDao<Program> { " p.topiaId," + " p.gearType," + " p." + I18nReferenceEntities.getPropertyName(referenceLocale) + + "(select count(*) from observe_seine.trip t where t.program = p.id) + (select count(*) from observe_longline.trip t where t.program = p.id) "+ " FROM observe_common.program p" + " WHERE " + " p.topiaId = ?" + @@ -111,6 +112,8 @@ public class ProgramTopiaDao extends AbstractProgramTopiaDao<Program> { String label = set.getString(3); I18nReferenceEntities.setLabel(referenceLocale, program, label); + int tripCount = set.getInt(4); + program.setTripCount(tripCount); return program; } diff --git a/entities/src/main/xmi/observe-common.zargo b/entities/src/main/xmi/observe-common.zargo index 17d14db..c552da6 100644 Binary files a/entities/src/main/xmi/observe-common.zargo and b/entities/src/main/xmi/observe-common.zargo differ diff --git a/services-dto-reference/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java b/services-dto-reference/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java index 730e61c..7baf5fe 100644 --- a/services-dto-reference/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java +++ b/services-dto-reference/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java @@ -151,7 +151,8 @@ public enum ReferentialReferenceSetDefinitions { PROGRAM(newDefinitionBuilder(ProgramDto.class) .addProperty(GearType.class, ProgramDto.PROPERTY_GEAR_TYPE) - .addProperty(String.class, ProgramDto.PROPERTY_GEAR_TYPE_PREFIX)), + .addProperty(String.class, ProgramDto.PROPERTY_GEAR_TYPE_PREFIX) + .addProperty(int.class, ProgramDto.PROPERTY_TRIP_COUNT)), SEX(newDefaultDefinitionBuilder(SexDto.class)), diff --git a/services-dto/src/main/xmi/observe-services-dto-common.zargo b/services-dto/src/main/xmi/observe-services-dto-common.zargo index 9a4b98d..9a74931 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-common.zargo and b/services-dto/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ProgramBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ProgramBinder.java index 6f707dc..f6b8293 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ProgramBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ProgramBinder.java @@ -61,6 +61,7 @@ public class ProgramBinder extends ReferentialBinderSupport<Program, ProgramDto> entity.setStartDate(dto.getStartDate()); entity.setEndDate(dto.getEndDate()); entity.setComment(dto.getComment()); + entity.setTripCount(dto.getTripCount()); } @@ -85,7 +86,7 @@ public class ProgramBinder extends ReferentialBinderSupport<Program, ProgramDto> dto.setStartDate(entity.getStartDate()); dto.setEndDate(entity.getEndDate()); dto.setComment(entity.getComment()); - + dto.setTripCount(entity.getTripCount()); } @Override @@ -94,7 +95,8 @@ public class ProgramBinder extends ReferentialBinderSupport<Program, ProgramDto> return toReferentialReference(entity, getLabel(referentialLocale, entity), GEAR_TYPE_TO_DTO.apply(entity.getGearType()), - entity.getGearTypePrefix()); + entity.getGearTypePrefix(), + entity.getTripCount()); } @@ -104,7 +106,8 @@ public class ProgramBinder extends ReferentialBinderSupport<Program, ProgramDto> return toReferentialReference(dto, getLabel(referentialLocale, dto), dto.getGearType(), - dto.getGearTypePrefix()); + dto.getGearTypePrefix(), + dto.getTripCount()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.