From 51907143cbf456f9587d8e4503c75c9e9b281cfc Mon Sep 17 00:00:00 2001
From: Horilla <support@horilla.com>
Date: Mon, 4 Aug 2025 14:11:30 +0530
Subject: [PATCH] [UPDT] BASE: Updated horilla html files by exclude the
 select2 scripts for dipatch event for change

---
 base/cbv/company.py                           |   4 +-
 base/templates/base/company/company.html      |   2 +-
 .../cbv/dashboard/job_position_field.html     |  10 +-
 .../cbv/dashboard/job_role_field.html         |   8 -
 .../cbv/multiple_approval_condition/form.html |  39 +--
 .../form_edit.html                            |   5 +-
 .../cbv/settings/company_bulk_update.html     |   7 -
 .../cbv/settings/company_inherit.html         |  16 -
 .../condition_edit_form.html                  |   7 -
 .../htmx/shift_reallocate_employees.html      |   8 -
 .../templates/dynamic_fields/common/form.html |   8 -
 .../allocations/employee/form_structure.html  |  98 +++---
 .../templates/cbv/document/notify_field.html  |   7 -
 .../cbv/documents/document_filter.html        |  94 -----
 .../cbv/employees_view/bulk_update_page.html  |   4 -
 .../cbv/employees_view/filter_employee.html   | 213 ++++++------
 horilla_views/templates/generic/form.html     | 158 ++++-----
 .../cbv/pipeline/onboarding/filters.html      | 189 +++++-----
 .../templates/cbv/candidates/filter.html      | 327 +++++++++---------
 .../cbv/interview/forms/form_hx.html          |   7 -
 .../cbv/pipeline/pipeline_filter.html         | 266 ++++++--------
 21 files changed, 601 insertions(+), 876 deletions(-)
 delete mode 100644 base/templates/cbv/settings/company_bulk_update.html
 delete mode 100644 base/templates/cbv/settings/company_inherit.html
 delete mode 100644 employee/templates/cbv/documents/document_filter.html

diff --git a/base/cbv/company.py b/base/cbv/company.py
index dbd5357f7..af9056b4c 100644
--- a/base/cbv/company.py
+++ b/base/cbv/company.py
@@ -66,8 +66,7 @@ class CompanyListView(HorillaListView):
 
     model = Company
     filter_class = CompanyFilter
-
-    bulk_template = "cbv/settings/company_bulk_update.html"
+    selected_instances_key_id = "selectedInstance"
     bulk_update_fields = ["country", "state", "city", "zip"]
 
     def get_bulk_form(self):
@@ -161,7 +160,6 @@ class CompanyCreateForm(HorillaFormView):
 
     model = Company
     form_class = CompanyForm
-    template_name = "cbv/settings/company_inherit.html"
     new_display_title = _("Create Company")
 
     def get_form(self, form_class=None):
diff --git a/base/templates/base/company/company.html b/base/templates/base/company/company.html
index f5770d0f9..818003b04 100644
--- a/base/templates/base/company/company.html
+++ b/base/templates/base/company/company.html
@@ -1,7 +1,7 @@
 {% extends 'settings.html' %} {% load i18n %} {% block settings %}{% load static %}
 {% include "generic/components.html" %}
 <meta name="csrf-token" content="{{ csrf_token }}">
-
+<div id="selectedInstance" data-ids="[]"></div>
 <div class="oh-inner-sidebar-content">
 	<div hx-get="{% url 'company-navbar' %}" hx-trigger="load"></div>
 	<div hx-get="{% url 'company-list' %}" hx-trigger="load"></div>
diff --git a/base/templates/cbv/dashboard/job_position_field.html b/base/templates/cbv/dashboard/job_position_field.html
index 4e54e8375..deacc53fd 100644
--- a/base/templates/cbv/dashboard/job_position_field.html
+++ b/base/templates/cbv/dashboard/job_position_field.html
@@ -3,16 +3,8 @@
   class="oh-label"
   for="id_{{ form.job_position_id.title }}"
   title="{{ form.job_position_id.help_text|safe }}"
-  >{% trans form.job_position_id.label %}</label
+  >{% trans form.job_position_id.label %} New</label
 >
 <div id ="dynamic_field_job_position_id">
 {{form.job_position_id}}
 </div>
-<script>
-  $(document).ready(function () {
-
-      $("select").on("select2:select", function (e) {
-          $(this).closest("select")[0].dispatchEvent(new Event("change"));
-      });
-  });
-</script>
diff --git a/base/templates/cbv/dashboard/job_role_field.html b/base/templates/cbv/dashboard/job_role_field.html
index c5ed4dc90..1847af648 100644
--- a/base/templates/cbv/dashboard/job_role_field.html
+++ b/base/templates/cbv/dashboard/job_role_field.html
@@ -8,11 +8,3 @@
 <div id ="dynamic_field_job_role_id">
 {{form.job_role_id}}
 </div>
-<script>
-  $(document).ready(function () {
-
-      $("select").on("select2:select", function (e) {
-          $(this).closest("select")[0].dispatchEvent(new Event("change"));
-      });
-  });
-</script>
diff --git a/base/templates/cbv/multiple_approval_condition/form.html b/base/templates/cbv/multiple_approval_condition/form.html
index 7febbf6e1..e13f0a43b 100644
--- a/base/templates/cbv/multiple_approval_condition/form.html
+++ b/base/templates/cbv/multiple_approval_condition/form.html
@@ -3,25 +3,17 @@
 {% include "generic/components.html" %}
 <div id="formContainer">
     {% include "generic/horilla_form.html" %}
