Gestion des géométries (création/edition pour site et groupe de site)

backend/gn_module_monitoring/monitoring/geom.py

@@ -26,5 +26,9 @@ def serialize(self, depth):
             geometry = None
 
         monitoring_object_dict['geometry'] = geometry
-
+        if len(monitoring_object_dict['properties'].get('types_site', [])) != 0:
+            if hasattr(self._model, 'types_site'):
+                #TODO: performance?
+                types_site = [typ.nomenclature.label_fr for typ in self._model.types_site]
+            monitoring_object_dict['properties']['types_site'] = types_site
         return monitoring_object_dict

backend/gn_module_monitoring/monitoring/objects.py

@@ -27,6 +27,8 @@ class MonitoringSite(MonitoringObjectGeom):
     def preprocess_data(self, data):
         if len(data["types_site"]) > 0 and all(isinstance(x, int) for x in data["types_site"]):
             data["id_nomenclature_type_site"] = data["types_site"][0]
+        elif "data" in data and data["data"]["id_nomenclature_type_site"]:
+            data["id_nomenclature_type_site"] = data["data"]["id_nomenclature_type_site"]
         else:
             data["id_nomenclature_type_site"] = data["types_site"][0]["id_nomenclature_type_site"]
             # TODO: A enlever une fois qu'on aura enelever le champ "id_nomenclature_type_site" du model et de la bdd

backend/gn_module_monitoring/routes/monitoring.py

@@ -127,7 +127,7 @@ def create_or_update_object_api_sites_sites_group(module_code, object_type, id=N
     else:
         module = {"id_module": "generic"}
         # TODO : A enlever une fois que le post_data contiendra geometry et type depuis le front
-        if object_type == "site":
+        if object_type == "site" and not 'geometry' in post_data:
             post_data["geometry"] = {"type": "Point", "coordinates": [2.5, 50]}
             post_data["type"] = "Feature"
     # on rajoute id_module s'il n'est pas renseigné par défaut ??
@@ -144,6 +144,35 @@ def create_or_update_object_api_sites_sites_group(module_code, object_type, id=N
     )
 
 
+def get_config_object(module_code, object_type, id):
+    '''
+        renvoie un object, à partir de type de l'object et de son id
+
+        :param module_code: reference le module concerne
+        :param object_type: le type d'object (site, visit, obervation)
+        :param id : l'identifiant de l'object (de id_base_site pour site)
+        :type module_code: str
+        :type object_type: str
+        :type id: int
+
+        :return: renvoie l'object requis
+        :rtype: dict
+    '''
+
+    # field_name = param.get('field_name')
+    # value = module_code if object_type == 'module'
+    get_config(module_code, force=True)
+
+    depth = to_int(request.args.get('depth', 1))
+
+    return (
+        monitoring_definitions
+        .monitoring_object_instance(module_code, object_type, id)
+        .get(depth=depth)
+        # .get(value=value, field_name = field_name)
+        .serialize(depth)
+    )
+
 # update object
 @blueprint.route('object/<string:module_code>/<object_type>/<int:id>', methods=['PATCH'])
 @blueprint.route(

backend/gn_module_monitoring/routes/site.py

@@ -14,7 +14,7 @@
     TNomenclatures,
 )
 from gn_module_monitoring.monitoring.schemas import BibTypeSiteSchema, MonitoringSitesSchema
-from gn_module_monitoring.routes.monitoring import create_or_update_object_api_sites_sites_group
+from gn_module_monitoring.routes.monitoring import create_or_update_object_api_sites_sites_group, get_config_object
 from gn_module_monitoring.utils.routes import (
     filter_params,
     geojson_query,
@@ -25,6 +25,14 @@
 )
 
 
+@blueprint.route("/sites/config",
+                 defaults={'id': None, 'object_type': "site",'module_code':'generic'},
+                  methods=["GET"])
+def get_config_sites(module_code, object_type, id):
+    obj = get_config_object(module_code, object_type, id)
+    return obj['properties']
+
+
 @blueprint.route("/sites/types", methods=["GET"])
 def get_types_site():
     params = MultiDict(request.args)
@@ -155,11 +163,10 @@ def post_sites():
 
 @blueprint.route("/sites/<int:_id>", methods=["DELETE"])
 def delete_site(_id):
-    item = TMonitoringSites.find_by_id(_id)
-    db.session.delete(item)
+    TMonitoringSites.query.filter_by(id_g=_id).delete()
     db.session.commit()
     return {
-        "success": f"Item with {item.id_g} from table {item.__tablename__} is successfully deleted"
+        "success": "Item is successfully deleted"
     }, 200
 
 @blueprint.route("/sites/<int:_id>", methods=["PATCH"])

backend/gn_module_monitoring/routes/sites_groups.py

@@ -19,10 +19,18 @@
     paginate,
     sort,
 )
