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 a92a6afdb5ba129089870c392f2700c12d9b98b9 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Aug 31 18:21:05 2016 +0200 always reset computed filed before consolidate action --- .../actions/consolidate/ConsolidateDataServiceTopia.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java index b63f69e..65c5625 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java @@ -46,13 +46,13 @@ import fr.ird.observe.entities.seine.TargetLength; import fr.ird.observe.entities.seine.TargetSample; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeines; +import fr.ird.observe.services.dto.constants.ReferentialLocale; +import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.actions.consolidate.ConsolidateActivitySeineDataResult; import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest; import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataResult; import fr.ird.observe.services.topia.ObserveServiceTopia; -import fr.ird.observe.services.dto.constants.ReferentialLocale; -import fr.ird.observe.services.dto.seine.TripSeineDto; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -221,6 +221,16 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements activityContext.watchTargetLength(targetLength); + if (targetLength.isWeightSource()) { + targetLength.setWeight(null); + targetLength.setWeightSource(false); + } + + if (targetLength.isLengthSource()) { + targetLength.setLength(null); + targetLength.setLengthSource(false); + } + updateLengthWeightAble(activityContext, targetLength.getSpecies(), null, /* pas de sexe precise */ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.