Merge branch 'develop'

This commit is contained in:
Nathan Chapman 2021-02-09 17:46:09 -07:00
commit 4f6092e29c

View File

@ -71,17 +71,12 @@ class AttendanceUpdateView(LoginRequiredMixin, FormView):
station_number = form.cleaned_data['qr_string'].split(':')[1] station_number = form.cleaned_data['qr_string'].split(':')[1]
student = Student.objects.get(student_number=student_number) student = Student.objects.get(student_number=student_number)
if student.is_clocked_in: if student.is_clocked_in:
student.is_clocked_in=False
period = student.period_set.get(pk=student.current_period_id) period = student.period_set.get(pk=student.current_period_id)
period.clocked_out=timezone.now() period.clocked_out=timezone.now()
student.save()
period.save() period.save()
messages.add_message(self.request, messages.INFO, f'{student.user.first_name} {student.user.last_name} clocked out.') messages.add_message(self.request, messages.INFO, f'{student.user.first_name} {student.user.last_name} clocked out.')
else: else:
period = student.period_set.create(student=student, clocked_in=timezone.now(), station_number=station_number) period = student.period_set.create(student=student, clocked_in=timezone.now(), station_number=station_number)
student.current_period_id = period.pk
student.is_clocked_in=True
student.save()
messages.add_message(self.request, messages.INFO, f'{student.user.first_name} {student.user.last_name} clocked in.') messages.add_message(self.request, messages.INFO, f'{student.user.first_name} {student.user.last_name} clocked in.')
return super().form_valid(form) return super().form_valid(form)