From 7bbf314108bcf266846d2b8b9bd152197ae122f2 Mon Sep 17 00:00:00 2001
From: Jeenyhus <mweembadabwitso@gmail.com>
Date: Tue, 24 Oct 2023 14:10:36 +0200
Subject: [PATCH 1/5] Archive feature for admin or super admin to archive
 support tickets from the system

---
 techsupport/models.py                         |  28 ++++-
 techsupport/templates/base.html               |  30 +++---
 techsupport/templates/dashboard.html          |  49 +++++----
 .../templates/support_ticket/all_tickets.html |   4 +-
 techsupport/templatetags/custom_filters.py    |   6 +-
 techsupport/urls.py                           |   9 ++
 techsupport/views.py                          | 102 ++++++++++++++++--
 7 files changed, 184 insertions(+), 44 deletions(-)

diff --git a/techsupport/models.py b/techsupport/models.py
index d881541..7289497 100644
--- a/techsupport/models.py
+++ b/techsupport/models.py
@@ -363,6 +363,7 @@ class Priority(models.TextChoices):
         blank=True,
     )
     resolution_notes = models.TextField(blank=True)
+    id = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
 
     assigned_to = models.ForeignKey(
         User,
@@ -372,7 +373,18 @@ class Priority(models.TextChoices):
         blank=True,
         related_name="assigned_tickets",
     )
