July 2018 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop-7.x] Présentation de la liste des références taille-poids - Closes #994
by Tony CHEMIT 03 Jul '18

03 Jul '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 78d29121 by Tony CHEMIT at 2018-07-03T15:33:24Z Présentation de la liste des références taille-poids - Closes #994 Présentation de la liste des relations taille-taille - Closes #993 - - - - - 8 changed files: - dto/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterDtoReferenceBinder.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/LengthLengthParameterDecorator.java - dto/src/main/java/fr/ird/observe/dto/decoration/decorators/LengthWeightParameterDecorator.java - dto/src/main/models/Observe.model - persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterEntityReferenceBinder.java - persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityReferenceBinder.java Changes: ===================================== dto/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterDtoReferenceBinder.java ===================================== --- a/dto/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterDtoReferenceBinder.java +++ b/dto/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterDtoReferenceBinder.java @@ -53,7 +53,9 @@ public class LengthLengthParameterDtoReferenceBinder extends ReferentialDtoRefer Optional.ofNullable(dto.getSex()).map(SexReference::getLabel).orElse(null), dto.getStartDate(), dto.getEndDate(), + Optional.ofNullable(dto.getInputSizeMeasureType()).map(SizeMeasureTypeReference::getCode).orElse(null), Optional.ofNullable(dto.getInputSizeMeasureType()).map(SizeMeasureTypeReference::getLabel).orElse(null), + Optional.ofNullable(dto.getOutputSizeMeasureType()).map(SizeMeasureTypeReference::getCode).orElse(null), Optional.ofNullable(dto.getOutputSizeMeasureType()).map(SizeMeasureTypeReference::getLabel).orElse(null), dto.getInputOutputFormula(), dto.getOutputInputFormula()); ===================================== dto/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterDtoReferenceBinder.java ===================================== --- a/dto/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterDtoReferenceBinder.java +++ b/dto/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterDtoReferenceBinder.java @@ -53,7 +53,8 @@ public class LengthWeightParameterDtoReferenceBinder extends ReferentialDtoRefer dto.getStartDate(), dto.getEndDate(), dto.getLengthWeightFormula(), - dto.getWeightLengthFormula()); + dto.getWeightLengthFormula(), + dto.getCode()); } } ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java +++ b/dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java @@ -558,13 +558,13 @@ public class DecoratorService extends DecoratorProvider { @Override public void initLengthLengthParameterDto() { registerDecorator(new LengthLengthParameterDecorator(libelle)); - registerReferentialReferenceDecorator(LengthLengthParameterReference.class, "${speciesLabel}$s##${oceanLabel}$s##${sexLabel}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY##${inputSizeMeasureTypeLabel}$s##${outputSizeMeasureTypeLabel}$s"); + registerReferentialReferenceDecorator(LengthLengthParameterReference.class, "${speciesLabel}$s##${oceanLabel}$s##${sexLabel}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY##${inputSizeMeasureTypeCode}$s##${outputSizeMeasureTypeCode}$s"); } @Override public void initLengthWeightParameterDto() { registerDecorator(new LengthWeightParameterDecorator(libelle)); - registerReferentialReferenceDecorator(LengthWeightParameterReference.class, "${speciesLabel}$s##${oceanLabel}$s##${sexLabel}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY"); + registerReferentialReferenceDecorator(LengthWeightParameterReference.class, "${speciesLabel}$s##${oceanLabel}$s##${sexLabel}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY##${sizeMeasureTypeCode}$s"); } @Override ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/LengthLengthParameterDecorator.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/LengthLengthParameterDecorator.java +++ b/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/LengthLengthParameterDecorator.java @@ -37,7 +37,7 @@ public class LengthLengthParameterDecorator extends ObserveDecorator<LengthLengt private static final long serialVersionUID = 1L; public LengthLengthParameterDecorator(String libelle) throws IllegalArgumentException, NullPointerException { - super(LengthLengthParameterDto.class, "${species/scientificLabel}$s##${ocean/" + libelle + "}$s##${sex/" + libelle + "}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY##${inputSizeMeasureType/" + libelle + "}$s##${outputSizeMeasureType/" + libelle + "}$s"); + super(LengthLengthParameterDto.class, "${species/scientificLabel}$s##${ocean/" + libelle + "}$s##${sex/" + libelle + "}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY##${inputSizeMeasureType/code}$s##${outputSizeMeasureType/code}$s"); } @SuppressWarnings({"unchecked"}) ===================================== dto/src/main/java/fr/ird/observe/dto/decoration/decorators/LengthWeightParameterDecorator.java ===================================== --- a/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/LengthWeightParameterDecorator.java +++ b/dto/src/main/java/fr/ird/observe/dto/decoration/decorators/LengthWeightParameterDecorator.java @@ -38,7 +38,7 @@ public class LengthWeightParameterDecorator extends ObserveDecorator<LengthWeigh public LengthWeightParameterDecorator(String libelle) throws IllegalArgumentException, NullPointerException { super(LengthWeightParameterDto.class, - "${species/scientificLabel}$s##${ocean/" + libelle + "}$s##${sex}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY" + "${species/scientificLabel}$s##${ocean/" + libelle + "}$s##${sex}$s##${startDate}$td/%4$tm/%4$tY##${endDate}$td/%5$tm/%5$tY##${sizeMeasureType/code}$s" ); } @@ -62,15 +62,12 @@ public class LengthWeightParameterDecorator extends ObserveDecorator<LengthWeigh if (token.startsWith(LengthWeightParameterDto.PROPERTY_OCEAN)) { return t("observe.common.inconnu"); } -// if (token.equals(LengthWeightParameterDto.PROPERTY_START_DATE) || token.equals(LengthWeightParameterDto.PROPERTY_END_DATE)) { -// return null; -// } return super.getDefaultUndefinedValue(token); } @Override protected Comparable<?> getDefaultNullValue(String token) { - if (token.equals(LengthWeightParameterDto.PROPERTY_START_DATE) || token.equals(LengthWeightParameterDto.PROPERTY_END_DATE)) { + if (token.startsWith(LengthWeightParameterDto.PROPERTY_START_DATE) || token.startsWith(LengthWeightParameterDto.PROPERTY_END_DATE)) { return null; } return super.getDefaultNullValue(token); ===================================== dto/src/main/models/Observe.model ===================================== --- a/dto/src/main/models/Observe.model +++ b/dto/src/main/models/Observe.model @@ -393,7 +393,7 @@ longitude + {*:1} Float quadrant + {*:1} Integer country {*:0..1} fr.ird.observe.dto.referential.CountryReference -referential.LengthLengthParameter > referential.LengthFormulaSupport | references=oceanLabel,speciesLabel,sexLabel,startDate,endDate,inputSizeMeasureTypeLabel,outputSizeMeasureTypeLabel,inputOutputFormula,outputInputFormula +referential.LengthLengthParameter > referential.LengthFormulaSupport | references=oceanLabel,speciesLabel,sexLabel,startDate,endDate,inputSizeMeasureTypeCode,inputSizeMeasureTypeLabel,outputSizeMeasureTypeCode,outputSizeMeasureTypeLabel,inputOutputFormula,outputInputFormula inputOutputFormula + {*:1} String inputOutputFormulaValid + {*:1} boolean outputInputFormula + {*:1} String @@ -401,7 +401,7 @@ outputInputFormulaValid + {*:1} boolean inputSizeMeasureType {*:1} fr.ird.observe.dto.referential.SizeMeasureTypeReference outputSizeMeasureType {*:1} fr.ird.observe.dto.referential.SizeMeasureTypeReference -referential.LengthWeightParameter > referential.LengthFormulaSupport | references=oceanLabel,speciesLabel,sexLabel,startDate,endDate,lengthWeightFormula,weightLengthFormula +referential.LengthWeightParameter > referential.LengthFormulaSupport | references=oceanLabel,speciesLabel,sexLabel,startDate,endDate,lengthWeightFormula,weightLengthFormula,sizeMeasureTypeCode lengthWeightFormula + {*:1} String weightLengthFormula + {*:1} String meanLength + {*:1} Float ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterEntityReferenceBinder.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterEntityReferenceBinder.java +++ b/persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthLengthParameterEntityReferenceBinder.java @@ -10,12 +10,12 @@ package fr.ird.observe.binder.referential.common; * 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>. @@ -27,6 +27,9 @@ import fr.ird.observe.dto.referential.LengthLengthParameterDto; import fr.ird.observe.dto.referential.LengthLengthParameterReference; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.referentiel.LengthLengthParameter; +import fr.ird.observe.entities.referentiel.SizeMeasureType; + +import java.util.Optional; /** * Created on 24/11/15. @@ -47,9 +50,11 @@ public class LengthLengthParameterEntityReferenceBinder extends ReferentialEntit dto.getSex().getLabel(referentialLocale), dto.getStartDate(), dto.getEndDate(), - dto.getInputSizeMeasureType().getLabel(referentialLocale), - dto.getOutputSizeMeasureType().getLabel(referentialLocale), - dto.getInputOutputFormula(), - dto.getOutputInputFormula()); + Optional.ofNullable(dto.getInputSizeMeasureType()).map(SizeMeasureType::getCode).orElse(null), + Optional.ofNullable(dto.getInputSizeMeasureType()).map(e -> e.getLabel(referentialLocale)).orElse(null), + Optional.ofNullable(dto.getOutputSizeMeasureType()).map(SizeMeasureType::getCode).orElse(null), + Optional.ofNullable(dto.getOutputSizeMeasureType()).map(e -> e.getLabel(referentialLocale)).orElse(null), + dto.getInputOutputFormula(), + dto.getOutputInputFormula()); } } ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityReferenceBinder.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityReferenceBinder.java +++ b/persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityReferenceBinder.java @@ -10,12 +10,12 @@ package fr.ird.observe.binder.referential.common; * 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>. @@ -27,6 +27,9 @@ import fr.ird.observe.dto.referential.LengthWeightParameterDto; import fr.ird.observe.dto.referential.LengthWeightParameterReference; import fr.ird.observe.dto.referential.ReferentialLocale; import fr.ird.observe.entities.referentiel.LengthWeightParameter; +import fr.ird.observe.entities.referentiel.SizeMeasureType; + +import java.util.Optional; /** * Created on 24/11/15. @@ -43,13 +46,14 @@ public class LengthWeightParameterEntityReferenceBinder extends ReferentialEntit public LengthWeightParameterReference toReference(ReferentialLocale referentialLocale, LengthWeightParameter dto) { return new LengthWeightParameterReference(dto, - dto.getOcean().getLabel(referentialLocale), - dto.getSpecies().getScientificLabel(), - dto.getSex().getLabel(referentialLocale), + dto.getOcean().getLabel(referentialLocale), + dto.getSpecies().getScientificLabel(), + dto.getSex().getLabel(referentialLocale), dto.getStartDate(), dto.getEndDate(), - dto.getLengthWeightFormula(), - dto.getWeightLengthFormula()); + dto.getLengthWeightFormula(), + dto.getWeightLengthFormula(), + Optional.ofNullable(dto.getSizeMeasureType()).map(SizeMeasureType::getCode).orElse(null)); } } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/78d29121fd0a2c3aa366e5f5da8… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/78d29121fd0a2c3aa366e5f5da8… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Correction de libelles manquants - See #958
by Tony CHEMIT 03 Jul '18