-from gn_module_monitoring.routes.monitoring import create_or_update_object_api_sites_sites_group
+from gn_module_monitoring.routes.monitoring import create_or_update_object_api_sites_sites_group, get_config_object
 from gn_module_monitoring.utils.utils import to_int
 
 
+@blueprint.route("/sites_groups/config",
+                 defaults={'id': None, 'object_type': "sites_group",'module_code':'generic'},
+                  methods=["GET"])
+def get_config_sites_groups(module_code, object_type, id):
+    obj = get_config_object(module_code, object_type, id)
+    return obj['properties']
+
+
 @blueprint.route("/sites_groups", methods=["GET"])
 def get_sites_groups():
     params = MultiDict(request.args)
@@ -44,7 +52,7 @@ def get_sites_groups():
 @blueprint.route("/sites_groups/<int:id_sites_group>", methods=["GET"])
 def get_sites_group_by_id(id_sites_group: int):
     schema = MonitoringSitesGroupsSchema()
-    result = TMonitoringSitesGroups.find_by_id(id_sites_group)
+    result = TMonitoringSitesGroups.query.get_or_404(id_sites_group)
     return jsonify(schema.dump(result))
 
 

config/monitoring/generic/site.json

@@ -17,14 +17,16 @@
     "last_visit",
     "nb_visits",
     "altitude_min",
-    "altitude_max"
+    "altitude_max",
+    "types_site"
   ],
   "display_list": [
     "base_site_name",
     "base_site_code",
     "id_nomenclature_type_site",
     "last_visit",
-    "nb_visits"
+    "nb_visits",
+    "types_site"
   ],
   "sorts": [
     {"prop": "last_visit", "dir": "desc"}
@@ -95,7 +97,7 @@
       },
       "types_site": {
         "type_widget": "datalist",
-        "attribut_label": "ID Type sites",
+        "attribut_label": "Type(s) de site",
         "hidden": true,
         "schema_dot_table": "gn_monitoring.t_base_sites"
       }

frontend/app/components/breadcrumbs/breadcrumbs.component.ts

@@ -16,31 +16,48 @@ import { ConfigService } from "../../services/config.service";
 import { MonitoringObject } from "../../class/monitoring-object";
 import { Router } from "@angular/router";
 import { ActivatedRoute } from "@angular/router";