-
-    <button
-    hidden
-        hx-target="#multiApprovalManager_0"
-        hx-swap="outerHTML"
-        hx-get="{% url 'add-more-approval-managers' %}"
-        role="button"
-        id = "addmangerButton"
-        style="color: green"
-        >{% trans "Add more managers.." %}</button>
+    <button hidden hx-target="#multiApprovalManager_0" hx-swap="outerHTML"
+        hx-get="{% url 'add-more-approval-managers' %}" role="button" id="addmangerButton" style="color: green">
+        {% trans "Add more managers.." %}
+    </button>
 </div>
 
 <script>
     $(document).ready(function () {
-
-
         $("#id_condition_start_value_parent_div").hide();
         $("#id_condition_end_value_parent_div").hide();
-        $("#id_condition_operator").change(function() {
+        $("#id_condition_operator").change(function () {
             var selectedValue = $(this).val();
             if (selectedValue === "range") {
                 $("#id_condition_start_value_parent_div").remove();
@@ -48,27 +40,8 @@
             console.error("Parent div with ID 'id_multi_approval_manager_parent_div' not found.");
         }
 
-        $(document).off('click', '#addmanger').on('click', '#addmanger', function(event) {
+        $(document).off('click', '#addmanger').on('click', '#addmanger', function (event) {
             $('#addmangerButton').trigger('click');
         });
-
-        $("select").on("select2:select", function (e) {
-            $(this).closest("select")[0].dispatchEvent(new Event("change"));
-          });
-
-
     });
-
-
-
 </script>
-
-
-
-{% comment %} <script>
-    $(document).ready(function () {
-      $("select").on("select2:select", function (e) {
-        $(this).closest("select")[0].dispatchEvent(new Event("change"));
-      });
-    });
-  </script> {% endcomment %}
diff --git a/base/templates/cbv/multiple_approval_condition/form_edit.html b/base/templates/cbv/multiple_approval_condition/form_edit.html
index 9a256d785..14bedcac2 100644
--- a/base/templates/cbv/multiple_approval_condition/form_edit.html
+++ b/base/templates/cbv/multiple_approval_condition/form_edit.html
@@ -12,7 +12,7 @@
         role="button"
         id = "addmangerButton"
         style="color: green"
-        >{% trans "Add more managers.." %}</button>
+        >{% trans "Add more managers.. 321" %}</button>
 </div>
 
 <script>
@@ -22,9 +22,6 @@
         $('#addmangerButton').trigger('click');
     });
 
-        $("select").on("select2:select", function (e) {
-            $(this).closest("select")[0].dispatchEvent(new Event("change"));
-          });
 
         var managersCount = {{ managers_count }};
 
diff --git a/base/templates/cbv/settings/company_bulk_update.html b/base/templates/cbv/settings/company_bulk_update.html
deleted file mode 100644
index 8c6350053..000000000
--- a/base/templates/cbv/settings/company_bulk_update.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% load static %}
-<div>
-    {% include 'generic/bulk_form.html' %}
-</div>
-<script>
-    {% include 'country.js' %}
-</script>
diff --git a/base/templates/cbv/settings/company_inherit.html b/base/templates/cbv/settings/company_inherit.html
deleted file mode 100644
index ff3bd4a69..000000000
--- a/base/templates/cbv/settings/company_inherit.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div>
-    {% include "generic/horilla_form.html" %}
-</div>
-<script>
-	{% include 'country.js' %}
-
-
-    $(document).ready(function() {
-        var country = "{{ form.instance.country |escapejs }}"
-        var state = "{{ form.instance.state |escapejs }}"
-        document.getElementById('id_country').value = country;
-        document.getElementById('id_state').value = state;
-        $("#id_country").trigger('change');
-        $("#id_state").val(state).trigger('change');
-    });
-</script>
diff --git a/base/templates/multi_approval_condition/condition_edit_form.html b/base/templates/multi_approval_condition/condition_edit_form.html
index 20e88e3f6..a473b1fe8 100644
--- a/base/templates/multi_approval_condition/condition_edit_form.html
+++ b/base/templates/multi_approval_condition/condition_edit_form.html
@@ -175,10 +175,3 @@
     </div>
   </form>
 </div>
-<script>
-  $(document).ready(function () {
-    $("select").on("select2:select", function (e) {
-      $(this).closest("select")[0].dispatchEvent(new Event("change"));
-    });
-  });
-</script>
diff --git a/base/templates/shift_request/htmx/shift_reallocate_employees.html b/base/templates/shift_request/htmx/shift_reallocate_employees.html
index 6175fd896..f2e6a8a79 100644
--- a/base/templates/shift_request/htmx/shift_reallocate_employees.html
+++ b/base/templates/shift_request/htmx/shift_reallocate_employees.html
@@ -8,11 +8,3 @@
 <div id ="dynamic_field_task_id">
 {{form.reallocate_to}}
 </div>
-<script>
-  $(document).ready(function () {
-
-      $("select").on("select2:select", function (e) {
-          $(this).closest("select")[0].dispatchEvent(new Event("change"));
-      });
-  });
-</script>
diff --git a/dynamic_fields/templates/dynamic_fields/common/form.html b/dynamic_fields/templates/dynamic_fields/common/form.html
index 1ff4984f2..dd12dd593 100644
--- a/dynamic_fields/templates/dynamic_fields/common/form.html
+++ b/dynamic_fields/templates/dynamic_fields/common/form.html
@@ -83,11 +83,3 @@
     </div>
   </div>
 </div>
-<script>
-  $(document).ready(function () {
-      $("select").on("select2:select", function (e) {
-         $(".leave-message").hide();
-          $(this).closest("select")[0].dispatchEvent(new Event("change"));
-      });
-  });
-</script>
diff --git a/employee/templates/cbv/allocations/employee/form_structure.html b/employee/templates/cbv/allocations/employee/form_structure.html
index d97880e0e..51e4d9e4f 100644
--- a/employee/templates/cbv/allocations/employee/form_structure.html
+++ b/employee/templates/cbv/allocations/employee/form_structure.html
@@ -1,57 +1,53 @@
-<form hx-post="{{request.path}}?{{request.GET.urlencode}}" hx-swap="outerHTML" hx-encoding="multipart/form-data">
-  <input hidden type="submit" id="allocationEmployeeFormsSubmit">
-  <input hidden type="text" name="instance_id" value="{{request.GET.instance_id}}">
+<form hx-post="{{ request.path }}?{{ request.GET.urlencode }}" hx-swap="outerHTML" hx-encoding="multipart/form-data">
+    <input hidden type="submit" id="allocationEmployeeFormsSubmit">
+    <input hidden type="text" name="instance_id" value="{{ request.GET.instance_id }}">
 
-{% load widget_tweaks %} {% load i18n %}
-{% load generic_template_filters %}
-<script>
-  $("#reloadMessagesButton").click()
-</script>
-<style>
-  .oh-label{
-    font-weight: bold;
-  }
-</style>
+    {% load widget_tweaks %} {% load i18n %}
+    {% load generic_template_filters %}
+    <script>
+        $("#reloadMessagesButton").click()
+    </script>
+    <style>
+        .oh-label {
+            font-weight: bold;
+        }
+    </style>
 
-<div id="{{form.container_id}}">
-    <div class="oh-profile-section__card row">
-      <div class="row" style="padding-right: 0;">
-        <div class="col-12" style="padding-right: 0;">{{ form.non_field_errors }}</div>
-        {% for field in form.visible_fields %}
-        <div class="col-12 col-md-{{field|col}}" id="id_{{ field.name }}_parent_div" style="padding-right: 0;">
-          <div class="oh-label__info" for="id_{{ field.name }}">
-            <label class="oh-label {% if field.field.required %} required-star{% endif %}" for="id_{{ field.name }}"
-              >{% trans field.label %}</label
-            >
-            {% if field.help_text != '' %}
-            <span
-              class="oh-info mr-2"
-              title="{{ field.help_text|safe }}"
-            ></span>
-            {% endif %}
-          </div>
+    <div id="{{ form.container_id }}">
+        <div class="oh-profile-section__card row">
+            <div class="row" style="padding-right: 0;">
+                <div class="col-12" style="padding-right: 0;">{{ form.non_field_errors }}</div>
+                {% for field in form.visible_fields %}
+                    <div class="col-12 col-md-{{ field|col }}" id="id_{{ field.name }}_parent_div" style="padding-right: 0;">
+                        <div class="oh-label__info" for="id_{{ field.name }}">
+                            <label class="oh-label {% if field.field.required %} required-star{% endif %}"
+                                for="id_{{ field.name }}">{% trans field.label %}</label>
+                            {% if field.help_text != '' %}
+                                <span class="oh-info mr-2" title="{{ field.help_text|safe }}"></span>
+                            {% endif %}
+                        </div>
 
-          {% if field.field.widget.input_type == 'checkbox' %}
-          <div class="oh-switch" style="width: 30px">
-            {{ field|add_class:'oh-switch__checkbox' }}
-          </div>
-          {% else %}
-          <div id="dynamic_field_{{field.name}}">
-            {{ field|add_class:'form-control' }}
-            {{ field.errors }}
-          </div>
-          {% endif %}
+                        {% if field.field.widget.input_type == 'checkbox' %}
+                            <div class="oh-switch" style="width: 30px">
+                                {{ field|add_class:'oh-switch__checkbox' }}
+                            </div>
+                        {% elif field.name == "country" or field.name == "state" %}
+                            <div class="oh-input-group mb-2">
+                                <select name="{{ field.name }}" id="{{ field.id_for_label }}" class="oh-select oh-select-2 form-control"
+                                    data-selected="{{ field.value|default:'' }}">
+                                </select>
+                                {{ field.errors }}
+                            </div>
+                        {% else %}
+                            <div id="dynamic_field_{{field.name}}">
+                                {{ field|add_class:'form-control' }}
+                                {{ field.errors }}
+                            </div>
+                        {% endif %}
+                    </div>
+                {% endfor %}
+            </div>
+            {% for field in form.hidden_fields %} {{ field }} {% endfor %}
         </div>
-        {% endfor %}
-      </div>
-
-      {% for field in form.hidden_fields %} {{ field }} {% endfor %}
     </div>
-  </div>
-  <script>
-    {% include 'country.js' %}
-    populateCountries("country", "state");
-    $('.oh-general__tab-target.oh-profile-section').not('.d-none').find('form').find('select[name=country]').val('{{form.instance.country}}').change()
-    $('.oh-general__tab-target.oh-profile-section').not('.d-none').find('form').find('select[name=state]').val('{{form.instance.state}}').change()
-  </script>
 </form>
diff --git a/employee/templates/cbv/document/notify_field.html b/employee/templates/cbv/document/notify_field.html
index ece6fd3c9..5992cee42 100644
--- a/employee/templates/cbv/document/notify_field.html
+++ b/employee/templates/cbv/document/notify_field.html
@@ -6,10 +6,3 @@
   >{% trans form.notify_before.label %}</label
 >
 {{form.notify_before}}
-{% comment %} <script>
-  $(document).ready(function () {
-      $("select").on("select2:select", function (e) {
-          $(this).closest("select")[0].dispatchEvent(new Event("change"));
-      });
-  });
-</script> {% endcomment %}
diff --git a/employee/templates/cbv/documents/document_filter.html b/employee/templates/cbv/documents/document_filter.html
deleted file mode 100644
index 8484d45a0..000000000
--- a/employee/templates/cbv/documents/document_filter.html
+++ /dev/null
@@ -1,94 +0,0 @@
-{% load i18n %}
-<div class="oh-dropdown__filter-body">
-    <div class="oh-accordion">
-        <div class="oh-accordion-header">{% 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.id_for_label}}">{% trans "Employee" %}</label>
-                        {{form.employee_id}}
-                    </div>
-                    <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 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 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 class="oh-input-group">
-                        <label class="oh-label" for="{{form.employee_id__is_active.id_for_label}}">{% trans "Is Active" %}?</label>
-                        {{form.employee_id__is_active}}
-                    </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 class="oh-input-group">
-                        <label class="oh-label" for="{{form.employee_id__employee_work_info__job_role_id.id_for_label}}">{% trans "Job Role" %}</label>
-                        {{form.employee_id__employee_work_info__job_role_id}}
-                    </div>
-                    <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 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 class="oh-input-group">
-                        <label class="oh-label" for="{{form.employee_id__gender.id_for_label}}">{% trans "Gender" %}</label>
-                        {{form.employee_id__gender}}
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="oh-accordion">
-        <div class="oh-accordion-header">
-            {% trans "Document Request" %}
-        </div>
-        <div class="oh-accordion-body">
-            <div class="row">
-                <div class="col-sm-12 col-md-12 col-lg-6">
-                    {% comment %} <div class="oh-input-group">
-                        <label class="oh-label"
-                            >{% trans "title" %}</label
-                        >
-                        {{form.title}}
-                    </div> {% endcomment %}
-                    <div class="oh-input-group">
-                        <label class="oh-label" for="{{form.status.id_for_label}}">{% trans "Status" %}</label>
-                        {{form.status}}
-                    </div>
-                </div>
-
-                <div class="col-sm-12 col-md-12 col-lg-6">
-                    {% comment %} <div class="oh-input-group">
-                        <label class="oh-label"
-                            >{% trans "Employee" %}</label
-                        >
-                        {{form.employee_id}}
-                    </div> {% endcomment %}
-                    <div class="oh-input-group">
-                        <label class="oh-label" for="{{form.document_request_id.id_for_label}}">{% trans "Document request" %}</label>
-                        {{form.document_request_id}}
-                    </div>
-                </div>
-
-            </div>
-        </div>
-    </div>
-</div>
diff --git a/employee/templates/cbv/employees_view/bulk_update_page.html b/employee/templates/cbv/employees_view/bulk_update_page.html
index b824f36f9..78683fba5 100644
--- a/employee/templates/cbv/employees_view/bulk_update_page.html
+++ b/employee/templates/cbv/employees_view/bulk_update_page.html
@@ -122,7 +122,3 @@
         });
     });
 </script>
