nestict/ihrm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UPDT] LEAVE: Added sorting while clicking on table heading

Browse Source
This commit is contained in:
Horilla
2023-10-20 16:17:03 +05:30
parent 32b517d12d
commit b50795ad17
3 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
leave/templates/leave/leave_request/leave_requests.html
View File

@@ -37,12 +37,12 @@
<div class="oh-sticky-table__table ">
<div class="oh-sticky-table__thead">
<div class="oh-sticky-table__tr">
<div class="oh-sticky-table__th">{% trans "Employee" %}</div>
<div class="oh-sticky-table__th">{% trans "Leave Type" %}</div>
<div class="oh-sticky-table__th">{% trans "Start Date" %}</div>
<div class="oh-sticky-table__th">{% trans "End Date" %}</div>
<div class="oh-sticky-table__th">{% trans "Requested Days" %}</div>
<div class="oh-sticky-table__th">{% trans "Status" %}</div>
<div class="oh-sticky-table__th" hx-get="{% url 'request-filter' %}?{{pd}}&sortby=employee_id" hx-target="#leaveRequest">{% trans "Employee" %}</div>
<div class="oh-sticky-table__th" hx-get="{% url 'request-filter' %}?{{pd}}&sortby=leave_type_id" hx-target="#leaveRequest">{% trans "Leave Type" %}</div>
<div class="oh-sticky-table__th" hx-get="{% url 'request-filter' %}?{{pd}}&sortby=start_date" hx-target="#leaveRequest">{% trans "Start Date" %}</div>
<div class="oh-sticky-table__th" hx-get="{% url 'request-filter' %}?{{pd}}&sortby=end_date" hx-target="#leaveRequest">{% trans "End Date" %}</div>
<div class="oh-sticky-table__th" hx-get="{% url 'request-filter' %}?{{pd}}&sortby=requested_days" hx-target="#leaveRequest">{% trans "Requested Days" %}</div>
<div class="oh-sticky-table__th" hx-get="{% url 'request-filter' %}?{{pd}}&sortby=status" hx-target="#leaveRequest">{% trans "Status" %}</div>
{% if not dashboard %}
<div class="oh-sticky-table__th">{% trans "Options" %}</div>
<div class="oh-sticky-table__th">{% trans "Actions" %}</div>

10
leave/templates/leave/user_leave/user_requests.html
View File

@@ -36,11 +36,11 @@
<div class="oh-sticky-table__table oh-table--sortable">
<div class="oh-sticky-table__thead">
<div class="oh-sticky-table__tr">
<div class="oh-sticky-table__th">{% trans "Leave Type" %}</div>
<div class="oh-sticky-table__th">{% trans "Start Date" %}</div>
<div class="oh-sticky-table__th">{% trans "End Date" %}</div>
<div class="oh-sticky-table__th">{% trans "Requested days" %}</div>
<div class="oh-sticky-table__th">{% trans "Status" %}</div>
<div class="oh-sticky-table__th" hx-get="{% url 'user-request-filter' %}?{{pd}}&sortby=leave_type_id" hx-target="#userRequest">{% trans "Leave Type" %}</div>
<div class="oh-sticky-table__th" hx-get="{% url 'user-request-filter' %}?{{pd}}&sortby=start_date" hx-target="#userRequest">{% trans "Start Date" %}</div>
<div class="oh-sticky-table__th" hx-get="{% url 'user-request-filter' %}?{{pd}}&sortby=end_date" hx-target="#userRequest">{% trans "End Date" %}</div>
<div class="oh-sticky-table__th" hx-get="{% url 'user-request-filter' %}?{{pd}}&sortby=requested_days" hx-target="#userRequest">{% trans "Requested Days" %}</div>
<div class="oh-sticky-table__th" hx-get="{% url 'user-request-filter' %}?{{pd}}&sortby=status" hx-target="#userRequest">{% trans "Status" %}</div>
<div class="oh-sticky-table__th"></div>
<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
</div>

5
leave/views.py
View File

@@ -27,7 +27,7 @@ from django.core.paginator import Paginator
from django.db.models.functions import TruncYear
from horilla.decorators import permission_required
from horilla.decorators import manager_can_enter
from base.methods import filtersubordinates, choosesubordinates, get_key_instances
from base.methods import filtersubordinates, choosesubordinates, get_key_instances, sortby
from django.utils.translation import gettext as __
from django.utils.translation import gettext_lazy as _
from notifications.signals import notify
@@ -332,7 +332,7 @@ def leave_request_filter(request):
"""
previous_data = request.GET.urlencode()
queryset = LeaveRequest.objects.all()
queryset = filtersubordinates(request, queryset, "leave.view_leaverequest")
queryset = sortby(request, queryset, "sortby")
leave_request_filter = LeaveRequestFilter(request.GET, queryset).qs
page_number = request.GET.get("page")
page_obj = paginator_qry(leave_request_filter, page_number)
@@ -1796,6 +1796,7 @@ def user_request_filter(request):
queryset = user.leaverequest_set.all()
previous_data = request.GET.urlencode()
page_number = request.GET.get("page")
queryset = sortby(request, queryset, "sortby")
user_request_filter = UserLeaveRequestFilter(request.GET, queryset).qs
page_obj = paginator_qry(user_request_filter, page_number)
data_dict = parse_qs(previous_data)