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

[FIX] HELPDESK: Ticket kanban view drag and drop while filtering

Browse Source
This commit is contained in:
Horilla
2024-02-14 14:54:13 +05:30
parent 39c71e627b
commit 303d2d6353
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
helpdesk/templates/helpdesk/ticket/ticket_filter.html
View File

@@ -1,12 +1,12 @@
{% load i18n %} {% load i18n %}
<!-- start of filter --> <!-- start of filter -->
<form <form
method="post" method="get"
hx-get="{% url 'ticket-filter' %}?view={{view}}" action=""
hx-target="#ticket_list"
id="filterForm" id="filterForm"
class="d-flex" class="d-flex"
> >
{% csrf_token %}
<div <div
class="oh-input-group oh-input__search-group" class="oh-input-group oh-input__search-group"
:class="searchShow ? 'oh-input__search-group--show' : ''" :class="searchShow ? 'oh-input__search-group--show' : ''"

14
helpdesk/views.py
View File

@@ -341,7 +341,11 @@ def ticket_view(request):
Parameters: Parameters:
request (HttpRequest): The HTTP request object. 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") my_page_number = request.GET.get("my_page")
all_page_number = request.GET.get("all_page") all_page_number = request.GET.get("all_page")
allocated_page_number = request.GET.get("allocated_page") allocated_page_number = request.GET.get("allocated_page")
@@ -354,7 +358,7 @@ def ticket_view(request):
allocated_tickets=[] allocated_tickets=[]
ticket_list = Ticket.objects.filter(is_active=True) ticket_list = tickets.filter(is_active=True)
user = request.user.employee_get user = request.user.employee_get
if hasattr(user, 'employee_work_info'): if hasattr(user, 'employee_work_info'):
department = user.employee_work_info.department_id 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" ) tickets_items = ticket_list.filter(raised_on = user.id,assigning_type = "individual" )
allocated_tickets += tickets_items allocated_tickets += tickets_items
data_dict = parse_qs(previous_data)
get_key_instances(Ticket, data_dict)
template = "helpdesk/ticket/ticket_view.html" template = "helpdesk/ticket/ticket_view.html"
context = { context = {
"my_tickets": paginator_qry(my_tickets, my_page_number), "my_tickets": paginator_qry(my_tickets, my_page_number),
@@ -379,6 +385,7 @@ def ticket_view(request):
"ticket_status":TICKET_STATUS, "ticket_status":TICKET_STATUS,
"view": request.GET.get('view'), "view": request.GET.get('view'),
"today": datetime.today().date(), "today": datetime.today().date(),
"filter_dict": data_dict,
} }
return render(request, template, context=context) return render(request, template, context=context)
@@ -692,6 +699,7 @@ def ticket_filter(request):
"field":field, "field":field,
"today": datetime.today().date(), "today": datetime.today().date(),
} }
return render(request, template, context) return render(request, template, context)
@login_required @login_required