black
This commit is contained in:
parent
e72df3548a
commit
15a1182fea
|
@ -21,10 +21,12 @@ class Shift(models.Model):
|
|||
# todo: add helper amount override field
|
||||
def __str__(self):
|
||||
return f"{self.room.name}: {self.start_at}"
|
||||
|
||||
def has_ended(self):
|
||||
return (self.start_at + self.duration) < timezone.now()
|
||||
|
||||
def is_running(self):
|
||||
return (self.start_at <=timezone.now()) and (not self.has_ended())
|
||||
return (self.start_at <= timezone.now()) and (not self.has_ended())
|
||||
|
||||
|
||||
class Helper(models.Model):
|
||||
|
@ -46,16 +48,21 @@ class Helper(models.Model):
|
|||
|
||||
# current or next shift
|
||||
def important_shift(self):
|
||||
ret = ShiftRegistration.objects.annotate(
|
||||
ret = (
|
||||
ShiftRegistration.objects.annotate(
|
||||
shift_end=ExpressionWrapper(
|
||||
F("shift__start_at") + F("shift__duration"),
|
||||
output_field=models.DateTimeField(),
|
||||
)).filter(helper=self, shift_end__gte=timezone.now()).order_by("shift__start_at").first()
|
||||
)
|
||||
)
|
||||
.filter(helper=self, shift_end__gte=timezone.now())
|
||||
.order_by("shift__start_at")
|
||||
.first()
|
||||
)
|
||||
if ret:
|
||||
return ret.shift
|
||||
|
||||
|
||||
|
||||
class ShiftRegistration(models.Model):
|
||||
class Meta:
|
||||
unique_together = (("shift", "helper"),)
|
||||
|
|
Loading…
Reference in New Issue