From 927d6807b043dbe9abae1d4366890fec6773f496 Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Mon, 29 Jan 2024 15:16:39 +0530
Subject: [PATCH] [UPDT] LEAVE: Leave request, admin leave request and holiday
 html updates using htmx attributes

---
 leave/filters.py                              |   9 +-
 leave/forms.py                                |   4 +
 leave/static/holiday/action.js                |   6 +
 leave/templates/leave/holiday/holiday.html    |   9 +-
 .../leave/holiday/holiday_export_filter.html  |  72 ++++++-----
 .../leave/holiday/holiday_filter.html         |   6 +-
 .../templates/leave/holiday/holiday_form.html |  83 ++++++------
 .../leave/holiday/holiday_update_form.html    |  85 ++++++------
 .../templates/leave/holiday/holiday_view.html |  49 +++----
 .../leave_request/filter_leave_requests.html  | 121 ++++++++++++++++++
 .../leave/leave_request/group_by.html         |   5 +-
 .../leave_request/leave_request_form.html     |   4 +-
 .../leave/leave_request/leave_requests.html   |   5 +-
 .../leave_requests_export_filter.html         |  60 ++++++++-
 .../leave/leave_request/request_view.html     |  90 ++-----------
 leave/views.py                                |  35 ++++-
 16 files changed, 390 insertions(+), 253 deletions(-)
 create mode 100644 leave/templates/leave/leave_request/filter_leave_requests.html

diff --git a/leave/filters.py b/leave/filters.py
index 567022cba..182da3a22 100644
--- a/leave/filters.py
+++ b/leave/filters.py
@@ -118,9 +118,6 @@ class AssignedLeaveFilter(FilterSet):
             self.form.fields[field].widget.attrs["id"] = f"{uuid.uuid4()}"
 
 