-
-<script>
-    {% include 'country.js' %}
-</script>
diff --git a/employee/templates/cbv/employees_view/filter_employee.html b/employee/templates/cbv/employees_view/filter_employee.html
index 09a25b1ec..71a4ab8a9 100644
--- a/employee/templates/cbv/employees_view/filter_employee.html
+++ b/employee/templates/cbv/employees_view/filter_employee.html
@@ -2,116 +2,117 @@
 {% load static %}
 {% load horillafilters %}
 
- <div class="oh-dropdown__filter-body">
+<div class="oh-dropdown__filter-body">
     <div class="oh-accordion">
-    <div class="oh-accordion-header">{% trans "Employee" %}</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_first_name.id_for_label}}">{% trans "First Name" %}</label>
-            {{form.employee_first_name}}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label" for="{{form.email.id_for_label}}">{% trans "Email" %}</label>
-            {{form.email}}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Country' %}</label>
-            <select name="country" class="oh-select-2 oh-select w-100 country" id="country">
-            </select>
-          </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_last_name.id_for_label}}">{% trans "Last Name" %}</label>
-            {{form.employee_last_name}}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label" for="{{form.phone.id_for_label}}">{% trans "Phone" %}</label>
-            {{form.phone}}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label" for="{{form.gender.id_for_label}}">{% trans "Gender" %}</label>
-            {{form.gender}}
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="oh-accordion">
-    <div class="oh-accordion-header">{% 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_work_info__company_id.id_for_label}}">{% trans "Company" %}</label>
-            {{form.employee_work_info__company_id}}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label" for="{{form.employee_work_info__department_id.id_for_label}}">{% trans "Department" %}</label>
-            {{form.employee_work_info__department_id}}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label" for="{{form.employee_work_info__shift_id.id_for_label}}">{% trans "Shift" %}</label>
-            {{form.employee_work_info__shift_id}}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label" for="{{form.employee_work_info__tags.id_for_label}}">{% trans "Employee tag" %}</label>
-            {{form.employee_work_info__tags}}
-          </div>
+        <div class="oh-accordion-header">{% trans "Employee" %}</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_first_name.id_for_label}}">{% trans "First Name" %}</label>
+                        {{form.employee_first_name}}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label" for="{{form.email.id_for_label}}">{% trans "Email" %}</label>
+                        {{form.email}}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Country' %}</label>
+                        <select name="country" class="oh-select-2 oh-select w-100 country" id="country">
+                        </select>
+                    </div>
+                </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_work_info__reporting_manager_id.id_for_label}}">{% trans "Reporting Manager" %}</label>
-            {{form.employee_work_info__reporting_manager_id}}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label" for="{{form.employee_work_info__job_position_id.id_for_label}}">{% trans "Job Position" %}</label>
-            {{form.employee_work_info__job_position_id}}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label" for="{{form.employee_work_info__work_type_id.id_for_label}}">{% trans "Work Type" %}</label>
-            {{form.employee_work_info__work_type_id}}
-          </div>
-          {% if "attendance"|app_installed %}
-          <div class="oh-input-group">
-            <label class="oh-label" for="{{form.working_today.id_for_label}}">{% trans "Currently Working" %}</label>
-            {{form.working_today}}
-          </div>
-          {% endif %}
-        </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">
-            <div class="oh-input-group">
-              <label class="oh-label" for="{{form.employee_user_id__groups.id_for_label}}">{% trans "Groups" %}?</label>
-              {{form.employee_user_id__groups}}
+                <div class="col-sm-12 col-md-12 col-lg-6">
+                    <div class="oh-input-group">
+                        <label class="oh-label" for="{{form.employee_last_name.id_for_label}}">{% trans "Last Name" %}</label>
+                        {{form.employee_last_name}}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label" for="{{form.phone.id_for_label}}">{% trans "Phone" %}</label>
+                        {{form.phone}}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label" for="{{form.gender.id_for_label}}">{% trans "Gender" %}</label>
+                        {{form.gender}}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="oh-accordion">
+        <div class="oh-accordion-header">{% 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_work_info__company_id.id_for_label}}">{% trans "Company" %}</label>
+                        {{form.employee_work_info__company_id}}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label" for="{{form.employee_work_info__department_id.id_for_label}}">{% trans "Department" %}</label>
+                        {{form.employee_work_info__department_id}}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label" for="{{form.employee_work_info__shift_id.id_for_label}}">{% trans "Shift" %}</label>
+                        {{form.employee_work_info__shift_id}}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label" for="{{form.employee_work_info__tags.id_for_label}}">{% trans "Employee tag" %}</label>
+                        {{form.employee_work_info__tags}}
+                    </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_work_info__reporting_manager_id.id_for_label}}">{% trans "Reporting Manager" %}</label>
+                        {{form.employee_work_info__reporting_manager_id}}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label" for="{{form.employee_work_info__job_position_id.id_for_label}}">{% trans "Job Position" %}</label>
+                        {{form.employee_work_info__job_position_id}}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label" for="{{form.employee_work_info__work_type_id.id_for_label}}">{% trans "Work Type" %}</label>
+                        {{form.employee_work_info__work_type_id}}
+                    </div>
+                    {% if "attendance"|app_installed %}
+                    <div class="oh-input-group">
+                        <label class="oh-label" for="{{form.working_today.id_for_label}}">{% trans "Currently Working" %}</label>
+                        {{form.working_today}}
+                    </div>
+                    {% endif %}
+                </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">
+                        <div class="oh-input-group">
+                            <label class="oh-label" for="{{form.employee_user_id__groups.id_for_label}}">{% trans "Groups" %}?</label>
+                            {{form.employee_user_id__groups}}
+                        </div>
+                        <div class="oh-input-group">
+                            <label class="oh-label" for="{{form.is_active.id_for_label}}">{% trans "Is Active" %}?</label>
+                            {{form.is_active}}
+                        </div>
+                    </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_user_id__user_permissions.id_for_label}}">{% trans "Permissions" %}</label>
+                        {{form.employee_user_id__user_permissions}}
+                    </div>
+                </div>
             </div>
