Level confirmation works

New high score!

assets/forms.py

@@ -45,7 +45,7 @@ class CableTypeForm(forms.ModelForm):
         model = models.CableType
         fields = '__all__'
 
-    def clean(self):
+    def clean(self): # TODO Does unique_together work better than this?
         form_data = self.cleaned_data
         queryset = models.CableType.objects.filter(Q(plug=form_data['plug']) & Q(socket=form_data['socket']) & Q(circuits=form_data['circuits']) & Q(cores=form_data['cores']))
         # Being identical to itself shouldn't count...

training/models.py

@@ -10,12 +10,12 @@ class Trainee(Profile):
 
     @property
     def is_supervisor(self):
-        for level_qualification in self.levels.all():
+        for level_qualification in self.levels.select_related('level').all():
             if confirmed_on is not None and level_qualification.level.level >= TrainingLevel.SUPERVISOR:
                 return True
 
     def get_records_of_depth(self, depth):
-        return self.qualifications_obtained.filter(depth=depth)
+        return self.qualifications_obtained.filter(depth=depth).select_related('item', 'trainee', 'supervisor')
 
     def is_user_qualified_in(self, item, required_depth):
         qual = self.qualifications_obtained.filter(item=item).first()  # this is a somewhat ghetto version of get_or_none
@@ -42,7 +42,7 @@ class TrainingItem(models.Model):
 
     @staticmethod
     def user_has_qualification(item, user, depth):
-        for q in user.qualifications_obtained.all():
+        for q in user.qualifications_obtained.all().select_related('item'):
             if q.item == item and q.depth > depth:
                 return True
 
@@ -113,7 +113,7 @@ class TrainingLevel(models.Model, RevisionMixin):
         return self.get_requirements_of_depth(TrainingItemQualification.PASSED_OUT)
 
     def percentage_complete(self, user): # FIXME
-        needed_qualifications = self.requirements.all()
+        needed_qualifications = self.requirements.all().select_related()
         relavant_qualifications = 0.0
         # TODO Efficiency...
         for req in needed_qualifications:
@@ -126,7 +126,7 @@ class TrainingLevel(models.Model, RevisionMixin):
             return 0
 
     def user_has_requirements(self, user):
-        return all(TrainingItem.user_has_qualification(req.item, user, req.depth) for req in self.requirements.all())            
+        return all(TrainingItem.user_has_qualification(req.item, user, req.depth) for req in self.requirements.select_related().all())            
 
     def __str__(self):
         if self.department is None: # 2TA
@@ -149,3 +149,9 @@ class TrainingLevelQualification(models.Model):
     level = models.ForeignKey('TrainingLevel', on_delete=models.RESTRICT)
     confirmed_on = models.DateTimeField(null=True)
     confirmed_by = models.ForeignKey('Trainee', related_name='confirmer', on_delete=models.RESTRICT, null=True)
+
+    def __str__(self):
+        return "{} qualified as a {}".format(self.trainee, self.level)
+
+    class Meta:
+        unique_together = ["trainee", "level"]

training/templates/trainee_detail.html

@@ -50,7 +50,15 @@
             <div class="card-footer">
                 {% user_level_if_present object level as level_qualification %}
                 {% if level_qualification %}
-                <button class="btn btn-warning text-right" disabled>Awaiting Confirmation</button>
+                    {% if level_qualification.confirmed_by is None %}
+                        {% if request.user.is_supervisor or request.user.is_superuser %}
+                        <a class="btn btn-info" href="{% url 'confirm_level' object.pk level.pk %}">Confirm</a>
+                        {% else %}
+                        <button class="btn btn-warning text-right" disabled>Awaiting Confirmation</button>
+                        {% endif %}
+                    {% else %}
+                    <button class="btn btn-success active">Confirmed <small>by {{ level_qualification.confirmed_by }}</small></button>
+                    {% endif %}
                 {% else %}
                 <button class="btn btn-danger text-right" disabled>Incomplete</button>
                 {% endif %}

training/urls.py

@@ -19,4 +19,5 @@ urlpatterns = [
     path('level/<int:pk>/', views.LevelDetail.as_view(), name='level_detail'),
     path('level/<int:pk>/add_requirement/', views.AddLevelRequirement.as_view(), name='add_requirement'),
     path('level/remove_requirement/<int:pk>/', views.RemoveRequirement.as_view(), name='remove_requirement'),
+    path('trainee/<int:pk>/level/<int:level_pk>/confirm', views.ConfirmLevel.as_view(), name='confirm_level'),
 ]

training/views.py

@@ -4,6 +4,7 @@ from django.urls import reverse_lazy
 from django.views import generic
 from PyRIGS.views import OEmbedView, is_ajax
 from training import models, forms
+from django.utils import timezone
 
 from users import views
 
@@ -26,7 +27,7 @@ class TraineeDetail(views.ProfileDetail):
         context = super(TraineeDetail, self).get_context_data(**kwargs)
         context["page_title"] = "{}'s Training Record".format(self.object)
         context["levels"] = models.TrainingLevel.objects.all()
-        context["categories"] = models.TrainingCategory.objects.all() 
+        context["categories"] = models.TrainingCategory.objects.all().prefetch_related('items')
         choices = models.TrainingItemQualification.CHOICES
         context["depths"] = choices
         for i in [x for x,_ in choices]:
@@ -120,3 +121,12 @@ class RemoveRequirement(generic.DeleteView):
     def get_success_url(self):
         return self.request.POST.get('next')
 
+
+class ConfirmLevel(generic.RedirectView):
+    def get_redirect_url(self, *args, **kwargs):
+        level_qualification = models.TrainingLevelQualification.objects.get(trainee=kwargs['pk'], level=kwargs['level_pk'])
+        level_qualification.confirmed_by = self.request.user
+        level_qualification.confirmed_on = timezone.now()
+        level_qualification.save()
+        return reverse_lazy('trainee_detail', kwargs={'pk': kwargs['pk']})
+