fix current_shift respect registration state

3 years ago · a75baf537a
parent d81f8cbb0d
commit a75baf537a
1 changed files with 6 additions and 1 deletions
--- a/shiftregister/app/models.py
+++ b/shiftregister/app/models.py
@ -82,7 +82,12 @@ class Helper(models.Model):
                    output_field=models.DateTimeField(),
                )
            )
-            .filter(helper=self, shift_end__gte=timezone.now(), shift__deleted=False)
+            .filter(
+                helper=self,
+                shift_end__gte=timezone.now(),
+                shift__deleted=False,
+                state__in=[ShiftRegistration.REGISTERED, ShiftRegistration.CHECKED_IN],
+            )
            .order_by("shift__start_at")
            .first()
        )