-from horilla.filters import filter_by_name
-
-
 class LeaveRequestFilter(FilterSet):
     """
     Filter class for LeaveRequest model.
@@ -170,6 +167,12 @@ class LeaveRequestFilter(FilterSet):
             "status",
             "department_name",
             "overall_leave",
+            "employee_id__employee_work_info__company_id",
+            "employee_id__employee_work_info__reporting_manager_id",
+            "employee_id__employee_work_info__department_id",
+            "employee_id__employee_work_info__job_position_id",
+            "employee_id__employee_work_info__shift_id",
+            "employee_id__employee_work_info__work_type_id",
         ]
 
     def overall_leave_filter(self, queryset, _, value):
diff --git a/leave/forms.py b/leave/forms.py
index aeda8d9c5..96af60ca5 100644
--- a/leave/forms.py
+++ b/leave/forms.py
@@ -440,6 +440,10 @@ class HolidayForm(ModelForm):
         labels = {
             "name": _("Name"),
         }
+    
+    def __init__(self, *args, **kwargs):
+        super(HolidayForm, self).__init__(*args, **kwargs)
+        self.fields['name'].widget.attrs['autocomplete'] = 'name'
 
 
 class LeaveOneAssignForm(ModelForm):
diff --git a/leave/static/holiday/action.js b/leave/static/holiday/action.js
index c54414e56..5c2fdbfb7 100644
--- a/leave/static/holiday/action.js
+++ b/leave/static/holiday/action.js
@@ -29,6 +29,12 @@ var downloadMessages = {
   fr: "Voulez-vous télécharger le modèle ?",
 };
 
+function createHolidayHxValue() {
+  var pd = $(".oh-pagination").attr('data-pd');
+  var hxValue = JSON.stringify(pd)
+  $("#holidayCreateButton").attr('hx-vals',`{"pd":${hxValue}}`);
+}
+
 tickHolidayCheckboxes();
 function makeHolidayListUnique(list) {
   return Array.from(new Set(list));
diff --git a/leave/templates/leave/holiday/holiday.html b/leave/templates/leave/holiday/holiday.html
index d04e959e5..5a6a8ed63 100644
--- a/leave/templates/leave/holiday/holiday.html
+++ b/leave/templates/leave/holiday/holiday.html
@@ -31,6 +31,7 @@
                     <div class="oh-sticky-table__th" style="width: 10px">
                     <div class="centered-div">
                         <input
+                        id="allHolidays"
                         type="checkbox"
                         title="{% trans 'Select All' %}"
                         class="oh-input oh-input__checkbox all-holidays"
@@ -78,9 +79,9 @@
                                   class="oh-btn oh-btn--light-bkg w-100"
                                   title="{% trans 'Edit' %}"
                                   data-toggle="oh-modal-toggle"
-                                  data-target="#editModal2"
-                                  hx-get="{% url 'holiday-update' holiday.id %}"
-                                  hx-target="#updateForm"
+                                  data-target="#holidayEditModal"
+                                  hx-get="{% url 'holiday-update' holiday.id %}?{{pd}}"
+                                  hx-target="#holidayEditFormModal"
                                   >
                                   <ion-icon name="create-outline"></ion-icon>
                                   </button>
@@ -102,7 +103,7 @@
         </div>
     </div>
 
-    <div class="oh-pagination">
+    <div class="oh-pagination" data-pd="{{pd}}">
         <span class="oh-pagination__page">
         {% trans "Page" %} {{ holidays.number }} {% trans "of" %} {{ holidays.paginator.num_pages }}.
         </span>
diff --git a/leave/templates/leave/holiday/holiday_export_filter.html b/leave/templates/leave/holiday/holiday_export_filter.html
index fdff29157..f2fab7b2e 100644
--- a/leave/templates/leave/holiday/holiday_export_filter.html
+++ b/leave/templates/leave/holiday/holiday_export_filter.html
@@ -1,43 +1,55 @@
 {% load i18n %}
 <div class="oh-dropdown__filter-body">
-    <div class="oh-accordion">
-      <div class="oh-accordion-header">{% trans "Excel columns" %}</div>
-      <div class="oh-accordion-body">
-        <div class="row">
-          {% for field in export_column.selected_fields %}
-          <div class="col-sm-12 col-md-12 col-lg-6">
-            <div class="oh-input-group">
-              <label class="oh-label"> {{ field }} </label>
-            </div>
+  <div class="oh-accordion">
+    <div class="oh-accordion-header">{% trans "Excel columns" %}</div>
+    <div class="oh-accordion-body">
+      <div class="row">
+        {% for field in export_column.selected_fields %}
+        <div class="col-sm-12 col-md-12 col-lg-6">
+          <div class="oh-input-group">
+            <label class="oh-label"> {{ field }} </label>
           </div>
-          {% endfor %}
         </div>
+        {% endfor %}
       </div>
     </div>
-    <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 "From Date" %}</label>
-              {{export_filter.form.from_date}}
-            </div>
+  </div>
+  <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"
+              for="{{ export_filter.form.from_date.id_for_label }}"
+              >{% trans "From Date" %}</label
+            >
+            {{export_filter.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>
-              {{export_filter.form.to_date}}
-            </div>
+        <div class="col-sm-12 col-md-12 col-lg-6">
+          <div class="oh-input-group">
+            <label
+              class="oh-label"
+              for="{{ export_filter.form.to_date.id_for_label }}"
+              >{% trans "To Date" %}</label
+            >
+            {{export_filter.form.to_date}}
           </div>
-          <div class="col-sm-12 col-md-12">
-            <div class="oh-input-group">
-              <label class="oh-label">{% trans "Recurring" %}</label>
-              {{export_filter.form.recurring}}
-            </div>
+        </div>
+        <div class="col-sm-12 col-md-12">
+          <div class="oh-input-group">
+            <label
+              class="oh-label"
+              for="{{ export_filter.form.recurring.id_for_label }}"
+              >{% trans "Recurring" %}</label
+            >
+            {{export_filter.form.recurring}}
           </div>
         </div>
       </div>
     </div>
-  </div>
\ No newline at end of file
+  </div>
+</div>
diff --git a/leave/templates/leave/holiday/holiday_filter.html b/leave/templates/leave/holiday/holiday_filter.html
index c13958829..84a15a1cc 100644
--- a/leave/templates/leave/holiday/holiday_filter.html
+++ b/leave/templates/leave/holiday/holiday_filter.html
@@ -13,19 +13,19 @@
           <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>
+                <label class="oh-label" for="{{ form.from_date.id_for_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>
+                <label class="oh-label" for="{{ form.to_date.id_for_label }}">{% trans "To Date" %}</label>
                   {{form.to_date}}
               </div>
             </div>
             <div class="col-sm-12 col-md-12">
               <div class="oh-input-group">
-                <label class="oh-label">{% trans "Recurring" %}</label>
+                <label class="oh-label" for="{{ form.recurring.id_for_label }}">{% trans "Recurring" %}</label>
                   {{form.recurring}}
               </div>
             </div>
diff --git a/leave/templates/leave/holiday/holiday_form.html b/leave/templates/leave/holiday/holiday_form.html
index 71ab29d81..51594e1d9 100644
--- a/leave/templates/leave/holiday/holiday_form.html
+++ b/leave/templates/leave/holiday/holiday_form.html
@@ -1,5 +1,4 @@
-{% load i18n %}
-{% if messages %}
+{% load i18n %} {% if messages %}
 <div class="oh-wrapper">
   {% for message in messages %}
   <div class="oh-alert-container">
@@ -11,46 +10,48 @@
 </div>
 <script>
   setTimeout(() => {
-    $('.oh-modal__close').click();
+    $(".oh-modal__close").click();
   }, 1000);
 </script>
 {% endif %}
-{% 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 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"
+    hx-get="{% url 'holiday-filter' %}?{{pd}}"
+    hx-target="#holidays"
+  >
+    <ion-icon name="close-outline"></ion-icon>
+  </button>
 </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
+<form
+  hx-post="{% url 'holiday-creation' %}?{{pd}}"
+  hx-target="#holidayCreateFormModal"
+>
+  <div class="oh-modal__dialog-body pb-2">
+    <label class="oh-label d-block" for="{{ form.name.id_for_label }}"
+      >{% trans "Holiday Name" %}</label
+    >
+    {{form.name}} {{form.name.errors}}
+    <label class="oh-label d-block" for="{{ form.name.id_for_label }}"
+      >{% trans "Start Date" %}</label
+    >
+    {{form.start_date}} {{form.start_date.errors}}
+    <label class="oh-label d-block" for="{{ form.name.id_for_label }}"
+      >{% trans "End Date" %}</label
+    >
+    {{form.end_date}} {{form.end_date.errors}}
+    <label class="oh-label d-block" for="{{ form.name.id_for_label }}"
+      >{% 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>
+  </div>
+</form>
diff --git a/leave/templates/leave/holiday/holiday_update_form.html b/leave/templates/leave/holiday/holiday_update_form.html
index f4c477782..0cd88a5c7 100644
--- a/leave/templates/leave/holiday/holiday_update_form.html
+++ b/leave/templates/leave/holiday/holiday_update_form.html
@@ -1,5 +1,4 @@
-{% load i18n %}
-{% if messages %}
+{% load i18n %} {% if messages %}
 <div class="oh-wrapper">
   {% for message in messages %}
   <div class="oh-alert-container">
@@ -11,47 +10,51 @@
 </div>
 <script>
   setTimeout(() => {
-    $('.oh-modal__close').click();
+    $(".oh-modal__close").click();
   }, 1000);
 </script>
 {% endif %}
-{% 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 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"
+    hx-get="{% url 'holiday-filter' %}?{{pd}}"
+    hx-target="#holidays"
+  >
+    <ion-icon name="close-outline"></ion-icon>
+  </button>
 </div>
-{% endif %}
+<form
+  hx-post="{% url 'holiday-update' id %}?{{pd}}"
+  hx-target="#holidayEditFormModal"
+>
+  <div class="oh-modal__dialog-body pb-2">
+    <label class="oh-label d-block" for="{{ form.name.id_for_label }}"
+      >{% trans "Holiday Name" %}</label
+    >
+    {{form.name}} {{form.name.errors}}
 
-<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
+    <label class="oh-label d-block" for="{{ form.start_date.id_for_label }}"
+      >{% trans "Start Date" %}</label
+    >
+    {{form.start_date}} {{form.start_date.errors}}
+
+    <label class="oh-label d-block" for="{{ form.end_date.id_for_label }}"
+      >{% trans "End Date" %}</label
+    >
+    {{form.end_date}} {{form.end_date.errors}}
+
+    <label class="oh-label d-block" for="{{ form.recurring.id_for_label }}"
+      >{% 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>
+  </div>
+</form>
diff --git a/leave/templates/leave/holiday/holiday_view.html b/leave/templates/leave/holiday/holiday_view.html
index dc0a40e38..ae7d088f5 100644
--- a/leave/templates/leave/holiday/holiday_view.html
+++ b/leave/templates/leave/holiday/holiday_view.html
@@ -44,11 +44,12 @@
         class="oh-input-group__icon oh-input-group__icon--left"
       ></ion-icon>
       <input
+        id="searchHoliday"
         type="text"
         class="oh-input oh-input__icon"
         aria-label="Search Input"
         placeholder="{% trans 'Search' %}"
-        name="name"
+        name="search"
         hx-get="{% url 'holiday-filter' %}"
         hx-trigger="keyup"
         hx-target="#holidays"
@@ -126,11 +127,13 @@
         <div class="oh-btn-group ml-2">
           <div class="oh-dropdown" x-data="{open: false}">
             <button
+              id="holidayCreateButton"
               class="oh-btn oh-btn--secondary oh-btn--shadow"
               data-toggle="oh-modal-toggle"
-              data-target="#editModal1"
+              data-target="#holidayCreateModal"
               hx-get="{% url 'holiday-creation' %}"
-              hx-target="#holidayForm"
+              hx-target="#holidayCreateFormModal"
+              onclick="createHolidayHxValue();"
             >
               <ion-icon name="add-outline" class="me-1"></ion-icon>
               {% trans "Create" %}
@@ -184,23 +187,12 @@
 <!-- Holiday creation -->
 <div
   class="oh-modal"
-  id="editModal1"
+  id="holidayCreateModal"
   role="dialog"
-  aria-labelledby="editDialogModal"
+  aria-labelledby="holidayCreateModalLabel"
   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" 
-              hx-get="{% url 'holiday-filter' %}" hx-target="#holidays"
-          >
-        <ion-icon name="close-outline"></ion-icon>
-      </button>
-    </div>
-    <div id="holidayForm"></div>
+  >
+  <div class="oh-modal__dialog" id="holidayCreateFormModal">
   </div>
 </div>
 
@@ -209,23 +201,12 @@
 <!-- start of Update Holiday -->
 <div
   class="oh-modal"
-  id="editModal2"
+  id="holidayEditModal"
   role="dialog"
-  aria-labelledby="editDialogModal"
+  aria-labelledby="holidayEditModalLabel"
   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"
-              hx-get="{% url 'holiday-filter' %}" hx-target="#holidays" 
-          >
-        <ion-icon name="close-outline"></ion-icon>
-      </button>
-    </div>
-    <div id="updateForm"></div>
+  <div class="oh-modal__dialog" id="holidayEditFormModal">
   </div>
 </div>
 <!-- end of update modal -->
@@ -265,7 +246,7 @@
             </div>
           </div>
           <div id="uploadContainer">
-            <label class="oh-dropdown__import-label" for="uploadFile">
+            <label class="oh-dropdown__import-label" for="importHoliday">
               <ion-icon
                 name="cloud-upload"
                 class="oh-dropdown__import-form-icon"
@@ -277,7 +258,7 @@
                 >{% trans "Drag and drop files here" %}</span
               >
             </label>
-            <input type="file" name="holidays_import" id="" required />
+            <input type="file" name="holidays_import" id="importHoliday" required />
           </div>
           <button
             type="submit"
diff --git a/leave/templates/leave/leave_request/filter_leave_requests.html b/leave/templates/leave/leave_request/filter_leave_requests.html
new file mode 100644
index 000000000..d8dbdc4d3
--- /dev/null
+++ b/leave/templates/leave/leave_request/filter_leave_requests.html
@@ -0,0 +1,121 @@
+{% load i18n %}
+<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">
+        <input type="hidden" value="{{request.GET.id}}" name="id">
+        <div class="row">
+          <div class="col-sm-12 col-md-12 col-lg-12">
+            <div class="oh-input-group">
+              <label class="oh-label" for="{{ form.leave_type_id.id_for_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" for="{{ form.start_date.id_for_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" for="{{ form.end_date.id_for_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" for="{{ form.status.id_for_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 "Work Info" %}
+      </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" for="{{ form.employee_id__employee_work_info__company_id.id_for_label }}">{% trans "Company" %}</label>
+              {{form.employee_id__employee_work_info__company_id}}
+            </div>
+          </div>
+          <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="oh-input-group">
+              <label class="oh-label" for="{{ form.employee_id__employee_work_info__reporting_manager_id.id_for_label }}">{% trans "Reporting Manager" %}</label>
+              {{form.employee_id__employee_work_info__reporting_manager_id}}
+            </div>
+          </div>
+          <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="oh-input-group">
+              <label class="oh-label" for="{{ form.employee_id__employee_work_info__department_id.id_for_label }}">{% trans "Department" %}</label>
+              {{form.employee_id__employee_work_info__department_id}}
+            </div>
+          </div>
+          <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="oh-input-group">
+              <label class="oh-label" for="{{ form.employee_id__employee_work_info__job_position_id.id_for_label }}">{% trans "Job Position" %}</label>
+              {{form.employee_id__employee_work_info__job_position_id}}
+            </div>
+          </div>
+          <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="oh-input-group">
+              <label class="oh-label" for="{{ form.employee_id__employee_work_info__shift_id.id_for_label }}">{% trans "Shift" %}</label>
+              {{form.employee_id__employee_work_info__shift_id}}
+            </div>
+          </div>
+          <div class="col-sm-12 col-md-12 col-lg-6">
+            <div class="oh-input-group">
+              <label class="oh-label" for="{{ form.employee_id__employee_work_info__work_type_id.id_for_label }}">{% trans "Work Type" %}</label>
+              {{form.employee_id__employee_work_info__work_type_id}}
+            </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" for="{{ form.from_date.id_for_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" for="{{ form.to_date.id_for_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>
\ No newline at end of file
diff --git a/leave/templates/leave/leave_request/group_by.html b/leave/templates/leave/leave_request/group_by.html
index 20825248e..c958d5e71 100644
--- a/leave/templates/leave/leave_request/group_by.html
+++ b/leave/templates/leave/leave_request/group_by.html
@@ -197,7 +197,7 @@
         </div>
     </div>
     {% endfor %}
-    <div class="oh-pagination">
+    <div class="oh-pagination" data-pd="{{pd}}">
         <span class="oh-pagination__page">
             {% trans "Page" %} {{ leave_requests.number }} {% trans "of" %} {{ leave_requests.paginator.num_pages }}.
         </span>
@@ -296,6 +296,9 @@
 
 <script>
     $(document).ready(function () {
+        var pd = $(".oh-pagination").attr('data-pd');
+        var hxVals = JSON.stringify(pd)
+        $("#requestCreateButton").attr('hx-vals',`{"pd":${hxVals}}`);
         $(".oh-accordion-meta__header").on("click",function (){
             $(this).siblings(".oh-accordion-meta__body").toggleClass("d-none")
         })
diff --git a/leave/templates/leave/leave_request/leave_request_form.html b/leave/templates/leave/leave_request/leave_request_form.html
index a1b373698..00a8ce716 100644
--- a/leave/templates/leave/leave_request/leave_request_form.html
+++ b/leave/templates/leave/leave_request/leave_request_form.html
@@ -21,7 +21,7 @@
   <button
     class="oh-modal__close"
     aria-label="Close"
-    hx-get="{% url 'request-filter' %}"
+    hx-get="{% url 'request-filter' %}?{{pd}}"
     hx-target="#leaveRequest"
   >
     <ion-icon name="close-outline"></ion-icon>
@@ -29,7 +29,7 @@
 </div>
 <div class="oh-modal__dialog-body">
   <form
-    hx-post="{% url 'request-creation' %}"
+    hx-post="{% url 'request-creation' %}?{{pd}}"
     hx-encoding="multipart/form-data"
     hx-target="#requestCreateFormModal"
   >
diff --git a/leave/templates/leave/leave_request/leave_requests.html b/leave/templates/leave/leave_request/leave_requests.html
index ec810333c..b9f1b85f1 100644
--- a/leave/templates/leave/leave_request/leave_requests.html
+++ b/leave/templates/leave/leave_request/leave_requests.html
@@ -231,7 +231,7 @@
 
 <!-- End of Sticky Table -->
 {% if  not dashboard %}
-<div class="oh-pagination">
+<div class="oh-pagination" data-pd="{{pd}}">
     <span class="oh-pagination__page">
         {% trans "Page" %} {{ leave_requests.number }} {% trans "of" %} {{ leave_requests.paginator.num_pages }}.
     </span>
@@ -335,6 +335,9 @@
     });
   
     $(document).ready(function () {
+      var pd = $(".oh-pagination").attr('data-pd');
+      var hxVals = JSON.stringify(pd)
+      $("#requestCreateButton").attr('hx-vals',`{"pd":${hxVals}}`);
       tickLeaverequestsCheckboxes();
       $(".all-leave-requests-row").change(function () {
         addingLeaverequestsIds();
diff --git a/leave/templates/leave/leave_request/leave_requests_export_filter.html b/leave/templates/leave/leave_request/leave_requests_export_filter.html
index a7aef38fc..fd514dbcd 100644
--- a/leave/templates/leave/leave_request/leave_requests_export_filter.html
+++ b/leave/templates/leave/leave_request/leave_requests_export_filter.html
@@ -39,32 +39,80 @@
       <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>
+            <label class="oh-label" for="{{ export_filter.leave_type_id.id_for_label }}">{% trans "Leave Type" %}</label>
             {{export_filter.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>
+            <label class="oh-label" for="{{ export_filter.start_date.id_for_label }}">{% trans "Start Date" %}</label>
             {{export_filter.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>
+            <label class="oh-label" for="{{ export_filter.end_date.id_for_label }}">{% trans "End Date" %}</label>
             {{export_filter.end_date}}
           </div>
         </div>
         <div class="col-sm-12 col-md-12">
           <div class="oh-input-group">
-            <label class="oh-label">{% trans "Status" %}</label>
+            <label class="oh-label" for="{{ export_filter.status.id_for_label }}">{% trans "Status" %}</label>
             {{export_filter.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 "Work Info" %}
+    </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" for="{{ export_filter.employee_id__employee_work_info__company_id.id_for_label }}">{% trans "Company" %}</label>
+            {{export_filter.employee_id__employee_work_info__company_id}}
+          </div>
+        </div>
+        <div class="col-sm-12 col-md-12 col-lg-6">
+          <div class="oh-input-group">
+            <label class="oh-label" for="{{ export_filter.employee_id__employee_work_info__reporting_manager_id.id_for_label }}">{% trans "Reporting Manager" %}</label>
+            {{export_filter.employee_id__employee_work_info__reporting_manager_id}}
+          </div>
+        </div>
+        <div class="col-sm-12 col-md-12 col-lg-6">
+          <div class="oh-input-group">
+            <label class="oh-label" for="{{ export_filter.employee_id__employee_work_info__department_id.id_for_label }}">{% trans "Department" %}</label>
+            {{export_filter.employee_id__employee_work_info__department_id}}
+          </div>
+        </div>
+        <div class="col-sm-12 col-md-12 col-lg-6">
+          <div class="oh-input-group">
+            <label class="oh-label" for="{{ export_filter.employee_id__employee_work_info__job_position_id.id_for_label }}">{% trans "Job Position" %}</label>
+            {{export_filter.employee_id__employee_work_info__job_position_id}}
+          </div>
+        </div>
+        <div class="col-sm-12 col-md-12 col-lg-6">
+          <div class="oh-input-group">
+            <label class="oh-label" for="{{ export_filter.employee_id__employee_work_info__shift_id.id_for_label }}">{% trans "Shift" %}</label>
+            {{export_filter.employee_id__employee_work_info__shift_id}}
+          </div>
+        </div>
+        <div class="col-sm-12 col-md-12 col-lg-6">
+          <div class="oh-input-group">
+            <label class="oh-label" for="{{ export_filter.employee_id__employee_work_info__work_type_id.id_for_label }}">{% trans "Work Type" %}</label>
+            {{export_filter.employee_id__employee_work_info__work_type_id}}
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
   <div class="oh-accordion">
     <div
       class="oh-accordion-header"
@@ -76,14 +124,14 @@
       <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>
+            <label class="oh-label" for="{{ export_filter.from_date.id_for_label }}">{% trans "From Date" %}</label>
             {{export_filter.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>
+            <label class="oh-label" for="{{ export_filter.to_date.id_for_label }}">{% trans "To Date" %}</label>
             {{export_filter.to_date}}
           </div>
         </div>
diff --git a/leave/templates/leave/leave_request/request_view.html b/leave/templates/leave/leave_request/request_view.html
index 947502fa9..4d2a585e3 100644
--- a/leave/templates/leave/leave_request/request_view.html
+++ b/leave/templates/leave/leave_request/request_view.html
@@ -84,78 +84,7 @@
             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">
-                  <input type="hidden" value="{{request.GET.id}}" name="id">
-                  <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>
+          {% include 'leave/leave_request/filter_leave_requests.html' %}
           </div>
         </div>
         <div class="oh-dropdown" x-data="{open: false}">
@@ -174,11 +103,11 @@
             style="display: none"
           >
             <div class="oh-accordion">
-              <label>{% trans "Group By" %}</label>
+              <label for="id_field">{% trans "Group By" %}</label>
               <div class="row">
                 <div class="col-sm-12 col-md-12 col-lg-6">
                   <div class="oh-input-group">
-                    <label class="oh-label">{% trans "Field" %}</label>
+                    <label class="oh-label" for="id_field">{% trans "Field" %}</label>
                   </div>
                 </div>
                 <div class="col-sm-12 col-md-12 col-lg-6">
@@ -200,7 +129,7 @@
           </div>
         </div>
       </form>
-      <div class="oh-dropdown ml-2" x-data="{open: false}">
+      <div class="oh-dropdown ml-2" x-data="{open: false}" onclick="event.preventDefault();">
         <button
           class="oh-btn oh-btn--dropdown"
           @click="open = !open"
@@ -241,11 +170,12 @@
       <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="#requestCreateModal"
-          hx-get="{% url 'request-creation' %}"
-          hx-target="#requestCreateFormModal"
+            id="requestCreateButton"
+            class="oh-btn oh-btn--secondary oh-btn--shadow"
+            data-toggle="oh-modal-toggle"
+            data-target="#requestCreateModal"
+            hx-get="{% url 'request-creation' %}"
+            hx-target="#requestCreateFormModal"
           >
           <ion-icon name="add-outline" class="me-1"></ion-icon>
           {% trans "Create" %}
diff --git a/leave/views.py b/leave/views.py
index 47c935bb9..334c1ac65 100644
--- a/leave/views.py
+++ b/leave/views.py
@@ -274,6 +274,7 @@ def leave_request_creation(request, type_id=None, emp_id=None):
     GET : return leave request form template
     POST : return leave request view
     """
