From c2f9feb3de9f01ae8fa4ce5e7d3f720cdd07446b Mon Sep 17 00:00:00 2001 From: Horilla Date: Fri, 17 Nov 2023 16:04:19 +0530 Subject: [PATCH] [FIX] LEAVE: Highlight issue on holidays --- leave/static/holiday/action.js | 5 +++++ leave/templates/leave/holiday/holiday.html | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/leave/static/holiday/action.js b/leave/static/holiday/action.js index 844c1782e..c54414e56 100644 --- a/leave/static/holiday/action.js +++ b/leave/static/holiday/action.js @@ -48,6 +48,7 @@ function getCurrentLanguageCode(callback) { function tickHolidayCheckboxes() { var ids = JSON.parse($("#selectedHolidays").attr("data-ids") || "[]"); uniqueIds = makeHolidayListUnique(ids); + toggleHighlight(uniqueIds); click = $("#selectedHolidays").attr("data-clicked"); if (click === "1") { $(".all-holidays").prop("checked", true); @@ -86,6 +87,7 @@ function addingHolidayIds() { }); ids = makeHolidayListUnique(ids); + toggleHighlight(ids) selectedCount = ids.length; getCurrentLanguageCode(function (code) { @@ -193,6 +195,9 @@ function unselectAllHolidays() { $("#" + empId).prop("checked", false); $(".all-holidays").prop("checked", false); } + var ids = JSON.parse($("#selectedHolidays").attr("data-ids") || "[]"); + var uniqueIds = makeListUnique(ids); + toggleHighlight(uniqueIds) $("#selectedHolidays").attr("data-ids", JSON.stringify([])); count = []; diff --git a/leave/templates/leave/holiday/holiday.html b/leave/templates/leave/holiday/holiday.html index e70a61243..16006e271 100644 --- a/leave/templates/leave/holiday/holiday.html +++ b/leave/templates/leave/holiday/holiday.html @@ -52,6 +52,7 @@ @@ -183,9 +184,11 @@ $(".all-holidays").change(function (e) { var is_checked = $(this).is(":checked"); if (is_checked) { - $(".all-holidays-row").prop("checked", true); + $(".all-holidays-row").prop("checked", true).closest(".oh-sticky-table__tr") + .addClass("highlight-selected");; } else { - $(".all-holidays-row").prop("checked", false); + $(".all-holidays-row").prop("checked", false).closest(".oh-sticky-table__tr") + .removeClass("highlight-selected");; } });