From eb28c5e6d9bf5c5143d1abccd261cc9707915391 Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Sat, 2 Mar 2024 10:27:32 +0530
Subject: [PATCH] [UPDT] EMPLOYEE: Updated employee attendance tab by changing
 hx-target of user-request-one-view url

---
 employee/templates/tabs/attendance-tab.html   | 18 ++------
 .../tabs/profile-attendance-tab.html          | 13 +-----
 employee/templates/tabs/shift-tab.html        | 42 +++----------------
 3 files changed, 12 insertions(+), 61 deletions(-)

diff --git a/employee/templates/tabs/attendance-tab.html b/employee/templates/tabs/attendance-tab.html
index 545dc59c4..52fed7405 100644
--- a/employee/templates/tabs/attendance-tab.html
+++ b/employee/templates/tabs/attendance-tab.html
@@ -66,8 +66,8 @@
 				<div class="oh-sticky-table__tbody">
 					<div class="oh-sticky-table__tr" draggable="false"
 						hx-get="{% url 'user-request-one-view' attendance.id %}?instances_ids={{attendances_ids}}"
-						data-toggle="oh-modal-toggle" data-target="#detailAttendance"
-						hx-target="#detailAttendanceModalBody"
+						data-toggle="oh-modal-toggle" data-target="#objectDetailsModalW25"
+						hx-target="#objectDetailsModalW25Target"
 						>
 					<div
 						class="oh-sticky-table__sd {% if attendance.attendance_validated %}row-status--yellow {% else %}row-status--purple{% endif %}"
@@ -256,8 +256,8 @@
 						<div class="oh-sticky-table__tr" 
 							draggable="false"
                   			data-toggle="oh-modal-toggle"
-                  			data-target="#detailAttendance"
-                  			hx-target="#detailAttendanceModalBody"
+                  			data-target="#objectDetailsModalW25"
+                  			hx-target="#objectDetailsModalW25Target"
                   			hx-get="{% url 'user-request-one-view' attendance.id %}?validate=true&instances_ids={{validate_attendances_ids}}">
 						  <div class="oh-sticky-table__sd">
 							<div class="d-flex">
@@ -341,16 +341,6 @@
 	</div>
 </div>
 
-<div
-  class="oh-modal"
-  id="detailAttendance"
-  role="dialog"
-  aria-labelledby="detailAttendance"
-  aria-hidden="true"
-  >
-    <div class="oh-modal__dialog w-25" id="detailAttendanceModalBody"></div>
-</div>
-
 <div
   class="oh-modal"
   id="updateAttendanceModal"
diff --git a/employee/templates/tabs/profile-attendance-tab.html b/employee/templates/tabs/profile-attendance-tab.html
index 8af0d9052..cf02c6a7c 100644
--- a/employee/templates/tabs/profile-attendance-tab.html
+++ b/employee/templates/tabs/profile-attendance-tab.html
@@ -22,8 +22,8 @@
         {% for attendance in attendances %}
         <div class="oh-sticky-table__tr" draggable="false"
             data-toggle="oh-modal-toggle"
-            data-target="#detailAttendance"
-            hx-target="#detailAttendanceModalBody"     
+            data-target="#objectDetailsModalW25"
+            hx-target="#objectDetailsModalW25Target"     
             hx-get="{% url 'user-request-one-view' attendance.id %}?my_attendance=true&instances_ids={{attendances_ids}}">
           <div class="oh-sticky-table__sd">
             <div class="oh-profile oh-profile--md">
@@ -76,15 +76,6 @@
       </div>
     </div>
 </div>
-<div
-  class="oh-modal"
-  id="detailAttendance"
-  role="dialog"
-  aria-labelledby="detailAttendance"
-  aria-hidden="true"
-  >
-  <div class="oh-modal__dialog" id="detailAttendanceModalBody"></div>
-</div>
 {% else %}
 <div class="d-flex justify-content-center align-items-center" style="height:40vh">
   <h5 class="oh-404__subtitle">{% trans "No attendance requests have been generated." %}</h5>
diff --git a/employee/templates/tabs/shift-tab.html b/employee/templates/tabs/shift-tab.html
index 85edd5a27..f469e2b2a 100644
--- a/employee/templates/tabs/shift-tab.html
+++ b/employee/templates/tabs/shift-tab.html
@@ -175,8 +175,8 @@
         	    	  <div
         	    	    class="oh-sticky-table__tr"
         	    	    hx-get="{% url 'work-type-request-single-view' work_type_request.id %}?instances_ids={{work_type_requests_ids}}"
-        	    	    hx-target="#workTypeRequestSingleViewTarget"
-        	    	    data-target="#workTypeRequestSingleViewModal"
+        	    	    hx-target="#objectDetailsModalTarget"
+        	    	    data-target="#objectDetailsModal"
         	    	    data-toggle="oh-modal-toggle"
         	    	    draggable="true"
         	    	  >
@@ -343,7 +343,7 @@
         	    </div>
         	    <div class="oh-sticky-table__tbody">
         	    	{% for rshift in rshift_assign %}
-        	    		<div class="oh-sticky-table__tr" draggable="true" data-toggle="oh-modal-toggle" data-target="#rotatingShiftAssignDetailModal" hx-get="{% url 'rshift-individual-view' rshift.id %}?instances_ids={{rshift_assign_ids}}" hx-target = "#rotatingShiftAssignDetail">
+        	    		<div class="oh-sticky-table__tr" draggable="true" data-toggle="oh-modal-toggle" data-target="#objectDetailsModal" hx-get="{% url 'rshift-individual-view' rshift.id %}?instances_ids={{rshift_assign_ids}}" hx-target = "#objectDetailsModalTarget">
         	    			<div class="oh-sticky-table__sd">
         	    			  <div class="d-flex">
         	    			    <div class="oh-profile oh-profile--md">
@@ -488,8 +488,8 @@
         	    <div class="oh-sticky-table__tbody">
         	    	{% for rwork_type in rwork_type_assign %}
         	    		<div class="oh-sticky-table__tr" hx-get="{% url "rwork-individual-view" rwork_type.id %}?instances_ids={{rwork_type_assign_ids}}" 
-							        data-toggle="oh-modal-toggle" data-target="#rotatingWorkTypeAssignDetailModal" 
-							        hx-target="#rotatingWorkTypeAssignDetail" draggable="true">
+							        data-toggle="oh-modal-toggle" data-target="#objectDetailsModal" 
+							        hx-target="#objectDetailsModalTarget" draggable="true">
         	    			<div class="oh-sticky-table__sd">
         	    				<div class="d-flex">
         	    				  <div class="oh-profile oh-profile--md">
@@ -639,7 +639,7 @@
     		    {% for shift_request in shift_data %}
     		    	<div class="oh-sticky-table__tbody">
     		    	  <div draggable="true" class="oh-sticky-table__tr" data-toggle="oh-modal-toggle"
-						   data-target="#shiftRequestDetailModal" hx-get="{% url 'shift-request-details' shift_request.id %}?instances_ids={{shift_requests_ids}}" hx-target="#shiftRequestDetailTarget"
+						   data-target="#objectDetailsModal" hx-get="{% url 'shift-request-details' shift_request.id %}?instances_ids={{shift_requests_ids}}" hx-target="#objectDetailsModalTarget"
     		    	  		>
     		    	    <div class="oh-sticky-table__sd">
     		    	      <div class="d-flex">
@@ -784,16 +784,6 @@
   </div>
 </div>
 
-<div
-  class="oh-modal"
-  id="workTypeRequestSingleViewModal"
-  role="dialog"
-  aria-labelledby="workTypeRequestSingleViewModal"
-  aria-hidden="true"
-  >
-  <div class="oh-modal__dialog" id="workTypeRequestSingleViewTarget"> </div>
-</div>
-
 <div
   class="oh-modal"
   id="rotatingWorkTypeAssignDetailModal"
@@ -804,26 +794,6 @@
   <div class="oh-modal__dialog" id="rotatingWorkTypeAssignDetail"> </div>
 </div>
 
-<div
-  class="oh-modal"
-  id="rotatingShiftAssignDetailModal"
-  role="dialog"
-  aria-labelledby="rotatingShiftAssignDetailModalLabel"
-  aria-hidden="true"
-  >
-  <div class="oh-modal__dialog" id="rotatingShiftAssignDetail"> </div>
-</div>
-
-<div
-  class="oh-modal"
-  id="shiftRequestDetailModal"
-  role="dialog"
-  aria-labelledby="shiftRequestDetailModalLabel"
-  aria-hidden="true"
-  >
-  <div class="oh-modal__dialog" id="shiftRequestDetailTarget"> </div>
-</div>
-
 <div
   class="oh-modal"
   id="workTypeRequestUpdateModal"