[Git][ultreiaio/ird-observe][develop] 2 commits: update fixtures

8 Nov 2021


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


Commits:
af6c3a12 by Tony Chemit at 2021-11-08T14:20:34+01:00
update fixtures

- - - - -
aca89b79 by Tony Chemit at 2021-11-08T14:26:02+01:00
update CHANGELOG [skip ci]

- - - - -


15 changed files:

- CHANGELOG.md
- server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/Create/content.json
- server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/Update/content.json
- server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Create/content.json
- server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Update/content.json
- tests/test/src/main/resources/fixtures/data/ll/common/Trip/content.json
- tests/test/src/main/resources/fixtures/data/ll/common/Trip/create.json
- tests/test/src/main/resources/fixtures/data/ll/logbook/Activity/content.json
- tests/test/src/main/resources/fixtures/data/ll/logbook/Activity/create.json
- tests/test/src/main/resources/fixtures/data/ps/common/Trip/content.json
- tests/test/src/main/resources/fixtures/data/ps/common/Trip/create.json
- tests/test/src/main/resources/fixtures/data/ps/logbook/Activity/content.json
- tests/test/src/main/resources/fixtures/data/ps/logbook/Activity/create.json
- tests/test/src/main/resources/fixtures/data/ps/logbook/Route/content.json
- tests/test/src/main/resources/fixtures/data/ps/logbook/Route/create.json


Changes:

=====================================
CHANGELOG.md
=====================================
@@ -1,7 +1,43 @@
 # ObServe changelog
 
  * Author [Tony Chemit](mailto:dev@tchemit.fr)
- * Last generated at 2021-10-27 12:34.
+ * Last generated at 2021-11-08 14:25.
+
+## Version [9.0.0-RC-18](https://gitlab.com/ultreiaio/ird-observe/-/milestones/206)
+
+**Closed at 2021-11-08.**
+
+### Download
+* [Application (observe-9.0.0-RC-18.zip)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.0.0-RC-18/observe-9....)
+* [Serveur (observe-9.0.0-RC-18.war)](https://repo1.maven.org/maven2/fr/ird/observe/observe/9.0.0-RC-18/observe-9....)
+
+### Issues
+  * [[Type::Anomalie 2071]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2071) **On peut créer un programme sans sélectionner aucun des types de données qu'il peut recevoir** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+  * [[Type::Anomalie 2074]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2074) **Ne pas supprimer les fichers temporaires à chaque lancement de l'application** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
+  * [[Type::Anomalie 2079]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2079) **Interdire l'utilisation des systèmes observés désactivés** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil)
+  * [[Type::Anomalie 2083]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2083) **Mauvais enregistrement matériaux au départ lors de l'import AVDTH** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
+  * [[Type::Anomalie 2086]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2086) **Voir pourquoi le parsing des poids min/max sur les catégories n'a pas bien fonctionné** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+  * [[Type::Anomalie 2087]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2087) **Si des activités sont liées aux échantillons ou bien au plan de cuves et qu'elles ne sont pas de type pêche, on ne les voit pas dans les formulaires associés** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
+  * [[Type::Anomalie 2088]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2088) **Par défaut l'assistant report ne cherche pas les reports au bon endroit** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+  * [[Type::Anomalie 2089]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2089) **Aucun report ne fonctionne en mode serveur** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+  * [[Type::Evolution 1347]](https://gitlab.com/ultreiaio/ird-observe/-/issues/1347) **Symboles de carte pour V9** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
+  * [[Type::Evolution 2011]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2011) **Revoir les conditions avant suppression des données (avec lien externe)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
+  * [[Type::Evolution 2051]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2051) **Supprimer ces flags sur Program** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+  * [[Type::Evolution 2070]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2070) **Création des routes et activités requises lorsqu'elles sont absentes** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+  * [[Type::Evolution 2075]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2075) **Alléger la décoration des espèces** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT)
+  * [[Type::Evolution 2076]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2076) **Positionner sur le bouton choisir un fichier ou un répertoire sur les écrans requis** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
+  * [[Type::Evolution 2078]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2078) **Passer activity.latitude/longitude en NULL possible** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+  * [[Type::Evolution 2080]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2080) **Activité PS logbook : Préremplir 'Nombre d'opération' avec 1** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+  * [[Type::Evolution 2081]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2081) **Distinguer Perte de transmission et Fin d'utilisation de balise** (Thanks to Pascal Cauquil) (Reported by Pascal Cauquil)
+  * [[Type::Evolution 2082]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2082) **Retirer le contrôle sur le quandrant en fonction de l'océan** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+  * [[Type::Evolution 2084]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2084) **Amélioration des pré-configuration de DCP** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
+  * [[Type::Evolution 2085]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2085) **Remplir les codes de weightmeasuremethod** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+  * [[Type::Evolution 2090]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2090) **Petite amélioration des formulaires sur les paquetages de référentiels** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
+  * [[Type::Evolution 2092]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2092) **La migration AVDTH met 'Peson' au lieu de 'Estimation Visuelle' sur les captures logbook** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+  * [[Type::Evolution 2093]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2093) **Mise en conformité des couleurs sur les nœuds de l'arbre de navigation sur les référentiels.** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
+  * [[Type::Evolution 2094]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2094) **Remonter l'action supprimer dans les formulaire de type tableau dans la popup Actions supplémentaires** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT)
+  * [[Type::Evolution 2097]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2097) **La migration AVDTH devrait initialiser le saisisseur de données logbook** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
+  * [[Type::Evolution 2098]](https://gitlab.com/ultreiaio/ird-observe/-/issues/2098) **Ajout de 3 codes dans le référentiel vesselActivity : la bonne méthode** (Thanks to Tony CHEMIT) (Reported by Pascal Cauquil)
 
 ## Version [9.0.0-RC-17](https://gitlab.com/ultreiaio/ird-observe/-/milestones/205)
 


=====================================
server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/Create/content.json
=====================================
@@ -558,6 +558,15 @@
     }
   ],
   "activityLogbook": [
+    {
+      "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093485",
+      "topiaCreateDate": "2021-01-05T03:40:31.000Z",
+      "lastUpdateDate": "2021-02-15T13:15:05.651Z",
+      "startTimeStamp": "2018-08-17T06:15:00.000Z",
+      "latitude": -1.666667,
+      "longitude": 54.65,
+      "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1464000000000#0.11"
+    },
     {
       "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093486",
       "topiaCreateDate": "2021-01-05T03:40:31.000Z",
@@ -615,15 +624,6 @@
         "mitigationType": [],
         "branchlinesComposition": []
       }
-    },
-    {
-      "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093485",
-      "topiaCreateDate": "2021-01-05T03:40:31.000Z",
-      "lastUpdateDate": "2021-02-15T13:15:05.651Z",
-      "startTimeStamp": "2018-08-17T06:15:00.000Z",
-      "latitude": -1.666667,
-      "longitude": 54.65,
-      "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1464000000000#0.11"
     }
   ],
   "landing": [


=====================================
server/runner/src/main/webResources/doc/api/public/data/ll/common/Trip/Update/content.json
=====================================
@@ -558,6 +558,15 @@
     }
   ],
   "activityLogbook": [
+    {
+      "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093485",
+      "topiaCreateDate": "2021-01-05T03:40:31.000Z",
+      "lastUpdateDate": "2021-02-15T13:15:05.651Z",
+      "startTimeStamp": "2018-08-17T06:15:00.000Z",
+      "latitude": -1.666667,
+      "longitude": 54.65,
+      "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1464000000000#0.11"
+    },
     {
       "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093486",
       "topiaCreateDate": "2021-01-05T03:40:31.000Z",
@@ -615,15 +624,6 @@
         "mitigationType": [],
         "branchlinesComposition": []
       }
-    },
-    {
-      "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093485",
-      "topiaCreateDate": "2021-01-05T03:40:31.000Z",
-      "lastUpdateDate": "2021-02-15T13:15:05.651Z",
-      "startTimeStamp": "2018-08-17T06:15:00.000Z",
-      "latitude": -1.666667,
-      "longitude": 54.65,
-      "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1464000000000#0.11"
     }
   ],
   "landing": [


=====================================
server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Create/content.json
=====================================
@@ -158,6 +158,7 @@
           "positionCorrected": false,
           "number": 1.0,
           "vesselActivity": "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586",
+          "relatedObservedActivity": "fr.ird.data.ps.observation.Activity#1554113237260#0.6013473195166136",
           "catches": [
             {
               "topiaId": "fr.ird.data.ps.logbook.Catch#1616768024297#0.28635979304850434",


=====================================
server/runner/src/main/webResources/doc/api/public/data/ps/common/Trip/Update/content.json
=====================================
@@ -158,6 +158,7 @@
           "positionCorrected": false,
           "number": 1.0,
           "vesselActivity": "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586",
+          "relatedObservedActivity": "fr.ird.data.ps.observation.Activity#1554113237260#0.6013473195166136",
           "catches": [
             {
               "topiaId": "fr.ird.data.ps.logbook.Catch#1616768024297#0.28635979304850434",


=====================================
tests/test/src/main/resources/fixtures/data/ll/common/Trip/content.json
=====================================
@@ -561,6 +561,15 @@
     }
   ],
   "activityLogbook": [
+    {
+      "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093485",
+      "topiaCreateDate": "2021-01-05T03:40:31.000Z",
+      "lastUpdateDate": "2021-02-15T13:15:05.651Z",
+      "startTimeStamp": "2018-08-17T06:15:00.000Z",
+      "latitude": -1.666667,
+      "longitude": 54.65,
+      "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1464000000000#0.11"
+    },
     {
       "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093486",
       "topiaCreateDate": "2021-01-05T03:40:31.000Z",
@@ -618,15 +627,6 @@
         "mitigationType": [],
         "branchlinesComposition": []
       }
-    },
-    {
-      "topiaId": "fr.ird.data.ll.logbook.Activity#1464000000000#0.01093485",
-      "topiaCreateDate": "2021-01-05T03:40:31.000Z",
-      "lastUpdateDate": "2021-02-15T13:15:05.651Z",
-      "startTimeStamp": "2018-08-17T06:15:00.000Z",
-      "latitude": -1.666667,
-      "longitude": 54.65,
-      "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1464000000000#0.11"
     }
   ],
   "landing": [


=====================================
tests/test/src/main/resources/fixtures/data/ll/common/Trip/create.json
=====================================
@@ -426,6 +426,12 @@
     }
   ],
   "activityLogbook": [
+    {
+      "startTimeStamp": "2018-08-17T06:15:00.000Z",
+      "latitude": -1.666667,
+      "longitude": 54.65,
+      "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1464000000000#0.11"
+    },
     {
       "startTimeStamp": "2018-08-18T14:35:00.000Z",
       "latitude": -4.35,
@@ -471,12 +477,6 @@
         "mitigationType": [],
         "branchlinesComposition": []
       }
-    },
-    {
-      "startTimeStamp": "2018-08-17T06:15:00.000Z",
-      "latitude": -1.666667,
-      "longitude": 54.65,
-      "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1464000000000#0.11"
     }
   ],
   "landing": [


=====================================
tests/test/src/main/resources/fixtures/data/ll/logbook/Activity/content.json
=====================================
@@ -6,6 +6,7 @@
   "latitude": -2.116667,
   "longitude": 55.05,
   "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1239832686138#0.1",
+  "relatedObservedActivity": "fr.ird.data.ll.observation.Activity#1538025383462#0.7048860714573149",
   "set": {
     "topiaId": "fr.ird.data.ll.logbook.Set#1464000000000#0.01093484",
     "topiaCreateDate": "2021-01-05T03:40:31.000Z",


=====================================
tests/test/src/main/resources/fixtures/data/ll/logbook/Activity/create.json
=====================================
@@ -3,6 +3,7 @@
   "latitude": -2.116667,
   "longitude": 55.05,
   "vesselActivity": "fr.ird.referential.ll.common.VesselActivity#1239832686138#0.1",
+  "relatedObservedActivity": "fr.ird.data.ll.observation.Activity#1538025383462#0.7048860714573149",
   "set": {
     "homeId": "FINSS-1093484",
     "settingStartTimeStamp": "2018-08-16T14:15:00.000Z",


=====================================
tests/test/src/main/resources/fixtures/data/ps/common/Trip/content.json
=====================================
@@ -161,6 +161,7 @@
           "positionCorrected": false,
           "number": 1.0,
           "vesselActivity": "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586",
+          "relatedObservedActivity": "fr.ird.data.ps.observation.Activity#1554113237260#0.6013473195166136",
           "catches": [
             {
               "topiaId": "fr.ird.data.ps.logbook.Catch#1616768024297#0.28635979304850434",


=====================================
tests/test/src/main/resources/fixtures/data/ps/common/Trip/create.json
=====================================
@@ -125,6 +125,7 @@
           "positionCorrected": false,
           "number": 1.0,
           "vesselActivity": "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586",
+          "relatedObservedActivity": "fr.ird.data.ps.observation.Activity#1554113237260#0.6013473195166136",
           "catches": [
             {
               "comment": "qa",


=====================================
tests/test/src/main/resources/fixtures/data/ps/logbook/Activity/content.json
=====================================
@@ -10,6 +10,7 @@
   "positionCorrected": false,
   "number": 1.0,
   "vesselActivity": "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586",
+  "relatedObservedActivity": "fr.ird.data.ps.observation.Activity#1554113237260#0.6013473195166136",
   "catches": [
     {
       "topiaId": "fr.ird.data.ps.logbook.Catch#1616768024297#0.28635979304850434",


=====================================
tests/test/src/main/resources/fixtures/data/ps/logbook/Activity/create.json
=====================================
@@ -7,6 +7,7 @@
   "positionCorrected": false,
   "number": 1.0,
   "vesselActivity": "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586",
+  "relatedObservedActivity": "fr.ird.data.ps.observation.Activity#1554113237260#0.6013473195166136",
   "catches": [
     {
       "comment": "qa",


=====================================
tests/test/src/main/resources/fixtures/data/ps/logbook/Route/content.json
=====================================
@@ -16,6 +16,7 @@
       "positionCorrected": false,
       "number": 1.0,
       "vesselActivity": "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586",
+      "relatedObservedActivity": "fr.ird.data.ps.observation.Activity#1554113237260#0.6013473195166136",
       "catches": [
         {
           "topiaId": "fr.ird.data.ps.logbook.Catch#1616768024297#0.28635979304850434",


=====================================
tests/test/src/main/resources/fixtures/data/ps/logbook/Route/create.json
=====================================
@@ -10,6 +10,7 @@
       "positionCorrected": false,
       "number": 1.0,
       "vesselActivity": "fr.ird.referential.ps.common.VesselActivity#1239832675369#0.12552908048322586",
+      "relatedObservedActivity": "fr.ird.data.ps.observation.Activity#1554113237260#0.6013473195166136",
       "catches": [
         {
           "comment": "qa",



View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1de267e06291f96a200be4418...

-- 
View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/1de267e06291f96a200be4418...
You're receiving this email because of your account on gitlab.com.

    

Tony CHEMIT (＠tchemit)

tags

participants (1)