-            <div class="oh-input-group">
-              <label class="oh-label" for="{{form.is_active.id_for_label}}">{% trans "Is Active" %}?</label>
-              {{form.is_active}}
-            </div>
-          </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_user_id__user_permissions.id_for_label}}">{% trans "Permissions" %}</label>
-            {{form.employee_user_id__user_permissions}}
-          </div>
-        </div>
-      </div>
     </div>
-  </div>
 </div>
 <script src="{% static '/base/filter.js' %}"></script>
-<script>
-{% include 'filter_country.js' %}
-</script>
diff --git a/horilla_views/templates/generic/form.html b/horilla_views/templates/generic/form.html
index b6efea7d2..bb3947304 100644
--- a/horilla_views/templates/generic/form.html
+++ b/horilla_views/templates/generic/form.html
@@ -1,93 +1,81 @@
 {% load widget_tweaks %} {% load i18n %}
 {% load generic_template_filters %}
 <style>
-  .condition-highlight {
-    background-color: #ffa5000f;
-  }
+    .condition-highlight {
+        background-color: #ffa5000f;
+    }
 </style>
+
 {% if form.verbose_name %}
-<div class="oh-modal__dialog-header">
-  <h2 class="oh-modal__dialog-title" id="createTitle">
-  {{form.verbose_name}}
-  </h2>
-  <button type="button" class="oh-modal__close--custom" onclick="$(this).closest('.oh-modal--show').removeClass('oh-modal--show')" aria-label="Close" {{form.close_button_attrs|safe}}>
-      <ion-icon name="close-outline" role="img" class="md hydrated" aria-label="close outline"></ion-icon>
-  </button>
-</div>
-{% endif %}
-<div class="oh-modal__dialog-body oh-modal__dialog-relative">
-  {% if form.instance_ids %}
-  <div class="oh-modal__dialog oh-modal__dialog--navigation m-0 p-0">
-    <button
-      hx-get="{{form.previous_url}}?{{form.ids_key}}={{form.instance_id}}&{{request.GET.urlencode}}"
-      hx-swap="innerHTML"
-      hx-target="#genericModalBody"
-      class="oh-modal__diaglog-nav oh-modal__nav-prev"
-    >
-      <ion-icon name="chevron-back-outline"></ion-icon>
-    </button>
-
-    <button
-      hx-get="{{form.next_url}}?{{form.ids_key}}={{form.instance_id}}&{{request.GET.urlencode}}"
-      hx-swap="innerHTML"
-      hx-target="#genericModalBody"
-      class="oh-modal__diaglog-nav oh-modal__nav-next"
-    >
-      <ion-icon name="chevron-forward-outline"></ion-icon>
-    </button>
-  </div>
-  {% endif %}
-  <div class="oh-general__tab-target oh-profile-section" id="{{form.container_id}}">
-    <div class="oh-profile-section__card row">
-      <div class="row" style="padding-right: 0;">
-        <div class="col-12" style="padding-right: 0;">{{ form.non_field_errors }}</div>
-        {% for field in form.visible_fields %}
-        <div class="col-12 col-md-{{field|col}}" id="id_{{ field.name }}_parent_div" style="padding-right: 0;">
-          <div class="oh-label__info" for="id_{{ field.name }}">
-            <label class="oh-label {% if field.field.required %} required-star{% endif %}" for="id_{{ field.name }}"
-              >{% trans field.label %}</label
-            >
-            {% if field.help_text != '' %}
-            <span
-              class="oh-info mr-2"
-              title="{{ field.help_text|safe }}"
-            ></span>
-            {% endif %}
-          </div>
-
-          {% if field.field.widget.input_type == 'checkbox' %}
-          <div class="oh-switch" style="width: 30px">
-            {{ field|add_class:'oh-switch__checkbox' }}
-          </div>
-          {% else %}
-          <div id="dynamic_field_{{field.name}}">
-            {{ field|add_class:'form-control' }}
-            {{ field.errors }}
-          </div>
-          {% endif %}
-        </div>
-        {% endfor %}
-      </div>
-
-      {% for field in form.hidden_fields %} {{ field }} {% endfor %}
-
-      <div class="d-flex flex-row-reverse">
-        <button
-          type="submit"
-          class="oh-btn oh-btn--secondary mt-2 mr-0 pl-4 pr-5 oh-btn--w-100-resp"
-          {{form.submit_button_attrs|safe}}
-        >
-          {% trans 'Save' %}
+    <div class="oh-modal__dialog-header">
+        <h2 class="oh-modal__dialog-title" id="createTitle">
+            {{form.verbose_name}}
+        </h2>
+        <button type="button" class="oh-modal__close--custom"
+            onclick="$(this).closest('.oh-modal--show').removeClass('oh-modal--show')" aria-label="Close"
+            {{form.close_button_attrs|safe}}>
+            <ion-icon name="close-outline" role="img" class="md hydrated" aria-label="close outline"></ion-icon>
         </button>
