From 0e987088a34662ba8782cbe506148f140946700c Mon Sep 17 00:00:00 2001 From: Jon Date: Sat, 21 Sep 2024 13:12:28 +0930 Subject: [PATCH] feat(itim): Add ticket tab to services shows related tickets ref: #296 #309 --- app/itim/forms/services.py | 7 ++++++- app/itim/templates/itim/service.html.j2 | 27 +++++++++++++++++++++++++ app/itim/views/services.py | 6 ++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/app/itim/forms/services.py b/app/itim/forms/services.py index 293c53ec..c88c32bf 100644 --- a/app/itim/forms/services.py +++ b/app/itim/forms/services.py @@ -128,7 +128,12 @@ class DetailForm(ServiceForm): ] } ] - } + }, + "tickets": { + "name": "Tickets", + "slug": "tickets", + "sections": [] + }, } diff --git a/app/itim/templates/itim/service.html.j2 b/app/itim/templates/itim/service.html.j2 index c6b48466..c681181d 100644 --- a/app/itim/templates/itim/service.html.j2 +++ b/app/itim/templates/itim/service.html.j2 @@ -72,4 +72,31 @@ +
+ + {% include 'content/section.html.j2' with tab=form.tabs.tickets %} + + + + + + + + {% if tickets %} + {% for ticket in tickets %} + + + + + + {% endfor %} + {% else %} + + + + {% endif %} +
NameStatus 
{% concat_strings "#" ticket.ticket.id as ticket_ref %}{{ ticket_ref | markdown | safe}}{% include 'core/ticket/badge_ticket_status.html.j2' with ticket_status_text=ticket.ticket.get_status_display ticket_status=ticket.ticket.get_status_display|ticket_status %} 
No related tickets exist
+ +
+ {% endblock %} \ No newline at end of file diff --git a/app/itim/views/services.py b/app/itim/views/services.py index 0068416c..c7e78741 100644 --- a/app/itim/views/services.py +++ b/app/itim/views/services.py @@ -4,6 +4,7 @@ from django.utils.decorators import method_decorator from core.forms.comment import AddNoteForm from core.models.notes import Notes +from core.models.ticket.ticket_linked_items import Ticket, TicketLinkedItem from core.views.common import AddView, ChangeView, DeleteView, IndexView from itim.forms.services import ServiceForm, DetailForm @@ -151,6 +152,11 @@ class View(ChangeView): context = super().get_context_data(**kwargs) + context['tickets'] = TicketLinkedItem.objects.filter( + item = int(self.kwargs['pk']), + item_type = TicketLinkedItem.Modules.SERVICE + ) + context['notes_form'] = AddNoteForm(prefix='note') context['notes'] = Notes.objects.filter(service=self.kwargs['pk'])