From 3deb7b25a2e673ad0178f63fc676eea049b8175d Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Thu, 29 Feb 2024 12:21:48 +0530
Subject: [PATCH] [UPDT] BASE: Updated shift request modal view in dashboard
 and shift request view by changing the hx-target and data-target

---
 .../own_attendance/attendances.html           | 17 ++--------------
 .../request_and_approve/shift_request.html    |  4 ++--
 .../work_type_request.html                    |  4 ++--
 .../htmx/allocation_details.html              | 13 ++++++++++++
 .../htmx/shift_request_detail.html            | 17 ++++++++++++++--
 .../shift_request/shift_request_view.html     | 20 ++-----------------
 6 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/attendance/templates/attendance/own_attendance/attendances.html b/attendance/templates/attendance/own_attendance/attendances.html
index 3be3ce268..d92ccfb0f 100644
--- a/attendance/templates/attendance/own_attendance/attendances.html
+++ b/attendance/templates/attendance/own_attendance/attendances.html
@@ -314,21 +314,8 @@
   role="dialog"
   aria-labelledby="detailAttendance"
   aria-hidden="true"
->
-  <div class="oh-modal__dialog">
-    <div class="oh-modal__dialog-header">
-      <h2 class="oh-modal__dialog-title" id="addEmployeeModalLabel">
-        {% trans "Details" %}
-      </h2>
-      <button class="oh-modal__close" aria-label="Close">
-        <ion-icon name="close-outline"></ion-icon>
-      </button>
-    </div>
-    <div
-      class="oh-modal__dialog-body oh-modal__dialog-body oh-modal__dialog-relative"
-      id="detailAttendanceModalBody"
-    ></div>
-  </div>
+  >
+  <div class="oh-modal__dialog w-25" id="detailAttendanceModalBody"></div>
 </div>
 
 <script>
diff --git a/base/templates/request_and_approve/shift_request.html b/base/templates/request_and_approve/shift_request.html
index 9b2641749..9ee936be6 100644
--- a/base/templates/request_and_approve/shift_request.html
+++ b/base/templates/request_and_approve/shift_request.html
@@ -16,9 +16,9 @@
             <div
                 class="oh-sticky-table__tr"
                 hx-get="{% url 'shift-request-details' shift_request.id %}?instances_ids={{requests_ids}}&dashboard=true"
-                hx-target="#smallModalTarget"
+                hx-target="#shiftRequestDetailTarget"
                 data-toggle="oh-modal-toggle"
-                data-target="#smallModal"
+                data-target="#shiftRequestDetailModal"
             >
                 <div class="oh-sticky-table__sd">
                     <div class="oh-profile oh-profile--md">
diff --git a/base/templates/request_and_approve/work_type_request.html b/base/templates/request_and_approve/work_type_request.html
index 7f4731550..979ea60fa 100644
--- a/base/templates/request_and_approve/work_type_request.html
+++ b/base/templates/request_and_approve/work_type_request.html
@@ -16,9 +16,9 @@
             <div
                 class="oh-sticky-table__tr"
                 hx-get="{% url 'work-type-request-single-view' work_type.id %}?instances_ids={{requests_ids}}&dashboard=true"
-                hx-target="#smallModalTarget"
+                hx-target="#workTypeRequestSingleViewTarget"
                 data-toggle="oh-modal-toggle"
-                data-target="#smallModal"
+                data-target="#workTypeRequestSingleViewModal"
             >
                 <div class="oh-sticky-table__sd">
                     <div class="oh-profile oh-profile--md">
diff --git a/base/templates/shift_request/htmx/allocation_details.html b/base/templates/shift_request/htmx/allocation_details.html
index 744916ecf..a8747df6c 100644
--- a/base/templates/shift_request/htmx/allocation_details.html
+++ b/base/templates/shift_request/htmx/allocation_details.html
@@ -1,5 +1,17 @@
 {% load basefilters %}
 {% load i18n %} {% load yes_no %}
