arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-26 18:02:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix to current rig count

Browse Source
This commit is contained in:
tomtom5152
2014-11-06 03:40:50 +00:00
parent c62c41b06f
commit 6cbf77fcb4
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
RIGS/models.py
View File

@@ -137,10 +137,13 @@ class EventManager(models.Manager):
def rig_count(self): def rig_count(self):
events = self.filter( events = self.filter(
models.Q(start_date__gte=datetime.date.today(), end_date__isnull=True) | # Starts after with no end models.Q(start_date__gte=datetime.date.today(), end_date__isnull=True,
models.Q(end_date__gte=datetime.date.today()) | # Ends after is_rig=True) | # Starts after with no end
models.Q(dry_hire=True, checked_in_by__isnull=False, status__lt=Event.CANCELLED) | # Active dry hire LT models.Q(end_date__gte=datetime.date.today(), is_rig=True) | # Ends after
models.Q(dry_hire=True, checked_in_by__isnull=False, status__gt=Event.CANCELLED) # Active dry hire GT models.Q(dry_hire=True, checked_in_by__isnull=False, status__lt=Event.CANCELLED,
is_rig=True) | # Active dry hire LT
models.Q(dry_hire=True, checked_in_by__isnull=False, status__gt=Event.CANCELLED, is_rig=True)
# Active dry hire GT
).order_by('meet_at', 'start_date') ).order_by('meet_at', 'start_date')
return len(events) return len(events)