From bd81a7c71a9dac02c772f8bb895f0b59eeb9e40d Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Tue, 3 Sep 2024 14:05:34 +0530
Subject: [PATCH] [UPDT] LEAVE: Added leave taken to my leave request and
 profile and individual tabs

---
 employee/templates/tabs/leave-tab.html           | 10 ++++++----
 leave/templates/leave/user_leave/user_leave.html |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/employee/templates/tabs/leave-tab.html b/employee/templates/tabs/leave-tab.html
index 0af969100..3b9575658 100644
--- a/employee/templates/tabs/leave-tab.html
+++ b/employee/templates/tabs/leave-tab.html
@@ -116,7 +116,8 @@
               <span class="oh-kanban-card__subtitle"
                 >{% trans "Total Leave Days" %} :
                 {% if user_leave.leave_type_id.limit_leave %}{{user_leave.total_leave_days}}{% else %}{% trans "No Limit" %}{% endif %}</span
-              >
+              ><br />
+              <span class="oh-kanban-card__subtitle">{% trans "Total Leave taken" %} :{{user_leave.leave_taken}}</span>
             </div>
           </div>
         {% endif %}
@@ -162,7 +163,7 @@
               >
               <span class="oh-kanban-card__subtitle"
                 >{% trans "Available Leave Days" %} :
-                {{employee_leave.available_days}}</span
+                {% if employee_leave.leave_type_id.limit_leave %}{{employee_leave.available_days}}{% else %}{% trans "No Limit" %}{% endif %}</span
               ><br />
               <span class="oh-kanban-card__subtitle"
                 >{% trans "Carryforward Leave Days" %} :
@@ -170,8 +171,9 @@
               ><br />
               <span class="oh-kanban-card__subtitle"
                 >{% trans "Total Leave Days" %} :
-                {{employee_leave.total_leave_days}}</span
-              >
+                {% if employee_leave.leave_type_id.limit_leave %}{{employee_leave.total_leave_days}}{% else %}{% trans "No Limit" %}{% endif %}</span
+              ><br />
+              <span class="oh-kanban-card__subtitle">{% trans "Total Leave taken" %} :{{employee_leave.leave_taken}}</span>
             </div>
           </div>
         {% endif %}
diff --git a/leave/templates/leave/user_leave/user_leave.html b/leave/templates/leave/user_leave/user_leave.html
index 6af7018af..157c9e6e5 100644
--- a/leave/templates/leave/user_leave/user_leave.html
+++ b/leave/templates/leave/user_leave/user_leave.html
@@ -36,7 +36,8 @@
                 <span class="oh-kanban-card__subtitle">{% trans "Available Leave Days" %} : {% if user_leave.leave_type_id.limit_leave %}{{user_leave.available_days}} {% else %}{% trans "No Limit" %}{% endif %}</span><br>
                 <span class="oh-kanban-card__subtitle">{% trans "Carryforward Leave Days" %} :
                     {{user_leave.carryforward_days}}</span><br>
-                <span class="oh-kanban-card__subtitle">{% trans "Total Leave Days" %} : {% if user_leave.leave_type_id.limit_leave %}{{user_leave.total_leave_days}}{% else %}{% trans "No Limit" %}{% endif %}</span>
+                <span class="oh-kanban-card__subtitle">{% trans "Total Leave Days" %} : {% if user_leave.leave_type_id.limit_leave %}{{user_leave.total_leave_days}}{% else %}{% trans "No Limit" %}{% endif %}</span><br>
+                <span class="oh-kanban-card__subtitle">{% trans "Total Leave taken" %} :{{user_leave.leave_taken}}</span>
             </div>
         </div>
         {% endfor %}