branch develop updated (e66a1c9 -> 9e92e7a)
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 e66a1c9 [LL] Nombre de coupures inconnu : cas problématique (refs-80 #7883) new 4068bb2 Ajout SpeciesFate.discard (persistence) new d7afb64 Ajout SpeciesFate.discard (service) new 40ac5e1 Ajout SpeciesFate.discard (ui) new 381e7f4 Activer la raison de rejet si le devenir espèce le requière new 9e92e7a [PS] Gestion plus intelligente des champs Devenir et Raison du rejet (Fixes #8377) Merge branch 'feature/8377' into develop The 5 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 9e92e7aeabe4c4f063fc63aadff088cac1a4fc41 Merge: e66a1c9 381e7f4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 13:11:51 2016 +0100 [PS] Gestion plus intelligente des champs Devenir et Raison du rejet (Fixes #8377) Merge branch 'feature/8377' into develop commit 381e7f4fcf01492a36680c981d7e1b02e3349636 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 13:11:40 2016 +0100 Activer la raison de rejet si le devenir espèce le requière commit 40ac5e1d9f3e14d50811031e73b4a18c527cdb9a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 12:58:00 2016 +0100 Ajout SpeciesFate.discard (ui) commit d7afb6413aae638dd81baa98fdbd283a6ee94d13 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 12:57:52 2016 +0100 Ajout SpeciesFate.discard (service) commit 4068bb2800cd22502d3e436df03a991d019f517b Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 12:57:38 2016 +0100 Ajout SpeciesFate.discard (persistence) Summary of changes: .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 8 ++++++++ .../SpeciesFateUI.jcss} | 14 ++++++++++---- .../content/ref/impl/seine/SpeciesFateUIModel.java | 8 +++++--- .../content/table/impl/seine/NonTargetCatchUI.jcss | 1 + .../table/impl/seine/NonTargetCatchUIHandler.java | 12 ++++++++---- .../i18n/application-swing_en_GB.properties | 1 + .../i18n/application-swing_es_ES.properties | 1 + .../i18n/application-swing_fr_FR.properties | 1 + .../versions/DataSourceMigrationForVersion_5_1.java | 1 + ...V5_1_16_evol_8377_speciesFate_add_discard-H2.sql | 1 + ...V5_1_16_evol_8377_speciesFate_add_discard-PG.sql | 1 + entities/src/main/xmi/observe-seine.zargo | Bin 86621 -> 86714 bytes .../ReferentialReferenceSetDefinitions.java | 3 ++- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60479 -> 60566 bytes .../topia/binder/referential/SpeciesFateBinder.java | 11 ++++------- 15 files changed, 44 insertions(+), 19 deletions(-) copy application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/{SpeciesGroupUI.jcss => seine/SpeciesFateUI.jcss} (82%) create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-H2.sql create mode 100644 entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-PG.sql -- 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 4068bb2800cd22502d3e436df03a991d019f517b Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 12:57:38 2016 +0100 Ajout SpeciesFate.discard (persistence) --- .../versions/DataSourceMigrationForVersion_5_1.java | 1 + ...V5_1_16_evol_8377_speciesFate_add_discard-H2.sql | 1 + ...V5_1_16_evol_8377_speciesFate_add_discard-PG.sql | 1 + entities/src/main/xmi/observe-seine.zargo | Bin 86621 -> 86714 bytes 4 files changed, 3 insertions(+) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java index 5f2d873..060953d 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java @@ -59,6 +59,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC addScript("13", "evol_7901_add_armateur_table", queries); addScript("14", "evol_8196_lengthWeightParameter_add_source", queries); addScript("15", "evol_8578_nonTargetLength_add_speciesFate", queries); + addScript("16", "evol_8377_speciesFate_add_discard", queries); } private void evol8391(TopiaSqlSupport topiaSqlSupport, List<String> queries) { diff --git a/entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-H2.sql b/entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-H2.sql new file mode 100644 index 0000000..18ae37a --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-H2.sql @@ -0,0 +1 @@ +ALTER TABLE observe_seine.speciesfate ADD COLUMN discard BOOLEAN DEFAULT false; \ No newline at end of file diff --git a/entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-PG.sql b/entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-PG.sql new file mode 100644 index 0000000..18ae37a --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-PG.sql @@ -0,0 +1 @@ +ALTER TABLE observe_seine.speciesfate ADD COLUMN discard BOOLEAN DEFAULT false; \ No newline at end of file diff --git a/entities/src/main/xmi/observe-seine.zargo b/entities/src/main/xmi/observe-seine.zargo index a65346c..de28753 100644 Binary files a/entities/src/main/xmi/observe-seine.zargo and b/entities/src/main/xmi/observe-seine.zargo differ -- 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 d7afb6413aae638dd81baa98fdbd283a6ee94d13 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 12:57:52 2016 +0100 Ajout SpeciesFate.discard (service) --- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60479 -> 60566 bytes .../topia/binder/referential/SpeciesFateBinder.java | 2 ++ 2 files changed, 2 insertions(+) diff --git a/services-dto/src/main/xmi/observe-services-dto-seine.zargo b/services-dto/src/main/xmi/observe-services-dto-seine.zargo index 6a207a9..843fee6 100644 Binary files a/services-dto/src/main/xmi/observe-services-dto-seine.zargo and b/services-dto/src/main/xmi/observe-services-dto-seine.zargo differ diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java index 0e38001..4b82d09 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java @@ -44,6 +44,7 @@ public class SpeciesFateBinder extends ReferentialBinderSupport<SpeciesFate, Spe copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); + entity.setDiscard(dto.isDiscard()); } @@ -53,6 +54,7 @@ public class SpeciesFateBinder extends ReferentialBinderSupport<SpeciesFate, Spe copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); + dto.setDiscard(entity.isDiscard()); } -- 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 40ac5e1d9f3e14d50811031e73b4a18c527cdb9a Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 12:58:00 2016 +0100 Ajout SpeciesFate.discard (ui) --- .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 8 ++++++ ...{SpeciesFateUIModel.java => SpeciesFateUI.jcss} | 31 ++++++---------------- .../content/ref/impl/seine/SpeciesFateUIModel.java | 8 +++--- .../i18n/application-swing_en_GB.properties | 1 + .../i18n/application-swing_es_ES.properties | 1 + .../i18n/application-swing_fr_FR.properties | 1 + 6 files changed, 24 insertions(+), 26 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx index e6c79be..be5a518 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx @@ -82,6 +82,14 @@ onItemStateChanged='getBean().setNeedComment(needComment.isSelected())'/> </cell> </row> + + <!-- discard --> + <row> + <cell anchor='east' weightx="1" fill="both" columns="2"> + <JCheckBox id='discard' + onItemStateChanged='getBean().setDiscard(discard.isSelected())'/> + </cell> + </row> </Table> <Table id='editI18nTable'> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jcss similarity index 52% copy from application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java copy to application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jcss index c03c506..ce9ff62 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jcss @@ -1,42 +1,27 @@ -package fr.ird.observe.application.swing.ui.content.ref.impl.seine; - /* * #%L - * ObServe :: Application Swing + * ObServe :: Swing * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public * License along with this program. If not, see * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; -import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel; - -/** - * Created on 9/28/14. - * - * @author Tony Chemit - chemit@codelutin.com - * @since XXX - */ -public class SpeciesFateUIModel extends ContentReferenceUIModel<SpeciesFateDto> { - - private static final long serialVersionUID = 1L; - - public SpeciesFateUIModel() { - super(SpeciesFateDto.class); - } - +#discard { + text:"observe.common.discard"; + selected:{bean.isDiscard()}; } + diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java index c03c506..cc710c1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIModel.java @@ -22,21 +22,23 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine; * #L% */ -import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIModel; +import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto; /** * Created on 9/28/14. * * @author Tony Chemit - chemit@codelutin.com - * @since XXX + * @since 5.1 */ public class SpeciesFateUIModel extends ContentReferenceUIModel<SpeciesFateDto> { private static final long serialVersionUID = 1L; public SpeciesFateUIModel() { - super(SpeciesFateDto.class); + super(SpeciesFateDto.class, + new String[]{SpeciesFateDto.PROPERTY_DISCARD}, + new String[]{SpeciesFateUI.BINDING_DISCARD_SELECTED}); } } diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 7d46d8a..660ea39 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -380,6 +380,7 @@ observe.common.description=Description observe.common.detailledActivitiesObservation=detailled activities observe.common.detectionMode=Detection mode observe.common.directory=Directory +observe.common.discard=Discard ? observe.common.endDate=end date observe.common.endLogValue=End log value observe.common.equation=Equation diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index 18672ab..323b731 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -380,6 +380,7 @@ observe.common.description=Descripción observe.common.detailledActivitiesObservation=Actividades detalladas observe.common.detectionMode=Modo de detección observe.common.directory=Carpeta +observe.common.discard=Rejeté ? \#TODO observe.common.endDate=Fecha de fin observe.common.endLogValue=Corredera de tarde (millas) observe.common.equation=Relación talla-peso diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index 00a2bc8..c0ea086 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -380,6 +380,7 @@ observe.common.description=Description observe.common.detailledActivitiesObservation=Activités détaillées observe.common.detectionMode=Mode détection observe.common.directory=Répertoire +observe.common.discard=Rejeté ? observe.common.endDate=Fin de validité observe.common.endLogValue=Loch du soir (milles) observe.common.equation=Relation Taille-Poids -- 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 381e7f4fcf01492a36680c981d7e1b02e3349636 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 13:11:40 2016 +0100 Activer la raison de rejet si le devenir espèce le requière --- .../swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss | 1 + .../ui/content/table/impl/seine/NonTargetCatchUIHandler.java | 12 ++++++++---- .../dto/reference/ReferentialReferenceSetDefinitions.java | 3 ++- .../services/topia/binder/referential/SpeciesFateBinder.java | 9 ++------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss index abfbfed..3230c29 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jcss @@ -52,6 +52,7 @@ #reasonForDiscard { property:{NonTargetCatchDto.PROPERTY_REASON_FOR_DISCARD}; selectedItem:{tableEditBean.getReasonForDiscard()}; + enabled:{getHandler().showReasonForDiscard(tableEditBean.getSpeciesFate())}; } #wellLabel { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java index c19bfb7..288c7f3 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java @@ -25,8 +25,11 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; -import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.application.swing.db.constants.DataContextType; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.ui.UIHelper; +import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; +import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource; import fr.ird.observe.services.dto.referential.ReferentialDto; @@ -42,9 +45,6 @@ import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto; import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchHelper; import fr.ird.observe.services.service.seine.NonTargetCatchService; import fr.ird.observe.services.service.seine.TripSeineService; -import fr.ird.observe.application.swing.ui.UIHelper; -import fr.ird.observe.application.swing.ui.content.table.ContentTableModel; -import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -400,6 +400,10 @@ public class NonTargetCatchUIHandler extends ContentTableUIHandler<SetSeineNonTa } + public boolean showReasonForDiscard(ReferentialReference<SpeciesFateDto> speciesFate) { + return speciesFate != null && (boolean) speciesFate.getPropertyValue(SpeciesFateDto.PROPERTY_DISCARD); + } + protected NonTargetCatchService getNonTargetCatchService() { return ObserveSwingApplicationContext.get().getMainDataSourceServicesProvider().newNonTargetCatchService(); } diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java index c3be1cb..5b06607 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java @@ -243,7 +243,8 @@ public enum ReferentialReferenceSetDefinitions { REASON_FOR_NULL_SET(newDefaultDefinitionBuilder(ReasonForNullSetDto.class)), - SPECIES_FATE(newDefaultDefinitionBuilder(SpeciesFateDto.class)), + SPECIES_FATE(newDefaultDefinitionBuilder(SpeciesFateDto.class) + .addProperty(boolean.class, SpeciesFateDto.PROPERTY_DISCARD)), SPECIES_STATUS(newDefaultDefinitionBuilder(SpeciesStatusDto.class)), diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java index 4b82d09..90b4329 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/SpeciesFateBinder.java @@ -41,7 +41,6 @@ public class SpeciesFateBinder extends ReferentialBinderSupport<SpeciesFate, Spe @Override public void copyToEntity(ReferentialLocale referentialLocale, SpeciesFateDto dto, SpeciesFate entity) { - copyDtoReferentialFieldsToEntity(dto, entity); copyDtoI18nFieldsToEntity(dto, entity); entity.setDiscard(dto.isDiscard()); @@ -51,7 +50,6 @@ public class SpeciesFateBinder extends ReferentialBinderSupport<SpeciesFate, Spe @Override public void copyToDto(ReferentialLocale referentialLocale, SpeciesFate entity, SpeciesFateDto dto) { - copyEntityReferentialFieldsToDto(entity, dto); copyEntityI18nFieldsToDto(entity, dto); dto.setDiscard(entity.isDiscard()); @@ -61,16 +59,13 @@ public class SpeciesFateBinder extends ReferentialBinderSupport<SpeciesFate, Spe @Override public ReferentialReference<SpeciesFateDto> toReferentialReference(ReferentialLocale referentialLocale, SpeciesFate entity) { - return toReferentialReference(entity, - entity.getCode(), getLabel(referentialLocale, entity)); - + return toReferentialReference(entity, entity.getCode(), getLabel(referentialLocale, entity), entity.isDiscard()); } @Override public ReferentialReference<SpeciesFateDto> toReferentialReference(ReferentialLocale referentialLocale, SpeciesFateDto dto) { - return toReferentialReference(dto, - dto.getCode(), getLabel(referentialLocale, dto)); + return toReferentialReference(dto, dto.getCode(), getLabel(referentialLocale, dto), dto.isDiscard()); } } -- 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 9e92e7aeabe4c4f063fc63aadff088cac1a4fc41 Merge: e66a1c9 381e7f4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Nov 3 13:11:51 2016 +0100 [PS] Gestion plus intelligente des champs Devenir et Raison du rejet (Fixes #8377) Merge branch 'feature/8377' into develop .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx | 8 ++++++ ...{SpeciesFateUIModel.java => SpeciesFateUI.jcss} | 31 ++++++--------------- .../content/ref/impl/seine/SpeciesFateUIModel.java | 8 ++++-- .../content/table/impl/seine/NonTargetCatchUI.jcss | 1 + .../table/impl/seine/NonTargetCatchUIHandler.java | 12 +++++--- .../i18n/application-swing_en_GB.properties | 1 + .../i18n/application-swing_es_ES.properties | 1 + .../i18n/application-swing_fr_FR.properties | 1 + .../DataSourceMigrationForVersion_5_1.java | 1 + ...5_1_16_evol_8377_speciesFate_add_discard-H2.sql | 1 + ...5_1_16_evol_8377_speciesFate_add_discard-PG.sql | 1 + entities/src/main/xmi/observe-seine.zargo | Bin 86621 -> 86714 bytes .../ReferentialReferenceSetDefinitions.java | 3 +- .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60479 -> 60566 bytes .../binder/referential/SpeciesFateBinder.java | 11 +++----- 15 files changed, 42 insertions(+), 38 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm