diff --git a/training/models.py b/training/models.py index 81038564..7de1ec1e 100644 --- a/training/models.py +++ b/training/models.py @@ -138,6 +138,8 @@ class TrainingLevel(models.Model, RevisionMixin): elif self.department == 2: return "danger" elif self.department == 3: + return "warning" + elif self.department == 4: return "light" else: return "primary" diff --git a/training/templates/level_list.html b/training/templates/level_list.html index 7f1e2c49..f4d0f4a2 100644 --- a/training/templates/level_list.html +++ b/training/templates/level_list.html @@ -1,4 +1,21 @@ {% extends 'base_training.html' %} +{% load colour_from_level from tags %} + +{% block css %} + +{% endblock %} {% block content %} - -
- {% for level in levels %} -
-

{{ level }}

-
-

{{ level.description }}

+
+ {% for level in levels %} + {% if forloop.counter == 3 %} +
+
+ {% endif %} + {% if level.level == 2 and level.department is None %} +
+
+ {% endif %} +
+
+

{{ level }}

+
+

{{ level.description }}

+
- {% endfor %} + {% if forloop.last %} +
+
+ {% endif %} + {% endfor %}
{% endblock %} diff --git a/training/templatetags/tags.py b/training/templatetags/tags.py index aaf570a4..a3c5f0ba 100644 --- a/training/templatetags/tags.py +++ b/training/templatetags/tags.py @@ -26,3 +26,7 @@ def percentage_complete(level, user): @register.simple_tag def colour_from_depth(depth): return models.TrainingItemQualification.get_colour_from_depth(depth) + +@register.simple_tag +def colour_from_level(level): + return level.get_department_colour() diff --git a/training/views.py b/training/views.py index dfbdc94c..56eb0c18 100644 --- a/training/views.py +++ b/training/views.py @@ -61,7 +61,7 @@ class LevelList(generic.ListView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) context["page_title"] = "All Training Levels" - context["levels"] = models.TrainingLevel.objects.all() + context["levels"] = models.TrainingLevel.objects.all().order_by('level','department') return context