GitLab

at 2020-08-10T13:45:06+02:00

[jgitflow-maven-plugin]updating poms for 7.6.6-SNAPSHOT development[skip ci]
[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci]
[jgitflow-maven-plugin]merging 'master-7.x' into 'develop-7.x'
[jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci]
[LL] Perte des données saisies "catchhealthstatus" et "discardhealthstatus" dans table "catch" depuis le passage à 7.6.2 - Closes #1624

[PS] Champ "type de mensuration" ne se met pas à jour - Closes #1631

Move to version 7.7.0

[jgitflow-maven-plugin]updating poms for branch'release/7.7.0' with non-snapshot versions[skip ci]
[jgitflow-maven-plugin]merging 'release/7.7.0' into 'master-7.x'
   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

   <artifactId>client-configuration</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

   <artifactId>client-core</artifactId>

 

     @Override

     protected void onSpeciesChanged(SpeciesReference species) {

-

-        Optional<SizeMeasureTypeReference> oldSizeMeasureType = Optional.ofNullable(getTableEditBean()).map(NonTargetLengthDto::getSizeMeasureType);

-        Optional<SizeMeasureTypeReference> sizeMeasureType = getSpeciesDefaultSizeMeasureType(species);

-        log.debug("Default size measure " + sizeMeasureType.orElse(null));

-        getUi().getModel().setDefaultSizeMeasureType(sizeMeasureType.orElse(null));

+        log.debug("On species changed to : " + species);

+        SizeMeasureTypeReference oldSizeMeasureType = getTableEditBean().getSizeMeasureType();

+        Optional<SizeMeasureTypeReference> defaultSizeMeasureType = getSpeciesDefaultSizeMeasureType(species);

+        log.debug("Old size measure " + oldSizeMeasureType);

+        log.debug("Default size measure " + defaultSizeMeasureType.orElse(null));

+        getUi().getModel().setDefaultSizeMeasureType(defaultSizeMeasureType.orElse(null));

         resetDefaultSizeMeasureType();

-        oldSizeMeasureType.ifPresent(sizeMeasureTypeReference -> getTableEditBean().setSizeMeasureType(sizeMeasureTypeReference));

+        if (getTableModel().isCreate()) {

+            log.debug("On create mode, always use default size measure");

+            oldSizeMeasureType = null;

+        }

+        SizeMeasureTypeReference newSizeMeasureType = oldSizeMeasureType == null ? defaultSizeMeasureType.orElse(null) : oldSizeMeasureType;

+        log.debug("New size measure " + newSizeMeasureType);

+        getTableEditBean().setSizeMeasureType(newSizeMeasureType);

     }

 

     @Override

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

   <artifactId>client-runner</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

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

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

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

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

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

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

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

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

   <artifactId>dto</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

   <artifactId>observe-i18n</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

   <artifactId>observe</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

   <artifactId>persistence</artifactId>

 ALTER TABLE observe_longline.Catch ADD COLUMN discardHealthStatus VARCHAR(255);

 ALTER TABLE observe_longline.Catch ADD COLUMN catchHealthStatus VARCHAR(255);

 ALTER TABLE observe_longline.Catch ADD COLUMN stomachFullness VARCHAR(255);

-UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthStatus, 'Healthness','HealthStatus'), catchHealthStatus = REPLACE(catchHealthStatus, 'Healthness','HealthStatus'), stomachFullness = REPLACE(stomachFullness, 'StomacFullness','StomachFullness');

+UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthness, 'Healthness', 'HealthStatus'), catchHealthStatus = REPLACE(catchHealthness, 'Healthness', 'HealthStatus'), stomachFullness = REPLACE(stomacFullness, 'StomacFullness','StomachFullness');

 ALTER TABLE observe_longline.Catch DROP COLUMN discardHealthness;

 ALTER TABLE observe_longline.Catch DROP COLUMN catchHealthness;

 ALTER TABLE observe_longline.Catch DROP COLUMN stomacFullness;

 ALTER TABLE observe_longline.Catch ADD COLUMN discardHealthStatus VARCHAR(255);

 ALTER TABLE observe_longline.Catch ADD COLUMN catchHealthStatus VARCHAR(255);

 ALTER TABLE observe_longline.Catch ADD COLUMN stomachFullness VARCHAR(255);

-UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthStatus, 'Healthness','HealthStatus'), catchHealthStatus = REPLACE(catchHealthStatus, 'Healthness','HealthStatus'), stomachFullness = REPLACE(stomachFullness, 'StomacFullness','StomachFullness');

+UPDATE observe_longline.Catch SET discardHealthStatus = REPLACE(discardHealthness, 'Healthness', 'HealthStatus'), catchHealthStatus = REPLACE(catchHealthness, 'Healthness', 'HealthStatus'), stomachFullness = REPLACE(stomacFullness, 'StomacFullness','StomachFullness');

 ALTER TABLE observe_longline.Catch DROP COLUMN discardHealthness CASCADE;

 ALTER TABLE observe_longline.Catch DROP COLUMN catchHealthness CASCADE;

 ALTER TABLE observe_longline.Catch DROP COLUMN stomacFullness CASCADE;

 

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

   <artifactId>ird-observe</artifactId>

-  <version>7.6.5</version>

+  <version>7.7.0</version>

   <packaging>pom</packaging>

 

   <name>ObServe :: Pom</name>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

   <artifactId>server-configuration</artifactId>

     <dependency>

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

       <artifactId>services</artifactId>

-      <version>7.6.5</version>

+      <version>7.7.0</version>

       <scope>compile</scope>

     </dependency>

 

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

   <artifactId>server-core</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

   <artifactId>server-runner</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

   <artifactId>services-client</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

   <artifactId>services-local</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

   <artifactId>services</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

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

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

   <artifactId>test</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

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

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.5</version>

+    <version>7.7.0</version>

   </parent>

 

   <artifactId>validation</artifactId>

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

Commits:

30 changed files:

Changes: