fix jdd observers

PnX-SI · Mar 2, 2022 · 9325840 · 9325840
1 parent 4334e63
commit 9325840
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 19 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.2.9
+0.2.10
diff --git a/config/monitoring/generic/module.json b/config/monitoring/generic/module.json
@@ -5,15 +5,15 @@
   "label": "Module",
   "genre": "M",
   "uuid_field_name": "uuid_module_complement",
-  "display_properties": [ 
+  "display_properties": [
     "module_label",
     "module_desc",
     "datasets"
   ],
   "generic": {
     "id_module": {
       "type_widget": "text",
-      "attribut_label": "ID", 
+      "attribut_label": "ID",
       "hidden": true
     },
 
@@ -57,14 +57,17 @@
     },
 
     "datasets": {
-      "type_widget": "dataset",
-      "multi_select": true,
-      "type_util": "dataset",
+      "type_widget": "datalist",
       "attribut_label": "Jeux de données",
+      "type_util": "dataset",
+      "multiple": true,
+      "api": "meta/datasets",
+      "application": "GeoNature",
+      "keyValue": "id_dataset",
+      "keyLabel": "dataset_shortname",
       "required": true
     },
 
-
     "id_list_observer": {
       "type_widget": "datalist",
       "attribut_label": "Liste des observateurs",
@@ -73,7 +76,7 @@
       "multiple": false,
       "api" : "users/listes",
       "application": "GeoNature",
-      "required": true, 
+      "required": true,
       "type_util": "observer_list",
       "definition": "Liste des observateurs. À gérer dans UsersHub."
     },
@@ -86,7 +89,7 @@
       "multiple": false,
       "api" : "biblistes/",
       "application": "TaxHub",
-      "required": true, 
+      "required": true,
       "type_util": "taxonomy_list",
       "data_path": "data",
       "definition": "Liste des taxons. À gérer dans TaxHub."

diff --git a/config/monitoring/generic/visit.json b/config/monitoring/generic/visit.json
@@ -22,7 +22,7 @@
     "dataset",
     "nb_observations"
   ],
- 
+
   "sorts": [
     {"prop": "visit_date_min", "dir": "desc"}
   ],
@@ -43,10 +43,15 @@
       "hidden": true
     },
     "observers": {
-      "type_widget": "observers",
+      "type_widget": "datalist",
       "attribut_label": "Observateurs",
-      "required": true,
-      "id_list": "__MODULE.ID_LIST_OBSERVER"
+      "api": "users/menu/__MODULE.ID_LIST_OBSERVER",
+      "application": "GeoNature",
+      "keyValue": "id_role",
+      "keyLabel": "nom_complet",
+      "type_util": "user",
+      "multiple": true,
+      "required": true
     },
 
     "id_digitiser": {
@@ -75,11 +80,18 @@
     },
 
     "id_dataset": {
-      "type_widget": "dataset",
-      "type_util": "dataset",
+      "type_widget": "datalist",
       "attribut_label": "Jeu de données",
-      "required": true,
-      "module_code": "__MODULE.MODULE_CODE"
+      "type_util": "dataset",
+      "api": "meta/datasets",
+      "application": "GeoNature",
+      "keyValue": "id_dataset",
+      "keyLabel": "dataset_shortname",
+      "params": {
+        "orderby": "dataset_name",
+        "module_code": "__MODULE.MODULE_CODE"
+      },
+      "required": true
     },
 
     "nb_observations": {

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -2,6 +2,13 @@
 CHANGELOG
 =========
 
+0.2.10 (2022-03-02)
+
+**🐛 Corrections**
+
+* Reprise de la config pour les champs de jeux de données et les observateurs
+* Prise en compte du changement de l'api pour les jdd pour le choix des jdd de l'export
+
 0.2.9 (2022-01-13)
 ------------------
 
@@ -56,7 +63,7 @@ Si vous mettez à jour le module :
 * Export PDF configurables
 
   - Bouton accessible depuis les détails
-  
+
 * Export CSV configurables
 
   - Bouton accessible depuis les détails

diff --git a/frontend/app/components/monitoring-properties/monitoring-properties.component.ts b/frontend/app/components/monitoring-properties/monitoring-properties.component.ts
@@ -62,7 +62,6 @@ export class MonitoringPropertiesComponent implements OnInit {
             "orderby": "dataset_name",
             "module_code": this.obj.moduleCode
           },
-          "data_path": "data",
           "required": true
         },
     ];