branch develop updated (2cb3539 -> 12f649b)
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 2cb3539 deplacement des vielles versions new 09ae867 fix migration script new 1358550 on utilise le code pas le label new 28bb6ab nullité possible new cd0ffa8 reformat jaxx new 12f649b Mauvaise resitution de l'ifnromation «observé» ou «calculé» sur l'écran des échantillons (Fixes #8732) 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 12f649b26a9de6e880f095065f4c0461602cbcaf Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 18:57:54 2016 +0100 Mauvaise resitution de l'ifnromation «observé» ou «calculé» sur l'écran des échantillons (Fixes #8732) commit cd0ffa81b21ab0ddac37cfd2724565c82aa4b942 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 18:30:36 2016 +0100 reformat jaxx commit 28bb6ab06f32d7fecc3e6a1c2d76040bada2384f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 18:30:20 2016 +0100 nullité possible commit 1358550770aed1c5e1add7ecc855b01092ca8854 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 18:28:38 2016 +0100 on utilise le code pas le label commit 09ae867b2150bbdec86bfe65300adf23ba743af2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 18:28:02 2016 +0100 fix migration script Summary of changes: .../ui/content/table/impl/seine/NonTargetSampleUI.jaxx | 6 +++--- .../ui/content/table/impl/seine/NonTargetSampleUI.jcss | 1 + .../ui/content/table/impl/seine/TargetSampleUIHandler.java | 4 +++- .../db/migration/5.1/V5_1_08_evol_8390_measure_type-H2.sql | 4 ++-- .../db/migration/5.1/V5_1_08_evol_8390_measure_type-PG.sql | 4 ++-- .../services/dto/referential/SizeMeasureTypeHelper.java | 14 +++++++------- .../ird/observe/services/dto/seine/TargetLengthHelper.java | 13 +++++++++++++ 7 files changed, 31 insertions(+), 15 deletions(-) create mode 100644 services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthHelper.java -- 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 09ae867b2150bbdec86bfe65300adf23ba743af2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 18:28:02 2016 +0100 fix migration script --- .../resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-H2.sql | 4 ++-- .../resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-PG.sql | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-H2.sql index 60d6314..49fba8f 100644 --- a/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-H2.sql +++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-H2.sql @@ -30,8 +30,8 @@ UPDATE observe_common.LASTUPDATEDATE SET TYPE = 'fr.ird.observe.entities.referen ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType VARCHAR(255); UPDATE observe_seine.targetlength SET sizeMeasureType = NULL WHERE measureType = 0; -UPDATE observe_seine.targetlength SET sizeMeasureType = (select topiaid from observe_longline.sizemeasuretype where label1 ='PDL') WHERE measureType = 1; -UPDATE observe_seine.targetlength SET sizeMeasureType =(select topiaid from observe_longline.sizemeasuretype where label1='FL') WHERE measureType = 2; +UPDATE observe_seine.targetlength SET sizeMeasureType = (select topiaid from observe_longline.sizemeasuretype where code ='PDL') WHERE measureType = 1; +UPDATE observe_seine.targetlength SET sizeMeasureType =(select topiaid from observe_longline.sizemeasuretype where code='FL') WHERE measureType = 2; ALTER TABLE observe_seine.targetlength DROP COLUMN measureType; ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType2 VARCHAR(255); diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-PG.sql index f4ad6a7..3efb60c 100644 --- a/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-PG.sql +++ b/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-PG.sql @@ -32,8 +32,8 @@ UPDATE observe_common.LASTUPDATEDATE SET TYPE = 'fr.ird.observe.entities.referen ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType character varying(255); UPDATE observe_seine.targetlength SET sizeMeasureType = NULL WHERE measureType = 0; -UPDATE observe_seine.targetlength SET sizeMeasureType = (select topiaid from observe_longline.sizemeasuretype where label1 ='PDL') WHERE measureType = 1; -UPDATE observe_seine.targetlength SET sizeMeasureType =(select topiaid from observe_longline.sizemeasuretype where label1='FL') WHERE measureType = 2; +UPDATE observe_seine.targetlength SET sizeMeasureType = (select topiaid from observe_longline.sizemeasuretype where code='PDL') WHERE measureType = 1; +UPDATE observe_seine.targetlength SET sizeMeasureType =(select topiaid from observe_longline.sizemeasuretype where code='FL') WHERE measureType = 2; ALTER TABLE observe_seine.targetlength DROP COLUMN measureType CASCADE; ALTER TABLE observe_seine.targetlength ADD COLUMN sizeMeasureType2 character varying(255); -- 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 1358550770aed1c5e1add7ecc855b01092ca8854 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 18:28:38 2016 +0100 on utilise le code pas le label --- .../services/dto/referential/SizeMeasureTypeHelper.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java index d955fee..d31236d 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/SizeMeasureTypeHelper.java @@ -30,8 +30,8 @@ import java.util.stream.Collectors; public class SizeMeasureTypeHelper extends GeneratedSizeMeasureTypeHelper { - public static final ImmutableSet<String> SEINE_LD1_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("PDL","LD1"); - public static final ImmutableSet<String> SEINE_LF_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("LF", "FL"); + public static final ImmutableSet<String> SEINE_LD1_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("PDL", "LD1"); + public static final ImmutableSet<String> SEINE_LF_SIZE_MEASURE_TYPE_ID = ImmutableSet.of("FL", "LF"); public static List<ReferentialReference<SizeMeasureTypeDto>> filterForSeine(Collection<ReferentialReference<SizeMeasureTypeDto>> incoming) { return incoming.stream() @@ -42,7 +42,7 @@ public class SizeMeasureTypeHelper extends GeneratedSizeMeasureTypeHelper { } public static ReferentialReference<SizeMeasureTypeDto> filterForSeine(ReferentialReference<SizeMeasureTypeDto> incoming) { - int index = incoming.getPropertyIndex(SizeMeasureTypeDto.PROPERTY_LABEL); + int index = incoming.getPropertyIndex(SizeMeasureTypeDto.PROPERTY_CODE); String value; if (isLd1(incoming)) { value = "LD1"; @@ -57,24 +57,24 @@ public class SizeMeasureTypeHelper extends GeneratedSizeMeasureTypeHelper { public static boolean isLd1(ReferentialReference<SizeMeasureTypeDto> incoming) { - return SEINE_LD1_SIZE_MEASURE_TYPE_ID.contains(incoming.getPropertyValue(SizeMeasureTypeDto.PROPERTY_LABEL)); + return SEINE_LD1_SIZE_MEASURE_TYPE_ID.contains(incoming.getCode()); } public static boolean isLf(ReferentialReference<SizeMeasureTypeDto> incoming) { - return SEINE_LF_SIZE_MEASURE_TYPE_ID.contains(incoming.getPropertyValue(SizeMeasureTypeDto.PROPERTY_LABEL)); + return SEINE_LF_SIZE_MEASURE_TYPE_ID.contains(incoming.getCode()); } public static ReferentialReference<SizeMeasureTypeDto> getLd1(Collection<ReferentialReference<SizeMeasureTypeDto>> incoming) { return incoming.stream() .filter(SizeMeasureTypeHelper::isLd1) - .findAny().get(); + .findAny().orElse(null); } public static ReferentialReference<SizeMeasureTypeDto> getLf(Collection<ReferentialReference<SizeMeasureTypeDto>> incoming) { return incoming.stream() .filter(SizeMeasureTypeHelper::isLf) - .findAny().get(); + .findAny().orElse(null); } } -- 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 28bb6ab06f32d7fecc3e6a1c2d76040bada2384f Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 18:30:20 2016 +0100 nullité possible --- .../swing/ui/content/table/impl/seine/TargetSampleUIHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java index b6b8608..d2a63a2 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUIHandler.java @@ -324,7 +324,9 @@ public class TargetSampleUIHandler extends AbstractSampleUIHandler<TargetSampleD TargetSampleHelper.copyTargetSampleDto(form.getObject(), getBean()); for (TargetLengthDto targetLengthDto : getBean().getTargetLength()) { ReferentialReference<SizeMeasureTypeDto> sizeMeasureType = targetLengthDto.getSizeMeasureType(); - SizeMeasureTypeHelper.filterForSeine(sizeMeasureType); + if (sizeMeasureType != null) { + SizeMeasureTypeHelper.filterForSeine(sizeMeasureType); + } } } -- 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 cd0ffa81b21ab0ddac37cfd2724565c82aa4b942 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 18:30:36 2016 +0100 reformat jaxx --- .../swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx | 6 +++--- .../swing/ui/content/table/impl/seine/NonTargetSampleUI.jcss | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx index d1684b0..3e6a70f 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx @@ -148,8 +148,7 @@ public String getSpeciesFauneTypeTaille(ReferentialReference<SpeciesDto> species </cell> <cell anchor='east'> <JToolBar id='lengthSourceAction'> - <JButton id='lengthSourceInformation' - onActionPerformed='getHandler().resetIsLengthComputed()'/> + <JButton id='lengthSourceInformation' onActionPerformed='getHandler().resetIsLengthComputed()'/> </JToolBar> </cell> </row> @@ -195,7 +194,8 @@ public String getSpeciesFauneTypeTaille(ReferentialReference<SpeciesDto> species <JLabel id='speciesFateLabel'/> </cell> <cell weightx='1' anchor='east' columns="2"> - <BeanComboBox id='speciesFate' constructorParams='this' genericType='ReferentialReference<SpeciesFateDto>' _entityClass='SpeciesFateDto.class'/> + <BeanComboBox id='speciesFate' constructorParams='this' + genericType='ReferentialReference<SpeciesFateDto>'/> </cell> </row> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jcss index 74897b1..a921312 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jcss @@ -32,6 +32,7 @@ #speciesFate { property:{NonTargetLengthDto.PROPERTY_SPECIES_FATE}; selectedItem:{tableEditBean.getSpeciesFate()}; + _entityClass:{SpeciesFateDto.class}; } #acquisitionModeGroup { -- 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 12f649b26a9de6e880f095065f4c0461602cbcaf Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 18:57:54 2016 +0100 Mauvaise resitution de l'ifnromation «observé» ou «calculé» sur l'écran des échantillons (Fixes #8732) --- .../ird/observe/services/dto/seine/TargetLengthHelper.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthHelper.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthHelper.java new file mode 100644 index 0000000..ea6cef1 --- /dev/null +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthHelper.java @@ -0,0 +1,13 @@ +package fr.ird.observe.services.dto.seine; + +public class TargetLengthHelper extends GeneratedTargetLengthHelper { + + public static <BeanType extends TargetLengthDto> void copyTargetLengthDto(BeanType source, BeanType target) { + + GeneratedTargetLengthHelper.copyTargetLengthDto(source, target); + target.setIsLengthComputed(source.isIsLengthComputed()); + target.setIsWeightComputed(source.isIsWeightComputed()); + + } + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm