From b33879d8ab246ab03dcc121d2134810c3a81fbcb Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Wed, 21 Feb 2024 10:42:36 +0530
Subject: [PATCH] [UPDT] BASE: Updated shift template script

---
 base/static/base/actions.js                          | 8 ++++++++
 base/templates/shift_request/htmx/group_by.html      | 8 +++++++-
 base/templates/shift_request/htmx/requests.html      | 7 ++++++-
 base/templates/shift_request/shift_request_view.html | 3 ++-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/base/static/base/actions.js b/base/static/base/actions.js
index cda178413..062b8c1bf 100644
--- a/base/static/base/actions.js
+++ b/base/static/base/actions.js
@@ -166,11 +166,13 @@ function tickRShiftCheckboxes() {
     var message = rowMessages[languageCode];
     if (selectedCount > 0) {
       $("#exportRShifts").css("display", "inline-flex");
+      $("#unselectAllRShifts").css("display", "inline-flex");
       $("#selectedShowRShifts").css("display", "inline-flex");
       $("#selectedShowRShifts").text(selectedCount + " -" + message);
     } else {
       $("#selectedShowRShifts").css("display", "none");
       $("#exportRShifts").css("display", "none");
+      $("#unselectAllRShifts").css("display", "none");
     }
   });
 }
@@ -415,11 +417,13 @@ function tickRWorktypeCheckboxes() {
     var message = rowMessages[languageCode];
     if (selectedCount > 0) {
       $("#exportRWorktypes").css("display", "inline-flex");
+      $("#unselectAllRWorktypes").css("display", "inline-flex");
       $("#selectedShowRWorktypes").css("display", "inline-flex");
       $("#selectedShowRWorktypes").text(selectedCount + " -" + message);
     } else {
       $("#selectedShowRWorktypes").css("display", "none");
       $("#exportRWorktypes").css("display", "none");
+      $("#unselectAllRWorktypes").css("display", "none");
     }
   });
 }
@@ -661,11 +665,13 @@ function tickShiftCheckboxes() {
     var message = rowMessages[languageCode];
     if (selectedCount > 0) {
       $("#exportShifts").css("display", "inline-flex");
+      $("#unselectAllShifts").css("display", "inline-flex");
       $("#selectedShowShifts").css("display", "inline-flex");
       $("#selectedShowShifts").text(selectedCount + " -" + message);
     } else {
       $("#selectedShowShifts").css("display", "none");
       $("#exportShifts").css("display", "none");
+      $("#unselectAllShifts").css("display", "none");
     }
   });
 }
@@ -909,11 +915,13 @@ function tickWorktypeCheckboxes() {
     var message = rowMessages[languageCode];
     if (selectedCount > 0) {
       $("#exportWorktypes").css("display", "inline-flex");
+      $("#unselectAllWorktypes").css("display", "inline-flex");
       $("#selectedShowWorktypes").css("display", "inline-flex");
       $("#selectedShowWorktypes").text(selectedCount + " -" + message);
     } else {
       $("#selectedShowWorktypes").css("display", "none");
       $("#exportWorktypes").css("display", "none");
+      $("#unselectAllWorktypes").css("display", "none");
     }
   });
 }
diff --git a/base/templates/shift_request/htmx/group_by.html b/base/templates/shift_request/htmx/group_by.html
index c4dd9f951..690485585 100644
--- a/base/templates/shift_request/htmx/group_by.html
+++ b/base/templates/shift_request/htmx/group_by.html
@@ -675,8 +675,11 @@
       if (selectedCount === 0) {
         $("#selectedShowShifts").css("display", "none");
         $("#exportShifts").css("display", "none");
+        $("#unselectAllShifts").css("display", "none");
+		
       } else {
         $("#exportShifts").css("display", "inline-flex");
+        $("#unselectAllShifts").css("display", "inline-flex");
         $("#selectedShowShifts").css("display", "inline-flex");
         $("#selectedShowShifts").text(selectedCount + " - " + message);
       }
@@ -685,7 +688,10 @@
 
   $(document).ready(function () {
     $(".all-shift-requests-row").change(function () {
-      addingShiftIds();
+	if ($('.all-shift-requests').is(":checked")) {
+	  	$(".all-shift-requests").prop("checked", false);
+	}
+	addingShiftIds();
     });
 
     $(".all-shift-requests").change(function () {
diff --git a/base/templates/shift_request/htmx/requests.html b/base/templates/shift_request/htmx/requests.html
index 83ead8954..5a87dcc47 100755
--- a/base/templates/shift_request/htmx/requests.html
+++ b/base/templates/shift_request/htmx/requests.html
@@ -575,10 +575,12 @@
           var message = rowMessages[languageCode];
           $("#selectedShifts").attr("data-ids", JSON.stringify(ids));
           if (selectedCount === 0) {
-            $("#selectedShowShifts").css("display", "none");
             $("#exportShifts").css("display", "none");
+            $("#unselectAllShifts").css("display", "none");
+            $("#selectedShowShifts").css("display", "none");
           } else {
             $("#exportShifts").css("display", "inline-flex");
+            $("#unselectAllShifts").css("display", "inline-flex");
             $("#selectedShowShifts").css("display", "inline-flex");
             $("#selectedShowShifts").text(selectedCount + " - " + message);
           }
@@ -587,6 +589,9 @@
     
       $(document).ready(function () {
         $(".all-shift-requests-row").change(function () {
+          if ($('.all-shift-requests').is(":checked")) {
+            $(".all-shift-requests").prop("checked", false);
+          }
           addingShiftIds();
         });
     
diff --git a/base/templates/shift_request/shift_request_view.html b/base/templates/shift_request/shift_request_view.html
index 9a26e85f0..07ca0aae1 100644
--- a/base/templates/shift_request/shift_request_view.html
+++ b/base/templates/shift_request/shift_request_view.html
@@ -47,7 +47,8 @@
     <div
     class="oh-checkpoint-badge text-secondary mb-2"
     id="unselectAllShifts"
-    style="cursor: pointer"
+    style="cursor: pointer;
+          display:none;"
     >
       {% trans "Unselect All Shifts" %}
     </div>