From 7a70270dfdc4875e8bf8c3c8e5733b363308fd5b Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Mon, 3 Jan 2022 14:56:29 +0000
Subject: [PATCH] Add ability to view other users progress on a level

That's kind of important huh :p
---
 training/templates/level_detail.html | 19 +++++++++----------
 training/views.py                    | 12 +-----------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/training/templates/level_detail.html b/training/templates/level_detail.html
index d85e3ce2..8b9869a1 100644
--- a/training/templates/level_detail.html
+++ b/training/templates/level_detail.html
@@ -44,7 +44,6 @@
 {% endblock %}
 
 {% block content %}
-{% if u %}<h3>for {{ u }}</h3>{% endif %}
 {% if request.user.is_supervisor or perms.training.change_traininglevel %}
 <div class="col-sm-12 text-right pr-0">
 <a type="button" class="btn btn-success mb-3" href="{% url 'add_requirement' pk=object.pk %}" id="requirement_button">
@@ -59,7 +58,7 @@
     </div>
 </div>
 <div class="card">
-    <h4 class="card-header">Level Requirements</h4>
+    <div class="card-header"><h4 class="card-title">Level Requirements</h4> {% if u.pk != request.user.pk %}<h5 class="card-subtitle font-italic">for {{ u }}</h5>{% endif %}</div>
     <table class="table card-body">
       <thead>
         <tr>
@@ -72,16 +71,16 @@
         {% for level in object.prerequisite_levels.all %}
         <tr data-toggle="collapse" data-target="#{{level.pk}}" style="cursor: pointer;"><th colspan="3" class="text-center font-italic" data-toggle="collapse" data-target="#level_{{level.pk}}">{{level}} (prerequisite)</th></tr>
         <tr id="level_{{level.pk}}" class="collapse">
-          <td><ul class="list-unstyled">{% for req in level.started_requirements %}<li>{{ req.item }} {% user_has_qualification request.user req.item 0 %}</li>{% endfor %}</ul></td>
-          <td><ul class="list-unstyled">{% for req in level.complete_requirements %}<li>{{ req.item }} {% user_has_qualification request.user req.item 1 %}</li>{% endfor %}</ul></td>
-          <td><ul class="list-unstyled">{% for req in level.passed_out_requirements %}<li>{{ req.item }} {% user_has_qualification request.user req.item 2 %}</li>{% endfor %}</ul></td>
+          <td><ul class="list-unstyled">{% for req in level.started_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 0 %}</li>{% endfor %}</ul></td>
+          <td><ul class="list-unstyled">{% for req in level.complete_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 1 %}</li>{% endfor %}</ul></td>
+          <td><ul class="list-unstyled">{% for req in level.passed_out_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 2 %}</li>{% endfor %}</ul></td>
         </tr>
         {% endfor %}
         <tr><th colspan="3" class="text-center">{{object}}</th></tr>
         <tr>
-          <td><ul class="list-unstyled">{% for req in object.started_requirements %}<li>{{ req.item }} {% user_has_qualification request.user req.item 0 %} {% if request.user.is_supervisor or perms.training.change_traininglevel %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
-          <td><ul class="list-unstyled">{% for req in object.complete_requirements %}<li>{{ req.item }} {% user_has_qualification request.user req.item 1 %} {% if request.user.is_supervisor or perms.training.change_traininglevel %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
-          <td><ul class="list-unstyled">{% for req in object.passed_out_requirements %}<li>{{ req.item }} {% user_has_qualification request.user req.item 2 %} {% if request.user.is_supervisor or perms.training.change_traininglevel %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline"" href="{% url 'remove_requirement' pk=req.pk %}" title="Delete requirement"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
+          <td><ul class="list-unstyled">{% for req in object.started_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 0 %} {% if request.user.is_supervisor or perms.training.change_traininglevel %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
+          <td><ul class="list-unstyled">{% for req in object.complete_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 1 %} {% if request.user.is_supervisor or perms.training.change_traininglevel %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline" href="{% url 'remove_requirement' pk=req.pk %}"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
+          <td><ul class="list-unstyled">{% for req in object.passed_out_requirements %}<li>{{ req.item }} {% user_has_qualification u req.item 2 %} {% if request.user.is_supervisor or perms.training.change_traininglevel %}<a type="button" class="btn btn-link tn-sm p-0 align-baseline"" href="{% url 'remove_requirement' pk=req.pk %}" title="Delete requirement"><span class="fas fa-trash-alt text-danger"></span></a>{%endif%}</li>{% endfor %}</ul></td>
         </tr>
       </tbody>
     </table>
@@ -89,10 +88,10 @@
     <div class="card-body">
        <ul>
        {% for level in object.prerequisite_levels.all %}
-       {% user_level_if_present request.user level as level_qualification %}
+       {% user_level_if_present u level as level_qualification %}
        <li><a href="{{level.get_absolute_url}}">{{ level }}</a> <span class="fas {% if level_qualification %}text-success fa-check{% if level_qualification.confirmed_by is not None %}-double{% endif %}{% else %}fa-hourglass-start text-warning{%endif%}"></span></li>
        {% for nested_level in level.prerequisite_levels.all %}
-       {% user_level_if_present request.user nested_level as nested_level_qualification %}
+       {% user_level_if_present u nested_level as nested_level_qualification %}
        <ul>
           <li><a href="{{nested_level.get_absolute_url}}">{{ nested_level }}</a> <span class="fas {% if nested_level_qualification %}text-success fa-check{% if nested_level_qualification.confirmed_by is not None %}-double{% endif %}{% else %}fa-hourglass-start text-warning{%endif%}"></span></li>
        </ul>
diff --git a/training/views.py b/training/views.py
index 968f3b6a..e1cb5f10 100644
--- a/training/views.py
+++ b/training/views.py
@@ -75,6 +75,7 @@ class LevelDetail(generic.DetailView):
         context = super().get_context_data(**kwargs)
         context["page_title"] = "Training Level {} {}".format(self.object, self.object.get_icon)
         context["users_with"] = map(lambda qual: qual.trainee, models.TrainingLevelQualification.objects.filter(level=self.object))
+        context["u"] = models.Trainee.objects.get(pk=self.kwargs['u']) if 'u' in self.kwargs else self.request.user
         return context
 
 
@@ -114,17 +115,6 @@ class TraineeList(generic.ListView):
         return context
 
 
-class SessionLog(generic.FormView):
-    template_name = "session_log_form.html"
-    form_class = forms.SessionLogForm
-
-    def get_context_data(self, **kwargs):
-        context = super(SessionLog, self).get_context_data(**kwargs)
-        context["page_title"] = "Log New Training Session"
-        context["depths"] = models.TrainingItemQualification.CHOICES
-        return context
-
-
 class AddQualification(generic.CreateView, ModalURLMixin):
     template_name = "edit_training_record.html"
     model = models.TrainingItemQualification