+import { ObjectService } from "../../services/object.service";
+import { SiteSiteGroup } from "../../interfaces/objObs";
+import { IBreadCrumb } from "../../interfaces/object";
+
+export const breadCrumbElementBase: IBreadCrumb = {
+  "description":"Liste des groupes de site",
+  "label":"",
+  "url": "sites_group"
+}
 
 @Component({
   selector: "pnx-monitoring-breadcrumbs",
   templateUrl: "./breadcrumbs.component.html",
   styleUrls: ["./breadcrumbs.component.css"],
 })
 export class BreadcrumbsComponent implements OnInit {
-  public breadcrumbs;
-
+  public breadcrumbs: IBreadCrumb[] =[];
   @Input() bEdit: boolean;
   @Output() bEditChange = new EventEmitter<boolean>();
 
   public frontendModuleMonitoringUrl: string;
-
+  public newLabel: string;
+  public new_desc: string;
   @Input() obj: MonitoringObject;
+  // Specific to the site access
+  siteSiteGroup: SiteSiteGroup | null = null;
 
   constructor(
     private _dataMonitoringObjectService: DataMonitoringObjectService,
     private _configService: ConfigService,
     private _router: Router,
-    private _route: ActivatedRoute
+    private _route: ActivatedRoute,
+    private _objectService: ObjectService
   ) {}
 
   ngOnInit() {
-    // this.initBreadcrumbs();
+    if (this.obj === undefined) {
+      this._objectService.currentDataBreadCrumb.subscribe(
+        (breadCrumb) => (this.breadcrumbs = breadCrumb)
+      );
+      return;
+    }
   }
 
   initBreadcrumbs() {
@@ -76,22 +93,25 @@ export class BreadcrumbsComponent implements OnInit {
     this.bEditChange.emit(false);
     setTimeout(() => {
       if (elem) {
-        this._router.navigate(
-          [
-            this._configService.frontendModuleMonitoringUrl(),
-            "object",
-            elem.module_code,
-            elem.object_type,
-            elem.id,
-          ],
-          {
-            queryParams: elem.params,
-          }
-        );
+        if (this.obj == undefined) {
+          const url = [this._configService.frontendModuleMonitoringUrl(), elem.url].join('/');
+          this._router.navigateByUrl(url);
+        } else {
+          this._router.navigate(
+            [
+              this._configService.frontendModuleMonitoringUrl(),
+              'object',
+              elem.module_code,
+              elem.object_type,
+              elem.id,
+            ],
+            {
+              queryParams: elem.params,
+            }
+          );
+        }
       } else {
-        this._router.navigate([
-          this._configService.frontendModuleMonitoringUrl(),
-        ]);
+        this._router.navigate([this._configService.frontendModuleMonitoringUrl()]);
       }
     }, 100);
   }

frontend/app/components/draw-form/draw-form.component.ts

@@ -6,10 +6,11 @@ import {
   EventEmitter,
   ViewEncapsulation,
 } from "@angular/core";
-import { FormControl, FormGroup } from "@angular/forms";
+import { FormControl } from "@angular/forms";
 
 import { leafletDrawOptions } from "./leaflet-draw.options";
 import { CustomMarkerIcon } from "@geonature_common/map/marker/marker.component";
+import { FormService } from "../../services/form.service";
 
 @Component({
   selector: "pnx-draw-form",
@@ -37,7 +38,7 @@ export class DrawFormComponent implements OnInit {
 
   @Input() bEdit;
 
-  constructor() {}
+  constructor(private _formService: FormService) {}
 
   ngOnInit() {
     // choix du type de geometrie
@@ -105,7 +106,18 @@ export class DrawFormComponent implements OnInit {
   // suivi composant => formControl
   bindGeojsonForm(geojson) {
     this.geojson = geojson;
-    this.parentFormControl.setValue(geojson.geometry);
+    if (!this.parentFormControl){
+        this._formService.currentFormMap.subscribe((dataForm) => {
+          if('geometry' in dataForm.frmGp.controls){
+            this.parentFormControl = dataForm.frmGp.controls['geometry'] as FormControl
+            this.parentFormControl.setValue(geojson.geometry);
+          }
+          })
+        }
+    else {
+      this.parentFormControl.setValue(geojson.geometry);
+    }
+
   }
 
   ngOnChanges(changes) {

frontend/app/components/monitoring-form-g/monitoring-form.component-g.css

@@ -31,7 +31,7 @@ form.ng-invalid {
 
 #form-scroll {
   overflow-y: auto;
-  max-height: 70vh;
+  max-height: 60vh;
 }
 
 .btn-child {

frontend/app/components/monitoring-form-g/monitoring-form.component-g.html

@@ -1,9 +1,10 @@
 <pnx-modal-msg [bDisplayModal]="bDeleteModal" *ngIf="obj && obj.bIsInitialized">
   <h2>Attention</h2>
-  <p>
+  <p *ngIf="obj.config && obj.properties">
     <!-- TODO: voir pour améliorer le passage d'informations ici -->
-    Vous êtes sur le point de supprimer le groupe de site
-    <b>Description du groupe de site</b>
+    Vous êtes sur le point de supprimer
+    {{obj.config["label"]}} :  {{obj.properties[obj.config["description_field_name"]]}}
+    <br><b>(id :{{obj.properties[obj.config["id_field_name"]]}})</b>
   </p>
   <button class="btn btn-danger float-right" (click)="onDelete()">
     <span
@@ -18,12 +19,12 @@ <h2>Attention</h2>
 </pnx-modal-msg>
 
 <div>
-  <div id="properties-form" class="cadre" *ngIf="!hideForm">
+  <div id="properties-form" class="cadre" *ngIf="!hideForm && obj.bIsInitialized && objFormsDefinition">
     <!-- TODO: voir pour intiialisation si nécessaire à remettre dans la div du dessus -->
     <!-- *ngIf="obj.bIsInitialized && objFormsDefinition" -->
 
     <!--  TODO: Voir pour l'enchainement des saisies -->
-    <!-- <span
+    <span
       *ngIf="!obj.id && obj.config['chained']"
       id="toggle-btn"
       class="float-right"
@@ -37,17 +38,17 @@ <h2>Attention</h2>
         (change)="bChainInputChanged($event)"
       >
       </mat-slide-toggle>
-    </span> -->
+    </span>
 
     <form [formGroup]="objForm">
       <!-- TODO: Gérer la saisie de géometrie -->
-      <!-- <p
+      <p
         class="alert alert-warning"
         style="display:inline-block;"
-        *ngIf="obj.config['geometry_type'] && !objForm.value.geometry"
+        *ngIf="obj.config && obj.config['geometry_type'] && !objForm.value.geometry"
       >
         <span> Veuillez saisir une géométrie sur la carte </span>
-      </p> -->
+      </p>
 
       <!-- composant choix de site select + filtre -->
 
@@ -94,14 +95,15 @@ <h2>Attention</h2>
             aria-hidden="true"
           ></span>
 
-          <!-- <span *ngIf="bChainInput && !obj.id"
+          <span *ngIf="bChainInput && !obj.id"
             >Valider et enchainer les saisies</span
-          > -->
-          <!-- <span *ngIf="!bChainInput || obj.id">Valider</span>
-        </button> -->
-          <span>Valider</span>
+          > 
+           <span *ngIf="!bChainInput || obj.id">Valider</span>
         </button>
 
+          <!-- <span>Valider</span>
+        </button> -->
+
         <button class="btn btn-primary float-left" (click)="onCancelEdit()">Annuler</button>
         <button class="btn btn-danger float-left" (click)="bDeleteModal = true" *ngIf="obj.id">
           Supprimer