-      </div>
     </div>
-  </div>
+{% endif %}
+
+<div class="oh-modal__dialog-body oh-modal__dialog-relative">
+    {% if form.instance_ids %}
+        <div class="oh-modal__dialog oh-modal__dialog--navigation m-0 p-0">
+            <button hx-get="{{form.previous_url}}?{{form.ids_key}}={{form.instance_id}}&{{request.GET.urlencode}}"
+                hx-swap="innerHTML" hx-target="#genericModalBody" class="oh-modal__diaglog-nav oh-modal__nav-prev">
+                <ion-icon name="chevron-back-outline"></ion-icon>
+            </button>
+
+            <button hx-get="{{form.next_url}}?{{form.ids_key}}={{form.instance_id}}&{{request.GET.urlencode}}"
+                hx-swap="innerHTML" hx-target="#genericModalBody" class="oh-modal__diaglog-nav oh-modal__nav-next">
+                <ion-icon name="chevron-forward-outline"></ion-icon>
+            </button>
+        </div>
+    {% endif %}
+    <div class="oh-general__tab-target oh-profile-section" id="{{form.container_id}}">
+        <div class="oh-profile-section__card row">
+            <div class="row" style="padding-right: 0;">
+                <div class="col-12" style="padding-right: 0;">{{ form.non_field_errors }}</div>
+                {% for field in form.visible_fields %}
+                    <div class="col-12 col-md-{{field|col}}" id="id_{{ field.name }}_parent_div" style="padding-right: 0;">
+                        <div class="oh-label__info" for="id_{{ field.name }}">
+                            <label class="oh-label {% if field.field.required %} required-star{% endif %}"
+                                for="id_{{ field.name }}">{% trans field.label %}</label>
+                            {% if field.help_text != '' %}
+                                <span class="oh-info mr-2" title="{{ field.help_text|safe }}"></span>
+                            {% endif %}
+                        </div>
+
+                        {% if field.field.widget.input_type == 'checkbox' %}
+                            <div class="oh-switch" style="width: 30px">
+                                {{ field|add_class:'oh-switch__checkbox' }}
+                            </div>
+                        {% elif field.name == "country" or field.name == "state" %}
+                            <div class="oh-input-group mb-2">
+                                <select name="{{ field.name }}" id="{{ field.id_for_label }}" class="oh-select oh-select-2 form-control"
+                                    data-selected="{{ field.value|default:'' }}">
+                                </select>
+                                {{ field.errors }}
+                            </div>
+                        {% else %}
+                            <div id="dynamic_field_{{field.name}}">
+                                {{ field|add_class:'form-control' }}
+                                {{ field.errors }}
+                            </div>
+                        {% endif %}
+                    </div>
+                {% endfor %}
+            </div>
+
+            {% for field in form.hidden_fields %} {{ field }} {% endfor %}
+
+            <div class="d-flex flex-row-reverse">
+                <button type="submit" class="oh-btn oh-btn--secondary mt-2 mr-0 pl-4 pr-5 oh-btn--w-100-resp"
+                    {{form.submit_button_attrs|safe}}>
+                    {% trans 'Save' %}
+                </button>
+            </div>
+        </div>
+    </div>
 </div>
-<script>
-  $(document).ready(function () {
-      $("select").on("select2:select", function (e) {
-         $(".leave-message").hide();
-          $(this).closest("select")[0].dispatchEvent(new Event("change"));
-      });
-  });
-</script>
diff --git a/onboarding/templates/cbv/pipeline/onboarding/filters.html b/onboarding/templates/cbv/pipeline/onboarding/filters.html
index 7829fffbd..b96517b62 100644
--- a/onboarding/templates/cbv/pipeline/onboarding/filters.html
+++ b/onboarding/templates/cbv/pipeline/onboarding/filters.html
@@ -1,108 +1,99 @@
 {% load i18n %}
 {% load static %}
 <div class="oh-dropdown__filter-body">
-  <div class="oh-accordion">
-    <div class="oh-accordion-header">
-      {% trans 'Recruitment' %}
-    </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 'Managers' %}</label>
-            {{ filter_instance_context_name.form.recruitment_managers }}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Start Date' %}</label>
-            {{ filter_instance_context_name.form.start_date }}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Is Published' %}</label>
-            {{ filter_instance_context_name.form.is_published }}
-          </div>
+    <div class="oh-accordion">
+        <div class="oh-accordion-header">
+            {% trans 'Recruitment' %}
         </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 'Managers' %}</label>
+                        {{ filter_instance_context_name.form.recruitment_managers }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Start Date' %}</label>
+                        {{ filter_instance_context_name.form.start_date }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Is Published' %}</label>
+                        {{ filter_instance_context_name.form.is_published }}
+                    </div>
+                </div>
 
-        <div class="col-sm-12 col-md-12 col-lg-6">
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Company' %}</label>
-            {{ filter_instance_context_name.form.company_id }}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'End Date' %}</label>
-            {{ filter_instance_context_name.form.end_date }}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Is closed' %}</label>
-            {{ filter_instance_context_name.form.closed }}
-          </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 From' %}</label>
-            {{ filter_instance_context_name.form.start_from }}
-          </div>
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Till End Date' %}</label>
-            {{ filter_instance_context_name.form.end_till }}
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-
-  <div class="oh-accordion">
-    <div class="oh-accordion-header">
-      {% trans 'Candidate' %}
-    </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 'Country' %}</label>
-            <select name="country" class="oh-select-2 w-100 country" id="country"></select>
-          </div>
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'State' %}</label>
-            <select name="state" class="oh-select-2 w-100 country" id="state"></select>
-          </div>
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Taks' %}</label>
-            {{ candidate_filter_obj.form.tasks }}
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="oh-accordion">
-    <div class="oh-accordion-header">
-      {% trans 'Stage' %}
-    </div>
-    <div class="oh-accordion-body">
-      <div class="row">
-        <div class="col-sm-12 col-md-12">
-          <div class="col-sm-12 col-md-12 col-lg-12 mb-2" style="width: 100%;">
-            <div class="oh-input-group">
-              <label class="oh-label">{% trans 'Stage Managers' %}</label>
+                <div class="col-sm-12 col-md-12 col-lg-6">
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Company' %}</label>
+                        {{ filter_instance_context_name.form.company_id }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'End Date' %}</label>
+                        {{ filter_instance_context_name.form.end_date }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Is closed' %}</label>
+                        {{ filter_instance_context_name.form.closed }}
+                    </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 From' %}</label>
+                        {{ filter_instance_context_name.form.start_from }}
+                    </div>
+                </div>
+                <div class="col-sm-12 col-md-12 col-lg-6">
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Till End Date' %}</label>
+                        {{ filter_instance_context_name.form.end_till }}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="oh-accordion">
+        <div class="oh-accordion-header">
+            {% trans 'Candidate' %}
+        </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 'Country' %}</label>
+                        <select name="country" class="oh-select-2 w-100 country" id="country"></select>
+                    </div>
+                </div>
+                <div class="col-sm-12 col-md-12 col-lg-6">
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'State' %}</label>
+                        <select name="state" class="oh-select-2 w-100 country" id="state"></select>
+                    </div>
+                </div>
+                <div class="col-sm-12 col-md-12 col-lg-6">
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Taks' %}</label>
+                        {{ candidate_filter_obj.form.tasks }}
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <div class="oh-accordion">
+        <div class="oh-accordion-header">
+            {% trans 'Stage' %}
+        </div>
+        <div class="oh-accordion-body">
+            <div class="row">
+                <div class="col-sm-12 col-md-12">
+                    <div class="col-sm-12 col-md-12 col-lg-12 mb-2" style="width: 100%;">
+                        <div class="oh-input-group">
+                            <label class="oh-label">{% trans 'Stage Managers' %}</label>
+                        </div>
+                        {{ stage_filter_obj.form.employee_id }}
+                    </div>
+                </div>
             </div>
-            {{ stage_filter_obj.form.employee_id }}
-          </div>
         </div>
-      </div>
     </div>
-  </div>
 </div>
-<script>
-  $(document).ready(function () {
-    {% include "country.js" %}
-    populateCountries("country","state")
-  });
-</script>
-{% comment %} <div class="oh-dropdown__filter-footer">
-  <button class="oh-btn oh-btn--secondary oh-btn--small w-100 filterButton" id="">{% trans 'Filter' %}</button>
-</div> {% endcomment %}
diff --git a/recruitment/templates/cbv/candidates/filter.html b/recruitment/templates/cbv/candidates/filter.html
index f06152ccb..7724b6283 100644
--- a/recruitment/templates/cbv/candidates/filter.html
+++ b/recruitment/templates/cbv/candidates/filter.html
@@ -2,183 +2,180 @@
 {% load static %}
 
 <div class="oh-dropdown__filter-body">
