From 18ada1e73ca9a129436e920abfaf9d1d0d618e98 Mon Sep 17 00:00:00 2001 From: Lova Andriarimalala <43842786+Xpirix@users.noreply.github.com> Date: Mon, 15 Jul 2024 10:50:05 +0300 Subject: [PATCH] Add conversations count to feedback icons (#442) * Add conversations count to feedback icons * Reset the feedback button color when all tasks are completed --- .../templates/plugins/plugin_detail.html | 17 ++++++++++++++--- qgis-app/plugins/templatetags/plugin_utils.py | 4 ++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/qgis-app/plugins/templates/plugins/plugin_detail.html b/qgis-app/plugins/templates/plugins/plugin_detail.html index c85b2c04..2448114e 100644 --- a/qgis-app/plugins/templates/plugins/plugin_detail.html +++ b/qgis-app/plugins/templates/plugins/plugin_detail.html @@ -329,10 +329,21 @@

{{ object.name }} {{ version.created_on|local_timezone }} {% if user.is_staff or user in version.plugin.approvers or user in version.plugin.editors %}
{% csrf_token %} {% if user.is_staff or user in version.plugin.approvers %} - {% if not version.approved %}{% else %}{% endif %} + {% if not version.approved %} + + {% else %} + + {% endif %} {% endif %} - + + + {% if version.feedback|feedbacks_not_completed|length >= 2 %} + {{ version.feedback|feedbacks_not_completed|length }} + {% endif %} {% if user.is_staff or user in version.plugin.editors %}  {% endif %}
diff --git a/qgis-app/plugins/templatetags/plugin_utils.py b/qgis-app/plugins/templatetags/plugin_utils.py index 0bd4ca49..3daf1722 100755 --- a/qgis-app/plugins/templatetags/plugin_utils.py +++ b/qgis-app/plugins/templatetags/plugin_utils.py @@ -56,3 +56,7 @@ def _validate_image(file_path): return True except (FileNotFoundError, UnidentifiedImageError): return False + +@register.filter +def feedbacks_not_completed(feedbacks): + return feedbacks.filter(is_completed=False)