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

Minor fiddling

Browse Source
This commit is contained in:
FreneticScribbler
2023-02-25 18:47:11 +00:00
parent 2e4b84c94e
commit a4f240e581
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RIGS/models/events.py
View File

@@ -211,7 +211,7 @@ class BaseEvent(models.Model, RevisionMixin):
end = self.latest_time end = self.latest_time
if isinstance(self.latest_time, datetime.datetime): if isinstance(self.latest_time, datetime.datetime):
end = self.latest_time.date() end = self.latest_time.date()
return (end - start).days return (end - start).days + 1
def clean(self): def clean(self):
errdict = {} errdict = {}

10
RIGS/utils.py
View File

@@ -14,16 +14,18 @@ class Calendar(HTMLCalendar):
return f"<a href='{event.get_absolute_url()}' class='modal-href' style='display: contents;'><div class='event event-start event-end bg-{event.color}' data-span='{event.length}' style='grid-column-start: calc({day[1]} + 1)'>{event}</div></a>" return f"<a href='{event.get_absolute_url()}' class='modal-href' style='display: contents;'><div class='event event-start event-end bg-{event.color}' data-span='{event.length}' style='grid-column-start: calc({day[1]} + 1)'>{event}</div></a>"
def formatmonth(self, withyear=True): def formatmonth(self, withyear=True):
events = Event.objects.filter(start_date__year=self.year, start_date__month=self.month) events = Event.objects.filter(start_date__year=self.year, start_date__month=self.month).order_by("start_date")
subhires = Subhire.objects.filter(start_date__year=self.year, start_date__month=self.month) subhires = Subhire.objects.filter(start_date__year=self.year, start_date__month=self.month).order_by("start_date")
weeks = self.monthdays2calendar(self.year, self.month) weeks = self.monthdays2calendar(self.year, self.month)
data = [] data = []
for week in weeks: for week in weeks:
weeks_events = [] weeks_events = []
for day in week: for day in week:
events_per_day = events.order_by("start_date").filter(start_date__day=day[0]) # Events that have started this week
subhires_per_day = subhires.order_by("start_date").filter(start_date__day=day[0]) events_per_day = events.filter(start_date__day=day[0])
subhires_per_day = subhires.filter(start_date__day=day[0])
event_html = "" event_html = ""
for event in events_per_day: for event in events_per_day:
event_html += self.get_html(day, event) event_html += self.get_html(day, event)