03 Jul '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 94bc7892 by Tony CHEMIT at 2018-07-03T11:38:31Z Correction de libelles manquants - See #958 - - - - - 1 changed file: - client/src/main/java/fr/ird/observe/client/ui/content/list/ContentListUI.jcss Changes: ===================================== client/src/main/java/fr/ird/observe/client/ui/content/list/ContentListUI.jcss ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/content/list/ContentListUI.jcss +++ b/client/src/main/java/fr/ird/observe/client/ui/content/list/ContentListUI.jcss @@ -37,7 +37,7 @@ } #emptyLabel { - text: {getEmptyListMessage()}; + text: {t(getEmptyListMessage())}; horizontalAlignment: center; preferredSize:{new Dimension(200,400)}; } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/94bc78925fbc5712924c1cd6ae1… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/94bc78925fbc5712924c1cd6ae1… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] fix test
by Tony CHEMIT 03 Jul '18

03 Jul '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: eb7902bb by Tony CHEMIT at 2018-07-03T11:08:42Z fix test - - - - - 1 changed file: - services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java Changes: ===================================== services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java ===================================== --- a/services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java +++ b/services-local/src/test/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocalTest.java @@ -171,7 +171,7 @@ public class ValidateServiceLocalTest extends ServiceLocalTestSupport { assertValidateResult(result, NonTargetCatchReleaseConformityDto.class, 2); assertValidateResult(result, MaturityStatusDto.class, 3); - assertValidateResult(result, LengthWeightParameterDto.class, 2); + assertValidateResult(result, LengthWeightParameterDto.class, 3); assertValidateResult(result, LengthLengthParameterDto.class, 0); assertValidateResult(result, NonTargetCatchReleaseStatusDto.class, 2); assertValidateResult(result, SurroundingActivityDto.class, 3); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/eb7902bbc98bb61ddd70208d158… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/eb7902bbc98bb61ddd70208d158… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Relations taille-poids : le type de mesure ne s'affiche pas dans l'UI - Closes #995
by Tony CHEMIT 03 Jul '18

