From 5d8f767ed7475ac2c744aecdb2705e10e2041f49 Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Wed, 17 Apr 2024 12:24:22 +0530
Subject: [PATCH] [UPDT] LEAVE : Style updation and closing issue of clash
 modal, leave type card view updations

---
 .../leave/leave_request/leave_clashes.html         |  2 +-
 .../leave/leave_request/leave_requests.html        | 10 ++++++----
 .../leave/leave_request/request_view.html          | 12 ++++++++++++
 leave/templates/leave/leave_type/leave_types.html  | 14 +++++++++++++-
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/leave/templates/leave/leave_request/leave_clashes.html b/leave/templates/leave/leave_request/leave_clashes.html
index 7ce662a67..382888f8e 100644
--- a/leave/templates/leave/leave_request/leave_clashes.html
+++ b/leave/templates/leave/leave_request/leave_clashes.html
@@ -101,7 +101,7 @@
     <div class="oh-sticky-table__table mt-3">
       <div class="oh-404__subtitle">
         <img
-          style="width: 190px; height: 190px"
+          style="width: 110px; height: 110px"
           src="{% static 'images/ui/argument.png' %}"
           class="oh-404__image mb-4"
           alt="Page not found. 404."
diff --git a/leave/templates/leave/leave_request/leave_requests.html b/leave/templates/leave/leave_request/leave_requests.html
index 35bc994be..cf9f57dc8 100644
--- a/leave/templates/leave/leave_request/leave_requests.html
+++ b/leave/templates/leave/leave_request/leave_requests.html
@@ -307,15 +307,17 @@
 </div>
 
 
-<div class="oh-modal" id="clashViewModal" role="dialog" aria-hidden="true" style="z-index:50;">
-  <div class="oh-modal__dialog" style="max-width: 1200px;">
+{% comment %} <div class="oh-modal" id="clashViewModal" role="dialog" aria-hidden="true" style="z-index:99;">
+  <div class="oh-modal__dialog" style="max-width: 900px;">
     <div class="oh-modal__dialog-header">
       <h3 class="oh-main__titlebar-title fw-bold ">{% trans "Clashed Leave Requests" %}</h3>
-      <button type="button" class="oh-modal__close" aria-label="Close"><ion-icon name="close-outline"></ion-icon></button>
+      <button class="oh-modal__close--custom" onclick="$(this).closest('.oh-modal--show').removeClass('oh-modal--show');">
+        <ion-icon name="close-outline" role="img" class="md hydrated" aria-label="close outline"></ion-icon>
+      </button>
     </div>
     <div class="oh-modal__dialog-body" id="clashViewModalBody" style="overflow-x:auto;"></div>
   </div>
-</div>
+</div> {% endcomment %}
 
 <div class="oh-modal" id="penaltyViewModal" role="dialog" aria-hidden="true">
   <div class="oh-modal__dialog" style="max-width: 900px">
diff --git a/leave/templates/leave/leave_request/request_view.html b/leave/templates/leave/leave_request/request_view.html
index 59d1c5da0..8bc622fe0 100644
--- a/leave/templates/leave/leave_request/request_view.html
+++ b/leave/templates/leave/leave_request/request_view.html
@@ -323,6 +323,18 @@
   </div>
 </div>
 
+<div class="oh-modal" id="clashViewModal" role="dialog" aria-hidden="true" style="z-index:99;">
+  <div class="oh-modal__dialog" style="max-width: 900px;">
+    <div class="oh-modal__dialog-header">
+      <h3 class="oh-main__titlebar-title fw-bold ">{% trans "Clashed Leave Requests" %}</h3>
+      <button class="oh-modal__close--custom" onclick="$(this).closest('.oh-modal--show').removeClass('oh-modal--show');">
+        <ion-icon name="close-outline" role="img" class="md hydrated" aria-label="close outline"></ion-icon>
+      </button>
+    </div>
+    <div class="oh-modal__dialog-body" id="clashViewModalBody" style="overflow-x:auto;"></div>
+  </div>
+</div>
+
 <script src="{% static '/leave_request/action.js' %}"></script>
 <script>
   $(document).on('htmx:afterSwap', function () {
diff --git a/leave/templates/leave/leave_type/leave_types.html b/leave/templates/leave/leave_type/leave_types.html
index ad392b8eb..7e786f867 100644
--- a/leave/templates/leave/leave_type/leave_types.html
+++ b/leave/templates/leave/leave_type/leave_types.html
@@ -28,9 +28,21 @@
             <img src="{{leave_type.get_avatar}}" class="oh-kanban-card__profile-image" alt="Username" />
           </div>
         </div>
+
         <div class="oh-kanban-card__details">
-          <span class="oh-kanban-card__title">{{leave_type.name}}</span>
+          <span class="oh-card__title oh-card__title--sm fw-bold" style="font-size:18px;">{{leave_type.name}}</span>
+          <div class="oh-timeoff-modal__stats-container mb-1">
+            <div class="oh-timeoff-modal__stat mt-1">
+              <span class="oh-timeoff-modal__stat-title fw-bold text-dark ">{% trans "Payment" %}</span>
+              <span class="oh-timeoff-modal__stat-title">{{leave_type.get_payment_display}}</span>
+            </div>
+            <div class="oh-timeoff-modal__stat mt-1">
+              <span class="oh-timeoff-modal__stat-title fw-bold text-dark">{% trans "Total Days" %}</span>
+              <span class="oh-timeoff-modal__stat-title">{{leave_type.total_days}}</span>
+            </div>
+          </div>
         </div>
+
         {% if perms.leave.change_leavetype or perms.leave.delete_leavetype %}
           <div class="oh-kanban-card__dots" onclick="event.stopPropagation()">
             <div class="oh-dropdown" x-data="{show: false}">