From 02a5492cd586cadea12726cac014a6f0ba5f751e Mon Sep 17 00:00:00 2001
From: MOIS3Y <s.zhukovskii@ispsystem.com>
Date: Sun, 6 Aug 2023 11:53:09 +0900
Subject: [PATCH] Add: UpdateTicket view and PageTitleMixin

---
 logs_collector/collector/forms.py             | 10 ++---
 .../collector/templates/collector/ticket.html |  4 +-
 .../templates/collector/ticket_create.html    |  4 +-
 .../templates/collector/ticket_delete.html    |  4 +-
 .../templates/collector/tickets.html          |  2 +-
 logs_collector/collector/urls.py              |  7 +++-
 logs_collector/collector/utils.py             | 16 ++++++++
 logs_collector/collector/views.py             | 41 +++++++++++++++----
 8 files changed, 67 insertions(+), 21 deletions(-)

diff --git a/logs_collector/collector/forms.py b/logs_collector/collector/forms.py
index ac65c7f..ce69500 100644
--- a/logs_collector/collector/forms.py
+++ b/logs_collector/collector/forms.py
@@ -6,7 +6,7 @@ from crispy_bootstrap5.bootstrap5 import FloatingField
 from .models import Ticket
 
 
-class CreateTicketForm(forms.ModelForm):
+class TicketForm(forms.ModelForm):
 
     class Meta:
         model = Ticket
@@ -16,12 +16,12 @@ class CreateTicketForm(forms.ModelForm):
         }
 
     def __init__(self, *args, **kwargs):
-        super(CreateTicketForm, self).__init__(*args, **kwargs)
+        super(TicketForm, self).__init__(*args, **kwargs)
         self.helper = FormHelper(self)
         # self.helper.attrs = {"novalidate": ''}
 
         self.helper.layout = Layout(
-            Div(FloatingField('number'), 'platform', css_class='col-md-2'),
-            Div('note', css_class='col-md-6'),
-            Submit('submit', 'Create', css_class='btn btn-success'),
+            Div(FloatingField('number'), 'platform', css_class='col-lg-2'),
+            Div('note', css_class='col-lg-6'),
+            Submit('submit', 'Save', css_class='btn btn-primary'),
         )
diff --git a/logs_collector/collector/templates/collector/ticket.html b/logs_collector/collector/templates/collector/ticket.html
index 75b8340..0aa68e7 100644
--- a/logs_collector/collector/templates/collector/ticket.html
+++ b/logs_collector/collector/templates/collector/ticket.html
@@ -1,6 +1,6 @@
 {% extends 'collector/base.html' %}
 {% load static %}
-{% block title %}<title>Collector - {{ ticket.number }}</title>{% endblock title %}
+{% block title %}<title>{{ title }}</title>{% endblock title %}
 {% block main %} 
 <div class="container mt-3">
   <div class="row">
@@ -31,7 +31,7 @@
         <!-- Card buttons -->
         <div class="d-flex w-100 justify-content-between">
           <a
-            href="/"
+            href="{% url 'collector:update' ticket.platform.name ticket.number %}"
             class="btn btn-outline-warning mb-1 mt-1"
           ><i class="bi bi-pencil-square"></i> Edit</a>
           <button
diff --git a/logs_collector/collector/templates/collector/ticket_create.html b/logs_collector/collector/templates/collector/ticket_create.html
index a84b4f4..6fd7ef3 100644
--- a/logs_collector/collector/templates/collector/ticket_create.html
+++ b/logs_collector/collector/templates/collector/ticket_create.html
@@ -1,12 +1,12 @@
 {% extends 'collector/base.html' %}
 {% load static %}
 {% load crispy_forms_tags %}
-{% block title %}<title>Collector - create</title>{% endblock title %}
+{% block title %}<title>{{ title }}</title>{% endblock title %}
 {% block main %}
 <div class="container mt-3">
     <div class="card">
       <div class="card-header">
-        <h4>New ticket:</h4>
+        <h3>Ticket:</h3>
       </div>
       <div class="card-body">
         {% crispy form %}
diff --git a/logs_collector/collector/templates/collector/ticket_delete.html b/logs_collector/collector/templates/collector/ticket_delete.html
index 96a67b3..0741250 100644
--- a/logs_collector/collector/templates/collector/ticket_delete.html
+++ b/logs_collector/collector/templates/collector/ticket_delete.html
@@ -1,8 +1,8 @@
 {% extends 'collector/base.html' %} 
 {% load static %} 
+{% block title %} {{ title }} {% endblock title %}
 {% block content %}
-{% include 'collector/includes/navbar.html' %}
-<div class="container mt-5">
+<div class="container mt-3">
   <div class="row">
     <form method="post" action="{% url 'collector:delete' ticket.number %}">
       {% csrf_token %}
diff --git a/logs_collector/collector/templates/collector/tickets.html b/logs_collector/collector/templates/collector/tickets.html
index b85bad5..154e734 100644
--- a/logs_collector/collector/templates/collector/tickets.html
+++ b/logs_collector/collector/templates/collector/tickets.html
@@ -1,6 +1,6 @@
 {% extends 'collector/base.html' %}
 {% load static %}
