From d15ca2681036afe2f5c2fb26d8c5604bb1eb06a9 Mon Sep 17 00:00:00 2001 From: Horilla Date: Mon, 4 Sep 2023 16:26:14 +0530 Subject: [PATCH] [UPDT]filter tags in employee and base --- base/methods.py | 6 ++++++ .../base/rotating_shift/filters.html | 2 +- .../rotating_shift_assign_view.html | 1 + .../base/rotating_work_type/filters.html | 6 +++--- .../rotating_work_type_assign_view.html | 1 + .../shift_request/htmx/requests.html | 1 + .../shift_request/shift_request_nav.html | 2 +- .../work_type_request/htmx/requests.html | 1 + .../work_type_request_nav.html | 2 +- base/views.py | 20 ++++++++++++++++++- employee/templates/employee_filters.html | 2 +- .../employee_personal_info/employee_card.html | 1 + .../employee_personal_info/employee_list.html | 1 + employee/views.py | 12 ++++++++++- templates/filter_tags.html | 1 + 15 files changed, 50 insertions(+), 9 deletions(-) diff --git a/base/methods.py b/base/methods.py index 02121b32e..f2205f149 100644 --- a/base/methods.py +++ b/base/methods.py @@ -250,8 +250,14 @@ def get_key_instances(model, data_dict): nested_instance = get_nested_instances(model, field_names, field_values) if nested_instance is not None: data_dict[key] = nested_instance + if 'csrfmiddlewaretoken' in data_dict: del data_dict['csrfmiddlewaretoken'] + + keys_to_remove = [key for key, value in data_dict.items() if value == ['unknown']] + for key in keys_to_remove: + del data_dict[key] + return data_dict diff --git a/base/templates/base/rotating_shift/filters.html b/base/templates/base/rotating_shift/filters.html index 1db58340b..e67c8f87a 100644 --- a/base/templates/base/rotating_shift/filters.html +++ b/base/templates/base/rotating_shift/filters.html @@ -93,7 +93,7 @@
diff --git a/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html b/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html index 37bca4535..0aecb899a 100644 --- a/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html +++ b/base/templates/base/rotating_work_type/rotating_work_type_assign_view.html @@ -1,6 +1,7 @@ {% load static %} {% load i18n %} {% load basefilters %} +{% include 'filter_tags.html' %}
diff --git a/base/templates/shift_request/htmx/requests.html b/base/templates/shift_request/htmx/requests.html index f84c4f59a..a48b911f8 100755 --- a/base/templates/shift_request/htmx/requests.html +++ b/base/templates/shift_request/htmx/requests.html @@ -2,6 +2,7 @@ {% load attendancefilters %} {% load static %} {% load i18n %} +{% include 'filter_tags.html' %}
diff --git a/base/templates/shift_request/shift_request_nav.html b/base/templates/shift_request/shift_request_nav.html index aa91399f1..93ba21e12 100644 --- a/base/templates/shift_request/shift_request_nav.html +++ b/base/templates/shift_request/shift_request_nav.html @@ -204,7 +204,7 @@ x-data="{searchShow: false}"
- +
diff --git a/base/templates/work_type_request/htmx/requests.html b/base/templates/work_type_request/htmx/requests.html index 8121cd46d..eb7d2a1c9 100755 --- a/base/templates/work_type_request/htmx/requests.html +++ b/base/templates/work_type_request/htmx/requests.html @@ -2,6 +2,7 @@ {% load attendancefilters %} {% load static %} {% load i18n %} +{% include 'filter_tags.html' %}
diff --git a/base/templates/work_type_request/work_type_request_nav.html b/base/templates/work_type_request/work_type_request_nav.html index 7b01e95af..1fde636ef 100644 --- a/base/templates/work_type_request/work_type_request_nav.html +++ b/base/templates/work_type_request/work_type_request_nav.html @@ -200,7 +200,7 @@ x-data="{searchShow: false}"
- +
diff --git a/base/views.py b/base/views.py index 5c749b975..0dcc40745 100644 --- a/base/views.py +++ b/base/views.py @@ -3,6 +3,7 @@ views.py This module is used to map url pattens with django views or methods """ +from urllib.parse import parse_qs import uuid import json from django.shortcuts import render, redirect @@ -65,7 +66,12 @@ from base.filters import ( RotatingShiftAssignFilters, RotatingWorkTypeAssignFilter, ) -from base.methods import choosesubordinates, filtersubordinates, sortby +from base.methods import ( + choosesubordinates, + filtersubordinates, + get_key_instances, + sortby, +) def custom404(request, exception): @@ -883,6 +889,8 @@ def rotating_work_type_assign_view(request): request, rwork_type_assign, "base.view_rotatingworktypeassign" ) rwork_type_assign = sortby(request, rwork_type_assign, "orderby") + data_dict = parse_qs(previous_data) + get_key_instances(RotatingWorkTypeAssign, data_dict) return render( request, "base/rotating_work_type/rotating_work_type_assign_view.html", @@ -891,6 +899,7 @@ def rotating_work_type_assign_view(request): rwork_type_assign, request.GET.get("page") ), "pd": previous_data, + "filter_dict": data_dict, }, ) @@ -1394,12 +1403,15 @@ def rotating_shift_assign_view(request): request, rshift_assign, "base.view_rotatingshiftassign" ) rshift_assign = sortby(request, rshift_assign, "orderby") + data_dict = parse_qs(previous_data) + get_key_instances(RotatingShiftAssign, data_dict) return render( request, "base/rotating_shift/rotating_shift_assign_view.html", { "rshift_assign": paginator_qry(rshift_assign, request.GET.get("page")), "pd": previous_data, + "filter_dict": data_dict, }, ) @@ -1676,12 +1688,15 @@ def work_type_request_search(request): employee_id=employee ) work_typ_requests = sortby(request, work_typ_requests, "orderby") + data_dict = parse_qs(previous_data) + get_key_instances(WorkTypeRequest, data_dict) return render( request, "work_type_request/htmx/requests.html", { "data": paginator_qry(work_typ_requests, request.GET.get("page")), "pd": previous_data, + "filter_dict": data_dict, }, ) @@ -2095,12 +2110,15 @@ def shift_request_search(request): employee_id=employee ) shift_requests = sortby(request, shift_requests, "orderby") + data_dict = parse_qs(previous_data) + get_key_instances(ShiftRequest, data_dict) return render( request, "shift_request/htmx/requests.html", { "data": paginator_qry(shift_requests, request.GET.get("page")), "pd": previous_data, + "filter_dict": data_dict, }, ) diff --git a/employee/templates/employee_filters.html b/employee/templates/employee_filters.html index f16d7c8ae..a4ea0b8c9 100644 --- a/employee/templates/employee_filters.html +++ b/employee/templates/employee_filters.html @@ -100,6 +100,6 @@
- +
diff --git a/employee/templates/employee_personal_info/employee_card.html b/employee/templates/employee_personal_info/employee_card.html index 20c4b9636..9b2a80770 100644 --- a/employee/templates/employee_personal_info/employee_card.html +++ b/employee/templates/employee_personal_info/employee_card.html @@ -10,6 +10,7 @@ {% endfor %}
{% endif %} +{% include 'filter_tags.html' %}
{% for emp in data %}
diff --git a/employee/templates/employee_personal_info/employee_list.html b/employee/templates/employee_personal_info/employee_list.html index 1a47fa73a..bb85992c6 100644 --- a/employee/templates/employee_personal_info/employee_list.html +++ b/employee/templates/employee_personal_info/employee_list.html @@ -5,6 +5,7 @@ {% endfor %}
{% endif %} +{% include 'filter_tags.html' %}
diff --git a/employee/views.py b/employee/views.py index c05c2265d..2b99ccd78 100755 --- a/employee/views.py +++ b/employee/views.py @@ -16,6 +16,7 @@ import json import calendar from datetime import datetime, timedelta, date from collections import defaultdict +from urllib.parse import parse_qs import pandas as pd from django.db.models import F from django.conf import settings @@ -42,7 +43,12 @@ from base.models import ( EmployeeType, Company, ) -from base.methods import filtersubordinates, filtersubordinatesemployeemodel, sortby +from base.methods import ( + filtersubordinates, + filtersubordinatesemployeemodel, + get_key_instances, + sortby, +) from employee.filters import EmployeeFilter from employee.forms import ( EmployeeForm, @@ -60,6 +66,7 @@ def get_language_code(request): language_code = request.LANGUAGE_CODE return JsonResponse({"language_code": language_code}) + @login_required def employee_profile(request): """ @@ -545,6 +552,8 @@ def employee_filter_view(request): page_number = request.GET.get("page") template = "employee_personal_info/employee_card.html" view = request.GET.get("view") + data_dict = parse_qs(previous_data) + get_key_instances(Employee, data_dict) if view == "list": template = "employee_personal_info/employee_list.html" return render( @@ -554,6 +563,7 @@ def employee_filter_view(request): "data": paginator_qry(filter_obj.qs, page_number), "f": filter_obj, "pd": previous_data, + "filter_dict": data_dict, }, ) diff --git a/templates/filter_tags.html b/templates/filter_tags.html index 51699750a..25dca8992 100644 --- a/templates/filter_tags.html +++ b/templates/filter_tags.html @@ -22,6 +22,7 @@ // Update all elements with the same ID to have null values {% comment %} $('[id="id_' + field_id + '"]').val(''); {% endcomment %} $(`[name=${field_id}]`).val(''); + console.log( $(`[name=${field_id}]`)) $(form_submit_id).click() }) });