From 66ce7b42ac582146f5497b9c9079a70643ea392f Mon Sep 17 00:00:00 2001
From: Ross <xkjq@ymail.com>
Date: Mon, 11 Dec 2023 10:58:00 +0000
Subject: [PATCH] improve trainee page

---
 generic/templates/generic/trainees.html | 67 +++++++++++++++++++------
 generic/views.py                        |  2 +-
 2 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/generic/templates/generic/trainees.html b/generic/templates/generic/trainees.html
index 7f23e24f..5b16de3d 100644
--- a/generic/templates/generic/trainees.html
+++ b/generic/templates/generic/trainees.html
@@ -5,25 +5,64 @@
 {% endblock %}
 
 {% block content %}
-<a href='{% url "trainees" %}'>All, </a> 
+    <a href='{% url "trainees" %}'>All, </a>
     {% for i in "123456"|make_list %}
-    <a href='{% url "trainees_grade" "ST"|add:i %}'>ST{{i}}</a>{% if not forloop.last %}, {% endif %}
+        <a href='{% url "trainees_grade" "ST"|add:i %}'>ST{{i}}</a>{% if not forloop.last %}, {% endif %}
     {% endfor %}
 
-<h2>
-{% if grade %}
-{{grade}} 
-{% endif %}Trainees 
+    <h2>
+        {% if grade %}
+            {{grade}}
+        {% endif %}Trainees
     </h2>
-<table>
-    <tr class="header"><th>Name</th><th>Grade</th><th>Email</th><th>Supervisor</th><th>Edit</th></tr>
+    <table>
+        <tr class="header"><th>Name</th><th>Grade</th><th>Email</th><th>Supervisor</th><th>Edit</th></tr>
 
-{% for trainee in trainees %}
-<tr class="trainee"><td>{{trainee.user.first_name}} {{trainee.user.last_name}}</td><td>{{trainee.grade}}</td><td>{{trainee.user.email}}</td><td>{{trainee.supervisor}}</td><td><a href="{% url 'account_update' trainee.user.username %}">User</a>/<a href="{% url 'account_profile_update' trainee.user.username %}">Profile</a></td></tr>
-{% endfor %}
+        {% for trainee in trainees %}
+            <tr class="trainee">
+                <td>{{trainee.user.first_name}} {{trainee.user.last_name}}</td>
+                <td
+                    {% if not trainee.grade %}
+                        class="no-grade"
+                    {% endif %}
+                >{{trainee.grade}}{% if not trainee.grade %}
+                    <a href="{% url 'account_profile_update' trainee.user.username %}" class="add-grade">add</a>
+                {% endif %}
+                </td>
+                <td>{{trainee.user.email}}</td>
+                <td
+                    {% if not trainee.supervisor %}
+                        class="no-supervisor"
+                    {% endif %}
+                >{{trainee.supervisor}}{% if not trainee.supervisor %}
+                    <a href="{% url 'account_profile_update' trainee.user.username %}" class="add-supervisor">add</a>
+                {% endif %}
+                </td>
+                <td><a href="{% url 'account_update' trainee.user.username %}">User</a>/<a href="{% url 'account_profile_update' trainee.user.username %}">Profile</a></td>
+            </tr>
+        {% endfor %}
 
-</table>
-    
-<div class="small-gray">Count: {{trainees|length}}</div>
+    </table>
 
+    <div class="small-gray">Count: {{trainees|length}}</div>
+
+    <style>
+        .add-supervisor, .add-grade {
+            font-size: small;
+        }
+        .no-supervisor, .no-grade {
+            color: red;
+            opacity: 50%;
+        }
+
+        td {
+            padding-right: 8px;
+        }
+
+        tr:hover {
+            box-shadow: 0 0 2px #ccc;
+
+        }
+    </style>
 {% endblock %}
+
diff --git a/generic/views.py b/generic/views.py
index 4ce7e073..b3b25758 100644
--- a/generic/views.py
+++ b/generic/views.py
@@ -3077,7 +3077,7 @@ def exam_inactive(request, context):
 @user_is_cid_user_manager
 def trainees(request, grade: None|str=None):
 
-    trainees = UserProfile.objects.filter(peninsula_trainee=True, user__is_active=True).order_by("grade__name", Lower("user__last_name"))
+    trainees = UserProfile.objects.filter(peninsula_trainee=True, user__is_active=True).order_by("grade__name", Lower("user__last_name")).prefetch_related("supervisor", "grade", "user")
 
     if grade is not None:
         trainees = trainees.filter(grade__name=grade)