show calendar without events

ephios-dev · Jul 30, 2024 · 7ec31e3 · 7ec31e3
1 parent 60b73a5
commit 7ec31e3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/ephios/core/templates/core/event_list.html b/ephios/core/templates/core/event_list.html
@@ -116,12 +116,6 @@ <h3 class="mx-3">
 
     {% if mode == "list" %}
         {% include "core/fragments/event_list_list_mode.html" %}
-    {% elif not event_list %}
-        <div class="mb-3">
-            <h5 class="mt-5 text-center">
-                {% translate "No results" %}
-            </h5>
-        </div>
     {% elif mode == "calendar" %}
         {{ calendar }}
     {% elif mode == "day" %}

diff --git a/ephios/core/templates/core/fragments/event_list_day_mode.html b/ephios/core/templates/core/fragments/event_list_day_mode.html
@@ -47,6 +47,10 @@ <h2 class="card-title clearfix text-truncate fs-6">
                 </div>
             </a>
         </div>
+    {% empty %}
+        <h5 class="mt-5 text-center">
+            {% translate "No results" %}
+        </h5>
     {% endfor %}
 
     {% for event in event_list %}

diff --git a/ephios/core/views/event.py b/ephios/core/views/event.py
@@ -345,12 +345,7 @@ def _get_day_context(self):
             .prefetch_related(Prefetch("shifts", queryset=Shift.objects.order_by("start_time")))
         )
 
-        if not events.exists():
-            ctx.update({"event_list": events, "date": this_date})
-            return ctx
-
         css_context = self._build_day_css_context(events, shifts)
-
         ctx.update(
             {
                 "event_list": events,
@@ -359,7 +354,6 @@ def _get_day_context(self):
                 **css_context,
             }
         )
-
         return ctx
 
     def _build_day_css_context(self, events, shifts):
@@ -390,8 +384,14 @@ def _build_day_css_context(self, events, shifts):
 
             shifts_by_event_layouted[event.pk] = columns
         css_shift_tops = ""
-        earliest_shift_start = min(shift.start_time for shift in shifts)
-        latest_shift_end = max(shift.end_time for shift in shifts)
+        try:
+            earliest_shift_start = min(shift.start_time for shift in shifts)
+            latest_shift_end = max(shift.end_time for shift in shifts)
+        except ValueError:
+            # empty shifts
+            earliest_shift_start = latest_shift_end = timezone.now()
+            total_height = 2
+
         # calculate timescale based on shortest shift
         # to not make things too small, consider a maximum of 4 hours and a minimum of 15 minutes
         shortest_shift_duration_in_hours = max(