merge develop

Author: TheoLechemia

atlas/atlasAPI.py

@@ -1,10 +1,11 @@
 # -*- coding:utf-8 -*-
 import json
 
-from flask import jsonify, Blueprint, request, current_app
+from flask import jsonify, Blueprint, request, current_app, render_template
 
 from atlas import utils
 from atlas.modeles.repositories import (
+    vmTaxonsRepository,
     vmSearchTaxonRepository,
     vmObservationsRepository,
     vmObservationsMaillesRepository,
@@ -33,7 +34,6 @@ def searchAreaAPI():
     return jsonify(results)
 
 
-
 if not current_app.config["AFFICHAGE_MAILLE"]:
 
     @api.route("/observationsMailleAndPoint/<int(signed=True):cd_ref>", methods=["GET"])
@@ -44,15 +44,14 @@ def getObservationsMailleAndPointAPI(cd_ref):
         :returns: dict ({'point:<GeoJson>', 'maille': 'GeoJson})
         """
         observations = {
-            "point": vmObservationsRepository.getObservationsChilds(filters={"cd_ref": cd_ref}),
+            "point": vmObservationsRepository.getObservationsChilds(params={"cd_ref": cd_ref}),
             "maille": vmObservationsMaillesRepository.getObservationsMaillesChilds(
-                filters={"cd_ref": cd_ref}
+                params={"cd_ref": cd_ref}
             ),
         }
         return jsonify(observations)
 
 
-
 @api.route("/observationsMaille", methods=["GET"])
 def getObservationsMailleAPI():
     """
@@ -69,14 +68,16 @@ def getObservationsMailleAPI():
         - year_min / year_max : filtre les observation dans des bornes d'année
         - cd_ref : renvoie que les observation de ce taxon et de ces enfants
         - id_area : renvoie uniquement les observations présente dans l'aire demandée
+        - fields: permet d'ajouter des champs au geojson:
+            -> "taxons" pour ajouter la liste de taxons de chaque maile
+            -> "ids_obs" pour ajouter la liste des id_observation de chaque maille
     with_taxons : bool, optional
         - Permet d'ajouter la liste des taxon d'une maille au Geojson
 
     :returns: GeoJson
     """
     observations = vmObservationsMaillesRepository.getObservationsMaillesChilds(
-        filters=request.args,
-        with_taxons=request.args.get("with_taxons", False)
+        params=request.args
     )
     return jsonify(observations)
 
@@ -105,12 +106,28 @@ def getObservationsPointAPI():
         Geosjon
         """
         observations = vmObservationsRepository.getObservationsChilds(
-            request.args,
-            with_taxons=request.args.get("with_taxons", False)
+            params=request.args,
         )
         return jsonify(observations)
 
-
+# 
+@api.route("/taxonList", methods=["GET"])
+@api.route("/taxonList/area/<id_area>", methods=["GET"])
+@api.route("/taxonList/liste/<cd_ref>", methods=["GET"])
+@api.route("/taxonList/group/<group_name>", methods=["GET"])
+def get_taxon_list(id_area=None, cd_ref=None, group_name=None):
+    list_taxon = vmTaxonsRepository.getListTaxon(
+        id_area=id_area,
+        group_name=group_name,
+        cd_ref=cd_ref,
+        params=dict(request.args)
+    )
+    return render_template(
+        "templates/core/taxon.html",
+        listTaxons=list_taxon,
+        DISPLAY_EYE_ON_LIST=True,
+        id_area=id_area,
+    )
 
 
 @api.route("/photoGroup/<group>", methods=["GET"])
@@ -140,9 +157,7 @@ def main_stat():
 @api.route("/rank_stat", methods=["GET"])
 @cache.cached()
 def rank_stat():
-    return jsonify(
-        vmObservationsRepository.genericStat(current_app.config["RANG_STAT"])
-    )
+    return jsonify(vmObservationsRepository.genericStat(current_app.config["RANG_STAT"]))
 
 
 @api.route("/area_chart_values/<id_area>", methods=["GET"])
@@ -151,15 +166,11 @@ def get_area_chart_valuesAPI(id_area):
     nb_species = stats["nb_species"]
     nb_threatened_species = stats["nb_taxon_menace"]
 
-    species_by_taxonomic_group = vmAreasRepository.get_species_by_taxonomic_group(
-        id_area
-    )
+    species_by_taxonomic_group = vmAreasRepository.get_species_by_taxonomic_group(id_area)
     observations_by_taxonomic_group = vmAreasRepository.get_nb_observations_taxonomic_group(
         id_area
     )
-    nb_species_by_organism = vmOrganismsRepository.get_species_by_organism_on_area(
-        id_area
-    )
+    nb_species_by_organism = vmOrganismsRepository.get_species_by_organism_on_area(id_area)
     observations_by_organism = vmOrganismsRepository.get_nb_observations_by_organism_on_area(
         id_area
     )

atlas/atlasRoutes.py

@@ -82,9 +82,7 @@ def ficheOrganism(id_organism):
         update_most_obs_taxons = []
         for taxon in mostObsTaxs:
             taxon_info = vmTaxrefRepository.searchEspece(taxon["cd_ref"])
-            photo = vmMedias.getFirstPhoto(
-                taxon["cd_ref"], current_app.config["ATTR_MAIN_PHOTO"]
-            )
+            photo = vmMedias.getFirstPhoto(taxon["cd_ref"], current_app.config["ATTR_MAIN_PHOTO"])
             taxon = {**taxon, **taxon_info["taxonSearch"]}
             taxon["photo"] = photo
             update_most_obs_taxons.append(taxon)
@@ -112,25 +110,40 @@ def ficheOrganism(id_organism):
 @main.route("/", methods=["GET", "POST"])
 def index():
 
+    nb_taxons = None
+    listTaxons = []
     if current_app.config["AFFICHAGE_TERRITOIRE_OBS"]:
-        listTaxons = vmTaxonsRepository.getTaxonsTerritory()
-    else:
-        listTaxons = []
+        nb_taxons = vmTaxonsRepository.get_nb_taxons()
+        listTaxons = vmTaxonsRepository.getListTaxon(
+            params={
+                "page": 0
+            }
+        )
+
 
     # si AFFICHAGE_TERRITOIRE_OBS on charge les données en AJAX
     # si AFFICHAGE_DERNIERES_OBS = False, on ne charge pas les obs
-    if current_app.config["AFFICHAGE_TERRITOIRE_OBS"] or not current_app.config["AFFICHAGE_DERNIERES_OBS"]:
+    if (
+        current_app.config["AFFICHAGE_TERRITOIRE_OBS"]
+        or not current_app.config["AFFICHAGE_DERNIERES_OBS"]
+    ):
         observations = []
-    elif current_app.config["AFFICHAGE_DERNIERES_OBS"]:
+    observations_mailles = None
+    if current_app.config["AFFICHAGE_DERNIERES_OBS"]:
+        # on charge les observations point meme si on est en mode maille pour afficher 
+        # la liste des dernières obs
+        observations = vmObservationsRepository.getObservationsChilds(
+            params={
+                "last_obs": str(current_app.config["NB_DAY_LAST_OBS"]) + " day",
+                "fields": "taxons,medias"
+            },
+        )
         if current_app.config["AFFICHAGE_MAILLE"]:
-            observations = vmObservationsMaillesRepository.lastObservationsMailles(
-                str(current_app.config["NB_DAY_LAST_OBS"]) + " day",
-                current_app.config["ATTR_MAIN_PHOTO"],
-            )
-        else:
-            observations = vmObservationsRepository.lastObservations(
-                str(current_app.config["NB_DAY_LAST_OBS"]) + " day",
-                current_app.config["ATTR_MAIN_PHOTO"],
+            observations_mailles = vmObservationsMaillesRepository.getObservationsMaillesChilds(
+                params={
+                    "last_obs": str(current_app.config["NB_DAY_LAST_OBS"]) + " day",
+                    "fields": "taxons,ids_obs"
+                }
             )
 
     if current_app.config["AFFICHAGE_EN_CE_MOMENT"]:
@@ -149,20 +162,23 @@ def index():
         lastDiscoveries = vmObservationsRepository.getLastDiscoveries()
     else:
         lastDiscoveries = []
-
+    group2_inpn = vmTaxonsRepository.get_group_inpn("group2_inpn")
     personal_data = False
     args_personal_data = request.args.get("personal_data")
     if args_personal_data and args_personal_data.lower() == "true":
         personal_data = True
 
     return render_template(
         "templates/home/_main.html",
-        listTaxons=listTaxons,
         observations=observations,
+        observations_mailles=observations_mailles,
         mostViewTaxon=mostViewTaxon,
         customStatMedias=customStatMedias,
         lastDiscoveries=lastDiscoveries,
         personal_data=personal_data,
+        group2_inpn=group2_inpn,
+        listTaxons=listTaxons,
+        nb_taxons=nb_taxons
     )
 
 
@@ -185,9 +201,7 @@ def ficheEspece(cd_nom):
     areas = vmAreasRepository.getAreasObservationsChilds(cd_ref)
     taxonomyHierarchy = vmTaxrefRepository.getAllTaxonomy(cd_ref)
     firstPhoto = vmMedias.getFirstPhoto(cd_ref, current_app.config["ATTR_MAIN_PHOTO"])
-    photoCarousel = vmMedias.getPhotoCarousel(
-        cd_ref, current_app.config["ATTR_OTHER_PHOTO"]
-    )
+    photoCarousel = vmMedias.getPhotoCarousel(cd_ref, current_app.config["ATTR_OTHER_PHOTO"])
     videoAudio = vmMedias.getVideo_and_audio(
         cd_ref,
         current_app.config["ATTR_AUDIO"],
@@ -299,29 +313,43 @@ def is_statut_in_groupe(statut, groupe):
 @main.route("/<lang_code>/area/<int:id_area>", methods=["GET", "POST"])
 @main.route("/area/<int:id_area>", methods=["GET", "POST"])
 def ficheArea(id_area):
-    listTaxons = vmTaxonsRepository.getTaxonsAreas(id_area)
     area = vmAreasRepository.getAreaFromIdArea(id_area)
     stats_area = vmAreasRepository.getStatsByArea(id_area)
+    listTaxons = vmTaxonsRepository.getListTaxon(
+        id_area=id_area, 
+        params={
+            "page": 0
+        }
+        )
+    group2_inpn = vmTaxonsRepository.get_group_inpn("group2_inpn")
     return render_template(
         "templates/areaSheet/_main.html",
-        listTaxons=listTaxons,
         stats_area=stats_area,
         areaInfos=area,
         id_area=id_area,
+        listTaxons=listTaxons,
+        group2_inpn=group2_inpn
     )
 
 
 @main.route("/<lang_code>/liste/<int(signed=True):cd_ref>", methods=["GET", "POST"])
 @main.route("/liste/<int(signed=True):cd_ref>", methods=["GET", "POST"])
-def ficheRangTaxonomie(cd_ref):
-    listTaxons = vmTaxonsRepository.getTaxonsChildsList(cd_ref)
+def ficheRangTaxonomie(cd_ref=None):
+    nb_taxons = vmTaxonsRepository.get_nb_taxons(cd_ref=cd_ref)
     referenciel = vmTaxrefRepository.getInfoFromCd_ref(cd_ref)
     taxonomyHierarchy = vmTaxrefRepository.getAllTaxonomy(cd_ref)
     observers = vmObservationsRepository.getObservers(cd_ref)
+    listTaxons = vmTaxonsRepository.getListTaxon(
+        cd_ref=cd_ref,
+        params={
+            "page": 0
+        }
+    )
 
     return render_template(
         "templates/taxoRankSheet/_main.html",
         listTaxons=listTaxons,
+        nb_taxons=nb_taxons,
         referenciel=referenciel,
         taxonomyHierarchy=taxonomyHierarchy,
         observers=observers,
@@ -332,12 +360,19 @@ def ficheRangTaxonomie(cd_ref):
 @main.route("/groupe/<groupe>", methods=["GET", "POST"])
 def ficheGroupe(groupe):
     groups = vmTaxonsRepository.getAllINPNgroup()
-    listTaxons = vmTaxonsRepository.getTaxonsGroup(groupe)
+    nb_taxons = vmTaxonsRepository.get_nb_taxons(group_name=groupe)
     observers = vmObservationsRepository.getGroupeObservers(groupe)
+    listTaxons = vmTaxonsRepository.getListTaxon(
+        group_name=groupe, 
+        params={
+            "page": 0
+        }    
+    )
 
     return render_template(
         "templates/groupSheet/_main.html",
         listTaxons=listTaxons,
+        nb_taxons=nb_taxons,
         referenciel=groupe,
         groups=groups,
         observers=observers,
@@ -351,8 +386,6 @@ def photos():
     return render_template("templates/photoGalery/_main.html", groups=groups)
 
 
-
-
 @main.route("/<lang_code>/static/<page>", methods=["GET", "POST"])
 @main.route("/static_pages/<page>", methods=["GET", "POST"])
 def get_staticpages(page):

atlas/configuration/config.py.example

@@ -204,6 +204,9 @@ AFFICHAGE_STAT_GLOBALES = True
 # Bloc avec carte et liste des dernières observations. Affichage True/False
 AFFICHAGE_DERNIERES_OBS = True
 
+# Nombre d'éléments récupérés par page lors de la liste de taxon.
+ITEMS_PER_PAGE = 50
+
 # Bloc avec espèces à voir en ce moment. Affichage True/False
 AFFICHAGE_EN_CE_MOMENT = True
 

atlas/configuration/config_schema.py

@@ -225,6 +225,7 @@ class Meta:
     )
     LIMIT_RANG_TAXONOMIQUE_HIERARCHIE = fields.Integer(load_default=13)
     LIMIT_FICHE_LISTE_HIERARCHY = fields.Integer(load_default=28)
+    ITEMS_PER_PAGE = fields.Integer(load_default=50)
     REMOTE_MEDIAS_URL = fields.String(load_default="http://mondomaine.fr/taxhub/")
     REDIMENSIONNEMENT_IMAGE = fields.Boolean(load_default=True)
     TAXHUB_URL = fields.String(required=False, load_default=None)

atlas/env.py

@@ -6,8 +6,10 @@
 from flask_caching import Cache
 from flask_babel import Babel
 
+
 class Base(DeclarativeBase):
-  pass
+    pass
+
 
 babel = Babel()
 
@@ -22,4 +24,4 @@ class Base(DeclarativeBase):
 
 atlas_config_file_path = os.environ.get("ATLAS_SETTINGS", default_atlas_config_file_path)
 atlas_static_folder = os.environ.get("ATLAS_STATIC_FOLDER", default_atlas_static_folder)
-atlas_template_folder = os.environ.get("ATLAS_TEMPLATE_FOLDER", default_atlas_template_folder)
+atlas_template_folder = os.environ.get("ATLAS_TEMPLATE_FOLDER", default_atlas_template_folder)