-  <div class="oh-accordion">
-    <div class="oh-accordion-header">
-      {% trans 'Candidates' %}
-    </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 'Phone' %}</label>
-            {{ form.mobile }}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Hired Date' %}</label>
-            {{ form.hired_date }}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Country' %}</label>
-            <select name="country" class="oh-select-2 oh-select w-100 country" id="country">
-            </select>
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Is Hired' %}?</label>
-            {{ form.hired }}
-          </div>
-          <div class="col-sm-12 col-md-12 col-lg-12 mb-2">
-            <div class="oh-input-group">
-              <label class="oh-label">{% trans "Reject Reason" %}</label>
-              {{form.rejected_candidate__reject_reason_id}}
+    <div class="oh-accordion">
+        <div class="oh-accordion-header">
+            {% trans 'Candidates' %}
+        </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 'Phone' %}</label>
+                        {{ form.mobile }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Hired Date' %}</label>
+                        {{ form.hired_date }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Country' %}</label>
+                        <select name="country" class="oh-select-2 oh-select w-100 country" id="country">
+                        </select>
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Is Hired' %}?</label>
+                        {{ form.hired }}
+                    </div>
+                    <div class="col-sm-12 col-md-12 col-lg-12 mb-2">
+                        <div class="oh-input-group">
+                            <label class="oh-label">{% trans "Reject Reason" %}</label>
+                            {{form.rejected_candidate__reject_reason_id}}
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-12 col-md-12 col-lg-6">
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Email' %}</label>
+                        {{ form.email }}
+                    </div>
+
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Gender' %}</label>
+                        {{ form.gender }}
+                    </div>
+
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'State' %}</label>
+                        <select name="state" class="oh-select-2 oh-select w-100 country" id="state">
+                        </select>
+                    </div>
+
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Is Canceled' %}?</label>
+                        {{ form.canceled }}
+                    </div>
+                    <div class="col-sm-12 col-md-12 col-lg-12 mb-2">
+                        <div class="oh-input-group">
+                            <label class="oh-label">{% trans "Offer Status" %}</label>
+                            {{form.offer_letter_status}}
+                        </div>
+                    </div>
+                </div>
             </div>
-          </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Email' %}</label>
-            {{ form.email }}
-          </div>
+    </div>
+    <div class="oh-accordion">
+        <div class="oh-accordion-header">
+            {% trans 'Recruitment' %}
+        </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 'Recruitment' %}</label>
+                        {{ form.recruitment_id }}
+                    </div>
 
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Gender' %}</label>
-            {{ form.gender }}
-          </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Job Position' %}</label>
+                        {{ form.job_position_id }}
+                    </div>
 
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'State' %}</label>
-            <select name="state" class="oh-select-2 oh-select w-100 country" id="state">
-            </select>
-          </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Start Date' %}</label>
+                        {{ form.start_date }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Is Closed' %}?</label>
+                        {{ form.recruitment_id__closed }}
+                    </div>
 
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Is Canceled' %}?</label>
-            {{ form.canceled }}
-          </div>
-          <div class="col-sm-12 col-md-12 col-lg-12 mb-2">
-            <div class="oh-input-group">
-              <label class="oh-label">{% trans "Offer Status" %}</label>
-              {{form.offer_letter_status}}
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Stage Type' %}</label>
+                        {{ form.stage_id__stage_type }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Stage Managers' %}</label>
+                        {{ form.stage_id__stage_managers }}
+                    </div>
+                </div>
+                <div class="col-sm-12 col-md-12 col-lg-6">
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Stage' %}</label>
+                        {{ form.stage_id }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Department' %}</label>
+                        {{ form.job_position_id__department_id }}
+                    </div>
+
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Company' %}</label>
+                        {{ form.recruitment_id__company_id }}
+                    </div>
+
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Recruitment Managers' %}</label>
+                        {{ form.recruitment_id__recruitment_managers }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'End Date' %}</label>
+                        {{ form.end_date }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Skill Zone' %}</label>
+                        {{ form.skillzonecandidate_set__skill_zone_id }}
+                    </div>
+                </div>
             </div>
-          </div>
         </div>
-      </div>
     </div>
-  </div>
-  <div class="oh-accordion">
-    <div class="oh-accordion-header">
-      {% trans 'Recruitment' %}
-    </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 'Recruitment' %}</label>
-            {{ form.recruitment_id }}
-          </div>
-
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Job Position' %}</label>
-            {{ form.job_position_id }}
-          </div>
-
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Start Date' %}</label>
-            {{ form.start_date }}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Is Closed' %}?</label>
-            {{ form.recruitment_id__closed }}
-          </div>
-
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Stage Type' %}</label>
-            {{ form.stage_id__stage_type }}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Stage Managers' %}</label>
-            {{ form.stage_id__stage_managers }}
-          </div>
+    <div class="oh-accordion">
+        <div class="oh-accordion-header">
+            {% trans 'Survey' %}
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Stage' %}</label>
-            {{ form.stage_id }}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Department' %}</label>
-            {{ form.job_position_id__department_id }}
-          </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 'Question & Response' %}</label>
+                        {{ form.survey_answer_by }}
+                    </div>
+                </div>
+                {% comment %} <div class="col-sm-12 col-md-12 col-lg-6">
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Response' %}</label>
+                        {{ form.survey_response }}
+                    </div>
+                </div> {% endcomment %}
+            </div>
+        </div>
+    </div>
 
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Company' %}</label>
-            {{ form.recruitment_id__company_id }}
-          </div>
-
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Recruitment Managers' %}</label>
-            {{ form.recruitment_id__recruitment_managers }}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'End Date' %}</label>
-            {{ form.end_date }}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Skill Zone' %}</label>
-            {{ form.skillzonecandidate_set__skill_zone_id }}
-          </div>
+    <div class="oh-accordion">
+        <div class="oh-accordion-header">
+            {% trans 'Advanced' %}
         </div>
-      </div>
-    </div>
-  </div>
-  <div class="oh-accordion">
-    <div class="oh-accordion-header">
-      {% trans 'Survey' %}
-    </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 'Question & Response' %}</label>
-            {{ form.survey_answer_by }}
-          </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 'Scheduled From' %}</label>
+                        {{ form.scheduled_from }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Is Active' %}?</label>
+                        {{ form.is_active }}
+                    </div>
+                </div>
+                <div class="col-sm-12 col-md-12 col-lg-6">
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Scheduled Till' %}</label>
+                        {{ form.scheduled_till }}
+                    </div>
+                </div>
+            </div>
         </div>
-        {% comment %} <div class="col-sm-12 col-md-12 col-lg-6">
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Response' %}</label>
-            {{ form.survey_response }}
-          </div>
-        </div> {% endcomment %}
-      </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 'Scheduled From' %}</label>
-            {{ form.scheduled_from }}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Is Active' %}?</label>
-            {{ form.is_active }}
-          </div>
-        </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Scheduled Till' %}</label>
-            {{ form.scheduled_till }}
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
 </div>
 <script src="{% static '/base/filter.js' %}"></script>
-<script>
-{% include 'filter_country.js' %}
-</script>
diff --git a/recruitment/templates/cbv/interview/forms/form_hx.html b/recruitment/templates/cbv/interview/forms/form_hx.html
index fdfabc238..30de53f6e 100644
--- a/recruitment/templates/cbv/interview/forms/form_hx.html
+++ b/recruitment/templates/cbv/interview/forms/form_hx.html
@@ -1,8 +1 @@
 {{form.employee_id}}
-<script>
-    $(document).ready(function () {
-        $("select").on("select2:select", function (e) {
-            $(this).closest("select")[0].dispatchEvent(new Event("change"));
-        });
-    });
-</script>
diff --git a/recruitment/templates/cbv/pipeline/pipeline_filter.html b/recruitment/templates/cbv/pipeline/pipeline_filter.html
index b40876371..46614d5a8 100644
--- a/recruitment/templates/cbv/pipeline/pipeline_filter.html
+++ b/recruitment/templates/cbv/pipeline/pipeline_filter.html
@@ -1,170 +1,128 @@
 {% load i18n %} {% load static %}
 <div class="oh-dropdown__filter-body">
