From a4f240e581e7f0f901d5d1c4ec6a11d4470a14bd Mon Sep 17 00:00:00 2001
From: FreneticScribbler <aj@aronajones.com>
Date: Sat, 25 Feb 2023 18:47:11 +0000
Subject: [PATCH] Minor fiddling

---
 RIGS/models/events.py |  2 +-
 RIGS/utils.py         | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/RIGS/models/events.py b/RIGS/models/events.py
index 0ba41fb7..57b03351 100644
--- a/RIGS/models/events.py
+++ b/RIGS/models/events.py
@@ -211,7 +211,7 @@ class BaseEvent(models.Model, RevisionMixin):
         end = self.latest_time
         if isinstance(self.latest_time, datetime.datetime):
             end = self.latest_time.date()
-        return (end - start).days
+        return (end - start).days + 1
 
     def clean(self):
         errdict = {}
diff --git a/RIGS/utils.py b/RIGS/utils.py
index e2d249bb..23cdf944 100644
--- a/RIGS/utils.py
+++ b/RIGS/utils.py
@@ -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>"
 
     def formatmonth(self, withyear=True):
-        events = Event.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)
+        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).order_by("start_date")
         weeks = self.monthdays2calendar(self.year, self.month)
         data = []
 
         for week in weeks:
             weeks_events = []
+            
             for day in week:
-                events_per_day = events.order_by("start_date").filter(start_date__day=day[0])
-                subhires_per_day = subhires.order_by("start_date").filter(start_date__day=day[0])
+                # Events that have started this week
+                events_per_day = events.filter(start_date__day=day[0])
+                subhires_per_day = subhires.filter(start_date__day=day[0])
                 event_html = ""
                 for event in events_per_day:
                     event_html += self.get_html(day, event)