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

Calendar changes

Browse Source 
Closes #437
(Probably) Closes #469 but also puts us out of spec...
This commit is contained in:
FreneticScribbler
2022-02-15 01:00:47 +00:00
parent 6c14b30c13
commit c2dcd86d5d
2 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
RIGS/templates/calendar.html
View File

@@ -27,15 +27,12 @@
calendar = new FullCalendar.Calendar(calendarEl, { calendar = new FullCalendar.Calendar(calendarEl, {
themeSystem: 'bootstrap', themeSystem: 'bootstrap',
//defaultView: 'dayGridMonth', This is now default
aspectRatio: 1.5, aspectRatio: 1.5,
eventTimeFormat: { eventTimeFormat: {
'hour': '2-digit', 'hour': '2-digit',
'minute': '2-digit', 'minute': '2-digit',
'hour12': false 'hour12': false
}, },
//nowIndicator: true,
//firstDay: 1,
headerToolbar: false, headerToolbar: false,
editable: false, editable: false,
dayMaxEventRows: true, // allow "more" link when too many events dayMaxEventRows: true, // allow "more" link when too many events
@@ -58,8 +55,10 @@
}; };
$(doc).each(function() { $(doc).each(function() {
end = $(this).attr('latest') end = $(this).attr('latest')
allDay = false
if(end.indexOf("T") < 0){ //If latest does not contain a time if(end.indexOf("T") < 0){ //If latest does not contain a time
end = moment(end).add(1, 'days') //End date is non-inclusive, so add a day end = moment(end + " 23:59").format("YYYY-MM-DD[T]HH:mm:ss")
allDay = true
} }
thisEvent = { thisEvent = {
@@ -67,7 +66,8 @@
'end': end, 'end': end,
'className': 'modal-href', 'className': 'modal-href',
'title': $(this).attr('title'), 'title': $(this).attr('title'),
'url': $(this).attr('url') 'url': $(this).attr('url'),
'allDay': allDay
} }
if($(this).attr('is_rig')===true || $(this).attr('status') === "Cancelled"){ if($(this).attr('is_rig')===true || $(this).attr('status') === "Cancelled"){

22
RIGS/views/ical.py
View File

@@ -93,7 +93,7 @@ class CalendarICS(ICalFeed):
title += item.name title += item.name
# Add the status # Add the status
title += ' (' + str(item.get_status_display()) + ')' title += f' ({item.get_status_display()})'
return title return title
@@ -101,9 +101,8 @@ class CalendarICS(ICalFeed):
return item.earliest_time return item.earliest_time
def item_end_datetime(self, item): def item_end_datetime(self, item):
if isinstance(item.latest_time, datetime.date): # Ical end_datetime is non-inclusive, so add a day # if isinstance(item.latest_time, datetime.date): # Ical end_datetime is non-inclusive, so add a day
return item.latest_time + datetime.timedelta(days=1) # return item.latest_time + datetime.timedelta(days=1)
return item.latest_time return item.latest_time
def item_location(self, item): def item_location(self, item):
@@ -115,13 +114,13 @@ class CalendarICS(ICalFeed):
tz = pytz.timezone(self.timezone) tz = pytz.timezone(self.timezone)
desc = 'Rig ID = ' + str(item.pk) + '\n' desc = f'Rig ID = {item.display_id}\n'
desc += 'Event = ' + item.name + '\n' desc += f'Event = {item.name}\n'
desc += 'Venue = ' + (item.venue.name if item.venue else '---') + '\n' 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 += 'Status = ' + str(item.get_status_display()) + '\n' desc += f'Status = {item.get_status_display()}\n'
desc += 'MIC = ' + (item.mic.name if item.mic else '---') + '\n' desc += 'MIC = ' + (item.mic.name if item.mic else '---') + '\n'
desc += '\n' desc += '\n'
@@ -140,23 +139,18 @@ class CalendarICS(ICalFeed):
desc += '\n' desc += '\n'
if item.description: if item.description:
desc += '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 # if item.notes: // Need to add proper keyholder checks before this gets put back
# desc += 'Notes:\n'+item.notes+'\n\n' # desc += 'Notes:\n'+item.notes+'\n\n'
base_url = "https://rigs.nottinghamtec.co.uk" desc += f'URL = https://rigs.nottinghamtec.co.uk{item.get_absolute_url()}'
desc += 'URL = ' + base_url + str(item.get_absolute_url())
return desc return desc
def item_link(self, item): def item_link(self, item):
# Make a link to the event in the web interface # Make a link to the event in the web interface
# base_url = "https://pyrigs.nottinghamtec.co.uk"
return item.get_absolute_url() return item.get_absolute_url()
# def item_created(self, item): #TODO - Implement created date-time (using django-reversion?) - not really necessary though
# return ''
def item_updated(self, item): # some ical clients will display this def item_updated(self, item): # some ical clients will display this
return item.last_edited_at return item.last_edited_at