From e9a972ad6064d3dbea972cc92927c1c4ab97ab2d Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Mon, 5 Oct 2020 17:29:19 +0200
Subject: [PATCH] Show dates in calendar week selection

---
 .../event/fragment_subevent_calendar_week.html              | 4 ++--
 .../templates/pretixpresale/organizers/calendar_week.html   | 4 ++--
 src/pretix/presale/views/event.py                           | 6 ++++--
 src/pretix/presale/views/organizer.py                       | 3 +--
 src/pretix/static/pretixpresale/scss/_calendar.scss         | 5 +++++
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar_week.html b/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar_week.html
index 9ebcb19f9..9813024fa 100644
--- a/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar_week.html
+++ b/src/pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar_week.html
@@ -16,9 +16,9 @@
             </a>
         </div>
         <div class="col-sm-4 col-xs-12 text-center">
-            <select name="week" class="form-control">
+            <select name="week" class="form-control select-calendar-week-short">
                 {% for w in weeks %}
-                    <option value="{{ w }}" {% if w == date.isocalendar.1 %}selected{% endif %}>{% trans "W" %} {{ w }}</option>
+                    <option value="{{ w.0.isocalendar.1 }}" {% if w.0.isocalendar.1 == date.isocalendar.1 %}selected{% endif %}>{% trans "W" %} {{ w.0.isocalendar.1 }} ({{ w.0|date:"SHORT_DATE_FORMAT" }} – {{ w.1|date:"SHORT_DATE_FORMAT" }})</option>
                 {% endfor %}
             </select>
             <select name="year" class="form-control">
diff --git a/src/pretix/presale/templates/pretixpresale/organizers/calendar_week.html b/src/pretix/presale/templates/pretixpresale/organizers/calendar_week.html
index 0956e2c2b..4504ed613 100644
--- a/src/pretix/presale/templates/pretixpresale/organizers/calendar_week.html
+++ b/src/pretix/presale/templates/pretixpresale/organizers/calendar_week.html
@@ -43,9 +43,9 @@
                 </a>
             </div>
             <div class="col-sm-4 col-xs-12 text-center">
-                <select name="week" class="form-control">
+                <select name="week" class="form-control select-calendar-week-short">
                     {% for w in weeks %}
-                        <option value="{{ w }}" {% if w == date.isocalendar.1 %}selected{% endif %}>{% trans "W" %} {{ w }}</option>
+                        <option value="{{ w.0.isocalendar.1 }}" {% if w.0.isocalendar.1 == date.isocalendar.1 %}selected{% endif %}>{% trans "W" %} {{ w.0.isocalendar.1 }} ({{ w.0|date:"SHORT_DATE_FORMAT" }} – {{ w.1|date:"SHORT_DATE_FORMAT" }})</option>
                     {% endfor %}
                 </select>
                 <select name="year" class="form-control">
diff --git a/src/pretix/presale/views/event.py b/src/pretix/presale/views/event.py
index 4b1ac2218..123cd6ea5 100644
--- a/src/pretix/presale/views/event.py
+++ b/src/pretix/presale/views/event.py
@@ -465,8 +465,10 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView):
                 len(i) for i in ebd.values() if isinstance(i, list)
             ) < 2
             context['days'] = days_for_template(ebd, week)
-            context['weeks'] = [date(self.year, i + 1, 1) for i in range(12)]
-            context['weeks'] = [i + 1 for i in range(53)]
+            context['weeks'] = [
+                (date.fromisocalendar(self.year, i + 1, 1), date.fromisocalendar(self.year, i + 1, 7))
+                for i in range(53)
+            ]
             context['years'] = range(now().year - 2, now().year + 3)
             context['week_format'] = get_format('WEEK_FORMAT')
             if context['week_format'] == 'WEEK_FORMAT':
diff --git a/src/pretix/presale/views/organizer.py b/src/pretix/presale/views/organizer.py
index 63ad3465d..3b3163785 100644
--- a/src/pretix/presale/views/organizer.py
+++ b/src/pretix/presale/views/organizer.py
@@ -522,8 +522,7 @@ class WeekCalendarView(OrganizerViewMixin, EventListMixin, TemplateView):
         ebd = self._events_by_day(before, after)
 
         ctx['days'] = days_for_template(ebd, week)
-        ctx['weeks'] = [date(self.year, i + 1, 1) for i in range(12)]
-        ctx['weeks'] = [i + 1 for i in range(53)]
+        ctx['weeks'] = [(date.fromisocalendar(self.year, i + 1, 1), date.fromisocalendar(self.year, i + 1, 7)) for i in range(53)]
         ctx['years'] = range(now().year - 2, now().year + 3)
         ctx['week_format'] = get_format('WEEK_FORMAT')
         if ctx['week_format'] == 'WEEK_FORMAT':
diff --git a/src/pretix/static/pretixpresale/scss/_calendar.scss b/src/pretix/static/pretixpresale/scss/_calendar.scss
index e3a226728..786b1ae17 100644
--- a/src/pretix/static/pretixpresale/scss/_calendar.scss
+++ b/src/pretix/static/pretixpresale/scss/_calendar.scss
@@ -124,3 +124,8 @@
 #monthselform .row > div {
   margin-bottom: 15px;
 }
+@media(min-width: $screen-md-min) {
+   .select-calendar-week-short {
+     max-width: 50%;
+   }
+}
\ No newline at end of file