From 1e580aa59da3015f4971fb1960f58cae091ce678 Mon Sep 17 00:00:00 2001
From: DavidVadnais <david.vadnais@protonmail.com>
Date: Fri, 21 Mar 2025 23:55:28 +0000
Subject: [PATCH] for last_followup remove filter stub, fix localization,
 improve serializer

---
 helpdesk/serializers.py                      | 10 +---------
 helpdesk/templates/helpdesk/ticket_list.html |  4 ++--
 helpdesk/views/staff.py                      |  8 --------
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/helpdesk/serializers.py b/helpdesk/serializers.py
index 9c1e9303..244d7b6c 100644
--- a/helpdesk/serializers.py
+++ b/helpdesk/serializers.py
@@ -75,15 +75,7 @@ class DatatablesTicketSerializer(serializers.ModelSerializer):
         return obj.kbitem.title if obj.kbitem else ""
         
     def get_last_followup(self, obj):
-        followup = obj.followup_set.order_by().annotate(
-            last_followup=Window(
-                expression=Max("date"),
-                partition_by=[F("ticket_id"),],
-                order_by="-date"
-            )
-        ).values("last_followup").distinct().values_list("last_followup", flat=True)
-        # If there are no followups for the ticket then the result will be empty
-        return localtime(followup[0]).strftime('%Y-%m-%d %H:%M:%S') if followup else ""
+        return obj.last_followup
         
     
 class FollowUpAttachmentSerializer(serializers.ModelSerializer):
diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html
index bb9fe19b..ffb8c1a7 100644
--- a/helpdesk/templates/helpdesk/ticket_list.html
+++ b/helpdesk/templates/helpdesk/ticket_list.html
@@ -335,7 +335,7 @@
     <script>
         window.helpdesk_settings = {
             LANGUAGE_CODE: "{{ helpdesk_settings.LANGUAGE_CODE|default:'en-US' }}",
-            NO_FOLLOWUP_TEXT: "{{ helpdesk_settings.TRANSLATIONS.No_followup_found|default:'No followup found' }}"
+            NO_FOLLOWUP_TEXT: "{% trans helpdesk_settings.TRANSLATIONS.No_followup_found|default:'No followup found' %}"
         };
 
         function get_url(row) {
@@ -425,7 +425,7 @@
                     {
                         data: "last_followup",
                         render: function (data, type, row) {
-                            let locale = window.helpdesk_settings.LANGUAGE_CODE; 
+                            let locale = navigator.language || navigator.userLanguage || window.helpdesk_settings.LANGUAGE_CODE;
                             
                             if (isNaN(Date.parse(data))) {
                                 return window.helpdesk_settings.NO_FOLLOWUP_TEXT;
diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py
index f19deae0..21544247 100644
--- a/helpdesk/views/staff.py
+++ b/helpdesk/views/staff.py
@@ -1061,14 +1061,6 @@ def ticket_list(request):
         if date_to:
             query_params['filtering']['created__lte'] = date_to
 
-        followup_from = request.GET.get('followup_from')
-        if followup_from:
-            query_params['filtering']['followup__gte'] = followup_from
-
-        followup_to = request.GET.get('followup_to')
-        if followup_to:
-            query_params['filtering']['followup__lte'] = followup_to
-
         # KEYWORD SEARCHING
         q = request.GET.get('q', '')
         context['query'] = q