From 80372dee6d4112dc967870bf41bdaaf6d34583ce Mon Sep 17 00:00:00 2001 From: Horilla Date: Mon, 15 Sep 2025 12:39:24 +0530 Subject: [PATCH] [FIX] EMPLOYEE: #913 --- employee/templates/employee_filters.html | 236 ++++++++++++----------- static/index/country.js | 7 +- 2 files changed, 124 insertions(+), 119 deletions(-) diff --git a/employee/templates/employee_filters.html b/employee/templates/employee_filters.html index 26f417fe9..4043c5d8b 100644 --- a/employee/templates/employee_filters.html +++ b/employee/templates/employee_filters.html @@ -1,125 +1,127 @@ {% load i18n %} {% load static %} -
+
-
{% trans "Employee" %}
-
-
-
-
- - {{f.form.employee_first_name}} -
-
- - {{f.form.email}} -
-
- - {{f.form.country}} -
+
{% trans "Employee" %}
+
+
+
+
+ + {{f.form.employee_first_name}} +
+
+ + {{f.form.email}} +
+
+ + {% comment %} # 913 {% endcomment %} +
+
+
+
+ + {{f.form.employee_last_name}} +
+
+ + {{f.form.phone}} +
+
+ + {{f.form.gender}} +
+
+
+
+
+
+
{% trans "Work Info" %}
+
+
+
+
+ + {{f.form.employee_work_info__company_id}} +
+
+ + {{f.form.employee_work_info__department_id}} +
+
+ + {{f.form.employee_work_info__shift_id}} +
+
+ + {{f.form.employee_work_info__tags}} +
+
+
+
+ + {{f.form.employee_work_info__reporting_manager_id}} +
+
+ + {{f.form.employee_work_info__job_position_id}} +
+
+ + {{f.form.employee_work_info__work_type_id}} +
+
+ + {{f.form.working_today}} +
+
+
-
-
- - {{f.form.employee_last_name}} -
-
- - {{f.form.phone}} -
-
- - {{f.form.gender}} -
-
-
-
-
-
{% trans "Work Info" %}
-
-
-
-
- - {{f.form.employee_work_info__company_id}} -
-
- - {{f.form.employee_work_info__department_id}} -
-
- - {{f.form.employee_work_info__shift_id}} -
-
- - {{f.form.employee_work_info__tags}} -
- +
+
{% trans "Advanced" %}
+
+
+
+
+
+ + {{f.form.employee_user_id__groups}} +
+
+ + {{f.form.probation_from}} +
+
+ + {{f.form.is_active}} +
+
+ + {{f.form.is_directly_converted}} +
+
+
+
+
+ + {{f.form.employee_user_id__user_permissions}} +
+
+ + {{f.form.probation_till}} +
+
+ + {{f.form.is_from_onboarding}} +
+
+
-
-
- - {{f.form.employee_work_info__reporting_manager_id}} -
-
- - {{f.form.employee_work_info__job_position_id}} -
-
- - {{f.form.employee_work_info__work_type_id}} -
-
- - {{f.form.working_today}} -
-
-
-
-
-
{% trans "Advanced" %}
-
-
-
-
-
- - {{f.form.employee_user_id__groups}} -
-
- - {{f.form.probation_from}} -
-
- - {{f.form.is_active}} -
-
- - {{f.form.is_directly_converted}} -
-
-
-
-
- - {{f.form.employee_user_id__user_permissions}} -
-
- - {{f.form.probation_till}} -
-
- - {{f.form.is_from_onboarding}} -
-
-
-
-
-
+
diff --git a/static/index/country.js b/static/index/country.js index 39933fd2d..b2c3a1159 100644 --- a/static/index/country.js +++ b/static/index/country.js @@ -730,10 +730,13 @@ function populateCountries(countryElementId, stateElementId) { } countryEl.options[countryEl.length] = option; } - + // # 913 + countryEl.onchange = function () { + let selectedValue = this.value; + this.setAttribute("data-selected", selectedValue); + }; if (stateEl) { populateStates(countryElementId, stateElementId); - countryEl.onchange = function () { populateStates(countryElementId, stateElementId); };