Add nb_attributs, nb_medias

apptax/admin/admin_view.py

@@ -23,6 +23,7 @@
 from flask_admin.model.ajax import AjaxModelLoader, DEFAULT_PAGE_SIZE
 
 
+
 from flask_admin.base import expose
 from flask_admin.model.helpers import get_mdict_item_or_list
 
@@ -33,6 +34,8 @@
 from flask_admin.contrib.sqla.filters import BaseSQLAFilter
 
 from sqlalchemy import or_
+from sqlalchemy.orm import undefer
+
 from wtforms import Form, BooleanField, SelectField, PasswordField, SubmitField, StringField
 
 from wtforms.validators import ValidationError, DataRequired, Email, EqualTo, Length
@@ -297,6 +300,9 @@ class TaxrefView(
         "classe",
         "ordre",
         "famille",
+        "liste",
+        "nb_attributs",
+        "nb_medias",
     )
 
     column_searchable_list = ["nom_complet", "cd_nom"]
@@ -340,6 +346,11 @@ def _get_theme_attributes(self, taxon_name):
             .all()
         )
 
+    def get_query(self):
+        return self.session.query(self.model).options(
+            undefer("nb_attributs"), undefer("nb_medias")
+        )
+
     def _get_attributes_value(self, taxon_name, theme_attributs_def):
         attributes_val = {}
         for a in [a for attrs in [t.attributs for t in theme_attributs_def] for a in attrs]:

apptax/taxonomie/models.py

@@ -2,9 +2,11 @@
 
 from flask import current_app
 from flask_sqlalchemy import SQLAlchemy
-from sqlalchemy import ForeignKey, Sequence
+from sqlalchemy import ForeignKey, select, func
+
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.schema import FetchedValue
+from sqlalchemy.orm import deferred
 
 from flask_sqlalchemy import BaseQuery
 from utils_flask_sqla.serializers import serializable
@@ -481,3 +483,16 @@ class TMetaTaxref(db.Model):
     referencial_name = db.Column(db.Integer, primary_key=True)
     version = db.Column(db.Integer)
     update_date = db.Column(db.DateTime, default=db.func.now(), nullable=False)
+
+
+# Taxref deffered properties
+
+Taxref.nb_medias = deferred(
+    select([func.count(TMedias.id_media)]).where(TMedias.cd_ref == Taxref.cd_ref)
+)
+
+Taxref.nb_attributs = deferred(
+    select([func.count(CorTaxonAttribut.id_attribut)])
+    .where(CorTaxonAttribut.cd_ref == Taxref.cd_ref)
+    .correlate_except(CorTaxonAttribut)
+)