From b14f77e94ebb55dce875de4970b173cc69e798ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laur=C3=A9line=20Gu=C3=A9rin?= Date: Tue, 13 Dec 2022 10:20:35 +0100 Subject: [PATCH] manager: add monday's date in options of week selector (#72322) --- .../chrono/manager_agenda_week_view.html | 25 +++++++++++++++++++ .../chrono/manager_resource_week_view.html | 25 +++++++++++++++++++ chrono/manager/views.py | 9 +++++++ 3 files changed, 59 insertions(+) diff --git a/chrono/manager/templates/chrono/manager_agenda_week_view.html b/chrono/manager/templates/chrono/manager_agenda_week_view.html index 3a25fad0..029a2b6f 100644 --- a/chrono/manager/templates/chrono/manager_agenda_week_view.html +++ b/chrono/manager/templates/chrono/manager_agenda_week_view.html @@ -3,6 +3,31 @@ {% block bodyargs %}class="weekview"{% endblock %} +{% block extrascripts %} + {{ block.super }} + +{% endblock %} + {% block breadcrumb %} {{ block.super }} {{ view.date|date:"F Y" }} diff --git a/chrono/manager/templates/chrono/manager_resource_week_view.html b/chrono/manager/templates/chrono/manager_resource_week_view.html index ad97b31f..682fefed 100644 --- a/chrono/manager/templates/chrono/manager_resource_week_view.html +++ b/chrono/manager/templates/chrono/manager_resource_week_view.html @@ -3,6 +3,31 @@ {% block bodyargs %}class="weekview"{% endblock %} +{% block extrascripts %} + {{ block.super }} + +{% endblock %} + {% block breadcrumb %} {{ block.super }} {{ view.date|date:"F Y" }} diff --git a/chrono/manager/views.py b/chrono/manager/views.py index 17990a1d..8a7f12e5 100644 --- a/chrono/manager/views.py +++ b/chrono/manager/views.py @@ -256,6 +256,15 @@ class DateMixin: def get_weeks(self): return [(str(x), _('Week %s') % x) for x in range(1, 53)] + def get_week_dates(self): + dates = {} + for year in self.get_years(): + dates[year] = {} + for week, week_label in self.get_weeks(): + date = datetime.datetime.strptime('%s-W%s-1' % (year, week), "%Y-W%W-%w") + dates[year][week] = (date, week_label) + return dates + def get_years(self): year = now().year return [str(x) for x in range(year - 1, year + 5)]