GitLab

at 2018-07-11T13:04:24Z

[PS][SERVER] La création du form FOB (Ctrl+P) depuis le form activité échoue en mode serveur - closes #1024

 package fr.ird.observe.client.ui.actions.content;

 

+/*-

+ * #%L

+ * ObServe :: Client

+ * %%

+ * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io

+ * %%

+ * 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.client.ObserveSwingApplicationContext;

 import fr.ird.observe.client.ui.ObserveKeyStrokes;

 import fr.ird.observe.client.ui.ObserveMainUI;

 package fr.ird.observe.client.ui.actions.content;

 

+/*-

+ * #%L

+ * ObServe :: Client

+ * %%

+ * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io

+ * %%

+ * 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 com.google.common.collect.Lists;

 import fr.ird.observe.client.ui.ObserveKeyStrokes;

 import fr.ird.observe.client.ui.ObserveMainUI;

  * #L%

  */

 

-import io.ultreia.java4all.bean.definition.JavaBeanDefinition;

-import io.ultreia.java4all.bean.definition.JavaBeanDefinitionStore;

-import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition;

-

-@GenerateJavaBeanDefinition

 public class LengthLengthParameterDto extends GeneratedLengthLengthParameterDto {

 

     private static final long serialVersionUID = 1L;

         setOutputInputFormulaValid(formulaTwoValid);

     }

 

-    @Override

-    public JavaBeanDefinition javaBeanDefinition() {

-        return JavaBeanDefinitionStore.definition(LengthLengthParameterDtoJavaBeanDefinition.class);

-    }

 }
  */

 

 import io.ultreia.java4all.bean.JavaBean;

-import io.ultreia.java4all.bean.definition.JavaBeanDefinition;

-import io.ultreia.java4all.bean.definition.JavaBeanDefinitionStore;

-import io.ultreia.java4all.bean.spi.GenerateJavaBeanDefinition;

 

-@GenerateJavaBeanDefinition

 public class LengthWeightParameterDto extends GeneratedLengthWeightParameterDto implements JavaBean {

 

     private static final long serialVersionUID = 1L;

         setWeightLengthFormulaValid(formulaTwoValid);

     }

 

-    @Override

-    public JavaBeanDefinition javaBeanDefinition() {

-        return JavaBeanDefinitionStore.definition(LengthWeightParameterDtoJavaBeanDefinition.class);

-    }

 }
-package fr.ird.observe.dto.referential;

-

-/*-

- * #%L

- * ObServe Toolkit :: Common Dto

- * %%

- * Copyright (C) 2017 - 2018 IRD, Ultreia.io

- * %%

- * 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 java.util.Comparator;

-import java.util.Date;

-import java.util.List;

-import java.util.Set;

-

-/**

- * Created on 22/12/16.

- *

- * @author Tony Chemit - dev@tchemit.fr

- * @since 6.0

- */

-public interface WithLengthFormula extends WithFormula, WithStartEndDate {

-

-    String PROPERTY_OCEAN = "ocean";

-    String PROPERTY_SPECIES = "species";

-    String PROPERTY_SEX = "sex";

-    String PROPERTY_START_DATE = "startDate";

-    String PROPERTY_END_DATE = "endDate";

-    String PROPERTY_COEFFICIENTS = "coefficients";

-    String PROPERTY_SOURCE = "source";

-

-    Comparator<WithLengthFormula> FORMULA_SUPPORT_START_DATE_COMPARATOR = Comparator.comparing(WithStartEndDate::getStartDate, WithStartEndDate.START_DATE_COMPARATOR);

-    Comparator<WithLengthFormula> FORMULA_SUPPORT_END_DATE_COMPARATOR = Comparator.comparing(WithStartEndDate::getEndDate, WithStartEndDate.END_DATE_COMPARATOR);

-    Comparator<WithLengthFormula> FORMULA_SUPPORT_COMPARATOR = FORMULA_SUPPORT_START_DATE_COMPARATOR.thenComparing(FORMULA_SUPPORT_END_DATE_COMPARATOR);

-

-    static <D extends WithLengthFormula> void sort(List<D> list) {

-        list.sort(FORMULA_SUPPORT_COMPARATOR);

-    }

-

-//    static <D extends WithStartEndDate> List<D> filter(List<D> list, Date date) {

-//        return list.stream()

-//                .filter(f -> WithStartEndDate.START_DATE_COMPARATOR.compare(f.getStartDate(), date) <= 0 && WithStartEndDate.END_DATE_COMPARATOR.compare(date, f.getEndDate()) <= 0)

-//                .collect(Collectors.toList());

-//    }

-

-    String getFormulaOneVariableName();

-

-    String getFormulaTwoVariableName();

-

-    void setStartDate(Date startDate);

-

-    void setEndDate(Date endDate);

-

-    void setCoefficients(String coefficients);

-

-    String getSource();

-

-    void setSource(String source);

-

-    default Set<String> getCoefficientNames() {

-        return getCoefficientValues().keySet();

-    }

-

-    String getFormulaOne();

-

-    String getFormulaTwo();

-

-    default void revalidateFormulaOne() {

-        boolean result = FormulaHelper.validateRelation(this, getFormulaOne(), getFormulaOneVariableName());

-        setFormulaOneValid(result);

-    }

-

-    boolean isFormulaOneValid();

-

-    void setFormulaOneValid(boolean formulaOneValid);

-

-    boolean isFormulaTwoValid();

-

-    void setFormulaTwoValid(boolean formulaTwoValid);

-

-    default void revalidateFormulaTwo() {

-        boolean result = FormulaHelper.validateRelation(this, getFormulaTwo(), getFormulaTwoVariableName());

-        setFormulaTwoValid(result);

-    }

-

-    default Double getCoefficientValue(String coefficientName) {

-        return getCoefficientValues().get(coefficientName);

-    }

-}
-package fr.ird.observe.dto.referential;