+<div class="oh-modal__dialog-header">
+    <span
+      class="oh-modal__dialog-title"
+      id="workTypeRequestSingleViewModalLabel"
+    >
+      {% trans "Details" %}
+    </span>
+    <button class="oh-modal__close" aria-label="Close">
+      <ion-icon name="close-outline"></ion-icon>
+    </button>
+</div>
+<div class="oh-modal__dialog-body oh-modal__dialog-relative" >
 {% if request.GET.instances_ids %}
 
     <div class="oh-modal__dialog oh-modal__dialog--navigation m-0 p-0">
@@ -144,4 +156,5 @@
         {% endif %}
        </div>
     </div>
+</div>
 </div>
\ No newline at end of file
diff --git a/base/templates/shift_request/htmx/shift_request_detail.html b/base/templates/shift_request/htmx/shift_request_detail.html
index 5e721138e..afc454114 100644
--- a/base/templates/shift_request/htmx/shift_request_detail.html
+++ b/base/templates/shift_request/htmx/shift_request_detail.html
@@ -1,10 +1,22 @@
 {% load basefilters %}
 {% load i18n %} {% load yes_no %}
+<div class="oh-modal__dialog-header">
+    <span
+      class="oh-modal__dialog-title"
+      id="shiftRequestDetailModalLabel"
+    >
+      {% trans "Details" %}
+    </span>
+    <button class="oh-modal__close" aria-label="Close">
+      <ion-icon name="close-outline"></ion-icon>
+    </button>
+</div>
+<div class="oh-modal__dialog-body oh-modal__dialog-relative">
 {% if request.GET.instances_ids %}
 <div class="oh-modal__dialog oh-modal__dialog--navigation m-0 p-0">
     <button 
         hx-get="{% url 'shift-request-details' previous %}?instances_ids={{requests_ids}}&dashboard={{dashboard}}" 
-        hx-target="{% if dashboard == 'true' %}#smallModalTarget{% else %}#shiftRequestDetailTarget {% endif %}"  
+        hx-target="#shiftRequestDetailTarget"  
         class="oh-modal__diaglog-nav oh-modal__nav-prev">
         <ion-icon name="chevron-back-outline" class="md hydrated" role="img"
         aria-label="chevron back outline"></ion-icon>
@@ -12,7 +24,7 @@
 
     <button  
         hx-get="{% url 'shift-request-details' next %}?instances_ids={{requests_ids}}&dashboard={{dashboard}}" 
-        hx-target="{% if dashboard == 'true' %}#smallModalTarget{% else %}#shiftRequestDetailTarget {% endif %}"  
+        hx-target="#shiftRequestDetailTarget"  
         class="oh-modal__diaglog-nav oh-modal__nav-next">
         <ion-icon name="chevron-forward-outline" class="md hydrated" role="img"
         aria-label="chevron forward outline"></ion-icon>
@@ -121,4 +133,5 @@
         {% endif %}
        </div>
     </div>
+</div>
 </div>
\ No newline at end of file
diff --git a/base/templates/shift_request/shift_request_view.html b/base/templates/shift_request/shift_request_view.html
index 07ca0aae1..791ede36b 100644
--- a/base/templates/shift_request/shift_request_view.html
+++ b/base/templates/shift_request/shift_request_view.html
@@ -105,24 +105,8 @@
   role="dialog"
   aria-labelledby="shiftRequestDetailModal"
   aria-hidden="true"
->
-  <div class="oh-modal__dialog">
-    <div class="oh-modal__dialog-header">
-      <h2
-        class="oh-modal__dialog-title"
-        id=""
-      >
-        {% trans "Details" %}
-      </h2>
-      <button class="oh-modal__close" aria-label="Close">
-        <ion-icon name="close-outline"></ion-icon>
-      </button>
-    </div>
-    <div
-      class="oh-modal__dialog-body oh-modal__dialog-relative"
-      id="shiftRequestDetailTarget"
-    ></div>
-  </div>
+  >
+  <div class="oh-modal__dialog" id="shiftRequestDetailTarget"></div>
 </div>
 
 <div class="oh-activity-sidebar" id="activitySidebar" style="z-index:1000;">