From 732affa0b268659069b50d645fa73aa47d5ebda0 Mon Sep 17 00:00:00 2001
From: Arona Jones <aj@aronajones.com>
Date: Tue, 28 Dec 2021 12:13:08 +0000
Subject: [PATCH] SQL optimisation of detailed training record

---
 training/models.py                        | 5 ++++-
 training/templates/trainee_item_list.html | 2 +-
 training/views.py                         | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/training/models.py b/training/models.py
index d7cf3c26..7e4ad7fe 100644
--- a/training/models.py
+++ b/training/models.py
@@ -67,7 +67,10 @@ class TrainingItem(models.Model):
         return "{}.{}".format(self.category.reference_number, self.reference_number)
 
     def __str__(self):
-        return "{} {}".format(self.number, self.name)
+        name = "{} {}".format(self.number, self.name)
+        if not self.active:
+            name += " (inactive)"
+        return name
 
     @staticmethod
     def user_has_qualification(item, user, depth):
diff --git a/training/templates/trainee_item_list.html b/training/templates/trainee_item_list.html
index 4e3163a5..2561ea1b 100644
--- a/training/templates/trainee_item_list.html
+++ b/training/templates/trainee_item_list.html
@@ -22,7 +22,7 @@
                 </thead>
                 <tbody>
                 {% for object in object_list %}
-                    <tr id="row_item">
+                    <tr id="row_item" {% if request.user.is_superuser and not object.item.active %}class="text-warning"{%endif%}>
                         <th scope="row" class="align-middle" id="cell_name">{{ object.item }}</th>
                         <td class="table-{% colour_from_depth object.depth %}">{{ object.get_depth_display }}</td>
                         <td>{{ object.date }}</td>
diff --git a/training/views.py b/training/views.py
index 10cfdc18..5fdbf75c 100644
--- a/training/views.py
+++ b/training/views.py
@@ -51,7 +51,7 @@ class TraineeItemDetail(generic.ListView):
     template_name = 'trainee_item_list.html'
 
     def get_queryset(self):
-        return models.Trainee.objects.get(pk=self.kwargs['pk']).qualifications_obtained.all()
+        return models.Trainee.objects.get(pk=self.kwargs['pk']).qualifications_obtained.all().order_by('-date').select_related('item', 'trainee', 'supervisor', 'item__category')
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)