-

-import com.google.common.collect.Ordering;

-import fr.ird.observe.dto.reference.DtoReferenceAware;

-

-import java.util.Comparator;

-import java.util.Date;

-

-/**

- * Created by tchemit on 10/07/2018.

- *

- * @author Tony Chemit - dev@tchemit.fr

- */

-public interface WithStartEndDate extends DtoReferenceAware {

-

-    Comparator<Date> START_DATE_COMPARATOR = Ordering.natural().nullsFirst();

-    Comparator<Date> END_DATE_COMPARATOR = Ordering.natural().nullsLast();

-

-    Comparator<WithStartEndDate> WITH_START_DATE_COMPARATOR = Comparator.comparing(WithStartEndDate::getStartDate, START_DATE_COMPARATOR);

-    Comparator<WithStartEndDate> WITH_END_DATE_COMPARATOR = Comparator.comparing(WithStartEndDate::getEndDate, END_DATE_COMPARATOR);

-

-    Date getStartDate();

-

-    Date getEndDate();

-

-}
 

 enum constants.ObserveDbRole

 

-enum data.seine.SetSeineConstants

-targetSampleCapture

-endSetDate

-endPursingDate

-endSetTime

-endPursingTime

-

-enum data.seine.TargetLengthConstants

-totalWeight

-

 interface ObserveDto

 

-interface referential.WithLengthFormula

+interface referential.WithFormula

 

 interface WithComment

 getComment() String

 label7 + {*:1} String

 label8 + {*:1} String

 

-abstract referential.LengthFormulaSupport > referential.Referential >> referential.WithLengthFormula

+abstract referential.LengthFormulaSupport > referential.Referential >> referential.WithFormula

 startDate + {*:1} Date

 endDate + {*:1} Date

 coefficients + {*:1} String

 meanWeight + {*:1} Integer

 species {*:1} fr.ird.observe.dto.referential.SpeciesReference

 

-data.seine.SetSeine > data.Commentable | references=comment

+data.seine.SetSeine > data.Commentable | references=comment constants=targetSampleCapture,endSetDate,endPursingDate,endSetTime,endPursingTime

 startTime + {*:1} Date

 endPursingTimeStamp + {*:1} Date

 endSetTimeStamp + {*:1} Date

 reasonForDiscard {*:0..1} fr.ird.observe.dto.referential.seine.ReasonForDiscardReference

 species {*:1} fr.ird.observe.dto.referential.SpeciesReference

 

-data.seine.TargetLength > data.Data | references=speciesLabel,length,count

+data.seine.TargetLength > data.Data | references=speciesLabel,length,count constants=totalWeight

 length + {*:1} Float

 isLengthComputed + {*:1} boolean

 count + {*:1} Integer

  */

 

 import fr.ird.observe.dto.referential.FormulaHelper;