+    previous_data = unquote(request.GET.urlencode())[len("pd=") :]
     form = LeaveRequestCreationForm()
     if type_id and emp_id:
         initial_data = {
@@ -331,7 +332,9 @@ def leave_request_creation(request, type_id=None, emp_id=None):
                 )
             form = LeaveRequestCreationForm()
     return render(
-        request, "leave/leave_request/leave_request_form.html", {"form": form}
+        request,
+        "leave/leave_request/leave_request_form.html",
+        {"form": form, "pd": previous_data},
     )
 
 
@@ -1184,13 +1187,19 @@ def holiday_creation(request):
     GET : return holiday creation form template
     POST : return holiday view template
     """
+    
+    query_string = request.GET.urlencode()
+    if query_string.startswith("pd="):
+        previous_data = unquote(query_string[len("pd="):])
+    else:
+        previous_data = unquote(query_string)
     form = HolidayForm()
     if request.method == "POST":
         form = HolidayForm(request.POST)
         if form.is_valid():
             form.save()
             messages.success(request, _("New holiday created successfully.."))
-    return render(request, "leave/holiday/holiday_form.html", {"form": form})
+    return render(request, "leave/holiday/holiday_form.html", {"form": form,"pd":previous_data})
 
 
 def holidays_excel_template(request):
@@ -1358,6 +1367,11 @@ def holiday_update(request, id):
     GET : return holiday update form template
     POST : return holiday view template
     """