-
+    archived = models.BooleanField(default=False, verbose_name=_("archived"))
+    date_archived = models.DateTimeField(
+        null=True, blank=True, verbose_name=_("date archived")
+    )
+    previous_status = models.CharField(
+        max_length=30,
+        verbose_name=_("previous status"),
+        choices=Status.choices,
+        null=True,
+        blank=True,
+    )
+    
     def save(self, *args, **kwargs):
         """
         Override the save method to set the ticket number and support description.
@@ -414,3 +426,17 @@ def ticket_age(self):
                 return f"{hours} hrs ago"
             else:
                 return f"{minutes} mins ago"
+
+class ArchivedSupportTicket(BaseModel):
+    support_ticket = models.OneToOneField(
+        SupportTicket,
+        on_delete=models.CASCADE,
+        related_name="archived_ticket",
+        verbose_name=_("support ticket"),
+    )
+
+    def unarchive(self):
+        self.support_ticket.status = SupportTicket.Status.OPEN
+        self.support_ticket.date_resolved = None
+        self.support_ticket.save()
+        self.delete()
\ No newline at end of file
diff --git a/techsupport/templates/base.html b/techsupport/templates/base.html
index 1f1bfe6..56636d4 100644
--- a/techsupport/templates/base.html
+++ b/techsupport/templates/base.html
@@ -64,6 +64,12 @@ <h5 class="d-none d-md-block"><strong>Technical Support</strong></h5>
                         <i class='bi bi-person-square nav_icon'></i>
                         <span class="profile">Profile</span>
                     </a>
+                    {% if user.is_admin or user.is_superuser %}
+                    <a href="{% url 'archive' %}" class="nav_link">
+                        <i class='bi bi-archive nav_icon'></i>
+                        <span class="archive">Archive</span>
+                    </a>
+                    {% endif %}
                 </div>
             </div>
             
@@ -75,20 +81,20 @@ <h5 class="d-none d-md-block"><strong>Technical Support</strong></h5>
         </nav>
     </div>
     
-    <!-- Display Messages -->
-    <div class="container mt-5">
-        <div class="row justify-content-center">
-            <div class="col-md-8">
-                {% if messages %}
-                {% for message in messages %}
-                <div class="alert alert-{{ message.tags }} text-center fade-out" style="animation: fadeOut 4.5s forwards;" role="alert">
-                    {{ message }}
-                </div>
-                {% endfor %}
-                {% endif %}
+<!-- Display Messages -->
+<div class="container mt-5">
+    <div class="row justify-content-center">
+        <div class="col-md-8">
+            {% if messages %}
+            {% for message in messages %}
+            <div class="alert alert-{{ message.tags }} text-center fade-out" role="alert" style="animation: fadeOut 4.5s forwards;">
+                {{ message }}
             </div>
+            {% endfor %}
+            {% endif %}
         </div>
-    </div>    
+    </div>
+</div> 
     
     <!-- CSS Animation -->
     <style>
diff --git a/techsupport/templates/dashboard.html b/techsupport/templates/dashboard.html
index f437976..2cd1f2a 100644
--- a/techsupport/templates/dashboard.html
+++ b/techsupport/templates/dashboard.html
@@ -207,7 +207,7 @@ <h6 class="text-muted fw-normal fs-6" title="Resolved">Resolved</h6>
                         </div>
                     </td>
                     <td class="text-center">
-                      <div class="d-flex justify-content-start align-items-center text-truncate">{{ ticket.centre }}</div>
+                      <div class="d-flex justify-content-start align-items-center text-truncate">{{ ticket.centre.acronym }}</div>
                     </td>
                     <td class="text-center">
                         <div class="d-flex align-items-center justify-content-start text-truncate">
@@ -237,23 +237,36 @@ <h6 class="text-muted fw-normal fs-6" title="Resolved">Resolved</h6>
                             {{ ticket.ticket_age }}
                         </div>
                     </td>
-                    <!-- Only visible to technician or above -->
-                    {% if user_role == 'super_admin' or user_role == 'admin' or user_role == 'technician'%}
-                    {% if ticket.status == 'In Progress' or ticket.status == 'Resolved' %}
-                    <td class="text-center">
-                        <div class="d-grid">
-                            <a href="{% url 'ticket_details' ticket.id %}" class="btn btn-secondary btn-block">Details</a>
-                        </div>
-                    </td>
-                    {% else %}
-                    <td class="text-center">
-                        <div class="d-grid">
-                            <a href="{% url 'ticket_details' ticket.id %}" class="btn bg-success btn-block d-md-none text-white">Take</a>
-                            <a href="{% url 'ticket_details' ticket.id %}" class="btn bg-success btn-block d-none d-md-block text-white">Take Ticket</a>
-                        </div>
-                    </td>
-                    {% endif %}
-                    {% endif %}
+                      <!-- Only visible to technician or above -->
+                      {% if user_role == 'super_admin' or user_role == 'admin' or user_role == 'technician' %}
+                          {% if ticket.status == 'In Progress' or ticket.status == 'Resolved' %}
+                              <td class="text-center">
+                                  <div class="d-flex">
+                                      <a href="{% url 'ticket_details' ticket.id %}" class="btn btn-secondary mr-1">
+                                          <i class="bi bi-info-circle"></i> 
+                                      </a>
+                                      {% if user.is_admin or user.is_superuser %}
+                                          <a href="{% url 'archive_ticket' ticket.id %}" class="btn btn-danger ml-1">
+                                              <i class="bi bi-archive"></i> 
+                                          </a>
+                                      {% endif %}
+                                  </div>
+                              </td>
+                          {% else %}
+                              <td class="text-center">
+                                  <div class="d-flex">
+                                      <a href="{% url 'ticket_details' ticket.id %}" class="btn bg-success text-white mr-1">
+                                        <i class="bi bi-check"></i> 
+                                      </a>
+                                      {% if user.is_admin or user.is_superuser %}
+                                          <a href="{% url 'archive_ticket' ticket.id %}" class="btn btn-danger ml-1">
+                                              <i class="bi bi-archive"></i>
+                                          </a>
+                                      {% endif %}
+                                  </div>
+                              </td>
+                          {% endif %}
+                      {% endif %}
                 </tr>
                 {% endfor %}
                 {% else %}
diff --git a/techsupport/templates/support_ticket/all_tickets.html b/techsupport/templates/support_ticket/all_tickets.html
index f5edf73..294e86a 100644
--- a/techsupport/templates/support_ticket/all_tickets.html
+++ b/techsupport/templates/support_ticket/all_tickets.html
@@ -14,7 +14,7 @@ <h6 class="card-title">
                     </h6>
                   </div>
                 <div class="table-responsive">
-                    <table class="table table-striped table-bordered text-truncate">
+                    <table class="table table-striped table-borderless text-truncate">
                         <thead>
                             <tr>
                                 <th class="text-start">#</th>
@@ -38,7 +38,7 @@ <h6 class="card-title">
                                     </div>
                                 </td>
                                 <td>
-                                    <div class="d-flex align-items-center justify-content-start">{{ ticket.centre }}
+                                    <div class="d-flex align-items-center justify-content-start">{{ ticket.centre.acronym }}
                                     </div>
                                 </td>
                                 <td>
diff --git a/techsupport/templatetags/custom_filters.py b/techsupport/templatetags/custom_filters.py
index 0b40e10..54c6cde 100644
--- a/techsupport/templatetags/custom_filters.py
+++ b/techsupport/templatetags/custom_filters.py
@@ -18,4 +18,8 @@ def add_class(field, class_name):
         field.field.widget.attrs['class'] += f' {class_name}'
     else:
         field.field.widget.attrs['class'] = class_name
-    return field
\ No newline at end of file
+    return field
+
+@register.filter
+def filter_not_archived(tickets):
+    return tickets.filter(archived=False)
\ No newline at end of file
diff --git a/techsupport/urls.py b/techsupport/urls.py
index ee4508a..1b1b0c6 100644
--- a/techsupport/urls.py
+++ b/techsupport/urls.py
@@ -1,4 +1,5 @@
 from django.urls import path
+from uuid import UUID
 from .views import (
     user_login,
     user_logout,
@@ -14,6 +15,9 @@
     tickets_in_progress,
     get_subcategories,
     export_tickets_csv,
+    archive,
+    archive_ticket,
+    unarchive_ticket,
 )
 from django.conf import settings
 from django.conf.urls.static import static
@@ -34,6 +38,11 @@
     path("resolved_tickets/", resolved_tickets, name="resolved_tickets"),
     path("tickets_in_progress/", tickets_in_progress, name="tickets_in_progress"),
     path("get_subcategories/", get_subcategories, name="get_subcategories"),
+    path("archive/", archive, name="archive"),
+    path('archive_ticket/<uuid:ticket_id>/', archive_ticket, name='archive_ticket'),
+    path('unarchive_ticket/<uuid:ticket_id>/', unarchive_ticket, name='unarchive_ticket'),
+
+
 ]
 
 urlpatterns += static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
diff --git a/techsupport/views.py b/techsupport/views.py
index cc2846d..495b1df 100644
--- a/techsupport/views.py
+++ b/techsupport/views.py
@@ -9,6 +9,7 @@
 from django.db.models import Q, Count
 from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
 from django.conf import settings
+from django.db import IntegrityError
 import json
 import requests
 import logging
@@ -26,6 +27,7 @@
     Centre,
     SubCategory,
     SupportTicket,
+    ArchivedSupportTicket,
     UserProfile,
     User,
 )
@@ -56,8 +58,9 @@ def user_logout(request):
 
 @login_required
 def dashboard(request):
-    # Retrieve all support tickets
-    tickets = SupportTicket.objects.all().order_by("-date_submitted")
+    # Retrieve all non-archived support tickets
+    tickets = SupportTicket.objects.filter(archived=False).order_by("-date_submitted")
+
 
     # Retrieve user's role using custom user model
     user_role = None
@@ -75,26 +78,26 @@ def dashboard(request):
 
     # Modify the tickets query based on the user's role
     if user_role == "super_admin":
-        tickets = SupportTicket.objects.all()
+        tickets = tickets
     elif user_role == "admin":
         admin_country = request.user.country
         admin_region = request.user.region
-        tickets = SupportTicket.objects.filter(
+        tickets = tickets.filter(
             Q(centre__region__country=admin_country) |
             Q(centre__region=admin_region)
         )
     elif user_role == "manager":
         manager_country = request.user.country
         manager_region = request.user.region
-        tickets = SupportTicket.objects.filter(
+        tickets = tickets.filter(
             Q(centre__region__country=manager_country) |
             Q(centre__region=manager_region)
         )
     elif user_role == "technician":
-        tickets = SupportTicket.objects.all()
+        tickets = tickets
     elif user_role == "user":
         user_centres = request.user.centres.all()
-        tickets = SupportTicket.objects.filter(centre__in=user_centres)
+        tickets = tickets.filter(centre__in=user_centres)
 
     # Retrieve search parameters from the request
     search_query = request.GET.get("search_query", "").strip()
@@ -185,6 +188,8 @@ def get_ticket_insights():
 
     return render(request, "dashboard.html", context)
 
+
+
 @login_required
 def export_tickets_csv(request):
     # Define the time period for which you want to extract data
@@ -471,11 +476,13 @@ def get_subcategories(request):
     )
     return JsonResponse({"subcategories": list(subcategories)})
 
+
 @login_required
 def all_tickets(request):
     user = request.user
     context = {}
 
+    # Define the queryset based on the user's role
     if user.is_user():
         # If the user is a regular user, filter tickets based on their assigned center
         user_tickets = user.submitted_issues.all()
@@ -499,6 +506,9 @@ def all_tickets(request):
         # Handle other roles as needed
         user_and_centre_tickets = None
 
+    # Filter out archived tickets
+    user_and_centre_tickets = user_and_centre_tickets.filter(archived=False)
+
     total_tickets_count = user_and_centre_tickets.count()
     open_tickets_count = user_and_centre_tickets.filter(status="Open").count()
     in_progress_tickets_count = user_and_centre_tickets.filter(status="In Progress").count()
@@ -515,9 +525,6 @@ def all_tickets(request):
     return render(request, "support_ticket/all_tickets.html", context)
 
 
-
-
-
 # @login_required
 # def settings_view(request):
 #     """ settings view """
@@ -575,3 +582,78 @@ def tickets_in_progress(request):
     return render(
         request, "support_ticket/tickets_in_progress.html", {"tickets": tickets}
     )
+
+@login_required
+def archive_ticket(request, ticket_id):
+    user = request.user
+    if user.role in ["admin", "super_admin"]:
+        # Retrieve the support ticket to archive
+        ticket = get_object_or_404(SupportTicket, id=ticket_id)
+
+        # Store the previous status
+        ticket.previous_status = ticket.status
+
+        # Change the support ticket status to "Closed"
+        ticket.status = SupportTicket.Status.CLOSED
+        ticket.save()
+
+        ticket.archived = True
+        ticket.date_archived = timezone.now()
+        ticket.save()
+
+        # Add a success message
+        messages.success(request, 'The support ticket has been archived.')
+
+        # Redirect to the dashboard or any other page you prefer
+        return redirect('dashboard')
+    else:
+        return redirect('dashboard')
+
+
+@login_required
+def unarchive_ticket(request, ticket_id):
+    user = request.user
+    if user.role in ["admin", "super_admin"]:
+        # Retrieve the support ticket to unarchive
+        ticket = get_object_or_404(SupportTicket, id=ticket_id)
+
+        # Check if the support ticket is archived
+        if not ticket.archived:
+            messages.error(request, 'The support ticket is not archived.')
+            return redirect('dashboard')
+
+        # Check if the previous status is null
+        if not ticket.previous_status:
+            messages.error(request, 'The support ticket does not have a previous status.')
+            return redirect('dashboard')
+
+        # Restore the previous status
+        ticket.status = ticket.previous_status
+        ticket.previous_status = None
+
+        # Set the archived flag to False
+        ticket.archived = False
+
+        # Save the support ticket
+        ticket.save()
+
+        # Add a success message
+        messages.success(request, 'The support ticket has been Restored.')
+
+        # Redirect to the dashboard or any other page you prefer
+        return redirect('dashboard')
+    else:
+        return redirect('dashboard')
+
+
+@login_required
+def archive(request):
+    user = request.user
+    if user.role in ["admin", "super_admin"]:
+        archived_tickets = SupportTicket.objects.filter(archived=True).order_by("-date_archived")
+        context = {
+            'archived_tickets': archived_tickets,
+        }
+        return render(request, 'support_ticket/archive.html', context)
+    else:
+        return redirect("dashboard")

From ee5a6f6e2ca2696bac3263070358439c9a78bc32 Mon Sep 17 00:00:00 2001
From: Jeenyhus <mweembadabwitso@gmail.com>
Date: Tue, 24 Oct 2023 15:01:13 +0200
Subject: [PATCH 2/5] added view restrictions

---
 techsupport/templates/base.html      | 23 +++++++++++++++--------
 techsupport/templates/dashboard.html |  4 ++--
 techsupport/views.py                 | 20 +++++++++++---------
 3 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/techsupport/templates/base.html b/techsupport/templates/base.html
index 56636d4..47c4d2f 100644
--- a/techsupport/templates/base.html
+++ b/techsupport/templates/base.html
@@ -64,12 +64,12 @@ <h5 class="d-none d-md-block"><strong>Technical Support</strong></h5>
                         <i class='bi bi-person-square nav_icon'></i>
                         <span class="profile">Profile</span>
                     </a>
-                    {% if user.is_admin or user.is_superuser %}
+                    {% if user.is_superuser or user.is_admin %}
                     <a href="{% url 'archive' %}" class="nav_link">
-                        <i class='bi bi-archive nav_icon'></i>
-                        <span class="archive">Archive</span>
+                      <i class='bi bi-archive nav_icon'></i>
+                      <span class="archive">Archive</span>
                     </a>
-                    {% endif %}
+                  {% endif %}
                 </div>
             </div>
             
@@ -87,11 +87,18 @@ <h5 class="d-none d-md-block"><strong>Technical Support</strong></h5>
         <div class="col-md-8">
             {% if messages %}
             {% for message in messages %}
-            <div class="alert alert-{{ message.tags }} text-center fade-out" role="alert" style="animation: fadeOut 4.5s forwards;">
-                {{ message }}
-            </div>
+              {% if message.tags == 'error' %}
+                <div class="alert alert-danger text-center fade-out" role="alert" style="animation: fadeOut 4.5s forwards;">
+                  <i class="bi bi-exclamation-circle"></i> {{ message }}
+                </div>
+              {% else %}
+                <div class="alert alert-{{ message.tags }} text-center fade-out" role="alert" style="animation: fadeOut 4.5s forwards;">
+                  <i class="bi bi-check-circle"></i> {{ message }}
+                </div>
+              {% endif %}
             {% endfor %}
-            {% endif %}
+          {% endif %}
+          
         </div>
     </div>
 </div> 
diff --git a/techsupport/templates/dashboard.html b/techsupport/templates/dashboard.html
index 2cd1f2a..e965540 100644
--- a/techsupport/templates/dashboard.html
+++ b/techsupport/templates/dashboard.html
@@ -245,7 +245,7 @@ <h6 class="text-muted fw-normal fs-6" title="Resolved">Resolved</h6>
                                       <a href="{% url 'ticket_details' ticket.id %}" class="btn btn-secondary mr-1">
                                           <i class="bi bi-info-circle"></i> 
                                       </a>
-                                      {% if user.is_admin or user.is_superuser %}
+                                      {% if user_role == 'super_admin' or user_role == 'admin' %}
                                           <a href="{% url 'archive_ticket' ticket.id %}" class="btn btn-danger ml-1">
                                               <i class="bi bi-archive"></i> 
                                           </a>
@@ -258,7 +258,7 @@ <h6 class="text-muted fw-normal fs-6" title="Resolved">Resolved</h6>
                                       <a href="{% url 'ticket_details' ticket.id %}" class="btn bg-success text-white mr-1">
                                         <i class="bi bi-check"></i> 
                                       </a>
-                                      {% if user.is_admin or user.is_superuser %}
+                                      {% if user_role == 'super_admin' or user_role == 'admin' %}
                                           <a href="{% url 'archive_ticket' ticket.id %}" class="btn btn-danger ml-1">
                                               <i class="bi bi-archive"></i>
                                           </a>
diff --git a/techsupport/views.py b/techsupport/views.py
index 495b1df..cb5f344 100644
--- a/techsupport/views.py
+++ b/techsupport/views.py
@@ -648,12 +648,14 @@ def unarchive_ticket(request, ticket_id):
 
 @login_required
 def archive(request):
-    user = request.user
-    if user.role in ["admin", "super_admin"]:
-        archived_tickets = SupportTicket.objects.filter(archived=True).order_by("-date_archived")
-        context = {
-            'archived_tickets': archived_tickets,
-        }
-        return render(request, 'support_ticket/archive.html', context)
-    else:
-        return redirect("dashboard")
+  user = request.user
+  if user.role not in ["admin", "super_admin"]:
+    messages.error(request, "Sorry, you don't have access to this page!.")
+    return redirect("dashboard")
+
+  archived_tickets = SupportTicket.objects.filter(archived=True).order_by("-date_archived")
+  context = {
+    'archived_tickets': archived_tickets,
+  }
+  return render(request, 'support_ticket/archive.html', context)
+

From 5f912c511bb199562d9cd6ff08df549d750dccc8 Mon Sep 17 00:00:00 2001
From: Jeenyhus <mweembadabwitso@gmail.com>
Date: Sat, 28 Oct 2023 12:40:45 +0200
Subject: [PATCH 3/5] Removed ArchivedSupportTicket model and only when ticket
 has status resolved/closed can be archived

---
 techsupport/models.py | 52 ++++++++++++++++---------------------------
 techsupport/views.py  | 41 ++++++++++++++++------------------
 2 files changed, 38 insertions(+), 55 deletions(-)

diff --git a/techsupport/models.py b/techsupport/models.py
index 7289497..794d7b0 100644
--- a/techsupport/models.py
+++ b/techsupport/models.py
@@ -284,9 +284,7 @@ class Meta:
         verbose_name_plural = "subcategories"
 
 
-class SupportTicket(BaseModel):
-    """Model representing a support ticket submitted by a coach."""
-
+class SupportTicket(models.Model):
     class Status(models.TextChoices):
         OPEN = "Open", _("Open")
         IN_PROGRESS = "In Progress", _("In Progress")
@@ -302,7 +300,7 @@ class Priority(models.TextChoices):
         verbose_name=_("ticket number"), unique=True, editable=False
     )
     date_submitted = models.DateTimeField(
-        verbose_name=_("date submitted"), default=now, editable=False
+        verbose_name=_("date submitted"), default=timezone.now, editable=False
     )
     date_resolved = models.DateTimeField(
         verbose_name=_("date resolved"), null=True, blank=True
@@ -377,22 +375,8 @@ class Priority(models.TextChoices):
     date_archived = models.DateTimeField(
         null=True, blank=True, verbose_name=_("date archived")
     )
-    previous_status = models.CharField(
-        max_length=30,
-        verbose_name=_("previous status"),
-        choices=Status.choices,
-        null=True,
-        blank=True,
-    )
     
     def save(self, *args, **kwargs):
-        """
-        Override the save method to set the ticket number and support description.
-
-        Args:
-            *args: Arguments passed to the superclass method.
-            **kwargs: Keyword arguments passed to the superclass method.
-        """
         if not self.ticket_number:
             max_ticket_number = SupportTicket.objects.aggregate(
                 max_ticket_number=models.Max("ticket_number")
@@ -404,10 +388,6 @@ def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
 
     def ticket_age(self):
-        """
-        Method that returns the difference between the current time and the time
-        the support ticket was submitted.
-        """
         now = timezone.now()
         age = now - self.date_submitted
 
@@ -427,16 +407,22 @@ def ticket_age(self):
             else:
                 return f"{minutes} mins ago"
 
-class ArchivedSupportTicket(BaseModel):
-    support_ticket = models.OneToOneField(
-        SupportTicket,
-        on_delete=models.CASCADE,
-        related_name="archived_ticket",
-        verbose_name=_("support ticket"),
-    )
+    def archive(self):
+        if self.status == SupportTicket.Status.RESOLVED:
+            self.status = SupportTicket.Status.CLOSED
+            self.save()
+            return True
+        return False
 
     def unarchive(self):
-        self.support_ticket.status = SupportTicket.Status.OPEN
-        self.support_ticket.date_resolved = None
-        self.support_ticket.save()
-        self.delete()
\ No newline at end of file
+        if self.status == SupportTicket.Status.CLOSED:
+            self.status = SupportTicket.Status.RESOLVED
+            self.save()
+            return True
+        return False
+
+    def can_be_archived(self):
+        return self.status == SupportTicket.Status.RESOLVED
+
+    def can_be_unarchived(self):
+        return self.status == SupportTicket.Status.CLOSED
\ No newline at end of file
diff --git a/techsupport/views.py b/techsupport/views.py
index cb5f344..ad0da98 100644
--- a/techsupport/views.py
+++ b/techsupport/views.py
@@ -27,7 +27,6 @@
     Centre,
     SubCategory,
     SupportTicket,
-    ArchivedSupportTicket,
     UserProfile,
     User,
 )
@@ -590,26 +589,30 @@ def archive_ticket(request, ticket_id):
         # Retrieve the support ticket to archive
         ticket = get_object_or_404(SupportTicket, id=ticket_id)
 
-        # Store the previous status
-        ticket.previous_status = ticket.status
+        # Check if the support ticket's status is "Resolved" before archiving
+        if ticket.status == SupportTicket.Status.RESOLVED:
+            # Change the support ticket status to "Closed"
+            ticket.status = SupportTicket.Status.CLOSED
+            ticket.save()
 
-        # Change the support ticket status to "Closed"
-        ticket.status = SupportTicket.Status.CLOSED
-        ticket.save()
+            ticket.archived = True
+            ticket.date_archived = timezone.now()
+            ticket.save()
 
-        ticket.archived = True
-        ticket.date_archived = timezone.now()
-        ticket.save()
+            # Add a success message
+            messages.success(request, 'The support ticket has been archived.')
 
-        # Add a success message
-        messages.success(request, 'The support ticket has been archived.')
+            # Redirect to the dashboard or any other page you prefer
+            return redirect('dashboard')
+        else:
+            messages.error(request, 'This support ticket cannot be archived')
 
-        # Redirect to the dashboard or any other page you prefer
         return redirect('dashboard')
     else:
         return redirect('dashboard')
 
 
+
 @login_required
 def unarchive_ticket(request, ticket_id):
     user = request.user
@@ -622,15 +625,9 @@ def unarchive_ticket(request, ticket_id):
             messages.error(request, 'The support ticket is not archived.')
             return redirect('dashboard')
 
-        # Check if the previous status is null
-        if not ticket.previous_status:
-            messages.error(request, 'The support ticket does not have a previous status.')
-            return redirect('dashboard')
-
-        # Restore the previous status
-        ticket.status = ticket.previous_status
-        ticket.previous_status = None
-
+        # Restore the open status to unarchived ticket
+        ticket.status = SupportTicket.Status.OPEN
+        
         # Set the archived flag to False
         ticket.archived = False
 
@@ -650,7 +647,7 @@ def unarchive_ticket(request, ticket_id):
 def archive(request):
   user = request.user
   if user.role not in ["admin", "super_admin"]:
-    messages.error(request, "Sorry, you don't have access to this page!.")
+    messages.error(request, "You do not have access to this page!.")
     return redirect("dashboard")
 
   archived_tickets = SupportTicket.objects.filter(archived=True).order_by("-date_archived")

From 0352477be75afb0019042e9c35da57e44b6badc6 Mon Sep 17 00:00:00 2001
From: Jeenyhus <mweembadabwitso@gmail.com>
Date: Wed, 15 Nov 2023 17:42:00 -0800
Subject: [PATCH 4/5] created archive template that wasnt properly added in the
 most recent commit

---
 techsupport/models.py                         | 21 +++-
 .../templates/support_ticket/archive.html     | 98 +++++++++++++++++++
 techsupport/views.py                          | 52 ++++------
 3 files changed, 137 insertions(+), 34 deletions(-)
 create mode 100644 techsupport/templates/support_ticket/archive.html

diff --git a/techsupport/models.py b/techsupport/models.py
index 794d7b0..82f99d8 100644
--- a/techsupport/models.py
+++ b/techsupport/models.py
@@ -285,6 +285,7 @@ class Meta:
 
 
 class SupportTicket(models.Model):
+    """Model representing a support ticket."""
     class Status(models.TextChoices):
         OPEN = "Open", _("Open")
         IN_PROGRESS = "In Progress", _("In Progress")
@@ -377,6 +378,9 @@ class Priority(models.TextChoices):
     )
     
     def save(self, *args, **kwargs):
+        """
+        Override the save method to auto-generate ticket number and title if not provided.
+        """
         if not self.ticket_number:
             max_ticket_number = SupportTicket.objects.aggregate(
                 max_ticket_number=models.Max("ticket_number")
@@ -388,6 +392,9 @@ def save(self, *args, **kwargs):
         super().save(*args, **kwargs)
 
     def ticket_age(self):
+        """
+        Calculate the age of the ticket based on submission time.
+        """
         now = timezone.now()
         age = now - self.date_submitted
 
@@ -408,6 +415,9 @@ def ticket_age(self):
                 return f"{minutes} mins ago"
 
     def archive(self):
+        """ 
+        Archive the ticket if it is resolved
+        """
         if self.status == SupportTicket.Status.RESOLVED:
             self.status = SupportTicket.Status.CLOSED
             self.save()
@@ -415,6 +425,9 @@ def archive(self):
         return False
 
     def unarchive(self):
+        """
+        Unarchive the ticket if it is closed
+        """
         if self.status == SupportTicket.Status.CLOSED:
             self.status = SupportTicket.Status.RESOLVED
             self.save()
@@ -422,7 +435,13 @@ def unarchive(self):
         return False
 
     def can_be_archived(self):
+        """
+        Check if the ticket can be archived
+        """
         return self.status == SupportTicket.Status.RESOLVED
 
     def can_be_unarchived(self):
-        return self.status == SupportTicket.Status.CLOSED
\ No newline at end of file
+        """
+        Check if the ticket can be unarchived
+        """
+        return self.status == SupportTicket.Status.CLOSED
diff --git a/techsupport/templates/support_ticket/archive.html b/techsupport/templates/support_ticket/archive.html
new file mode 100644
index 0000000..1909068
--- /dev/null
+++ b/techsupport/templates/support_ticket/archive.html
@@ -0,0 +1,98 @@
+{% extends 'base.html' %}
+{% load static %}
+
+{% block content %}
+<div class="container-fluid mt-5">
+    <div class="row justify-content-center">
+        <div class="col-md-10">
+            <!-- Archived Tickets Table -->
+            <div class="card border-0 shadow mb-4">
+                <div class="card-header bg-success text-white text-center rounded-top">
+                    <h6 class="card-title">
+                      <i class="bi bi-journal-plus me-2"></i>
+                      <span class="mr-2"></span><strong>Archived Tickets</strong>
+                    </h6>
+                </div>
+                <div class="table-responsive">
+                    <table class="table table-striped table-borderless text-truncate">
+                        <thead>
+                            <tr>
+                                <th class="text-start">#</th>
+                                <th class="text-start">Title</th>
+                                <th class="text-start">Centre</th>
+                                <th class="text-start">Status</th>
+                                <th class="text-start">Priority</th>
+                                <th class="text-start">Ticket Age</th>
+                                <th class="text-start">Submitted By</th>
+                                <th class="text-start">Actions</th>  <!-- New column for actions -->
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {% for ticket in archived_tickets %}
+                            <tr>
+                                <td>{{ ticket.ticket_number }}</td>
+                                <td class="text-start">
+                                    <div class="d-flex align-items-center justify-content-start">
+                                        <a href="{% url 'ticket_details' ticket.id %}" class="text-truncate"
+                                            data-bs-toggle="tooltip" data-bs-placement="top"
+                                            title="{{ ticket.title }}">{{ ticket.title }}</a>
+                                    </div>
+                                </td>
+                                <td>
+                                    <div class="d-flex align-items-center justify-content-start">{{ ticket.centre.acronym }}
+                                    </div>
+                                </td>
+                                <td>
+                                    <div class="d-flex align-items-center justify-content-start">
+                                        {% if ticket.status == 'Resolved' %}
+                                        <i class="bi bi-check2 me-1"></i><span class="mr-2"></span>{{ ticket.status }}
+                                        {% elif ticket.status == 'In Progress' %}
+                                        <i class="bi bi-hourglass me-1"></i><span class="mr-2"></span>{{ ticket.status }}
+                                        {% else %}
+                                        <i class="bi bi-exclamation-diamond me-1"></i><span class="mr-2"></span>Open
+                                        {% endif %}
+                                    </div>
+                                </td>
+                                <td>
+                                    <div class="d-flex align-items-center justify-content-start">
+                                        {% if ticket.priority == 'High' %}
+                                        <i class="bi bi-exclamation-triangle text-danger me-1"></i><span
+                                            class="mr-2"></span>
+                                        {% elif ticket.priority == 'Medium' %}
+                                        <i class="bi bi-exclamation-triangle text-warning me-1"></i><span
+                                            class="mr-2"></span>
+                                        {% else %}
+                                        <i class="bi bi-exclamation-triangle text-success me-1"></i><span
+                                            class="mr-2"></span>
+                                        {% endif %}
+                                        {{ ticket.priority }}
+                                    </div>
+                                </td>
+                                <td>{{ ticket.ticket_age }}</td>
+                                <td>
+                                    {% if ticket.submitted_by == user %}
+                                        You
+                                    {% else %}
+                                        {{ ticket.submitted_by.username }}
+                                    {% endif %}
+                                </td>
+                                <td>
+                                    <button class="btn btn-success btn-sm" onclick="unarchiveTicket({{ ticket.id }})">
+                                        Unarchive
+                                    </button>
+                                </td>
+                            </tr>
+                            {% empty %}
+                            <tr>
+                                <!-- No Tickets Found -->
+                                <td colspan="8" class="text-center">No archived tickets found.</td>
+                            </tr>
+                            {% endfor %}
+                        </tbody>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}
diff --git a/techsupport/views.py b/techsupport/views.py
index ad0da98..250aeed 100644
--- a/techsupport/views.py
+++ b/techsupport/views.py
@@ -589,21 +589,14 @@ def archive_ticket(request, ticket_id):
         # Retrieve the support ticket to archive
         ticket = get_object_or_404(SupportTicket, id=ticket_id)
 
-        # Check if the support ticket's status is "Resolved" before archiving
-        if ticket.status == SupportTicket.Status.RESOLVED:
-            # Change the support ticket status to "Closed"
-            ticket.status = SupportTicket.Status.CLOSED
-            ticket.save()
-
-            ticket.archived = True
-            ticket.date_archived = timezone.now()
-            ticket.save()
-
-            # Add a success message
-            messages.success(request, 'The support ticket has been archived.')
-
-            # Redirect to the dashboard or any other page you prefer
-            return redirect('dashboard')
+        # Use the can_be_archived method to check if the ticket can be archived
+        if ticket.can_be_archived():
+            # Use the archive method to handle the archiving logic
+            if ticket.archive():
+                # Add a success message
+                messages.success(request, 'The support ticket has been archived.')
+            else:
+                messages.error(request, 'Error archiving the support ticket.')
         else:
             messages.error(request, 'This support ticket cannot be archived')
 
@@ -612,7 +605,6 @@ def archive_ticket(request, ticket_id):
         return redirect('dashboard')
 
 
-
 @login_required
 def unarchive_ticket(request, ticket_id):
     user = request.user
@@ -620,29 +612,23 @@ def unarchive_ticket(request, ticket_id):
         # Retrieve the support ticket to unarchive
         ticket = get_object_or_404(SupportTicket, id=ticket_id)
 
-        # Check if the support ticket is archived
-        if not ticket.archived:
-            messages.error(request, 'The support ticket is not archived.')
-            return redirect('dashboard')
-
-        # Restore the open status to unarchived ticket
-        ticket.status = SupportTicket.Status.OPEN
-        
-        # Set the archived flag to False
-        ticket.archived = False
-
-        # Save the support ticket
-        ticket.save()
-
-        # Add a success message
-        messages.success(request, 'The support ticket has been Restored.')
+        # Use the can_be_unarchived method to check if the ticket can be unarchived
+        if ticket.can_be_unarchived():
+            # Use the unarchive method to handle the unarchiving logic
+            if ticket.unarchive():
+                # Add a success message
+                messages.success(request, 'The support ticket has been Restored.')
+            else:
+                messages.error(request, 'Error restoring the support ticket.')
+        else:
+            messages.error(request, 'The support ticket is not eligible for restoration.')
 
-        # Redirect to the dashboard or any other page you prefer
         return redirect('dashboard')
     else:
         return redirect('dashboard')
 
 
+
 @login_required
 def archive(request):
   user = request.user

From 27a31eadb1a62be2888167fda99913ceb3ab9180 Mon Sep 17 00:00:00 2001
From: Jeenyhus <mweembadabwitso@gmail.com>
Date: Thu, 16 Nov 2023 13:45:02 -0800
Subject: [PATCH 5/5] archiving tickets, unarchiving ticket,removed redundant
 code

---
 techsupport/models.py                         | 17 +++++-----
 .../templates/support_ticket/archive.html     | 31 +++++++++----------
 techsupport/views.py                          |  7 +----
 3 files changed, 26 insertions(+), 29 deletions(-)

diff --git a/techsupport/models.py b/techsupport/models.py
index 82f99d8..e25c2ae 100644
--- a/techsupport/models.py
+++ b/techsupport/models.py
@@ -415,21 +415,23 @@ def ticket_age(self):
                 return f"{minutes} mins ago"
 
     def archive(self):
-        """ 
-        Archive the ticket if it is resolved
-        """
+        """Archive the ticket if it is resolved."""
         if self.status == SupportTicket.Status.RESOLVED:
             self.status = SupportTicket.Status.CLOSED
+            self.archived = True
+            self.date_archived = timezone.now()
             self.save()
             return True
         return False
 
     def unarchive(self):
         """
