From f9667a8e268b3af75fcdff46061f90bae7f65977 Mon Sep 17 00:00:00 2001 From: Stefan Wehrmeyer Date: Mon, 14 Mar 2022 13:47:13 +0100 Subject: [PATCH] Reorder progress bar --- froide_govplan/templatetags/govplan.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/froide_govplan/templatetags/govplan.py b/froide_govplan/templatetags/govplan.py index cff6db0..94e7231 100644 --- a/froide_govplan/templatetags/govplan.py +++ b/froide_govplan/templatetags/govplan.py @@ -5,10 +5,20 @@ from froide_govplan.models import STATUS_CSS, PlanStatus register = template.Library() +PROGRESS_ORDER = [ + PlanStatus.IMPLEMENTED, + PlanStatus.PARTIALLY_IMPLEMENTED, + PlanStatus.DEFERRED, + PlanStatus.NOT_STARTED, +] + + @register.simple_tag def get_plan_progress(object_list): sections = [] - for value, label in PlanStatus.choices: + for value in PROGRESS_ORDER: + label = value.label + value = str(value) status_count = len([x for x in object_list if x.status == value]) percentage = ( 0 if len(object_list) == 0 else status_count / len(object_list) * 100