From 303d2d6353b7fabe6452954257027202e4380285 Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Wed, 14 Feb 2024 14:54:13 +0530
Subject: [PATCH] [FIX] HELPDESK: Ticket kanban view drag and drop while
 filtering

---
 .../templates/helpdesk/ticket/ticket_filter.html   |  6 +++---
 helpdesk/views.py                                  | 14 +++++++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/helpdesk/templates/helpdesk/ticket/ticket_filter.html b/helpdesk/templates/helpdesk/ticket/ticket_filter.html
index 22782c30e..4040ce129 100644
--- a/helpdesk/templates/helpdesk/ticket/ticket_filter.html
+++ b/helpdesk/templates/helpdesk/ticket/ticket_filter.html
@@ -1,12 +1,12 @@
 {% load i18n %}
 <!-- start of filter  -->
 <form
-    method="post"
-    hx-get="{% url 'ticket-filter' %}?view={{view}}"
-    hx-target="#ticket_list"
+    method="get"
+    action=""
     id="filterForm"
     class="d-flex"
 >
+    {% csrf_token %}
     <div
         class="oh-input-group oh-input__search-group"
         :class="searchShow ? 'oh-input__search-group--show' : ''"
diff --git a/helpdesk/views.py b/helpdesk/views.py
index 5b0102339..29625101d 100644
--- a/helpdesk/views.py
+++ b/helpdesk/views.py
@@ -341,7 +341,11 @@ def ticket_view(request):
     Parameters:
         request (HttpRequest): The HTTP request object.
     """
-    tickets =Ticket.objects.filter(is_active=True)    
+    tickets =Ticket.objects.filter(is_active=True)
+    
+    previous_data = request.GET.urlencode()
+    if request.method =='GET':
+        tickets = TicketFilter(request.GET).qs
     my_page_number = request.GET.get("my_page")
     all_page_number = request.GET.get("all_page")
     allocated_page_number = request.GET.get("allocated_page")
@@ -354,7 +358,7 @@ def ticket_view(request):
 
 
     allocated_tickets=[]
-    ticket_list = Ticket.objects.filter(is_active=True)
+    ticket_list = tickets.filter(is_active=True)
     user = request.user.employee_get
     if hasattr(user, 'employee_work_info'):
         department = user.employee_work_info.department_id
@@ -368,7 +372,9 @@ def ticket_view(request):
             
     tickets_items = ticket_list.filter(raised_on = user.id,assigning_type = "individual" )
     allocated_tickets += tickets_items
-
+    
+    data_dict = parse_qs(previous_data)
+    get_key_instances(Ticket, data_dict) 
     template = "helpdesk/ticket/ticket_view.html"
     context = {
         "my_tickets": paginator_qry(my_tickets, my_page_number),
@@ -379,6 +385,7 @@ def ticket_view(request):
         "ticket_status":TICKET_STATUS,
         "view": request.GET.get('view'),
         "today": datetime.today().date(),
+        "filter_dict": data_dict,
     }
 
     return render(request, template, context=context)
@@ -692,6 +699,7 @@ def ticket_filter(request):
         "field":field,
         "today": datetime.today().date(),
     }
+    
     return render(request, template, context)
 
 @login_required