From c254559554ba3e9e23ec0f6bddf9d147dd4158a9 Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Fri, 20 Oct 2023 14:47:09 +0530
Subject: [PATCH] [FIX] EMPLOYEE: Leave create form design issue in employee
 tab

---
 employee/templates/tabs/leave-tab.html | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/employee/templates/tabs/leave-tab.html b/employee/templates/tabs/leave-tab.html
index 6fe13b265..8160163ed 100644
--- a/employee/templates/tabs/leave-tab.html
+++ b/employee/templates/tabs/leave-tab.html
@@ -191,7 +191,8 @@
         </div>
         <div class="oh-sticky-table__tbody">
           {% for leave_request in employee.leaverequest_set.all %}
-          <div class="oh-sticky-table__tr" draggable="true">
+          <div class="oh-sticky-table__tr" data-toggle="oh-modal-toggle" data-target="#tableTimeOff"
+          hx-get="{% url 'user-request-one' leave_request.id %}" hx-target="#userRequestView">
             <div class="oh-sticky-table__sd {% if leave_request.status == "requested" %}row-status--orange {% elif leave_request.status == "cancelled" %} row-status--gray {% elif leave_request.status == "approved" %} row-status--yellow{% endif %}"
               data-toggle="oh-modal-toggle" data-target="#tableTimeOff" hx-get="{% url 'user-request-one' leave_request.id %}" hx-target="#userRequestView">
             <div class="oh-profile oh-profile--md">
@@ -222,7 +223,7 @@
             {{leave_request.get_status_display}}
           </div>
             {% if perms.leave.change_leaverequest %}
-            <div class="oh-sticky-table__td">
+            <div class="oh-sticky-table__td" onclick="event.stopPropagation()">
               <div class="oh-btn-group">
                 {% if leave_request.status != 'approved' %}
                 <a type="submit" href="{% url 'request-approve' leave_request.id leave_request.employee_id.id %}" title="{% trans 'Approve' %}"
@@ -273,7 +274,7 @@
   aria-labelledby="editDialogModal"
   aria-hidden="true"
 >
-  <div class="oh-modal__dialog oh-modal__dialog--timeoff">
+  <div class="oh-modal__dialog ">
     <div class="oh-modal__dialog-header">
       <span class="oh-modal__dialog-title" id="editDialogDialog"
         >{% trans "Leave Request" %}</span
@@ -282,6 +283,22 @@
         <ion-icon name="close-outline"></ion-icon>
       </button>
     </div>
-    <div id="requestForm"></div>
+    <div class="oh-modal__dialog-body" id="requestForm"></div>
+  </div>
+</div>
+
+<div class="oh-modal" id="tableTimeOff" role="dialog" aria-labelledby="tableTimeOffModal" aria-hidden="true">
+  <div class="oh-modal__dialog oh-modal__dialog--timeoff oh-timeoff-modal">
+      <div class="oh-modal__dialog-header">
+
+          <button class="oh-modal__close" aria-label="Close">
+              <ion-icon name="close-outline"></ion-icon>
+          </button>
+      </div>
+
+      <div id="userRequestView">
+
+      </div>
+      
   </div>
 </div>