diff --git a/helpdesk/lib.py b/helpdesk/lib.py index 83f5b1a8..03fe22fd 100644 --- a/helpdesk/lib.py +++ b/helpdesk/lib.py @@ -34,6 +34,7 @@ def ticket_template_context(ticket): else: context[field] = attr context['assigned_to'] = context['_get_assigned_to'] + context['last_followup'] = ticket.followups.latest('date') return context diff --git a/helpdesk/query.py b/helpdesk/query.py index 9c5a0930..d186d147 100644 --- a/helpdesk/query.py +++ b/helpdesk/query.py @@ -65,8 +65,9 @@ DATATABLES_ORDER_COLUMN_CHOICES = Choices( ('6', 'due_date'), ('7', 'assigned_to'), ('8', 'submitter_email'), - # ('9', 'time_spent'), - ('10', 'kbitem'), + ('9', 'last_followup'), + # ('10', 'time_spent'), + ('11', 'kbitem'), ) diff --git a/helpdesk/serializers.py b/helpdesk/serializers.py index c8c4dbb7..8d899454 100644 --- a/helpdesk/serializers.py +++ b/helpdesk/serializers.py @@ -1,5 +1,6 @@ from django.contrib.auth import get_user_model from django.contrib.humanize.templatetags import humanize +from django.utils.timezone import localtime from rest_framework import serializers from rest_framework.exceptions import ValidationError @@ -18,6 +19,7 @@ class DatatablesTicketSerializer(serializers.ModelSerializer): ticket = serializers.SerializerMethodField() assigned_to = serializers.SerializerMethodField() submitter = serializers.SerializerMethodField() + last_followup = serializers.SerializerMethodField() created = serializers.SerializerMethodField() due_date = serializers.SerializerMethodField() status = serializers.SerializerMethodField() @@ -30,8 +32,8 @@ class DatatablesTicketSerializer(serializers.ModelSerializer): model = Ticket # fields = '__all__' fields = ('ticket', 'id', 'priority', 'title', 'queue', 'status', - 'created', 'due_date', 'assigned_to', 'submitter', 'row_class', - 'time_spent', 'kbitem') + 'created', 'due_date', 'assigned_to', 'submitter', 'last_followup', + 'row_class', 'time_spent', 'kbitem') def get_queue(self, obj): return {"title": obj.queue.title, "id": obj.queue.id} @@ -70,8 +72,11 @@ class DatatablesTicketSerializer(serializers.ModelSerializer): def get_kbitem(self, obj): return obj.kbitem.title if obj.kbitem else "" - - + + def get_last_followup(self, obj): + followup = obj.followup_set.latest('date') + return localtime(followup.date).strftime('%Y-%m-%d %H:%M:%S') if followup else "" + class FollowUpAttachmentSerializer(serializers.ModelSerializer): class Meta: model = FollowUpAttachment diff --git a/helpdesk/templates/helpdesk/filters/followupdates.html b/helpdesk/templates/helpdesk/filters/followupdates.html new file mode 100644 index 00000000..d8e9e8df --- /dev/null +++ b/helpdesk/templates/helpdesk/filters/followupdates.html @@ -0,0 +1,20 @@ +{% load i18n humanize %} +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+ +

{% trans "Use YYYY-MM-DD date format, eg 2018-01-30. This only searches when the last followup occured" %}

+
diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html index 2e644c7f..298c0cc5 100644 --- a/helpdesk/templates/helpdesk/ticket_list.html +++ b/helpdesk/templates/helpdesk/ticket_list.html @@ -76,6 +76,7 @@ {% trans "Due Date" %} {% trans "Owner" %} {% trans "Submitter" %} + {% trans "Last Followup" %} {% if helpdesk_settings.HELPDESK_ENABLE_TIME_SPENT_ON_TICKET %}{% trans "Time Spent" %}{% endif %} {% if helpdesk_settings.HELPDESK_KB_ENABLED %}{% trans "KB item" %}{% endif %} @@ -188,6 +189,9 @@ + @@ -224,6 +228,10 @@ id="filterBoxKBItems"> {% include 'helpdesk/filters/kbitems.html' %} +
  • + {% include 'helpdesk/filters/followupdates.html' %} +
    • @@ -415,6 +423,15 @@ } }, {data: "submitter"}, + { + data: "last_followup", + render: function (data, type, row, meta) { + if (data && data !== "None") { + return data; + } + return ""; + } + }, {% if helpdesk_settings.HELPDESK_ENABLE_TIME_SPENT_ON_TICKET %} {data: "time_spent", "visible": false}, {% endif %} diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py index 89aea899..04babdda 100644 --- a/helpdesk/views/staff.py +++ b/helpdesk/views/staff.py @@ -1025,12 +1025,14 @@ def ticket_list(request): ('assigned_to', 'assigned_to__id__in'), ('status', 'status__in'), ('kbitem', 'kbitem__in'), + ('last_followup', 'last_followup__in'), ] filter_null_params = dict([ ('queue', 'queue__id__isnull'), ('assigned_to', 'assigned_to__id__isnull'), ('status', 'status__isnull'), ('kbitem', 'kbitem__isnull'), + ('last_followup', 'last_followup__isnull'), ]) for param, filter_command in filter_in_params: if request.GET.get(param) is not None: @@ -1061,6 +1063,14 @@ 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 @@ -1068,7 +1078,7 @@ def ticket_list(request): # SORTING sort = request.GET.get('sort', None) - if sort not in ('status', 'assigned_to', 'created', 'title', 'queue', 'priority', 'kbitem'): + if sort not in ('status', 'assigned_to', 'created', 'title', 'queue', 'priority', 'last_followup', 'kbitem'): sort = 'created' query_params['sorting'] = sort @@ -1158,6 +1168,7 @@ def datatables_ticket_list(request, query): """ query = Query(HelpdeskUser(request.user), base64query=query) result = query.get_datatables_context(**request.query_params) + print(result) return JsonResponse(result, status=status.HTTP_200_OK)