arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Fixed EventManger methods for Django 1.7

Browse Source
This commit is contained in:
tomtom5152
2014-11-06 03:02:16 +00:00
parent 2156485d53
commit 3f5cc920cb
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
RIGS/models.py
View File

@@ -126,22 +126,23 @@ class EventManager(models.Manager):
# events = chain(startAfter, endAfter, activeDryHire, canceledDryHire) # events = chain(startAfter, endAfter, activeDryHire, canceledDryHire)
# return sorted(events, key=operator.attrgetter('start_date')) # return sorted(events, key=operator.attrgetter('start_date'))
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) | # Starts after with no end
models.Q(end_date__gte=datetime.date.today()) | # Ends after models.Q(end_date__gte=datetime.date.today()) | # Ends after
models.Q(dry_hire=True, checked_in_by__isnull=False, status__neq=Event.CANCELLED) | # Active dry hire models.Q(dry_hire=True, checked_in_by__isnull=False, status__lt=Event.CANCELLED) | # Active dry hire LT
models.Q(dry_hire=True, checked_in_by__isnull=False, status__gt=Event.CANCELLED) | # Active dry hire GT
models.Q(dry_hire=True, status=Event.CANCELLED, start_date__gte=datetime.date.today()) models.Q(dry_hire=True, status=Event.CANCELLED, start_date__gte=datetime.date.today())
# Canceled but not started # Canceled but not started
).sort('meet_at', 'start_at') ).order_by('meet_at', 'start_date')
return events return events
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) | # Starts after with no end
models.Q(end_date__gte=datetime.date.today()) | # Ends after models.Q(end_date__gte=datetime.date.today()) | # Ends after
models.Q(dry_hire=True, checked_in_by__isnull=False), # Active dry hire models.Q(dry_hire=True, checked_in_by__isnull=False, status__lt=Event.CANCELLED) | # Active dry hire LT
status__neq=Event.CANCELLED models.Q(dry_hire=True, checked_in_by__isnull=False, status__gt=Event.CANCELLED) # Active dry hire GT
).sort('meet_at', 'start_at') ).order_by('meet_at', 'start_date')
return len(list(events)) return len(events)
@reversion.register(follow=['items']) @reversion.register(follow=['items'])