03 Jul '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: e3ac4fa9 by Tony CHEMIT at 2018-07-03T11:00:34Z Relations taille-poids : le type de mesure ne s'affiche pas dans l'UI - Closes #995 - - - - - 1 changed file: - persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityDtoBinder.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityDtoBinder.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityDtoBinder.java +++ b/persistence/src/main/java/fr/ird/observe/binder/referential/common/LengthWeightParameterEntityDtoBinder.java @@ -51,6 +51,7 @@ public class LengthWeightParameterEntityDtoBinder extends ReferentialEntityDtoBi entity.setSource(dto.getSource()); entity.setStartDate(dto.getStartDate()); entity.setEndDate(dto.getEndDate()); + entity.setSizeMeasureType(toEntity(dto.getSizeMeasureType())); } @@ -67,6 +68,7 @@ public class LengthWeightParameterEntityDtoBinder extends ReferentialEntityDtoBi dto.setSource(entity.getSource()); dto.setStartDate(entity.getStartDate()); dto.setEndDate(entity.getEndDate()); + dto.setSizeMeasureType(toReferentialReference(referentialLocale, entity.getSizeMeasureType())); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e3ac4fa91c480aa16c7b301d51c… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/e3ac4fa91c480aa16c7b301d51c… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] 2 commits: Revoir la clé d'unicité sur le référentiel taille-taille - See #992
by Tony CHEMIT 03 Jul '18

