branch develop updated (0ae63be -> 7d68bea)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 0ae63be Action/calculer les données : sélection de la marée par défaut (Fixes #2893) new d4ee717 Remontée des identifiants de type d'activité new 5f545dc Chargement des sous formulaires en adéquation avec le type d'activité bateau (LL) new 7d68bea [LL] Piloter les fonctions/formulaires disponibles en fonction du type d'activité choisi (Fixes #6702) Merge branch 'feature/6702' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7d68bea7bc9099a7c40f83a0a23f9459504aab6c Merge: 0ae63be 5f545dc Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 15:16:37 2016 +0200 [LL] Piloter les fonctions/formulaires disponibles en fonction du type d'activité choisi (Fixes #6702) Merge branch 'feature/6702' into develop commit 5f545dc51ecd49a739484d63b6640e92d5487ed5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 15:15:51 2016 +0200 Chargement des sous formulaires en adéquation avec le type d'activité bateau (LL) commit d4ee7172fe78d39e64bc6e4677a876eb223a90eb Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 15:14:49 2016 +0200 Remontée des identifiants de type d'activité Summary of changes: .../loadors/ActivityLonglineNodeChildLoador.java | 26 +++++++++++++++++----- .../longline/ActivityLonglineTopiaDao.java | 6 ++++- .../entities/seine/ActivitySeineTopiaDao.java | 6 ++++- .../dto/reference/DataReferenceSetDefinitions.java | 2 ++ .../topia/binder/data/ActivityLonglineBinder.java | 2 ++ .../topia/binder/data/ActivitySeineBinder.java | 2 ++ 6 files changed, 37 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit d4ee7172fe78d39e64bc6e4677a876eb223a90eb Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 15:14:49 2016 +0200 Remontée des identifiants de type d'activité --- .../fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java | 6 +++++- .../java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java | 6 +++++- .../observe/services/dto/reference/DataReferenceSetDefinitions.java | 2 ++ .../observe/services/topia/binder/data/ActivityLonglineBinder.java | 2 ++ .../ird/observe/services/topia/binder/data/ActivitySeineBinder.java | 2 ++ 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java index 9245799..b8773f0 100644 --- a/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java +++ b/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java @@ -63,6 +63,7 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A " a.timestamp," + // " a.open," + " a.set," + + " va.topiaId," + " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_longline.activity a, observe_longline.vesselactivity va" + " WHERE " + @@ -82,6 +83,7 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A " a.timestamp," + // " a.open," + " a.set," + + " va.topiaId," + " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_longline.activity a, observe_longline.vesselactivity va" + " WHERE " + @@ -124,7 +126,9 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A } VesselActivityLongline vesselActivity = new VesselActivityLonglineImpl(); - String label = set.getString(4); + String vesselActivityId = set.getString(4); + vesselActivity.setTopiaId(vesselActivityId); + String label = set.getString(5); I18nReferenceEntities.setLabel(referenceLocale,vesselActivity, label); activity.setVesselActivityLongline(vesselActivity); diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java index 1bf95ba..972b41e 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java +++ b/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java @@ -62,6 +62,7 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit " a.topiaId," + " a.time," + " a.set," + + " va.topiaId," + " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_seine.activity a, observe_seine.vesselactivity va" + " WHERE " + @@ -80,6 +81,7 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit " a.topiaId," + " a.time," + " a.set," + + " va.topiaId," + " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + " FROM observe_seine.activity a, observe_seine.vesselactivity va" + " WHERE " + @@ -122,7 +124,9 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit } VesselActivitySeine vesselActivity = new VesselActivitySeineImpl(); - String label = set.getString(4); + String vesselActivityId = set.getString(4); + vesselActivity.setTopiaId(vesselActivityId); + String label = set.getString(5); I18nReferenceEntities.setLabel(referenceLocale, vesselActivity, label); activity.setVesselActivitySeine(vesselActivity); diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java index 023560c..3a336e1 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -97,6 +97,7 @@ public enum DataReferenceSetDefinitions { ACTIVITY_SEINE(newDefinitionBuilder(ActivitySeineDto.class) .addProperty(Date.class, ActivitySeineDto.PROPERTY_TIME) + .addProperty(String.class, ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE + "Id") .addProperty(String.class, ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE) .addProperty(DataReference.class, ActivitySeineDto.PROPERTY_SET_SEINE) ), @@ -129,6 +130,7 @@ public enum DataReferenceSetDefinitions { ACTIVITY_LONGLINE(newDefinitionBuilder(ActivityLonglineDto.class) .addProperty(Date.class, ActivityLonglineDto.PROPERTY_TIME_STAMP) + .addProperty(String.class, ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE + "Id") .addProperty(String.class, ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE) .addProperty(DataReference.class, ActivityLonglineDto.PROPERTY_SET_LONGLINE) ), diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java index 1ec3b38..88ff856 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivityLonglineBinder.java @@ -77,6 +77,7 @@ public class ActivityLonglineBinder extends DataBinderSupport<ActivityLongline, return toDataReference(entity, entity.getTimeStamp(), + entity.getVesselActivityLongline().getTopiaId(), getLabel(referentialLocale, entity.getVesselActivityLongline()), toDataReference(referentialLocale, entity.getSetLongline(), SetLonglineDto.class)); @@ -87,6 +88,7 @@ public class ActivityLonglineBinder extends DataBinderSupport<ActivityLongline, return toDataReference(dto, dto.getTimeStamp(), + dto.getVesselActivityLongline().getId(), getLabel(referentialLocale, dto.getVesselActivityLongline()), dto.getSetLongline()); } diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java index 0e7fcee..9be6227 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/binder/data/ActivitySeineBinder.java @@ -105,6 +105,7 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi return toDataReference(entity, entity.getTime(), + entity.getVesselActivitySeine().getTopiaId(), getLabel(referentialLocale, entity.getVesselActivitySeine()), toDataReference(referentialLocale, entity.getSetSeine(), SetSeineDto.class)); @@ -115,6 +116,7 @@ public class ActivitySeineBinder extends DataBinderSupport<ActivitySeine, Activi return toDataReference(dto, dto.getTime(), + dto.getVesselActivitySeine().getId(), getLabel(referentialLocale, dto.getVesselActivitySeine()), dto.getSetSeine()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 5f545dc51ecd49a739484d63b6640e92d5487ed5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 15:15:51 2016 +0200 Chargement des sous formulaires en adéquation avec le type d'activité bateau (LL) --- .../loadors/ActivityLonglineNodeChildLoador.java | 26 +++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java index 0ea250f..b0b4ad2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/loadors/ActivityLonglineNodeChildLoador.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.tree.loadors; * #L% */ +import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.swing.ui.tree.ActivityLonglineNode; import fr.ird.observe.application.swing.ui.tree.ObserveNode; import fr.ird.observe.application.swing.ui.tree.SetLonglineNode; @@ -30,10 +31,12 @@ import fr.ird.observe.services.dto.longline.ActivityLonglineDto; import fr.ird.observe.services.dto.longline.EncounterDto; import fr.ird.observe.services.dto.longline.SensorUsedDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; +import fr.ird.observe.services.dto.referential.ReferentialReference; +import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; import jaxx.runtime.swing.nav.NavDataProvider; import jaxx.runtime.swing.nav.tree.NavTreeBridge; -import java.util.Arrays; +import java.util.Collections; import java.util.List; import java.util.Objects; @@ -47,6 +50,15 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Cla private static final long serialVersionUID = 1L; + private final static ImmutableSet<String> ENCOUNTERS_ID = ImmutableSet.of( + "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1", // operation de peche + "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.4" // rencontre interaction + ); + private final static ImmutableSet<String> SENSOR_USED_ID = ImmutableSet.of( + "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.1", // operation de peche + "fr.ird.observe.entities.referentiel.longline.VesselActivityLongline#1239832686138#0.3" // station oceanographique + ); + public ActivityLonglineNodeChildLoador() { super(String.class); } @@ -69,15 +81,19 @@ public class ActivityLonglineNodeChildLoador extends AbstractNodeChildLoador<Cla parentNode.add(createSetNode(setLonglineRef)); } - // ajout des autres fils avant la calée - super.loadChilds(model, parentNode, dataProvider); + String vesselActivityId = (String) activityLonglineRef.getPropertyValue(ActivityLonglineDto.PROPERTY_VESSEL_ACTIVITY_LONGLINE + "Id"); + if (ENCOUNTERS_ID.contains(vesselActivityId)) { + parentNode.add(createNode(EncounterDto.class, dataProvider)); + } + if (SENSOR_USED_ID.contains(vesselActivityId)) { + parentNode.add(createNode(SensorUsedDto.class, dataProvider)); + } } @Override public List<Class> getData(Class<?> parentClass, String parentId, NavDataProvider dataService) { - return Arrays.asList(EncounterDto.class, SensorUsedDto.class); - + return Collections.emptyList(); } @Override -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 7d68bea7bc9099a7c40f83a0a23f9459504aab6c Merge: 0ae63be 5f545dc Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 15:16:37 2016 +0200 [LL] Piloter les fonctions/formulaires disponibles en fonction du type d'activité choisi (Fixes #6702) Merge branch 'feature/6702' into develop .../loadors/ActivityLonglineNodeChildLoador.java | 26 +++++++++++++++++----- .../longline/ActivityLonglineTopiaDao.java | 6 ++++- .../entities/seine/ActivitySeineTopiaDao.java | 6 ++++- .../dto/reference/DataReferenceSetDefinitions.java | 2 ++ .../topia/binder/data/ActivityLonglineBinder.java | 2 ++ .../topia/binder/data/ActivitySeineBinder.java | 2 ++ 6 files changed, 37 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm