GitLab

at 2022-04-30T15:08:54+02:00

[jgitflow-maven-plugin]updating poms for 7.6.13-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]
Problème de quadrant - See #2300

[jgitflow-maven-plugin]updating poms for branch'release/7.6.13' with non-snapshot versions[skip ci]
Problème de quadrant - See #2300

[jgitflow-maven-plugin]merging 'release/7.6.13' into 'master-7.x'
   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

   <artifactId>client-configuration</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

   <artifactId>client-core</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

   <artifactId>client-runner</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

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

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

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

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

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

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

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

             throw new ValidationException("No parameter 'fieldName' filled");

         }

 

-        ReferentialDtoReference ocean = (ReferentialDtoReference) getFieldValue(this.ocean, object);

+        ReferentialDtoReference<?,?> ocean = (ReferentialDtoReference<?, ?>) getFieldValue(this.ocean, object);

         if (ocean == null) {

             throw new ValidationException("could not find ocean named: " + this.ocean);

         }

             return;

         }

 

-        Integer code = Integer.valueOf(ocean.get(ReferentialDtoReference.PROPERTY_CODE));

-        boolean valid = code == 3

-                || (code == 1 && (quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4))

-                || (code == 2 && (quadrant == 1 || quadrant == 2));

-

+        String code = ocean.get(ReferentialDtoReference.PROPERTY_CODE);

+        boolean valid;

+        switch (code) {

+            case "1": // Atlantic

+                valid= quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4;

+                break;

+            case "2": // Indian

+                valid = quadrant == 1 || quadrant == 2;

+                break;

+            default:

+                valid=true;

+        }

         if (!valid) {

             if (getDefaultMessage().isEmpty()) {

                 setDefaultMessage(n("observe.validation.quadrant.invalid") + "##${" + this.ocean + ".label}");

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

   <artifactId>dto</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

   <artifactId>observe-i18n</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

   <artifactId>observe</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

   <artifactId>persistence</artifactId>

 

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

   <artifactId>ird-observe</artifactId>

-  <version>7.6.12</version>

+  <version>7.6.13</version>

   <packaging>pom</packaging>

 

   <name>ObServe :: Pom</name>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

   <artifactId>server-configuration</artifactId>

     <dependency>

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

       <artifactId>services</artifactId>

-      <version>7.6.12</version>

+      <version>7.6.13</version>

       <scope>compile</scope>

     </dependency>

 

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

   <artifactId>server-core</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

   <artifactId>server-runner</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

   <artifactId>services-client</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

   <artifactId>services-local</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

   <artifactId>services</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

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

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

   <artifactId>test</artifactId>

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

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

   <parent>

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

     <artifactId>ird-observe</artifactId>

-    <version>7.6.12</version>

+    <version>7.6.13</version>

   </parent>

 

   <artifactId>validation</artifactId>

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

Commits:

23 changed files:

Changes: