CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Show dates in calendar week selection

Browse Source
This commit is contained in:
Raphael Michel
2020-10-05 17:29:19 +02:00
parent a31f0c1bc8
commit e9a972ad60
5 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pretix/presale/templates/pretixpresale/event/fragment_subevent_calendar_week.html
View File

@@ -16,9 +16,9 @@
</a> </a>
</div> </div>
<div class="col-sm-4 col-xs-12 text-center"> <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 %} {% 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 %} {% endfor %}
</select> </select>
<select name="year" class="form-control"> <select name="year" class="form-control">

4
src/pretix/presale/templates/pretixpresale/organizers/calendar_week.html
View File

@@ -43,9 +43,9 @@
</a> </a>
</div> </div>
<div class="col-sm-4 col-xs-12 text-center"> <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 %} {% 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 %} {% endfor %}
</select> </select>
<select name="year" class="form-control"> <select name="year" class="form-control">

6
src/pretix/presale/views/event.py
View File

@@ -465,8 +465,10 @@ class EventIndex(EventViewMixin, EventListMixin, CartMixin, TemplateView):
len(i) for i in ebd.values() if isinstance(i, list) len(i) for i in ebd.values() if isinstance(i, list)
) < 2 ) < 2
context['days'] = days_for_template(ebd, week) context['days'] = days_for_template(ebd, week)
context['weeks'] = [date(self.year, i + 1, 1) for i in range(12)] context['weeks'] = [
context['weeks'] = [i + 1 for i in range(53)] (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['years'] = range(now().year - 2, now().year + 3)
context['week_format'] = get_format('WEEK_FORMAT') context['week_format'] = get_format('WEEK_FORMAT')
if context['week_format'] == 'WEEK_FORMAT': if context['week_format'] == 'WEEK_FORMAT':

3
src/pretix/presale/views/organizer.py
View File

@@ -522,8 +522,7 @@ class WeekCalendarView(OrganizerViewMixin, EventListMixin, TemplateView):
ebd = self._events_by_day(before, after) ebd = self._events_by_day(before, after)
ctx['days'] = days_for_template(ebd, week) ctx['days'] = days_for_template(ebd, week)
ctx['weeks'] = [date(self.year, i + 1, 1) for i in range(12)] ctx['weeks'] = [(date.fromisocalendar(self.year, i + 1, 1), date.fromisocalendar(self.year, i + 1, 7)) for i in range(53)]
ctx['weeks'] = [i + 1 for i in range(53)]
ctx['years'] = range(now().year - 2, now().year + 3) ctx['years'] = range(now().year - 2, now().year + 3)
ctx['week_format'] = get_format('WEEK_FORMAT') ctx['week_format'] = get_format('WEEK_FORMAT')
if ctx['week_format'] == 'WEEK_FORMAT': if ctx['week_format'] == 'WEEK_FORMAT':

5
src/pretix/static/pretixpresale/scss/_calendar.scss
View File

@@ -124,3 +124,8 @@
#monthselform .row > div { #monthselform .row > div {
margin-bottom: 15px; margin-bottom: 15px;
} }
@media(min-width: $screen-md-min) {
.select-calendar-week-short {
max-width: 50%;
}
}