-  <div class="oh-accordion">
-    <div class="oh-accordion-header">{% trans 'Recruitment' %}</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.recruitment_managers.id_for_label}}"
-              >{% trans 'Managers' %}</label
-            >
-            {{ form.recruitment_managers }}
-          </div>
-          <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 class="oh-input-group">
-            <label
-              class="oh-label"
-              for="{{form.start_from.id_for_label}}"
-              >{% trans 'Start Date From' %}</label
-            >
-            {{ form.start_from }}
-          </div>
-          <div class="oh-input-group">
-            <label
-              class="oh-label"
-              for="{{form.closed.id_for_label}}"
-              >{% trans 'Is Closed' %}</label
-            >
-            {{ form.closed }}
-          </div>
-        </div>
+    <div class="oh-accordion">
+        <div class="oh-accordion-header">{% trans 'Recruitment' %}</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.recruitment_managers.id_for_label}}">{% trans 'Managers' %}</label>
+                        {{ form.recruitment_managers }}
+                    </div>
+                    <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 class="oh-input-group">
+                        <label class="oh-label" for="{{form.start_from.id_for_label}}">{% trans 'Start Date From' %}</label>
+                        {{ form.start_from }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label" for="{{form.closed.id_for_label}}">{% trans 'Is Closed' %}</label>
+                        {{ form.closed }}
+                    </div>
+                </div>
 
-        <div class="col-sm-12 col-md-12 col-lg-6">
-          <div class="oh-input-group">
-            <label
-              class="oh-label"
-              for="{{form.company_id.id_for_label}}"
-              >{% trans 'Company' %}</label
-            >
-            {{ form.company_id }}
-          </div>
-          <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 class="oh-input-group">
-            <label
-              class="oh-label"
-              for="{{form.end_till.id_for_label}}"
-              >{% trans 'Till End Date' %}</label
-            >
-            {{ form.end_till }}
-          </div>
-          <div class="oh-input-group">
-            <label
-              class="oh-label"
-              for="{{form.is_published.id_for_label}}"
-              >{% trans 'Is Published' %}</label
-            >
-            {{ form.is_published }}
-          </div>
+                <div class="col-sm-12 col-md-12 col-lg-6">
+                    <div class="oh-input-group">
+                        <label class="oh-label" for="{{form.company_id.id_for_label}}">{% trans 'Company' %}</label>
+                        {{ form.company_id }}
+                    </div>
+                    <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 class="oh-input-group">
+                        <label class="oh-label" for="{{form.end_till.id_for_label}}">{% trans 'Till End Date' %}</label>
+                        {{ form.end_till }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label" for="{{form.is_published.id_for_label}}">{% trans 'Is Published' %}</label>
+                        {{ form.is_published }}
+                    </div>
+                </div>
+            </div>
         </div>
-      </div>
     </div>
-  </div>
 
-  <div class="oh-accordion">
-    <div class="oh-accordion-header">{% trans 'Stage' %}</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 'Recruitment' %}</label>
-            {{ stage_filter_obj.form.recruitment_id }}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Stage Type' %}</label>
-            {{ stage_filter_obj.form.stage_type }}
-          </div>
-        </div>
+    <div class="oh-accordion">
+        <div class="oh-accordion-header">{% trans 'Stage' %}</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 'Recruitment' %}</label>
+                        {{ stage_filter_obj.form.recruitment_id }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Stage Type' %}</label>
+                        {{ stage_filter_obj.form.stage_type }}
+                    </div>
+                </div>
 
-        <div class="col-sm-12 col-md-12 col-lg-6">
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Stage Managers' %}</label>
-            {{ stage_filter_obj.form.stage_managers }}
-          </div>
+                <div class="col-sm-12 col-md-12 col-lg-6">
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Stage Managers' %}</label>
+                        {{ stage_filter_obj.form.stage_managers }}
+                    </div>
+                </div>
+            </div>
         </div>
-      </div>
     </div>
-  </div>
 
-  <div class="oh-accordion">
-    <div class="oh-accordion-header">{% trans 'Candidates' %}</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 'Country' %}</label>
-            <select
-              name="country"
-              class="oh-select w-100 country"
-              id="country"
-              data-selected="{{ candidate_filter_obj.form.country.value|default:'' }}"
-            ></select>
-          </div>
-          <div class="col-sm-12 col-md-12 col-lg-12 mb-2">
-            <div class="oh-input-group">
-              <label class="oh-label">{% trans 'Reject Reason' %}</label>
-              {{ candidate_filter_obj.form.rejected_candidate__reject_reason_id }}
+    <div class="oh-accordion">
+        <div class="oh-accordion-header">{% trans 'Candidates' %}</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 'Country' %}</label>
+                        <select name="country" class="oh-select-2 w-100 country" id="country"></select>
+                    </div>
+                    <div class="col-sm-12 col-md-12 col-lg-12 mb-2">
+                        <div class="oh-input-group">
+                            <label class="oh-label">{% trans 'Reject Reason' %}</label>
+                            {{ candidate_filter_obj.form.rejected_candidate__reject_reason_id }}
+                        </div>
+                        <div class="oh-input-group">
+                            <label class="oh-label">{% trans 'Is Hired' %}</label>
+                            {{ candidate_filter_obj.form.hired }}
+                        </div>
+                        <div class="oh-input-group">
+                            <label class="oh-label">{% trans 'Gender' %}</label>
+                            {{ candidate_filter_obj.form.gender }}
+                        </div>
+                        <div class="oh-input-group">
+                            <label class="oh-label">{% trans 'Job Position' %}</label>
+                            {{ candidate_filter_obj.form.job_position_id }}
+                        </div>
+                    </div>
+                </div>
+                <div class="col-sm-12 col-md-12 col-lg-6">
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'State' %}</label>
+                        <select name="state" class="oh-select-2 w-100 country" id="state"></select>
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Offer Status' %}</label>
+                        {{ candidate_filter_obj.form.offer_letter_status }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Is Canceled' %}</label>
+                        {{ candidate_filter_obj.form.canceled }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Rating' %}</label>
+                        {{ candidate_filter_obj.form.candidate_rating__rating }}
+                    </div>
+                    <div class="oh-input-group">
+                        <label class="oh-label">{% trans 'Department' %}</label>
+                        {{ candidate_filter_obj.form.job_position_id__department_id }}
+                    </div>
+                </div>
             </div>
-            <div class="oh-input-group">
-              <label class="oh-label">{% trans 'Is Hired' %}</label>
-              {{ candidate_filter_obj.form.hired }}
-            </div>
-            <div class="oh-input-group">
-              <label class="oh-label">{% trans 'Gender' %}</label>
-              {{ candidate_filter_obj.form.gender }}
-            </div>
-            <div class="oh-input-group">
-              <label class="oh-label">{% trans 'Job Position' %}</label>
-              {{ candidate_filter_obj.form.job_position_id }}
-            </div>
-          </div>
         </div>
-        <div class="col-sm-12 col-md-12 col-lg-6">
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'State' %}</label>
-            <select
-              name="state"
-              class="oh-select w-100 country"
-              data-selected="{{ candidate_filter_obj.form.state.value|default:'' }}"
-              id="state"
-            ></select>
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Offer Status' %}</label>
-            {{ candidate_filter_obj.form.offer_letter_status }}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Is Canceled' %}</label>
-            {{ candidate_filter_obj.form.canceled }}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Rating' %}</label>
-            {{ candidate_filter_obj.form.candidate_rating__rating }}
-          </div>
-          <div class="oh-input-group">
-            <label class="oh-label">{% trans 'Department' %}</label>
-            {{ candidate_filter_obj.form.job_position_id__department_id }}
-          </div>
-        </div>
-      </div>
     </div>
-  </div>
 </div>
 
 <script src="{% static '/base/filter.js' %}"></script>