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/78d29121fd0a2c3aa366e5f5da82... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/78d29121fd0a2c3aa366e5f5da82... You're receiving this email because of your account on gitlab.com.