add is_product_owner, maitre_ouvrage, echelle_saisie, ref_geo_saisie fields (refs PnX-SI#52)

Author: juggler31

.gitignore

@@ -106,6 +106,9 @@ venv.bak/
 
 # vscode
 .vscode/
+
+.idea
+cache
 # config module
 frontend/app/module.config.ts
 

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 (à déterminer)
 
+**🚀 Nouveautés**
+
+- Ajout de 3 nouveau champs "maitre_ouvrage", "echelle_saisie", "ref_geo_saisie"(#52, by @juggler31)
+
 **🐛 Corrections**
 
 - Ajout du boutton "quitter" sur l'onglet 9 (#114, by @juggler31)

backend/gn_module_zh/blueprint.py

@@ -19,7 +19,7 @@
 from ref_geo.models import BibAreasTypes, LAreas, LiMunicipalities
 from geonature.utils.config import config
 from geonature.utils.env import DB, ROOT_DIR, BACKEND_DIR
-from pypnnomenclature.models import TNomenclatures
+from pypnnomenclature.models import TNomenclatures, BibNomenclaturesTypes
 from pypnusershub.db.models import Organisme, User
 from sqlalchemy import desc, func, text, select, update, delete
 from sqlalchemy.orm import aliased
@@ -360,6 +360,8 @@ def get_pbf_complete():
                tz.menaces,
                tz.diagnostic_bio,
                tz.diagnostic_hydro,
+               tz.maitre_ouvrage,
+               tz.echelle_saisie,
                Json_build_object('criteres_delim', tz.criteres_delim,
                          'communes',
                          tz.communes,
@@ -452,6 +454,94 @@ def get_ref_autocomplete():
         DB.session.close()
 
 
+@blueprint.route("/product_owner/autocomplete", methods=["GET"])
+@permissions.check_cruved_scope("R", module_code="ZONES_HUMIDES")
+@json_resp
+def get_product_owner_autocomplete():
+    try:
+        params = request.args
+        search_product_owner = params.get("search_product_owner")
+        # search_title = 'MCD'
+        q = select(BibOrganismes, func.similarity(BibOrganismes.name, search_product_owner).label("idx_trgm"))
+
+        search_product_owner = search_product_owner.replace(" ", "%")
+        q = q.where(BibOrganismes.name.ilike("%" + search_product_owner + "%")).where(BibOrganismes.is_product_owner == True).order_by(desc("idx_trgm"))
+
+        limit = request.args.get("limit", 20)
+        data = DB.session.execute(q.limit(limit)).all()
+        if data:
+            return [d[0].as_dict() for d in data]
+        else:
+            return "No Result", 404
+    except Exception as e:
+        if e.__class__.__name__ == "ZHApiError":
+            raise ZHApiError(message=str(e.message), details=str(e.details))
+        exc_type, value, tb = sys.exc_info()
+        raise ZHApiError(
+            message="get_product_owner_autocomplete_error",
+            details=str(exc_type) + ": " + str(e.with_traceback(tb)),
+        )
+    finally:
+        DB.session.close()
+
+@blueprint.route("/echelle_saisie/autocomplete", methods=["GET"])
+@permissions.check_cruved_scope("R", module_code="ZONES_HUMIDES")
+@json_resp
+def get_echelle_saisie_autocomplete():
+    try:
+        params = request.args
+        search_echelle_saisie = params.get("search_echelle_saisie")
+        id_nommenclature_type = DB.session.execute(select(BibNomenclaturesTypes.id_type).where(BibNomenclaturesTypes.mnemonique.like('ECHELLE_SAISIE'))).scalar_one()
+        q = select(TNomenclatures.mnemonique).where(TNomenclatures.id_type == id_nommenclature_type).where(TNomenclatures.mnemonique.ilike("%" + search_echelle_saisie + "%"))
+
+        limit = request.args.get("limit", 20)
+        data = DB.session.execute(q.limit(limit)).all()
+
+        if data:
+            return [d[0] for d in data]
+        else:
+            return "No Result", 404
+    except Exception as e:
+        if e.__class__.__name__ == "ZHApiError":
+            raise ZHApiError(message=str(e.message), details=str(e.details))
+        exc_type, value, tb = sys.exc_info()
+        raise ZHApiError(
+            message="get_echelle_saisie_autocomplete_error",
+            details=str(exc_type) + ": " + str(e.with_traceback(tb)),
+        )
+    finally:
+        DB.session.close()
+
+@blueprint.route("/ref_geo_saisie/autocomplete", methods=["GET"])
+@permissions.check_cruved_scope("R", module_code="ZONES_HUMIDES")
+@json_resp
+def get_ref_geo_saisie_autocomplete():
+    try:
+        params = request.args
+        search_ref_geo_saisie = params.get("search_ref_geo_saisie")
+        id_nommenclature_type = DB.session.execute(select(BibNomenclaturesTypes.id_type).where(BibNomenclaturesTypes.mnemonique.like('REF_GEO_SAISIE'))).scalar_one()
+        q = select(TNomenclatures.mnemonique).where(TNomenclatures.id_type == id_nommenclature_type).where(TNomenclatures.mnemonique.ilike("%" + search_ref_geo_saisie + "%"))
+
+        limit = request.args.get("limit", 20)
+        data = DB.session.execute(q.limit(limit)).all()
+
+        if data:
+            return [d[0] for d in data]
+        else:
+            return "No Result", 404
+
+    except Exception as e:
+        if e.__class__.__name__ == "ZHApiError":
+            raise ZHApiError(message=str(e.message), details=str(e.details))
+        exc_type, value, tb = sys.exc_info()
+        raise ZHApiError(
+            message="get_ref_geo_saisie_autocomplete_error",
+            details=str(exc_type) + ": " + str(e.with_traceback(tb)),
+        )
+    finally:
+        DB.session.close()
+
+
 @blueprint.route("/<int:id_zh>/files", methods=["GET"])
 @permissions.check_cruved_scope("R", module_code="ZONES_HUMIDES")
 @json_resp_accept_empty_list
@@ -628,7 +718,6 @@ def get_tab_data(id_tab):
             raise BadRequest(
                 "Géométrie manquante",
             )
-
         # POST / PATCH
         if "id_zh" not in form_data.keys():
             # set geometry from coordinates

backend/gn_module_zh/conf_schema_toml.py

@@ -26,6 +26,7 @@ class MapListConfig(Schema):
     {"prop": "code", "name": "Code"},
     {"prop": "sdage", "name": "Typologie SDAGE", "sortable": True},
     {"prop": "bassin_versant", "name": "Bassin versant", "sortable": True},
+    {"prop": "echelle_saisie", "name": "Échelle de saisie"},
     {"prop": "delims", "name": "Critères délimitation (de la zh)", "sortable": True},
     {"prop": "create_date", "name": "Date de création"},
     {"prop": "author", "name": "Auteur"},

backend/gn_module_zh/forms.py

@@ -86,6 +86,9 @@ def create_zh(form_data, info_role, zh_date, polygon, zh_area, ref_geo_referenti
         geom=polygon,
         area=zh_area,
         main_id_rb=main_id_rb,
+        maitre_ouvrage = form_data["maitre_ouvrage"],
+        echelle_saisie = form_data["echelle_saisie"],
+        ref_geo_saisie = form_data["ref_geo_saisie"]
     )
     DB.session.add(new_zh)
     DB.session.flush()