From f786b93bb6dbb95237d56adb76fa8120c29cd8d3 Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Tue, 9 Apr 2024 10:03:48 +0530
Subject: [PATCH] [FIX] PAYROLL: Fixed contract sortby issues

---
 payroll/templates/payroll/contract/contract_list.html | 4 ++--
 payroll/views/views.py                                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/payroll/templates/payroll/contract/contract_list.html b/payroll/templates/payroll/contract/contract_list.html
index e754e91b9..04d0e8a9b 100644
--- a/payroll/templates/payroll/contract/contract_list.html
+++ b/payroll/templates/payroll/contract/contract_list.html
@@ -43,8 +43,8 @@
             </div>
             <div class="oh-sticky-table__th">{% trans "Contract" %}</div>
             <div data-cell-index="1" data-cell-title='{% trans "Employee" %}' 
-              class="oh-sticky-table__th {% if request.sort_option.order == '-employee_id' %}arrow-up {% elif request.sort_option.order == 'employee_id' %}arrow-down {% else %} arrow-up-down {% endif %}"
-              hx-target="#payroll-contract-container" hx-get="{% url 'contract-filter' %}?{{pd}}&orderby=employee_id"
+              class="oh-sticky-table__th {% if request.sort_option.order == '-employee_id__employee_first_name' %}arrow-up {% elif request.sort_option.order == 'employee_id__employee_first_name' %}arrow-down {% else %} arrow-up-down {% endif %}"
+              hx-target="#payroll-contract-container" hx-get="{% url 'contract-filter' %}?{{pd}}&orderby=employee_id__employee_first_name"
             >{% trans "Employee" %}</div>
             <div data-cell-index="2" data-cell-title='{% trans "Start Date" %}' 
               class="oh-sticky-table__th {% if request.sort_option.order == '-contract_start_date' %}arrow-up {% elif request.sort_option.order == 'contract_start_date' %}arrow-down {% else %} arrow-up-down {% endif %}"
diff --git a/payroll/views/views.py b/payroll/views/views.py
index 2e26011d2..1b2f1ae45 100644
--- a/payroll/views/views.py
+++ b/payroll/views/views.py
@@ -329,12 +329,12 @@ def contract_filter(request):
         template = "payroll/contract/group_by.html"
 
     else:
+        contracts = sortby(request, contracts, "orderby")
         contracts = paginator_qry(contracts, request.GET.get("page"))
         contract_ids_json = json.dumps(
             [instance.id for instance in contracts.object_list]
         )
 
-        contracts = sortby(request, contracts, "orderby")
     data_dict = parse_qs(query_string)
     get_key_instances(Contract, data_dict)
     keys_to_remove = [key for key, value in data_dict.items() if value == ["unknown"]]