diff --git a/training/models.py b/training/models.py index 6501d1cf..86c795ee 100644 --- a/training/models.py +++ b/training/models.py @@ -12,10 +12,9 @@ class Trainee(Profile, RevisionMixin): class Meta: proxy = True - # TODO remove levels that the user has a qualification in # FIXME use queryset def started_levels(self): - return [level for level in TrainingLevel.objects.all() if level.percentage_complete(self) > 0] + return [level for level in TrainingLevel.objects.all() if level.percentage_complete(self) > 0 and level.pk not in self.level_qualifications.values_list('level', flat=True)] @property def is_supervisor(self): @@ -109,6 +108,9 @@ class TrainingItemQualification(models.Model): else: return "info" + def get_absolute_url(self): + return reverse('trainee_item_detail', kwargs={'pk': self.trainee.pk}) + class Meta: unique_together = ["trainee", "item", "depth"] order_with_respect_to = 'item' diff --git a/training/templates/level_detail.html b/training/templates/level_detail.html index c8d55e13..e7ec7cea 100644 --- a/training/templates/level_detail.html +++ b/training/templates/level_detail.html @@ -96,6 +96,9 @@
| {% if level_qualification.confirmed_on %} Qualified on {{ level_qualification.confirmed_on }} {%else%}Unconfirmed{%endif%} |
- View Profile | -|
| {% if level_qualification.confirmed_on %} Qualified on {{ level_qualification.confirmed_on }} {%else%}Unconfirmed{%endif%} |
+ View Profile | +