03 Jul '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 16e80c82 by Tony CHEMIT at 2018-07-03T10:32:58Z Revoir la clé d'unicité sur le référentiel taille-taille - See #992 - - - - - c7a6c10a by Tony CHEMIT at 2018-07-03T10:33:28Z Fix consolidation code - - - - - 11 changed files: - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java - validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-error-validation.xml - validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-warning-validation.xml - validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-update-error-validation.xml - validation/src/main/resources/i18n/validation_en_GB.properties - validation/src/main/resources/i18n/validation_es_ES.properties - validation/src/main/resources/i18n/validation_fr_FR.properties Changes: ===================================== services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java ===================================== --- a/services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java +++ b/services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java @@ -686,16 +686,14 @@ public class ConsolidateDataServiceLocal extends ObserveServiceLocal implements // on doit effectuer une conversion taille - taille avant de convertir en poids Optional<LengthLengthParameter> optionalLengthLengthParameter = activityContext.findLengthLengthParameter(species, sex, inputSizeMeasureType, outputSizeMeasureType); - if (optionalLengthLengthParameter == null) { + if (optionalLengthLengthParameter.isPresent()) { + length = optionalLengthLengthParameter.get().computeFromFormulaOne(length); + } else { if (log.isWarnEnabled()) { log.warn("Could not find lengLengthParameter for input: " + inputSizeMeasureType + " - output: " + outputSizeMeasureType); } return; - } else { - - length = optionalLengthLengthParameter.get().computeFromFormulaOne(length); - } } ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-error-validation.xml ===================================== --- a/validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-error-validation.xml +++ b/validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-error-validation.xml @@ -42,6 +42,11 @@ </field> <field name="ocean"> +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthLengthParameter.null.ocean</message> + </field-validator> +  <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> @@ -52,6 +57,11 @@ </field> <field name="sex"> +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthLengthParameter.null.sex</message> + </field-validator> +  <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> @@ -73,6 +83,11 @@ <field name="inputSizeMeasureType"> +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthLengthParameter.null.inputSizeMeasureType</message> + </field-validator> +  <field-validator type="fieldexpression"> <param name="expression"> @@ -85,6 +100,11 @@ <field name="outputSizeMeasureType"> +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthLengthParameter.null.outputSizeMeasureType</message> + </field-validator> +  <field-validator type="fieldexpression"> <param name="expression"> ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-warning-validation.xml ===================================== --- a/validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-warning-validation.xml +++ b/validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-create-warning-validation.xml @@ -43,27 +43,6 @@ </field-validator> </field> - <field name="inputSizeMeasureType"> -  - <field-validator type="required"> - <message>observe.validation.lengthLengthParameter.null.inputSizeMeasureType</message> - </field-validator> - </field> - - <field name="outputSizeMeasureType"> -  - <field-validator type="required"> - <message>observe.validation.lengthLengthParameter.null.outputSizeMeasureType</message> - </field-validator> - </field> - - <field name="ocean"> -  - <field-validator type="required"> - <message>observe.validation.lengthWeightParameter.null.ocean</message> - </field-validator> - </field> - <field name="startDate">  <field-validator type="required"> @@ -80,5 +59,4 @@ </field-validator> </field> - </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-error-validation.xml ===================================== --- a/validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-error-validation.xml +++ b/validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-error-validation.xml @@ -41,6 +41,11 @@ </field> <field name="ocean"> +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthLengthParameter.null.ocean</message> + </field-validator> +  <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> @@ -53,7 +58,7 @@ <field name="sex">  <field-validator type="required" short-circuit="true"> - <message>observe.validation.lengthLengthParameter.required.sex</message> + <message>observe.validation.lengthLengthParameter.null.sex</message> </field-validator>  @@ -74,6 +79,38 @@ </field-validator> </field> + <field name="inputSizeMeasureType"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthLengthParameter.null.inputSizeMeasureType</message> + </field-validator> + +  + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ intputSizeMeasureType == null || intputSizeMeasureType.enabled ]]> + </param> + <message>observe.validation.lengthLengthParameter.disabled.inputSizeMeasureType</message> + </field-validator> + </field> + + + <field name="outputSizeMeasureType"> + +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthLengthParameter.null.outputSizeMeasureType</message> + </field-validator> + +  + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ outputSizeMeasureType == null || outputSizeMeasureType.enabled ]]> + </param> + <message>observe.validation.lengthLengthParameter.disabled.inputSizeMeasureType</message> + </field-validator> + </field> <field name="inputOutputFormula">  ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-warning-validation.xml ===================================== --- a/validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-warning-validation.xml +++ b/validation/src/main/resources/fr/ird/observe/dto/referential/LengthLengthParameterDto-update-warning-validation.xml @@ -59,5 +59,4 @@ </field-validator> </field> - </validators> ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-error-validation.xml ===================================== --- a/validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-error-validation.xml +++ b/validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-error-validation.xml @@ -41,18 +41,12 @@ </field-validator> </field> - <field name="sizeMeasureType"> - -  - <field-validator type="fieldexpression"> - <param name="expression"> - <![CDATA[ sizeMeasureType == null || sizeMeasureType.enabled ]]> - </param> - <message>observe.validation.lengthWeightParameter.disabled.sizeMeasureType</message> + <field name="ocean"> +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthWeightParameter.null.ocean</message> </field-validator> - </field> - <field name="ocean">  <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> @@ -63,6 +57,11 @@ </field> <field name="sex"> +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthWeightParameter.null.sex</message> + </field-validator> +  <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> @@ -82,6 +81,21 @@ </field-validator> </field> + <field name="sizeMeasureType"> +  + <field-validator type="required"> + <message>observe.validation.lengthWeightParameter.null.sizeMeasureType</message> + </field-validator> + +  + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ sizeMeasureType == null || sizeMeasureType.enabled ]]> + </param> + <message>observe.validation.lengthWeightParameter.disabled.sizeMeasureType</message> + </field-validator> + </field> + <field name="lengthWeightFormula">  <field-validator type="requiredstring" short-circuit="true"> ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-warning-validation.xml ===================================== --- a/validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-warning-validation.xml +++ b/validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-create-warning-validation.xml @@ -43,21 +43,6 @@ </field-validator> </field> - <field name="ocean"> -  - <field-validator type="required"> - <message>observe.validation.lengthWeightParameter.null.ocean</message> - </field-validator> - </field> - - <field name="sizeMeasureType"> -  - <field-validator type="required"> - <message>observe.validation.lengthWeightParameter.null.sizeMeasureType</message> - </field-validator> - </field> - - <field name="startDate">  <field-validator type="required"> ===================================== validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-update-error-validation.xml ===================================== --- a/validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-update-error-validation.xml +++ b/validation/src/main/resources/fr/ird/observe/dto/referential/LengthWeightParameterDto-update-error-validation.xml @@ -51,6 +51,11 @@ </field> <field name="ocean"> +  + <field-validator type="required"> + <message>observe.validation.lengthWeightParameter.null.ocean</message> + </field-validator> +  <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> @@ -61,6 +66,11 @@ </field> <field name="sex"> +  + <field-validator type="required" short-circuit="true"> + <message>observe.validation.lengthWeightParameter.null.sex</message> + </field-validator> +  <field-validator type="observeReferentialCollectionUniqueKeyDto" short-circuit="true"> <param name="collectionFieldName">editingReferentielList</param> @@ -80,6 +90,21 @@ </field-validator> </field> + <field name="sizeMeasureType"> +  + <field-validator type="required"> + <message>observe.validation.lengthWeightParameter.null.sizeMeasureType</message> + </field-validator> + +  + <field-validator type="fieldexpression"> + <param name="expression"> + <![CDATA[ sizeMeasureType == null || sizeMeasureType.enabled ]]> + </param> + <message>observe.validation.lengthWeightParameter.disabled.sizeMeasureType</message> + </field-validator> + </field> + <field name="lengthWeightFormula">  <field-validator type="requiredstring" short-circuit="true"> ===================================== validation/src/main/resources/i18n/validation_en_GB.properties ===================================== --- a/validation/src/main/resources/i18n/validation_en_GB.properties +++ b/validation/src/main/resources/i18n/validation_en_GB.properties @@ -458,6 +458,7 @@ observe.validation.lengthLengthParameter.invalid.uniqueKey=Tuple (gender/ocean/s observe.validation.lengthLengthParameter.null.inputSizeMeasureType=Input size measure type is not filled. observe.validation.lengthLengthParameter.null.ocean=Ocean is not filled. observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Output size measure type is not filled. +observe.validation.lengthLengthParameter.null.sex=Sex must be filled. observe.validation.lengthLengthParameter.required.coefficients=Coefficients are required. observe.validation.lengthLengthParameter.required.endDate=End date must be filled. observe.validation.lengthLengthParameter.required.inputOutputFormula=Formula is required. ===================================== validation/src/main/resources/i18n/validation_es_ES.properties ===================================== --- a/validation/src/main/resources/i18n/validation_es_ES.properties +++ b/validation/src/main/resources/i18n/validation_es_ES.properties @@ -460,6 +460,7 @@ observe.validation.lengthLengthParameter.invalid.uniqueKey=Tupla (sexo/océano/e observe.validation.lengthLengthParameter.null.inputSizeMeasureType=Le type de mensuration d'entrée n'est pas renseigné. \#TODO observe.validation.lengthLengthParameter.null.ocean=No se ha seleccionado oceano. observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné. \#TODO +observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné. \#TODO observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires. \#TODO observe.validation.lengthLengthParameter.required.endDate=Fecha de fin de validez debe ser especificada. observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire. \#TODO ===================================== validation/src/main/resources/i18n/validation_fr_FR.properties ===================================== --- a/validation/src/main/resources/i18n/validation_fr_FR.properties +++ b/validation/src/main/resources/i18n/validation_fr_FR.properties @@ -458,6 +458,7 @@ observe.validation.lengthLengthParameter.invalid.uniqueKey=Le tuple (sexe/océan observe.validation.lengthLengthParameter.null.inputSizeMeasureType=Le type de mensuration d'entrée n'est pas renseigné. observe.validation.lengthLengthParameter.null.ocean=Aucun océan sélectionné. observe.validation.lengthLengthParameter.null.outputSizeMeasureType=Le type de mensuration de sortie n'est pas renseigné. +observe.validation.lengthLengthParameter.null.sex=Le sexe doit être renseigné. observe.validation.lengthLengthParameter.required.coefficients=Les coefficients sont obligatoires. observe.validation.lengthLengthParameter.required.endDate=Date de fin de validité non renseignée. observe.validation.lengthLengthParameter.required.inputOutputFormula=La formule est obligatoire. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2829316f729129bede28934ea9… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/2829316f729129bede28934ea9… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop-7.x] Migration de sql.gz V5 HS - Closes #990
by Tony CHEMIT 02 Jul '18

