From 246a52d19e0fb01b3b3b569c2951ea1547e4334b Mon Sep 17 00:00:00 2001 From: FreneticScribbler Date: Fri, 20 Aug 2021 13:48:06 +0100 Subject: [PATCH] Don't try and create existing level qualifications --- training/models.py | 4 ++-- training/templates/trainee_detail.html | 2 +- training/views.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/training/models.py b/training/models.py index a543a9fc..403bee2c 100644 --- a/training/models.py +++ b/training/models.py @@ -71,9 +71,9 @@ class TrainingItemQualification(models.Model): def save(self, *args, **kwargs): super().save() - for level in TrainingLevel.objects.all(): # Mm yes efficiency + for level in TrainingLevel.objects.all(): # Mm yes efficiency FIXME if level.user_has_requirements(self.trainee): - level_qualification = TrainingLevelQualification.objects.create(trainee=self.trainee, level=level) + level_qualification = TrainingLevelQualification.objects.get_or_create(trainee=self.trainee, level=level) class Meta: unique_together = ["trainee", "item", "depth"] diff --git a/training/templates/trainee_detail.html b/training/templates/trainee_detail.html index f29ce12f..73f7b8ec 100644 --- a/training/templates/trainee_detail.html +++ b/training/templates/trainee_detail.html @@ -70,7 +70,7 @@

Training Items


Key: Training Started Training Complete Passed Out

-
+
{% for category in categories %}

{{ category }}

diff --git a/training/views.py b/training/views.py index a0e473ad..bfd349e0 100644 --- a/training/views.py +++ b/training/views.py @@ -27,7 +27,7 @@ class TraineeDetail(views.ProfileDetail): def get_context_data(self, **kwargs): context = super(TraineeDetail, self).get_context_data(**kwargs) - context["page_title"] = "{}'s Training Record".format(self.object) + context["page_title"] = "{}'s Training Record".format(self.object.first_name + " " + self.object.last_name) context["levels"] = models.TrainingLevel.objects.all() context["categories"] = models.TrainingCategory.objects.all().prefetch_related('items') choices = models.TrainingItemQualification.CHOICES