From 75a775bd349a145bfdd2b95e1ee0e3ad4a7cc3fc Mon Sep 17 00:00:00 2001
From: Horilla <131998600+horilla-opensource@users.noreply.github.com>
Date: Wed, 20 Mar 2024 08:44:48 +0000
Subject: [PATCH] Development (#125)

* [UPDT] EMPLOYEE: Updated employee individual view tab select option by adding permission

* [UPDT] LEAVE: Updated holiday delete method by adding hx attributes and holiday table action column by adding user permission

* [UPDT] TEMPLATES: Updated Configuration subemenu permission for a user

* [UPDT] PMS: Updated performance dashboard data's fetching by changing filter field in employee key result
---
 .../templates/employee/view/individual.html   |   2 +-
 leave/templates/leave/assign-view.html        | 154 --------
 .../leave/available-update-form.html          |  32 --
 .../leave/available_update_form.html          |  32 --
 .../leave/company-leave-creation-form.html    |  30 --
 .../leave/company-leave-update-form.html      |  28 --
 leave/templates/leave/company-leave-view.html | 156 --------
 .../leave/company_leave/company_leave.html    |   2 +-
 .../leave/company_leave_creation.html         |  13 -
 .../leave/company_leave_creation_form.html    |  30 --
 .../leave/company_leave_update_form.html      |  28 --
 leave/templates/leave/company_leave_view.html | 191 ----------
 leave/templates/leave/employee-dashboard.html | 164 ---------
 leave/templates/leave/holiday-form.html       |  40 ---
 .../templates/leave/holiday-update-form.html  |  41 ---
 leave/templates/leave/holiday-view.html       | 184 ----------
 leave/templates/leave/holiday/holiday.html    |  66 ++--
 .../leave/holiday/holiday_update_form.html    |   2 +-
 .../templates/leave/holiday/holiday_view.html | 102 +++---
 leave/templates/leave/holiday_creation.html   |  34 --
 leave/templates/leave/holiday_form.html       |  40 ---
 leave/templates/leave/holiday_import.html     |   8 -
 .../templates/leave/holiday_update_form.html  |  41 ---
 leave/templates/leave/holiday_view.html       | 195 ----------
 leave/templates/leave/leave-assign-form.html  |  30 --
 .../leave/leave-assign-one-form.html          |  26 --
 leave/templates/leave/leave-request-form.html |  60 ----
 .../templates/leave/leave-type-creation.html  | 334 ------------------
 leave/templates/leave/leave-type-update.html  | 305 ----------------
 leave/templates/leave/leave-type-view.html    | 139 --------
 leave/templates/leave/leave_assign_view.html  |  43 ---
 leave/templates/leave/one-request-view.html   |  93 -----
 .../templates/leave/request-update-form.html  |  69 ----
 leave/templates/leave/request-view.html       | 225 ------------
 leave/templates/leave/today-leave-empty.html  |  12 -
 .../leave/user-leave-empty-view.html          |  20 --
 .../leave/user-leave-type-empty-view.html     |  57 ---
 leave/templates/leave/user-leave-view.html    | 101 ------
 leave/templates/leave/user-request-form.html  |  44 ---
 leave/templates/leave/user-request-one.html   |  53 ---
 .../templates/leave/user-request-update.html  |  53 ---
 leave/templates/leave/user-request-view.html  | 183 ----------
 leave/templates/leave/user-requests.html      | 119 -------
 leave/views.py                                |   3 +-
 pms/models.py                                 |   4 +-
 pms/views.py                                  |   6 +-
 templates/sidebar.html                        |   3 +-
 47 files changed, 99 insertions(+), 3498 deletions(-)
 delete mode 100644 leave/templates/leave/assign-view.html
 delete mode 100644 leave/templates/leave/available-update-form.html
 delete mode 100644 leave/templates/leave/available_update_form.html
 delete mode 100644 leave/templates/leave/company-leave-creation-form.html
 delete mode 100644 leave/templates/leave/company-leave-update-form.html
 delete mode 100644 leave/templates/leave/company-leave-view.html
 delete mode 100644 leave/templates/leave/company_leave_creation.html
 delete mode 100644 leave/templates/leave/company_leave_creation_form.html
 delete mode 100644 leave/templates/leave/company_leave_update_form.html
 delete mode 100644 leave/templates/leave/company_leave_view.html
 delete mode 100644 leave/templates/leave/employee-dashboard.html
 delete mode 100644 leave/templates/leave/holiday-form.html
 delete mode 100644 leave/templates/leave/holiday-update-form.html
 delete mode 100644 leave/templates/leave/holiday-view.html
 delete mode 100644 leave/templates/leave/holiday_creation.html
 delete mode 100644 leave/templates/leave/holiday_form.html
 delete mode 100644 leave/templates/leave/holiday_import.html
 delete mode 100644 leave/templates/leave/holiday_update_form.html
 delete mode 100644 leave/templates/leave/holiday_view.html
 delete mode 100644 leave/templates/leave/leave-assign-form.html
 delete mode 100644 leave/templates/leave/leave-assign-one-form.html
 delete mode 100644 leave/templates/leave/leave-request-form.html
 delete mode 100644 leave/templates/leave/leave-type-creation.html
 delete mode 100644 leave/templates/leave/leave-type-update.html
 delete mode 100644 leave/templates/leave/leave-type-view.html
 delete mode 100644 leave/templates/leave/leave_assign_view.html
 delete mode 100644 leave/templates/leave/one-request-view.html
 delete mode 100644 leave/templates/leave/request-update-form.html
 delete mode 100644 leave/templates/leave/request-view.html
 delete mode 100644 leave/templates/leave/today-leave-empty.html
 delete mode 100644 leave/templates/leave/user-leave-empty-view.html
 delete mode 100644 leave/templates/leave/user-leave-type-empty-view.html
 delete mode 100644 leave/templates/leave/user-leave-view.html
 delete mode 100644 leave/templates/leave/user-request-form.html
 delete mode 100644 leave/templates/leave/user-request-one.html
 delete mode 100644 leave/templates/leave/user-request-update.html
 delete mode 100644 leave/templates/leave/user-request-view.html
 delete mode 100644 leave/templates/leave/user-requests.html

diff --git a/employee/templates/employee/view/individual.html b/employee/templates/employee/view/individual.html
index eaf548cac..21ce6d5b3 100644
--- a/employee/templates/employee/view/individual.html
+++ b/employee/templates/employee/view/individual.html
@@ -225,7 +225,7 @@
 		</div>
 		
 		<div class="oh-table_sticky--wrapper">
-			{% if request.user == employee.employee_user_id %}
+			{% if request.user.is_superuser or request.user|check_manager:employee or request.user == employee.employee_user_id %}
 			<div class="oh-sticky-dropdown--header">
 				<div class="oh-dropdown" x-data="{open: false}">
 				<button class="oh-sticky-dropdown_btn " @click="open = !open"><ion-icon name="ellipsis-vertical-sharp"
diff --git a/leave/templates/leave/assign-view.html b/leave/templates/leave/assign-view.html
deleted file mode 100644
index 2db9cbd37..000000000
--- a/leave/templates/leave/assign-view.html
+++ /dev/null
@@ -1,154 +0,0 @@
-{% extends 'index.html' %}
-{% block content %}
-{% load static %}
-{% load i18n %}
-{% if messages %}
-<div class="oh-wrapper">
-    {% for message in messages %}
-    <div class="oh-alert-container">
-        <div class="oh-alert oh-alert--animated {{ message.tags }}">
-            {{ message }}
-        </div>
-    </div>
-    {% endfor %}
-</div>
-{% endif %}
-
-<section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
-    <div class="oh-main__titlebar oh-main__titlebar--left">
-        <h1 class="oh-main__titlebar-title fw-bold">{% trans "All Assigned Leaves" %}</h1>
-        <a class="oh-main__titlebar-search-toggle" role="button" aria-label="Toggle Search"
-            @click="searchShow = !searchShow">
-            <ion-icon name="search-outline" class="oh-main__titlebar-serach-icon"></ion-icon>
-        </a>
-    </div>
-    <div class="oh-main__titlebar oh-main__titlebar--right">
-        <div class="oh-input-group oh-input__search-group" :class="searchShow ? 'oh-input__search-group--show' : ''">
-            <ion-icon name="search-outline" class="oh-input-group__icon oh-input-group__icon--left"></ion-icon>
-            <input type="text" class="oh-input oh-input__icon" aria-label="Search Input" placeholder="{% trans 'Search' %}"
-                name="employee_id" hx-get="{% url 'assign-filter' %}" hx-trigger="keyup" hx-target="#assignedLeaves" />
-        </div>
-        <div class="oh-main__titlebar-button-container">
-            <div class="oh-dropdown" x-data="{open: false}">
-                <button class="oh-btn ml-2" @click="open = !open">
-                    <ion-icon name="filter" class="mr-1"></ion-icon>{% trans "Filter" %}<div id="filterCount"></div>
-                </button>
-                <form hx-get="{% url 'assign-filter' %}" hx-target="#assignedLeaves" id="filterForm">
-                    <div class="oh-dropdown__menu oh-dropdown__menu--right oh-dropdown__filter p-4" x-show="open"
-                        style="display: none;" @click.outside="open = false">
-                        <div class="oh-dropdown__filter-body">
-                            <div class="oh-accordion">
-                                <div class="oh-accordion-header">{% trans "Assigned Leave" %}</div>
-                                <div class="oh-accordion-body">
-                                    <div class="row">
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "Leave Type" %}</label>
-                                                {{form.leave_type_id}}
-                                            </div>
-
-                                        </div>
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "Assigned Date" %}</label>
-                                                {{form.assigned_date}}
-                                            </div>
-
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-
-                        </div>
-                        <div class="oh-dropdown__filter-footer">
-                            <button class="oh-btn oh-btn--secondary oh-btn--small w-100 filterButton" type="submit">{% trans "Filter" %}</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="oh-btn-group ml-2">
-                <div class="oh-dropdown" x-data="{open: false}">
-                    <button class="oh-btn  oh-btn--secondary oh-btn--shadow" data-toggle="oh-modal-toggle"
-                        data-target="#editModal2" hx-get="{% url 'assign' %}" hx-target="#assignLeaveForm">
-                        {% trans "Assign" %}
-                    </button>
-
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
-
-<div class="oh-wrapper" id="assignedLeaves">
-    {% include 'leave/leave_assign/assigned-leave.html' %}
-
-
-</div>
-
-
-<!-- update available leave -->
-<div class="oh-modal" id="editModal1" role="dialog" aria-labelledby="editDialogModal" aria-hidden="true">
-    <div class="oh-modal__dialog oh-modal__dialog--timeoff">
-        <div class="oh-modal__dialog-header">
-            <span class="oh-modal__dialog-title" id="editDialogDialog">{% trans "Update Available Leave" %}</span>
-            <button class="oh-modal__close" aria-label="Close">
-                <ion-icon name="close-outline"></ion-icon>
-            </button>
-        </div>
-        <div id="leaveForm">
-
-        </div>
-    </div>
-</div>
-
-<!-- Assign leave -->
-<div class="oh-modal" id="editModal2" role="dialog" aria-labelledby="editDialogModal" aria-hidden="true">
-    <div class="oh-modal__dialog oh-modal__dialog--timeoff">
-        <div class="oh-modal__dialog-header">
-            <span class="oh-modal__dialog-title" id="editDialogDialog">{% trans "Assign Leave" %}</span>
-            <button class="oh-modal__close" aria-label="Close">
-                <ion-icon name="close-outline"></ion-icon>
-            </button>
-        </div>
-        <div id="assignLeaveForm">
-
-        </div>
-    </div>
-</div>
-
-
-<script>
-
-    $(document).on('htmx:load', '#assignedLeaves', function () {
-        // Create a new script element
-        var scriptElement = document.createElement("script");
-        // Set the source URL of the script file to be loaded
-        scriptElement.src = "{% static 'build/js/web.frontend.min.js' %}";
-        // Append the script element to the head of the HTML document
-        document.head.appendChild(scriptElement);
-    });
-
-    $(document).on('htmx:load', '#assignLeaveForm', function () {
-        {% include 'select2.js' %}
-        $('#leaveTypeAssign #id_leave_type_id').select2();
-        $('#employeeAssign #id_employee_id').select2();
-    });
-
-    $('#delete-link').on('click', function (event) {
-
-        event.preventDefault(); // prevent the default behavior of the link
-
-        const link = $(this);
-        const confirmation = confirm("{% trans 'Are you sure you want to delete?' %}");
-
-        if (confirmation) {
-            window.location.href = link.attr('href'); // execute the href if confirmed
-        }
-    });
-
-</script>
-
-<script src="{% static '/base/filter.js' %}"></script>
-
-{% endblock %}
\ No newline at end of file
diff --git a/leave/templates/leave/available-update-form.html b/leave/templates/leave/available-update-form.html
deleted file mode 100644
index 0bc4859f5..000000000
--- a/leave/templates/leave/available-update-form.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% load i18n %}
-{% if form.errors %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-
-<form  hx-post="{% url 'available-leave-update' id %}">
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Available Days" %}</label>
-        {{form.available_days}}
-        {{form.available_days.errors}}
-
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Carryforward Days" %}</label>
-        {{form.carryforward_days}}
-        {{form.carryforward_days.errors}}
-      </div>
-      <div class="oh-modal__dialog-footer">
-        <button type="submit" class="oh-btn oh-btn--secondary w-100">
-          {% trans "Apply" %}
-        </button>
-    </form>
\ No newline at end of file
diff --git a/leave/templates/leave/available_update_form.html b/leave/templates/leave/available_update_form.html
deleted file mode 100644
index 0bc4859f5..000000000
--- a/leave/templates/leave/available_update_form.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% load i18n %}
-{% if form.errors %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-
-<form  hx-post="{% url 'available-leave-update' id %}">
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Available Days" %}</label>
-        {{form.available_days}}
-        {{form.available_days.errors}}
-
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Carryforward Days" %}</label>
-        {{form.carryforward_days}}
-        {{form.carryforward_days.errors}}
-      </div>
-      <div class="oh-modal__dialog-footer">
-        <button type="submit" class="oh-btn oh-btn--secondary w-100">
-          {% trans "Apply" %}
-        </button>
-    </form>
\ No newline at end of file
diff --git a/leave/templates/leave/company-leave-creation-form.html b/leave/templates/leave/company-leave-creation-form.html
deleted file mode 100644
index 86a74d96b..000000000
--- a/leave/templates/leave/company-leave-creation-form.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% load i18n %}
-{% if form.errors %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-<form hx-post="{% url 'company-leave-creation' %}">
-    <div class="oh-modal__dialog-body pb-2" id="basedOnWeek">
-        <label class="oh-label d-block">{% trans "Based On Week" %}</label>
-        {{form.based_on_week}}
-        {{form.based_on_week.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2" id="basedOnWeekDay">
-        <label class="oh-label d-block">{% trans "Based On Week Day" %}</label>
-        {{form.based_on_week_day}}
-        {{form.based_on_week_day.errors}}
-      </div>
-      <div class="oh-modal__dialog-footer">
-        <button type="submit" class="oh-btn oh-btn--secondary w-100">
-          {% trans "Apply" %}
-        </button>
- </form>
\ No newline at end of file
diff --git a/leave/templates/leave/company-leave-update-form.html b/leave/templates/leave/company-leave-update-form.html
deleted file mode 100644
index fc2585f5f..000000000
--- a/leave/templates/leave/company-leave-update-form.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% load i18n %}
-{% if form.errors %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-<form hx-post="{% url 'company-leave-update' id %}">
-    <div class="oh-modal__dialog-body pb-2" id="#updateBasedOnWeek">
-        <label class="oh-label d-block">{% trans "Based On Week" %}</label>
-        {{form.based_on_week}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2" id="#updateBasedOnWeekDay">
-        <label class="oh-label d-block">{% trans "Based On Week Day" %}</label>
-        {{form.based_on_week_day}}
-      </div>
-      <div class="oh-modal__dialog-footer">
-        <button type="submit" class="oh-btn oh-btn--secondary w-100">
-          {% trans "Apply" %}
-        </button>
- </form>
\ No newline at end of file
diff --git a/leave/templates/leave/company-leave-view.html b/leave/templates/leave/company-leave-view.html
deleted file mode 100644
index 8176384e2..000000000
--- a/leave/templates/leave/company-leave-view.html
+++ /dev/null
@@ -1,156 +0,0 @@
-{% extends 'index.html' %}
-{% block content %}
-{% load static %}
-{% load i18n %}
-{% if messages %}
-<div class="oh-wrapper">
-    {% for message in messages %}
-    <div class="oh-alert-container">
-        <div class="oh-alert oh-alert--animated {{ message.tags }}">
-            {{ message }}
-        </div>
-    </div>
-    {% endfor %}
-</div>
-{% endif %}
-<section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
-    <div class="oh-main__titlebar oh-main__titlebar--left">
-        <h1 class="oh-main__titlebar-title fw-bold">{% trans "Company Leaves" %}</h1>
-        <a class="oh-main__titlebar-search-toggle" role="button" aria-label="Toggle Search"
-            @click="searchShow = !searchShow">
-            <ion-icon name="search-outline" class="oh-main__titlebar-serach-icon"></ion-icon>
-        </a>
-    </div>
-    <div class="oh-main__titlebar oh-main__titlebar--right">
-        <div class="oh-input-group oh-input__search-group" :class="searchShow ? 'oh-input__search-group--show' : ''">
-            <ion-icon name="search-outline" class="oh-input-group__icon oh-input-group__icon--left"></ion-icon>
-            <input type="text" class="oh-input oh-input__icon" aria-label="Search Input" placeholder="{% trans 'Search' %}"
-                name="name" hx-get="{% url 'company-leave-filter' %}" hx-trigger="keyup" hx-target="#companyLeave" />
-        </div>
-        <div class="oh-main__titlebar-button-container">
-            <div class="oh-dropdown" x-data="{open: false}">
-                <button class="oh-btn ml-2" @click="open = !open">
-                    <ion-icon name="filter" class="mr-1"></ion-icon>{% trans "Filter" %}<div id="filterCount"></div>
-                </button>
-                <form  hx-get="{% url 'company-leave-filter' %}" hx-target="#companyLeave" id="filterForm">
-                    <div class="oh-dropdown__menu oh-dropdown__menu--right oh-dropdown__filter p-4" x-show="open"
-                        @click.outside="open = false" style="display: none;">
-                        <div class="oh-dropdown__filter-body">
-                            <div class="oh-accordion">
-                                <div class="oh-accordion-header">{% trans "Company Leave" %}</div>
-                                <div class="oh-accordion-body">
-                                    <div class="row">
-                                        <div class="col-sm-12 col-md-12 col-lg-12">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "Based On week" %}</label>
-                                                {{form.based_on_week}}
-                                            </div>
-                                        </div>
-                                        <div class="col-sm-12 col-md-12">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "Based On Weekday" %}</label>
-                                                {{form.based_on_week_day}}
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-
-                        </div>
-                        <div class="oh-dropdown__filter-footer">
-                            <button class="oh-btn oh-btn--secondary oh-btn--small w-100 filterButton" type="submit">{% trans "Filter" %}</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="oh-btn-group ml-2">
-                <div class="oh-dropdown" x-data="{open: false}">
-                    <button class="oh-btn oh-btn--secondary oh-btn--shadow" data-toggle="oh-modal-toggle"
-                        data-target="#editModal1" hx-get="{% url 'company-leave-creation' %}"
-                        hx-target="#companyLeaveForm">
-                        <ion-icon name="add-outline" class="me-1"></ion-icon>
-                        {% trans "Create" %}
-                    </button>
-
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
-
-<div class="oh-wrapper" id="companyLeave">
-    {% include 'leave/company_leave/company-leave.html' %}
-</div>
-
-
-<!-- Holiday creation -->
-<div class="oh-modal" id="editModal1" role="dialog" aria-labelledby="editDialogModal" aria-hidden="true">
-    <div class="oh-modal__dialog oh-modal__dialog--timeoff">
-        <div class="oh-modal__dialog-header">
-            <span class="oh-modal__dialog-title" id="editDialogDialog">{% trans "Create Holiday" %}</span>
-            <button class="oh-modal__close" aria-label="Close">
-                <ion-icon name="close-outline"></ion-icon>
-            </button>
-        </div>
-        <div id="companyLeaveForm">
-
-        </div>
-
-
-    </div>
-</div>
-
-<!-- Update Holiday -->
-<div class="oh-modal" id="editModal2" role="dialog" aria-labelledby="editDialogModal" aria-hidden="true">
-    <div class="oh-modal__dialog oh-modal__dialog--timeoff">
-        <div class="oh-modal__dialog-header">
-            <span class="oh-modal__dialog-title" id="editDialogDialog">{% trans "Update Holiday" %}</span>
-            <button class="oh-modal__close" aria-label="Close">
-                <ion-icon name="close-outline"></ion-icon>
-            </button>
-        </div>
-        <div id="companyUpdateForm">
-
-        </div>
-
-
-    </div>
-</div>
-</div>
-
-<script>
-    $(document).on('htmx:load','#companyLeave', function () {
-        // Create a new script element
-        var scriptElement = document.createElement("script");
-        // Set the source URL of the script file to be loaded
-        scriptElement.src = "{% static 'build/js/web.frontend.min.js' %}";
-        // Append the script element to the head of the HTML document
-        document.head.appendChild(scriptElement);
-    });
-    $(document).on('htmx:load', '#companyLeaveForm', function () {
-        {% include 'select2.js' %}
-        $('#basedOnWeekDay #id_based_on_week_day').select2();
-        $('#basedOnWeek #id_based_on_week').select2();
-    });
-    $(document).on('htmx:load', '#companyUpdateForm', function () {
-        {% include 'select2.js' %}
-        $('#updateBasedOnWeekDay #id_based_on_week_day').select2();
-        $('#updateBasedOnWeek #id_based_on_week').select2();
-    });
-    $('#delete-link').on('click', function(event) {
-        event.preventDefault(); // prevent the default behavior of the link
-        
-        const link = $(this);
-        const confirmation = confirm('{% trans "Are you sure you want to delete?" %}');
-        
-        if (confirmation) {
-          window.location.href = link.attr('href'); // execute the href if confirmed
-        }
-      });
-
-</script>
-
-<script src="{% static '/base/filter.js' %}"></script>
-
-{% endblock %}
\ No newline at end of file
diff --git a/leave/templates/leave/company_leave/company_leave.html b/leave/templates/leave/company_leave/company_leave.html
index 00a72bfe9..a159041ee 100644
--- a/leave/templates/leave/company_leave/company_leave.html
+++ b/leave/templates/leave/company_leave/company_leave.html
@@ -13,7 +13,7 @@
       </div>
       <div class="oh-sticky-table__tbody">
           {% for company_leave in company_leaves %}
-          <div class="oh-sticky-table__tr company_leave">
+          <div class="oh-sticky-table__tr company_leave" style="height:60px;">
               <div class="oh-sticky-table__sd">
                     {% if company_leave.based_on_week != None %}
                         {% for week in weeks %}
diff --git a/leave/templates/leave/company_leave_creation.html b/leave/templates/leave/company_leave_creation.html
deleted file mode 100644
index 446298361..000000000
--- a/leave/templates/leave/company_leave_creation.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% extends 'index.html' %} {% load i18n %} {% block  content%}
-<p class="pb-3">
-    <a href="{% url 'company-leave-view' %}" class="btn btn-primary">{% trans "View" %}</a> {% trans "View All Company Leave" %}
-</p>
-<form action="" method="post">
-  {% csrf_token %}
-    {{form}}
-    <input type="submit" value="{% trans 'Submit' %}" id="submit" class='mt-4 btn btn-success'/>
-  </div>
-</form>
-
-{% endblock  %}
-
diff --git a/leave/templates/leave/company_leave_creation_form.html b/leave/templates/leave/company_leave_creation_form.html
deleted file mode 100644
index 86a74d96b..000000000
--- a/leave/templates/leave/company_leave_creation_form.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% load i18n %}
-{% if form.errors %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-<form hx-post="{% url 'company-leave-creation' %}">
-    <div class="oh-modal__dialog-body pb-2" id="basedOnWeek">
-        <label class="oh-label d-block">{% trans "Based On Week" %}</label>
-        {{form.based_on_week}}
-        {{form.based_on_week.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2" id="basedOnWeekDay">
-        <label class="oh-label d-block">{% trans "Based On Week Day" %}</label>
-        {{form.based_on_week_day}}
-        {{form.based_on_week_day.errors}}
-      </div>
-      <div class="oh-modal__dialog-footer">
-        <button type="submit" class="oh-btn oh-btn--secondary w-100">
-          {% trans "Apply" %}
-        </button>
- </form>
\ No newline at end of file
diff --git a/leave/templates/leave/company_leave_update_form.html b/leave/templates/leave/company_leave_update_form.html
deleted file mode 100644
index fc2585f5f..000000000
--- a/leave/templates/leave/company_leave_update_form.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% load i18n %}
-{% if form.errors %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-<form hx-post="{% url 'company-leave-update' id %}">
-    <div class="oh-modal__dialog-body pb-2" id="#updateBasedOnWeek">
-        <label class="oh-label d-block">{% trans "Based On Week" %}</label>
-        {{form.based_on_week}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2" id="#updateBasedOnWeekDay">
-        <label class="oh-label d-block">{% trans "Based On Week Day" %}</label>
-        {{form.based_on_week_day}}
-      </div>
-      <div class="oh-modal__dialog-footer">
-        <button type="submit" class="oh-btn oh-btn--secondary w-100">
-          {% trans "Apply" %}
-        </button>
- </form>
\ No newline at end of file
diff --git a/leave/templates/leave/company_leave_view.html b/leave/templates/leave/company_leave_view.html
deleted file mode 100644
index 44367a930..000000000
--- a/leave/templates/leave/company_leave_view.html
+++ /dev/null
@@ -1,191 +0,0 @@
-{% extends 'index.html' %}
-{% block content %}
-{% load static %}
-{% load i18n %}
-{% if messages %}
-<div class="oh-wrapper">
-    {% for message in messages %}
-    <div class="oh-alert-container">
-        <div class="oh-alert oh-alert--animated {{ message.tags }}">
-            {{ message }}
-        </div>
-    </div>
-    {% endfor %}
-</div>
-{% endif %}
-<section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
-    <div class="oh-main__titlebar oh-main__titlebar--left">
-        <h1 class="oh-main__titlebar-title fw-bold">{% trans "Company Leaves" %}</h1>
-        <a class="oh-main__titlebar-search-toggle" role="button" aria-label="Toggle Search"
-            @click="searchShow = !searchShow">
-            <ion-icon name="search-outline" class="oh-main__titlebar-serach-icon"></ion-icon>
-        </a>
-    </div>
-    <div class="oh-main__titlebar oh-main__titlebar--right">
-        {% if company_leaves %}
-        <div class="oh-input-group oh-input__search-group" :class="searchShow ? 'oh-input__search-group--show' : ''">
-            <ion-icon name="search-outline" class="oh-input-group__icon oh-input-group__icon--left"></ion-icon>
-            <input type="text" class="oh-input oh-input__icon" aria-label="Search Input" placeholder="{% trans 'Search' %}"
-                name="name" id="search" />
-        </div>
-        <div class="oh-main__titlebar-button-container">
-            <div class="oh-dropdown" x-data="{open: false}">
-                <button class="oh-btn ml-2" @click="open = !open">
-                    <ion-icon name="filter" class="mr-1"></ion-icon>{% trans "Filter" %}<div id="filterCount"></div>
-                </button>
-                <form  hx-get="{% url 'company-leave-filter' %}" hx-target="#companyLeave" id="filterForm">
-                    <div class="oh-dropdown__menu oh-dropdown__menu--right oh-dropdown__filter p-4" x-show="open"
-                        @click.outside="open = false" style="display: none;">
-                        <div class="oh-dropdown__filter-body">
-                            <div class="oh-accordion">
-                                <div class="oh-accordion-header">{% trans "Company Leave" %}</div>
-                                <div class="oh-accordion-body">
-                                    <div class="row">
-                                        <div class="col-sm-12 col-md-12 col-lg-12">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "Based On week" %}</label>
-                                                {{form.based_on_week}}
-                                            </div>
-                                        </div>
-                                        <div class="col-sm-12 col-md-12">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "Based On Weekday" %}</label>
-                                                {{form.based_on_week_day}}
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-
-                        </div>
-                        <div class="oh-dropdown__filter-footer">
-                            <button class="oh-btn oh-btn--secondary oh-btn--small w-100 filterButton" type="submit">{% trans "Filter" %}</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            {% endif %}
-            <div class="oh-btn-group ml-2">
-                <div class="oh-dropdown" x-data="{open: false}">
-                    <button class="oh-btn oh-btn--secondary oh-btn--shadow" data-toggle="oh-modal-toggle"
-                        data-target="#editModal1" hx-get="{% url 'company-leave-creation' %}"
-                        hx-target="#companyLeaveForm">
-                        <ion-icon name="add-outline" class="me-1"></ion-icon>
-                        {% trans "Create" %}
-                    </button>
-
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
-
-<div class="oh-wrapper" id="companyLeave">
-    {% if company_leaves %}
-    {% include 'leave/company_leave/company_leave.html' %}
-    {% else %}
-    <div style="height: 70vh; display:flex;align-items: center;justify-content: center;" class="">
-        <div style="" class="oh-404">
-        <img style="display: block;width:150px;height:150px;margin: 10px auto ;" src="{% static 'images/ui/leave_types.png' %}" class="mb-4" alt=""/>
-        <h3 style="font-size:20px" class="oh-404__subtitle">{% trans "There are no company leaves at the moment." %}</h3>
-        </div>
-    </div>
-    {% endif %}
-</div>
-
-
-<div class="oh-modal" id="editModal1" role="dialog" aria-labelledby="editDialogModal" aria-hidden="true">
-    <div class="oh-modal__dialog oh-modal__dialog--timeoff">
-        <div class="oh-modal__dialog-header">
-            <span class="oh-modal__dialog-title" id="editDialogDialog">{% trans "Create Company Leaves" %}</span>
-            <button class="oh-modal__close" aria-label="Close">
-                <ion-icon name="close-outline"></ion-icon>
-            </button>
-        </div>
-        <div id="companyLeaveForm">
-
-        </div>
-
-
-    </div>
-</div>
-
-<div class="oh-modal" id="editModal2" role="dialog" aria-labelledby="editDialogModal" aria-hidden="true">
-    <div class="oh-modal__dialog oh-modal__dialog--timeoff">
-        <div class="oh-modal__dialog-header">
-            <span class="oh-modal__dialog-title" id="editDialogDialog">{% trans "Update Company Leaves" %}</span>
-            <button class="oh-modal__close" aria-label="Close">
-                <ion-icon name="close-outline"></ion-icon>
-            </button>
-        </div>
-        <div id="companyUpdateForm">
-
-        </div>
-
-
-    </div>
-</div>
-</div>
-
-<script>
-    $(document).on('htmx:load','#companyLeave', function () {
-        // Create a new script element
-        var scriptElement = document.createElement("script");
-        // Set the source URL of the script file to be loaded
-        scriptElement.src = "{% static 'build/js/web.frontend.min.js' %}";
-        // Append the script element to the head of the HTML document
-        document.head.appendChild(scriptElement);
-    });
-    $(document).on('htmx:load', '#companyLeaveForm', function () {
-        {% include 'select2.js' %}
-        $('#basedOnWeekDay #id_based_on_week_day').select2();
-        $('#basedOnWeek #id_based_on_week').select2();
-    });
-    $(document).on('htmx:load', '#companyUpdateForm', function () {
-        {% include 'select2.js' %}
-        $('#updateBasedOnWeekDay #id_based_on_week_day').select2();
-        $('#updateBasedOnWeek #id_based_on_week').select2();
-    });
-    $('#delete-link').on('click', function(event) {
-        event.preventDefault(); // prevent the default behavior of the link
-        
-        const link = $(this);
-        const confirmation = confirm('{% trans "Are you sure you want to delete?" %}');
-        
-        if (confirmation) {
-          window.location.href = link.attr('href'); // execute the href if confirmed
-        }
-      });
-      
-      $(document).ready(function(){
-        $("#search").on("keyup", function() {
-            var value = $(this).val().toLowerCase();
-            $(".week_days").filter(function() {
-              $(this).parent(".company_leave").toggle($(this).text().toLowerCase().indexOf(value) > -1)
-            });
-            if (value == ""){
-                $(".oh-filter-tag-container").html("")
-            }
-            else {
-            $(".oh-filter-tag-container").html(`<span class="oh-filter-tag">{% trans "Applied Filters :" %}</span>
-            <span class="oh-filter-tag filter-field" data-x-field="{{field}}">
-                ${value}
-                <button class="oh-filter-tag__close" onclick="$('.filterButton').click();$('#search').val('');">
-                  <ion-icon
-                    name="close-outline"
-                    role="img"
-                    class="md hydrated"
-                    aria-label="close outline"
-                  >
-                  </ion-icon>
-                </button></span>`
-            )  
-            }          
-        });     
-      })
-</script>
-
-<script src="{% static '/base/filter.js' %}"></script>
-
-{% endblock %}
\ No newline at end of file
diff --git a/leave/templates/leave/employee-dashboard.html b/leave/templates/leave/employee-dashboard.html
deleted file mode 100644
index 31fb6bee3..000000000
--- a/leave/templates/leave/employee-dashboard.html
+++ /dev/null
@@ -1,164 +0,0 @@
-{% extends 'index.html' %}
-{% load static %}
-{% block content %}
-{% load i18n %}
-<style>
-    .oh-card-dashboard {
-        cursor : default !important;
-    }
-    .pointer {
-        cursor : pointer !important;
-    }
-    .dash-card {
-        padding-bottom:30px;
-    }
-</style>
-<div class="oh-wrapper">
-    <div class="d-none mt-5" id="back_button" style="width:10%">
-        <a href=""
-          class="oh-btn oh-btn--secondary oh-btn--shadow ms-3"
-        >
-          <ion-icon
-            class="me-2 md hydrated"
-            name="arrow-back-outline"
-            role="img"
-            aria-label="arrow-back-outline"
-          ></ion-icon
-          >{% trans "Back" %}</a
-        >
-    </div>
-    <div class="oh-dashboard row" id="dashboard">
-        <div class="oh-dashboard__left col-12 col-sm-12 col-md-12 col-lg-9">
-            <div class="oh-dashboard__cards row">
-                <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-                    <div class="oh-card-dashboard oh-card-dashboard oh-card-dashboard--neutral filter pointer dash-card" hx-get="{% url "request-filter" %}?status=requested&dashboard=true&employee_id={{request.user.employee_get.employee_first_name}}" hx-target="#dashboard" >
-                        <div class="oh-card-dashboard__header">
-                            <span class="oh-card-dashboard__title">{% trans "New Requests" %}</span>
-                        </div>
-                        <div class="oh-card-dashboard__body">
-                            <div class="oh-card-dashboard__counts">
-                                
-                                <span class="oh-card-dashboard__count">{{requested|length}}</span>
-                            </div>
-                            
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-                    <div class="oh-card-dashboard oh-card-dashboard--success filter pointer dash-card" hx-get="{% url "request-filter" %}?status=approved&dashboard=true&employee_id={{request.user.employee_get.employee_first_name}}" hx-target="#dashboard">
-                        <div class="oh-card-dashboard__header">
-                            <span class="oh-card-dashboard__title">{% trans "Approved Requests" %}</span>
-                        </div>
-                        <div class="oh-card-dashboard__body">
-                            <div class="oh-card-dashboard__counts">
-                                <span class="oh-card-dashboard__count">{{approved|length}}</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <div class="col-12 col-sm-12 col-md-6 col-lg-4">
-                    <div class="oh-card-dashboard oh-card-dashboard--danger filter pointer dash-card" hx-get="{% url "request-filter" %}?status=cancelled&dashboard=true&employee_id={{request.user.employee_get.employee_first_name}}" hx-target="#dashboard">
-                        <div class="oh-card-dashboard__header">
-                            <span class="oh-card-dashboard__title">{% trans "Rejected Requests" %}</span>
-                        </div>
-                        <div class="oh-card-dashboard__body">
-                            <div class="oh-card-dashboard__counts">
-                               <span class="oh-card-dashboard__count">{{cancelled|length}}</span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-            <div class="oh-dashboard__movable-cards row mt-4">
-    
-                <div class="col-12 col-sm-12 col-md-12 col-lg-4 mt-2">
-                    <div class="oh-card-dashboard oh-card-dashboard--no-scale oh-card-dashboard--transparent">
-                        <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
-                            <span class="oh-card-dashboard__title" >{% trans "Available Leaves" %}</span>
-                        </div>
-                        <div class="oh-card-dashboard__body" id="availableLeaveContainer">
-                            <canvas id="availableLeave" ></canvas>
-                        </div>
-                    </div>
-                </div> 
-                <div class="col-12 col-sm-12 col-md-12 col-lg-8">
-                    <div class="oh-card-dashboard oh-card-dashboard--no-scale oh-card-dashboard--transparent">
-                        <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
-                            <span class="oh-card-dashboard__title">{% trans "Total Leave Requests" %}</span>
-                            <input type="month" hx-trigger="change delay:100ms" class="float-end month" hx-get="{% url 'dashboard-leave-requests' %}" hx-target="#leaveRequest">
-                        </div>
-                        <div class="oh-card-dashboard__body" id="leaveRequest" style="height:35vh;overflow-y:auto">
-                            {% include 'leave/leave_request/leave-requests.html' %}
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div> 
-
-        
-
-        <div class="oh-dashboard__right  col-12 col-sm-12 col-md-12 col-lg-3">
-            <div class="oh-dashboard__events">
-                <div class="w-100">
-                    {% if perms.leave.view_leaverequest %}
-                    <div class="w-100 mb-1" id="back_button">
-                        <a href="{% url 'leave-dashboard' %}"
-                        class="oh-btn oh-btn--secondary oh-btn--shadow"
-                        >{% trans "View Admin Dashboard" %}
-                        <ion-icon
-                            class="me-2 md hydrated"
-                            name="arrow-forward-outline"
-                            role="img"
-                            aria-label="arrow-back-outline"
-                        ></ion-icon
-                        ></a
-                        >
-                    </div>
-                    {% endif %}
-                    <div class="oh-dashboard__event oh-dashboard__event--purple mb-2"  style="padding-bottom:1rem">
-                        <div class="oh-dasboard__event-photo" style="background-color:white">
-                            <img src="/static/images/ui/sunbed.png" class="oh-dashboard__event-userphoto" />
-                        </div>
-                        <div class="oh-dasboard__event-details">
-                            <span class="oh-dashboard__event-title">{% trans "Next Holiday" %}</span>
-                            <span class="oh-dashboard__event-main">{{next_holiday.name}}</span>
-                            <span class="oh-dashboard__event-date">{{next_holiday.start_date}}</span>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="oh-card-dashboard oh-card-dashboard--no-scale oh-card-dashboard--transparent mt-3">
-                <div class="oh-card-dashboard__header oh-card-dashboard__header--divider">
-                    <span class="oh-card-dashboard__title">{% trans "Up coming holidays" %}</span>
-                </div>
-                <div class="oh-card-dashboard__body">
-                    <ul class="oh-card-dashboard__user-list">
-                        {% if holidays %}
-                            {% for holiday in holidays %}
-                                <li class="oh-card-dashboard__user-item oh-dashboard__event">
-                                    <div class="">
-                                    <span class="oh-profile__name oh-text--white">{{holiday.name}}</span> <br/>
-                                    <span class="oh-dashboard__event-date oh-text--white">{{holiday.start_date}}</span>
-                                    </div>
-                                </li>
-                            {% endfor %}
-
-                        {% else %}
-                            <div style="height: 350px; display:flex;align-items: center;justify-content: center;" class="">
-                                <div style="" class="">
-                                <img style="display: block;width: 70px;margin: 10px auto ;" src="{% static 'images/ui/leave_types.png' %}" class="" alt=""/>
-                                <h3 style="font-size:16px" class="oh-404__subtitle">{% trans "No more holidays scheduled for this month." %}</h3>
-                                </div>
-                            </div>
-                        {% endif %}
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
-<script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-
-<script src="{% static "dashboard/dashboard.js" %}"></script>
-{% endblock %}
\ No newline at end of file
diff --git a/leave/templates/leave/holiday-form.html b/leave/templates/leave/holiday-form.html
deleted file mode 100644
index b965ef5ab..000000000
--- a/leave/templates/leave/holiday-form.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% if form.errors %}
-{% load i18n %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-<form hx-post="{% url 'holiday-creation' %}">
-    <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Holiday Name" %}</label>
-        {{form.name}}
-        {{form.name.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Start Date" %}</label>
-        {{form.start_date}}
-        {{form.start_date.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "End Date" %}</label>
-        {{form.end_date}}
-        {{form.end_date.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Recurring" %}</label>
-        {{form.recurring}}
-        {{form.recurring.errors}}
-      </div>
-      <div class="oh-modal__dialog-footer">
-        <button type="submit" class="oh-btn oh-btn--secondary w-100">
-          {% trans "Apply" %}
-        </button>
- </form>
\ No newline at end of file
diff --git a/leave/templates/leave/holiday-update-form.html b/leave/templates/leave/holiday-update-form.html
deleted file mode 100644
index 6c1550b1d..000000000
--- a/leave/templates/leave/holiday-update-form.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% load i18n %}
-{% if form.errors %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-
-<form hx-post="{% url 'holiday-update' id %}">
-    <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Holiday Name" %}</label>
-        {{form.name}}
-        {{form.name.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Start Date" %}</label>
-        {{form.start_date}}
-        {{form.start_date.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "End Date" %}</label>
-        {{form.end_date}}
-        {{form.end_date.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Recurring" %}</label>
-        {{form.recurring}}
-        {{form.recurring.errors}}
-      </div>
-      <div class="oh-modal__dialog-footer">
-        <button type="submit" class="oh-btn oh-btn--secondary w-100">
-          {% trans "Apply" %}
-        </button>
- </form>
\ No newline at end of file
diff --git a/leave/templates/leave/holiday-view.html b/leave/templates/leave/holiday-view.html
deleted file mode 100644
index dbce601eb..000000000
--- a/leave/templates/leave/holiday-view.html
+++ /dev/null
@@ -1,184 +0,0 @@
-{% extends 'index.html' %}
-{% block content %}
-{% load static %}
-{% load i18n %}
-{% if messages %}
-<div class="oh-wrapper">
-    {% for message in messages %}
-    <div class="oh-alert-container">
-        <div class="oh-alert oh-alert--animated {{ message.tags }}">
-            {{ message }}
-        </div>
-    </div>
-    {% endfor %}
-</div>
-{% endif %}
-
-<section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
-    <div class="oh-main__titlebar oh-main__titlebar--left">
-        <h1 class="oh-main__titlebar-title fw-bold">{% trans "Holidays" %}</h1>
-        <a class="oh-main__titlebar-search-toggle" role="button" aria-label="Toggle Search"
-            @click="searchShow = !searchShow">
-            <ion-icon name="search-outline" class="oh-main__titlebar-serach-icon"></ion-icon>
-        </a>
-    </div>
-    <div class="oh-main__titlebar oh-main__titlebar--right">
-        <div class="oh-input-group oh-input__search-group" :class="searchShow ? 'oh-input__search-group--show' : ''">
-            <ion-icon name="search-outline" class="oh-input-group__icon oh-input-group__icon--left"></ion-icon>
-            <input type="text" class="oh-input oh-input__icon" aria-label="Search Input" placeholder="{% trans 'Search' %}"
-                name="name" hx-get="{% url 'holiday-filter' %}" hx-trigger="keyup" hx-target="#holidays" />
-        </div>
-        <div class="oh-main__titlebar-button-container">
-            <div class="oh-dropdown" x-data="{open: false}">
-                <button class="oh-btn ml-2" @click="open = !open">
-                    <ion-icon name="filter" class="mr-1"></ion-icon>{% trans "Filter" %}<div id="filterCount"></div>
-                </button>
-                <form  hx-get="{% url 'holiday-filter' %}" hx-target="#holidays" id="filterForm">
-                    <div class="oh-dropdown__menu oh-dropdown__menu--right oh-dropdown__filter p-4" x-show="open"
-                        @click.outside="open = false" style="display: none;">
-                        <div class="oh-dropdown__filter-body">
-                            <div class="oh-accordion">
-                                <div class="oh-accordion-header">{% trans "Holiday" %}</div>
-                                <div class="oh-accordion-body">
-                                    <div class="row">
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "Start Date" %}</label>
-                                                {{form.start_date}}
-                                            </div>
-                                        </div>
-
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "End Date" %}</label>
-                                                {{form.end_date}}
-                                            </div>
-                                        </div>
-                                        <div class="col-sm-12 col-md-12">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "Recurring" %}</label>
-                                                {{form.recurring}}
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="oh-accordion">
-                                <div class="oh-accordion-header">{% trans "Advanced" %}</div>
-                                <div class="oh-accordion-body">
-                                    <div class="row">
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "From Date" %}</label>
-                                                {{form.from_date}}
-                                            </div>
-                                        </div>
-
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "To Date" %}</label>
-                                                {{form.to_date}}
-                                            </div>
-                                        </div>
-
-                                    </div>
-                                </div>
-                            </div>
-
-
-                        </div>
-                        <div class="oh-dropdown__filter-footer">
-                            <button class="oh-btn oh-btn--secondary oh-btn--small w-100 filterButton" type="submit">{% trans "Filter" %}</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="oh-btn-group ml-2">
-                <div class="oh-dropdown" x-data="{open: false}">
-                    <button class="oh-btn oh-btn--secondary oh-btn--shadow" data-toggle="oh-modal-toggle"
-                        data-target="#editModal1" hx-get="{% url 'holiday-creation' %}" hx-target="#holidayForm">
-                        <ion-icon name="add-outline" class="me-1"></ion-icon>
-                        {% trans "Create" %}
-                    </button>
-
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
-<div class="oh-wrapper" id="holidays">
-    {% include 'leave/holiday/holiday.html' %}
-</div>
-<!-- Holiday creation -->
-<div class="oh-modal" id="editModal1" role="dialog" aria-labelledby="editDialogModal" aria-hidden="true">
-    <div class="oh-modal__dialog oh-modal__dialog--timeoff">
-        <div class="oh-modal__dialog-header">
-            <span class="oh-modal__dialog-title" id="editDialogDialog">{% trans "Create Holiday" %}</span>
-            <button class="oh-modal__close" aria-label="Close">
-                <ion-icon name="close-outline"></ion-icon>
-            </button>
-        </div>
-        <div id="holidayForm">
-
-        </div>
-
-
-    </div>
-</div>
-
-<!-- Update Holiday -->
-<div class="oh-modal" id="editModal2" role="dialog" aria-labelledby="editDialogModal" aria-hidden="true">
-    <div class="oh-modal__dialog oh-modal__dialog--timeoff">
-        <div class="oh-modal__dialog-header">
-            <span class="oh-modal__dialog-title" id="editDialogDialog">{% trans "Update Holiday" %}</span>
-            <button class="oh-modal__close" aria-label="Close">
-                <ion-icon name="close-outline"></ion-icon>
-            </button>
-        </div>
-        <div id="updateForm">
-
-        </div>
-
-
-    </div>
-</div>
-</div>
-
-<script>
-    $(document).on('htmx:load','#holidays', function () {
-        // Create a new script element
-        var scriptElement = document.createElement("script");
-        // Set the source URL of the script file to be loaded
-        scriptElement.src = "{% static 'build/js/web.frontend.min.js' %}";
-        // Append the script element to the head of the HTML document
-        document.head.appendChild(scriptElement);
-    });
-    $(document).ready(function () {
-        $('#delete').submit(function (e) {
-            e.preventDefault(); // Prevent form submission
-            if (confirm('Are you sure you want to delete this record?')) {
-                // If user confirms, submit the form
-                this.submit();
-            } else {
-                // If user cancels, do nothing
-                return false;
-            }
-        });
-    });
-    $('#delete-link').on('click', function(event) {
-        event.preventDefault(); // prevent the default behavior of the link
-        
-        const link = $(this);
-        const confirmation = confirm('{% trans "Are you sure you want to delete?" %}');
-        
-        if (confirmation) {
-          window.location.href = link.attr('href'); // execute the href if confirmed
-        }
-      });
-
-</script>
-
-<script src="{% static '/base/filter.js' %}"></script>
-
-
-{% endblock %}
\ No newline at end of file
diff --git a/leave/templates/leave/holiday/holiday.html b/leave/templates/leave/holiday/holiday.html
index 4eeecaa7c..2d0fa010c 100644
--- a/leave/templates/leave/holiday/holiday.html
+++ b/leave/templates/leave/holiday/holiday.html
@@ -1,28 +1,41 @@
 {% load i18n %} {% load static %} {% include 'filter_tags.html' %}
+{% if messages %}
+<div class="oh-wrapper">
+  {% for message in messages %}
+  <div class="oh-alert-container">
+    <div class="oh-alert oh-alert--animated {{ message.tags }}">
+      {{ message }}
+    </div>
+  </div>
+  {% endfor %}
+{% endif %}
+</div>
 {% if holidays %}
     <!-- start of selection buttons -->
-    <div
-      class="oh-checkpoint-badge text-success mb-2"
-      id="selectAllHolidays"
-      style="cursor: pointer"
-    >
-      {% trans "Select All Holidays" %}
-    </div>
-    <div
-      class="oh-checkpoint-badge text-secondary mb-2"
-      id="unselectAllHolidays"
-      style="cursor: pointer; display:none;"
-    >
-      {% trans "Unselect All Holidays" %}
-    </div>
-    <div
-      class="oh-checkpoint-badge text-info mb-2"
-      id="exportHolidays"
-      style="cursor: pointer; display: none"
-    >
-      {% trans "Export Holidays" %}
-    </div>
-    <div class="oh-checkpoint-badge text-danger mb-2" id="selectedShowHolidays" style="display: none"></div>
+    {% if perms.leave.add_holiday %} 
+      <div
+        class="oh-checkpoint-badge text-success mb-2"
+        id="selectAllHolidays"
+        style="cursor: pointer"
+        >
+        {% trans "Select All Holidays" %}
+      </div>
+      <div
+        class="oh-checkpoint-badge text-secondary mb-2"
+        id="unselectAllHolidays"
+        style="cursor: pointer; display:none;"
+        >
+        {% trans "Unselect All Holidays" %}
+      </div>
+      <div
+        class="oh-checkpoint-badge text-info mb-2"
+        id="exportHolidays"
+        style="cursor: pointer; display: none"
+        >
+        {% trans "Export Holidays" %}
+      </div>
+      <div class="oh-checkpoint-badge text-danger mb-2" id="selectedShowHolidays" style="display: none"></div>
+    {% endif %}
     <!-- end of selection buttons -->
     <div class="oh-sticky-table">
         <div class="oh-sticky-table__table oh-table--sortable">
@@ -87,10 +100,11 @@
                                   </button>
                                 {% endif %}
                                 {% if perms.leave.delete_holiday %}
-                                  <a class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100"
-                                  id="delete-link" href="{% url 'holiday-delete' holiday.id %}"
-                                  onclick="return confirm('{% trans "Are you sure you want to delete?"%}');" 
-                                  title="{% trans 'Delete' %}" >
+                                  <a class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" id="delete-link"
+                                    hx-confirm="{% trans 'Are you sure you want to delete?' %}" 
+                                    hx-post="{% url 'holiday-delete' holiday.id %}?{{pd}}"
+                                    hx-target="#holidays"
+                                        title="{% trans 'Delete' %}" >
                                   <ion-icon name="trash-outline"></ion-icon>
                                   </a>
                                 {% endif %}
diff --git a/leave/templates/leave/holiday/holiday_update_form.html b/leave/templates/leave/holiday/holiday_update_form.html
index 0cd88a5c7..436dcd60f 100644
--- a/leave/templates/leave/holiday/holiday_update_form.html
+++ b/leave/templates/leave/holiday/holiday_update_form.html
@@ -16,7 +16,7 @@
 {% endif %}
 <div class="oh-modal__dialog-header">
   <span class="oh-modal__dialog-title" id="editDialogDialog"
-    >{% trans "Create Holiday" %}</span
+    >{% trans "Update Holiday" %}</span
   >
   <button
     class="oh-modal__close"
diff --git a/leave/templates/leave/holiday/holiday_view.html b/leave/templates/leave/holiday/holiday_view.html
index 94fc7ef29..1fa3c9328 100644
--- a/leave/templates/leave/holiday/holiday_view.html
+++ b/leave/templates/leave/holiday/holiday_view.html
@@ -71,55 +71,61 @@
       {% endif %}
 
       <!-- start of Actions -->
-      <div class="oh-dropdown ml-2" x-data="{open: false}">
-        <button
-          class="oh-btn oh-btn--dropdown"
-          @click="open = !open"
-          @click.outside="open = false"
-        >
-          {% trans "Actions" %}
-        </button>
-        <div
-          class="oh-dropdown__menu oh-dropdown__menu--right"
-          x-show="open"
-          style="display: none"
-        >
-          <ul class="oh-dropdown__items">
-            <li class="oh-dropdown__item">
-              <a
-                href="#"
-                class="oh-dropdown__link"
-                id="holidays-info-import"
-                data-toggle="oh-modal-toggle"
-                data-target="#holidayImport"
-                >{% trans "Import" %}</a
-              >
-            </li>
-            {% if holidays %}
-            <li class="oh-dropdown__item">
-              <a
-                href="#"
-                class="oh-dropdown__link"
-                id="holidays-export"
-                data-toggle="oh-modal-toggle"
-                data-target="#holidayExport"
-                >{% trans "Export" %}</a
-              >
-            </li>
-              {% if perms.leave.delete_holiday %}
+      {% if perms.leave.add_holiday or perms.leave.delete_holiday%} 
+        <div class="oh-dropdown ml-2" x-data="{open: false}">
+          <button
+            class="oh-btn oh-btn--dropdown"
+            @click="open = !open"
+            @click.outside="open = false"
+          >
+            {% trans "Actions" %}
+          </button>
+          <div
+            class="oh-dropdown__menu oh-dropdown__menu--right"
+            x-show="open"
+            style="display: none"
+          >
+            <ul class="oh-dropdown__items">
+              {% if perms.leave.add_holiday %}
                 <li class="oh-dropdown__item">
                   <a
                     href="#"
-                    id="bulkHolidaysDelete"
-                    class="oh-dropdown__link oh-dropdown__link--danger"
-                    >{% trans "Delete" %}</a
+                    class="oh-dropdown__link"
+                    id="holidays-info-import"
+                    data-toggle="oh-modal-toggle"
+                    data-target="#holidayImport"
+                    >{% trans "Import" %}</a
                   >
                 </li>
               {% endif %}
-            {% endif %}
-          </ul>
+              {% if holidays %}
+                {% if perms.leave.add_holiday %}
+                  <li class="oh-dropdown__item">
+                    <a
+                      href="#"
+                      class="oh-dropdown__link"
+                      id="holidays-export"
+                      data-toggle="oh-modal-toggle"
+                      data-target="#holidayExport"
+                      >{% trans "Export" %}</a
+                    >
+                  </li>
+                {% endif %}
+                {% if perms.leave.delete_holiday %}
+                  <li class="oh-dropdown__item">
+                    <a
+                      href="#"
+                      id="bulkHolidaysDelete"
+                      class="oh-dropdown__link oh-dropdown__link--danger"
+                      >{% trans "Delete" %}</a
+                    >
+                  </li>
+                {% endif %}
+              {% endif %}
+            </ul>
+          </div>
         </div>
-      </div>
+      {% endif %}
       <!-- end of actions -->
 
       <!-- start of create -->
@@ -337,18 +343,6 @@
       }
     });
   });
-  $("#delete-link").on("click", function (event) {
-    event.preventDefault(); // prevent the default behavior of the link
-
-    const link = $(this);
-    const confirmation = confirm(
-      '{% trans "Are you sure you want to delete?" %}'
-    );
-
-    if (confirmation) {
-      window.location.href = link.attr("href"); // execute the href if confirmed
-    }
-  });
 </script>
 
 <script src="{% static '/base/filter.js' %}"></script>
diff --git a/leave/templates/leave/holiday_creation.html b/leave/templates/leave/holiday_creation.html
deleted file mode 100644
index 72f2634b3..000000000
--- a/leave/templates/leave/holiday_creation.html
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends 'index.html' %} {% load i18n %} {% block content %}
-<p class="pb-3">
-  <a href="/leave/holiday-view" class="btn btn-primary">{% trans "View" %}</a> {% trans "View All Holiday" %} 
-</p>
-<form action="" method="post">
-  {%csrf_token%} {{form.as_p}}
-  <input type="submit" class="btn btn-success" />
-</form>
-
-
-<script>
-  $(document).ready(function () {
-    // Get references to the start and end date fields
-    var $startDate = $('#id_start_date');
-    var $endDate = $('#id_end_date');
-
-    // Attach an event listener to the start date field
-    $startDate.on('change', function () {
-      // Get the value of the start date field
-      var startDateVal = $startDate.val();
-      // Set the min attribute of the end date field to the value of the start date field
-      $endDate.attr('min', startDateVal);
-    });
-
-    $endDate.on('change', function () {
-      // Get the value of the end date field
-      var endDateVal = $endDate.val();
-      // Set the max attribute of the start date field to the value of the end date field
-      $startDate.attr('max', endDateVal);
-    });
-
-  });
-</script>
-{% endblock %}
\ No newline at end of file
diff --git a/leave/templates/leave/holiday_form.html b/leave/templates/leave/holiday_form.html
deleted file mode 100644
index b965ef5ab..000000000
--- a/leave/templates/leave/holiday_form.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% if form.errors %}
-{% load i18n %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-<form hx-post="{% url 'holiday-creation' %}">
-    <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Holiday Name" %}</label>
-        {{form.name}}
-        {{form.name.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Start Date" %}</label>
-        {{form.start_date}}
-        {{form.start_date.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "End Date" %}</label>
-        {{form.end_date}}
-        {{form.end_date.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Recurring" %}</label>
-        {{form.recurring}}
-        {{form.recurring.errors}}
-      </div>
-      <div class="oh-modal__dialog-footer">
-        <button type="submit" class="oh-btn oh-btn--secondary w-100">
-          {% trans "Apply" %}
-        </button>
- </form>
\ No newline at end of file
diff --git a/leave/templates/leave/holiday_import.html b/leave/templates/leave/holiday_import.html
deleted file mode 100644
index 4c917934f..000000000
--- a/leave/templates/leave/holiday_import.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends 'index.html' %}{% block  content %}
-<form action="" method="post" enctype="multipart/form-data">
-    {%csrf_token%}
-    <div class="form-group">
-        <input type="file" class="form-control" name='holiday_file'>
-    </div>
-    <input type="submit">
-  </form>{% endblock  %}
\ No newline at end of file
diff --git a/leave/templates/leave/holiday_update_form.html b/leave/templates/leave/holiday_update_form.html
deleted file mode 100644
index 6c1550b1d..000000000
--- a/leave/templates/leave/holiday_update_form.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% load i18n %}
-{% if form.errors %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-
-<form hx-post="{% url 'holiday-update' id %}">
-    <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Holiday Name" %}</label>
-        {{form.name}}
-        {{form.name.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Start Date" %}</label>
-        {{form.start_date}}
-        {{form.start_date.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "End Date" %}</label>
-        {{form.end_date}}
-        {{form.end_date.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Recurring" %}</label>
-        {{form.recurring}}
-        {{form.recurring.errors}}
-      </div>
-      <div class="oh-modal__dialog-footer">
-        <button type="submit" class="oh-btn oh-btn--secondary w-100">
-          {% trans "Apply" %}
-        </button>
- </form>
\ No newline at end of file
diff --git a/leave/templates/leave/holiday_view.html b/leave/templates/leave/holiday_view.html
deleted file mode 100644
index 112d943d9..000000000
--- a/leave/templates/leave/holiday_view.html
+++ /dev/null
@@ -1,195 +0,0 @@
-{% extends 'index.html' %}
-{% block content %}
-{% load static %}
-{% load i18n %}
-{% if messages %}
-<div class="oh-wrapper">
-    {% for message in messages %}
-    <div class="oh-alert-container">
-        <div class="oh-alert oh-alert--animated {{ message.tags }}">
-            {{ message }}
-        </div>
-    </div>
-    {% endfor %}
-</div>
-{% endif %}
-
-<section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
-    <div class="oh-main__titlebar oh-main__titlebar--left">
-        <h1 class="oh-main__titlebar-title fw-bold">{% trans "Holidays" %}</h1>
-        <a class="oh-main__titlebar-search-toggle" role="button" aria-label="Toggle Search"
-            @click="searchShow = !searchShow">
-            <ion-icon name="search-outline" class="oh-main__titlebar-serach-icon"></ion-icon>
-        </a>
-    </div>
-    <div class="oh-main__titlebar oh-main__titlebar--right">
-    {% if holidays %}
-        <div class="oh-input-group oh-input__search-group" :class="searchShow ? 'oh-input__search-group--show' : ''">
-            <ion-icon name="search-outline" class="oh-input-group__icon oh-input-group__icon--left"></ion-icon>
-            <input type="text" class="oh-input oh-input__icon" aria-label="Search Input" placeholder="{% trans 'Search' %}"
-                name="name" hx-get="{% url 'holiday-filter' %}" hx-trigger="keyup" hx-target="#holidays" />
-        </div>
-        <div class="oh-main__titlebar-button-container">
-            <div class="oh-dropdown" x-data="{open: false}">
-                <button class="oh-btn ml-2" @click="open = !open">
-                    <ion-icon name="filter" class="mr-1"></ion-icon>{% trans "Filter" %}<div id="filterCount"></div>
-                </button>
-                <form  hx-get="{% url 'holiday-filter' %}" hx-target="#holidays" id="filterForm">
-                    <div class="oh-dropdown__menu oh-dropdown__menu--right oh-dropdown__filter p-4" x-show="open"
-                        @click.outside="open = false" style="display: none;">
-                        <div class="oh-dropdown__filter-body">
-                            <div class="oh-accordion">
-                                <div class="oh-accordion-header">{% trans "Holiday" %}</div>
-                                <div class="oh-accordion-body">
-                                    <div class="row">
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "Start Date" %}</label>
-                                                {{form.start_date}}
-                                            </div>
-                                        </div>
-
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "End Date" %}</label>
-                                                {{form.end_date}}
-                                            </div>
-                                        </div>
-                                        <div class="col-sm-12 col-md-12">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "Recurring" %}</label>
-                                                {{form.recurring}}
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="oh-accordion">
-                                <div class="oh-accordion-header">{% trans "Advanced" %}</div>
-                                <div class="oh-accordion-body">
-                                    <div class="row">
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "From Date" %}</label>
-                                                {{form.from_date}}
-                                            </div>
-                                        </div>
-
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "To Date" %}</label>
-                                                {{form.to_date}}
-                                            </div>
-                                        </div>
-
-                                    </div>
-                                </div>
-                            </div>
-
-
-                        </div>
-                        <div class="oh-dropdown__filter-footer">
-                            <button class="oh-btn oh-btn--secondary oh-btn--small w-100 filterButton" type="submit">{% trans "Filter" %}</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            {% endif %}
-            <div class="oh-btn-group ml-2">
-                <div class="oh-dropdown" x-data="{open: false}">
-                    <button class="oh-btn oh-btn--secondary oh-btn--shadow" data-toggle="oh-modal-toggle"
-                        data-target="#editModal1" hx-get="{% url 'holiday-creation' %}" hx-target="#holidayForm">
-                        <ion-icon name="add-outline" class="me-1"></ion-icon>
-                        {% trans "Create" %}
-                    </button>
-
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
-<div class="oh-wrapper" id="holidays">
-    {% if holidays %}
-    {% include 'leave/holiday/holiday.html' %}
-    {% else %}
-    <div style="height: 70vh; display:flex;align-items: center;justify-content: center;" class="">
-        <div style="" class="oh-404">
-        <img style="display: block;width:150px;height:150px;margin: 10px auto ;" src="{% static 'images/ui/leave_types.png' %}" class="mb-4" alt=""/>
-        <h3 style="font-size:20px" class="oh-404__subtitle">{% trans "There are no holidays at the moment." %}</h3>
-        </div>
-    </div>
-    {% endif %}
-</div>
-<!-- Holiday creation -->
-<div class="oh-modal" id="editModal1" role="dialog" aria-labelledby="editDialogModal" aria-hidden="true">
-    <div class="oh-modal__dialog oh-modal__dialog--timeoff">
-        <div class="oh-modal__dialog-header">
-            <span class="oh-modal__dialog-title" id="editDialogDialog">{% trans "Create Holiday" %}</span>
-            <button class="oh-modal__close" aria-label="Close">
-                <ion-icon name="close-outline"></ion-icon>
-            </button>
-        </div>
-        <div id="holidayForm">
-
-        </div>
-
-
-    </div>
-</div>
-
-<!-- Update Holiday -->
-<div class="oh-modal" id="editModal2" role="dialog" aria-labelledby="editDialogModal" aria-hidden="true">
-    <div class="oh-modal__dialog oh-modal__dialog--timeoff">
-        <div class="oh-modal__dialog-header">
-            <span class="oh-modal__dialog-title" id="editDialogDialog">{% trans "Update Holiday" %}</span>
-            <button class="oh-modal__close" aria-label="Close">
-                <ion-icon name="close-outline"></ion-icon>
-            </button>
-        </div>
-        <div id="updateForm">
-
-        </div>
-
-
-    </div>
-</div>
-</div>
-
-<script>
-    $(document).on('htmx:load','#holidays', function () {
-        // Create a new script element
-        var scriptElement = document.createElement("script");
-        // Set the source URL of the script file to be loaded
-        scriptElement.src = "{% static 'build/js/web.frontend.min.js' %}";
-        // Append the script element to the head of the HTML document
-        document.head.appendChild(scriptElement);
-    });
-    $(document).ready(function () {
-        $('#delete').submit(function (e) {
-            e.preventDefault(); // Prevent form submission
-            if (confirm('Are you sure you want to delete this record?')) {
-                // If user confirms, submit the form
-                this.submit();
-            } else {
-                // If user cancels, do nothing
-                return false;
-            }
-        });
-    });
-    $('#delete-link').on('click', function(event) {
-        event.preventDefault(); // prevent the default behavior of the link
-        
-        const link = $(this);
-        const confirmation = confirm('{% trans "Are you sure you want to delete?" %}');
-        
-        if (confirmation) {
-          window.location.href = link.attr('href'); // execute the href if confirmed
-        }
-      });
-
-</script>
-
-<script src="{% static '/base/filter.js' %}"></script>
-
-
-{% endblock %}
\ No newline at end of file
diff --git a/leave/templates/leave/leave-assign-form.html b/leave/templates/leave/leave-assign-form.html
deleted file mode 100644
index 7b2b14b51..000000000
--- a/leave/templates/leave/leave-assign-form.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% load i18n %}
-{% if form.errors %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-<form hx-post="{% url 'assign' %}">
-  <div class="oh-modal__dialog-body pb-2" id="leaveTypeAssign">
-    <label class="oh-label d-block">{% trans "Leave types" %}</label>
-    {{form.leave_type_id}}
-    {{form.leave_type_id.errors}}
-  </div>
-  <div class="oh-modal__dialog-body pb-2" id="employeeAssign">
-    <label class="oh-label d-block">{% trans "Employees" %}</label>
-    {{form.employee_id}}
-    {{form.employee_id.errors}}
-  </div>
-  <div class="oh-modal__dialog-footer">
-    <button type="submit" class="oh-btn oh-btn--secondary w-100">
-      {% trans "Apply" %}
-    </button>
-</form>
\ No newline at end of file
diff --git a/leave/templates/leave/leave-assign-one-form.html b/leave/templates/leave/leave-assign-one-form.html
deleted file mode 100644
index 75a4b7ada..000000000
--- a/leave/templates/leave/leave-assign-one-form.html
+++ /dev/null
@@ -1,26 +0,0 @@
-{% load i18n %}
-{% if form.errors %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-
-<form  hx-post="{% url 'assign-one' id %}">
-    <div class="oh-modal__dialog-body pb-2">
-      <label class="oh-label d-block">{% trans "Employees" %}</label>
-      {{form.employee_id}}
-      {{form.employee_id.errors}}
-    </div>
-    <div class="oh-modal__dialog-footer">
-      <button type="submit" class="oh-btn oh-btn--secondary w-100">
-        {% trans "Apply" %}
-      </button>
-  </form>
\ No newline at end of file
diff --git a/leave/templates/leave/leave-request-form.html b/leave/templates/leave/leave-request-form.html
deleted file mode 100644
index 71e46638b..000000000
--- a/leave/templates/leave/leave-request-form.html
+++ /dev/null
@@ -1,60 +0,0 @@
-{% load i18n %}
-{% if form.errors %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-
-<form  hx-post="{% url 'request-creation' %}"  hx-encoding="multipart/form-data">
-      <div class="oh-modal__dialog-body pb-2" id="leaveType">
-        <label class="oh-label d-block ">{% trans "Leave types" %}</label>
-        {{form.leave_type_id}}
-        {{form.leave_type_id.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2" id="employee">
-        <label class="oh-label d-block">{% trans "Employees" %}</label>
-        {{form.employee_id}}
-        {{form.employee_id.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Start Date" %}</label>
-        {{form.start_date}}
-        {{form.start_date.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2" id="startDate">
-        <label class="oh-label d-block">{% trans "Start Date Breakdown" %}</label>       
-        {{form.start_date_breakdown}}
-        {{form.start_date_breakdown.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "End Date" %}</label>
-        {{form.end_date}}
-        {{form.end_date.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2" id="endDate">  
-        <label class="oh-label d-block">{% trans "End Date Breakdown" %}</label>
-        {{form.end_date_breakdown}}
-        {{form.end_date_breakdown.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Description" %}</label>
-        {{form.description}}
-        {{form.description.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Attachment" %}</label>
-        {{form.attachment}}
-        {{form.attachment.errors}}
-      </div>
-      <div class="oh-modal__dialog-footer">
-        <button type="submit" class="oh-btn oh-btn--secondary w-100">
-          {% trans "Apply" %}
-        </button>
- </form>
\ No newline at end of file
diff --git a/leave/templates/leave/leave-type-creation.html b/leave/templates/leave/leave-type-creation.html
deleted file mode 100644
index 403cc4db5..000000000
--- a/leave/templates/leave/leave-type-creation.html
+++ /dev/null
@@ -1,334 +0,0 @@
-{% extends 'index.html' %}
-{% load static %}
-{% load i18n %}
-{% block content %}
-{% if form.errors %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-<section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
-    <div class="oh-main__titlebar oh-main__titlebar--left">
-        <form action="{% url 'type-view' %}">
-            <button class="oh-btn oh-btn--secondary oh-btn--shadow">
-                {% trans "View Leave Types" %}
-            </button>
-        </form>
-    </div>
-    
-  </section>
-
-  <div class="oh-wrapper d-flex justify-content-center">
-    <div class="oh-onboarding-card">
-        <form method="post" enctype="multipart/form-data">
-            {% csrf_token %}
-            <div class="oh-onboarding-card__address-group">
-                <h2 class="oh-onboarding-card__section-title">{% trans "Create Leave Type" %}</h2>
-                <div class="row">
-                    <div class="col-sm-12 col-md-12 ">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Name" %}</label>
-                            {{form.name}}
-                            {{form.name.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-6">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Icon" %}</label>
-                            {{form.icon}}
-                            {{form.icon.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-6">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Color" %}</label>
-                            {{form.color}}
-                            {{form.color.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-12">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Payment Method" %}</label>
-                            {{form.payment}}   
-                            {{form.payment.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-4">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Leave Count" %}</label>
-                            {{form.count}}
-                            {{form.count.errors}} 
-                        </div>
-                    </div> 
-                    <div class="col-sm-12 col-md-12 col-lg-4">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Period In" %}</label>
-                            {{form.period_in}}
-                            {{form.period_in.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-4">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Total Days" %}</label>
-                            {{form.total_days}}
-                            {{form.total_days.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 ">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Reset" %}</label>
-                            {{form.reset}}
-                            {{form.reset.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 ">
-                        <div class="oh-input-group">
-                            <label for="id_reset_based" class="oh-label">{% trans "Reset Based" %}</label>
-                            {{form.reset_based}}
-                            {{form.reset_based.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 ">
-                        <div class="oh-input-group">
-                            <label for="id_reset_month" class="oh-label">{% trans "Reset Month" %}</label>
-                            {{form.reset_month}}
-                            {{form.reset_month.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 ">
-                        <div class="oh-input-group">
-                            <label for="id_reset_day" class="oh-label">{% trans "Reset Day" %}</label>
-                            {{form.reset_day}}
-                            {{form.reset_day.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 ">
-                        <div class="oh-input-group">
-                            <label for="id_reset_weekend" class="oh-label">{% trans "Reset Weekday" %}</label>
-                            {{form.reset_weekend}}
-                            {{form.reset_weekend.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 ">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Carryforward Type" %}</label>
-                            {{form.carryforward_type}}
-                            {{form.carryforward_type.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 ">
-                        <div class="oh-input-group">
-                            <label for="id_carryforward_max" class="oh-label">{% trans "Carryforward Max" %}</label>
-                            {{form.carryforward_max}}
-                            {{form.carryforward_max.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12">
-                        <div class="oh-input-group">
-                            <label for="id_carryforward_expire_in" class="oh-label">{% trans "Carryforward Expire In" %}</label>
-                            {{form.carryforward_expire_in}}
-                            {{form.carryforward_expire_in.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12">
-                        <div class="oh-input-group">
-                            <label for="id_carryforward_expire_period" class="oh-label">{% trans "Carryforward Expire" %}
-                                Period</label>
-                            {{form.carryforward_expire_period}}
-                            {{form.carryforward_expire_period.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12  col-lg-6">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Require Approval" %}</label>
-                            {{form.require_approval}}
-                            {{form.require_approval.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12  col-lg-6">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Require Attachment" %}</label>
-                            {{form.require_attachment}}
-                            {{form.require_attachment.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-6">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Exclude Company Leaves" %}</label>
-                            {{form.exclude_company_leave}}
-                            {{form.exclude_company_leave.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-6">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Exclude Holidays" %}</label>
-                            {{form.exclude_holiday}}
-                            {{form.exclude_holiday.errors}}
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <button type="submit"
-                class="oh-btn oh-onboarding-card__button mt-4 oh-btn--secondary oh-btn--shadow w-100 mb-4"
-                role="button">
-                {% trans "Create" %}
-            </button>
-        </form>
-
-    </div>
-</div>
-
-<script>
-    $(document).ready(function () {
-
-        var reset = $("#id_reset");
-        var reset_based_label = $("label[for='id_reset_based']");
-        var reset_based = $("#id_reset_based");
-        var reset_month_label = $("label[for='id_reset_month']");
-        var reset_month = $("#id_reset_month");
-        var reset_day_label = $("label[for='id_reset_day']");
-        var reset_day = $("#id_reset_day");
-        var reset_weekend = $("#id_reset_weekend");
-        var reset_weekend_label = $("label[for='id_reset_weekend']");
-        var carryforward_type = $("#id_carryforward_type");
-        var carryforward_max_label = $("label[for='id_carryforward_max']");
-        var carryforward_max = $("#id_carryforward_max");
-        var carryforward_expire_in_label = $("label[for='id_carryforward_expire_in']");
-        var carryforward_expire_in = $("#id_carryforward_expire_in");
-        var carryforward_expire_period_label = $("label[for='id_carryforward_expire_period']");
-        var carryforward_expire_period = $("#id_carryforward_expire_period");
-        
-
-
-        //Making all fields which are not needed first was hidden and not required
-        reset_based_label.hide();
-        reset_based.hide().prop('required', false);
-        reset_month_label.hide();
-        reset_month.hide().prop('required', false);
-        reset_day_label.hide();
-        reset_day.hide().prop('required', false);
-        reset_weekend.hide().prop('required', false);;
-        reset_weekend_label.hide();
-        carryforward_max_label.hide();
-        carryforward_max.hide().prop('required', false);
-        carryforward_expire_in_label.hide();
-        carryforward_expire_in.hide().prop('required', false);
-        carryforward_expire_period_label.hide();
-        carryforward_expire_period.hide().prop('required', false);
-    
-
-        // Check value of reset change field and trigger action
-        reset.change(function () {
-            (this.checked) ? (reset_based.show().prop('required', true), reset_based_label.show()) : (reset_based_label.hide(), reset_based.hide().prop('required', false), reset_based.val(''))
-            reset_based.is(':hidden') ? (reset_month_label.hide(), reset_month.hide().prop('required', false), reset_month.val(''), reset_day_label.hide(), reset_day.val(''), reset_day.hide().prop('required', false), reset_weekend_label.hide(), reset_weekend.hide().prop('required', false), reset_weekend.val('')) : ""
-        });
-
-        // Check value of boolean change field and trigger action
-        reset_based.change(function (e) {
-            var value = $(this).val();
-            if (value == 'weekly') {
-                reset_weekend.show().prop('required', true);
-                reset_weekend_label.show();
-                reset_month.hide().prop('required', false);
-                reset_month_label.hide()
-                reset_month.val('')
-                reset_day.hide().prop('required', false);
-                reset_day_label.hide()
-                reset_day.val('')
-            } else {
-                reset_weekend_label.hide()
-                reset_weekend.hide().prop('required', false);
-                reset_weekend.val('')
-            }
-            if (value == 'yearly') {
-                reset_weekend_label.hide()
-                reset_weekend.hide().prop('required', false);
-                reset_weekend.val('')
-                reset_month_label.show()
-                reset_month.show().prop('required', true);
-                reset_day.show().prop('required', true);
-                reset_day_label.show()
-            }
-            if (value == 'monthly') {
-                reset_day.show().prop('required', true);
-                reset_day_label.show()
-                reset_month.hide().prop('required', false);
-                reset_month_label.hide()
-                reset_month.val('')
-            }
-            if (value == '') {
-                reset_month.hide().prop('required', false);
-                reset_month_label.hide()
-                reset_month.val('')
-                reset_day.hide().prop('required', false);
-                reset_day_label.hide()
-                reset_day.val('')
-            }
-
-
-        });
-
-        carryforward_type.change(function () {
-            (this.value == 'carryforward' || this.value == 'carryforward expire') ? (carryforward_max_label.show(), carryforward_max.show().prop('required', true)) : (carryforward_max_label.hide(), carryforward_max.hide().prop('required', false), carryforward_max.val(''));
-            this.value == 'carryforward expire' ?
-                (carryforward_expire_in_label.show(), carryforward_expire_in.show().prop('required', true), carryforward_expire_period_label.show(), carryforward_expire_period.show().prop('required', true)) :
-                (carryforward_expire_in_label.hide(), carryforward_expire_in.hide().prop('required', false), carryforward_expire_in.val(''), carryforward_expire_period_label.hide(), carryforward_expire_period.hide().prop('required', false), carryforward_expire_period.val(''));
-        })
-
-        function toggleFields() {
-            if ($("#id_reset").is(":checked")) {
-                $("#id_carryforward_type").parent().show();
-                if ($("#id_carryforward_type").val() == "carryforward") {
-                    $("#id_carryforward_max").parent().show();
-                }
-                else if ($("#id_carryforward_type").val() == "carryforward expire") {
-                    $("#id_carryforward_max,#id_carryforward_expire_in,#id_carryforward_expire_period").parent().show();
-                }
-
-            }else{
-
-                $("#id_carryforward_type,#id_carryforward_max").parent().hide();
-                $("#id_carryforward_max,#id_carryforward_expire_in,#id_carryforward_expire_period").parent().hide();
-
-
-            }
-        }
-
-       $("select,input[type=checkbox]").change(function (e) { 
-        toggleFields()
-    });
-    toggleFields()
-
-
-        // leave total days calculation
-        $('#id_period_in, #id_count').change(function () {
-            const month = 30
-            const year = 365
-            const day = 1
-            var totalDays = 0
-            var unit = $('#id_period_in').val();
-            var count = $('#id_count').val();
-
-            if (unit == 'day') {
-                totalDays = day * count
-            } else if (unit == 'month') {
-                totalDays = month * count
-            } else if (unit == 'year') {
-                totalDays = year * count
-            }
-            $('#id_total_days').val(totalDays);
-        });
-
-    });
-</script>
-
-{% endblock %}
\ No newline at end of file
diff --git a/leave/templates/leave/leave-type-update.html b/leave/templates/leave/leave-type-update.html
deleted file mode 100644
index e57b49a9c..000000000
--- a/leave/templates/leave/leave-type-update.html
+++ /dev/null
@@ -1,305 +0,0 @@
-{% extends 'index.html' %}
-{% load static %}
-{% load i18n %}
-{% block content %}
-
-{% if form.errors %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-
-<section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
-    <div class="oh-main__titlebar oh-main__titlebar--left">
-        <form action="{% url 'type-view' %}">
-            <button class="oh-btn oh-btn--secondary oh-btn--shadow">
-                {% trans "View Leave Types" %}
-            </button>
-        </form>
-    </div>
-    
-  </section>
-
-  <div class="oh-wrapper d-flex justify-content-center">
-    <div class="oh-onboarding-card">
-        <form method="post" enctype="multipart/form-data">
-            {% csrf_token %}
-            <div class="oh-onboarding-card__address-group">
-                <h2 class="oh-onboarding-card__section-title">{% trans "Update Leave Type" %}</h2>
-                <div class="row">
-                    <div class="col-sm-12 col-md-12 ">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Name" %}</label>
-                            {{form.name}}
-                            {{form.name.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-6">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Icon" %}</label>
-                            {{form.icon}}
-                            {{form.icon.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-6">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Color" %}</label>
-                            {{form.color}}
-                            {{form.color.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-12">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Payment Method" %}</label>
-                            {{form.payment}}
-                            {{form.payment.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-4">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Leave Count" %}</label>
-                            {{form.count}}
-                            {{form.count.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-4">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Period In" %}</label>
-                            {{form.period_in}}
-                            {{form.period_in.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-4">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Total Days" %}</label>
-                            {{form.total_days}}
-                            {{form.total_days.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 ">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Reset" %}</label>
-                            {{form.reset}}
-                            {{form.reset.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 ">
-                        <div class="oh-input-group">
-                            <label for="id_reset_based" class="oh-label">{% trans "Reset Based" %}</label>
-                            {{form.reset_based}}
-                            {{form.reset_based.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 ">
-                        <div class="oh-input-group">
-                            <label for="id_reset_month" class="oh-label">{% trans "Reset Month" %}</label>
-                            {{form.reset_month}}
-                            {{form.reset_month.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 ">
-                        <div class="oh-input-group">
-                            <label for="id_reset_day" class="oh-label">{% trans "Reset Day" %}</label>
-                            {{form.reset_day}}
-                            {{form.reset_day.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 ">
-                        <div class="oh-input-group">
-                            <label for="id_reset_weekend" class="oh-label">{% trans "Reset Weekday" %}</label>
-                            {{form.reset_weekend}}
-                            {{form.reset_weekend.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 ">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Carryforward Type" %}</label>
-                            {{form.carryforward_type}}
-                            {{form.carryforward_type.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 ">
-                        <div class="oh-input-group">
-                            <label for="id_carryforward_max" class="oh-label">{% trans "Carryforward Max" %}</label>
-                            {{form.carryforward_max}}
-                            {{form.carryforward_max.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12">
-                        <div class="oh-input-group">
-                            <label for="id_carryforward_expire_in" class="oh-label">{% trans "Carryforward Expire In" %}</label>
-                            {{form.carryforward_expire_in}}
-                            {{form.carryforward_expire_in.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12">
-                        <div class="oh-input-group">
-                            <label for="id_carryforward_expire_period" class="oh-label">{% trans "Carryforward Expire Period" %}
-                                </label>
-                            {{form.carryforward_expire_period}}
-                            {{form.carryforward_expire_period.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-6">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Require Approval" %}</label>
-                            {{form.require_approval}}
-                            {{form.require_approval.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-6">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Require Attachment" %}</label>
-                            {{form.require_attachment}}
-                            {{form.require_attachment.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-6">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Exclude Company Leaves" %}</label>
-                            {{form.exclude_company_leave}}
-                            {{form.exclude_company_leave.errors}}
-                        </div>
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-6">
-                        <div class="oh-input-group">
-                            <label for="" class="oh-label">{% trans "Exclude Holidays" %}</label>
-                            {{form.exclude_holiday}}
-                            {{form.exclude_holiday.errors}}
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <button type="submit"
-                class="oh-btn oh-onboarding-card__button mt-4 oh-btn--secondary oh-btn--shadow w-100 mb-4"
-                role="button">
-                {% trans "Update" %}
-            </button>
-        </form>
-
-    </div>
-</div>
-
-<script>
-  $(document).ready(function () {
-    var icon = $("#id_icon");
-    icon.show();
-    var reset = $("#id_reset");
-    var reset_based_label = $("label[for='id_reset_based']");
-    var reset_based = $("#id_reset_based");
-    var reset_month_label = $("label[for='id_reset_month']");
-    var reset_month = $("#id_reset_month");
-    var reset_day_label = $("label[for='id_reset_day']");
-    var reset_day = $("#id_reset_day");
-    var reset_weekend = $("#id_reset_weekend");
-    var reset_weekend_label = $("label[for='id_reset_weekend']");
-    var carryforward_type = $("#id_carryforward_type");
-    var carryforward_max_label = $("label[for='id_carryforward_max']");
-    var carryforward_max = $("#id_carryforward_max");
-    var carryforward_expire_in_label = $("label[for='id_carryforward_expire_in']");
-    var carryforward_expire_in = $("#id_carryforward_expire_in");
-    var carryforward_expire_period_label = $("label[for='id_carryforward_expire_period']");
-    var carryforward_expire_period = $("#id_carryforward_expire_period");
-
-
-    var hiddenLabelsFields = $('[data-hidden]')
-    for (let index = 0; index < hiddenLabelsFields.length; index++) {
-      const element = hiddenLabelsFields[index];
-      var id = $(element).attr('id');
-      var label = $('label[for="' + id + '"]');
-      label.hide();      
-    }  
-
-    // Check value of reset change field and trigger action
-    reset.change(function () {
-      (this.checked) ? (reset_based.show().prop('required', true), reset_based_label.show()):(reset_based_label.hide(), reset_based.hide().prop('required',false), reset_based.val(''))
-      reset_based.is(':hidden') ? (reset_month_label.hide(), reset_month.hide().prop('required', false), reset_month.val(''), reset_day_label.hide(), reset_day.val(''), reset_day.hide().prop('required', false), reset_weekend_label.hide(), reset_weekend.hide().prop('required', false), reset_weekend.val('')) : ""
-    });
-
-    // Check value of boolean change field and trigger action
-    reset_based.change(function (e) {
-      var value = $(this).val();
-      if (value == 'weekly') {
-        reset_weekend.show().prop('required', true);
-        reset_weekend_label.show();
-        reset_month.hide().prop('required', false);
-        reset_month_label.hide()
-        reset_month.val('')
-        reset_day.hide().prop('required', false);
-        reset_day_label.hide()
-        reset_day.val('')
-      } else {
-        reset_weekend_label.hide()
-        reset_weekend.hide().prop('required', false);
-        reset_weekend.val('')
-      }
-      if (value == 'yearly') {
-        reset_weekend_label.hide()
-        reset_weekend.hide().prop('required', false);
-        reset_weekend.val('')
-        reset_month_label.show()
-        reset_month.show().prop('required', true);
-        reset_day.show().prop('required', true);
-        reset_day_label.show()
-      }
-      if (value == 'monthly') {
-        reset_day.show().prop('required', true);
-        reset_day_label.show()
-        reset_month.hide().prop('required', false);
-        reset_month_label.hide()
-        reset_month.val('')
-      }
-      if (value == '') {
-        reset_month.hide().prop('required', false);
-        reset_month_label.hide()
-        reset_month.val('')
-        reset_day.hide().prop('required', false);
-        reset_day_label.hide()
-        reset_day.val('')
-      }
-
-
-    });
-
-    carryforward_type.change(function () {
-      (this.value == 'carryforward' || this.value == 'carryforward expire') ? (carryforward_max_label.show(), carryforward_max.show().prop('required', true)) : (carryforward_max_label.hide(), carryforward_max.hide().prop('required', false), carryforward_max.val(''));
-      this.value == 'carryforward expire' ?
-        (carryforward_expire_in_label.show(), carryforward_expire_in.show().prop('required', true), carryforward_expire_period_label.show(), carryforward_expire_period.show().prop('required', true)) :
-        (carryforward_expire_in_label.hide(), carryforward_expire_in.hide().prop('required', false), carryforward_expire_in.val(''), carryforward_expire_period_label.hide(), carryforward_expire_period.hide().prop('required', false), carryforward_expire_period.val(''));
-    })
-
-   
-   
-
-    // leave total days calculation
-    $('#id_period_in, #id_count').change(function () {
-      const month = 30
-      const year = 365
-      const day = 1
-      var totalDays = 0
-      var unit = $('#id_period_in').val();
-      var count = $('#id_count').val();
-
-      if (unit == 'day') {
-        totalDays = day * count
-      } else if (unit == 'month') {
-        totalDays = month * count
-      } else if (unit == 'year') {
-        totalDays = year * count
-      }
-      $('#id_total_days').val(totalDays);
-    });
-   
-  });  
-</script>
-
-{% endblock %}
\ No newline at end of file
diff --git a/leave/templates/leave/leave-type-view.html b/leave/templates/leave/leave-type-view.html
deleted file mode 100644
index 500533d58..000000000
--- a/leave/templates/leave/leave-type-view.html
+++ /dev/null
@@ -1,139 +0,0 @@
-{% extends 'index.html' %}
-{% block content %}
-{% load static %}
-{% load i18n %}
-
-{% if messages %}
-<div class="oh-wrapper">
-  {% for message in messages %}
-  <div class="oh-alert-container">
-    <div class="oh-alert oh-alert--animated {{ message.tags }}">
-      {{ message }}
-    </div>
-  </div>
-  {% endfor %}
-</div>
-{% endif %}
-
-<section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
-  <div class="oh-main__titlebar oh-main__titlebar--left">
-    <h1 class="oh-main__titlebar-title fw-bold mb-0">{% trans "Leave Types" %}</h1>
-    <a class="oh-main__titlebar-search-toggle" role="button" aria-label="Toggle Search"
-      @click="searchShow = !searchShow">
-      <ion-icon name="search-outline" class="oh-main__titlebar-serach-icon"></ion-icon>
-    </a>
-  </div>
-  <div class="oh-main__titlebar oh-main__titlebar--right">
-    <div class="oh-input-group oh-input__search-group" :class="searchShow ? 'oh-input__search-group--show' : ''">
-      <ion-icon name="search-outline" class="oh-input-group__icon oh-input-group__icon--left"></ion-icon>
-      <input type="text" class="oh-input oh-input__icon" aria-label="Search Input" placeholder="{% trans 'Search' %}" name="name"
-        hx-get="{% url 'type-filter' %}" hx-trigger="keyup" hx-target="#leaveTypes" />
-    </div>
-    <div class="oh-main__titlebar-button-container">
-      <div class="oh-dropdown" x-data="{open: false}">
-        <button class="oh-btn ml-2" @click="open = !open">
-          <ion-icon name="filter" class="mr-1"></ion-icon>{% trans "Filter" %}<div id='filterCount'></div>
-        </button>
-        <form hx-get="{% url 'type-filter' %}" hx-target="#leaveTypes" id="filterForm">
-
-          <div class="oh-dropdown__menu oh-dropdown__menu--right oh-dropdown__filter p-4" x-show="open" style="display: none;"
-            @click.outside="open = false">
-            <div class="oh-dropdown__filter-body">
-              <div class="oh-accordion">
-                <div class="oh-accordion-header">{% trans "Leave Type" %}</div>
-                <div class="oh-accordion-body">
-                  <div class="row">
-                    <div class="col-sm-12 col-md-12 col-lg-6">
-                      <div class="oh-input-group">
-                        <label class="oh-label">{% trans "Name" %}</label>
-                        {{form.name}}
-                      </div>
-
-                    </div>
-                    <div class="col-sm-12 col-md-12 col-lg-6">
-                      <div class="oh-input-group">
-                        <label class="oh-label">{% trans "Payment Method" %}</label>
-                        {{form.payment}}
-                      </div>
-
-                    </div>
-                  </div>
-                </div>
-              </div>
-
-
-            </div>
-            <div class="oh-dropdown__filter-footer">
-              <button class="oh-btn oh-btn--secondary oh-btn--small w-100 filterButton" type="submit">{% trans "Filter" %}</button>
-            </div>
-          </div>
-        </form>
-      </div>
-      <div class="oh-btn-group ml-2">
-        <form action="{% url 'type-creation' %}">
-          <button class="oh-btn oh-btn--secondary oh-btn--shadow">
-            <ion-icon name="add-outline" class="me-1"></ion-icon>
-            {% trans "Create" %}
-          </button>
-        </form>
-
-      </div>
-    </div>
-  </div>
-</section>
-
-<div class="oh-wrapper" id="leaveTypes">
-  {% include 'leave/leave_type/leave_types.html' %}
-</div>
-
-
-<!-- Time-Off -->
-<div class="oh-modal" id="editModal" role="dialog" aria-labelledby="editDialogModal" aria-hidden="true">
-  <div class="oh-modal__dialog oh-modal__dialog--timeoff">
-    <div class="oh-modal__dialog-header">
-      <span class="oh-modal__dialog-title" id="editDialogDialog">{% trans "Assign Leave" %}</span>
-      <button class="oh-modal__close" aria-label="Close">
-        <ion-icon name="close-outline"></ion-icon>
-      </button>
-    </div>
-    <div id="leaveForm">
-
-    </div>
-
-
-  </div>
-</div>
-</div>
-
-<script>
-  $(document).on('htmx:afterSwap', function () {
-    // Create a new script element
-    var scriptElement = document.createElement("script");
-    // Set the source URL of the script file to be loaded
-    scriptElement.src = "{% static 'build/js/web.frontend.min.js' %}";
-    // Append the script element to the head of the HTML document
-    document.head.appendChild(scriptElement);
-  });
-
-  $(document).on('htmx:load', '#leaveForm', function () {
-    {% include 'select2.js' %}
-    $('#id_employee_id').select2();
-  });
-
-  $('#delete-link').on('click', function(event) {
-    event.preventDefault(); // prevent the default behavior of the link
-    
-    const link = $(this);
-    const confirmation = confirm('{% trans "Are you sure you want to delete?" %}');
-    
-    if (confirmation) {
-      window.location.href = link.attr('href'); // execute the href if confirmed
-    }
-  });
-
-</script>
-
-<script src="{% static '/base/filter.js' %}"></script>
-
-
-{% endblock %}
\ No newline at end of file
diff --git a/leave/templates/leave/leave_assign_view.html b/leave/templates/leave/leave_assign_view.html
deleted file mode 100644
index 656af3baa..000000000
--- a/leave/templates/leave/leave_assign_view.html
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends 'index.html' %} {% load i18n %} {% block content %}
-<p class="pb-3">
-  <a href="{% url 'assign' %}" class="btn btn-primary">{% trans "Assign" %}</a> {% trans "New Leave Type" %}
-</p>
-
-<table class="table table-striped">
-  <thead>
-    <tr>
-      <th scope="col">{% trans "Employee" %}</th>
-      <th scope="col">{% trans "Type" %}</th>
-      <th scope="col">{% trans "Available leave Days" %}</th>
-      <th scope="col">{% trans "Carryforward Leave days" %}</th>
-      <th scope="col">{% trans "Total Leave Days" %}</th>
-    </tr>
-  </thead>
-  <tbody>
-    {% for leave_assign in data %}
-    <tr>
-
-      <td>{{leave_assign.employee_id}}</td>
-      <td>
-        {% if leave_assign.leave_type_id is not None %}
-        {{leave_assign.leave_type_id}}
-        {% else %}
-        {{leave_assign.accrual_plan_id}}
-        {% endif %}
-      </td>
-      <td>{{leave_assign.available_days}}</td>
-      <td>{{leave_assign.carryforward_days}}</td>
-      <td>{{leave_assign.total_leave_days}}</td>
-       
-      <td>
-        <a href="{% url 'available-leave-update' leave_assign.id  %}" class="btn btn-warning">{% trans "Edit" %}</a>
-      </td>
-      <td>
-        <a href="{% url 'assign-delete' leave_assign.id %}" class="btn btn-danger">{% trans "Delete" %}</a>
-      </td>
-
-      {% endfor %}
-  </tbody>
-</table>
-
-{% endblock %}
\ No newline at end of file
diff --git a/leave/templates/leave/one-request-view.html b/leave/templates/leave/one-request-view.html
deleted file mode 100644
index d779576c5..000000000
--- a/leave/templates/leave/one-request-view.html
+++ /dev/null
@@ -1,93 +0,0 @@
-{% load i18n %}
-<div class="oh-modal__dialog-body oh-timeoff-modal__body  pb-2">
-    <div class="oh-timeoff-modal__profile-content">
-        <div class="oh-profile">
-            <div class="oh-profile__avatar mr-1">
-                {% if leave_request.employee_id.employee_profile %}
-                <img src="{{leave_request.employee_id.employee_profile.url}}" class="oh-profile__image"
-                    alt="" />
-                {% else %}
-                <img src="https://ui-avatars.com/api/?name={{leave_request.employee_id}}&background=random"
-                    class="oh-profile__image" alt="" />
-                {% endif %}
-            </div>
-        </div>
-        <div class="oh-timeoff-modal__profile-info">
-            <span class="oh-timeoff-modal__user fw-bold">{{leave_request.employee_id}}</span>
-            <span class="oh-timeoff-modal__position">{{leave_request.employee_id.recruitment_id.job_position_id}}</span>
-        </div>
-    </div>
-
-    <div class="oh-timeoff-modal__stats-container">
-        <div class="oh-timeoff-modal__stat">
-            <span class="oh-timeoff-modal__stat-title">{% trans "Start Date" %}</span>
-            <span class="oh-timeoff-modal__stat-count">{{leave_request.start_date}}</span>
-        </div>
-        <div class="oh-timeoff-modal__stat">
-            <span class="oh-timeoff-modal__stat-title">{% trans "End Date" %}</span>
-            <span class="oh-timeoff-modal__stat-count">{{leave_request.end_date}}</span>
-        </div>
-    </div>
-
-    <div class="oh-timeoff-modal__stats-container mt-3">
-        <div class="oh-timeoff-modal__stat">
-            <span class="oh-timeoff-modal__stat-title">{% trans "Days" %}</span>
-            <span class="oh-timeoff-modal__stat-count">{{leave_request.requested_days}}</span>
-        </div>
-        <div class="oh-timeoff-modal__stat">
-            <span class="oh-timeoff-modal__stat-title">{% trans "Leave Type" %}</span>
-            <span class="oh-timeoff-modal__stat-count">{{leave_request.leave_type_id}}</span>
-        </div>
-    </div>
-    <div class="oh-timeoff-modal__stats-container mt-3">
-        <div class="oh-timeoff-modal__stat">
-            <span class="oh-timeoff-modal__stat-title">{% trans "Created Date" %}</span>
-            <span class="oh-timeoff-modal__stat-count">{{leave_request.requested_date}}</span>
-        </div>
-        <div class="oh-timeoff-modal__stat">
-            <span class="oh-timeoff-modal__stat-title">{% trans "Created By" %}</span>
-            <span class="oh-timeoff-modal__stat-count">{{leave_request.created_by}}</span>
-        </div>
-    </div>
-
-    <div class="oh-timeoff-modal__stats w-100 mt-3">
-        <div class="oh-timeoff-modal__stat">
-            <span class="oh-timeoff-modal__stat-title">{% trans "Description" %}</span>
-            <div class="oh-timeoff-modal__stat-description">{{leave_request.description}}</div>
-        </div>
-    </div>
-    {% if leave_request.attachment %}
-    <a href="{{leave_request.attachment.url}}" target="_blank" class="oh-timeoff-modal__download-link">
-        <ion-icon class="me-1" name="download-outline"></ion-icon>
-        <span class="oh-timeoff-modal__download-link-text"></span>
-        {% trans "View attachment" %}
-    </a>
-    {% endif %}
-</div>
-
-<div class="oh-modal__dialog-footer oh-timeoff-modal__footer">
-    {% if leave_request.status != 'approved'%}
-    <a href="{% url 'request-approve' leave_request.id %}" class="oh-btn oh-btn--success">
-        <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
-        {% trans "Approve" %}
-    </a>
-    {% else %}
-    <a href="{% url 'request-approve' leave_request.id %}" class="oh-btn oh-btn--success oh-btn--disabled"
-        onclick="event.preventDefault()">
-        <ion-icon class="me-1" name="checkmark-outline"></ion-icon>
-        {% trans "Approve" %}
-    </a>
-    {% endif %}
-    {% if leave_request.status != 'cancelled' %}
-    <a href="{% url 'request-cancel' leave_request.id %}" class="oh-btn oh-btn--danger">
-        <ion-icon class="me-1" name="close-circle-outline"></ion-icon>
-        {% trans "Cancel" %}
-    </a>
-    {% else %}
-    <a href="{% url 'request-cancel' leave_request.id %}" class="oh-btn oh-btn--danger oh-btn--disabled
-    " onclick="event.preventDefault()">
-        <ion-icon class="me-1" name="close-circle-outline"></ion-icon>
-        {% trans "Cancel" %}
-    </a>
-    {% endif %}
-</div>
\ No newline at end of file
diff --git a/leave/templates/leave/request-update-form.html b/leave/templates/leave/request-update-form.html
deleted file mode 100644
index 9ea5f2dd1..000000000
--- a/leave/templates/leave/request-update-form.html
+++ /dev/null
@@ -1,69 +0,0 @@
-{% load i18n %}
-{% if form.errors %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-
-
-<form  hx-post="{% url 'request-update' id %}"  hx-encoding="multipart/form-data">
-    {% csrf_token %}
-    <div class="oh-modal__dialog-body pb-2" id="updateLeaveType">
-        <label class="oh-label d-block">{% trans "Leave Types" %}</label>
-        {{form.leave_type_id}}
-        {{form.leave_type_id.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2" id="updateEmployee">
-        <label class="oh-label d-block">{% trans "Employees" %}</label>
-        {{form.employee_id}}
-        {{form.employee_id.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Start Date" %}</label>
-        {{form.start_date}}
-        {{form.start_date.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2" id="updateStartDate">
-        <label class="oh-label d-block">{% trans "Start Date Breakdown" %}</label>
-        {{form.start_date_breakdown}}
-        {{form.start_date_breakdown.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "End Date" %}</label>
-        {{form.end_date}}
-        {{form.end_date.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2" id="updateEndDate">
-        <label class="oh-label d-block">{% trans "End Date Breakdown" %}</label>
-        {{form.end_date_breakdown}}
-        {{form.end_date_breakdown.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Description" %}</label>
-        {{form.description}}
-        {{form.description.errors}}
-
-      </div>
-      <div class="oh-modal__dialog-body pb-2">
-        <label class="oh-label d-block">{% trans "Attachment" %}</label>
-        {{form.attachment}}
-        {{form.attachment.errors}}
-      </div>
-      <div class="oh-modal__dialog-body pb-2" id="updateStatus">
-        <label class="oh-label d-block">{% trans "Status" %}</label>
-        {{form.status}}
-        {{form.status.errors}}
-      </div>
-      <div class="oh-modal__dialog-footer">
-        <button type="submit" class="oh-btn oh-btn--secondary w-100">
-          {% trans "Apply" %}
-        </button>
- </form>
\ No newline at end of file
diff --git a/leave/templates/leave/request-view.html b/leave/templates/leave/request-view.html
deleted file mode 100644
index 070240515..000000000
--- a/leave/templates/leave/request-view.html
+++ /dev/null
@@ -1,225 +0,0 @@
-{% extends 'index.html' %}
-{% block content %}
-{% load static %}
-{% load i18n %}
-{% if messages %}
-<div class="oh-wrapper">
-    {% for message in messages %}
-    <div class="oh-alert-container">
-        <div class="oh-alert oh-alert--animated {{ message.tags }}">
-            {{ message }}
-        </div>
-    </div>
-    {% endfor %}
-</div>
-{% endif %}
-
-<section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
-    <div class="oh-main__titlebar oh-main__titlebar--left">
-        <h1 class="oh-main__titlebar-title fw-bold">{% trans "Leave Requests" %}</h1>
-        <a class="oh-main__titlebar-search-toggle" role="button" aria-label="Toggle Search"
-            @click="searchShow = !searchShow">
-            <ion-icon name="search-outline" class="oh-main__titlebar-serach-icon"></ion-icon>
-        </a>
-    </div>
-    <div class="oh-main__titlebar oh-main__titlebar--right">
-        <div class="oh-input-group oh-input__search-group" :class="searchShow ? 'oh-input__search-group--show' : ''">
-            <ion-icon name="search-outline" class="oh-input-group__icon oh-input-group__icon--left"></ion-icon>
-            <input type="text" class="oh-input oh-input__icon" aria-label="Search Input" placeholder="{% trans 'Search' %}"
-                name="employee_id" hx-get="{% url 'request-filter' %}" hx-trigger="keyup" hx-target="#leaveRequest" />
-        </div>
-        <div class="oh-main__titlebar-button-container">
-            <div class="oh-dropdown" x-data="{open: false}">
-                <button class="oh-btn ml-2" @click="open = !open">
-                    <ion-icon name="filter" class="mr-1"></ion-icon>{% trans "Filter" %}<div id="filterCount"></div>
-                </button>
-                <form method="post" hx-get="{% url 'request-filter' %}" hx-target="#leaveRequest" id="filterForm">
-                    {% csrf_token %}
-                    <div class="oh-dropdown__menu oh-dropdown__menu--right oh-dropdown__filter p-4" x-show="open"
-                        style="display: none;" @click.outside="open = false">
-                        <div class="oh-dropdown__filter-body">
-                            <div class="oh-accordion">
-                                <div class="oh-accordion-header" onclick="event.stopImmediatePropagation();$(this).parent().toggleClass('oh-accordion--show');">{% trans "Leave Request" %}</div>
-                                <div class="oh-accordion-body">
-                                    <div class="row">
-                                        <div class="col-sm-12 col-md-12 col-lg-12">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "Leave Type" %}</label>
-                                                {{form.leave_type_id}}
-                                            </div>
-                                        </div>
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "Start Date" %}</label>
-                                                {{form.start_date}}
-                                            </div>
-                                        </div>
-
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "End Date" %}</label>
-                                                {{form.end_date}}
-                                            </div>
-                                        </div>
-                                        <div class="col-sm-12 col-md-12">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "Status" %}</label>
-                                                {{form.status}}
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="oh-accordion" >
-                                <div class="oh-accordion-header" onclick="event.stopImmediatePropagation();$(this).parent().toggleClass('oh-accordion--show');">{% trans "Advanced" %}</div>
-                                <div class="oh-accordion-body">
-                                    <div class="row">
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "From Date" %}</label>
-                                                {{form.from_date}}
-                                            </div>
-                                        </div>
-
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "To Date" %}</label>
-                                                {{form.to_date}}
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-                        <div class="oh-dropdown__filter-footer">
-                            <button class="oh-btn oh-btn--secondary oh-btn--small w-100 filterButton" type="submit">{% trans "Filter" %}</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-            <div class="oh-btn-group ml-2">
-                <div class="oh-dropdown" x-data="{open: false}">
-                    <button class="oh-btn  oh-btn--secondary oh-btn--shadow" data-toggle="oh-modal-toggle"
-                        data-target="#editModal1" hx-get="{% url 'request-creation' %}" hx-target="#requestForm">
-                        <ion-icon name="add-outline" class="me-1"></ion-icon>
-                        {% trans "Create" %}
-                    </button>
-
-                </div>
-            </div>
-        </div>
-    </div>
-</section>
-
-<div class="oh-wrapper" id="leaveRequest">
-    {% include 'leave/leave_request/leave-requests.html' %}
-    <!-- Sticky Table -->
-</div>
-
-<!-- Create request -->
-<div class="oh-modal" id="editModal1" role="dialog" aria-labelledby="editDialogModal" aria-hidden="true">
-    <div class="oh-modal__dialog oh-modal__dialog--timeoff">
-        <div class="oh-modal__dialog-header">
-            <span class="oh-modal__dialog-title" id="editDialogDialog">{% trans "Create Request" %}</span>
-            <button class="oh-modal__close" aria-label="Close">
-                <ion-icon name="close-outline"></ion-icon>
-            </button>
-
-        </div>
-        <div id="requestForm">
-
-        </div>
-    </div>
-</div>
-
-<!-- update request -->
-<div class="oh-modal" id="editModal2" role="dialog" aria-labelledby="editDialogModal" aria-hidden="true">
-    <div class="oh-modal__dialog oh-modal__dialog--timeoff">
-        <div class="oh-modal__dialog-header">
-            <span class="oh-modal__dialog-title" id="editDialogDialog">{% trans "Update Request" %}</span>
-            <button class="oh-modal__close" aria-label="Close">
-                <ion-icon name="close-outline"></ion-icon>
-            </button>
-        </div>
-        <div id="updateForm">
-
-        </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="requestView">
-
-        </div>
-        
-    </div>
-</div>
-
-
-
-<script>
-    $(document).on('htmx:afterSwap', function () {
-        // Create a new script element
-        var scriptElement = document.createElement("script");
-        // Set the source URL of the script file to be loaded
-        scriptElement.src = "{% static 'build/js/web.frontend.min.js' %}";
-        // Append the script element to the head of the HTML document
-        document.head.appendChild(scriptElement);
-    });
-
-    $(document).on('htmx:load', '#requestForm', function () {
-        {% include 'select2.js' %}
-        $('#leaveType #id_leave_type_id').select2();
-        $('#employee #id_employee_id').select2();
-        $('#startDate #id_start_date_breakdown').select2();
-        $('#endDate #id_end_date_breakdown').select2();
-    });
-    $(document).on('htmx:load', '#updateForm', function () {
-        {% include 'select2.js' %}
-        $('#updateLeaveType #id_leave_type_id').select2();
-        $('#updateEmployee #id_employee_id').select2();
-        $('#updateStartDate #id_start_date_breakdown').select2();
-        $('#updateEndDate #id_end_date_breakdown').select2();
-        $('#updateStatus #id_status').select2();
-    });
-
-    $('#delete-link').on('click', function (event) {
-        event.preventDefault(); // prevent the default behavior of the link
-
-        const link = $(this);
-        const confirmation = confirm('{% trans "Are you sure you want to delete?" %}');
-
-        if (confirmation) {
-            window.location.href = link.attr('href'); // execute the href if confirmed
-        }
-    });
-
-    $("#filterForm").submit(function (e) {
-        var formData = $(this).serialize();
-        count = 0;
-        formData.split("&").forEach(function (field) {
-            parts = field.split("=");
-            value = parts[1];
-            if (value !='' && parts[0] !== "csrfmiddlewaretoken") {
-                count++;
-            }
-        });
-        $("#filterCount").empty();
-        if (count > 0) {
-            $("#filterCount").text("(" + count + ")");
-        }
-      });
-    
-</script>
-{% endblock %}
\ No newline at end of file
diff --git a/leave/templates/leave/today-leave-empty.html b/leave/templates/leave/today-leave-empty.html
deleted file mode 100644
index ec35a000f..000000000
--- a/leave/templates/leave/today-leave-empty.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{% load static %}
-{% load i18n %}
-  
-    <div class="oh-wrapper">
-      <div style="height: 380px; display:flex;align-items: center;justify-content: center;" class="">
-        <div style="" class="">
-          <img style="    display: block;width: 70px;margin: 10px auto ;" src="{% static 'images/ui/leave_types.png' %}" class="" alt="Page not found. 404."/>
-          <h3 style="font-size:16px" class="oh-404__subtitle">{% trans "Today, all employees are present." %}</h3>
-          {% comment %} <p class="oh-404__subtitle">{% trans "Please contact your administrators for assistance" %}</p> {% endcomment %}
-        </div>
-      </div>
-    </div>
\ No newline at end of file
diff --git a/leave/templates/leave/user-leave-empty-view.html b/leave/templates/leave/user-leave-empty-view.html
deleted file mode 100644
index 86cdc132a..000000000
--- a/leave/templates/leave/user-leave-empty-view.html
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends 'index.html' %}{% block content %}
-{% load i18n %}
-{% load static %}
-
-    <div
-      class="oh-wrapper-main"
-    >
-        <main :class="sidebarOpen ? 'oh-main__sidebar-visible' : ''">
-          
-          <div class="oh-wrapper">
-            <div class="oh-404">
-                <img style="    width: 150px;height: 150px;" src="{% static 'images/ui/leave_types.png' %}" class="oh-404__image mb-4" alt="Page not found. 404."/>
-                <h3 class="oh-404__subtitle">{% trans "Leave types not assigned to you." %}</h3>
-                <p class="oh-404__subtitle">{% trans "Please contact your administrators for assistance." %}</p>
-            </div>
-          </div>
-        </main>
-      </div>
-    </div>
-    {% endblock  %}
\ No newline at end of file
diff --git a/leave/templates/leave/user-leave-type-empty-view.html b/leave/templates/leave/user-leave-type-empty-view.html
deleted file mode 100644
index 58e98ab44..000000000
--- a/leave/templates/leave/user-leave-type-empty-view.html
+++ /dev/null
@@ -1,57 +0,0 @@
-{% extends 'index.html' %}
-{% block content %}
-{% load static %}
-{% load i18n %}
-
-{% if messages %}
-<div class="oh-wrapper">
-  {% for message in messages %}
-  <div class="oh-alert-container">
-    <div class="oh-alert oh-alert--animated {{ message.tags }}">
-      {{ message }}
-    </div>
-  </div>
-  {% endfor %}
-</div>
-{% endif %}
-
-<section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
-  <div class="oh-main__titlebar oh-main__titlebar--left">
-    <h1 class="oh-main__titlebar-title fw-bold mb-0">{% trans "Leave Types" %}</h1>
-    <a class="oh-main__titlebar-search-toggle" role="button" aria-label="Toggle Search"
-      @click="searchShow = !searchShow">
-      <ion-icon name="search-outline" class="oh-main__titlebar-serach-icon"></ion-icon>
-    </a>
-  </div>
-  <div class="oh-main__titlebar oh-main__titlebar--right">
-    <div class="oh-main__titlebar-button-container">
-      <div class="oh-btn-group ml-2">
-        <form action="{% url 'type-creation' %}">
-          <button class="oh-btn oh-btn--secondary oh-btn--shadow">
-            <ion-icon name="add-outline" class="me-1"></ion-icon>
-            {% trans "Create" %}
-          </button>
-        </form>
-
-      </div>
-    </div>
-  </div>
-</section>
-
-<div
-class="oh-wrapper-main"
->
-  <main :class="sidebarOpen ? 'oh-main__sidebar-visible' : ''">
-    
-    <div class="oh-wrapper">
-      <div class="oh-404">
-          <img style="    width: 150px;height: 150px;" src="{% static 'images/ui/leave_types.png' %}" class="oh-404__image mb-4" alt="Page not found. 404."/>
-          <h3 class="oh-404__subtitle">{% trans "No leave types have been created yet." %}</h3>
-          <p class="oh-404__subtitle">{% trans "Please contact your administrators for assistance." %}</p>
-      </div>
-    </div>
-  </main>
-</div>
-</div>
-
-{% endblock content %}
\ No newline at end of file
diff --git a/leave/templates/leave/user-leave-view.html b/leave/templates/leave/user-leave-view.html
deleted file mode 100644
index 7c54ae007..000000000
--- a/leave/templates/leave/user-leave-view.html
+++ /dev/null
@@ -1,101 +0,0 @@
-{% extends 'index.html' %}
-{% block content %}
-{% load static %}
-{% load i18n %}
-<section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
-    <div class="oh-main__titlebar oh-main__titlebar--left">
-        <h1 class="oh-main__titlebar-title fw-bold">{% trans "My Leave" %}</h1>
-        <a class="oh-main__titlebar-search-toggle" role="button" aria-label="Toggle Search"
-            @click="searchShow = !searchShow">
-            <ion-icon name="search-outline" class="oh-main__titlebar-serach-icon"></ion-icon>
-        </a>
-    </div>
-    <div class="oh-main__titlebar oh-main__titlebar--right">
-        <div class="oh-input-group oh-input__search-group" :class="searchShow ? 'oh-input__search-group--show' : ''">
-            <ion-icon name="search-outline" class="oh-input-group__icon oh-input-group__icon--left"></ion-icon>
-            <input type="text" class="oh-input oh-input__icon" aria-label="Search Input" placeholder="{% trans 'Search' %}"
-                name="leave_type" hx-get="{% url 'user-leave-filter' %}" hx-trigger="keyup" hx-target="#userLeaves" />
-        </div>
-        <div class="oh-main__titlebar-button-container">
-            <div class="oh-dropdown" x-data="{open: false}">
-                <button class="oh-btn ml-2" @click="open = !open">
-                    <ion-icon name="filter" class="mr-1"></ion-icon>{% trans "Filter" %}<div id='filterCount'></div>
-                </button>
-                <form hx-get="{% url 'user-leave-filter' %}" hx-target="#userLeaves" id="filterForm">
-                    <div class="oh-dropdown__menu oh-dropdown__menu--right oh-dropdown__filter p-4" x-show="open" style="display: none;"
-                        @click.outside="open = false">
-                        <div class="oh-dropdown__filter-body">
-                            <div class="oh-accordion">
-                                <div class="oh-accordion-header">{% trans "User Leave" %}</div>
-                                <div class="oh-accordion-body">
-                                    <div class="row">
-                                        <div class="col-sm-12 col-md-12">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "Leave Type" %}</label>
-                                                {{form.leave_type_id}}
-                                            </div>
-
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-
-                        </div>
-                        <div class="oh-dropdown__filter-footer">
-                            <button class="oh-btn oh-btn--secondary oh-btn--small w-100 filterButton" type="submit">{% trans "Filter" %}</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-
-        </div>
-    </div>
-</section>
-
-<div class="oh-wrapper" id="userLeaves">
-    {% include 'leave/user_leave/user-leave.html' %}
-</div>
-
-
-<!-- Time-Off -->
-<div class="oh-modal" id="editDialog" role="dialog" aria-labelledby="editDialogModal" aria-hidden="true">
-    <div class="oh-modal__dialog oh-modal__dialog--timeoff">
-        <div class="oh-modal__dialog-header">
-            <span class="oh-modal__dialog-title" id="editDialogDialog">{% trans "Leave Request" %}</span>
-            <button class="oh-modal__close" aria-label="Close">
-                <ion-icon name="close-outline"></ion-icon>
-            </button>
-        </div>
-        <div id="requestForm">
-
-        </div>
-    </div>
-</div>
-</div>
-<!-- End of Time-Off -->
-
-<script>
-    $(document).on('htmx:load','#userLeaves', function () {
-        // Create a new script element
-        var scriptElement = document.createElement("script");
-        // Set the source URL of the script file to be loaded
-        scriptElement.src = "{% static 'build/js/web.frontend.min.js' %}";
-        // Append the script element to the head of the HTML document
-        document.head.appendChild(scriptElement);
-    });
-
-    $(document).on('htmx:load', '#requestForm', function () {
-        {% include 'select2.js' %}
-        $('#leaveType #id_leave_type_id').select2();
-        $('#employee #id_employee_id').select2();
-        $('#startDate #id_start_date_breakdown').select2();
-        $('#endDate #id_end_date_breakdown').select2();
-    });
-
-</script>
-
-<script src="{% static '/base/filter.js' %}"></script>
-
-
-{% endblock %}
\ No newline at end of file
diff --git a/leave/templates/leave/user-request-form.html b/leave/templates/leave/user-request-form.html
deleted file mode 100644
index e6619e0d9..000000000
--- a/leave/templates/leave/user-request-form.html
+++ /dev/null
@@ -1,44 +0,0 @@
-{% load i18n %} {% if form.errors %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-  <div class="oh-alert-container">
-    {% for error in form.non_field_errors %}
-    <div class="oh-alert oh-alert--animated oh-alert--danger">{{ error }}</div>
-    {% endfor %}
-  </div>
-</div>
-{% endif %}
-
-<form hx-post="{% url 'user-request' id %}" hx-encoding="multipart/form-data">
-  <div class="oh-modal__dialog-body pb-2">
-    <label class="oh-label d-block">{% trans "Start Date" %}</label>
-    {{form.start_date}} {{form.start_date.errors}}
-  </div>
-  <div class="oh-modal__dialog-body pb-2" id="startDate">
-    <label class="oh-label d-block">{% trans "Start Date Breakdown" %}</label>
-    {{form.start_date_breakdown}}
-  </div>
-  <div class="oh-modal__dialog-body pb-2">
-    <label class="oh-label d-block">{% trans "End Date" %}</label>
-    {{form.end_date}} {{form.end_date.errors}}
-  </div>
-  <div class="oh-modal__dialog-body pb-2" id="endDate">
-    <label class="oh-label d-block">{% trans "End Date Breakdown" %}</label>
-    {{form.end_date_breakdown}}
-  </div>
-  <div class="oh-modal__dialog-body pb-2">
-    <label class="oh-label d-block">{% trans "Description" %}</label>
-    {{form.description}}
-  </div>
-  {% if leave_type.require_attachment == "yes" %}
-  <div class="oh-modal__dialog-body pb-2">
-    <label class="oh-label d-block">{% trans "Attachment" %}</label>
-    {{form.attachment}} {{form.attachment.errors}}
-  </div>
-  {% endif %}
-  <div class="oh-modal__dialog-footer">
-    <button type="submit" class="oh-btn oh-btn--secondary w-100">
-      {% trans "Apply" %}
-    </button>
-  </div>
-</form>
diff --git a/leave/templates/leave/user-request-one.html b/leave/templates/leave/user-request-one.html
deleted file mode 100644
index f87a1422a..000000000
--- a/leave/templates/leave/user-request-one.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% load i18n %}
-<div class="oh-modal__dialog-body oh-timeoff-modal__body  pb-2">
-    <div class="oh-timeoff-modal__profile-content">
-        <div class="oh-profile">
-            <div class="oh-profile__avatar mr-1">
-                {% if leave_request.leave_type_id.icon %}
-                <img src="{{leave_request.leave_type_id.icon.url}}" class="oh-profile__image"
-                    alt="{{leave_request.leave_type_id}}" />
-                {% else %}
-                <img src="https://ui-avatars.com/api/?name={{leave_request.employee_id}}&background=random"
-                    class="oh-profile__image" alt="Mary Magdalene" />
-                {% endif %}
-            </div>
-        </div>
-        <div class="oh-timeoff-modal__profile-info">
-            <span class="oh-timeoff-modal__user fw-bold">{{leave_request.leave_type_id}}</span>
-        </div>
-    </div>
-
-    <div class="oh-timeoff-modal__stats-container">
-        <div class="oh-timeoff-modal__stat">
-            <span class="oh-timeoff-modal__stat-title">{% trans "Start Date" %}</span>
-            <span class="oh-timeoff-modal__stat-count">{{leave_request.start_date}}</span>
-        </div>
-        <div class="oh-timeoff-modal__stat">
-            <span class="oh-timeoff-modal__stat-title">{% trans "End Date" %}</span>
-            <span class="oh-timeoff-modal__stat-count">{{leave_request.end_date}}</span>
-        </div>
-    </div>
-
-    <div class="oh-timeoff-modal__stats-container mt-3">
-        <div class="oh-timeoff-modal__stat">
-            <span class="oh-timeoff-modal__stat-title">{% trans "Days" %}</span>
-            <span class="oh-timeoff-modal__stat-count">{{leave_request.requested_days}}</span>
-        </div>
-       
-    </div>
-
-    <div class="oh-timeoff-modal__stats w-100 mt-3">
-        <div class="oh-timeoff-modal__stat">
-            <span class="oh-timeoff-modal__stat-title">{% trans "Description" %}</span>
-            <div class="oh-timeoff-modal__stat-description">{{leave_request.description}}</div>
-        </div>
-    </div>
-    {% if leave_request.attachment %}
-    <a href="{{leave_request.attachment.url}}" target="_blank" class="oh-timeoff-modal__download-link">
-        <ion-icon class="me-1" name="download-outline"></ion-icon>
-        <span class="oh-timeoff-modal__download-link-text"></span>
-        {% trans "View attachment" %}
-    </a>
-    {% endif %}
- 
-</div>
\ No newline at end of file
diff --git a/leave/templates/leave/user-request-update.html b/leave/templates/leave/user-request-update.html
deleted file mode 100644
index 3018120fe..000000000
--- a/leave/templates/leave/user-request-update.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% load i18n %}
-{% if form.errors %}
-<!-- form errors  -->
-<div class="oh-wrapper">
-    <div class="oh-alert-container">
-
-        {% for error in form.non_field_errors %}
-        <div class="oh-alert oh-alert--animated oh-alert--danger">
-            {{ error }}
-        </div>
-        {% endfor %}
-    </div>
-</div>
-{% endif %}
-
-<form  hx-post="{% url 'user-request-update' id %}" hx-encoding='multipart/form-data'>
-    <div class="oh-modal__dialog-body pb-2">
-      <label class="oh-label d-block">{% trans "Start Date" %}</label>
-      {{form.start_date}}
-      {{form.start_date.errors}}
-    </div>
-    <div class="oh-modal__dialog-body pb-2" id="startDate">
-      <label class="oh-label d-block">{% trans "Start Date Breakdown" %}</label>       
-      {{form.start_date_breakdown}}
-      {{form.start_date_breakdown.errors}}
-    </div>
-    <div class="oh-modal__dialog-body pb-2">
-      <label class="oh-label d-block">{% trans "End Date" %}</label>
-      {{form.end_date}}
-      {{form.end_date.errors}}
-    </div>
-    <div class="oh-modal__dialog-body pb-2" id="endDate">  
-      <label class="oh-label d-block">{% trans "End Date Breakdown" %}</label>
-      {{form.end_date_breakdown}}
-      {{form.end_date_breakdown.errors}}
-    </div>
-    <div class="oh-modal__dialog-body pb-2">
-      <label class="oh-label d-block">{% trans "Description" %}</label>
-      {{form.description}}
-      {{form.description.errors}}
-    </div>
-    <div class="oh-modal__dialog-body pb-2">
-      <label class="oh-label d-block">{% trans "Attachment" %}</label>
-      {{form.attachment}}
-      {{form.attachment.errors}}
-    </div>
-    <div class="oh-modal__dialog-footer">
-      <button type="submit" class="oh-btn oh-btn--secondary w-100">
-        {% trans "Apply" %}
-      </button>
-
-    </div>
-</form>
\ No newline at end of file
diff --git a/leave/templates/leave/user-request-view.html b/leave/templates/leave/user-request-view.html
deleted file mode 100644
index b6e40e3d9..000000000
--- a/leave/templates/leave/user-request-view.html
+++ /dev/null
@@ -1,183 +0,0 @@
-{% extends 'index.html' %}
-{% block content %}
-{% load static %}
-{% load i18n %}
-{% if messages %}
-<div class="oh-wrapper">
-    {% for message in messages %}
-    <div class="oh-alert-container">
-        <div class="oh-alert oh-alert--animated {{ message.tags }}">
-            {{ message }}
-        </div>
-    </div>
-    {% endfor %}
-</div>
-{% endif %}
-
-<section class="oh-wrapper oh-main__topbar" x-data="{searchShow: false}">
-    <div class="oh-main__titlebar oh-main__titlebar--left">
-        <h1 class="oh-main__titlebar-title fw-bold">{% trans "My Leave Requests" %}</h1>
-        <a class="oh-main__titlebar-search-toggle" role="button" aria-label="Toggle Search"
-            @click="searchShow = !searchShow">
-            <ion-icon name="search-outline" class="oh-main__titlebar-serach-icon"></ion-icon>
-        </a>
-    </div>
-    <div class="oh-main__titlebar oh-main__titlebar--right">
-        <div class="oh-input-group oh-input__search-group" :class="searchShow ? 'oh-input__search-group--show' : ''">
-            <ion-icon name="search-outline" class="oh-input-group__icon oh-input-group__icon--left"></ion-icon>
-            <input type="text" class="oh-input oh-input__icon" aria-label="Search Input" placeholder="{% trans 'Search' %}"
-                name="leave_type" hx-get="{% url 'user-request-filter' %}" hx-trigger="keyup"
-                hx-target="#userRequest" />
-        </div>
-        <div class="oh-main__titlebar-button-container">
-            <div class="oh-dropdown" x-data="{open: false}">
-                <button class="oh-btn ml-2" @click="open = !open">
-                    <ion-icon name="filter" class="mr-1"></ion-icon>{% trans "Filter" %}<div id='filterCount'><div>
-                </button>
-                <form method="post" hx-get="{% url 'user-request-filter' %}" hx-target="#userRequest" id='filterForm'>
-                    <div class="oh-dropdown__menu oh-dropdown__menu--right oh-dropdown__filter p-4" x-show="open"
-                        style="display: none;" @click.outside="open = false">
-                        <div class="oh-dropdown__filter-body">
-                            <div class="oh-accordion" >
-                                <div class="oh-accordion-header" onclick="event.stopImmediatePropagation();$(this).parent().toggleClass('oh-accordion--show');">{% trans "Leave Request" %}</div>
-                                <div class="oh-accordion-body" >
-                                    <div class="row" >
-                                        <div class="col-sm-12 col-md-12 col-lg-12">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "Leave Type" %}</label>
-                                                {{form.leave_type_id}}
-                                            </div>
-                                        </div>
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "Start Date" %}</label>
-                                                {{form.start_date}}
-                                            </div>
-                                        </div>
-
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "End Date" %}</label>
-                                                {{form.end_date}}
-                                            </div>
-                                        </div>
-                                        <div class="col-sm-12 col-md-12">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "Status" %}</label>
-                                                {{form.status}}
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="oh-accordion" >
-                                <div class="oh-accordion-header" onclick="event.stopImmediatePropagation();$(this).parent().toggleClass('oh-accordion--show');">{% trans "Advanced" %}</div>
-                                <div class="oh-accordion-body">
-                                    <div class="row">
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "From Date" %}</label>
-                                                {{form.from_date}}
-                                            </div>
-                                        </div>
-
-                                        <div class="col-sm-12 col-md-12 col-lg-6">
-                                            <div class="oh-input-group">
-                                                <label class="oh-label">{% trans "To Date" %}</label>
-                                                {{form.to_date}}
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-
-                        </div>
-                        <div class="oh-dropdown__filter-footer">
-                            <button class="oh-btn oh-btn--secondary oh-btn--small w-100 filterButton" type="submit">{% trans "Filter" %}</button>
-                        </div>
-                    </div>
-                </form>
-            </div>
-
-        </div>
-    </div>
-</section>
-
-<div class="oh-wrapper" id="userRequest">
-    {% include 'leave/user-requests.html' %}
-
-</div>
-
-
-
-<div class="oh-modal" id="editModal" role="dialog" aria-labelledby="editDialogModal" aria-hidden="true">
-    <div class="oh-modal__dialog oh-modal__dialog--timeoff">
-        <div class="oh-modal__dialog-header">
-            <span class="oh-modal__dialog-title" id="editDialogDialog">{% trans "Update Request" %}</span>
-            <button class="oh-modal__close" aria-label="Close">
-                <ion-icon name="close-outline"></ion-icon>
-            </button>
-        </div>
-        <div id="updateForm">
-
-        </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>
-
-<script>
-    $(document).on('htmx:load', '#userRequest', function () {
-        // Create a new script element
-        var scriptElement = document.createElement("script");
-        // Set the source URL of the script file to be loaded
-        scriptElement.src = "{% static 'build/js/web.frontend.min.js' %}";
-        // Append the script element to the head of the HTML document
-        document.head.appendChild(scriptElement);
-
-    });
-
-    $(document).on('htmx:load', '#updateForm', function () {
-        {% include 'select2.js' %}
-        $('#startDate #id_start_date_breakdown').select2();
-        $('#endDate #id_end_date_breakdown').select2();
-    });
-    $('#delete-link').on('click', function (event) {
-        event.preventDefault(); // prevent the default behavior of the link
-
-        const link = $(this);
-        const confirmation = confirm('{% trans "Are you sure you want to delete?" %}');
-
-        if (confirmation) {
-            window.location.href = link.attr('href'); // execute the href if confirmed
-        }
-    });
-
-</script>
-
-<script src="{% static '/base/filter.js' %}"></script>
-
-
-<script src="./build/js/web.frontend.min.js"></script>
-
-<script type="module" src="https://unpkg.com/ionicons@5.5.2/dist/ionicons/ionicons.esm.js"></script>
-<script nomodule src="https://unpkg.com/ionicons@5.5.2/dist/ionicons/ionicons.js"></script>
-</body>
-
-</html>
-{% endblock %}
\ No newline at end of file
diff --git a/leave/templates/leave/user-requests.html b/leave/templates/leave/user-requests.html
deleted file mode 100644
index 6fbc30a32..000000000
--- a/leave/templates/leave/user-requests.html
+++ /dev/null
@@ -1,119 +0,0 @@
-{% load i18n %}
-{% if messages %}
-<div class="oh-wrapper">
-    {% for message in messages %}
-    <div class="oh-alert-container">
-        <div class="oh-alert oh-alert--animated {{ message.tags }}">
-        {{ message }}
-        </div>
-    </div>
-    {% endfor %}
-</div>
-{% endif %}
-{% include 'filter_tags.html' %}
-
-<div class="d-flex flex-row-reverse">
-    <span class="m-3" style="cursor:pointer;" hx-get="{% url 'user-request-filter' %}?{{pd}}&status=cancelled" hx-target="#userRequest">
-      <span class="oh-dot oh-dot--small me-1" style="background-color:gray"></span>
-      {% trans "Cancelled" %}
-    </span>
-    <span class="m-3" style="cursor:pointer;" hx-get="{% url 'user-request-filter' %}?{{pd}}&status=requested" hx-target="#userRequest">
-      <span class="oh-dot oh-dot--small me-1" style="background-color:orange;"></span>
-      {% trans "Requested" %}
-    </span>
-    <span class="m-3" style="cursor:pointer;" hx-get="{% url 'user-request-filter' %}?{{pd}}&status=approved" hx-target="#userRequest">
-      <span class="oh-dot oh-dot--small me-1" style="background-color:yellowgreen"></span>
-      {% trans "Approved" %}
-    </span>
-</div>
-
-<div class="oh-sticky-table">
-    <div class="oh-sticky-table__table oh-table--sortable">
-        <div class="oh-sticky-table__thead">
-            <div class="oh-sticky-table__tr">
-                <div class="oh-sticky-table__th">{% trans "Leave Type" %}</div>
-                <div class="oh-sticky-table__th">{% trans "Start Date" %}</div>
-                <div class="oh-sticky-table__th">{% trans "End Date" %}</div>
-                <div class="oh-sticky-table__th">{% trans "Requested days" %}</div>
-                <div class="oh-sticky-table__th">{% trans "Status" %}</div>
-                <div class="oh-sticky-table__th">{% trans "Actions" %}</div>
-            </div>
-        </div>
-        <div class="oh-sticky-table__tbody">
-            {% for leave_request in leave_requests %}
-            <div class="oh-sticky-table__tr" draggable="true">
-                <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">
-                        <div class="oh-profile__avatar mr-1">
-                            {% if leave_request.leave_type_id.icon %}
-                            <img src="{{leave_request.leave_type_id.icon.url}}" class="oh-profile__image"
-                                alt="Leave Type Icon" />
-                            {% else%}
-                            <img src="https://ui-avatars.com/api/?name={{leave_request.leave_type_id}}&background=random"
-                                class="oh-profile__image" alt="Leave type icon" />
-                            {% endif %}
-                        </div>
-                        <span class="oh-profile__name oh-text--dark">{{leave_request.leave_type_id}}</span>
-                    </div>
-                </div>
-                <div class="oh-sticky-table__td">{{leave_request.start_date}}</div>
-                <div class="oh-sticky-table__td">{{leave_request.end_date}}</div>
-                <div class="oh-sticky-table__td">{{leave_request.requested_days}}</div>
-                <div class="oh-sticky-table__td">{{leave_request.get_status_display}}</div>
-                {% if leave_request.status == 'requested'%}
-                <div class="oh-sticky-table__td">
-                    <div class="oh-btn-group">
-                        <button class="oh-btn oh-btn--light-bkg w-100" title="{% trans 'Edit' %}" data-toggle="oh-modal-toggle"
-                            data-target="#editModal" hx-get="{% url 'user-request-update' leave_request.id %}"
-                            hx-target="#updateForm"><ion-icon name="create-outline"></ion-icon></button>
-                        <a class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" title="{% trans 'Delete' %}" id="delete-link"
-                            href="{% url 'user-request-delete' leave_request.id %}"><ion-icon name="trash-outline"></ion-icon></a>
-                    </div>
-                </div>
-                {% endif %}
-            </div>
-            {% endfor %}
-        </div>
-    </div>
-</div>
-
-<div class="oh-pagination">
-    <span class="oh-pagination__page">
-        {% trans "Page" %} {{ leave_requests.number }} {% trans "of" %} {{ leave_requests.paginator.num_pages }}.
-    </span>
-    <nav class="oh-pagination__nav">
-        <div class="oh-pagination__input-container me-3">
-            <span class="oh-pagination__label me-1">{% trans "Page" %}</span>
-            <input type="number" name="page" class="oh-pagination__input" value="{{leave_requests.number}}"
-                hx-get="{% url 'user-request-filter' %}?{{pd}}" hx-target="#userRequest" min="1" />
-            <span class="oh-pagination__label">{% trans "of" %} {{leave_requests.paginator.num_pages}}</span>
-        </div>
-        <ul class="oh-pagination__items">
-            {% if leave_requests.has_previous %}
-            <li class="oh-pagination__item oh-pagination__item--wide">
-                <a hx-target='#userRequest' hx-get="{% url 'user-request-filter' %}?{{pd}}&page=1"
-                    class="oh-pagination__link">{% trans "First" %}</a>
-            </li>
-            <li class="oh-pagination__item oh-pagination__item--wide">
-                <a hx-target='#userRequest'
-                    hx-get="{% url 'user-request-filter' %}?{{pd}}&page={{ leave_requests.previous_page_number }}"
-                    class="oh-pagination__link">{% trans "Previous" %}</a>
-            </li>
-            {% endif %}
-            {% if leave_requests.has_next %}
-            <li class="oh-pagination__item oh-pagination__item--wide">
-                <a hx-target='#userRequest'
-                    hx-get="{% url 'user-request-filter' %}?{{pd}}&page={{ leave_requests.next_page_number }}"
-                    class="oh-pagination__link">{% trans "Next" %}</a>
-            </li>
-            <li class="oh-pagination__item oh-pagination__item--wide">
-                <a hx-target='#userRequest'
-                    hx-get="{% url 'user-request-filter' %}?{{pd}}&page={{ leave_requests.paginator.num_pages }}"
-                    class="oh-pagination__link">{% trans "Last" %}</a>
-            </li>
-            {% endif %}
-  
-        </ul>
-    </nav>
-  </div>
diff --git a/leave/views.py b/leave/views.py
index 0334bc86b..be8ba246c 100644
--- a/leave/views.py
+++ b/leave/views.py
@@ -1523,6 +1523,7 @@ def holiday_delete(request, id):
     Returns:
     GET : return holiday view template
     """
+    query_string = request.GET.urlencode()
     try:
         Holiday.objects.get(id=id).delete()
         messages.success(request, _("Holiday deleted successfully.."))
@@ -1530,7 +1531,7 @@ def holiday_delete(request, id):
         messages.error(request, _("Holiday not found."))
     except ProtectedError:
         messages.error(request, _("Related entries exists"))
-    return redirect(holiday_view)
+    return redirect(f"/leave/holiday-filter?{query_string}")
 
 
 @require_http_methods(["POST"])
diff --git a/pms/models.py b/pms/models.py
index ca1dcacdd..50098ad0b 100644
--- a/pms/models.py
+++ b/pms/models.py
@@ -219,7 +219,7 @@ class Comment(models.Model):
     )
     created_at = models.DateTimeField(auto_now_add=True, null=True, blank=True)
     history = HorillaAuditLog(excluded_fields=["comment"], bases=[HorillaAuditInfo])
-    objects = HorillaCompanyManager("employee_id__employee_work_info__company_id")
+    objects = HorillaCompanyManager(related_company_field="employee_id__employee_work_info__company_id")
 
     def __str__(self):
         return f"{self.employee_id.employee_first_name} - {self.comment} "
@@ -276,7 +276,7 @@ class EmployeeKeyResult(models.Model):
     start_date = models.DateField(null=True, blank=True)
     end_date = models.DateField(null=True, blank=True)
     history = HorillaAuditLog(bases=[HorillaAuditInfo])
-    objects = HorillaCompanyManager("employee_objective_id__objective_id__company_id")
+    objects = HorillaCompanyManager(related_company_field="employee_objective_id__objective_id__company_id")
     progress_percentage = models.IntegerField(default=0)
 
     def __str__(self):
diff --git a/pms/views.py b/pms/views.py
index 949b87409..4deeeec6b 100644
--- a/pms/views.py
+++ b/pms/views.py
@@ -2080,19 +2080,19 @@ def dashboard_view(request):
     elif is_manager:
         employees_ids = [employee.id for employee in is_manager]
         count_objective = EmployeeObjective.objects.filter(
-            employee_id__in=employees_ids
+            employee_idemployee_objective_id__employee_id__in=employees_ids
         ).count()
         count_key_result = EmployeeObjective.objects.filter(
             emp_obj_id__employee_id__in=employees_ids
         ).count()
         count_feedback = Feedback.objects.filter(employee_id__in=employees_ids).count()
         okr_at_risk = EmployeeObjective.objects.filter(
-            employee_id__in=employees_ids
+            employee_objective_id__employee_id__in=employees_ids
         ).filter(status="At Risk")
     else:
         count_objective = EmployeeObjective.objects.filter(employee_id=employee).count()
         count_key_result = EmployeeKeyResult.objects.filter(
-            employee_id=employee
+            employee_objective_id__employee_id=employee
         ).count()
         count_feedback = Feedback.objects.filter(employee_id=employee).count()
         okr_at_risk = EmployeeObjective.objects.filter(employee_id=employee).filter(
diff --git a/templates/sidebar.html b/templates/sidebar.html
index 34ba7a2e5..addaf630d 100755
--- a/templates/sidebar.html
+++ b/templates/sidebar.html
@@ -944,7 +944,6 @@
         <div
           class="oh-sidebar__submenu"
           id="configNav"
-          style="display: none"
           x-show="isOpen"
           x-transition
           style="display: none"
@@ -968,6 +967,7 @@
                 >{% trans "Mail Templates" %}</a
               >
             </li>
+            {% endif %}
             <li class="oh-sidebar__submenu-item">
               <a
                 href="{% url 'holiday-view' %}"
@@ -983,7 +983,6 @@
                 >{% trans "Company Leaves" %}</a
               >
             </li>
-            {% endif %}
           </ul>
         </div>
       </li>