02 Jul '18

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 2829316f by Tony CHEMIT at 2018-07-02T18:22:28Z Migration de sql.gz V5 HS - Closes #990 - - - - - 1 changed file: - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java ===================================== --- a/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_2.java @@ -76,7 +76,7 @@ public class DataSourceMigrationForVersion_7_2 extends MigrationVersionResource @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { return connection.prepareStatement( - "SELECT DISTINCT(a.code) FROM observe_seine.observedsystem"); + "SELECT DISTINCT(a.code) FROM observe_seine.observedsystem a"); } @Override View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2829316f729129bede28934ea99… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2829316f729129bede28934ea99… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Update CHANGELOG.md
by Tony CHEMIT 01 Jul '18

01 Jul '18

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: de53474a by Tony CHEMIT at 2018-07-01T18:19:25Z Update CHANGELOG.md - - - - - 1 changed file: - CHANGELOG.md Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -53,8 +53,8 @@ Premier lot du contrat IRD-2018-01-V8 **Closed at 2018-07-01.** ### Download -* [Application (observe-7.0-RC-14.zip)](https://ultreia.io/release/observe-7.0-RC-14.zip) -* [Serveur (observe-7.0-RC-14.war )](https://ultreia.io/release/observe-7.0-RC-14.war) +* [Application (observe-7.0-RC-15.zip)](https://ultreia.io/release/observe-7.0-RC-15.zip) +* [Serveur (observe-7.0-RC-15.war )](https://ultreia.io/release/observe-7.0-RC-15.war) ### Issues * [[Anomalie 942]](https://gitlab.com/ultreiaio/ird-observe/issues/942) **Plantage base en sortie de l'outil de traduction** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/de53474a376d1a68449bcaf323f… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/de53474a376d1a68449bcaf323f… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][pages] Site checkin for project ObServe :: Pom
by Tony CHEMIT 01 Jul '18

01 Jul '18

Tony CHEMIT pushed to branch pages at ultreiaio / ird-observe Commits: 036ce194 by 166231 at 2018-07-01T18:07:23Z Site checkin for project ObServe :: Pom - - - - - 11 changed files: - administration-web.html - aggregate-third-party-report.html - architecture-logicielle.html - changelog.html - changes-report.html - config-report.html - dependency-convergence.html - dependency-info.html - dependency-management.html - dependency-updates-report.html - dev-activity.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/036ce194c0406fd69af76139db0… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/036ce194c0406fd69af76139db0… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch release/7.0-RC-15
by Tony CHEMIT 01 Jul '18

01 Jul '18

Tony CHEMIT deleted branch release/7.0-RC-15 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new tag v7.0-RC-15
by Tony CHEMIT 01 Jul '18

01 Jul '18

Tony CHEMIT pushed new tag v7.0-RC-15 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/tree/v7.0-RC-15 You're receiving this email because of your account on gitlab.com.

1 0