From d2a088bbb41ad2a11404ddd301a7e4018bb9ea5c Mon Sep 17 00:00:00 2001 From: Horilla Date: Thu, 22 Feb 2024 11:20:25 +0530 Subject: [PATCH] [UPDT] LEAVE: Updated user leave request select all instance method --- leave/static/leave_request/action.js | 10 +++++++++- leave/templates/leave/user_leave/group_by.html | 5 ++++- leave/templates/leave/user_leave/user_requests.html | 5 ++++- 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/leave/static/leave_request/action.js b/leave/static/leave_request/action.js index d44e1a5e5..56a375454 100644 --- a/leave/static/leave_request/action.js +++ b/leave/static/leave_request/action.js @@ -109,12 +109,14 @@ function tickLeaverequestsCheckboxes() { languageCode = code; var message = rowMessages[languageCode]; if (selectedCount > 0) { + $("#unselectAllLeaverequests").css("display", "inline-flex"); $("#exportLeaverequests").css("display", "inline-flex"); $("#selectedShowLeaverequests").css("display", "inline-flex"); $("#selectedShowLeaverequests").text(selectedCount + " -" + message); } else { $("#selectedShowLeaverequests").css("display", "none"); $("#exportLeaverequests").css("display", "none"); + $("#unselectAllLeaverequests").css("display", "none"); } }); } @@ -144,7 +146,9 @@ function addingLeaverequestsIds() { if (selectedCount === 0) { $("#selectedShowLeaverequests").css("display", "none"); $("#exportLeaverequests").css("display", "none"); + $("#unselectAllLeaverequests").css("display", "none"); } else { + $("#unselectAllLeaverequests").css("display", "inline-flex"); $("#exportLeaverequests").css("display", "inline-flex"); $("#selectedShowLeaverequests").css("display", "inline-flex"); $("#selectedShowLeaverequests").text(selectedCount + " - " + message); @@ -389,12 +393,14 @@ function tickUserrequestsCheckboxes() { languageCode = code; var message = rowMessages[languageCode]; if (selectedCount > 0) { + $("#unselectAllUserrequests").css("display", "inline-flex"); $("#exportUserrequests").css("display", "inline-flex"); $("#selectedShowUserrequests").css("display", "inline-flex"); $("#selectedShowUserrequests").text(selectedCount + " -" + message); } else { - $("#selectedShowUserrequests").css("display", "none"); + $("#unselectAllUserrequests").css("display", "none"); $("#exportUserrequests").css("display", "none"); + $("#selectedShowUserrequests").css("display", "none"); } }); } @@ -422,10 +428,12 @@ function addingUserrequestsIds() { var message = rowMessages[languageCode]; $("#selectedUserrequests").attr("data-ids", JSON.stringify(ids)); if (selectedCount === 0) { + $("#unselectAllUserrequests").css("display", "none"); $("#selectedShowUserrequests").css("display", "none"); $("#exportUserrequests").css("display", "none"); } else { $("#exportUserrequests").css("display", "inline-flex"); + $("#unselectAllUserrequests").css("display", "inline-flex"); $("#selectedShowUserrequests").css("display", "inline-flex"); $("#selectedShowUserrequests").text(selectedCount + " - " + message); } diff --git a/leave/templates/leave/user_leave/group_by.html b/leave/templates/leave/user_leave/group_by.html index e51d93f10..8d7170672 100644 --- a/leave/templates/leave/user_leave/group_by.html +++ b/leave/templates/leave/user_leave/group_by.html @@ -12,7 +12,7 @@
{% trans "Unselect All Requests" %}
@@ -325,6 +325,9 @@ $("#requestCreateButton").attr('hx-vals',`{"pd":${hxVals}}`); tickUserrequestsCheckboxes(); $(".all-user-requests-row").change(function () { + if ($('.all-user-requests').is(":checked")) { + $(".all-user-requests").prop("checked", false); + } addingUserrequestsIds(); }); diff --git a/leave/templates/leave/user_leave/user_requests.html b/leave/templates/leave/user_leave/user_requests.html index 6854867bd..1bd239b5e 100644 --- a/leave/templates/leave/user_leave/user_requests.html +++ b/leave/templates/leave/user_leave/user_requests.html @@ -31,7 +31,7 @@
{% trans "Unselect All Requests" %}
@@ -279,6 +279,9 @@ $("#requestCreateButton").attr('hx-vals',`{"pd":${hxVals}}`); tickUserrequestsCheckboxes(); $(".all-user-requests-row").change(function () { + if ($('.all-user-requests').is(":checked")) { + $(".all-user-requests").prop("checked", false); + } addingUserrequestsIds(); });