+    query_string = request.GET.urlencode()
+    if query_string.startswith("pd="):
+        previous_data = unquote(query_string[len("pd="):])
+    else:
+        previous_data = unquote(query_string)
     holiday = Holiday.objects.get(id=id)
     form = HolidayForm(instance=holiday)
     if request.method == "POST":
@@ -1366,7 +1380,7 @@ def holiday_update(request, id):
             form.save()
             messages.info(request, _("Holiday updated successfully.."))
     return render(
-        request, "leave/holiday/holiday_update_form.html", {"form": form, "id": id}
+        request, "leave/holiday/holiday_update_form.html", {"form": form, "id": id,"pd":previous_data}
     )
 
 
@@ -1585,7 +1599,7 @@ def user_leave_request(request, id):
     GET : return user leave request creation form template
     POST : user my leave view template
     """
-    previous_data = unquote(request.GET.urlencode())[len("pd="):]
+    previous_data = unquote(request.GET.urlencode())[len("pd=") :]
     employee = request.user.employee_get
     leave_type = LeaveType.objects.get(id=id)
     form = UserLeaveRequestForm(
@@ -1705,7 +1719,7 @@ def user_leave_request(request, id):
     return render(
         request,
         "leave/user_leave/user_request_form.html",
-        {"form": form, "id": id, "leave_type": leave_type,"pd":previous_data},
+        {"form": form, "id": id, "leave_type": leave_type, "pd": previous_data},
     )
 
 
@@ -2403,7 +2417,10 @@ def leave_over_period(request):
     }
     return JsonResponse(response)
 
+
 from urllib.parse import unquote
+
+
 @login_required
 def leave_request_create(request):
     """
@@ -2416,7 +2433,7 @@ def leave_request_create(request):
     GET : return leave request form template
     POST : return leave request view
     """
-    previous_data = unquote(request.GET.urlencode())[len("pd="):]
+    previous_data = unquote(request.GET.urlencode())[len("pd=") :]
     employee = request.user.employee_get
     emp_id = employee.id
     emp = Employee.objects.get(id=emp_id)
@@ -2510,7 +2527,11 @@ def leave_request_create(request):
             return HttpResponse(
                 response.content.decode("utf-8") + "<script>location.reload();</script>"
             )
-    return render(request, "leave/user_leave/request_form.html", {"form": form,"pd":previous_data})
+    return render(
+        request,
+        "leave/user_leave/request_form.html",
+        {"form": form, "pd": previous_data},
+    )
 
 
 @login_required