-        Unarchive the ticket if it is closed
+        Unarchive the ticket if it is closed or resolved
         """
-        if self.status == SupportTicket.Status.CLOSED:
-            self.status = SupportTicket.Status.RESOLVED
+        if self.can_be_unarchived():
+            self.status = SupportTicket.Status.OPEN  # Set the status to 'OPEN' when unarchiving
+            self.archived = False
+            self.date_archived = None
             self.save()
             return True
         return False
@@ -444,4 +446,5 @@ def can_be_unarchived(self):
         """
         Check if the ticket can be unarchived
         """
-        return self.status == SupportTicket.Status.CLOSED
+        return self.status in [SupportTicket.Status.CLOSED, SupportTicket.Status.RESOLVED]
+
diff --git a/techsupport/templates/support_ticket/archive.html b/techsupport/templates/support_ticket/archive.html
index 1909068..db69612 100644
--- a/techsupport/templates/support_ticket/archive.html
+++ b/techsupport/templates/support_ticket/archive.html
@@ -20,11 +20,11 @@ <h6 class="card-title">
                                 <th class="text-start">#</th>
                                 <th class="text-start">Title</th>
                                 <th class="text-start">Centre</th>
-                                <th class="text-start">Status</th>
-                                <th class="text-start">Priority</th>
+                                {% comment %} <th class="text-start">Status</th> {% endcomment %}
+                                {% comment %} <th class="text-start">Priority</th> {% endcomment %}
                                 <th class="text-start">Ticket Age</th>
-                                <th class="text-start">Submitted By</th>
-                                <th class="text-start">Actions</th>  <!-- New column for actions -->
+                                <th class="text-start">By</th>
+                                <th class="text-start">Actions</th>
                             </tr>
                         </thead>
                         <tbody>
@@ -42,18 +42,16 @@ <h6 class="card-title">
                                     <div class="d-flex align-items-center justify-content-start">{{ ticket.centre.acronym }}
                                     </div>
                                 </td>
-                                <td>
+                                {% comment %} <td>
                                     <div class="d-flex align-items-center justify-content-start">
-                                        {% if ticket.status == 'Resolved' %}
-                                        <i class="bi bi-check2 me-1"></i><span class="mr-2"></span>{{ ticket.status }}
-                                        {% elif ticket.status == 'In Progress' %}
-                                        <i class="bi bi-hourglass me-1"></i><span class="mr-2"></span>{{ ticket.status }}
+                                        {% if ticket.status == 'Closed' %}
+                                            <i class="bi bi-archive me-1"></i><span class="mr-2"></span>Closed
                                         {% else %}
-                                        <i class="bi bi-exclamation-diamond me-1"></i><span class="mr-2"></span>Open
+                                            <!-- This block will be empty for tickets that are not archived -->
                                         {% endif %}
                                     </div>
-                                </td>
-                                <td>
+                                </td> {% endcomment %}
+                                {% comment %} <td>
                                     <div class="d-flex align-items-center justify-content-start">
                                         {% if ticket.priority == 'High' %}
                                         <i class="bi bi-exclamation-triangle text-danger me-1"></i><span
@@ -67,7 +65,7 @@ <h6 class="card-title">
                                         {% endif %}
                                         {{ ticket.priority }}
                                     </div>
-                                </td>
+                                </td> {% endcomment %}
                                 <td>{{ ticket.ticket_age }}</td>
                                 <td>
                                     {% if ticket.submitted_by == user %}
@@ -77,9 +75,9 @@ <h6 class="card-title">
                                     {% endif %}
                                 </td>
                                 <td>
-                                    <button class="btn btn-success btn-sm" onclick="unarchiveTicket({{ ticket.id }})">
-                                        Unarchive
-                                    </button>
+                                    <a href="{% url 'unarchive_ticket' ticket.id %}" class="btn bg-success ml-1">
+                                        <i class="bi bi-arrow-counterclockwise text-white"></i>
+                                    </a>
                                 </td>
                             </tr>
                             {% empty %}
@@ -96,3 +94,4 @@ <h6 class="card-title">
     </div>
 </div>
 {% endblock %}
+
diff --git a/techsupport/views.py b/techsupport/views.py
index 250aeed..f9401f5 100644
--- a/techsupport/views.py
+++ b/techsupport/views.py
@@ -609,26 +609,21 @@ def archive_ticket(request, ticket_id):
 def unarchive_ticket(request, ticket_id):
     user = request.user
     if user.role in ["admin", "super_admin"]:
-        # Retrieve the support ticket to unarchive
         ticket = get_object_or_404(SupportTicket, id=ticket_id)
 
-        # Use the can_be_unarchived method to check if the ticket can be unarchived
         if ticket.can_be_unarchived():
-            # Use the unarchive method to handle the unarchiving logic
             if ticket.unarchive():
-                # Add a success message
                 messages.success(request, 'The support ticket has been Restored.')
             else:
                 messages.error(request, 'Error restoring the support ticket.')
         else:
             messages.error(request, 'The support ticket is not eligible for restoration.')
 
-        return redirect('dashboard')
+        return redirect('dashboard')  
     else:
         return redirect('dashboard')
 
 
-
 @login_required
 def archive(request):
   user = request.user