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

Add subhire handling to ical feed

Browse Source
This commit is contained in:
FreneticScribbler
2022-12-30 12:32:39 +00:00
parent 1615e27767
commit 87f2de46a1
3 changed files with 48 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
RIGS/models/events.py
View File

@@ -290,7 +290,6 @@ class Event(BaseEvent):
""" """
Inc VAT Inc VAT
""" """
@property @property
def total(self): def total(self):
return Decimal(self.sum_total + self.vat).quantize(Decimal('.01')) return Decimal(self.sum_total + self.vat).quantize(Decimal('.01'))
@@ -337,9 +336,8 @@ class Event(BaseEvent):
return "danger" return "danger"
elif self.confirmed and self.authorised: elif self.confirmed and self.authorised:
if self.dry_hire or self.riskassessment: if self.dry_hire or self.riskassessment:
return "success" return "success"
else: return "warning"
return "warning"
else: else:
return "warning" return "warning"
@@ -360,7 +358,7 @@ class Event(BaseEvent):
elif self.start_time is not None and self.start_date == self.access_at.date() and self.access_at.time() > self.start_time: elif self.start_time is not None and self.start_date == self.access_at.date() and self.access_at.time() > self.start_time:
errdict['access_at'] = ['Regardless of what some clients might think, access time cannot be after the event has started.'] errdict['access_at'] = ['Regardless of what some clients might think, access time cannot be after the event has started.']
if errdict != {}: # If there was an error when validation if errdict: # If there was an error when validation
raise ValidationError(errdict) raise ValidationError(errdict)
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
@@ -435,9 +433,16 @@ class Subhire(BaseEvent):
events = models.ManyToManyField(Event) events = models.ManyToManyField(Event)
quote = models.URLField(default='', validators=[validate_url]) quote = models.URLField(default='', validators=[validate_url])
objects = SubhireManager() objects = SubhireManager()
@property
def is_rig(self):
return False
@property
def dry_hire(self):
return False
@property @property
def display_id(self): def display_id(self):
return f"S{self.pk:05d}" return f"S{self.pk:05d}"

57
RIGS/views/ical.py
View File