-{% block title %}<title>Collector</title>{% endblock title %}
+{% block title %}<title>{{ title }}</title>{% endblock title %}
 {% block main %}
 <div class="container mt-3">
   {% csrf_token %}
diff --git a/logs_collector/collector/urls.py b/logs_collector/collector/urls.py
index 81b94aa..bd0ab52 100644
--- a/logs_collector/collector/urls.py
+++ b/logs_collector/collector/urls.py
@@ -15,7 +15,6 @@ urlpatterns = [
         views.CreateTicket.as_view(),
         name='create'
     ),
-
     # READ:
     path(
         '',
@@ -42,6 +41,12 @@ urlpatterns = [
         views.ArchiveHandlerView.as_view(),
         name="download"
     ),
+    # UPDATE:
+    path(
+        'tickets/update/<slug:platform>/<int:ticket>/',
+        views.UpdateTicket.as_view(),
+        name='update'
+    ),
 
     # ▄▀█ ░░█ ▄▀█ ▀▄▀
     # █▀█ █▄█ █▀█ █░█
diff --git a/logs_collector/collector/utils.py b/logs_collector/collector/utils.py
index 9ac6bcd..d8650da 100644
--- a/logs_collector/collector/utils.py
+++ b/logs_collector/collector/utils.py
@@ -21,3 +21,19 @@ def get_file_size(file_path, unit='bytes'):
 def is_ajax(request):
     if request.headers.get('X-Requested-With') == 'XMLHttpRequest':
         return True
+
+
+class PageTitleViewMixin:
+    title = 'Collector'
+
+    def get_title(self, *args, **kwargs):
+        """
+        Return the class title attr by default,
+        but you can override this method to further customize
+        """
+        return self.title
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['title'] = self.get_title()
+        return context
diff --git a/logs_collector/collector/views.py b/logs_collector/collector/views.py
index 9fec4b1..bddf1ea 100644
--- a/logs_collector/collector/views.py
+++ b/logs_collector/collector/views.py
@@ -9,8 +9,8 @@ from rest_framework import status
 # from rest_framework.response import Response
 
 from .models import Archive, Ticket
-from .forms import CreateTicketForm
-from .utils import is_ajax
+from .forms import TicketForm
+from .utils import PageTitleViewMixin, is_ajax
 
 
 class ArchiveHandlerView(LoginRequiredMixin, SingleObjectMixin, generic.View):
@@ -29,45 +29,70 @@ class ArchiveHandlerView(LoginRequiredMixin, SingleObjectMixin, generic.View):
             return JsonResponse({'file': path}, status=status.HTTP_200_OK)
 
 
-class CreateTicket(LoginRequiredMixin, generic.CreateView):
+class CreateTicket(LoginRequiredMixin, PageTitleViewMixin, generic.CreateView):
     model = Ticket
-    form_class = CreateTicketForm
+    form_class = TicketForm
     template_name = 'collector/ticket_create.html'
 
+    def get_title(self):
+        return f'{self.title} - create'
+
     def form_valid(self, form):
         form.instance.user = self.request.user
         return super().form_valid(form)
 
 
-class ListAllTickets(generic.ListView):
+class UpdateTicket(LoginRequiredMixin, PageTitleViewMixin, generic.UpdateView):
+    model = Ticket
+    form_class = TicketForm
+    template_name = 'collector/ticket_create.html'
+    slug_field = 'number'
+    slug_url_kwarg = 'ticket'
+
+    def get_title(self, **kwargs):
+        return f'{self.title} - {self.kwargs.get("ticket", "update")}'
+
+    def form_valid(self, form):
+        form.instance.user = self.request.user
+        return super().form_valid(form)
+
+
+class ListAllTickets(PageTitleViewMixin, generic.ListView):
     model = Ticket
     template_name = 'collector/tickets.html'
     context_object_name = 'tickets'
     paginate_by = 5
+    title = 'Collector - tickets'
 
 
-class ListPlatformTickets(generic.ListView):
+class ListPlatformTickets(PageTitleViewMixin, generic.ListView):
     model = Ticket
     template_name = 'collector/tickets.html'
     context_object_name = 'tickets'
     # allow_empty = False
     paginate_by = 5
 
+    def get_title(self, **kwargs):
+        return f'{self.title} - {self.kwargs.get("platform", "tickets")}'
+
     def get_queryset(self):
         return Ticket.objects.filter(
             platform__name=self.kwargs.get('platform')
         )
 
 
-class DetailTicket(generic.DetailView):
+class DetailTicket(PageTitleViewMixin, generic.DetailView):
     model = Ticket
     template_name = 'collector/ticket.html'
     context_object_name = 'ticket'
     slug_field = 'number'
     slug_url_kwarg = 'ticket'
 
+    def get_title(self, **kwargs):
+        return f'{self.title} - {self.kwargs.get("ticket", "show")}'
 
-class DeleteTicket(generic.DeleteView):
+
+class DeleteTicket(PageTitleViewMixin, generic.DeleteView):
     model = Ticket
     template_name = 'collector/ticket_delete.html'
     context_object_name = 'ticket'