From 43a637767d18ae5a92585aaceddcb3ef2a9d67b6 Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Fri, 3 Nov 2023 13:58:43 +0530
Subject: [PATCH] [FIX] ATTENDANCE: Next and previous view for all individual
 view in attendance

---
 .../templates/attendance/attendance/validate_attendance.html  | 4 ++--
 .../templates/attendance/own_attendance/attendances.html      | 4 ++--
 attendance/views/views.py                                     | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/attendance/templates/attendance/attendance/validate_attendance.html b/attendance/templates/attendance/attendance/validate_attendance.html
index aea6b2491..bfd8df331 100644
--- a/attendance/templates/attendance/attendance/validate_attendance.html
+++ b/attendance/templates/attendance/attendance/validate_attendance.html
@@ -88,7 +88,7 @@
                   data-toggle="oh-modal-toggle"
                   data-target="#detailAttendance"
                   hx-target="#detailAttendanceModalBody"
-                  hx-get="{% url 'user-request-one-view' attendance.id %}"
+                  hx-get="{% url 'user-request-one-view' attendance.id %}?instances_ids={{attendances_ids}}"
                   >
                     <div class="oh-sticky-table__sd">
                         <div class="d-flex">
@@ -250,7 +250,7 @@
                 <ion-icon name="close-outline"></ion-icon>
             </button>
         </div>
-        <div class="oh-modal__dialog-body" id="detailAttendanceModalBody"></div>
+        <div class="oh-modal__dialog-body oh-modal__dialog-body oh-modal__dialog-relative" id="detailAttendanceModalBody"></div>
     </div>
 </div>
 
diff --git a/attendance/templates/attendance/own_attendance/attendances.html b/attendance/templates/attendance/own_attendance/attendances.html
index 21fcaac59..70bdfbf7c 100644
--- a/attendance/templates/attendance/own_attendance/attendances.html
+++ b/attendance/templates/attendance/own_attendance/attendances.html
@@ -169,7 +169,7 @@
         data-toggle="oh-modal-toggle"
         data-target="#detailAttendance"
         hx-target="#detailAttendanceModalBody"     
-        hx-get="{% url 'user-request-one-view' attendance.id %}?my_attendance=true"
+        hx-get="{% url 'user-request-one-view' attendance.id %}?my_attendance=true&instances_ids={{attendances_ids}}"
       >
         <div
           class="oh-sticky-table__sd{% if attendance.is_validate_request_approved %} row-status--blue {% elif attendance.attendance_validated %} row-status--green {% elif attendance.is_validate_request %} row-status--orange {% else %} row-status--red{% endif %}"
@@ -295,7 +295,7 @@
       </button>
     </div>
     <div
-      class="oh-modal__dialog-body"
+      class="oh-modal__dialog-body oh-modal__dialog-body oh-modal__dialog-relative"
       id="detailAttendanceModalBody"
     ></div>
   </div>
diff --git a/attendance/views/views.py b/attendance/views/views.py
index 45b767e50..e3180dff7 100644
--- a/attendance/views/views.py
+++ b/attendance/views/views.py
@@ -478,11 +478,15 @@ def view_my_attendance(request):
         template = "attendance/own_attendance/view_own_attendances.html"
     else:
         template = "attendance/own_attendance/own_empty.html"
+    attendances_ids = json.dumps(
+        list(employee_attendances.values_list("id", flat=True))
+    )
     return render(
         request,
         template,
         {
             "attendances": paginator_qry(employee_attendances, request.GET.get("page")),
+            "attendances_ids":attendances_ids,
             "f": filter,
         },
     )