@@ -1,12 +1,14 @@
import datetime import datetime
import pytz from django.utils import timezone
from django.conf import settings from django.conf import settings
from django.db.models import Q from django.db.models import Q
from django_ical.views import ICalFeed from django_ical.views import ICalFeed
from RIGS import models from RIGS import models
from itertools import chain
class CalendarICS(ICalFeed): class CalendarICS(ICalFeed):
""" """
@@ -31,6 +33,7 @@ class CalendarICS(ICalFeed):
params['dry-hire'] = request.GET.get('dry-hire', 'true') == 'true' params['dry-hire'] = request.GET.get('dry-hire', 'true') == 'true'
params['non-rig'] = request.GET.get('non-rig', 'true') == 'true' params['non-rig'] = request.GET.get('non-rig', 'true') == 'true'
params['rig'] = request.GET.get('rig', 'true') == 'true' params['rig'] = request.GET.get('rig', 'true') == 'true'
params['subhire'] = request.GET.get('subhire', 'true') == 'true'
params['cancelled'] = request.GET.get('cancelled', 'false') == 'true' params['cancelled'] = request.GET.get('cancelled', 'false') == 'true'
params['provisional'] = request.GET.get('provisional', 'true') == 'true' params['provisional'] = request.GET.get('provisional', 'true') == 'true'
@@ -40,42 +43,46 @@ class CalendarICS(ICalFeed):
def description(self, params): def description(self, params):
desc = "Calendar generated by RIGS system. This includes event types: " + ('Rig, ' if params['rig'] else '') + ( desc = "Calendar generated by RIGS system. This includes event types: " + ('Rig, ' if params['rig'] else '') + (
'Non-rig, ' if params['non-rig'] else '') + ('Dry Hire ' if params['dry-hire'] else '') + '\n' 'Non-rig, ' if params['non-rig'] else '') + ('Dry Hire, ' if params['dry-hire'] else '') + ('Subhires' if params['subhire'] else '') + '\n'
desc = desc + "Includes events with status: " + ('Cancelled, ' if params['cancelled'] else '') + ( desc += "Includes events with status: " + ('Cancelled, ' if params['cancelled'] else '') + (
'Provisional, ' if params['provisional'] else '') + ('Confirmed/Booked, ' if params['confirmed'] else '') 'Provisional, ' if params['provisional'] else '') + ('Confirmed/Booked, ' if params['confirmed'] else '')
return desc return desc
def items(self, params): def items(self, params):
# include events from up to 1 year ago # include events from up to 1 year ago
start = datetime.datetime.now() - datetime.timedelta(days=365) start = timezone.now() - datetime.timedelta(days=365)
filter = Q(start_date__gte=start) filter = Q(start_date__gte=start)
typeFilters = Q(pk=None) # Need something that is false for every entry type_filters = Q(pk=None) # Need something that is false for every entry
if params['dry-hire']: if params['dry-hire']:
typeFilters = typeFilters | Q(dry_hire=True, is_rig=True) type_filters = type_filters | Q(dry_hire=True, is_rig=True)
if params['non-rig']: if params['non-rig']:
typeFilters = typeFilters | Q(is_rig=False) type_filters = type_filters | Q(is_rig=False)
if params['rig']: if params['rig']:
typeFilters = typeFilters | Q(is_rig=True, dry_hire=False) type_filters = type_filters | Q(is_rig=True, dry_hire=False)
statusFilters = Q(pk=None) # Need something that is false for every entry status_filters = Q(pk=None) # Need something that is false for every entry
if params['cancelled']: if params['cancelled']:
statusFilters = statusFilters | Q(status=models.Event.CANCELLED) status_filters = status_filters | Q(status=models.Event.CANCELLED)
if params['provisional']: if params['provisional']:
statusFilters = statusFilters | Q(status=models.Event.PROVISIONAL) status_filters = status_filters | Q(status=models.Event.PROVISIONAL)
if params['confirmed']: if params['confirmed']:
statusFilters = statusFilters | Q(status=models.Event.CONFIRMED) | Q(status=models.Event.BOOKED) status_filters = status_filters | Q(status=models.Event.CONFIRMED) | Q(status=models.Event.BOOKED)
filter = filter & typeFilters & statusFilters filter = filter & type_filters & status_filters
return models.Event.objects.filter(filter).order_by('-start_date').select_related('person', 'organisation', events = models.Event.objects.filter(filter).order_by('-start_date').select_related('person', 'organisation',
'venue', 'mic') 'venue', 'mic')
subhires = models.Subhire.objects.filter(status_filters).order_by('-start_date').select_related('person', 'organisation')
return list(chain(events, subhires))
def item_title(self, item): def item_title(self, item):
title = '' title = ''
@@ -106,30 +113,32 @@ class CalendarICS(ICalFeed):
return item.latest_time return item.latest_time
def item_location(self, item): def item_location(self, item):
return item.venue if hasattr(item, 'venue'):
return item.venue
return ""
def item_description(self, item): def item_description(self, item):
# Create a nice information-rich description # Create a nice information-rich description
# note: only making use of information available to "non-keyholders" # note: only making use of information available to "non-keyholders"
tz = pytz.timezone(self.timezone)
desc = f'Rig ID = {item.display_id}\n' desc = f'Rig ID = {item.display_id}\n'
desc += f'Event = {item.name}\n' desc += f'Event = {item.name}\n'
desc += 'Venue = ' + (item.venue.name if item.venue else '---') + '\n' if hasattr(item, 'venue'):
desc += 'Venue = ' + (item.venue.name if item.venue else '---') + '\n'
if item.is_rig and item.person: if item.is_rig and item.person:
desc += 'Client = ' + item.person.name + ( desc += 'Client = ' + item.person.name + (
(' for ' + item.organisation.name) if item.organisation else '') + '\n' (' for ' + item.organisation.name) if item.organisation else '') + '\n'
desc += f'Status = {item.get_status_display()}\n' desc += f'Status = {item.get_status_display()}\n'
desc += 'MIC = ' + (item.mic.name if item.mic else '---') + '\n' if hasattr(item, 'mic'):
desc += 'MIC = ' + (item.mic.name if item.mic else '---') + '\n'
desc += '\n' desc += '\n'
if item.meet_at: if hasattr(item, 'meet_at') and item.meet_at:
desc += 'Crew Meet = ' + ( desc += 'Crew Meet = ' + (
item.meet_at.astimezone(tz).strftime('%Y-%m-%d %H:%M') if item.meet_at else '---') + '\n' timezone.make_aware(item.meet_at).strftime('%Y-%m-%d %H:%M') if item.meet_at else '---') + '\n'
if item.access_at: if hasattr(item, 'access_at') and item.access_at:
desc += 'Access At = ' + ( desc += 'Access At = ' + (
item.access_at.astimezone(tz).strftime('%Y-%m-%d %H:%M') if item.access_at else '---') + '\n' timezone.make_aware(item.access_at).strftime('%Y-%m-%d %H:%M') if item.access_at else '---') + '\n'
if item.start_date: if item.start_date:
desc += 'Event Start = ' + item.start_date.strftime('%Y-%m-%d') + ( desc += 'Event Start = ' + item.start_date.strftime('%Y-%m-%d') + (
(' ' + item.start_time.strftime('%H:%M')) if item.has_start_time else '') + '\n' (' ' + item.start_time.strftime('%H:%M')) if item.has_start_time else '') + '\n'
@@ -140,8 +149,6 @@ class CalendarICS(ICalFeed):
desc += '\n' desc += '\n'
if item.description: if item.description:
desc += f'Event Description:\n{item.description}\n\n' desc += f'Event Description:\n{item.description}\n\n'
# if item.notes: // Need to add proper keyholder checks before this gets put back
# desc += 'Notes:\n'+item.notes+'\n\n'
desc += f'URL = https://rigs.nottinghamtec.co.uk{item.get_absolute_url()}' desc += f'URL = https://rigs.nottinghamtec.co.uk{item.get_absolute_url()}'

5
users/templates/profile_detail.html
View File

@@ -118,6 +118,11 @@
<input type="checkbox" value="dry-hire" data-default="true" checked> Dry-Hires <input type="checkbox" value="dry-hire" data-default="true" checked> Dry-Hires
</label> </label>
<label class="checkbox-inline mx-lg-2"> <label class="checkbox-inline mx-lg-2">
<input type="checkbox" value="subhire" data-default="false"> Subhires
</label>
</div>
<div class="form-group d-flex flex-column flex-lg-row">
<label class="checkbox-inline mr-lg-2">
<input type="checkbox" value="cancelled" data-default="false" > Cancelled <input type="checkbox" value="cancelled" data-default="false" > Cancelled
</label> </label>
<label class="checkbox-inline mx-lg-2"> <label class="checkbox-inline mx-lg-2">