-import fr.ird.observe.dto.referential.WithLengthFormula;

 import org.apache.commons.lang3.BooleanUtils;

 

 import java.util.Map;

  * @author Tony Chemit - dev@tchemit.fr

  * @since 6.0

  */

-public abstract class FormulaSupportImpl extends FormulaSupportAbstract implements WithLengthFormula {

+public abstract class FormulaSupportImpl extends FormulaSupportAbstract {

 

     private static final long serialVersionUID = 1L;

 

 

 enum !fr.ird.observe.dto.data.seine.DcpComputedValue

 

-enum longline.ActivityLonglineConstants

-date

-time

-

-enum longline.BranchlineConstants

-timerTimeOnBoardDate

-timerTimeOnBoardTime

-

-enum longline.SetLonglineConstants

-settingStartDate

-settingStartTime

-settingStartQuadrant

-settingEndDate

-settingEndTime

-settingEndQuadrant

-haulingStartDate

-haulingStartTime

-haulingStartQuadrant

-haulingEndDate

-haulingEndTime

-haulingEndQuadrant

-floatlinesCompositionProportionSum

-branchlinesCompositionProportionSum

-hooksCompositionProportionSum

-baitsCompositionProportionSum

-

-enum longline.TdrConstants

-deployementStartDate

-deployementStartTime

-deployementEndDate

-deployementEndTime

-fishingStartDate

-fishingStartTime

-fishingEndDate

-fishingEndTime

-

-enum referentiel.FormulaSupportConstants

-formulaOneValid

-formulaTwoValid

-

-enum referentiel.HarbourConstants

-quadrant

-

-enum referentiel.ProgramConstants

-gearTypePrefix

-

-enum seine.SetConstants

-targetSampleCapture

-endSetDate

-endPursingDate

-endSetTime

-endPursingTime

-

-enum seine.TargetLengthConstants

-totalWeight

-

 interface Activity

 

 interface LengthWeightComputable

 abstract ObserveEntity >> fr.ird.observe.dto.reference.DtoReferenceAware | entity

 lastUpdateDate + {*:1} Date | notNull

 

-longline.ActivityLongline > CommentableEntity >> Activity | entity dbName=Activity

+longline.ActivityLongline > CommentableEntity >> Activity | entity dbName=Activity constants=date,time

 timeStamp + {*:1} Date

 latitude + {*:1} Float

 longitude + {*:1} Float

 tdr {*} longline.Tdr

 setLongline {*:1} longline.SetLongline | dbName=set

 

-longline.Branchline > CommentableEntity >> longline.LonglineCompositionEntity | entity

+longline.Branchline > CommentableEntity >> longline.LonglineCompositionEntity | entity constants=timerTimeOnBoardDate,timerTimeOnBoardTime

 settingIdentifier + {*:1} Integer | notNull

 haulingIdentifier + {*:1} Integer

 depthRecorder + {*:1} Boolean

 sensorDataFormat {*:0..1} referentiel.longline.SensorDataFormat

 sensorBrand {*:1} referentiel.longline.SensorBrand

 

-longline.SetLongline > CommentableEntity >> ObserveSet | entity dbName=Set

+longline.SetLongline > CommentableEntity >> ObserveSet | entity dbName=Set constants=settingStartTime,settingStartQuadrant,settingEndDate,settingEndTime,settingEndQuadrant,haulingStartDate,haulingStartTime,haulingStartQuadrant,haulingEndDate,haulingEndTime,haulingEndQuadrant,floatlinesCompositionProportionSum,branchlinesCompositionProportionSum,hooksCompositionProportionSum,baitsCompositionProportionSum

 homeId + {*:1} String

 number + {*:1} Integer

 basketsPerSectionCount + {*:1} Integer

 size + {*:1} Float | sqlType=numeric

 sizeMeasureType {*:1} referentiel.SizeMeasureType

 

-longline.Tdr > ObserveDataEntity >> longline.LonglinePositionAware | entity

+longline.Tdr > ObserveDataEntity >> longline.LonglinePositionAware | entity constants=deployementStartDate,deployementStartTime,deployementEndDate,deployementEndTime,fishingStartDate,fishingStartTime,fishingEndDate,fishingEndTime

 homeId + {*:1} String

 floatline1Length + {*:1} Float | sqlType=numeric

 floatline2Length + {*:1} Float | sqlType=numeric

 

 referentiel.DataQuality > referentiel.I18nReferentialEntity | entity

 

-abstract referentiel.FormulaSupport > referentiel.ObserveReferentialEntity >> fr.ird.observe.dto.referential.WithLengthFormula | entity

+abstract referentiel.FormulaSupport > referentiel.ObserveReferentialEntity >> fr.ird.observe.dto.referential.WithFormula | entity constants=formulaOneValid,formulaTwoValid

 ocean {*:0..1} referentiel.Ocean | notNull lazy=false

 species {*:1} referentiel.Species | notNull lazy=false

 sex {*:1} referentiel.Sex | notNull lazy=false

 

 referentiel.GearCaracteristicType > referentiel.I18nReferentialEntity | entity

 

-referentiel.Harbour > referentiel.ObserveReferentialEntity | entity

+referentiel.Harbour > referentiel.ObserveReferentialEntity | entity constants=quadrant

 country {*:1} referentiel.Country

 locode + {*:1} String

 name + {*:1} String

 dataEntryOperator + {*:1} boolean

 country {*:0..1} referentiel.Country

 

-referentiel.Program > referentiel.I18nReferentialEntity | entity

+referentiel.Program > referentiel.I18nReferentialEntity | entity constants=gearTypePrefix

 organism {*:1} referentiel.Organism | lazy=false

 nonTargetObservation + {*:1} int

 targetDiscardsObservation + {*:1} int

 setSeine {*:1} seine.SetSeine | naturalId dbName=set

 species {*:1} referentiel.Species | naturalId

 

-seine.SetSeine > CommentableEntity >> ObserveSet | entity dbName=Set

+seine.SetSeine > CommentableEntity >> ObserveSet | entity dbName=Set constants=targetSampleCapture,endSetDate,endPursingDate,endSetTime,endPursingTime

 startTime + {*:1} Date | hibernateAttributeType.java.util.Date=time

 endPursingTimeStamp + {*:1} Date

 endSetTimeStamp + {*:1} Date

 getSpecies() referentiel.Species

 setSpecies(species referentiel.Species)

 

-seine.TargetLength > ObserveDataEntity >> LengthWeightComputable | entity

+seine.TargetLength > ObserveDataEntity >> LengthWeightComputable | entity constants=totalWeight

 length + {*:1} Float | sqlType=numeric

 isLengthComputed + {*:1} boolean

 count + {*:1} Integer

   <parent>

     <groupId>io.ultreia.maven</groupId>

     <artifactId>pom</artifactId>

-    <version>2018.36</version>

+    <version>2018.40</version>

   </parent>

 

   <groupId>fr.ird.observe</groupId>

     <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format>

     <buildDate>${maven.build.timestamp}</buildDate>

 

-    <observeToolkitVersion>3.7.1</observeToolkitVersion>

-

+    <observeToolkitVersion>3.7.2</observeToolkitVersion>

     <!--<lib.version.java4all.jaxx>3.0-alpha-31</lib.version.java4all.jaxx>-->

     <!--<lib.version.nuiton.topia>3.4.2-SNAPSHOT</lib.version.nuiton.topia>-->

     <lib.version.nuiton.validation>3.1</lib.version.nuiton.validation>

     <!--<lib.version.hibernate>5.2.10.Final</lib.version.hibernate>-->

     <!--can't use 1.4.197 (date has changed + blob also-->

     <lib.version.h2>1.4.196</lib.version.h2>

-    <lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>

+    <!--<lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>-->

+    <lib.version.java4all.eugene>3.0-alpha-23</lib.version.java4all.eugene>

     <!--<lib.version.java4all.topia>1.1.2-SNAPSHOT</lib.version.java4all.topia>-->

     <!-- license header configuration -->

     <license.licenseName>gpl_v3</license.licenseName>

 import fr.ird.observe.services.ObserveServiceInitializer;

 import fr.ird.observe.services.ObserveServiceMainFactory;

 import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration;

+import fr.ird.observe.services.gson.FloatingObjectModificationAdapter;

 import fr.ird.observe.services.gson.ObserveDataSourceConfigurationAdapter;

 import fr.ird.observe.services.gson.ObserveDtoGsonSupplier;

 import fr.ird.observe.services.service.ObserveService;

+import fr.ird.observe.services.service.actions.consolidate.dcp.FloatingObjectModification;

 import org.debux.webmotion.server.call.HttpContext;

 import org.nuiton.version.Version;

 

             @Override

             protected GsonBuilder getGsonBuilder(boolean prettyPrint) {

                 return super.getGsonBuilder(prettyPrint)

-                        .registerTypeAdapter(ObserveDataSourceConfiguration.class, new ObserveDataSourceConfigurationAdapter());

+                        .registerTypeAdapter(ObserveDataSourceConfiguration.class, new ObserveDataSourceConfigurationAdapter())

+                        .registerTypeAdapter(FloatingObjectModification.class, new FloatingObjectModificationAdapter());

 

             }

         };

+package fr.ird.observe.services.gson;

+

+/*-

+ * #%L

+ * ObServe :: Services API

+ * %%

+ * Copyright (C) 2008 - 2018 IRD, Code Lutin, Ultreia.io

+ * %%

+ * 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 com.google.gson.JsonDeserializationContext;

+import com.google.gson.JsonDeserializer;

+import com.google.gson.JsonElement;

+import com.google.gson.JsonObject;

+import com.google.gson.JsonParseException;

+import com.google.gson.JsonSerializationContext;

+import com.google.gson.JsonSerializer;

+import fr.ird.observe.services.service.actions.consolidate.dcp.FloatingObjectModification;

+

+import java.io.Serializable;

+import java.lang.reflect.Type;

+

+/**

+ * Created by tchemit on 11/07/2018.

+ *

+ * @author Tony Chemit - dev@tchemit.fr

+ */

+public class FloatingObjectModificationAdapter implements JsonDeserializer<FloatingObjectModification>, JsonSerializer<FloatingObjectModification> {

+

+    @Override

+    public FloatingObjectModification deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {

+        JsonObject reportVariableJson = json.getAsJsonObject();

+

+        String dcpId = context.deserialize(reportVariableJson.get("dcpId"), String.class);

+        String propertyName = context.deserialize(reportVariableJson.get("propertyName"), String.class);

+        Class<?> type = context.deserialize(reportVariableJson.get("type"), Class.class);

+        Serializable newValue1 = context.deserialize(reportVariableJson.get("newValue"), type);

+        return new FloatingObjectModification(dcpId, propertyName, newValue1);

+    }

+

+    @Override

+    public JsonElement serialize(FloatingObjectModification src, Type typeOfSrc, JsonSerializationContext context) {

+        JsonObject result = new JsonObject();

+        result.add("dcpId", context.serialize(src.getDcpId()));

+        result.add("propertyName", context.serialize(src.getPropertyName()));

+        Serializable newValue = src.getNewValue();

+        result.add("type", context.serialize(newValue == null ? String.class : newValue.getClass()));

+        result.add("newValue", context.serialize(newValue));

+        return result;

+    }

+}
  */

 

 import com.google.gson.GsonBuilder;

+import fr.ird.observe.services.service.actions.consolidate.dcp.FloatingObjectModification;

 import fr.ird.observe.services.service.actions.report.ReportVariable;

 import io.ultreia.java4all.http.HResponseError;

 import io.ultreia.java4all.http.HResponseErrorAdapter;

         if (create) {

             gsonBuilder.registerTypeAdapter(ReportVariable.class, new ReportVariableAdapter());

             gsonBuilder.registerTypeAdapter(HResponseError.class, new HResponseErrorAdapter());

+            gsonBuilder.registerTypeAdapter(FloatingObjectModification.class, new FloatingObjectModificationAdapter());

 

         }

         return gsonBuilder;

  * #L%

  */

 

+import fr.ird.observe.dto.ObserveDto;

+

 import java.io.Serializable;

 

 /**

  *

  * @author Tony Chemit - dev@tchemit.fr

  */

-public class FloatingObjectModification implements Serializable {

+public class FloatingObjectModification implements ObserveDto, Serializable {

 

     private static final long serialVersionUID = 1L;

 

 import fr.ird.observe.services.spi.WriteDataPermission;

 import io.ultreia.java4all.http.spi.Delete;

 import io.ultreia.java4all.http.spi.Get;

+import io.ultreia.java4all.http.spi.Nullable;

 import io.ultreia.java4all.http.spi.Post;

 

 /**

 

     @Get

     @WriteDataPermission

-    Form<FloatingObjectDto> preCreate(String activitySeineId, String floatingObjectPresetId);

+    Form<FloatingObjectDto> preCreate(String activitySeineId, @Nullable String floatingObjectPresetId);

 

     @Write

     @WriteDataPermission

Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe

Commits:

15 changed files:

Changes: