From 56da8272682996771d43b7a7aa4959adaf4d7ba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Laur=C3=A9line=20Gu=C3=A9rin?= <zebuline@entrouvert.com>
Date: Tue, 13 Jul 2021 19:30:18 +0200
Subject: [PATCH] toodego: calendar widget compatibility with calendar cell
 (#55586)

---
 .../widgets/caluire-reservations-enfant.html    | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/templates/variants/toodego/qommon/forms/widgets/caluire-reservations-enfant.html b/templates/variants/toodego/qommon/forms/widgets/caluire-reservations-enfant.html
index cd8dedd9..5ca5dbaa 100644
--- a/templates/variants/toodego/qommon/forms/widgets/caluire-reservations-enfant.html
+++ b/templates/variants/toodego/qommon/forms/widgets/caluire-reservations-enfant.html
@@ -4,15 +4,17 @@
 {% with options=widget.get_options|list %}
 {% with first_monday=options.0.options.details.JOURDATE|adjust_to_week_monday last_option=options|last %}
 {% with last_day=last_option.options.details.JOURDATE|adjust_to_week_monday|add_days:6 %}
+{% now 'Y-m-d' as now %}
 
+{% spaceless %}
 <button class="previous-week">←</button>
 <ul>
 {% for day in first_monday|iterate_days_until:last_day %}
 {% if day.weekday == 0 %}
 {% if not forloop.first %}</ul></li>{% endif %}
-<li {% if forloop.first %}class="shown"{% endif %}><span class="week-title">Semaine<br class="weekbreak"> du {{day|date:"d/m"}} au {{day|add_days:6|date:"d/m"}}</span><ul>
+<li><span class="week-title">Semaine<br class="weekbreak"> du {{day|date:"d/m"}} au {{day|add_days:6|date:"d/m"}}</span><ul>
 {% endif %}
-<li class="day-title" data-weekday="{{day.weekday}}"><strong>{{day|date:"l d/m"}}</strong></li>
+<li class="day-title {% if form.var.current_day == day|date:"Y-m-d" or not form.var.current_day and now == day|date:"Y-m-d" %}current{% endif %}" data-weekday="{{day.weekday}}"><strong>{{day|date:"l d/m"}}</strong></li>
   {% with day_str=day|date:"Y-m-d" %}
     {% for option in options %}
       {% if option.options.details.JOURDATE == day_str %}
@@ -47,6 +49,7 @@
 {% endfor %}
 </ul>
 <button class="next-week">→</button>
+{% endspaceless %}
 {% endwith %}
 {% endwith %}
 {% endwith %}
@@ -104,8 +107,6 @@
         left: 0;
         border: 1px solid black;
         border-radius: 2px;
-}
-.template-caluire-reservations-enfant .content input[disabled] + span::before {
         border: 1px solid #aaa;
 }
 .template-caluire-reservations-enfant .content input[disabled] + span::after {
@@ -196,6 +197,14 @@ $('.template-caluire-reservations-enfant li.day-title').each(function(idx, elem)
     $(elem).hide();
   }
 });
+/* init first week shown */
+var $cell = $('.template-caluire-reservations-enfant');
+$('li', $cell).removeClass('shown');
+if ($('li.day-title.current', $cell).length) {
+  $('li.day-title.current', $cell).parent().parent().addClass('shown');
+} else {
+  $('li', $cell).first().addClass('shown');
+}
 $('.template-caluire-reservations-enfant input').on('change', function() {
   if ($(this).is(':checked')) {
     var $current_li = $(this).parents('li').first();