From 05f5ea07687ea2b48553f5747d6ad0840a23fd57 Mon Sep 17 00:00:00 2001 From: Maryse Simard Date: Thu, 5 Jun 2025 14:01:28 -0400 Subject: [PATCH] Bug 17015: Identify days unavailable for edition (mostly dates too far in the future) --- .../intranet-tmpl/prog/css/src/calendar.scss | 3 ++- .../prog/en/modules/tools/discrete_calendar.tt | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss b/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss index 988b2ddc94..22dc2e74c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/calendar.scss @@ -47,7 +47,8 @@ $selected: #B9DB88; border: 0; } - &.past-date { + &.past-date, + &.unavailable-date { background-color: $pastdate_bg; &.selected { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt index 0c814426ce..120039dfca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/discrete_calendar.tt @@ -493,7 +493,11 @@ if (date.date_obj < today) { formatDay( [ "past-date", _("Past day")], dayElem ); } else { - formatDay( [ "normalday", _("Normal day")], dayElem ); + if (datesInfos[dateString]) { + formatDay( [ "normalday", _("Normal day")], dayElem ); + } else { + formatDay( [ "unavailable-date", _("Unavailable day")], dayElem ); + } } if (datesInfos[dateString] && datesInfos[dateString].holiday_type =='W') { @@ -726,9 +730,14 @@ var dayName = weekdays[weekDay]; var dateString = date.dateString; - // set value of form hidden field - $('#from_date').val(dateStr); - showHoliday(date.date_obj, dateString, dayName, date.day, date.month, date.year, weekDay, datesInfos[dateString].title, datesInfos[dateString].description, datesInfos[dateString].holiday_type); + + if (datesInfos[dateString]) { + // set value of form hidden field + $('#from_date').val(dateStr); + showHoliday(date.date_obj, dateString, dayName, date.day, date.month, date.year, weekDay, datesInfos[dateString].title, datesInfos[dateString].description, datesInfos[dateString].holiday_type); + } else { + $("#newHoliday").hide(); + } [% END %] } }); -- 2.43.0