arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-24 08:52:15 +00:00
Code Issues Projects Releases Wiki Activity

Level confirmation works

Browse Source
This commit is contained in:
FreneticScribbler
2021-07-29 23:15:16 +01:00
parent b6ef7c1d89
commit be648c20d5
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
training/templates/trainee_detail.html
View File

@@ -57,7 +57,7 @@
<button class="btn btn-warning text-right" disabled>Awaiting Confirmation</button> <button class="btn btn-warning text-right" disabled>Awaiting Confirmation</button>
{% endif %} {% endif %}
{% else %} {% else %}
<button class="btn btn-success active">Confirmed</button> <button class="btn btn-success active">Confirmed <small>by {{ level_qualification.confirmed_by }}</small></button>
{% endif %} {% endif %}
{% else %} {% else %}
<button class="btn btn-danger text-right" disabled>Incomplete</button> <button class="btn btn-danger text-right" disabled>Incomplete</button>

12
training/views.py
View File

@@ -27,7 +27,7 @@ class TraineeDetail(views.ProfileDetail):
context = super(TraineeDetail, self).get_context_data(**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)
context["levels"] = models.TrainingLevel.objects.all() 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 choices = models.TrainingItemQualification.CHOICES
context["depths"] = choices context["depths"] = choices
for i in [x for x,_ in choices]: for i in [x for x,_ in choices]:
@@ -124,11 +124,9 @@ class RemoveRequirement(generic.DeleteView):
class ConfirmLevel(generic.RedirectView): class ConfirmLevel(generic.RedirectView):
def get_redirect_url(self, *args, **kwargs): def get_redirect_url(self, *args, **kwargs):
# TODO Prevent duplicate training level qualifications existing level_qualification = models.TrainingLevelQualification.objects.get(trainee=kwargs['pk'], level=kwargs['level_pk'])
level_qualification = models.TrainingLevelQualification.objects.filter(trainee=kwargs['pk'], level=kwargs['level_pk']) level_qualification.confirmed_by = self.request.user
print(level_qualification) level_qualification.confirmed_on = timezone.now()
#level_qualification.confirmed_by = self.request.user level_qualification.save()
#level_qualification.confirmed_on = timezone.now()
#level_qualification.save()
return reverse_lazy('trainee_detail', kwargs={'pk': kwargs['pk']}) return reverse_lazy('trainee_detail', kwargs={'pk': kwargs['pk']})