From 22d137836fdd77eea1733d1c7e9999e5acc7d905 Mon Sep 17 00:00:00 2001
From: Serghei Mihai <smihai@entrouvert.com>
Date: Wed, 20 Jun 2018 23:14:07 +0200
Subject: [PATCH 1/3] manager: rename element for calendar date picking
 (#21326)

---
 chrono/manager/static/css/style.scss                 |  4 ++--
 chrono/manager/static/js/chrono.manager.js           | 12 ++++++++----
 .../templates/chrono/manager_agenda_day_view.html    |  4 ++--
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/chrono/manager/static/css/style.scss b/chrono/manager/static/css/style.scss
index f8f23a8..9b42892 100644
--- a/chrono/manager/static/css/style.scss
+++ b/chrono/manager/static/css/style.scss
@@ -164,7 +164,7 @@ span.start-time {
 	font-size: 80%;
 }
 
-.day-title {
+.date-title {
 	cursor: pointer;
 	&::after {
 		content: "\f073"; /* calendar */
@@ -180,7 +180,7 @@ span.start-time {
 	}
 }
 
-.day-picker {
+.date-picker {
 	button, select {
 		font-size: 1rem;
 	}
diff --git a/chrono/manager/static/js/chrono.manager.js b/chrono/manager/static/js/chrono.manager.js
index eb02229..13c05f0 100644
--- a/chrono/manager/static/js/chrono.manager.js
+++ b/chrono/manager/static/js/chrono.manager.js
@@ -4,11 +4,15 @@ $(function() {
     var booked = $(this).data('booked');
     $(this).find('.occupation-bar').css('max-width', 100 * booked / total + '%');
   });
-  $('.day-title').on('click', function() {
-    $(this).parent().find('.day-picker').toggle();
+  $('.date-title').on('click', function() {
+    $(this).parent().find('.date-picker').toggle();
   });
-  $('.day-picker button').on('click', function() {
-    window.location = '../../../' + $('[name=year]').val() + '/' + $('[name=month]').val() + '/' + $('[name=day]').val() + '/';
+    $('.date-picker button').on('click', function() {
+    if ($('[name=day]').val()) {
+       window.location = '../../../' + $('[name=year]').val() + '/' + $('[name=month]').val() + '/' + $('[name=day]').val() + '/';
+    } else {
+        window.location = '../../' + $('[name=year]').val() + '/' + $('[name=month]').val() + '/';
+    }
     return false;
   });
 });
diff --git a/chrono/manager/templates/chrono/manager_agenda_day_view.html b/chrono/manager/templates/chrono/manager_agenda_day_view.html
index 7c47bd8..af5a1cf 100644
--- a/chrono/manager/templates/chrono/manager_agenda_day_view.html
+++ b/chrono/manager/templates/chrono/manager_agenda_day_view.html
@@ -11,9 +11,9 @@
 {% block appbar %}
 <h2>
   <a href="{{ view.get_previous_day_url }}">←</a>
-  <span class="day-title">{{ view.date|date:"l j F Y" }}</span>
+  <span class="date-title">{{ view.date|date:"l j F Y" }}</span>
   {% with selected_day=view.date|date:"j" selected_month=view.date|date:"n" selected_year=view.date|date:"Y" %}
-    <div class="day-picker" style="display: none">
+    <div class="date-picker" style="display: none">
     <select name="day">{% for day in view.get_days %}<option value="{{ day }}" {% if selected_day == day %}selected{% endif %}>{{day}}</option>{% endfor %}</select>
     <select name="month">{% for month, month_label in view.get_months %}<option value="{{ month }}" {% if selected_month == month %}selected{% endif %}>{{ month_label }}</option>{% endfor %}</select>
     <select name="year">{% for year in view.get_years %}<option value="{{ year }}" {% if selected_year == year %}selected{% endif %}>{{year}}</option>{% endfor %}</select>
-- 
2.19.0.rc2