branch feature/7610_revue_des_ecrans_de_referentiel created (now 62172c4)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git at 62172c4 Chargement de la liste des référentiels avec leurs informations techniques This branch includes the following new commits: new d4a870a Mettre en évidence dans les écrans d'édition d'un référentiel le label de base en cours d'utilisation (See #7610) new 910cc5d Correction de la liste des oceans sur l'écran d'édition d'une espèce (See #7610) new 1254068 Ajout des informations techniques pour un réferentiel en consultation ou édition (See #7610) new b005c5b Ajout FIXME pour kmorin new d0e3025 Ajout des informations techniques sur les références de réferentiels new f2f75b6 Nettoyage de code (See #7610) new 81a2487 Utilisation des types génériques new 383dafe Ajout d'une méthode de service pour récupérer aussi les champs techniques sur un set de référentiels new d25ad02 Suppression de champs techniques du binding par defaut des référentiels new 3afb71d Plutot utiliser directement le flag enabled sur une référence de référentiel new 23b208d Ajout des informations techniques sur l'écran de consultation / édition d'un référentiel + chargement au bon moment des données new 62172c4 Chargement de la liste des référentiels avec leurs informations techniques The 12 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 62172c456024ac4534462d903eb8fd8aeb38f234 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 12:15:33 2015 +0200 Chargement de la liste des référentiels avec leurs informations techniques commit 23b208d7bc8dc697ad95a3d3d712f6eff7a0478f Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 12:14:54 2015 +0200 Ajout des informations techniques sur l'écran de consultation / édition d'un référentiel + chargement au bon moment des données commit 3afb71db6c4a0834fcba8ac55d70f7f1713275d8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 12:14:09 2015 +0200 Plutot utiliser directement le flag enabled sur une référence de référentiel commit d25ad0234cb30d62ddd7f57e072d639b593222d6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:56:40 2015 +0200 Suppression de champs techniques du binding par defaut des référentiels commit 383dafe9e729b25f17340dcb2a933c1db151da59 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:56:00 2015 +0200 Ajout d'une méthode de service pour récupérer aussi les champs techniques sur un set de référentiels commit 81a248774b869417cc7eb9665beddab03243cc88 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:55:18 2015 +0200 Utilisation des types génériques commit f2f75b6d0eb90730ff833b979cad12a89a6832aa Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:13:12 2015 +0200 Nettoyage de code (See #7610) commit d0e3025bc225a1270614d34c10384b7d8ac6bd20 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:12:51 2015 +0200 Ajout des informations techniques sur les références de réferentiels commit b005c5b74624b9e51893f5973a671364bcfa5e73 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:12:19 2015 +0200 Ajout FIXME pour kmorin commit 1254068b03d935110a9a93e4431b4b1ee06454f7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:11:46 2015 +0200 Ajout des informations techniques pour un réferentiel en consultation ou édition (See #7610) commit d4a870a681dc5432cb5eb20ba2c452e6c5076905 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 09:32:22 2015 +0200 Mettre en évidence dans les écrans d'édition d'un référentiel le label de base en cours d'utilisation (See #7610) commit 910cc5d0665a7fec76d6b07bf45d9e15e9360976 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 09:43:43 2015 +0200 Correction de la liste des oceans sur l'écran d'édition d'une espèce (See #7610) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit d4a870a681dc5432cb5eb20ba2c452e6c5076905 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 09:32:22 2015 +0200 Mettre en évidence dans les écrans d'édition d'un référentiel le label de base en cours d'utilisation (See #7610) --- .../java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index 57aef51..1158cba 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -463,7 +463,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content ui.getConfig().getDbLocale()); String libelleName = localeEnum.getLibelle() + "Label"; for (int i = 1; i <= 8; i++) { - String lib = "libelle" + i + "Label"; + String lib = "label" + i + "Label"; JLabel label = (JLabel) ui.getObjectById(lib); if (label == null) { // not in ui actually @@ -481,7 +481,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content font = normalFont; } label.setFont(font); - ((JComponent) ui.getObjectById("libelle" + i)).setFont(font); + ((JComponent) ui.getObjectById("label" + i)).setFont(font); } } ContentMode mode = computeContentMode(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit 910cc5d0665a7fec76d6b07bf45d9e15e9360976 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 09:43:43 2015 +0200 Correction de la liste des oceans sur l'écran d'édition d'une espèce (See #7610) --- .../src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx index e8238cc..fc83d15 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/impl/SpeciesUI.jaxx @@ -263,7 +263,7 @@ <JScrollPane id='oceanPane' layout='{new GridLayout(1,1)}'> <FilterableDoubleList id='ocean' genericType='ReferenceDto<OceanDto>' - _entityClass='SpeciesDto.class'/> + _entityClass='OceanDto.class'/> </JScrollPane> </cell> </row> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit 1254068b03d935110a9a93e4431b4b1ee06454f7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:11:46 2015 +0200 Ajout des informations techniques pour un réferentiel en consultation ou édition (See #7610) --- .../ui/content/ref/ContentReferenceUIHandler.java | 20 +++++++++++++++++--- .../i18n/observe-application-swing_en_GB.properties | 1 + .../i18n/observe-application-swing_es_ES.properties | 1 + .../i18n/observe-application-swing_fr_FR.properties | 1 + 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index 1158cba..3ac3035 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -53,6 +53,7 @@ import jaxx.runtime.swing.ErrorDialogUI; import jaxx.runtime.swing.editor.bean.BeanListHeader; import jaxx.runtime.validator.swing.SwingValidatorUtil; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.time.FastDateFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.decorator.Decorator; @@ -87,6 +88,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; +import java.util.Locale; import java.util.Map; import static org.nuiton.i18n.I18n.t; @@ -126,9 +128,17 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content private ReferentialContentUIInitializer<E, ContentReferenceUI<E>> uiInitializer; + protected final FastDateFormat dateFormat; + public ContentReferenceUIHandler(ContentReferenceUI<E> ui) { super(ui, null, null); uiInitializer = new ReferentialContentUIInitializer<>(ui); + Locale locale = ui.getConfig().getLocale(); + if (Locale.ENGLISH.equals(locale)) { + dateFormat = FastDateFormat.getInstance("yyyy-MM-ddZZ"); + } else { + dateFormat = FastDateFormat.getInstance("dd/MM/yyyy"); + } } @@ -398,12 +408,16 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content content.add(new JLabel(t("observe.common.topiaId"))); content.add(new JLabel(bean.getId())); - //FIXME content.add(new JLabel(t("observe.common.topiaCreateDate"))); - content.add(new JLabel("test")); + + content.add(new JLabel(dateFormat.format(bean.getCreateDate()))); + + content.add(new JLabel(t("observe.common.lastUpdateDate"))); + + content.add(new JLabel(dateFormat.format(bean.getLastUpdate()))); content.add(new JLabel(t("observe.common.topiaVersion"))); - content.add(new JLabel("test")); + content.add(new JLabel(String.valueOf(bean.getVersion()))); SpringUtilities.makeCompactGrid(content, 3, 2, 5, 5, 5, 5); diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 3c2bc2e..cb0dd3a 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -830,6 +830,7 @@ observe.common.label7= observe.common.label8= observe.common.landingHarbour=Landing harbour observe.common.lastName= +observe.common.lastUpdateDate=Last update date observe.common.latitude=Latitude observe.common.length= observe.common.length.computed.tip= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index 3760ec4..29a9f9c 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -830,6 +830,7 @@ observe.common.label7=Texto 7 observe.common.label8=Texto 8 observe.common.landingHarbour= observe.common.lastName=Nombre +observe.common.lastUpdateDate=Last update date observe.common.latitude=Latitude observe.common.length=Longitud eslora total observe.common.length.computed.tip=Longitud calculada diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 2ff259f..e91f943 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -830,6 +830,7 @@ observe.common.label7=Libellé 7 observe.common.label8=Libellé 8 observe.common.landingHarbour=Port d'arrivée observe.common.lastName=Nom +observe.common.lastUpdateDate=Date de dernière mise à jour observe.common.latitude=Latitude observe.common.length=Longueur hors tout observe.common.length.computed.tip=La longueur a été calculée -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit b005c5b74624b9e51893f5973a671364bcfa5e73 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:12:19 2015 +0200 Ajout FIXME pour kmorin --- .../java/fr/ird/observe/services/service/ReferentialServiceTopia.java | 1 + 1 file changed, 1 insertion(+) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index e036e86..b6d2715 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -144,6 +144,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe return result; } + //FIXME-kmorin Rename with method protected <E extends TopiaEntity, I extends IdDto> List<I> test(Class<I> dtoType, Class<E> type, EntityMap allUsages) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit d0e3025bc225a1270614d34c10384b7d8ac6bd20 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:12:51 2015 +0200 Ajout des informations techniques sur les références de réferentiels --- .../src/main/xmi/observe-services-dto-common.zargo | Bin 42474 -> 42833 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index 53937bc..edf42cd 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit f2f75b6d0eb90730ff833b979cad12a89a6832aa Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:13:12 2015 +0200 Nettoyage de code (See #7610) --- .../ref/ReferentialContentUIInitializer.java | 46 ++++++++++++---------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java index a601fbb..5395e0a 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java @@ -23,7 +23,6 @@ package fr.ird.observe.ui.content.ref; */ import fr.ird.observe.ObserveSwingApplicationContext; -import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; import fr.ird.observe.services.dto.referential.ReferentialDto; @@ -39,6 +38,7 @@ import org.nuiton.decorator.DecoratorUtil; import org.nuiton.decorator.JXPathDecorator; import org.nuiton.jaxx.widgets.select.FilterableDoubleList; +import javax.swing.JComponent; import java.util.ArrayList; import java.util.Collections; import java.util.LinkedHashSet; @@ -69,14 +69,10 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend } - @Override - protected <E1 extends IdDto> void updateData(BeanComboBox comboBox) { - ObserveSwingApplicationContext context = ObserveSwingApplicationContext.get(); + protected void updateData(BeanComboBox comboBox) { - // init combobox - Class<? extends ReferentialDto> dtoClass = - (Class<? extends ReferentialDto>) comboBox.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); + Class<? extends ReferentialDto> dtoClass = getDtoClass(comboBox); Boolean noLoad = (Boolean) comboBox.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_LIST_NO_LOAD); @@ -94,8 +90,7 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend data = new ArrayList<>(); // get complete data list from service - ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); - ReferenceSetDto referentialReferenceSet = service.getReferentialReferenceSet(dtoClass); + ReferenceSetDto referentialReferenceSet = getReferentialService().getReferentialReferenceSet(dtoClass); LinkedHashSet<ReferenceDto> reference = referentialReferenceSet.getReference(); data.addAll(reference); @@ -110,18 +105,16 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend } @Override - protected <E1 extends IdDto> void updateData(BeanListHeader list) { + protected void updateData(BeanListHeader list) { - Class<? extends ReferentialDto> dtoClass = - (Class<? extends ReferentialDto>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); + Class<? extends ReferentialDto> dtoClass = getDtoClass(list); - ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + ReferentialService service = getReferentialService(); ReferenceSetDto referentialReferenceSet = service.getReferentialReferenceSet(dtoClass); List<ReferenceDto> data = new ArrayList<>(referentialReferenceSet.getReference()); - Decorator<ReferenceDto> decorator = ObserveSwingApplicationContext.get().getDecorator(ReferenceDto.class, - dtoClass.getSimpleName()); + Decorator<ReferenceDto> decorator = getDecorator(dtoClass); DecoratorUtil.sort((JXPathDecorator<ReferenceDto>) decorator, data, 0); list.setData(data); @@ -129,14 +122,13 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend } @Override - protected <E1 extends IdDto> void updateData(FilterableDoubleList list) { - Class<? extends ReferentialDto> dtoClass = - (Class<? extends ReferentialDto>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); + protected void updateData(FilterableDoubleList list) { + Class<? extends ReferentialDto> dtoClass = getDtoClass(list); List<ReferenceDto> data; if (ReferentialDto.class.isAssignableFrom(dtoClass)) { - ReferentialService service = ObserveSwingApplicationContext.get().newService(ReferentialService.class); + ReferentialService service = getReferentialService(); ReferenceSetDto referentialReferenceSet = service.getReferentialReferenceSet(dtoClass); data = new ArrayList<>(referentialReferenceSet.getReference()); @@ -148,11 +140,23 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend } // sort data from first decorator context - ObserveSwingApplicationContext tx = ObserveSwingApplicationContext.get(); - Decorator<ReferenceDto> decorator = tx.getDecorator(ReferenceDto.class, dtoClass.getSimpleName()); + Decorator<ReferenceDto> decorator = getDecorator(dtoClass); DecoratorUtil.sort((JXPathDecorator<ReferenceDto>) decorator, data, 0); list.setUniverse(data); list.putClientProperty("data", data); } + + protected ReferentialService getReferentialService() { + return ObserveSwingApplicationContext.get().newService(ReferentialService.class); + } + + protected Decorator<ReferenceDto> getDecorator(Class<? extends ReferentialDto> dtoClass) { + return ObserveSwingApplicationContext.get().getDecorator(ReferenceDto.class, dtoClass.getSimpleName()); + } + + protected Class<? extends ReferentialDto> getDtoClass(JComponent list) { + return (Class<? extends ReferentialDto>) list.getClientProperty(ObserveContentUI.CLIENT_PROPERTY_ENTITY_CLASS); + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit 81a248774b869417cc7eb9665beddab03243cc88 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:55:18 2015 +0200 Utilisation des types génériques --- .../src/main/java/fr/ird/observe/services/ObserveServiceTopia.java | 4 ++-- .../java/fr/ird/observe/services/builder/EntityToDtoBuilder.java | 7 ++++--- .../services/builder/EntityToReferentialReferenceDtoBuilder.java | 6 ++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java index bbbcfab..632e933 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/ObserveServiceTopia.java @@ -383,7 +383,7 @@ public abstract class ObserveServiceTopia implements ObserveService { } if (FollowedUpdateEntity.class.isAssignableFrom(entityType) - && FollowedUpdateDto.class.isAssignableFrom(dtoType)) { + && FollowedUpdateDto.class.isAssignableFrom(dtoType)) { Date lasUpdate = ((FollowedUpdateEntity) entity).getLastUpdate(); Date currentUpdate = ((FollowedUpdateDto) dto).getLastUpdate(); @@ -412,7 +412,7 @@ public abstract class ObserveServiceTopia implements ObserveService { if (entity instanceof ReferenceEntity) { - referenceDto = EntityToReferentialReferenceDtoBuilder.build((Class) dtoType, serviceContext.getReferentialLocale(), entity); + referenceDto = EntityToReferentialReferenceDtoBuilder.build((Class) dtoType, serviceContext.getReferentialLocale(), (ReferenceEntity) entity); } else { diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java index 719f9ce..9539491 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToDtoBuilder.java @@ -27,6 +27,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.reflect.TypeToken; +import fr.ird.observe.entities.referentiel.ReferenceEntity; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ObserveDtoBinders; import fr.ird.observe.services.dto.ObserveDtosInitializer; @@ -231,7 +232,7 @@ public class EntityToDtoBuilder<E extends TopiaEntity, D extends IdDto> implemen if (isReferential) { - dto = entityToReferentialRef(referentialLocale, dtoType, entityType, propertyName, entityValue, referenceTypesBuilder); + dto = entityToReferentialRef(referentialLocale, dtoType, entityType, propertyName, (ReferenceEntity) entityValue, referenceTypesBuilder); } else { @@ -286,7 +287,7 @@ public class EntityToDtoBuilder<E extends TopiaEntity, D extends IdDto> implemen } - protected <EE extends TopiaEntity, R extends IdDto> ReferenceDto<R> entityToRef(Class dtoType, ReferentialLocale referentialLocale, String propertyName, TopiaEntity entityValue, ImmutableSet.Builder<ReferenceTypeName> referenceTypesBuilder) { + protected <EE extends TopiaEntity, R extends IdDto> ReferenceDto<R> entityToRef(Class dtoType, ReferentialLocale referentialLocale, String propertyName, EE entityValue, ImmutableSet.Builder<ReferenceTypeName> referenceTypesBuilder) { ReferenceTypeName referenceTypeName = new ReferenceTypeName(binder.getTargetType(), dtoType, propertyName); referenceTypesBuilder.add(referenceTypeName); @@ -296,7 +297,7 @@ public class EntityToDtoBuilder<E extends TopiaEntity, D extends IdDto> implemen } - protected <EE extends TopiaEntity, R extends ReferentialDto> ReferentialReferenceDto<R> entityToReferentialRef(ReferentialLocale referentialLocale, Class dtoType, Class entityType, String propertyName, TopiaEntity entityValue, ImmutableSet.Builder<ReferenceTypeName> referenceTypesBuilder) { + protected <EE extends ReferenceEntity, R extends ReferentialDto> ReferentialReferenceDto<R> entityToReferentialRef(ReferentialLocale referentialLocale, Class dtoType, Class entityType, String propertyName, EE entityValue, ImmutableSet.Builder<ReferenceTypeName> referenceTypesBuilder) { ReferenceTypeName referenceTypeName = new ReferenceTypeName(binder.getTargetType(), dtoType, propertyName); referenceTypesBuilder.add(referenceTypeName); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilder.java b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilder.java index d1fd630..ae69b55 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilder.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilder.java @@ -48,9 +48,9 @@ import java.util.Set; * * @author Tony Chemit - chemit@codelutin.com */ -public class EntityToReferentialReferenceDtoBuilder<E extends TopiaEntity, D extends ReferentialDto> { +public class EntityToReferentialReferenceDtoBuilder<E extends ReferenceEntity, D extends ReferentialDto> { - public static <E extends TopiaEntity, D extends ReferentialDto> ReferentialReferenceDto<D> build(Class<D> dtoType, ReferentialLocale referentialLocale, E entity) { + public static <E extends ReferenceEntity, D extends ReferentialDto> ReferentialReferenceDto<D> build(Class<D> dtoType, ReferentialLocale referentialLocale, E entity) { Preconditions.checkNotNull(dtoType, "'dtoType' can't be null"); Preconditions.checkNotNull(referentialLocale, "'referentialLocale' can't be null"); @@ -94,8 +94,6 @@ public class EntityToReferentialReferenceDtoBuilder<E extends TopiaEntity, D ext result.setPropertyValue(referentialLocale, propertyName, (Serializable) propertyValue); } result.setId(entity.getTopiaId()); - //FIXME -// result.setLastUpdate(entity.getLastUpdate()); return result; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit 383dafe9e729b25f17340dcb2a933c1db151da59 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:56:00 2015 +0200 Ajout d'une méthode de service pour récupérer aussi les champs techniques sur un set de référentiels --- .../v1/ReferentialServiceController.java | 5 ++ .../services/service/ReferentialService.java | 3 + .../services/service/ReferentialServiceTopia.java | 75 +++++++++++++++++----- 3 files changed, 67 insertions(+), 16 deletions(-) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java index 758ceb9..03cbf95 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ReferentialServiceController.java @@ -45,6 +45,11 @@ public class ReferentialServiceController extends ObserveAuthenticatedServiceCon } @Override + public <R extends ReferentialDto> ReferenceSetDto<R> getReferentialReferenceSet(Class<R> type, boolean loadTechnicalInformations) { + return service.getReferentialReferenceSet(type, loadTechnicalInformations); + } + + @Override public <R extends ReferentialDto> ReferenceSetDto<R> getReferentialReferenceSet(Class<R> type) { return service.getReferentialReferenceSet(type); } diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java index 4e2bd25..c283b5e 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/ReferentialService.java @@ -46,6 +46,9 @@ import java.util.Date; public interface ReferentialService extends ObserveService { @ReadReferentialPermission + <R extends ReferentialDto> ReferenceSetDto<R> getReferentialReferenceSet(Class<R> type, boolean loadTechnicalInformations); + + @ReadReferentialPermission <R extends ReferentialDto> ReferenceSetDto<R> getReferentialReferenceSet(Class<R> type); @ReadReferentialPermission diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index b6d2715..6055619 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -24,13 +24,17 @@ package fr.ird.observe.services.service; import com.google.common.base.Optional; import fr.ird.observe.entities.EntityMap; +import fr.ird.observe.entities.referentiel.ReferenceEntity; import fr.ird.observe.services.ObserveServiceTopia; import fr.ird.observe.services.dto.DtoMap; import fr.ird.observe.services.dto.FormDto; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.ReferenceDto; import fr.ird.observe.services.dto.ReferenceSetDto; +import fr.ird.observe.services.dto.ReferenceSetDtos; +import fr.ird.observe.services.dto.constants.ReferenceStatus; import fr.ird.observe.services.dto.referential.ReferentialDto; +import fr.ird.observe.services.dto.referential.ReferentialReferenceDto; import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntity; @@ -38,6 +42,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Date; +import java.util.LinkedHashSet; import java.util.List; /** @@ -48,8 +53,13 @@ import java.util.List; public class ReferentialServiceTopia extends ObserveServiceTopia implements ReferentialService { @Override - public <D extends ReferentialDto> ReferenceSetDto<D> getReferentialReferenceSet(Class<D> dtoType) { - return getReferenceSet(dtoType); + public <R extends ReferentialDto> ReferenceSetDto<R> getReferentialReferenceSet(Class<R> dtoType) { + return getReferenceSet(dtoType, false); + } + + @Override + public <D extends ReferentialDto> ReferenceSetDto<D> getReferentialReferenceSet(Class<D> dtoType, boolean loadTechnicalInformations) { + return getReferenceSet(dtoType, loadTechnicalInformations); } @Override @@ -61,7 +71,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe Optional<Date> lastUpdateOptional = getLastUpdate(entityType); if (lastUpdateOptional.isPresent() && lastUpdateOptional.get().after(updateAfter)) { - result = getReferenceSet(dtoType); + result = getReferenceSet(dtoType, false); } return result; @@ -77,24 +87,24 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> ReferenceDto<D> loadReferenceToRead(Class<D> dtoType, String id) throws DataNotFoundException { - Class<TopiaEntity> entityType = getEntityType(dtoType); - TopiaEntity entity = loadEntity(dtoType, entityType, id); + Class<ReferenceEntity> entityType = getEntityType(dtoType); + ReferenceEntity entity = loadEntity(dtoType, entityType, id); ReferenceDto<D> form = entityToReferenceDto(dtoType, entity); return form; } @Override public <D extends ReferentialDto> FormDto<D> loadToEdit(Class<D> dtoType, String id) { - Class<TopiaEntity> entityType = getEntityType(dtoType); - TopiaEntity entity = loadEntity(dtoType, entityType, id); + Class<ReferenceEntity> entityType = getEntityType(dtoType); + ReferenceEntity entity = loadEntity(dtoType, entityType, id); FormDto<D> form = entityToEditFormDto(dtoType, entityType, entity); return form; } @Override public <D extends ReferentialDto> FormDto<D> preCreate(Class<D> dtoType) { - Class<TopiaEntity> entityType = getEntityType(dtoType); - TopiaEntity entity = newEntity(entityType); + Class<ReferenceEntity> entityType = getEntityType(dtoType); + ReferenceEntity entity = newEntity(entityType); //TODO Voir selon le type d'entité si il y a des valeurs par défaut à utiliser FormDto<D> form = entityToEditFormDto(dtoType, entityType, entity); return form; @@ -102,8 +112,8 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe public <D extends ReferentialDto> String save(D bean) { Class<D> dtoType = (Class<D>) bean.getClass(); - Class<TopiaEntity> entityType = getEntityType(dtoType); - TopiaEntity entity = dtoToEntity(dtoType, entityType, bean); + Class<ReferenceEntity> entityType = getEntityType(dtoType); + ReferenceEntity entity = dtoToEntity(dtoType, entityType, bean); entity = saveEntity(entityType, entity); FormDto<D> model = entityToEditFormDto(dtoType, entityType, entity); return model.getForm().getId(); @@ -111,13 +121,13 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> void delete(Class<D> dtoType, String id) { - Class<? extends TopiaEntity> entityType = getEntityType(dtoType); + Class<? extends ReferenceEntity> entityType = getEntityType(dtoType); deleteEntity(dtoType, entityType, Collections.singleton(id)); } @Override public <D extends ReferentialDto> void delete(Class<D> dtoType, Collection<String> ids) { - Class<? extends TopiaEntity> entityType = getEntityType(dtoType); + Class<? extends ReferenceEntity> entityType = getEntityType(dtoType); deleteEntity(dtoType, entityType, ids); } @@ -125,10 +135,10 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe public <R extends ReferentialDto> DtoMap findAllUsages(R bean) throws DataNotFoundException { Class<? extends IdDto> referentialDtoType = bean.getClass(); - Class<TopiaEntity> entityType = getEntityType(referentialDtoType); - TopiaEntity entity = loadEntity(referentialDtoType, entityType, bean.getId()); + Class<ReferenceEntity> entityType = getEntityType(referentialDtoType); + ReferenceEntity entity = loadEntity(referentialDtoType, entityType, bean.getId()); - TopiaDao<TopiaEntity> dao = getTopiaPersistenceContext().getDao(entityType); + TopiaDao<ReferenceEntity> dao = getTopiaPersistenceContext().getDao(entityType); EntityMap allUsages = new EntityMap(dao.findAllUsages(entity)); DtoMap result = new DtoMap(); @@ -156,4 +166,37 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } return dtos; } + + protected <D extends ReferentialDto, E extends ReferenceEntity> ReferenceSetDto<D> getReferenceSet( + Class<D> dtoType, + boolean loadTechnicalInformations) { + + Class<E> entityType = getEntityType(dtoType); + + Iterable<E> entities = loadEntities(entityType); + + LinkedHashSet<ReferentialReferenceDto<D>> labels = new LinkedHashSet<>(); + for (E entity : entities) { + + ReferentialReferenceDto<D> dto = (ReferentialReferenceDto<D>) entityToReferenceDto(dtoType, entity); + + if (loadTechnicalInformations) { + + dto.setVersion(entity.getTopiaVersion()); + dto.setCreateDate(entity.getTopiaCreateDate()); + dto.setLastUpdate(entity.getLastUpdate()); + dto.setStatus(ReferenceStatus.valueOf(entity.getStatus().name())); + } + labels.add(dto); + + } + + Optional<Date> lastUpdateOptional = getLastUpdate(entityType); + + ReferenceSetDto<D> labelSetDto = ReferenceSetDtos.newReferenceSetDto(dtoType, null, labels, lastUpdateOptional.orNull()); + + return labelSetDto; + + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit d25ad0234cb30d62ddd7f57e072d639b593222d6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 11:56:40 2015 +0200 Suppression de champs techniques du binding par defaut des référentiels --- .../main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java index 40098fe..d33465c 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/dto/ObserveDtosInitializer.java @@ -286,9 +286,7 @@ public class ObserveDtosInitializer implements ObserveModelInitializer { ReferentialDto.PROPERTY_CODE, I18nReferentialDto.PROPERTY_LABEL1, I18nReferentialDto.PROPERTY_LABEL2, - I18nReferentialDto.PROPERTY_LABEL3, - ReferentialDto.PROPERTY_STATUS, - ReferentialDto.PROPERTY_LAST_UPDATE}; + I18nReferentialDto.PROPERTY_LABEL3}; // { // // Need to add by hand a speciesList binder -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit 3afb71db6c4a0834fcba8ac55d70f7f1713275d8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 12:14:09 2015 +0200 Plutot utiliser directement le flag enabled sur une référence de référentiel --- .../src/main/xmi/observe-services-dto-common.zargo | Bin 42833 -> 42827 bytes .../services/service/ReferentialServiceTopia.java | 18 ++++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo index edf42cd..2919165 100644 Binary files a/observe-services-model/src/main/xmi/observe-services-dto-common.zargo and b/observe-services-model/src/main/xmi/observe-services-dto-common.zargo differ diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java index 6055619..9b087c5 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/ReferentialServiceTopia.java @@ -66,7 +66,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe public <D extends ReferentialDto> ReferenceSetDto<D> getReferentialReferenceSetIfModify(Class<D> dtoType, Date updateAfter) { ReferenceSetDto<D> result = null; - Class<TopiaEntity> entityType = getEntityType(dtoType); + Class<ReferenceEntity> entityType = getEntityType(dtoType); Optional<Date> lastUpdateOptional = getLastUpdate(entityType); @@ -79,9 +79,10 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe @Override public <D extends ReferentialDto> FormDto<D> loadToRead(Class<D> dtoType, String id) { - Class<TopiaEntity> entityType = getEntityType(dtoType); - TopiaEntity entity = loadEntity(dtoType, entityType, id); + Class<ReferenceEntity> entityType = getEntityType(dtoType); + ReferenceEntity entity = loadEntity(dtoType, entityType, id); FormDto<D> form = entityToReadFormDto(dtoType, entityType, entity); + addTechnicalInformations(entity, form.getForm()); return form; } @@ -98,6 +99,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe Class<ReferenceEntity> entityType = getEntityType(dtoType); ReferenceEntity entity = loadEntity(dtoType, entityType, id); FormDto<D> form = entityToEditFormDto(dtoType, entityType, entity); + addTechnicalInformations(entity, form.getForm()); return form; } @@ -185,7 +187,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe dto.setVersion(entity.getTopiaVersion()); dto.setCreateDate(entity.getTopiaCreateDate()); dto.setLastUpdate(entity.getLastUpdate()); - dto.setStatus(ReferenceStatus.valueOf(entity.getStatus().name())); + dto.setEnabled(entity.getStatus() == fr.ird.observe.entities.constants.ReferenceStatus.enabled); } labels.add(dto); @@ -199,4 +201,12 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe } + protected <D extends ReferentialDto> void addTechnicalInformations(ReferenceEntity entity, D dto) { + dto.setVersion(entity.getTopiaVersion()); + dto.setCreateDate(entity.getTopiaCreateDate()); + dto.setLastUpdate(entity.getLastUpdate()); + dto.setStatus(ReferenceStatus.valueOf(entity.getStatus().name())); + dto.setEnabled(entity.getStatus() == fr.ird.observe.entities.constants.ReferenceStatus.enabled); + } + } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit 23b208d7bc8dc697ad95a3d3d712f6eff7a0478f Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 12:14:54 2015 +0200 Ajout des informations techniques sur l'écran de consultation / édition d'un référentiel + chargement au bon moment des données --- .../fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index 3ac3035..7820f1b 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -419,7 +419,7 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content content.add(new JLabel(t("observe.common.topiaVersion"))); content.add(new JLabel(String.valueOf(bean.getVersion()))); - SpringUtilities.makeCompactGrid(content, 3, 2, 5, 5, 5, 5); + SpringUtilities.makeCompactGrid(content, 4, 2, 5, 5, 5, 5); Decorator<E> decorator = getDecoratorService().getDecoratorByType(getBeanType()); @@ -456,8 +456,6 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content } }); - uiInitializer.referentialDataUpdated(); - // UIHelper.getLayer(ui.getEditKeyTable()).setUI(ui.getEditKeyTableLayerUI()); } @@ -467,6 +465,9 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content ContentReferenceUIModel<E> model = getModel(); + // Chargement des données + uiInitializer.referentialDataUpdated(); + ContentReferenceUI<E> ui = getUi(); if (I18nReferentialDto.class.isAssignableFrom(model.getBeanType())) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7610_revue_des_ecrans_de_referentiel in repository observe. See http://git.codelutin.com/observe.git commit 62172c456024ac4534462d903eb8fd8aeb38f234 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 21 12:15:33 2015 +0200 Chargement de la liste des référentiels avec leurs informations techniques --- .../ird/observe/ui/content/ref/ReferentialContentUIInitializer.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java index 5395e0a..1c43310 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ReferentialContentUIInitializer.java @@ -109,8 +109,9 @@ public class ReferentialContentUIInitializer<E extends ReferentialDto, UI extend Class<? extends ReferentialDto> dtoClass = getDtoClass(list); - ReferentialService service = getReferentialService(); - ReferenceSetDto referentialReferenceSet = service.getReferentialReferenceSet(dtoClass); + // Attention ici on charge les references avec aussi les données techniques + // On en a besoin pour l'écran justement des informations techniques d'une entité en cours d'édition + ReferenceSetDto referentialReferenceSet = getReferentialService().getReferentialReferenceSet(dtoClass, true); List<ReferenceDto> data = new ArrayList<>(referentialReferenceSet.getReference()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm