Skip to content

Commit

Permalink
Add progress to project hierarchy (#488)
Browse files Browse the repository at this point in the history
  • Loading branch information
jochenklar committed Oct 8, 2023
1 parent b18342f commit 4608efe
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand Down
12 changes: 11 additions & 1 deletion rdmo/projects/templatetags/projects_tags.py
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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;'

Expand All @@ -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):
Expand Down

0 comments on commit 4608efe

Please sign in to comment.