[UPDT] RECRUITMENT : Interview section sortable option and table view updation

This commit is contained in:
Horilla
2024-09-23 17:12:08 +05:30
parent 84e37aef06
commit 5daad6ff50
2 changed files with 10 additions and 6 deletions

View File

@@ -41,7 +41,8 @@
class="oh-sticky-table__th" class="oh-sticky-table__th"
>{% trans "Interviewer" %}</div> >{% trans "Interviewer" %}</div>
<div data-cell-index="2" data-cell-title='{% trans "Interview Date" %}' <div data-cell-index="2" data-cell-title='{% trans "Interview Date" %}'
class="oh-sticky-table__th" class="oh-sticky-table__th {% if request.sort_option.order == '-interview_date' %}arrow-up {% elif request.sort_option.order == 'interview_date' %}arrow-down {% else %}arrow-up-down {% endif %}"
hx-get="{% url 'interview-filter-view' %}?{{pd}}&sortby=interview_date" hx-target="#section"
>{% trans "Interview Date" %}</div> >{% trans "Interview Date" %}</div>
<div data-cell-index="3" data-cell-title='{% trans "Interview Time" %}' <div data-cell-index="3" data-cell-title='{% trans "Interview Time" %}'
class="oh-sticky-table__th" class="oh-sticky-table__th"

View File

@@ -43,7 +43,7 @@ from base.backends import ConfiguredEmailBackend
from base.context_processors import check_candidate_self_tracking from base.context_processors import check_candidate_self_tracking
from base.countries import country_arr, s_a, states from base.countries import country_arr, s_a, states
from base.forms import MailTemplateForm from base.forms import MailTemplateForm
from base.methods import export_data, generate_pdf, get_key_instances from base.methods import export_data, generate_pdf, get_key_instances, sortby
from base.models import EmailLog, HorillaMailTemplate, JobPosition from base.models import EmailLog, HorillaMailTemplate, JobPosition
from employee.models import Employee, EmployeeWorkInformation from employee.models import Employee, EmployeeWorkInformation
from horilla import settings from horilla import settings
@@ -1368,11 +1368,14 @@ def interview_filter_view(request):
previous_data = request.GET.urlencode() previous_data = request.GET.urlencode()
if request.user.has_perm("view_interviewschedule"): if request.user.has_perm("view_interviewschedule"):
interviews = InterviewSchedule.objects.all() interviews = InterviewSchedule.objects.all().order_by("-interview_date")
else: else:
interviews = InterviewSchedule.objects.filter( interviews = InterviewSchedule.objects.filter(
employee_id=request.user.employee_get.id employee_id=request.user.employee_get.id
) ).order_by("-interview_date")
if request.GET.get("sortby"):
interviews = sortby(request, interviews, "sortby")
dis_filter = InterviewFilter(request.GET, queryset=interviews).qs dis_filter = InterviewFilter(request.GET, queryset=interviews).qs
@@ -1401,11 +1404,11 @@ def interview_view(request):
previous_data = request.GET.urlencode() previous_data = request.GET.urlencode()
if request.user.has_perm("view_interviewschedule"): if request.user.has_perm("view_interviewschedule"):
interviews = InterviewSchedule.objects.all() interviews = InterviewSchedule.objects.all().order_by("-interview_date")
else: else:
interviews = InterviewSchedule.objects.filter( interviews = InterviewSchedule.objects.filter(
employee_id=request.user.employee_get.id employee_id=request.user.employee_get.id
) ).order_by("-interview_date")
form = InterviewFilter(request.GET, queryset=interviews) form = InterviewFilter(request.GET, queryset=interviews)
page_number = request.GET.get("page") page_number = request.GET.get("page")