[UPDT]filter tags in employee and base
This commit is contained in:
@@ -100,6 +100,6 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="oh-dropdown__filter-footer">
|
||||
<button class="oh-btn oh-btn--secondary oh-btn--small w-100" id='#employeeFilter' onclick="employeeFilter(this)">{% trans "Filter" %}</button>
|
||||
<button class="oh-btn oh-btn--secondary oh-btn--small w-100 filterButton" id='#employeeFilter' onclick="employeeFilter(this)">{% trans "Filter" %}</button>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% include 'filter_tags.html' %}
|
||||
<div class="oh-layout--grid-3">
|
||||
{% for emp in data %}
|
||||
<div class="oh-kanban-card" style="color: inherit;text-decoration: none;">
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{% include 'filter_tags.html' %}
|
||||
<div class="oh-sticky-table">
|
||||
<div class="oh-sticky-table__table oh-table--sortable">
|
||||
<div class="oh-sticky-table__thead">
|
||||
|
||||
@@ -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,
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user