wip profiles

backend/geonature/core/gn_profiles/models.py

@@ -1,6 +1,7 @@
 from flask import current_app
 from geoalchemy2 import Geometry
 from sqlalchemy.dialects.postgresql import UUID
+from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.sql.schema import ForeignKey
 
 from utils_flask_sqla.serializers import serializable
@@ -57,5 +58,11 @@ class VConsistancyData(DB.Model):
     valid_distribution = DB.Column(DB.Boolean)
     valid_phenology = DB.Column(DB.Boolean)
     valid_altitude = DB.Column(DB.Boolean)
-    score = DB.Column(DB.Integer)
+    # score = DB.Column(DB.Integer)
     valid_status = DB.Column(DB.Unicode)
+
+    def as_dict(data):
+        score = (data["valid_distribution"] or 0) + (
+                data["valid_altitude"] or 0
+                ) + (data["valid_phenology"] or 0)
+        return data.update({"score":score})

contrib/gn_module_validation/backend/blueprint.py

@@ -8,6 +8,8 @@
 from sqlalchemy import select, func
 from flask import Blueprint, request
 from geojson import FeatureCollection
+from sqlalchemy.sql.expression import cast
+from sqlalchemy.sql.sqltypes import Integer
 
 from utils_flask_sqla.response import json_resp
 from utils_flask_sqla.serializers import SERIALIZERS
@@ -69,7 +71,7 @@ def get_synthese_data(info_role):
         result_limit = filters.pop("limit")
     else:
         result_limit = blueprint.config["NB_MAX_OBS_MAP"]
-
+    result_limit = 100
     # Construction de la requête select
     # Les champs correspondent aux champs obligatoires
     #       + champs définis par l'utilisateur
@@ -107,24 +109,52 @@ def get_synthese_data(info_role):
                 serializer[column_config["column_name"]] = SERIALIZERS.get(
                     col.type.__class__.__name__.lower(), lambda x: x
                 )
-
+    # add profiles columns
+    columns_profile = ["valid_distribution", "valid_phenology", "valid_altitude"]
+    for col in columns_profile:
+        select_columns.append(
+            getattr(VConsistancyData, col)
+        )
+        serializer[col] = lambda x : x
     # Construction de la requête avec SyntheseQuery
     #   Pour profiter des opérations CRUVED
     query = (
         select(select_columns)
         .where(VSyntheseValidation.the_geom_4326.isnot(None))
         .order_by(VSyntheseValidation.date_min.desc())
     )
+    score = None
+    if "score" in filters :
+        score = filters.pop("score")
+
     validation_query_class = SyntheseQuery(VSyntheseValidation, query, filters)
+    validation_query_class.add_join(
+        VConsistancyData, VConsistancyData.id_synthese,
+        VSyntheseValidation.id_synthese, join_type="left"
+    )
+
+    #filter with profile
+    if score:
+        validation_query_class.query = validation_query_class.query.where(
+            VConsistancyData.valid_phenology.cast(Integer)+ 
+            VConsistancyData.valid_altitude.cast(Integer) + 
+            VConsistancyData.valid_distribution.cast(Integer)
+             == score
+        )
+
     validation_query_class.filter_query_all_filters(info_role)
-    result = DB.engine.execute(validation_query_class.query.limit(result_limit))
-    # TODO nb_total factice
+    print(validation_query_class.query)
+    result = DB.engine.execute(validation_query_class.query.limit(100))
     nb_total = 0
     geojson_features = []
     properties = {}
     # TODO : add join on VConsistency data
-    for r in result:    
+    for r in result:
         properties = {k: serializer[k](r[k]) for k in serializer.keys()}
+        properties["score"] = (
+            r["valid_distribution"] or 0) + (
+                r["valid_phenology"] or 0) + (
+                    r["valid_altitude"] or 0)
         properties["nom_vern_or_lb_nom"] = (
             r["nom_vern"] if r["nom_vern"] else r["lb_nom"]
         )

contrib/gn_module_validation/config/conf_schema_toml.py

@@ -22,6 +22,7 @@
     {"column_name": "nom_vern", "column_label": "nom_vern"},
     {"column_name": "lb_nom", "column_label": "lb_nom"},
     {"column_name": "validation_date", "column_label": "Date de validation"},
+    {"column_name": "score", "column_label": "Score"},
 ]
 
 

contrib/gn_module_validation/frontend/app/components/validation-synthese-list/validation-synthese-list.component.html

@@ -129,7 +129,7 @@
     </ng-template>
   </ngx-datatable-column>
 
-  <!-- <ngx-datatable-column 
+  <ngx-datatable-column 
     minWidth="10"
     [maxWidth]="100"
     *ngIf="appConfig.FRONTEND.DISPLAY_PROFILES"
@@ -225,7 +225,7 @@
       </ng-template>
 
     </ng-template>
-  </ngx-datatable-column> -->
+  </ngx-datatable-column>
 
 
   <ngx-datatable-footer>

contrib/gn_module_validation/frontend/app/components/validation-synthese-list/validation-synthese-list.component.scss

@@ -189,14 +189,18 @@ button:active {
 
 .chip-alert {
   background: red;
+  color: white!important;
+
 }
 
 .chip-warning {
-  background: orange;
+  background: rgb(255, 123, 0);
+  color: white!important;
 }
 
 .chip-success {
-  background: rgba(88, 146, 1, 0.0);
+  background: green;
+  color: white!important;
   }
 
 .mat-chip {