From 2d75688ef4a013abf98e46abd1f0588f403185ae Mon Sep 17 00:00:00 2001
From: Thomas JUND <tjund@entrouvert.com>
Date: Wed, 24 Feb 2021 10:28:45 +0100
Subject: [PATCH] isere-cd38: ens-calendar: change sunday weekdayindex to 7
 instead 0 (#51310)

---
 .../qommon/forms/widgets/select--ens-calendar.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/templates/variants/isere-cd38/qommon/forms/widgets/select--ens-calendar.html b/templates/variants/isere-cd38/qommon/forms/widgets/select--ens-calendar.html
index bb62e34a..ee976532 100644
--- a/templates/variants/isere-cd38/qommon/forms/widgets/select--ens-calendar.html
+++ b/templates/variants/isere-cd38/qommon/forms/widgets/select--ens-calendar.html
@@ -63,7 +63,9 @@ $(function() {
       date.value = (is$) ? day.value : day.id;
       date.label = (is$) ? day.text : day.details;
       date.number = (is$) ? day.dataset.daynumber : day.date_number ;
-      date.weekdayindex = (is$) ? day.dataset.weekdayindex : day.date_weekdayindex;
+      date.weekdayindex = parseInt((is$) ? day.dataset.weekdayindex : day.date_weekdayindex);
+      // French weekdayindex : sunday == 7 instead 0
+      date.weekdayindex = (date.weekdayindex == 0) ? 7 : date.weekdayindex;
       date.weeknumber = (is$) ? day.dataset.weeknumber : day.date_weeknumber;
       date.month = (is$) ? day.dataset.month : day.date_month;
       date.idx = (is$) ? idx : idx + 1;
@@ -144,7 +146,7 @@ $(function() {
           return day.weeknumber === weeknumber;
         });
         // empty days before
-        const first_position = parseInt(days_of_week[0].weekdayindex);
+        const first_position = days_of_week[0].weekdayindex;
         for (let i = 1; i < first_position; i++) {
           days_markup += day_tpl();
         }
@@ -153,11 +155,9 @@ $(function() {
           days_markup += day_tpl(day);
         });
         // empty days after
-        const last_position = parseInt(days_of_week[days_of_week.length - 1].weekdayindex);
-        if (last_position)  {
-          for (let i = last_position; i < 7; i++) {
-            days_markup += day_tpl();
-          }
+        const last_position = days_of_week[days_of_week.length - 1].weekdayindex;
+        for (let i = last_position; i < 7; i++) {
+          days_markup += day_tpl();
         }
         // week raw
         weeks_markup += '<tr class="' + prefix + 'week">' + days_markup + '</tr>';