diff --git a/training/models.py b/training/models.py
index 8f44f71f..0b6099d7 100644
--- a/training/models.py
+++ b/training/models.py
@@ -19,7 +19,7 @@ class Trainee(Profile, RevisionMixin):
@property
def is_supervisor(self):
return self.level_qualifications.all().exclude(confirmed_on=None).select_related('level') \
- .filter(level__gte=TrainingLevel.SUPERVISOR) \
+ .filter(level__level__gte=TrainingLevel.SUPERVISOR) \
.exclude(level__department=TrainingLevel.HAULAGE) \
.exclude(level__department__isnull=True).exists()
diff --git a/training/templates/trainee_list.html b/training/templates/trainee_list.html
index dbfe89e4..3481ba85 100644
--- a/training/templates/trainee_list.html
+++ b/training/templates/trainee_list.html
@@ -38,7 +38,7 @@
{{ object.is_driver|yesno|title }} |
{% for level in object|get_levels_of_depth:1 %}{% if forloop.first %}Yes {%endif%}{{ level.get_icon }}{%empty%}No{%endfor%} |
{% for level in object|get_levels_of_depth:2 %}{% if forloop.first %}Yes {%endif%}{{ level.get_icon }}{%empty%}No{%endfor%} |
- {{ object.num_qualifications }} |
+ {{ object.num_qualifications }} {% if forloop.first %} {% endif %} |
View Training Record
View Detailed Record
diff --git a/training/templatetags/tags.py b/training/templatetags/tags.py
index b3a97fbb..a3cc1126 100644
--- a/training/templatetags/tags.py
+++ b/training/templatetags/tags.py
@@ -39,4 +39,4 @@ def get_supervisor(tech):
@register.filter
def get_levels_of_depth(trainee, level):
- return trainee.level_qualifications.all().exclude(confirmed_on=None).select_related('level').filter(level__level=level)
+ return trainee.level_qualifications.all().exclude(confirmed_on=None).exclude(level__department=models.TrainingLevel.HAULAGE).select_related('level').filter(level__level=level)
|