From 1374e7406a837254ee216ece926cc0524a3cef3d Mon Sep 17 00:00:00 2001
From: Jochen Klar <mail@jochenklar.de>
Date: Sun, 8 Oct 2023 11:04:39 +0200
Subject: [PATCH] Add progress to project hierarchy (#488)

---
 .../projects/project_detail_header_hierarchy.html    |  6 +++---
 rdmo/projects/templatetags/projects_tags.py          | 12 +++++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/rdmo/projects/templates/projects/project_detail_header_hierarchy.html b/rdmo/projects/templates/projects/project_detail_header_hierarchy.html
index 33d6f62a3f..c7004fc525 100644
--- a/rdmo/projects/templates/projects/project_detail_header_hierarchy.html
+++ b/rdmo/projects/templates/projects/project_detail_header_hierarchy.html
@@ -19,13 +19,13 @@
         {% if can_view_parent_project %}
            <a href="{% url 'project' node.id %}">
                 {% if node.id == project.id %}
-                <strong>{{ node.title }}</strong>
+                <strong>{{ node.title }}</strong> {% project_progress_text node %}
                 {% else %}
-                {{ node.title }}
+                {{ node.title }} {% project_progress_text node %}
                 {% endif %}
             </a>
         {% else %}
-        {{ node.title }}
+        {{ node.title }} {% project_progress_text node %}
         {% endif %}
     </li>
 {% endfor %}
diff --git a/rdmo/projects/templatetags/projects_tags.py b/rdmo/projects/templatetags/projects_tags.py
index 9517c7cda0..12f35737e9 100644
--- a/rdmo/projects/templatetags/projects_tags.py
+++ b/rdmo/projects/templatetags/projects_tags.py
@@ -1,6 +1,7 @@
 from django import template
 from django.template.defaultfilters import stringfilter
 from django.utils.safestring import mark_safe
+from django.utils.translation import gettext as _
 
 from ..models import Membership
 
@@ -11,7 +12,7 @@
 def projects_indent(level):
     string = ''
     if level > 0:
-        for _ in range(level - 1):
+        for i in range(level - 1):
             string += '&ensp;&ensp;'
         string += '&#8226;&ensp;'
 
@@ -31,6 +32,15 @@ def project_progress(project):
     return f'{ratio:.0%}'
 
 
+@register.simple_tag()
+def project_progress_text(project):
+    progress = project_progress(project)
+    if progress:
+        return _('(%(progress)s progress)') % {'progress': progress}
+    else:
+        return ''
+
+
 @register.filter()
 @stringfilter
 def projects_role(role):