From 769294ae9fe1c9c90ce536e026adf1623e59ee14 Mon Sep 17 00:00:00 2001
From: awwang0628 <awwang0628@gmail.com>
Date: Fri, 14 Jun 2024 16:20:49 -0400
Subject: [PATCH 01/14] navigation-sidebar.html: Added accessibility notice to
 sidebar of helpdesk for Colorado

---
 helpdesk/templates/helpdesk/navigation-sidebar.html | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/helpdesk/templates/helpdesk/navigation-sidebar.html b/helpdesk/templates/helpdesk/navigation-sidebar.html
index c9b9fe2ed..78da8afee 100644
--- a/helpdesk/templates/helpdesk/navigation-sidebar.html
+++ b/helpdesk/templates/helpdesk/navigation-sidebar.html
@@ -65,6 +65,15 @@
           </a>
         </li>
         {% endif %}
+        {% if user.default_organization.name == 'Building Performance Colorado' %}
+        <li class="nav-item">
+          <a class="nav-link" href="https://energyoffice.colorado.gov/accessibility"  target="_blank">
+            <i class="fas fa-fw fa-universal-access"></i>
+            <span>{% trans "Accessibility Notice" %}</span>
+          </a>
+        </li>
+        {% endif %}
+
         <li class="dropdown-divider"></li>
         <li class="nav-item dropdown {% if url_name == 'user_settings' or url_name == 'system_settings' or 'rss_' in url_name %}active{% endif %}">
           <a class="nav-link dropdown-toggle" href="#" id="userDropdown" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">

From f695e0de3e2335c8695de53255bca367aee4972f Mon Sep 17 00:00:00 2001
From: awwang0628 <awwang0628@gmail.com>
Date: Mon, 17 Jun 2024 09:46:33 -0400
Subject: [PATCH 02/14] Pushing current work done on notifications

---
 helpdesk/email.py                             |  26 +-
 .../migrations/0103_add_notification_model.py |  36 +++
 .../0104_alter_usersettings_model.py          |  18 ++
 helpdesk/models.py                            |  62 +++-
 helpdesk/static/helpdesk/css/sb-admin.css     |  24 +-
 helpdesk/static/helpdesk/css/sb-admin.css.map |   8 +-
 helpdesk/static/helpdesk/scss/_navbar.scss    |  16 +
 .../helpdesk/navigation-sidebar.html          |  15 +
 .../helpdesk/notification_index_old.html      | 289 +++++++++++++++++
 .../helpdesk/notifications_index.html         | 306 ++++++++++++++++++
 .../templatetags/get_unread_notifications.py  |   8 +
 helpdesk/urls.py                              |  21 ++
 helpdesk/views/staff.py                       | 203 +++++++++++-
 13 files changed, 1016 insertions(+), 16 deletions(-)
 create mode 100644 helpdesk/migrations/0103_add_notification_model.py
 create mode 100644 helpdesk/migrations/0104_alter_usersettings_model.py
 create mode 100644 helpdesk/templates/helpdesk/notification_index_old.html
 create mode 100644 helpdesk/templates/helpdesk/notifications_index.html
 create mode 100644 helpdesk/templatetags/get_unread_notifications.py

diff --git a/helpdesk/email.py b/helpdesk/email.py
index bdd8cd98e..3cd48b381 100644
--- a/helpdesk/email.py
+++ b/helpdesk/email.py
@@ -40,7 +40,7 @@
 
 from helpdesk import settings
 from helpdesk.lib import safe_template_context, process_attachments
-from helpdesk.models import Ticket, TicketCC, FollowUp, IgnoreEmail, FormType, CustomField, is_extra_data
+from helpdesk.models import Ticket, TicketCC, FollowUp, IgnoreEmail, FormType, CustomField, is_extra_data, Notification
 from seed.models import EmailImporter, GOOGLE, MICROSOFT, EXCHANGE_OAUTH, EXCHANGE_PASS
 from helpdesk.decorators import is_helpdesk_staff
 from post_office.models import Email
@@ -848,6 +848,30 @@ def create_ticket_from_processed_message(message, ticket_id, payload, files, log
                 email_logger=logger,
                 source="import"
             )
+        for ticketcc in ticket.ticketcc_set.all():
+            if is_helpdesk_staff(ticketcc.user, ticket.ticket_form.organization_id) and ticketcc.user.usersettings_helpdesk.enable_notifications:
+                new_notification = Notification(
+                    user=ticketcc.user,
+                    ticket=ticket,
+                    organization=ticket.ticket_form.organization,
+                    message= "A ticket you have been CC'd on has been updated",
+                    is_read=False,
+                    delete_by = timezone.now() + timedelta(days=60)
+                )
+
+                new_notification.save()
+
+        if ticket.assigned_to and ticket.assigned_to.user.usersettings_helpdesk.enable_notifications:
+            new_notification = Notification(
+                user=ticket.assigned_to,
+                ticket=ticket,
+                organization=ticket.ticket_form.organization,
+                message=message,
+                is_read=False,
+                delete_by = timezone.now() + timedelta(days=60)
+            )
+
+            new_notification.save()
     return ticket
 
 def process_message(message, importer, queues, logger, options=None):
diff --git a/helpdesk/migrations/0103_add_notification_model.py b/helpdesk/migrations/0103_add_notification_model.py
new file mode 100644
index 000000000..1c7a748f7
--- /dev/null
+++ b/helpdesk/migrations/0103_add_notification_model.py
@@ -0,0 +1,36 @@
+# Generated by Django 3.2.18 on 2024-06-05 16:22
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('orgs', '0056_alter_organization_map_help_text'),
+        ('helpdesk', '0102_add_kbitem_unlisted'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='kbitem',
+            name='unlisted',
+            field=models.BooleanField(default=False, help_text='Should this form be hidden from the public article list? (If the "Is this article publicly visible?" option is checked, this form will still be accessible by everyone through the link.)', verbose_name='Unlisted'),
+        ),
+        migrations.CreateModel(
+            name='Notification',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('message', models.TextField()),
+                ('is_read', models.BooleanField()),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('delete_by', models.DateTimeField()),
+                ('announcement', models.BooleanField(default=False)),
+                ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='orgs.organization')),
+                ('ticket', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='helpdesk.ticket', verbose_name='Ticket')),
+                ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='User')),
+            ],
+        ),
+    ]
diff --git a/helpdesk/migrations/0104_alter_usersettings_model.py b/helpdesk/migrations/0104_alter_usersettings_model.py
new file mode 100644
index 000000000..a5496cf9f
--- /dev/null
+++ b/helpdesk/migrations/0104_alter_usersettings_model.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.18 on 2024-06-07 15:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('helpdesk', '0103_add_notification_model'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='usersettings',
+            name='enable_notifications',
+            field=models.BooleanField(default=True, help_text="Get notifications when tickets you've been assigned to or CC'd on are updated?", verbose_name='Enable notification when tickets are created or updated?'),
+        ),
+    ]
diff --git a/helpdesk/models.py b/helpdesk/models.py
index d82badbd8..f2d8d6da4 100644
--- a/helpdesk/models.py
+++ b/helpdesk/models.py
@@ -21,6 +21,7 @@
 import os
 import mimetypes
 import datetime
+from datetime import timedelta
 import logging
 
 from django.utils.safestring import mark_safe
@@ -679,7 +680,7 @@ def send(role, recipient):
 
                 for field in email_fields:
                     if field in self.extra_data and self.extra_data[field] is not None and self.extra_data[field] != '' and is_extra_data(field):
-                        send('extra', self.extra_data[field])
+                        send('extra', self.extra_data[field])            
 
         return recipients
 
@@ -1843,6 +1844,12 @@ class UserSettings(models.Model):
         default=use_email_as_submitter_default,
     )
 
+    enable_notifications = models.BooleanField(
+        verbose_name=('Enable notification when tickets are created or updated?'),
+        help_text='Get notifications when tickets you\'ve been assigned to or CC\'d on are updated?',
+        default=True,
+    )
+
     def __str__(self):
         return 'Preferences for %s' % self.user
 
@@ -2245,3 +2252,56 @@ class Meta:
 
     def __str__(self):
         return '%s / %s' % (self.ticket, self.depends_on)
+
+class Notification(models.Model):
+    user = models.ForeignKey(
+            settings.AUTH_USER_MODEL,
+            on_delete=models.SET_NULL,
+            blank=True,
+            null=True,
+            verbose_name=_('User'),
+    )
+
+    ticket = models.ForeignKey(
+        Ticket,
+        on_delete=models.CASCADE,
+        verbose_name=_('Ticket'),
+        blank=True,
+        null=True
+    )
+
+    organization = models.ForeignKey(
+        Organization, 
+        on_delete=models.CASCADE
+    )
+
+    message = models.TextField()
+
+    is_read = models.BooleanField()
+
+    created = models.DateTimeField(
+        auto_now_add=True
+    )
+
+    delete_by = models.DateTimeField()
+
+    announcement = models.BooleanField(default=False)
+
+    def get_time_since_created(self):
+
+        time_diff = timezone.now() - self.created
+
+        days = time_diff.days
+        seconds = time_diff.seconds
+        hours = seconds // 3600
+        minutes = (seconds % 3600) // 60
+
+        if days > 0:
+            return self.created
+        elif hours > 0:
+            return f"{hours} hour(s) ago"
+        elif minutes > 0:
+            return f"{minutes} minute(s) ago"
+        else:
+            return "just now"
+    
\ No newline at end of file
diff --git a/helpdesk/static/helpdesk/css/sb-admin.css b/helpdesk/static/helpdesk/css/sb-admin.css
index dea491247..7281f3eef 100644
--- a/helpdesk/static/helpdesk/css/sb-admin.css
+++ b/helpdesk/static/helpdesk/css/sb-admin.css
@@ -233,11 +233,11 @@ body.fixed-nav.sidebar-toggled #content-wrapper {
   vertical-align: 0;
   border: 0;
   font-weight: 900;
-  content: '\f105';
-  font-family: 'Font Awesome 5 Free';
+  content: "\f105";
+  font-family: "Font Awesome 5 Free";
 }
 .navbar-nav .nav-item.dropdown.show .dropdown-toggle::after {
-  content: '\f107';
+  content: "\f107";
 }
 .navbar-nav .nav-item.dropdown.no-arrow .dropdown-toggle::after {
   display: none;
@@ -366,8 +366,20 @@ body.fixed-nav.sidebar-toggled #content-wrapper {
   height: 86px;
 }
 
-.navbar {
-  height: 86px;
+.notification-indicator {
+  position: relative;
+  display: inline-block;
+}
+
+.notification-indicator .indicator {
+  position: absolute;
+  top: 24px;
+  right: 80px;
+  height: 10px;
+  width: 10px;
+  background-color: red;
+  border-radius: 50%;
+  content: "";
 }
 
 .card-body-icon {
@@ -467,7 +479,7 @@ body.fixed-nav.sidebar-toggled #content-wrapper {
 }
 
 .form-label-group input:not(:placeholder-shown) {
-  padding-top: calc(var(--input-padding-y) + var(--input-padding-y) * (2 / 3));
+  padding-top: calc(var(--input-padding-y) + var(--input-padding-y) * 0.6666666667);
   padding-bottom: calc(var(--input-padding-y) / 3);
 }
 
diff --git a/helpdesk/static/helpdesk/css/sb-admin.css.map b/helpdesk/static/helpdesk/css/sb-admin.css.map
index 4cbf4c2a6..4bfe01e62 100644
--- a/helpdesk/static/helpdesk/css/sb-admin.css.map
+++ b/helpdesk/static/helpdesk/css/sb-admin.css.map
@@ -1,7 +1 @@
-{
-"version": 3,
-"mappings": "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",
-"sources": ["../scss/_fonts.scss","../scss/_global.scss","../scss/_variables.scss","../scss/_utilities.scss","../scss/_navbar.scss","../scss/_mixins.scss","../scss/_cards.scss","../scss/_login.scss","../scss/_footer.scss"],
-"names": [],
-"file": "sb-admin.css"
-}
+{"version":3,"sourceRoot":"","sources":["../scss/_fonts.scss","../scss/_global.scss","../scss/_variables.scss","../scss/_utilities.scss","../scss/_navbar.scss","../scss/_mixins.scss","../scss/_cards.scss","../scss/_login.scss","../scss/_footer.scss"],"names":[],"mappings":"AAAA;AACA;EACE;EACA;EACA;EACA;EAEA;;AAGF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAEF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAGF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAIF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAGF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAEF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAGF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAIF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAGF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAEF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAGF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAIF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAGF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAEF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAGF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAKF;AAAA;EAEE;;;ACjKF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;AACA;EACE;EACA;EACA;EACA,gBCqBmB;;;ADhBrB;EACE,YCSiB;EDRjB,cCYsB;;ADTtB;EACE;;AAGJ;EACE;IACE,cCCe;;EDEf;IACE,cCDkB;;;;ADQ1B;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA,OClDM;EDmDN;EACA;;AACA;EAEE;;AAEF;EACE,YClDO;;ADoDT;EACE;;;AAIJ;EACI;EACA;EACA;EACA;;;AAEJ;EACI;EACA;;;AAGJ;EACI;;;AE9EJ;EACE;;;AAIF;EACE;;;AAIF;EACE;;;AAGF;EACE;;;ACdA;EACE;;AAKE;EACE,OFPA;;AEYA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIF;EACE;;AAIF;EACE;;AAKJ;EAEE;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAKN;EAEE;IACE;;;;AAON;EACE;EACA,kBFpDS;EEqDT;;AC1DE;EACE;;AAEF;EACE;EACA;EACA,OHwBoB;;AGvBpB;EACE;EACA;;AAGJ;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;AAGJ;EACE;;ADsCF;EACE;;AACA;EAGE;;AAIN;EACE;EACA;;;AAIJ;EACE;IACE;;EAGE;IACE;IACA;IACA;IACA;IACA,OF1Da;;EE2Db;IACE;IACA;;EAGJ;IACE;IACA;IAEA;;EAEF;IACE;;EAGJ;IACE;IACA;;ECxGF;IACE;;EAEF;IACE;IACA;IACA,OHwBoB;;EGvBpB;IACE;IACA;;EAGJ;IACE;IACA;IACA;IACA;;EACA;IACE;IACA;;EAGJ;IACE;;;AD0FN;EACE,KFxFmB;EEyFnB;EACA;;;AAIF;EACI;;;AAGJ;EACI,QFnGiB;;;AEsGrB;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AEjJF;EACE;EACA;EACA;EACA;EACA;EAEA;EDRA;;;ACcA;EADF;IAEI;;;AAEF;EAJF;IAKI;;;AAEF;EAPF;IAQI;;;;AAIJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;ACnCJ;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;AAAA;EAEE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;ACnEF;EACE;EACA;EACA;EACA;EACA;EACA,QNgCqB;EM/BrB,kBNHS;;AMIT;EACE;EACA;;AAEF;EAZF;IAaI;;;;AAKF;EACE;;AAEF;EACE;IACE","file":"sb-admin.css"}
\ No newline at end of file
diff --git a/helpdesk/static/helpdesk/scss/_navbar.scss b/helpdesk/static/helpdesk/scss/_navbar.scss
index 807e2bddf..a1421857e 100644
--- a/helpdesk/static/helpdesk/scss/_navbar.scss
+++ b/helpdesk/static/helpdesk/scss/_navbar.scss
@@ -130,4 +130,20 @@
 
 .navbar {
     height: $navbar-base-height;
+}
+
+.notification-indicator {
+  position: relative;
+  display: inline-block;
+}
+
+.notification-indicator .indicator {
+  position: absolute;
+  top: 24px;
+  right: 80px;
+  height: 10px;
+  width: 10px;
+  background-color: red;
+  border-radius: 50%;
+  content: '';
 }
\ No newline at end of file
diff --git a/helpdesk/templates/helpdesk/navigation-sidebar.html b/helpdesk/templates/helpdesk/navigation-sidebar.html
index 78da8afee..807a72dde 100644
--- a/helpdesk/templates/helpdesk/navigation-sidebar.html
+++ b/helpdesk/templates/helpdesk/navigation-sidebar.html
@@ -4,6 +4,7 @@
 {% load saved_queries %}
 {% with user|saved_queries as user_saved_queries_ %}
 {% with request.resolver_match.url_name as url_name %}
+{% load get_unread_notifications %}
     <!-- Sidebar -->
     <ul class="sidebar navbar-nav">
     {% if helpdesk_settings.HELPDESK_NAVIGATION_ENABLED and user.is_authenticated or user|is_helpdesk_staff %}
@@ -65,6 +66,20 @@
           </a>
         </li>
         {% endif %}
+        {% if user|is_helpdesk_staff %}
+        <li class="nav-item {% if url_name == 'notifications' %}active{% endif %}">
+          <a class="nav-link notification-indicator" href="{% url 'helpdesk:notifications' %}">
+            {% with user|get_unread_notifications:user.default_organization.helpdesk_organization as unread_notifications %}
+              {% if unread_notifications %}
+                <span class="indicator"></span>
+              {% endif %}
+            {% endwith %}
+            <i class="fas fa-fw fa-bell"></i>
+            <span>{% trans "Notifications" %}</span>
+          </a>
+        </li>
+        {% endif %}
+
         {% if user.default_organization.name == 'Building Performance Colorado' %}
         <li class="nav-item">
           <a class="nav-link" href="https://energyoffice.colorado.gov/accessibility"  target="_blank">
diff --git a/helpdesk/templates/helpdesk/notification_index_old.html b/helpdesk/templates/helpdesk/notification_index_old.html
new file mode 100644
index 000000000..6aaa1293b
--- /dev/null
+++ b/helpdesk/templates/helpdesk/notification_index_old.html
@@ -0,0 +1,289 @@
+{% extends "helpdesk/base.html" %}
+
+{% load i18n humanize static in_list %}
+
+{% block helpdesk_title %} {% trans "Notifications" %} {% endblock %}
+
+{% block helpdesk_breadcrumb %}
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:notifications' %}">{% trans "Notifications" %}</a>
+</li>
+<li class="breadcrumb-item active">Overview</li>
+{% endblock %}
+
+{% block helpdesk_body %}
+<div class="d-flex align-items-center">    
+    
+    <div class="input-group justify-content-end">
+
+        
+        <div class="input-group-append">
+            <button id="mark_as_read_btn" class="btn btn-outline-primary rounded-left font-weight-semibold" type="button" method="POST"> {% csrf_token %} Mark As Read <i class="fa fa-check mr-1"></i></button>
+            <button id="delete_btn" class="btn btn-outline-danger font-weight-semibold" type="button" method="POST"> {% csrf_token %} Delete Selected <i class="fa fa-trash-alt mr-1"></i></button>
+        </div>
+        <div class="input-group-prepend">
+            <label class="input-group-text bg-white border-0">Select:</label>
+        </div>
+        
+        <div class="input-group-append">
+            <button id="select_all_btn" class="btn btn-outline-primary rounded-left font-weight-semibold" type="button">All <i class="fa fa-plus-circle mr-1"></i></button>
+            <button id="select_none_btn" class="btn btn-outline-danger font-weight-semibold" type="button">None <i class="fa fa-times-circle mr-1"></i></button>
+        </div>
+    </div>
+</div>
+
+
+<div class="row">
+    <div class="col-sm-8 col-md-9 col-lg-10 order-1 pl-3">
+        <div id="query_card" class="card mb-2">
+            <!-- Notifications-->
+            <div class="card-header">
+                <i class="fas fa-bell"></i>
+                {% trans "Notifications" %}
+            </div>
+
+            <div class="card-body">
+                <div class="table-responsive">
+                    <table class="table table-bordered table-sm m-0" id="dataTable" width="100%" cellspacing="0">
+                        <thead class="thead-light">
+                            <tr id="headers">
+                                <th class="filter-top" data-colname="checkbox" scope="col"></th>
+                                <th class="filter-top" data-colname="message" scope="col">Message</th>
+                                <th class="filter-top" data-colname="date" scope="col">Date</th>
+                                <th class="filter-top" data-colname="ticket_link" scope="col">Ticket</th>
+                                
+                            </tr>
+
+                            <tr>
+                                <td></td>
+                                <td></td>
+                                <td></td>
+                                <td></td>
+                              </tr>
+                        </thead>
+                        <tbody>
+                            {% for notification in notifications %}
+                                <tr {% if notification.is_read %} style="background-color: lightgray;" {% endif %}>
+                                    <td>
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" name="notification_checkbox" class="custom-control-input notification_multi_select" id="newCustomCheck{{ forloop.counter }}" value="{{ notification.id }}">
+                                            <label class="custom-control-label" for="newCustomCheck{{ forloop.counter }}"></label>
+                                        </div>
+                                    </td>
+                                    <td>{{notification.message}}</td>
+                                    <td title="{{ notification.created }}">{{notification.get_time_since_created}}</td>
+                                    <td><a href="{% url 'helpdesk:mark_notification_as_read' notification.id%}">[queue-{{notification.ticket.queue}}] {{notification.ticket.title}}</a></td>
+                                </tr>
+                            {% empty %}
+                                <tr>
+                                    <td colspan="4">No Notifications</td>
+                                </tr>
+                            {% endfor %}
+
+                        </tbody>
+                    </table>
+                </div>
+                <!-- Pagination Toolbar -->
+                <div class="d-flex flex-wrap border-top px-2 py-2" style="//background-color: #f7f7f7">
+                    {% with 't_page' as page_var %}
+
+                    <div class="mr-auto d-flex align-items-center ml-2">Showing {{ notification_index_start }}-{{ notification_index_end }} of {{ notification_total }}<em><span class="select_count"></span></em></div>
+                    <div class="flex-fill justify-content-end">
+                        <div class="btn-toolbar float-right" role="toolbar" style="bottom: 0;">
+                            <div class="btn-group mr-2" role="group">
+                                {% if notifications.has_previous %}
+                                <button class="btn btn-primary font-weight-bold" onclick="paginatedQuery(1, false)">First</button>
+                                <button class="btn btn-primary font-weight-bold" onclick="paginatedQuery({{ notifications.previous_page_number }})">Previous</button>
+                                {% else %}
+                                <button class="btn btn-primary font-weight-bold disabled">First</button>
+                                <button class="btn btn-primary font-weight-bold disabled">Previous</button>
+                                {% endif %}
+                            </div>
+                            <div class="btn-group mr-2" role="group">
+                                {% with 3 as thresh %}
+                                {% for i in notifications.paginator.page_range %}
+                                {% if notifications.number == i %}
+                                <button class="btn btn-outline-primary active font-weight-bold">{{ i }}</button>
+                                {% elif i <= notifications.number|add:5 and i >= notifications.number|add:-5 %}
+                                <button class="btn btn-outline-primary font-weight-bold" onclick="paginatedQuery({{ i }})">{{ i }}</button>
+                                {% endif %}
+                                {% endfor %}
+                                {% endwith %}
+                            </div>
+                            <div class="btn-group" role="group">
+                                {% if notifications.has_next %}
+                                <button class="btn btn-primary font-weight-bold" onclick="paginatedQuery({{ notifications.next_page_number }}, false)">Next</button>
+                                <button class="btn btn-primary font-weight-bold" onclick="paginatedQuery({{ notifications.paginator.num_pages }}, false)">Last</button>
+                                {% else %}
+                                <button class="btn btn-primary font-weight-bold disabled">Next</button>
+                                <button class="btn btn-primary font-weight-bold disabled">Last</button>
+                                {% endif %}
+                            </div>
+                        </div>
+                    </div>
+                    {% endwith %}
+                </div>
+                <!-- / Pagination Toolbar -->
+                                
+
+                
+            </div>
+    
+    </div>
+
+    <form method="get" id="query_form" action="{% url 'helpdesk:notifications' %}">
+
+        <!-- Hidden Fields -->
+
+        <!-- Paginator fields -->
+        <input type='hidden' id='n' name='n' value="{{ notifications_per_page }}"/>
+        <input type='hidden' id='p' name='p' value="1"/>
+
+        <input type='hidden' id='saved-query' name='saved-query' value="{{ saved_query.id }}"/>
+    </form>
+
+    
+    </div>
+</div>
+{% endblock %}
+
+{% block helpdesk_js %}
+<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
+<script src="https://cdn.datatables.net/1.10.21/js/jquery.dataTables.min.js"></script>
+<script src="https://cdn.datatables.net/1.10.21/js/dataTables.bootstrap4.min.js"></script>
+
+<script>
+    var selected = [];
+    var all_notification_ids = [];
+
+    $(document).ready(function () {
+
+        for (const id of document.querySelectorAll(".notification_multi_select")) {
+            all_notification_ids.push(id.value)
+        }
+
+        $("#select_all_btn").click(function () {
+            $(".notification_multi_select").prop('checked', true);
+            all_notification_ids.forEach(function(e) {
+                if (!selected.includes(String(e))) {
+                    selected.push(String(e));
+                }
+            })
+            
+            
+        });
+
+        $("#select_none_btn").click(function () {
+            $(".notification_multi_select").prop('checked', false);
+            selected = [];
+            
+        });
+
+        $(".notification_multi_select").click(function () {
+            if ($(this).prop('checked')) {
+                if (!selected.includes($(this).val())) {
+                    selected.push($(this).val())
+                }
+            } else {
+                if (selected.includes($(this).val())) {
+                    selected.pop($(this).val())
+                } 
+            }
+
+        })
+        
+        $("#delete_btn").click(function (e) {
+            if (selected.length > 0) {
+                console.log(selected)
+                $.ajax({
+                    url: "{% url 'helpdesk:delete_selected_notifications' %}",
+                    type: 'POST',
+                    data: {
+                        csrfmiddlewaretoken: '{{ csrf_token }}',
+                        'selected[]': selected
+                    },
+                    success: function(response) {
+                        console.log(response)
+                        location.reload();
+                    }
+                });
+            } else {
+                console.log("NOTHING HERE")
+                location.reload();
+            }
+        })
+
+        $('#mark_as_read_btn').click(function() {
+            if (selected.length > 0) {
+                $.ajax({
+                    url: "{% url 'helpdesk:mark_selected_as_read' %}",
+                    type: 'POST',
+                    data: {
+                        csrfmiddlewaretoken: '{{ csrf_token }}',
+                        'selected[]': selected
+                    },
+                    success: function(response) {
+                        console.log(response);
+                        location.reload();
+                    }
+                });
+            } else {
+                console.log("NOTHING HERE");
+                location.reload();
+            }
+        })
+    });
+
+    function toggleQuerySelector() {
+        let queryToggle = !(localStorage.getItem("helpdesk.show_query") === 'true');
+
+        $('#show_query_text').toggle(!queryToggle);
+        $('#hide_query_text').toggle(queryToggle);
+        $("#query_select").toggle(queryToggle);
+        let resultsCol = $("#query_card").parent();
+        resultsCol.toggleClass('col-12', !queryToggle);
+        resultsCol.toggleClass('col-sm-8', queryToggle);
+        resultsCol.toggleClass('col-md-9', queryToggle);
+        resultsCol.toggleClass('col-lg-10', queryToggle);
+
+        localStorage.setItem("helpdesk.show_query", queryToggle);
+    }
+
+    function updateNotificationsPerPage(notifications_per_page) {
+        document.getElementById('n').value = notifications_per_page;
+        paginatedQuery();
+    }
+
+    function paginatedQuery(page=1, clearSavedQuery=false) {
+        document.getElementById('p').value = page;
+
+        /*
+        for (const colfilter of document.querySelectorAll('[data-colfilter]')) {
+            document.getElementById(colfilter.dataset['colfilter'] + '_filter').value = colfilter.value
+        }
+        */
+
+        if (!clearSavedQuery && $("#saved-query").val() !== '') {
+            // keep the saved query input and erase everything else
+            $("#query_form").find(':input:not(#saved-query)').not(":input[type=hidden]").filter(function() {
+                return true;
+            }).attr('disabled', 'disabled');
+            document.forms['query_form'].submit();
+        } else {
+            if (clearSavedQuery) {
+                // remove the saved query before submitting the form
+                $("#query_form").find("#saved-query").attr('disabled', 'disabled');
+            } else if ($("#saved-query").val() === 'None') {
+                $("#saved-query").val('');
+            }
+            // removes empty inputs from form
+            $("#query_form").find(':input').filter(function() {
+                return !($(this).is('input:checkbox:checked') || !$(this).is('input:checkbox') && $(this).val() !== '');
+            }).attr('disabled', 'disabled');
+
+            document.forms['query_form'].submit();
+        }
+    }
+
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/helpdesk/templates/helpdesk/notifications_index.html b/helpdesk/templates/helpdesk/notifications_index.html
new file mode 100644
index 000000000..48a31c3f1
--- /dev/null
+++ b/helpdesk/templates/helpdesk/notifications_index.html
@@ -0,0 +1,306 @@
+{% extends "helpdesk/base.html" %}
+
+{% load i18n humanize static in_list %}
+
+{% block helpdesk_title %} {% trans "Notifications" %} {% endblock %}
+
+{% block helpdesk_breadcrumb %}
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:notifications' %}">{% trans "Notifications" %}</a>
+</li>
+<li class="breadcrumb-item active">Overview</li>
+{% endblock %}
+
+{% block helpdesk_body %}
+<div class="d-flex align-items-center">    
+    
+    <div class="input-group justify-content-end">
+
+        
+        <div class="input-group-append">
+            <button id="mark_as_read_btn" class="btn btn-outline-primary rounded-left font-weight-semibold ml-2" type="button" method="POST"> {% csrf_token %} Mark As Read <i class="fa fa-check mr-1"></i></button>
+            <button id="delete_btn" class="btn btn-outline-danger font-weight-semibold ml-2" type="button" method="POST"> {% csrf_token %} Delete Selected <i class="fa fa-trash-alt mr-1"></i></button>
+        </div>
+        <div class="input-group-prepend">
+            <label class="input-group-text bg-white border-0">Select:</label>
+        </div>
+        
+        <div class="input-group-append">
+            <button id="select_all_btn" class="btn btn-outline-primary rounded-left font-weight-semibold" type="button">All <i class="fa fa-plus-circle mr-1"></i></button>
+            <button id="select_none_btn" class="btn btn-outline-danger font-weight-semibold" type="button">None <i class="fa fa-times-circle mr-1"></i></button>
+        </div>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-sm-8 col-md-9 col-lg-10 order-1 pl-3">
+
+        <div id="query_card" class="card mb-2">
+            <!-- Notifications-->
+            <div class="card-header">
+                <i class="fas fa-bell"></i>
+                {% trans "Notifications" %}
+            </div>
+
+            <div id="filterContainer" class="mb-3 d-flex justify-content-end">
+                <!-- Dropdown filters will be appended here -->
+                <span id="filterQueue"></span>
+            </div>
+            <div class="card-body">
+                <div class="table-responsive">
+                    <table class="table table-bordered table-sm m-0" id="dataTable" width="100%" cellspacing="0">
+                        <thead class="thead-light">
+                            <tr id="headers">
+                                <th class="filter-top" data-colname="checkbox" scope="col"></th>
+                                <th class="filter-top" data-colname="message" scope="col">Message</th>
+                                <th class="filter-top" data-colname="date" scope="col">Date</th>
+                                <th class="filter-top" data-colname="ticket_link" scope="col">Ticket</th>
+                                <th></th>
+                                <th></th>
+                                
+                            </tr>
+                        </thead>
+                        <tbody></tbody>
+                        <footer></footer>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+{% endblock %}
+
+{% block helpdesk_js %}
+<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
+<script src="https://cdn.datatables.net/1.10.21/js/jquery.dataTables.min.js"></script>
+<script src="https://cdn.datatables.net/1.10.21/js/dataTables.bootstrap4.min.js"></script>
+
+<script>
+    $(document).ready(function() {
+        var selected = [];
+        var hiddenRowsData = [];
+        var filterContainer = $('#filterContainer');
+
+        // Go to the url that marks a notification as read
+        var baseUrl = "{% url 'helpdesk:mark_notification_as_read' 0%}"
+        // Data table
+        var dataTable = $('#dataTable').DataTable({
+            // Gets all the data that the data table needs
+            "ajax": {
+                "url": "{% url 'helpdesk:notifications_json' %}",
+                "dataSrc": "data",
+            
+            },
+
+            "columnDefs": [
+                {
+                    "searchable": false,
+                    "targets": 0
+                },
+
+                {
+                    "visible": false,
+                    "targets": [4,5]
+                }
+		    ],
+            // Setting the data for all of the columns
+            "columns": [
+                // Checkboxes
+                {    
+                    // Grabs the 'id' key from the dictionary returned from the view
+                    "data": "id",
+                    "render": function(data, type, row) {
+                        return `<div class="custom-control custom-checkbox">
+                                    <input type="checkbox" name="notification_checkbox" class="custom-control-input notification_multi_select" id="newCustomCheck${data}" value="${data}">
+                                    <label class="custom-control-label" for="newCustomCheck${data}"></label>
+                                </div>`;
+                    }
+                },
+                // Displays message
+                {"data": "message"}, 
+                // Displays the date
+                {
+                    "data": "date", 
+                    "render": function(data, type, row) {
+                        var date = new Date(data);
+                        var created = new Date(row.created)
+                        var formattedDate = isNaN(date.getTime()) ? data : date.toLocaleString();
+                        var originalDate = created.toLocaleString();
+                        
+                        return `<span title = "${originalDate}">${formattedDate}</span>`;
+                    }
+                },
+                // Displays queue and title of ticket. Marks notification as read if link is clicked
+                {
+                    "data": null,
+                    "render": function(data, type, row) {
+                        var baseUrl = "{% url 'helpdesk:mark_notification_as_read' 0 %}".replace('0', row.id);
+                        return `<a href= ${baseUrl}>[queue-${row.ticket_queue}] ${row.ticket_title}</a>`;
+                    }
+                },
+
+                {"data": "ticket_queue"},
+                {"data": "is_read"}
+
+            ], 
+
+            // Ordering by notification id
+            "order" : [[0, 'desc']],
+            // Sets color of read notifications to gray
+            "createdRow": function(row, data, dataIndex) {
+                if (data.is_read) {
+                    $(row).css('background-color', 'lightgray');
+                } 
+            },
+
+            "initComplete": function() {
+                this.api().columns().every(function (index) {
+                    if (index === 4) {
+                        let column = this
+
+                        let select = document.createElement('select');
+                        select.add(new Option(''));
+
+                        select.classList.add('ml-3')
+
+                        $(select).appendTo(filterContainer)
+
+                        select.addEventListener('change', function () {
+                            column
+                                .search(select.value, {exact: true})
+                                .draw();
+                        });
+
+                        
+
+                        column
+                            .data()
+                            .unique()
+                            .sort()
+                            .each(function (d, j) {
+                                select.add(new Option(d));
+                            });
+                    
+                        $('#filterQueue').text('Filter by Queue:')
+                    } else if (index === 5) {
+                        let column = this
+
+                        let select = document.createElement('select');
+                        select.add(new Option(''));
+
+                        select.classList.add('ml-3')
+
+                        $('<span id="filterRead" class="ml-2">Filter Read/Unread Notifications:</span>').appendTo(filterContainer);
+
+                        $(select).appendTo(filterContainer)
+
+                        select.addEventListener('change', function () {
+                            if (select.value === "Read") {
+                                column
+                                .search(true)
+                                .draw();
+                            } else if (select.value === "Unread") {
+                                column
+                                .search(false)
+                                .draw(); 
+                            } else {
+                                column
+                                .search(select.value, {exact: true})
+                                .draw(); 
+                            }
+                        });
+
+                        column
+                            .data()
+                            .unique()
+                            .sort()
+                            .each(function (d, j) {
+                                if (d) {
+                                    select.add(new Option("Read"));
+                                } else {
+                                    select.add(new Option("Unread"));
+                                }
+                                
+                        });
+                    }
+                })
+                
+            }
+        });
+
+        $("#select_all_btn").click(function () {
+            $(".notification_multi_select").prop('checked', true);
+            all_notification_ids.forEach(function(e) {
+                if (!selected.includes(String(e))) {
+                    selected.push(String(e));
+                }
+            })
+            
+            
+        });
+
+        $("#select_none_btn").click(function () {
+            $(".notification_multi_select").prop('checked', false);
+            selected = [];
+            
+        });
+    
+        // When checkboxes are clicked, add/remove from selected list
+        $('#dataTable tbody').on('click', '.notification_multi_select', function() {
+            if ($(this).prop('checked')) {
+                if (!selected.includes($(this).val())) {
+                    selected.push($(this).val())
+                }
+            } else {
+                if (selected.includes($(this).val())) {
+                    selected.pop($(this).val())
+                } 
+            }
+        })
+        
+
+        $("#delete_btn").click(function (e) {
+            if (selected.length > 0) {
+                $.ajax({
+                    url: "{% url 'helpdesk:delete_selected_notifications' %}",
+                    type: 'POST',
+                    data: {
+                        csrfmiddlewaretoken: '{{ csrf_token }}',
+                        'selected[]': selected
+                    },
+                    success: function(response) {
+                        console.log(response)
+                        location.reload();
+                    }
+                });
+            } else {
+                console.log("NOTHING HERE")
+                location.reload();
+            }
+        })
+
+        $('#mark_as_read_btn').click(function() {
+            if (selected.length > 0) {
+                $.ajax({
+                    url: "{% url 'helpdesk:mark_selected_as_read' %}",
+                    type: 'POST',
+                    data: {
+                        csrfmiddlewaretoken: '{{ csrf_token }}',
+                        'selected[]': selected
+                    },
+                    success: function(response) {
+                        console.log(response);
+                        location.reload();
+                    }
+                });
+            } else {
+                console.log("NOTHING HERE");
+                location.reload();
+            }
+        })
+
+    });
+</script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/helpdesk/templatetags/get_unread_notifications.py b/helpdesk/templatetags/get_unread_notifications.py
new file mode 100644
index 000000000..f0dfce836
--- /dev/null
+++ b/helpdesk/templatetags/get_unread_notifications.py
@@ -0,0 +1,8 @@
+from django import template
+from helpdesk.models import Notification
+
+register = template.Library()
+
+@register.filter
+def get_unread_notifications(user, organization):
+    return Notification.objects.filter(user=user, organization=organization, is_read=False).count()
diff --git a/helpdesk/urls.py b/helpdesk/urls.py
index 7ae9e9b97..77af44efd 100644
--- a/helpdesk/urls.py
+++ b/helpdesk/urls.py
@@ -441,4 +441,25 @@ def get_context_data(self, **kwargs):
     url(r'^system_settings/maintain_forms/copy_field/',
         staff.copy_field,
         name="copy_field"),
+
+    url(r'^notifications/$',
+        staff.CreateNotificationView.as_view(),
+        name="notifications"),
+
+    url(r'^notifications/(?P<notification_id>[0-9]+)/$',
+        staff.mark_notification_as_read,
+        name="mark_notification_as_read"),
+
+    url(r'^notifications/delete_notifications/$',
+        staff.delete_selected_notifications,
+        name="delete_selected_notifications"),
+
+    url(r'^notifications/mark_as_read/$',
+        staff.mark_selected_as_read,
+        name="mark_selected_as_read"),
+    
+    url(r'^notifications/json/$',
+        staff.notifications_json,
+        name="notifications_json"),
+
 ]
diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py
index 94bf844ae..1257ad284 100644
--- a/helpdesk/views/staff.py
+++ b/helpdesk/views/staff.py
@@ -29,6 +29,7 @@
 from django.utils import timezone
 from django.utils.safestring import mark_safe
 from django.views.generic.edit import FormView, UpdateView
+from django.views.generic.list import ListView
 
 from helpdesk.forms import CUSTOMFIELD_DATE_FORMAT, CUSTOMFIELD_DATETIME_FORMAT, PreviewWidget
 from helpdesk.query import (
@@ -60,7 +61,7 @@
 from helpdesk.models import (
     Ticket, Queue, FollowUp, TimeSpent, TicketChange, PreSetReply, FollowUpAttachment, SavedSearch,
     IgnoreEmail, TicketCC, TicketDependency, UserSettings, KBItem, CustomField, is_unlisted,
-    FormType, EmailTemplate, get_markdown, clean_html, Tag
+    FormType, EmailTemplate, get_markdown, clean_html, Tag, Notification
 )
 
 from helpdesk import settings as helpdesk_settings
@@ -1408,6 +1409,49 @@ def update_ticket(request, ticket_id, public=False):
         if SHOW_SUBSCRIBE:
             subscribe_staff_member_to_ticket(ticket, request.user)
 
+    if old_owner != ticket.assigned_to:
+        message = "A ticket has been assigned to you"
+    else:
+        if request.user:
+            message = "Ticket " + str(ticket.id) + " has been updated by " + str(request.user.get_full_name())
+        else:
+            if request.user.email:
+                message = "Ticket " + str(ticket.id) + " has been updated (" + str(request.user.email) + ")"
+            else:
+                message = "Ticket " + str(ticket.id) + " has been updated"
+
+    for ticketcc in ticket.ticketcc_set.all():
+        if is_helpdesk_staff(ticketcc.user, ticket.ticket_form.organization_id) and ticketcc.user.usersettings_helpdesk.enable_notifications:
+            if request.user:
+                message = "A ticket you have been CC'd on has been updated by " + str(request.user.get_full_name())
+            else:
+                if request.user.email:
+                    message = "A ticket you have been CC'd on has been updated (" + str(request.user.email) + ")"
+                else:
+                    message = "A ticket you have been CC'd on has been updated"
+            new_notification = Notification(
+                user=ticketcc.user,
+                ticket=ticket,
+                organization=ticket.ticket_form.organization,
+                message= message,
+                is_read=False,
+                delete_by = timezone.now() + timedelta(days=60)
+            )
+
+            new_notification.save()
+
+    if ticket.assigned_to and ticket.assigned_to.usersettings_helpdesk.enable_notifications:
+        new_notification = Notification(
+            user=ticket.assigned_to,
+            ticket=ticket,
+            organization=ticket.ticket_form.organization,
+            message=message,
+            is_read=False,
+            delete_by = timezone.now() + timedelta(days=60)
+        )
+
+        new_notification.save()
+
     return return_to_ticket(request.user, request, helpdesk_settings, ticket)
 
 @helpdesk_staff_member_required
@@ -1510,6 +1554,19 @@ def mass_update(request):
                              public=False,  # DC
                              user=request.user)
                 f.save()
+
+                if user.usersettings_helpdesk.enable_notifications:
+                    new_notification = Notification(
+                        user=user,
+                        ticket=t,
+                        organization=t.ticket_form.organization,
+                        message='You\'ve been assigned to ticket ' + str(t.id),
+                        is_read=False,
+                        delete_by = timezone.now() + timedelta(days=60)
+                    )
+
+                    new_notification.save()
+            
             if user.usersettings_helpdesk.email_on_ticket_assign and user != request.user:
                 # customized context in order for the bulk template to work properly
                 # yes, queues can have different sender addresses, but it seems unnecessary to rewrite everything just for that edge case
@@ -1534,6 +1591,7 @@ def mass_update(request):
                 )
     else:
         for t in Ticket.objects.filter(id__in=tickets):
+            message = None
             if not huser.can_access_queue(t.queue):
                 continue
 
@@ -1548,6 +1606,8 @@ def mass_update(request):
                              public=False,  # DC
                              user=request.user)
                 f.save()
+
+                message = 'You\'ve been assigned to ticket ' + str(t.id)
             elif action == 'unassign' and t.assigned_to is not None:
                 t.assigned_to = None
                 t.save()
@@ -1557,6 +1617,8 @@ def mass_update(request):
                              public=False,  # DC
                              user=request.user)
                 f.save()
+
+                message = 'You\ve been unassigned from ticket ' + str(t.id)
             elif action == 'set_kbitem':
                 t.kbitem = kbitem
                 t.save()
@@ -1649,9 +1711,36 @@ def mass_update(request):
                         ticket=t
                     )
 
+                message = 'Ticket ' + str(t.id) + ' has been closed'
             elif action == 'delete':
                 # todo create a note of this somewhere?
                 t.delete()
+            
+            if message:
+                if t.assigned_to.usersettings_helpdesk.enable_notifications:
+                    new_notification = Notification(
+                        user=t.assigned_to,
+                        ticket=t,
+                        organization=t.ticket_form.organization,
+                        message=message,
+                        is_read=False,
+                        delete_by = timezone.now() + timedelta(days=60)
+                    )
+
+                    new_notification.save()
+                
+                for ticketcc in t.ticketcc_set.all():
+                    if ticketcc.user.usersettings_helpdesk.enable_notifications:
+                        new_notification = Notification(
+                            user=ticketcc.user,
+                            ticket=t,
+                            organization=t.ticket_form.organization,
+                            message='A ticket you were CC\'d on has been updated',
+                            is_read=False,
+                            delete_by = timezone.now() + timedelta(days=60)
+                        )
+
+                        new_notification.save()
 
     return JsonResponse({'update_status': "Ticket Update Complete"})
 
@@ -2160,6 +2249,32 @@ def get_form_kwargs(self):
 
     def form_valid(self, form):
         self.ticket = form.save(form_id=self.form_id, user=self.request.user if self.request.user.is_authenticated else None)
+
+        for ticketcc in self.ticket.ticketcc_set.all():
+            if is_helpdesk_staff(ticketcc.user, self.ticket.ticket_form.organization_id) and ticketcc.user.usersettings_helpdesk.enable_notifications:
+                new_notification = Notification(
+                    user=ticketcc.user,
+                    ticket=self.ticket,
+                    organization=self.ticket.ticket_form.organization,
+                    message="A ticket has been created and you are CC'd on it",
+                    is_read=False,
+                    delete_by = timezone.now() + timedelta(days=60)
+                )
+
+                new_notification.save()
+
+        if self.ticket.assigned_to and self.ticket.assigned_to.usersettings_helpdesk.enable_notifications:
+            new_notification = Notification(
+                user=self.ticket.assigned_to,
+                ticket=self.ticket,
+                organization=self.ticket.ticket_form.organization,
+                message="A new ticket has been created and you have been assigned to it",
+                is_read=False,
+                delete_by = timezone.now() + timedelta(days=60)
+            )
+
+            new_notification.save()
+
         if self.request.GET.get('milestone_beam_redirect', False):
             # Pair Ticket to Milestone
             attach_ticket_to_property_milestone(self.request, self.ticket)
@@ -3766,3 +3881,89 @@ def export(qs, org, serializer, paginate=False, do_extra_data=True, visible_cols
         response['Content-Disposition'] = 'attachment; filename=' + file_name
         response['Content-Type'] = 'application/vnd.ms-excel; charset=utf-16'
         return response
+
+class CreateNotificationView(ListView):
+    model = Notification
+    template_name = 'helpdesk/notifications_index.html'
+
+    def get_queryset(self):
+        return Notification.objects.filter(user=self.request.user).order_by("-created")
+
+    def get_context_data(self, **kwargs):
+        huser = HelpdeskUser(self.request.user)
+        user_saved_queries = SavedSearch.objects.filter(user=self.request.user)
+        notifications = Notification.objects.filter(user=self.request.user, organization = self.request.user.default_organization.helpdesk_organization).order_by("-created")
+        user_saved_queries = SavedSearch.objects.filter(user=self.request.user)
+
+        # New notifications paginator
+        page = self.request.GET.get('p', '1')
+        try:
+            page = int(page)
+        except ValueError:
+            page = 1
+
+        
+        notifications_per_page = 25
+        
+        paginator = Paginator(notifications, notifications_per_page)
+        try:
+            notifications = paginator.page(page)
+        except PageNotAnInteger:
+            notifications = paginator.page(1)
+        except EmptyPage:
+            notifications = paginator.page(paginator.num_pages)
+
+        context = super().get_context_data(**kwargs)
+        context['notifications'] = notifications
+        context['user_saved_queries'] = user_saved_queries
+        context['queue_choices'] = huser.get_queues()
+        context['user_saved_queries'] = user_saved_queries
+        context['notifications_per_page'] = notifications_per_page
+        context['notification_index_start'] = paginator.page(page).start_index() 
+        context['notification_index_end'] = paginator.page(page).end_index() 
+        context['notification_total'] = paginator.count
+
+        return context
+
+def notifications_json(request):
+    
+    notifications = Notification.objects.filter(user=request.user, organization=request.user.default_organization.helpdesk_organization).order_by("-created")
+
+    data = [{
+        'id': notification.id,
+        'message': notification.message,
+        'date': notification.get_time_since_created(),
+        'ticket_title': notification.ticket.title,
+        'ticket_queue': notification.ticket.queue.title, 
+        'is_read': notification.is_read,
+        'created': notification.created
+    } for notification in notifications]
+
+    return JsonResponse({'data': data})
+
+def mark_notification_as_read(request, notification_id):
+    notification = get_object_or_404(Notification, id=notification_id, user=request.user)
+    notification.is_read = True
+    notification.save()
+
+    return redirect(notification.ticket.get_absolute_url())
+
+def mark_selected_as_read(request):
+    selected = request.POST.getlist('selected[]')
+
+    if request.method == 'POST':
+        for id in selected:
+            notification = Notification.objects.get(id=int(id), user=request.user)
+            notification.is_read = True
+            notification.save()
+        return JsonResponse({"selected": selected})
+
+def delete_selected_notifications(request):
+    selected = request.POST.getlist('selected[]')
+
+    if request.method == 'POST':
+        for id in selected:
+            notification = Notification.objects.get(id=int(id), user=request.user)
+            notification.delete()
+        return JsonResponse({"selected": selected})
+        

From 1a727d261ca5c96239d2c4841e6f7688fdacc425 Mon Sep 17 00:00:00 2001
From: awwang0628 <awwang0628@gmail.com>
Date: Tue, 9 Jul 2024 13:25:23 -0400
Subject: [PATCH 03/14] Minor tweaks to messages

---
 .../helpdesk/notifications_index.html         | 15 +++++++++---
 helpdesk/views/staff.py                       | 24 +++++++++----------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/helpdesk/templates/helpdesk/notifications_index.html b/helpdesk/templates/helpdesk/notifications_index.html
index 48a31c3f1..0f48a471f 100644
--- a/helpdesk/templates/helpdesk/notifications_index.html
+++ b/helpdesk/templates/helpdesk/notifications_index.html
@@ -80,6 +80,7 @@
     $(document).ready(function() {
         var selected = [];
         var hiddenRowsData = [];
+        var all_notification_ids = [];
         var filterContainer = $('#filterContainer');
 
         // Go to the url that marks a notification as read
@@ -156,6 +157,7 @@
 
             "initComplete": function() {
                 this.api().columns().every(function (index) {
+                    // Adds all queues to the dropdown menu.
                     if (index === 4) {
                         let column = this
 
@@ -183,6 +185,7 @@
                             });
                     
                         $('#filterQueue').text('Filter by Queue:')
+                    // Adds logic for filtering by read/unread notifications
                     } else if (index === 5) {
                         let column = this
 
@@ -231,18 +234,23 @@
 
         $("#select_all_btn").click(function () {
             $(".notification_multi_select").prop('checked', true);
+
+            for (const id of document.querySelectorAll(".notification_multi_select")) {
+                    all_notification_ids.push(id.value)
+                };
+            
             all_notification_ids.forEach(function(e) {
                 if (!selected.includes(String(e))) {
                     selected.push(String(e));
                 }
             })
             
-            
         });
 
         $("#select_none_btn").click(function () {
             $(".notification_multi_select").prop('checked', false);
             selected = [];
+            all_notification_ids = []
             
         });
     
@@ -259,7 +267,7 @@
             }
         })
         
-
+        // Deletes all selected notifications
         $("#delete_btn").click(function (e) {
             if (selected.length > 0) {
                 $.ajax({
@@ -279,7 +287,8 @@
                 location.reload();
             }
         })
-
+ 
+        // Mark all selected notifications as read
         $('#mark_as_read_btn').click(function() {
             if (selected.length > 0) {
                 $.ajax({
diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py
index 1257ad284..18a2cd97a 100644
--- a/helpdesk/views/staff.py
+++ b/helpdesk/views/staff.py
@@ -1419,6 +1419,18 @@ def update_ticket(request, ticket_id, public=False):
                 message = "Ticket " + str(ticket.id) + " has been updated (" + str(request.user.email) + ")"
             else:
                 message = "Ticket " + str(ticket.id) + " has been updated"
+    
+    if ticket.assigned_to and ticket.assigned_to.usersettings_helpdesk.enable_notifications:
+        new_notification = Notification(
+            user=ticket.assigned_to,
+            ticket=ticket,
+            organization=ticket.ticket_form.organization,
+            message=message,
+            is_read=False,
+            delete_by = timezone.now() + timedelta(days=60)
+        )
+
+        new_notification.save()
 
     for ticketcc in ticket.ticketcc_set.all():
         if is_helpdesk_staff(ticketcc.user, ticket.ticket_form.organization_id) and ticketcc.user.usersettings_helpdesk.enable_notifications:
@@ -1440,18 +1452,6 @@ def update_ticket(request, ticket_id, public=False):
 
             new_notification.save()
 
-    if ticket.assigned_to and ticket.assigned_to.usersettings_helpdesk.enable_notifications:
-        new_notification = Notification(
-            user=ticket.assigned_to,
-            ticket=ticket,
-            organization=ticket.ticket_form.organization,
-            message=message,
-            is_read=False,
-            delete_by = timezone.now() + timedelta(days=60)
-        )
-
-        new_notification.save()
-
     return return_to_ticket(request.user, request, helpdesk_settings, ticket)
 
 @helpdesk_staff_member_required

From 8255279320828f1ec8a2d82a7f6d9a04f770ccfc Mon Sep 17 00:00:00 2001
From: awwang0628 <awwang0628@gmail.com>
Date: Tue, 23 Jul 2024 10:58:47 -0400
Subject: [PATCH 04/14] Delete old notification_index.html

---
 .../helpdesk/notification_index_old.html      | 289 ------------------
 1 file changed, 289 deletions(-)
 delete mode 100644 helpdesk/templates/helpdesk/notification_index_old.html

diff --git a/helpdesk/templates/helpdesk/notification_index_old.html b/helpdesk/templates/helpdesk/notification_index_old.html
deleted file mode 100644
index 6aaa1293b..000000000
--- a/helpdesk/templates/helpdesk/notification_index_old.html
+++ /dev/null
@@ -1,289 +0,0 @@
-{% extends "helpdesk/base.html" %}
-
-{% load i18n humanize static in_list %}
-
-{% block helpdesk_title %} {% trans "Notifications" %} {% endblock %}
-
-{% block helpdesk_breadcrumb %}
-<li class="breadcrumb-item">
-    <a href="{% url 'helpdesk:notifications' %}">{% trans "Notifications" %}</a>
-</li>
-<li class="breadcrumb-item active">Overview</li>
-{% endblock %}
-
-{% block helpdesk_body %}
-<div class="d-flex align-items-center">    
-    
-    <div class="input-group justify-content-end">
-
-        
-        <div class="input-group-append">
-            <button id="mark_as_read_btn" class="btn btn-outline-primary rounded-left font-weight-semibold" type="button" method="POST"> {% csrf_token %} Mark As Read <i class="fa fa-check mr-1"></i></button>
-            <button id="delete_btn" class="btn btn-outline-danger font-weight-semibold" type="button" method="POST"> {% csrf_token %} Delete Selected <i class="fa fa-trash-alt mr-1"></i></button>
-        </div>
-        <div class="input-group-prepend">
-            <label class="input-group-text bg-white border-0">Select:</label>
-        </div>
-        
-        <div class="input-group-append">
-            <button id="select_all_btn" class="btn btn-outline-primary rounded-left font-weight-semibold" type="button">All <i class="fa fa-plus-circle mr-1"></i></button>
-            <button id="select_none_btn" class="btn btn-outline-danger font-weight-semibold" type="button">None <i class="fa fa-times-circle mr-1"></i></button>
-        </div>
-    </div>
-</div>
-
-
-<div class="row">
-    <div class="col-sm-8 col-md-9 col-lg-10 order-1 pl-3">
-        <div id="query_card" class="card mb-2">
-            <!-- Notifications-->
-            <div class="card-header">
-                <i class="fas fa-bell"></i>
-                {% trans "Notifications" %}
-            </div>
-
-            <div class="card-body">
-                <div class="table-responsive">
-                    <table class="table table-bordered table-sm m-0" id="dataTable" width="100%" cellspacing="0">
-                        <thead class="thead-light">
-                            <tr id="headers">
-                                <th class="filter-top" data-colname="checkbox" scope="col"></th>
-                                <th class="filter-top" data-colname="message" scope="col">Message</th>
-                                <th class="filter-top" data-colname="date" scope="col">Date</th>
-                                <th class="filter-top" data-colname="ticket_link" scope="col">Ticket</th>
-                                
-                            </tr>
-
-                            <tr>
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                              </tr>
-                        </thead>
-                        <tbody>
-                            {% for notification in notifications %}
-                                <tr {% if notification.is_read %} style="background-color: lightgray;" {% endif %}>
-                                    <td>
-                                        <div class="custom-control custom-checkbox">
-                                            <input type="checkbox" name="notification_checkbox" class="custom-control-input notification_multi_select" id="newCustomCheck{{ forloop.counter }}" value="{{ notification.id }}">
-                                            <label class="custom-control-label" for="newCustomCheck{{ forloop.counter }}"></label>
-                                        </div>
-                                    </td>
-                                    <td>{{notification.message}}</td>
-                                    <td title="{{ notification.created }}">{{notification.get_time_since_created}}</td>
-                                    <td><a href="{% url 'helpdesk:mark_notification_as_read' notification.id%}">[queue-{{notification.ticket.queue}}] {{notification.ticket.title}}</a></td>
-                                </tr>
-                            {% empty %}
-                                <tr>
-                                    <td colspan="4">No Notifications</td>
-                                </tr>
-                            {% endfor %}
-
-                        </tbody>
-                    </table>
-                </div>
-                <!-- Pagination Toolbar -->
-                <div class="d-flex flex-wrap border-top px-2 py-2" style="//background-color: #f7f7f7">
-                    {% with 't_page' as page_var %}
-
-                    <div class="mr-auto d-flex align-items-center ml-2">Showing {{ notification_index_start }}-{{ notification_index_end }} of {{ notification_total }}<em><span class="select_count"></span></em></div>
-                    <div class="flex-fill justify-content-end">
-                        <div class="btn-toolbar float-right" role="toolbar" style="bottom: 0;">
-                            <div class="btn-group mr-2" role="group">
-                                {% if notifications.has_previous %}
-                                <button class="btn btn-primary font-weight-bold" onclick="paginatedQuery(1, false)">First</button>
-                                <button class="btn btn-primary font-weight-bold" onclick="paginatedQuery({{ notifications.previous_page_number }})">Previous</button>
-                                {% else %}
-                                <button class="btn btn-primary font-weight-bold disabled">First</button>
-                                <button class="btn btn-primary font-weight-bold disabled">Previous</button>
-                                {% endif %}
-                            </div>
-                            <div class="btn-group mr-2" role="group">
-                                {% with 3 as thresh %}
-                                {% for i in notifications.paginator.page_range %}
-                                {% if notifications.number == i %}
-                                <button class="btn btn-outline-primary active font-weight-bold">{{ i }}</button>
-                                {% elif i <= notifications.number|add:5 and i >= notifications.number|add:-5 %}
-                                <button class="btn btn-outline-primary font-weight-bold" onclick="paginatedQuery({{ i }})">{{ i }}</button>
-                                {% endif %}
-                                {% endfor %}
-                                {% endwith %}
-                            </div>
-                            <div class="btn-group" role="group">
-                                {% if notifications.has_next %}
-                                <button class="btn btn-primary font-weight-bold" onclick="paginatedQuery({{ notifications.next_page_number }}, false)">Next</button>
-                                <button class="btn btn-primary font-weight-bold" onclick="paginatedQuery({{ notifications.paginator.num_pages }}, false)">Last</button>
-                                {% else %}
-                                <button class="btn btn-primary font-weight-bold disabled">Next</button>
-                                <button class="btn btn-primary font-weight-bold disabled">Last</button>
-                                {% endif %}
-                            </div>
-                        </div>
-                    </div>
-                    {% endwith %}
-                </div>
-                <!-- / Pagination Toolbar -->
-                                
-
-                
-            </div>
-    
-    </div>
-
-    <form method="get" id="query_form" action="{% url 'helpdesk:notifications' %}">
-
-        <!-- Hidden Fields -->
-
-        <!-- Paginator fields -->
-        <input type='hidden' id='n' name='n' value="{{ notifications_per_page }}"/>
-        <input type='hidden' id='p' name='p' value="1"/>
-
-        <input type='hidden' id='saved-query' name='saved-query' value="{{ saved_query.id }}"/>
-    </form>
-
-    
-    </div>
-</div>
-{% endblock %}
-
-{% block helpdesk_js %}
-<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
-<script src="https://cdn.datatables.net/1.10.21/js/jquery.dataTables.min.js"></script>
-<script src="https://cdn.datatables.net/1.10.21/js/dataTables.bootstrap4.min.js"></script>
-
-<script>
-    var selected = [];
-    var all_notification_ids = [];
-
-    $(document).ready(function () {
-
-        for (const id of document.querySelectorAll(".notification_multi_select")) {
-            all_notification_ids.push(id.value)
-        }
-
-        $("#select_all_btn").click(function () {
-            $(".notification_multi_select").prop('checked', true);
-            all_notification_ids.forEach(function(e) {
-                if (!selected.includes(String(e))) {
-                    selected.push(String(e));
-                }
-            })
-            
-            
-        });
-
-        $("#select_none_btn").click(function () {
-            $(".notification_multi_select").prop('checked', false);
-            selected = [];
-            
-        });
-
-        $(".notification_multi_select").click(function () {
-            if ($(this).prop('checked')) {
-                if (!selected.includes($(this).val())) {
-                    selected.push($(this).val())
-                }
-            } else {
-                if (selected.includes($(this).val())) {
-                    selected.pop($(this).val())
-                } 
-            }
-
-        })
-        
-        $("#delete_btn").click(function (e) {
-            if (selected.length > 0) {
-                console.log(selected)
-                $.ajax({
-                    url: "{% url 'helpdesk:delete_selected_notifications' %}",
-                    type: 'POST',
-                    data: {
-                        csrfmiddlewaretoken: '{{ csrf_token }}',
-                        'selected[]': selected
-                    },
-                    success: function(response) {
-                        console.log(response)
-                        location.reload();
-                    }
-                });
-            } else {
-                console.log("NOTHING HERE")
-                location.reload();
-            }
-        })
-
-        $('#mark_as_read_btn').click(function() {
-            if (selected.length > 0) {
-                $.ajax({
-                    url: "{% url 'helpdesk:mark_selected_as_read' %}",
-                    type: 'POST',
-                    data: {
-                        csrfmiddlewaretoken: '{{ csrf_token }}',
-                        'selected[]': selected
-                    },
-                    success: function(response) {
-                        console.log(response);
-                        location.reload();
-                    }
-                });
-            } else {
-                console.log("NOTHING HERE");
-                location.reload();
-            }
-        })
-    });
-
-    function toggleQuerySelector() {
-        let queryToggle = !(localStorage.getItem("helpdesk.show_query") === 'true');
-
-        $('#show_query_text').toggle(!queryToggle);
-        $('#hide_query_text').toggle(queryToggle);
-        $("#query_select").toggle(queryToggle);
-        let resultsCol = $("#query_card").parent();
-        resultsCol.toggleClass('col-12', !queryToggle);
-        resultsCol.toggleClass('col-sm-8', queryToggle);
-        resultsCol.toggleClass('col-md-9', queryToggle);
-        resultsCol.toggleClass('col-lg-10', queryToggle);
-
-        localStorage.setItem("helpdesk.show_query", queryToggle);
-    }
-
-    function updateNotificationsPerPage(notifications_per_page) {
-        document.getElementById('n').value = notifications_per_page;
-        paginatedQuery();
-    }
-
-    function paginatedQuery(page=1, clearSavedQuery=false) {
-        document.getElementById('p').value = page;
-
-        /*
-        for (const colfilter of document.querySelectorAll('[data-colfilter]')) {
-            document.getElementById(colfilter.dataset['colfilter'] + '_filter').value = colfilter.value
-        }
-        */
-
-        if (!clearSavedQuery && $("#saved-query").val() !== '') {
-            // keep the saved query input and erase everything else
-            $("#query_form").find(':input:not(#saved-query)').not(":input[type=hidden]").filter(function() {
-                return true;
-            }).attr('disabled', 'disabled');
-            document.forms['query_form'].submit();
-        } else {
-            if (clearSavedQuery) {
-                // remove the saved query before submitting the form
-                $("#query_form").find("#saved-query").attr('disabled', 'disabled');
-            } else if ($("#saved-query").val() === 'None') {
-                $("#saved-query").val('');
-            }
-            // removes empty inputs from form
-            $("#query_form").find(':input').filter(function() {
-                return !($(this).is('input:checkbox:checked') || !$(this).is('input:checkbox') && $(this).val() !== '');
-            }).attr('disabled', 'disabled');
-
-            document.forms['query_form'].submit();
-        }
-    }
-
-</script>
-{% endblock %}
\ No newline at end of file

From 85ee2cec894561ef0ebea5d2d2e3c31d06455f86 Mon Sep 17 00:00:00 2001
From: awwang0628 <awwang0628@gmail.com>
Date: Mon, 17 Jun 2024 09:46:33 -0400
Subject: [PATCH 05/14] Pushing current work done on notifications

---
 helpdesk/email.py                             |  26 +-
 .../migrations/0103_add_notification_model.py |  36 +++
 .../0104_alter_usersettings_model.py          |  18 ++
 helpdesk/models.py                            |  62 +++-
 helpdesk/static/helpdesk/css/sb-admin.css     |  24 +-
 helpdesk/static/helpdesk/css/sb-admin.css.map |   8 +-
 helpdesk/static/helpdesk/scss/_navbar.scss    |  16 +
 .../helpdesk/navigation-sidebar.html          |   1 +
 .../helpdesk/notification_index_old.html      | 289 +++++++++++++++++
 .../helpdesk/notifications_index.html         | 306 ++++++++++++++++++
 .../templatetags/get_unread_notifications.py  |   8 +
 helpdesk/urls.py                              |  21 ++
 helpdesk/views/staff.py                       | 203 +++++++++++-
 13 files changed, 1002 insertions(+), 16 deletions(-)
 create mode 100644 helpdesk/migrations/0103_add_notification_model.py
 create mode 100644 helpdesk/migrations/0104_alter_usersettings_model.py
 create mode 100644 helpdesk/templates/helpdesk/notification_index_old.html
 create mode 100644 helpdesk/templates/helpdesk/notifications_index.html
 create mode 100644 helpdesk/templatetags/get_unread_notifications.py

diff --git a/helpdesk/email.py b/helpdesk/email.py
index bdd8cd98e..3cd48b381 100644
--- a/helpdesk/email.py
+++ b/helpdesk/email.py
@@ -40,7 +40,7 @@
 
 from helpdesk import settings
 from helpdesk.lib import safe_template_context, process_attachments
-from helpdesk.models import Ticket, TicketCC, FollowUp, IgnoreEmail, FormType, CustomField, is_extra_data
+from helpdesk.models import Ticket, TicketCC, FollowUp, IgnoreEmail, FormType, CustomField, is_extra_data, Notification
 from seed.models import EmailImporter, GOOGLE, MICROSOFT, EXCHANGE_OAUTH, EXCHANGE_PASS
 from helpdesk.decorators import is_helpdesk_staff
 from post_office.models import Email
@@ -848,6 +848,30 @@ def create_ticket_from_processed_message(message, ticket_id, payload, files, log
                 email_logger=logger,
                 source="import"
             )
+        for ticketcc in ticket.ticketcc_set.all():
+            if is_helpdesk_staff(ticketcc.user, ticket.ticket_form.organization_id) and ticketcc.user.usersettings_helpdesk.enable_notifications:
+                new_notification = Notification(
+                    user=ticketcc.user,
+                    ticket=ticket,
+                    organization=ticket.ticket_form.organization,
+                    message= "A ticket you have been CC'd on has been updated",
+                    is_read=False,
+                    delete_by = timezone.now() + timedelta(days=60)
+                )
+
+                new_notification.save()
+
+        if ticket.assigned_to and ticket.assigned_to.user.usersettings_helpdesk.enable_notifications:
+            new_notification = Notification(
+                user=ticket.assigned_to,
+                ticket=ticket,
+                organization=ticket.ticket_form.organization,
+                message=message,
+                is_read=False,
+                delete_by = timezone.now() + timedelta(days=60)
+            )
+
+            new_notification.save()
     return ticket
 
 def process_message(message, importer, queues, logger, options=None):
diff --git a/helpdesk/migrations/0103_add_notification_model.py b/helpdesk/migrations/0103_add_notification_model.py
new file mode 100644
index 000000000..1c7a748f7
--- /dev/null
+++ b/helpdesk/migrations/0103_add_notification_model.py
@@ -0,0 +1,36 @@
+# Generated by Django 3.2.18 on 2024-06-05 16:22
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('orgs', '0056_alter_organization_map_help_text'),
+        ('helpdesk', '0102_add_kbitem_unlisted'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='kbitem',
+            name='unlisted',
+            field=models.BooleanField(default=False, help_text='Should this form be hidden from the public article list? (If the "Is this article publicly visible?" option is checked, this form will still be accessible by everyone through the link.)', verbose_name='Unlisted'),
+        ),
+        migrations.CreateModel(
+            name='Notification',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('message', models.TextField()),
+                ('is_read', models.BooleanField()),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('delete_by', models.DateTimeField()),
+                ('announcement', models.BooleanField(default=False)),
+                ('organization', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='orgs.organization')),
+                ('ticket', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='helpdesk.ticket', verbose_name='Ticket')),
+                ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='User')),
+            ],
+        ),
+    ]
diff --git a/helpdesk/migrations/0104_alter_usersettings_model.py b/helpdesk/migrations/0104_alter_usersettings_model.py
new file mode 100644
index 000000000..a5496cf9f
--- /dev/null
+++ b/helpdesk/migrations/0104_alter_usersettings_model.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.18 on 2024-06-07 15:00
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('helpdesk', '0103_add_notification_model'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='usersettings',
+            name='enable_notifications',
+            field=models.BooleanField(default=True, help_text="Get notifications when tickets you've been assigned to or CC'd on are updated?", verbose_name='Enable notification when tickets are created or updated?'),
+        ),
+    ]
diff --git a/helpdesk/models.py b/helpdesk/models.py
index b6fd70678..ee6d58369 100644
--- a/helpdesk/models.py
+++ b/helpdesk/models.py
@@ -21,6 +21,7 @@
 import os
 import mimetypes
 import datetime
+from datetime import timedelta
 import logging
 
 from django.utils.safestring import mark_safe
@@ -673,7 +674,7 @@ def send(role, recipient):
 
                 for field in email_fields:
                     if field in self.extra_data and self.extra_data[field] is not None and self.extra_data[field] != '' and is_extra_data(field):
-                        send('extra', self.extra_data[field])
+                        send('extra', self.extra_data[field])            
 
         return recipients
 
@@ -1798,6 +1799,12 @@ class UserSettings(models.Model):
         default=use_email_as_submitter_default,
     )
 
+    enable_notifications = models.BooleanField(
+        verbose_name=('Enable notification when tickets are created or updated?'),
+        help_text='Get notifications when tickets you\'ve been assigned to or CC\'d on are updated?',
+        default=True,
+    )
+
     def __str__(self):
         return 'Preferences for %s' % self.user
 
@@ -2200,3 +2207,56 @@ class Meta:
 
     def __str__(self):
         return '%s / %s' % (self.ticket, self.depends_on)
+
+class Notification(models.Model):
+    user = models.ForeignKey(
+            settings.AUTH_USER_MODEL,
+            on_delete=models.SET_NULL,
+            blank=True,
+            null=True,
+            verbose_name=_('User'),
+    )
+
+    ticket = models.ForeignKey(
+        Ticket,
+        on_delete=models.CASCADE,
+        verbose_name=_('Ticket'),
+        blank=True,
+        null=True
+    )
+
+    organization = models.ForeignKey(
+        Organization, 
+        on_delete=models.CASCADE
+    )
+
+    message = models.TextField()
+
+    is_read = models.BooleanField()
+
+    created = models.DateTimeField(
+        auto_now_add=True
+    )
+
+    delete_by = models.DateTimeField()
+
+    announcement = models.BooleanField(default=False)
+
+    def get_time_since_created(self):
+
+        time_diff = timezone.now() - self.created
+
+        days = time_diff.days
+        seconds = time_diff.seconds
+        hours = seconds // 3600
+        minutes = (seconds % 3600) // 60
+
+        if days > 0:
+            return self.created
+        elif hours > 0:
+            return f"{hours} hour(s) ago"
+        elif minutes > 0:
+            return f"{minutes} minute(s) ago"
+        else:
+            return "just now"
+    
\ No newline at end of file
diff --git a/helpdesk/static/helpdesk/css/sb-admin.css b/helpdesk/static/helpdesk/css/sb-admin.css
index dea491247..7281f3eef 100644
--- a/helpdesk/static/helpdesk/css/sb-admin.css
+++ b/helpdesk/static/helpdesk/css/sb-admin.css
@@ -233,11 +233,11 @@ body.fixed-nav.sidebar-toggled #content-wrapper {
   vertical-align: 0;
   border: 0;
   font-weight: 900;
-  content: '\f105';
-  font-family: 'Font Awesome 5 Free';
+  content: "\f105";
+  font-family: "Font Awesome 5 Free";
 }
 .navbar-nav .nav-item.dropdown.show .dropdown-toggle::after {
-  content: '\f107';
+  content: "\f107";
 }
 .navbar-nav .nav-item.dropdown.no-arrow .dropdown-toggle::after {
   display: none;
@@ -366,8 +366,20 @@ body.fixed-nav.sidebar-toggled #content-wrapper {
   height: 86px;
 }
 
-.navbar {
-  height: 86px;
+.notification-indicator {
+  position: relative;
+  display: inline-block;
+}
+
+.notification-indicator .indicator {
+  position: absolute;
+  top: 24px;
+  right: 80px;
+  height: 10px;
+  width: 10px;
+  background-color: red;
+  border-radius: 50%;
+  content: "";
 }
 
 .card-body-icon {
@@ -467,7 +479,7 @@ body.fixed-nav.sidebar-toggled #content-wrapper {
 }
 
 .form-label-group input:not(:placeholder-shown) {
-  padding-top: calc(var(--input-padding-y) + var(--input-padding-y) * (2 / 3));
+  padding-top: calc(var(--input-padding-y) + var(--input-padding-y) * 0.6666666667);
   padding-bottom: calc(var(--input-padding-y) / 3);
 }
 
diff --git a/helpdesk/static/helpdesk/css/sb-admin.css.map b/helpdesk/static/helpdesk/css/sb-admin.css.map
index 4cbf4c2a6..4bfe01e62 100644
--- a/helpdesk/static/helpdesk/css/sb-admin.css.map
+++ b/helpdesk/static/helpdesk/css/sb-admin.css.map
@@ -1,7 +1 @@
-{
-"version": 3,
-"mappings": "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",
-"sources": ["../scss/_fonts.scss","../scss/_global.scss","../scss/_variables.scss","../scss/_utilities.scss","../scss/_navbar.scss","../scss/_mixins.scss","../scss/_cards.scss","../scss/_login.scss","../scss/_footer.scss"],
-"names": [],
-"file": "sb-admin.css"
-}
+{"version":3,"sourceRoot":"","sources":["../scss/_fonts.scss","../scss/_global.scss","../scss/_variables.scss","../scss/_utilities.scss","../scss/_navbar.scss","../scss/_mixins.scss","../scss/_cards.scss","../scss/_login.scss","../scss/_footer.scss"],"names":[],"mappings":"AAAA;AACA;EACE;EACA;EACA;EACA;EAEA;;AAGF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAEF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAGF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAIF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAGF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAEF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAGF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAIF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAGF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAEF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAGF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAIF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAGF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAEF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAGF;AACA;EACE;EACA;EACA;EACA;EAEA;;AAKF;AAAA;EAEE;;;ACjKF;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;AACA;EACE;EACA;EACA;EACA,gBCqBmB;;;ADhBrB;EACE,YCSiB;EDRjB,cCYsB;;ADTtB;EACE;;AAGJ;EACE;IACE,cCCe;;EDEf;IACE,cCDkB;;;;ADQ1B;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA,OClDM;EDmDN;EACA;;AACA;EAEE;;AAEF;EACE,YClDO;;ADoDT;EACE;;;AAIJ;EACI;EACA;EACA;EACA;;;AAEJ;EACI;EACA;;;AAGJ;EACI;;;AE9EJ;EACE;;;AAIF;EACE;;;AAIF;EACE;;;AAGF;EACE;;;ACdA;EACE;;AAKE;EACE,OFPA;;AEYA;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAIF;EACE;;AAIF;EACE;;AAKJ;EAEE;;AAEF;EACE;EACA;EACA;EACA;EACA;;AAKN;EAEE;IACE;;;;AAON;EACE;EACA,kBFpDS;EEqDT;;AC1DE;EACE;;AAEF;EACE;EACA;EACA,OHwBoB;;AGvBpB;EACE;EACA;;AAGJ;EACE;EACA;EACA;EACA;;AACA;EACE;EACA;;AAGJ;EACE;;ADsCF;EACE;;AACA;EAGE;;AAIN;EACE;EACA;;;AAIJ;EACE;IACE;;EAGE;IACE;IACA;IACA;IACA;IACA,OF1Da;;EE2Db;IACE;IACA;;EAGJ;IACE;IACA;IAEA;;EAEF;IACE;;EAGJ;IACE;IACA;;ECxGF;IACE;;EAEF;IACE;IACA;IACA,OHwBoB;;EGvBpB;IACE;IACA;;EAGJ;IACE;IACA;IACA;IACA;;EACA;IACE;IACA;;EAGJ;IACE;;;AD0FN;EACE,KFxFmB;EEyFnB;EACA;;;AAIF;EACI;;;AAGJ;EACI,QFnGiB;;;AEsGrB;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AEjJF;EACE;EACA;EACA;EACA;EACA;EAEA;EDRA;;;ACcA;EADF;IAEI;;;AAEF;EAJF;IAKI;;;AAEF;EAPF;IAQI;;;;AAIJ;EACI;;;AAGJ;EACI;;;AAGJ;EACI;;;ACnCJ;EACE;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;AAAA;EAEE;EACA;;;AAGF;EACE;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;EACA;EACA;EACA;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;;;AAGF;EACE;EACA;;;AAGF;EACE;EACA;EACA;EACA;;;ACnEF;EACE;EACA;EACA;EACA;EACA;EACA,QNgCqB;EM/BrB,kBNHS;;AMIT;EACE;EACA;;AAEF;EAZF;IAaI;;;;AAKF;EACE;;AAEF;EACE;IACE","file":"sb-admin.css"}
\ No newline at end of file
diff --git a/helpdesk/static/helpdesk/scss/_navbar.scss b/helpdesk/static/helpdesk/scss/_navbar.scss
index 807e2bddf..a1421857e 100644
--- a/helpdesk/static/helpdesk/scss/_navbar.scss
+++ b/helpdesk/static/helpdesk/scss/_navbar.scss
@@ -130,4 +130,20 @@
 
 .navbar {
     height: $navbar-base-height;
+}
+
+.notification-indicator {
+  position: relative;
+  display: inline-block;
+}
+
+.notification-indicator .indicator {
+  position: absolute;
+  top: 24px;
+  right: 80px;
+  height: 10px;
+  width: 10px;
+  background-color: red;
+  border-radius: 50%;
+  content: '';
 }
\ No newline at end of file
diff --git a/helpdesk/templates/helpdesk/navigation-sidebar.html b/helpdesk/templates/helpdesk/navigation-sidebar.html
index c9b9fe2ed..52817094c 100644
--- a/helpdesk/templates/helpdesk/navigation-sidebar.html
+++ b/helpdesk/templates/helpdesk/navigation-sidebar.html
@@ -4,6 +4,7 @@
 {% load saved_queries %}
 {% with user|saved_queries as user_saved_queries_ %}
 {% with request.resolver_match.url_name as url_name %}
+{% load get_unread_notifications %}
     <!-- Sidebar -->
     <ul class="sidebar navbar-nav">
     {% if helpdesk_settings.HELPDESK_NAVIGATION_ENABLED and user.is_authenticated or user|is_helpdesk_staff %}
diff --git a/helpdesk/templates/helpdesk/notification_index_old.html b/helpdesk/templates/helpdesk/notification_index_old.html
new file mode 100644
index 000000000..6aaa1293b
--- /dev/null
+++ b/helpdesk/templates/helpdesk/notification_index_old.html
@@ -0,0 +1,289 @@
+{% extends "helpdesk/base.html" %}
+
+{% load i18n humanize static in_list %}
+
+{% block helpdesk_title %} {% trans "Notifications" %} {% endblock %}
+
+{% block helpdesk_breadcrumb %}
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:notifications' %}">{% trans "Notifications" %}</a>
+</li>
+<li class="breadcrumb-item active">Overview</li>
+{% endblock %}
+
+{% block helpdesk_body %}
+<div class="d-flex align-items-center">    
+    
+    <div class="input-group justify-content-end">
+
+        
+        <div class="input-group-append">
+            <button id="mark_as_read_btn" class="btn btn-outline-primary rounded-left font-weight-semibold" type="button" method="POST"> {% csrf_token %} Mark As Read <i class="fa fa-check mr-1"></i></button>
+            <button id="delete_btn" class="btn btn-outline-danger font-weight-semibold" type="button" method="POST"> {% csrf_token %} Delete Selected <i class="fa fa-trash-alt mr-1"></i></button>
+        </div>
+        <div class="input-group-prepend">
+            <label class="input-group-text bg-white border-0">Select:</label>
+        </div>
+        
+        <div class="input-group-append">
+            <button id="select_all_btn" class="btn btn-outline-primary rounded-left font-weight-semibold" type="button">All <i class="fa fa-plus-circle mr-1"></i></button>
+            <button id="select_none_btn" class="btn btn-outline-danger font-weight-semibold" type="button">None <i class="fa fa-times-circle mr-1"></i></button>
+        </div>
+    </div>
+</div>
+
+
+<div class="row">
+    <div class="col-sm-8 col-md-9 col-lg-10 order-1 pl-3">
+        <div id="query_card" class="card mb-2">
+            <!-- Notifications-->
+            <div class="card-header">
+                <i class="fas fa-bell"></i>
+                {% trans "Notifications" %}
+            </div>
+
+            <div class="card-body">
+                <div class="table-responsive">
+                    <table class="table table-bordered table-sm m-0" id="dataTable" width="100%" cellspacing="0">
+                        <thead class="thead-light">
+                            <tr id="headers">
+                                <th class="filter-top" data-colname="checkbox" scope="col"></th>
+                                <th class="filter-top" data-colname="message" scope="col">Message</th>
+                                <th class="filter-top" data-colname="date" scope="col">Date</th>
+                                <th class="filter-top" data-colname="ticket_link" scope="col">Ticket</th>
+                                
+                            </tr>
+
+                            <tr>
+                                <td></td>
+                                <td></td>
+                                <td></td>
+                                <td></td>
+                              </tr>
+                        </thead>
+                        <tbody>
+                            {% for notification in notifications %}
+                                <tr {% if notification.is_read %} style="background-color: lightgray;" {% endif %}>
+                                    <td>
+                                        <div class="custom-control custom-checkbox">
+                                            <input type="checkbox" name="notification_checkbox" class="custom-control-input notification_multi_select" id="newCustomCheck{{ forloop.counter }}" value="{{ notification.id }}">
+                                            <label class="custom-control-label" for="newCustomCheck{{ forloop.counter }}"></label>
+                                        </div>
+                                    </td>
+                                    <td>{{notification.message}}</td>
+                                    <td title="{{ notification.created }}">{{notification.get_time_since_created}}</td>
+                                    <td><a href="{% url 'helpdesk:mark_notification_as_read' notification.id%}">[queue-{{notification.ticket.queue}}] {{notification.ticket.title}}</a></td>
+                                </tr>
+                            {% empty %}
+                                <tr>
+                                    <td colspan="4">No Notifications</td>
+                                </tr>
+                            {% endfor %}
+
+                        </tbody>
+                    </table>
+                </div>
+                <!-- Pagination Toolbar -->
+                <div class="d-flex flex-wrap border-top px-2 py-2" style="//background-color: #f7f7f7">
+                    {% with 't_page' as page_var %}
+
+                    <div class="mr-auto d-flex align-items-center ml-2">Showing {{ notification_index_start }}-{{ notification_index_end }} of {{ notification_total }}<em><span class="select_count"></span></em></div>
+                    <div class="flex-fill justify-content-end">
+                        <div class="btn-toolbar float-right" role="toolbar" style="bottom: 0;">
+                            <div class="btn-group mr-2" role="group">
+                                {% if notifications.has_previous %}
+                                <button class="btn btn-primary font-weight-bold" onclick="paginatedQuery(1, false)">First</button>
+                                <button class="btn btn-primary font-weight-bold" onclick="paginatedQuery({{ notifications.previous_page_number }})">Previous</button>
+                                {% else %}
+                                <button class="btn btn-primary font-weight-bold disabled">First</button>
+                                <button class="btn btn-primary font-weight-bold disabled">Previous</button>
+                                {% endif %}
+                            </div>
+                            <div class="btn-group mr-2" role="group">
+                                {% with 3 as thresh %}
+                                {% for i in notifications.paginator.page_range %}
+                                {% if notifications.number == i %}
+                                <button class="btn btn-outline-primary active font-weight-bold">{{ i }}</button>
+                                {% elif i <= notifications.number|add:5 and i >= notifications.number|add:-5 %}
+                                <button class="btn btn-outline-primary font-weight-bold" onclick="paginatedQuery({{ i }})">{{ i }}</button>
+                                {% endif %}
+                                {% endfor %}
+                                {% endwith %}
+                            </div>
+                            <div class="btn-group" role="group">
+                                {% if notifications.has_next %}
+                                <button class="btn btn-primary font-weight-bold" onclick="paginatedQuery({{ notifications.next_page_number }}, false)">Next</button>
+                                <button class="btn btn-primary font-weight-bold" onclick="paginatedQuery({{ notifications.paginator.num_pages }}, false)">Last</button>
+                                {% else %}
+                                <button class="btn btn-primary font-weight-bold disabled">Next</button>
+                                <button class="btn btn-primary font-weight-bold disabled">Last</button>
+                                {% endif %}
+                            </div>
+                        </div>
+                    </div>
+                    {% endwith %}
+                </div>
+                <!-- / Pagination Toolbar -->
+                                
+
+                
+            </div>
+    
+    </div>
+
+    <form method="get" id="query_form" action="{% url 'helpdesk:notifications' %}">
+
+        <!-- Hidden Fields -->
+
+        <!-- Paginator fields -->
+        <input type='hidden' id='n' name='n' value="{{ notifications_per_page }}"/>
+        <input type='hidden' id='p' name='p' value="1"/>
+
+        <input type='hidden' id='saved-query' name='saved-query' value="{{ saved_query.id }}"/>
+    </form>
+
+    
+    </div>
+</div>
+{% endblock %}
+
+{% block helpdesk_js %}
+<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
+<script src="https://cdn.datatables.net/1.10.21/js/jquery.dataTables.min.js"></script>
+<script src="https://cdn.datatables.net/1.10.21/js/dataTables.bootstrap4.min.js"></script>
+
+<script>
+    var selected = [];
+    var all_notification_ids = [];
+
+    $(document).ready(function () {
+
+        for (const id of document.querySelectorAll(".notification_multi_select")) {
+            all_notification_ids.push(id.value)
+        }
+
+        $("#select_all_btn").click(function () {
+            $(".notification_multi_select").prop('checked', true);
+            all_notification_ids.forEach(function(e) {
+                if (!selected.includes(String(e))) {
+                    selected.push(String(e));
+                }
+            })
+            
+            
+        });
+
+        $("#select_none_btn").click(function () {
+            $(".notification_multi_select").prop('checked', false);
+            selected = [];
+            
+        });
+
+        $(".notification_multi_select").click(function () {
+            if ($(this).prop('checked')) {
+                if (!selected.includes($(this).val())) {
+                    selected.push($(this).val())
+                }
+            } else {
+                if (selected.includes($(this).val())) {
+                    selected.pop($(this).val())
+                } 
+            }
+
+        })
+        
+        $("#delete_btn").click(function (e) {
+            if (selected.length > 0) {
+                console.log(selected)
+                $.ajax({
+                    url: "{% url 'helpdesk:delete_selected_notifications' %}",
+                    type: 'POST',
+                    data: {
+                        csrfmiddlewaretoken: '{{ csrf_token }}',
+                        'selected[]': selected
+                    },
+                    success: function(response) {
+                        console.log(response)
+                        location.reload();
+                    }
+                });
+            } else {
+                console.log("NOTHING HERE")
+                location.reload();
+            }
+        })
+
+        $('#mark_as_read_btn').click(function() {
+            if (selected.length > 0) {
+                $.ajax({
+                    url: "{% url 'helpdesk:mark_selected_as_read' %}",
+                    type: 'POST',
+                    data: {
+                        csrfmiddlewaretoken: '{{ csrf_token }}',
+                        'selected[]': selected
+                    },
+                    success: function(response) {
+                        console.log(response);
+                        location.reload();
+                    }
+                });
+            } else {
+                console.log("NOTHING HERE");
+                location.reload();
+            }
+        })
+    });
+
+    function toggleQuerySelector() {
+        let queryToggle = !(localStorage.getItem("helpdesk.show_query") === 'true');
+
+        $('#show_query_text').toggle(!queryToggle);
+        $('#hide_query_text').toggle(queryToggle);
+        $("#query_select").toggle(queryToggle);
+        let resultsCol = $("#query_card").parent();
+        resultsCol.toggleClass('col-12', !queryToggle);
+        resultsCol.toggleClass('col-sm-8', queryToggle);
+        resultsCol.toggleClass('col-md-9', queryToggle);
+        resultsCol.toggleClass('col-lg-10', queryToggle);
+
+        localStorage.setItem("helpdesk.show_query", queryToggle);
+    }
+
+    function updateNotificationsPerPage(notifications_per_page) {
+        document.getElementById('n').value = notifications_per_page;
+        paginatedQuery();
+    }
+
+    function paginatedQuery(page=1, clearSavedQuery=false) {
+        document.getElementById('p').value = page;
+
+        /*
+        for (const colfilter of document.querySelectorAll('[data-colfilter]')) {
+            document.getElementById(colfilter.dataset['colfilter'] + '_filter').value = colfilter.value
+        }
+        */
+
+        if (!clearSavedQuery && $("#saved-query").val() !== '') {
+            // keep the saved query input and erase everything else
+            $("#query_form").find(':input:not(#saved-query)').not(":input[type=hidden]").filter(function() {
+                return true;
+            }).attr('disabled', 'disabled');
+            document.forms['query_form'].submit();
+        } else {
+            if (clearSavedQuery) {
+                // remove the saved query before submitting the form
+                $("#query_form").find("#saved-query").attr('disabled', 'disabled');
+            } else if ($("#saved-query").val() === 'None') {
+                $("#saved-query").val('');
+            }
+            // removes empty inputs from form
+            $("#query_form").find(':input').filter(function() {
+                return !($(this).is('input:checkbox:checked') || !$(this).is('input:checkbox') && $(this).val() !== '');
+            }).attr('disabled', 'disabled');
+
+            document.forms['query_form'].submit();
+        }
+    }
+
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/helpdesk/templates/helpdesk/notifications_index.html b/helpdesk/templates/helpdesk/notifications_index.html
new file mode 100644
index 000000000..48a31c3f1
--- /dev/null
+++ b/helpdesk/templates/helpdesk/notifications_index.html
@@ -0,0 +1,306 @@
+{% extends "helpdesk/base.html" %}
+
+{% load i18n humanize static in_list %}
+
+{% block helpdesk_title %} {% trans "Notifications" %} {% endblock %}
+
+{% block helpdesk_breadcrumb %}
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:notifications' %}">{% trans "Notifications" %}</a>
+</li>
+<li class="breadcrumb-item active">Overview</li>
+{% endblock %}
+
+{% block helpdesk_body %}
+<div class="d-flex align-items-center">    
+    
+    <div class="input-group justify-content-end">
+
+        
+        <div class="input-group-append">
+            <button id="mark_as_read_btn" class="btn btn-outline-primary rounded-left font-weight-semibold ml-2" type="button" method="POST"> {% csrf_token %} Mark As Read <i class="fa fa-check mr-1"></i></button>
+            <button id="delete_btn" class="btn btn-outline-danger font-weight-semibold ml-2" type="button" method="POST"> {% csrf_token %} Delete Selected <i class="fa fa-trash-alt mr-1"></i></button>
+        </div>
+        <div class="input-group-prepend">
+            <label class="input-group-text bg-white border-0">Select:</label>
+        </div>
+        
+        <div class="input-group-append">
+            <button id="select_all_btn" class="btn btn-outline-primary rounded-left font-weight-semibold" type="button">All <i class="fa fa-plus-circle mr-1"></i></button>
+            <button id="select_none_btn" class="btn btn-outline-danger font-weight-semibold" type="button">None <i class="fa fa-times-circle mr-1"></i></button>
+        </div>
+    </div>
+</div>
+
+<div class="row">
+    <div class="col-sm-8 col-md-9 col-lg-10 order-1 pl-3">
+
+        <div id="query_card" class="card mb-2">
+            <!-- Notifications-->
+            <div class="card-header">
+                <i class="fas fa-bell"></i>
+                {% trans "Notifications" %}
+            </div>
+
+            <div id="filterContainer" class="mb-3 d-flex justify-content-end">
+                <!-- Dropdown filters will be appended here -->
+                <span id="filterQueue"></span>
+            </div>
+            <div class="card-body">
+                <div class="table-responsive">
+                    <table class="table table-bordered table-sm m-0" id="dataTable" width="100%" cellspacing="0">
+                        <thead class="thead-light">
+                            <tr id="headers">
+                                <th class="filter-top" data-colname="checkbox" scope="col"></th>
+                                <th class="filter-top" data-colname="message" scope="col">Message</th>
+                                <th class="filter-top" data-colname="date" scope="col">Date</th>
+                                <th class="filter-top" data-colname="ticket_link" scope="col">Ticket</th>
+                                <th></th>
+                                <th></th>
+                                
+                            </tr>
+                        </thead>
+                        <tbody></tbody>
+                        <footer></footer>
+                    </table>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+{% endblock %}
+
+{% block helpdesk_js %}
+<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
+<script src="https://cdn.datatables.net/1.10.21/js/jquery.dataTables.min.js"></script>
+<script src="https://cdn.datatables.net/1.10.21/js/dataTables.bootstrap4.min.js"></script>
+
+<script>
+    $(document).ready(function() {
+        var selected = [];
+        var hiddenRowsData = [];
+        var filterContainer = $('#filterContainer');
+
+        // Go to the url that marks a notification as read
+        var baseUrl = "{% url 'helpdesk:mark_notification_as_read' 0%}"
+        // Data table
+        var dataTable = $('#dataTable').DataTable({
+            // Gets all the data that the data table needs
+            "ajax": {
+                "url": "{% url 'helpdesk:notifications_json' %}",
+                "dataSrc": "data",
+            
+            },
+
+            "columnDefs": [
+                {
+                    "searchable": false,
+                    "targets": 0
+                },
+
+                {
+                    "visible": false,
+                    "targets": [4,5]
+                }
+		    ],
+            // Setting the data for all of the columns
+            "columns": [
+                // Checkboxes
+                {    
+                    // Grabs the 'id' key from the dictionary returned from the view
+                    "data": "id",
+                    "render": function(data, type, row) {
+                        return `<div class="custom-control custom-checkbox">
+                                    <input type="checkbox" name="notification_checkbox" class="custom-control-input notification_multi_select" id="newCustomCheck${data}" value="${data}">
+                                    <label class="custom-control-label" for="newCustomCheck${data}"></label>
+                                </div>`;
+                    }
+                },
+                // Displays message
+                {"data": "message"}, 
+                // Displays the date
+                {
+                    "data": "date", 
+                    "render": function(data, type, row) {
+                        var date = new Date(data);
+                        var created = new Date(row.created)
+                        var formattedDate = isNaN(date.getTime()) ? data : date.toLocaleString();
+                        var originalDate = created.toLocaleString();
+                        
+                        return `<span title = "${originalDate}">${formattedDate}</span>`;
+                    }
+                },
+                // Displays queue and title of ticket. Marks notification as read if link is clicked
+                {
+                    "data": null,
+                    "render": function(data, type, row) {
+                        var baseUrl = "{% url 'helpdesk:mark_notification_as_read' 0 %}".replace('0', row.id);
+                        return `<a href= ${baseUrl}>[queue-${row.ticket_queue}] ${row.ticket_title}</a>`;
+                    }
+                },
+
+                {"data": "ticket_queue"},
+                {"data": "is_read"}
+
+            ], 
+
+            // Ordering by notification id
+            "order" : [[0, 'desc']],
+            // Sets color of read notifications to gray
+            "createdRow": function(row, data, dataIndex) {
+                if (data.is_read) {
+                    $(row).css('background-color', 'lightgray');
+                } 
+            },
+
+            "initComplete": function() {
+                this.api().columns().every(function (index) {
+                    if (index === 4) {
+                        let column = this
+
+                        let select = document.createElement('select');
+                        select.add(new Option(''));
+
+                        select.classList.add('ml-3')
+
+                        $(select).appendTo(filterContainer)
+
+                        select.addEventListener('change', function () {
+                            column
+                                .search(select.value, {exact: true})
+                                .draw();
+                        });
+
+                        
+
+                        column
+                            .data()
+                            .unique()
+                            .sort()
+                            .each(function (d, j) {
+                                select.add(new Option(d));
+                            });
+                    
+                        $('#filterQueue').text('Filter by Queue:')
+                    } else if (index === 5) {
+                        let column = this
+
+                        let select = document.createElement('select');
+                        select.add(new Option(''));
+
+                        select.classList.add('ml-3')
+
+                        $('<span id="filterRead" class="ml-2">Filter Read/Unread Notifications:</span>').appendTo(filterContainer);
+
+                        $(select).appendTo(filterContainer)
+
+                        select.addEventListener('change', function () {
+                            if (select.value === "Read") {
+                                column
+                                .search(true)
+                                .draw();
+                            } else if (select.value === "Unread") {
+                                column
+                                .search(false)
+                                .draw(); 
+                            } else {
+                                column
+                                .search(select.value, {exact: true})
+                                .draw(); 
+                            }
+                        });
+
+                        column
+                            .data()
+                            .unique()
+                            .sort()
+                            .each(function (d, j) {
+                                if (d) {
+                                    select.add(new Option("Read"));
+                                } else {
+                                    select.add(new Option("Unread"));
+                                }
+                                
+                        });
+                    }
+                })
+                
+            }
+        });
+
+        $("#select_all_btn").click(function () {
+            $(".notification_multi_select").prop('checked', true);
+            all_notification_ids.forEach(function(e) {
+                if (!selected.includes(String(e))) {
+                    selected.push(String(e));
+                }
+            })
+            
+            
+        });
+
+        $("#select_none_btn").click(function () {
+            $(".notification_multi_select").prop('checked', false);
+            selected = [];
+            
+        });
+    
+        // When checkboxes are clicked, add/remove from selected list
+        $('#dataTable tbody').on('click', '.notification_multi_select', function() {
+            if ($(this).prop('checked')) {
+                if (!selected.includes($(this).val())) {
+                    selected.push($(this).val())
+                }
+            } else {
+                if (selected.includes($(this).val())) {
+                    selected.pop($(this).val())
+                } 
+            }
+        })
+        
+
+        $("#delete_btn").click(function (e) {
+            if (selected.length > 0) {
+                $.ajax({
+                    url: "{% url 'helpdesk:delete_selected_notifications' %}",
+                    type: 'POST',
+                    data: {
+                        csrfmiddlewaretoken: '{{ csrf_token }}',
+                        'selected[]': selected
+                    },
+                    success: function(response) {
+                        console.log(response)
+                        location.reload();
+                    }
+                });
+            } else {
+                console.log("NOTHING HERE")
+                location.reload();
+            }
+        })
+
+        $('#mark_as_read_btn').click(function() {
+            if (selected.length > 0) {
+                $.ajax({
+                    url: "{% url 'helpdesk:mark_selected_as_read' %}",
+                    type: 'POST',
+                    data: {
+                        csrfmiddlewaretoken: '{{ csrf_token }}',
+                        'selected[]': selected
+                    },
+                    success: function(response) {
+                        console.log(response);
+                        location.reload();
+                    }
+                });
+            } else {
+                console.log("NOTHING HERE");
+                location.reload();
+            }
+        })
+
+    });
+</script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/helpdesk/templatetags/get_unread_notifications.py b/helpdesk/templatetags/get_unread_notifications.py
new file mode 100644
index 000000000..f0dfce836
--- /dev/null
+++ b/helpdesk/templatetags/get_unread_notifications.py
@@ -0,0 +1,8 @@
+from django import template
+from helpdesk.models import Notification
+
+register = template.Library()
+
+@register.filter
+def get_unread_notifications(user, organization):
+    return Notification.objects.filter(user=user, organization=organization, is_read=False).count()
diff --git a/helpdesk/urls.py b/helpdesk/urls.py
index 2de7c4442..0c2970ba1 100644
--- a/helpdesk/urls.py
+++ b/helpdesk/urls.py
@@ -427,4 +427,25 @@ def get_context_data(self, **kwargs):
     url(r'^system_settings/maintain_forms/copy_field/',
         staff.copy_field,
         name="copy_field"),
+
+    url(r'^notifications/$',
+        staff.CreateNotificationView.as_view(),
+        name="notifications"),
+
+    url(r'^notifications/(?P<notification_id>[0-9]+)/$',
+        staff.mark_notification_as_read,
+        name="mark_notification_as_read"),
+
+    url(r'^notifications/delete_notifications/$',
+        staff.delete_selected_notifications,
+        name="delete_selected_notifications"),
+
+    url(r'^notifications/mark_as_read/$',
+        staff.mark_selected_as_read,
+        name="mark_selected_as_read"),
+    
+    url(r'^notifications/json/$',
+        staff.notifications_json,
+        name="notifications_json"),
+
 ]
diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py
index 6f383a95b..f0add7302 100644
--- a/helpdesk/views/staff.py
+++ b/helpdesk/views/staff.py
@@ -29,6 +29,7 @@
 from django.utils import timezone
 from django.utils.safestring import mark_safe
 from django.views.generic.edit import FormView, UpdateView
+from django.views.generic.list import ListView
 
 from helpdesk.forms import CUSTOMFIELD_DATE_FORMAT, CUSTOMFIELD_DATETIME_FORMAT, PreviewWidget
 from helpdesk.query import (
@@ -60,7 +61,7 @@
 from helpdesk.models import (
     Ticket, Queue, FollowUp, TicketChange, PreSetReply, FollowUpAttachment, SavedSearch,
     IgnoreEmail, TicketCC, TicketDependency, UserSettings, KBItem, CustomField, is_unlisted,
-    FormType, EmailTemplate, get_markdown, clean_html, Tag
+    FormType, EmailTemplate, get_markdown, clean_html, Tag, Notification
 )
 
 from helpdesk import settings as helpdesk_settings
@@ -1411,6 +1412,49 @@ def update_ticket(request, ticket_id, public=False):
         if SHOW_SUBSCRIBE:
             subscribe_staff_member_to_ticket(ticket, request.user)
 
+    if old_owner != ticket.assigned_to:
+        message = "A ticket has been assigned to you"
+    else:
+        if request.user:
+            message = "Ticket " + str(ticket.id) + " has been updated by " + str(request.user.get_full_name())
+        else:
+            if request.user.email:
+                message = "Ticket " + str(ticket.id) + " has been updated (" + str(request.user.email) + ")"
+            else:
+                message = "Ticket " + str(ticket.id) + " has been updated"
+
+    for ticketcc in ticket.ticketcc_set.all():
+        if is_helpdesk_staff(ticketcc.user, ticket.ticket_form.organization_id) and ticketcc.user.usersettings_helpdesk.enable_notifications:
+            if request.user:
+                message = "A ticket you have been CC'd on has been updated by " + str(request.user.get_full_name())
+            else:
+                if request.user.email:
+                    message = "A ticket you have been CC'd on has been updated (" + str(request.user.email) + ")"
+                else:
+                    message = "A ticket you have been CC'd on has been updated"
+            new_notification = Notification(
+                user=ticketcc.user,
+                ticket=ticket,
+                organization=ticket.ticket_form.organization,
+                message= message,
+                is_read=False,
+                delete_by = timezone.now() + timedelta(days=60)
+            )
+
+            new_notification.save()
+
+    if ticket.assigned_to and ticket.assigned_to.usersettings_helpdesk.enable_notifications:
+        new_notification = Notification(
+            user=ticket.assigned_to,
+            ticket=ticket,
+            organization=ticket.ticket_form.organization,
+            message=message,
+            is_read=False,
+            delete_by = timezone.now() + timedelta(days=60)
+        )
+
+        new_notification.save()
+
     return return_to_ticket(request.user, request, helpdesk_settings, ticket)
 
 
@@ -1472,6 +1516,19 @@ def mass_update(request):
                              public=False,  # DC
                              user=request.user)
                 f.save()
+
+                if user.usersettings_helpdesk.enable_notifications:
+                    new_notification = Notification(
+                        user=user,
+                        ticket=t,
+                        organization=t.ticket_form.organization,
+                        message='You\'ve been assigned to ticket ' + str(t.id),
+                        is_read=False,
+                        delete_by = timezone.now() + timedelta(days=60)
+                    )
+
+                    new_notification.save()
+            
             if user.usersettings_helpdesk.email_on_ticket_assign and user != request.user:
                 # customized context in order for the bulk template to work properly
                 # yes, queues can have different sender addresses, but it seems unnecessary to rewrite everything just for that edge case
@@ -1496,6 +1553,7 @@ def mass_update(request):
                 )
     else:
         for t in Ticket.objects.filter(id__in=tickets):
+            message = None
             if not huser.can_access_queue(t.queue):
                 continue
 
@@ -1510,6 +1568,8 @@ def mass_update(request):
                              public=False,  # DC
                              user=request.user)
                 f.save()
+
+                message = 'You\'ve been assigned to ticket ' + str(t.id)
             elif action == 'unassign' and t.assigned_to is not None:
                 t.assigned_to = None
                 t.save()
@@ -1519,6 +1579,8 @@ def mass_update(request):
                              public=False,  # DC
                              user=request.user)
                 f.save()
+
+                message = 'You\ve been unassigned from ticket ' + str(t.id)
             elif action == 'set_kbitem':
                 t.kbitem = kbitem
                 t.save()
@@ -1611,9 +1673,36 @@ def mass_update(request):
                         ticket=t
                     )
 
+                message = 'Ticket ' + str(t.id) + ' has been closed'
             elif action == 'delete':
                 # todo create a note of this somewhere?
                 t.delete()
+            
+            if message:
+                if t.assigned_to.usersettings_helpdesk.enable_notifications:
+                    new_notification = Notification(
+                        user=t.assigned_to,
+                        ticket=t,
+                        organization=t.ticket_form.organization,
+                        message=message,
+                        is_read=False,
+                        delete_by = timezone.now() + timedelta(days=60)
+                    )
+
+                    new_notification.save()
+                
+                for ticketcc in t.ticketcc_set.all():
+                    if ticketcc.user.usersettings_helpdesk.enable_notifications:
+                        new_notification = Notification(
+                            user=ticketcc.user,
+                            ticket=t,
+                            organization=t.ticket_form.organization,
+                            message='A ticket you were CC\'d on has been updated',
+                            is_read=False,
+                            delete_by = timezone.now() + timedelta(days=60)
+                        )
+
+                        new_notification.save()
 
     return JsonResponse({'update_status': "Ticket Update Complete"})
 
@@ -2122,6 +2211,32 @@ def get_form_kwargs(self):
 
     def form_valid(self, form):
         self.ticket = form.save(form_id=self.form_id, user=self.request.user if self.request.user.is_authenticated else None)
+
+        for ticketcc in self.ticket.ticketcc_set.all():
+            if is_helpdesk_staff(ticketcc.user, self.ticket.ticket_form.organization_id) and ticketcc.user.usersettings_helpdesk.enable_notifications:
+                new_notification = Notification(
+                    user=ticketcc.user,
+                    ticket=self.ticket,
+                    organization=self.ticket.ticket_form.organization,
+                    message="A ticket has been created and you are CC'd on it",
+                    is_read=False,
+                    delete_by = timezone.now() + timedelta(days=60)
+                )
+
+                new_notification.save()
+
+        if self.ticket.assigned_to and self.ticket.assigned_to.usersettings_helpdesk.enable_notifications:
+            new_notification = Notification(
+                user=self.ticket.assigned_to,
+                ticket=self.ticket,
+                organization=self.ticket.ticket_form.organization,
+                message="A new ticket has been created and you have been assigned to it",
+                is_read=False,
+                delete_by = timezone.now() + timedelta(days=60)
+            )
+
+            new_notification.save()
+
         if self.request.GET.get('milestone_beam_redirect', False):
             # Pair Ticket to Milestone
             attach_ticket_to_property_milestone(self.request, self.ticket)
@@ -3728,3 +3843,89 @@ def export(qs, org, serializer, paginate=False, do_extra_data=True, visible_cols
         response['Content-Disposition'] = 'attachment; filename=' + file_name
         response['Content-Type'] = 'application/vnd.ms-excel; charset=utf-16'
         return response
+
+class CreateNotificationView(ListView):
+    model = Notification
+    template_name = 'helpdesk/notifications_index.html'
+
+    def get_queryset(self):
+        return Notification.objects.filter(user=self.request.user).order_by("-created")
+
+    def get_context_data(self, **kwargs):
+        huser = HelpdeskUser(self.request.user)
+        user_saved_queries = SavedSearch.objects.filter(user=self.request.user)
+        notifications = Notification.objects.filter(user=self.request.user, organization = self.request.user.default_organization.helpdesk_organization).order_by("-created")
+        user_saved_queries = SavedSearch.objects.filter(user=self.request.user)
+
+        # New notifications paginator
+        page = self.request.GET.get('p', '1')
+        try:
+            page = int(page)
+        except ValueError:
+            page = 1
+
+        
+        notifications_per_page = 25
+        
+        paginator = Paginator(notifications, notifications_per_page)
+        try:
+            notifications = paginator.page(page)
+        except PageNotAnInteger:
+            notifications = paginator.page(1)
+        except EmptyPage:
+            notifications = paginator.page(paginator.num_pages)
+
+        context = super().get_context_data(**kwargs)
+        context['notifications'] = notifications
+        context['user_saved_queries'] = user_saved_queries
+        context['queue_choices'] = huser.get_queues()
+        context['user_saved_queries'] = user_saved_queries
+        context['notifications_per_page'] = notifications_per_page
+        context['notification_index_start'] = paginator.page(page).start_index() 
+        context['notification_index_end'] = paginator.page(page).end_index() 
+        context['notification_total'] = paginator.count
+
+        return context
+
+def notifications_json(request):
+    
+    notifications = Notification.objects.filter(user=request.user, organization=request.user.default_organization.helpdesk_organization).order_by("-created")
+
+    data = [{
+        'id': notification.id,
+        'message': notification.message,
+        'date': notification.get_time_since_created(),
+        'ticket_title': notification.ticket.title,
+        'ticket_queue': notification.ticket.queue.title, 
+        'is_read': notification.is_read,
+        'created': notification.created
+    } for notification in notifications]
+
+    return JsonResponse({'data': data})
+
+def mark_notification_as_read(request, notification_id):
+    notification = get_object_or_404(Notification, id=notification_id, user=request.user)
+    notification.is_read = True
+    notification.save()
+
+    return redirect(notification.ticket.get_absolute_url())
+
+def mark_selected_as_read(request):
+    selected = request.POST.getlist('selected[]')
+
+    if request.method == 'POST':
+        for id in selected:
+            notification = Notification.objects.get(id=int(id), user=request.user)
+            notification.is_read = True
+            notification.save()
+        return JsonResponse({"selected": selected})
+
+def delete_selected_notifications(request):
+    selected = request.POST.getlist('selected[]')
+
+    if request.method == 'POST':
+        for id in selected:
+            notification = Notification.objects.get(id=int(id), user=request.user)
+            notification.delete()
+        return JsonResponse({"selected": selected})
+        

From bdb84b7bcfbd39238ceb7c2de70d643680c590dc Mon Sep 17 00:00:00 2001
From: awwang0628 <awwang0628@gmail.com>
Date: Tue, 9 Jul 2024 13:25:23 -0400
Subject: [PATCH 06/14] Minor tweaks to messages

---
 .../helpdesk/notifications_index.html         | 15 +++++++++---
 helpdesk/views/staff.py                       | 24 +++++++++----------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/helpdesk/templates/helpdesk/notifications_index.html b/helpdesk/templates/helpdesk/notifications_index.html
index 48a31c3f1..0f48a471f 100644
--- a/helpdesk/templates/helpdesk/notifications_index.html
+++ b/helpdesk/templates/helpdesk/notifications_index.html
@@ -80,6 +80,7 @@
     $(document).ready(function() {
         var selected = [];
         var hiddenRowsData = [];
+        var all_notification_ids = [];
         var filterContainer = $('#filterContainer');
 
         // Go to the url that marks a notification as read
@@ -156,6 +157,7 @@
 
             "initComplete": function() {
                 this.api().columns().every(function (index) {
+                    // Adds all queues to the dropdown menu.
                     if (index === 4) {
                         let column = this
 
@@ -183,6 +185,7 @@
                             });
                     
                         $('#filterQueue').text('Filter by Queue:')
+                    // Adds logic for filtering by read/unread notifications
                     } else if (index === 5) {
                         let column = this
 
@@ -231,18 +234,23 @@
 
         $("#select_all_btn").click(function () {
             $(".notification_multi_select").prop('checked', true);
+
+            for (const id of document.querySelectorAll(".notification_multi_select")) {
+                    all_notification_ids.push(id.value)
+                };
+            
             all_notification_ids.forEach(function(e) {
                 if (!selected.includes(String(e))) {
                     selected.push(String(e));
                 }
             })
             
-            
         });
 
         $("#select_none_btn").click(function () {
             $(".notification_multi_select").prop('checked', false);
             selected = [];
+            all_notification_ids = []
             
         });
     
@@ -259,7 +267,7 @@
             }
         })
         
-
+        // Deletes all selected notifications
         $("#delete_btn").click(function (e) {
             if (selected.length > 0) {
                 $.ajax({
@@ -279,7 +287,8 @@
                 location.reload();
             }
         })
-
+ 
+        // Mark all selected notifications as read
         $('#mark_as_read_btn').click(function() {
             if (selected.length > 0) {
                 $.ajax({
diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py
index f0add7302..20be56579 100644
--- a/helpdesk/views/staff.py
+++ b/helpdesk/views/staff.py
@@ -1422,6 +1422,18 @@ def update_ticket(request, ticket_id, public=False):
                 message = "Ticket " + str(ticket.id) + " has been updated (" + str(request.user.email) + ")"
             else:
                 message = "Ticket " + str(ticket.id) + " has been updated"
+    
+    if ticket.assigned_to and ticket.assigned_to.usersettings_helpdesk.enable_notifications:
+        new_notification = Notification(
+            user=ticket.assigned_to,
+            ticket=ticket,
+            organization=ticket.ticket_form.organization,
+            message=message,
+            is_read=False,
+            delete_by = timezone.now() + timedelta(days=60)
+        )
+
+        new_notification.save()
 
     for ticketcc in ticket.ticketcc_set.all():
         if is_helpdesk_staff(ticketcc.user, ticket.ticket_form.organization_id) and ticketcc.user.usersettings_helpdesk.enable_notifications:
@@ -1443,18 +1455,6 @@ def update_ticket(request, ticket_id, public=False):
 
             new_notification.save()
 
-    if ticket.assigned_to and ticket.assigned_to.usersettings_helpdesk.enable_notifications:
-        new_notification = Notification(
-            user=ticket.assigned_to,
-            ticket=ticket,
-            organization=ticket.ticket_form.organization,
-            message=message,
-            is_read=False,
-            delete_by = timezone.now() + timedelta(days=60)
-        )
-
-        new_notification.save()
-
     return return_to_ticket(request.user, request, helpdesk_settings, ticket)
 
 

From 590ab5864402db7aeb2f0bd5b0ad8aeb858674b2 Mon Sep 17 00:00:00 2001
From: awwang0628 <awwang0628@gmail.com>
Date: Tue, 23 Jul 2024 10:47:35 -0400
Subject: [PATCH 07/14] Added ability to create and display announcements

---
 helpdesk/forms.py                             | 19 +++++-
 helpdesk/templates/helpdesk/base.html         |  2 +
 .../helpdesk/create_announcement.html         | 59 +++++++++++++++++++
 .../helpdesk/notifications_index.html         |  7 ++-
 helpdesk/templates/helpdesk/ticket_list.html  | 35 +++++++++++
 helpdesk/urls.py                              |  9 +++
 helpdesk/views/staff.py                       | 33 ++++++++++-
 7 files changed, 158 insertions(+), 6 deletions(-)
 create mode 100644 helpdesk/templates/helpdesk/create_announcement.html

diff --git a/helpdesk/forms.py b/helpdesk/forms.py
index 189557cf1..24d20220a 100644
--- a/helpdesk/forms.py
+++ b/helpdesk/forms.py
@@ -21,7 +21,7 @@
 from django.shortcuts import get_object_or_404
 
 from helpdesk.lib import safe_template_context, process_attachments
-from helpdesk.models import (Ticket, Queue, FollowUp, IgnoreEmail, TicketCC,
+from helpdesk.models import (Ticket, Queue, FollowUp, IgnoreEmail, TicketCC, Notification,
                              CustomField, TicketDependency, UserSettings, KBItem, Tag,
                              FormType, KBCategory, KBIAttachment, is_extra_data, PreSetReply, EmailTemplate, clean_html)
 from helpdesk import settings as helpdesk_settings
@@ -162,7 +162,6 @@ def customfield_to_field(self, field, instanceargs, kwargs={}):
 class PreviewWidget(forms.widgets.Textarea):
     template_name = "helpdesk/include/edit_md_preview.html"
 
-
 class EditTicketForm(CustomFieldMixin, forms.ModelForm):
 
     description = forms.CharField(widget=PreviewWidget, help_text=Ticket.description.field.help_text)
@@ -1353,3 +1352,19 @@ def clean_tickets(self):
         if len(queues) != 1:
             raise ValidationError(_('All selected tickets must share the same queue in order to be merged.'))
         return tickets
+    
+class AnnouncementDateWidget(forms.widgets.DateInput):
+    template_name = 'helpdesk/include/announcement_date.html'
+    
+class AnnouncementForm(forms.ModelForm):
+    class Meta:
+        model = Notification
+        exclude = ['user', 'ticket', 'organization', 'is_read', 'created', 'announcement']
+        widgets = {
+            'message': PreviewWidget,
+            'delete_by': forms.DateInput(attrs={'id': 'datefield', 'class': 'form-control', 'type': 'date', 'style': 'width: 25%'})
+        }
+        help_texts = {
+            'message': 'Message to be displayed'
+    }
+
diff --git a/helpdesk/templates/helpdesk/base.html b/helpdesk/templates/helpdesk/base.html
index 93be20098..ddc36cd84 100644
--- a/helpdesk/templates/helpdesk/base.html
+++ b/helpdesk/templates/helpdesk/base.html
@@ -28,6 +28,8 @@
 
             <div class="container-fluid">
 
+                {% block announcements %}{% endblock %}
+
                 <!-- Breadcrumbs-->
                 <ol class="breadcrumb">
                     {% block helpdesk_breadcrumb %}{% endblock %}
diff --git a/helpdesk/templates/helpdesk/create_announcement.html b/helpdesk/templates/helpdesk/create_announcement.html
new file mode 100644
index 000000000..ba64732e1
--- /dev/null
+++ b/helpdesk/templates/helpdesk/create_announcement.html
@@ -0,0 +1,59 @@
+{% extends "helpdesk/base.html" %}
+
+{% load i18n helpdesk_staff %}
+
+{% block helpdesk_title %} {% trans "Create Announcement" %} {% endblock %}
+
+{% block helpdesk_breadcrumb %}
+<li class="breadcrumb-item">
+    <a href="{% url 'helpdesk:notifications' %}">{% trans "Notifications" %}</a>
+</li>
+<li class="breadcrumb-item active">Create Annoucement</li>
+{% endblock %}
+
+{% block helpdesk_body %}
+<div class="container">
+    <div class="card card-register mx-auto mt-5">
+        <div class="card-header">
+            {% trans "Create Announcement" %}
+        </div>
+
+        <div class="card-body" style="margin-top:-15px">
+            <form method="POST" id="announcement_form">
+                {% csrf_token %}
+                {% for field in form %}
+                    <div class="form-group" id='id_group_{{ field.name }}'>
+                        <label for='id_{{ field.name }}'>
+                            {{ field.label }}{% if field.field.required %}<span style="color:red;">*</span>{% endif %}
+                        </label>
+                        {{ field }}
+                        {% if field.errors %}
+                            <small class='error'>{{ field.errors }}</small>
+                        {% endif %}
+                        {% if field.help_text %}
+                            <small class='form_help_text help-block'>
+                                {{ field.help_text|safe }}
+                            </small>
+                        {% endif %}
+                    </div>
+                {% endfor %}
+                <button type="submit" class="btn btn-primary btn-lg btn-block">
+                    <i class="fa fa-send"></i> {% trans "Create Announcement" %}
+                </button>
+            </form>
+        </div>
+    </div>
+</div>
+
+{% include 'helpdesk/include/edit_md_preview_script.html' %}
+
+
+{% endblock %}
+
+{% block helpdesk_js %}
+
+<script>
+    datefield.min = new Date().toISOString().split("T")[0];
+</script>
+
+{% endblock %}
\ No newline at end of file
diff --git a/helpdesk/templates/helpdesk/notifications_index.html b/helpdesk/templates/helpdesk/notifications_index.html
index 0f48a471f..e6058a47e 100644
--- a/helpdesk/templates/helpdesk/notifications_index.html
+++ b/helpdesk/templates/helpdesk/notifications_index.html
@@ -14,6 +14,10 @@
 {% block helpdesk_body %}
 <div class="d-flex align-items-center">    
     
+    <div class="input-group justify-content-start">
+        <a href="{% url 'helpdesk:create_announcement' %}"><button id="announcements_btn" class="btn btn-outline-primary rounded-left font-weight-semibold ml-2" type="button">Create Annoucement<i class="fa fa-plus ml-2"></i></button></a>
+    </div>
+    
     <div class="input-group justify-content-end">
 
         
@@ -33,8 +37,7 @@
 </div>
 
 <div class="row">
-    <div class="col-sm-8 col-md-9 col-lg-10 order-1 pl-3">
-
+    <div class="col-sm-8 col-md-9 col-lg-12 order-1 pt-2">
         <div id="query_card" class="card mb-2">
             <!-- Notifications-->
             <div class="card-header">
diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html
index 672297352..c13a25595 100644
--- a/helpdesk/templates/helpdesk/ticket_list.html
+++ b/helpdesk/templates/helpdesk/ticket_list.html
@@ -17,8 +17,23 @@
 {% if from_saved_query %} [{{ saved_query.title }}]{% endif %}
 {% endblock %}
 
+{% block announcements %}
+{% for announcement in unread_announcements %}
+<div class="alert alert-primary alert-dismissible fade show" role="alert">
+    {{announcement.message}}
+    <button type="button" class="close checkmarkbutton" data-id="{{announcement.id}}" data-dismiss="alert" aria-label="Close" title= "Mark as read" style="margin-right: 30px;" data-action="mark-read">
+        <span aria-hidden="true"><i class="fas fa-check">{% csrf_token %}</i></span>
+    </button>
+    <button type="button" class="close" data-dismiss="alert" aria-label="Close" title="Close announcement">
+      <span aria-hidden="true"><i class="fas fa-times"></i></span>
+    </button>
+  </div>
+{% endfor %}
+
+{% endblock %}
 
 {% block helpdesk_breadcrumb %}
+
 <li class="breadcrumb-item">
     <a href="{% url 'helpdesk:list' %}">{% trans "Tickets" %}</a>
 </li>
@@ -503,8 +518,27 @@
                 paginatedQuery()
             }
         })
+
+       
     })
 
+    $(".checkmarkbutton").on('click', function() {
+        announcementId = $(this).data('id');
+
+        $.ajax({
+            url: "{% url 'helpdesk:mark_announcement_as_read' 0 %}".replace('0', announcementId),
+            type: "POST",
+            data: {
+                csrfmiddlewaretoken: '{{ csrf_token }}',
+            },
+            success: function() {
+                console.log("completed");
+            }
+
+            
+        });
+    });
+
     colNums = {"id": 0};
     idx = 1;
     for (const col of document.querySelectorAll('#headers th')) {
@@ -687,6 +721,7 @@
     checkInputs();
     checkCheckboxes();
 
+
     $(document).on("change", ".form-control", function() {
         checkInputs();
     });
diff --git a/helpdesk/urls.py b/helpdesk/urls.py
index 0c2970ba1..571c75fdd 100644
--- a/helpdesk/urls.py
+++ b/helpdesk/urls.py
@@ -447,5 +447,14 @@ def get_context_data(self, **kwargs):
     url(r'^notifications/json/$',
         staff.notifications_json,
         name="notifications_json"),
+    
+    url(r'^create_announcement/$',
+        staff.CreateAnnouncementView.as_view(),
+        name="create_announcement"),
+    
+    url(r'^mark_announcement_as_read/(?P<notification_id>[0-9]+)/$',
+        staff.mark_announcement_as_read,
+        name="mark_announcement_as_read"),
+    
 
 ]
diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py
index 20be56579..220efcc45 100644
--- a/helpdesk/views/staff.py
+++ b/helpdesk/views/staff.py
@@ -31,7 +31,7 @@
 from django.views.generic.edit import FormView, UpdateView
 from django.views.generic.list import ListView
 
-from helpdesk.forms import CUSTOMFIELD_DATE_FORMAT, CUSTOMFIELD_DATETIME_FORMAT, PreviewWidget
+from helpdesk.forms import CUSTOMFIELD_DATE_FORMAT, CUSTOMFIELD_DATETIME_FORMAT, PreviewWidget, AnnouncementForm
 from helpdesk.query import (
     get_query_class,
     query_to_base64,
@@ -2088,6 +2088,8 @@ def ticket_list(request):
     except EmptyPage:
         tickets = paginator.page(paginator.num_pages)
 
+    announcements = Notification.objects.filter(organization=org, announcement=True, is_read=False).order_by('-created')
+
     return render(request, 'helpdesk/ticket_list.html', dict(
         context,
         tickets_per_page=tickets_per_page,
@@ -2108,6 +2110,7 @@ def ticket_list(request):
         ticket_index_start=paginator.page(page).start_index(),
         ticket_index_end=paginator.page(page).end_index(),
         ticket_total=paginator.count,
+        unread_announcements=announcements
     ))
 
 ticket_list = staff_member_required(ticket_list)
@@ -3889,7 +3892,7 @@ def get_context_data(self, **kwargs):
 
 def notifications_json(request):
     
-    notifications = Notification.objects.filter(user=request.user, organization=request.user.default_organization.helpdesk_organization).order_by("-created")
+    notifications = Notification.objects.filter(user=request.user, organization=request.user.default_organization.helpdesk_organization, announcement=False).order_by("-created")
 
     data = [{
         'id': notification.id,
@@ -3928,4 +3931,30 @@ def delete_selected_notifications(request):
             notification = Notification.objects.get(id=int(id), user=request.user)
             notification.delete()
         return JsonResponse({"selected": selected})
+
+def mark_announcement_as_read(request, notification_id):
+    notification = get_object_or_404(Notification, id=notification_id, user=request.user)
+    notification.is_read = True
+    notification.save()
+
+    return JsonResponse({'notification_id': notification_id}, status=status.HTTP_200_OK)
+
+
+class CreateAnnouncementView(FormView):
+    template_name = 'helpdesk/create_announcement.html'
+    form_class = AnnouncementForm
+
+    def form_valid(self, form):
+        new_announcement = form.save(commit=False)
+        new_announcement.user = self.request.user
+        new_announcement.organization = self.request.user.default_organization.helpdesk_organization
+        new_announcement.announcement = True
+        new_announcement.is_read = False
+
+        new_announcement.save()
+
+        return super().form_valid(form)
+
+    def get_success_url(self):
+        return reverse('helpdesk:list')
         

From 011075f59f54834d341d36d7678c7dcc9595222e Mon Sep 17 00:00:00 2001
From: awwang0628 <awwang0628@gmail.com>
Date: Tue, 23 Jul 2024 11:19:43 -0400
Subject: [PATCH 08/14] Restored Announcements

---
 helpdesk/templates/helpdesk/ticket_list.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html
index c13a25595..cc61cbf17 100644
--- a/helpdesk/templates/helpdesk/ticket_list.html
+++ b/helpdesk/templates/helpdesk/ticket_list.html
@@ -18,6 +18,7 @@
 {% endblock %}
 
 {% block announcements %}
+<!-- Random Comment -->
 {% for announcement in unread_announcements %}
 <div class="alert alert-primary alert-dismissible fade show" role="alert">
     {{announcement.message}}

From c3733c01da1d4799777e8351252da066ff3d47fc Mon Sep 17 00:00:00 2001
From: awwang0628 <awwang0628@gmail.com>
Date: Tue, 23 Jul 2024 11:38:24 -0400
Subject: [PATCH 09/14] Delete old notification page

---
 .../helpdesk/notification_index_old.html      | 289 ------------------
 1 file changed, 289 deletions(-)
 delete mode 100644 helpdesk/templates/helpdesk/notification_index_old.html

diff --git a/helpdesk/templates/helpdesk/notification_index_old.html b/helpdesk/templates/helpdesk/notification_index_old.html
deleted file mode 100644
index 6aaa1293b..000000000
--- a/helpdesk/templates/helpdesk/notification_index_old.html
+++ /dev/null
@@ -1,289 +0,0 @@
-{% extends "helpdesk/base.html" %}
-
-{% load i18n humanize static in_list %}
-
-{% block helpdesk_title %} {% trans "Notifications" %} {% endblock %}
-
-{% block helpdesk_breadcrumb %}
-<li class="breadcrumb-item">
-    <a href="{% url 'helpdesk:notifications' %}">{% trans "Notifications" %}</a>
-</li>
-<li class="breadcrumb-item active">Overview</li>
-{% endblock %}
-
-{% block helpdesk_body %}
-<div class="d-flex align-items-center">    
-    
-    <div class="input-group justify-content-end">
-
-        
-        <div class="input-group-append">
-            <button id="mark_as_read_btn" class="btn btn-outline-primary rounded-left font-weight-semibold" type="button" method="POST"> {% csrf_token %} Mark As Read <i class="fa fa-check mr-1"></i></button>
-            <button id="delete_btn" class="btn btn-outline-danger font-weight-semibold" type="button" method="POST"> {% csrf_token %} Delete Selected <i class="fa fa-trash-alt mr-1"></i></button>
-        </div>
-        <div class="input-group-prepend">
-            <label class="input-group-text bg-white border-0">Select:</label>
-        </div>
-        
-        <div class="input-group-append">
-            <button id="select_all_btn" class="btn btn-outline-primary rounded-left font-weight-semibold" type="button">All <i class="fa fa-plus-circle mr-1"></i></button>
-            <button id="select_none_btn" class="btn btn-outline-danger font-weight-semibold" type="button">None <i class="fa fa-times-circle mr-1"></i></button>
-        </div>
-    </div>
-</div>
-
-
-<div class="row">
-    <div class="col-sm-8 col-md-9 col-lg-10 order-1 pl-3">
-        <div id="query_card" class="card mb-2">
-            <!-- Notifications-->
-            <div class="card-header">
-                <i class="fas fa-bell"></i>
-                {% trans "Notifications" %}
-            </div>
-
-            <div class="card-body">
-                <div class="table-responsive">
-                    <table class="table table-bordered table-sm m-0" id="dataTable" width="100%" cellspacing="0">
-                        <thead class="thead-light">
-                            <tr id="headers">
-                                <th class="filter-top" data-colname="checkbox" scope="col"></th>
-                                <th class="filter-top" data-colname="message" scope="col">Message</th>
-                                <th class="filter-top" data-colname="date" scope="col">Date</th>
-                                <th class="filter-top" data-colname="ticket_link" scope="col">Ticket</th>
-                                
-                            </tr>
-
-                            <tr>
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                                <td></td>
-                              </tr>
-                        </thead>
-                        <tbody>
-                            {% for notification in notifications %}
-                                <tr {% if notification.is_read %} style="background-color: lightgray;" {% endif %}>
-                                    <td>
-                                        <div class="custom-control custom-checkbox">
-                                            <input type="checkbox" name="notification_checkbox" class="custom-control-input notification_multi_select" id="newCustomCheck{{ forloop.counter }}" value="{{ notification.id }}">
-                                            <label class="custom-control-label" for="newCustomCheck{{ forloop.counter }}"></label>
-                                        </div>
-                                    </td>
-                                    <td>{{notification.message}}</td>
-                                    <td title="{{ notification.created }}">{{notification.get_time_since_created}}</td>
-                                    <td><a href="{% url 'helpdesk:mark_notification_as_read' notification.id%}">[queue-{{notification.ticket.queue}}] {{notification.ticket.title}}</a></td>
-                                </tr>
-                            {% empty %}
-                                <tr>
-                                    <td colspan="4">No Notifications</td>
-                                </tr>
-                            {% endfor %}
-
-                        </tbody>
-                    </table>
-                </div>
-                <!-- Pagination Toolbar -->
-                <div class="d-flex flex-wrap border-top px-2 py-2" style="//background-color: #f7f7f7">
-                    {% with 't_page' as page_var %}
-
-                    <div class="mr-auto d-flex align-items-center ml-2">Showing {{ notification_index_start }}-{{ notification_index_end }} of {{ notification_total }}<em><span class="select_count"></span></em></div>
-                    <div class="flex-fill justify-content-end">
-                        <div class="btn-toolbar float-right" role="toolbar" style="bottom: 0;">
-                            <div class="btn-group mr-2" role="group">
-                                {% if notifications.has_previous %}
-                                <button class="btn btn-primary font-weight-bold" onclick="paginatedQuery(1, false)">First</button>
-                                <button class="btn btn-primary font-weight-bold" onclick="paginatedQuery({{ notifications.previous_page_number }})">Previous</button>
-                                {% else %}
-                                <button class="btn btn-primary font-weight-bold disabled">First</button>
-                                <button class="btn btn-primary font-weight-bold disabled">Previous</button>
-                                {% endif %}
-                            </div>
-                            <div class="btn-group mr-2" role="group">
-                                {% with 3 as thresh %}
-                                {% for i in notifications.paginator.page_range %}
-                                {% if notifications.number == i %}
-                                <button class="btn btn-outline-primary active font-weight-bold">{{ i }}</button>
-                                {% elif i <= notifications.number|add:5 and i >= notifications.number|add:-5 %}
-                                <button class="btn btn-outline-primary font-weight-bold" onclick="paginatedQuery({{ i }})">{{ i }}</button>
-                                {% endif %}
-                                {% endfor %}
-                                {% endwith %}
-                            </div>
-                            <div class="btn-group" role="group">
-                                {% if notifications.has_next %}
-                                <button class="btn btn-primary font-weight-bold" onclick="paginatedQuery({{ notifications.next_page_number }}, false)">Next</button>
-                                <button class="btn btn-primary font-weight-bold" onclick="paginatedQuery({{ notifications.paginator.num_pages }}, false)">Last</button>
-                                {% else %}
-                                <button class="btn btn-primary font-weight-bold disabled">Next</button>
-                                <button class="btn btn-primary font-weight-bold disabled">Last</button>
-                                {% endif %}
-                            </div>
-                        </div>
-                    </div>
-                    {% endwith %}
-                </div>
-                <!-- / Pagination Toolbar -->
-                                
-
-                
-            </div>
-    
-    </div>
-
-    <form method="get" id="query_form" action="{% url 'helpdesk:notifications' %}">
-
-        <!-- Hidden Fields -->
-
-        <!-- Paginator fields -->
-        <input type='hidden' id='n' name='n' value="{{ notifications_per_page }}"/>
-        <input type='hidden' id='p' name='p' value="1"/>
-
-        <input type='hidden' id='saved-query' name='saved-query' value="{{ saved_query.id }}"/>
-    </form>
-
-    
-    </div>
-</div>
-{% endblock %}
-
-{% block helpdesk_js %}
-<script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
-<script src="https://cdn.datatables.net/1.10.21/js/jquery.dataTables.min.js"></script>
-<script src="https://cdn.datatables.net/1.10.21/js/dataTables.bootstrap4.min.js"></script>
-
-<script>
-    var selected = [];
-    var all_notification_ids = [];
-
-    $(document).ready(function () {
-
-        for (const id of document.querySelectorAll(".notification_multi_select")) {
-            all_notification_ids.push(id.value)
-        }
-
-        $("#select_all_btn").click(function () {
-            $(".notification_multi_select").prop('checked', true);
-            all_notification_ids.forEach(function(e) {
-                if (!selected.includes(String(e))) {
-                    selected.push(String(e));
-                }
-            })
-            
-            
-        });
-
-        $("#select_none_btn").click(function () {
-            $(".notification_multi_select").prop('checked', false);
-            selected = [];
-            
-        });
-
-        $(".notification_multi_select").click(function () {
-            if ($(this).prop('checked')) {
-                if (!selected.includes($(this).val())) {
-                    selected.push($(this).val())
-                }
-            } else {
-                if (selected.includes($(this).val())) {
-                    selected.pop($(this).val())
-                } 
-            }
-
-        })
-        
-        $("#delete_btn").click(function (e) {
-            if (selected.length > 0) {
-                console.log(selected)
-                $.ajax({
-                    url: "{% url 'helpdesk:delete_selected_notifications' %}",
-                    type: 'POST',
-                    data: {
-                        csrfmiddlewaretoken: '{{ csrf_token }}',
-                        'selected[]': selected
-                    },
-                    success: function(response) {
-                        console.log(response)
-                        location.reload();
-                    }
-                });
-            } else {
-                console.log("NOTHING HERE")
-                location.reload();
-            }
-        })
-
-        $('#mark_as_read_btn').click(function() {
-            if (selected.length > 0) {
-                $.ajax({
-                    url: "{% url 'helpdesk:mark_selected_as_read' %}",
-                    type: 'POST',
-                    data: {
-                        csrfmiddlewaretoken: '{{ csrf_token }}',
-                        'selected[]': selected
-                    },
-                    success: function(response) {
-                        console.log(response);
-                        location.reload();
-                    }
-                });
-            } else {
-                console.log("NOTHING HERE");
-                location.reload();
-            }
-        })
-    });
-
-    function toggleQuerySelector() {
-        let queryToggle = !(localStorage.getItem("helpdesk.show_query") === 'true');
-
-        $('#show_query_text').toggle(!queryToggle);
-        $('#hide_query_text').toggle(queryToggle);
-        $("#query_select").toggle(queryToggle);
-        let resultsCol = $("#query_card").parent();
-        resultsCol.toggleClass('col-12', !queryToggle);
-        resultsCol.toggleClass('col-sm-8', queryToggle);
-        resultsCol.toggleClass('col-md-9', queryToggle);
-        resultsCol.toggleClass('col-lg-10', queryToggle);
-
-        localStorage.setItem("helpdesk.show_query", queryToggle);
-    }
-
-    function updateNotificationsPerPage(notifications_per_page) {
-        document.getElementById('n').value = notifications_per_page;
-        paginatedQuery();
-    }
-
-    function paginatedQuery(page=1, clearSavedQuery=false) {
-        document.getElementById('p').value = page;
-
-        /*
-        for (const colfilter of document.querySelectorAll('[data-colfilter]')) {
-            document.getElementById(colfilter.dataset['colfilter'] + '_filter').value = colfilter.value
-        }
-        */
-
-        if (!clearSavedQuery && $("#saved-query").val() !== '') {
-            // keep the saved query input and erase everything else
-            $("#query_form").find(':input:not(#saved-query)').not(":input[type=hidden]").filter(function() {
-                return true;
-            }).attr('disabled', 'disabled');
-            document.forms['query_form'].submit();
-        } else {
-            if (clearSavedQuery) {
-                // remove the saved query before submitting the form
-                $("#query_form").find("#saved-query").attr('disabled', 'disabled');
-            } else if ($("#saved-query").val() === 'None') {
-                $("#saved-query").val('');
-            }
-            // removes empty inputs from form
-            $("#query_form").find(':input').filter(function() {
-                return !($(this).is('input:checkbox:checked') || !$(this).is('input:checkbox') && $(this).val() !== '');
-            }).attr('disabled', 'disabled');
-
-            document.forms['query_form'].submit();
-        }
-    }
-
-</script>
-{% endblock %}
\ No newline at end of file

From 38ac3697be81d162b7b5771b9f0fd744cc652ea8 Mon Sep 17 00:00:00 2001
From: awwang0628 <awwang0628@gmail.com>
Date: Fri, 26 Jul 2024 12:20:43 -0400
Subject: [PATCH 10/14] Reformatted table and changed notification messages

---
 .../helpdesk/notifications_index.html         | 125 +++++++++++++-----
 helpdesk/urls.py                              |   4 +
 helpdesk/views/staff.py                       |  87 +++++++++---
 3 files changed, 169 insertions(+), 47 deletions(-)

diff --git a/helpdesk/templates/helpdesk/notifications_index.html b/helpdesk/templates/helpdesk/notifications_index.html
index e6058a47e..da050ee1f 100644
--- a/helpdesk/templates/helpdesk/notifications_index.html
+++ b/helpdesk/templates/helpdesk/notifications_index.html
@@ -16,15 +16,6 @@
     
     <div class="input-group justify-content-start">
         <a href="{% url 'helpdesk:create_announcement' %}"><button id="announcements_btn" class="btn btn-outline-primary rounded-left font-weight-semibold ml-2" type="button">Create Annoucement<i class="fa fa-plus ml-2"></i></button></a>
-    </div>
-    
-    <div class="input-group justify-content-end">
-
-        
-        <div class="input-group-append">
-            <button id="mark_as_read_btn" class="btn btn-outline-primary rounded-left font-weight-semibold ml-2" type="button" method="POST"> {% csrf_token %} Mark As Read <i class="fa fa-check mr-1"></i></button>
-            <button id="delete_btn" class="btn btn-outline-danger font-weight-semibold ml-2" type="button" method="POST"> {% csrf_token %} Delete Selected <i class="fa fa-trash-alt mr-1"></i></button>
-        </div>
         <div class="input-group-prepend">
             <label class="input-group-text bg-white border-0">Select:</label>
         </div>
@@ -34,6 +25,33 @@
             <button id="select_none_btn" class="btn btn-outline-danger font-weight-semibold" type="button">None <i class="fa fa-times-circle mr-1"></i></button>
         </div>
     </div>
+    
+    <div class="d-flex align-items-center mr-2" style="width: 500px">
+        <form method="post" action="{% url 'helpdesk:run_actions' %}" id="notification_run_actions">
+            {% csrf_token %} 
+            <div class="input-group">
+                <div class="input-group-prepend">
+                    <label class="input-group-text bg-white border-0">Action:</label>
+                </div>
+                <select class="custom-select rounded-left" name="action" id="tableActions" disabled>
+                    <option selected>Choose...</option>
+                    <option value="mark-read">Mark As Read</option>
+                    <option value="mark-unread">Mark As Unread</option>
+                    <option value="delete">Delete Selected</option>
+                </select>
+                <div class="input-group-append">
+                    <button id="runActionButton" type="button" onclick="runActions()" class="btn btn-outline-secondary" disabled> Run Action <i class="fa fa-arrow-circle-right mr-1"></i></button>
+                </div>
+
+                <!-- <div class="input-group-append">
+                    <button id="mark_as_read_btn" class="btn btn-outline-primary rounded-left font-weight-semibold ml-2" type="button" method="POST"> {% csrf_token %} Mark As Read <i class="fa fa-check mr-1"></i></button>
+                    <button id="delete_btn" class="btn btn-outline-danger font-weight-semibold ml-2" type="button" method="POST"> {% csrf_token %} Delete Selected <i class="fa fa-trash-alt mr-1"></i></button>
+                </div> -->
+                
+            </div>
+        </form>
+    </div>
+    
 </div>
 
 <div class="row">
@@ -55,10 +73,10 @@
                         <thead class="thead-light">
                             <tr id="headers">
                                 <th class="filter-top" data-colname="checkbox" scope="col"></th>
+                                <th class="filter-top" data-colname="queue" scope="col">Queue</th>
+                                <th class="filter-top" data-colname="ticket_link" scope="col">Ticket</th>
                                 <th class="filter-top" data-colname="message" scope="col">Message</th>
                                 <th class="filter-top" data-colname="date" scope="col">Date</th>
-                                <th class="filter-top" data-colname="ticket_link" scope="col">Ticket</th>
-                                <th></th>
                                 <th></th>
                                 
                             </tr>
@@ -78,13 +96,16 @@
 <script src="https://code.jquery.com/jquery-3.5.1.min.js"></script>
 <script src="https://cdn.datatables.net/1.10.21/js/jquery.dataTables.min.js"></script>
 <script src="https://cdn.datatables.net/1.10.21/js/dataTables.bootstrap4.min.js"></script>
+<script src="//cdn.datatables.net/plug-ins/2.1.2/dataRender/ellipsis.js"></script>
 
 <script>
+    var selected = [];
+    var hiddenRowsData = [];
+    var all_notification_ids = [];
+    var filterContainer = $('#filterContainer');
+
     $(document).ready(function() {
-        var selected = [];
-        var hiddenRowsData = [];
-        var all_notification_ids = [];
-        var filterContainer = $('#filterContainer');
+
 
         // Go to the url that marks a notification as read
         var baseUrl = "{% url 'helpdesk:mark_notification_as_read' 0%}"
@@ -105,7 +126,12 @@
 
                 {
                     "visible": false,
-                    "targets": [4,5]
+                    "targets": [5]
+                },
+
+                {
+                    "targets": [3],
+                    "render": $.fn.dataTable.render.ellipsis(85)  // Apply ellipsis render
                 }
 		    ],
             // Setting the data for all of the columns
@@ -121,8 +147,21 @@
                                 </div>`;
                     }
                 },
+
+                {"data": "ticket_queue"},
+
+                // Displays queue and title of ticket. Marks notification as read if link is clicked
+                {
+                    "data": null,
+                    "render": function(data, type, row) {
+                        var baseUrl = "{% url 'helpdesk:mark_notification_as_read' 0 %}".replace('0', row.id);
+                        return `<a href="${baseUrl}">${row.ticket_id}. ${$.fn.dataTable.render.ellipsis(40, true)(row.ticket_title, type, row)}</a>`;
+                    }
+                },
                 // Displays message
-                {"data": "message"}, 
+                {
+                    "data": "message",
+                }, 
                 // Displays the date
                 {
                     "data": "date", 
@@ -135,16 +174,6 @@
                         return `<span title = "${originalDate}">${formattedDate}</span>`;
                     }
                 },
-                // Displays queue and title of ticket. Marks notification as read if link is clicked
-                {
-                    "data": null,
-                    "render": function(data, type, row) {
-                        var baseUrl = "{% url 'helpdesk:mark_notification_as_read' 0 %}".replace('0', row.id);
-                        return `<a href= ${baseUrl}>[queue-${row.ticket_queue}] ${row.ticket_title}</a>`;
-                    }
-                },
-
-                {"data": "ticket_queue"},
                 {"data": "is_read"}
 
             ], 
@@ -154,14 +183,15 @@
             // Sets color of read notifications to gray
             "createdRow": function(row, data, dataIndex) {
                 if (data.is_read) {
-                    $(row).css('background-color', 'lightgray');
+                    $(row).addClass("bg-light")
+                    $(row).addClass("text-muted")
                 } 
             },
 
             "initComplete": function() {
                 this.api().columns().every(function (index) {
                     // Adds all queues to the dropdown menu.
-                    if (index === 4) {
+                    if (index === 1) {
                         let column = this
 
                         let select = document.createElement('select');
@@ -247,6 +277,9 @@
                     selected.push(String(e));
                 }
             })
+
+            $("#tableActions").attr("disabled", false)
+            $("#runActionButton").attr("disabled", false)
             
         });
 
@@ -254,6 +287,9 @@
             $(".notification_multi_select").prop('checked', false);
             selected = [];
             all_notification_ids = []
+
+            $("#tableActions").attr("disabled", true)
+            $("#runActionButton").attr("disabled", true)
             
         });
     
@@ -268,6 +304,17 @@
                     selected.pop($(this).val())
                 } 
             }
+
+            // Setting Action options and button to disabled if no table elements are selected
+            if (selected.length > 0) {
+                $("#tableActions").attr("disabled", false)
+                $("#runActionButton").attr("disabled", false)
+            } else {
+                $("#tableActions").attr("disabled", true)
+                $("#runActionButton").attr("disabled", true)
+            }
+
+            console.log(selected);
         })
         
         // Deletes all selected notifications
@@ -299,7 +346,7 @@
                     type: 'POST',
                     data: {
                         csrfmiddlewaretoken: '{{ csrf_token }}',
-                        'selected[]': selected
+                        'selected[]': selected,
                     },
                     success: function(response) {
                         console.log(response);
@@ -311,8 +358,24 @@
                 location.reload();
             }
         })
-
     });
+
+    function runActions() {
+        $.ajax({
+            url: "{% url 'helpdesk:run_actions' %}",
+            type: 'POST',
+            data: { 
+                csrfmiddlewaretoken: '{{ csrf_token }}',
+                'selected[]': selected,
+                'action': document.getElementById('tableActions').value
+            },
+            success: function(response) {
+                console.log(response);
+                location.reload();
+            }
+        })
+    }
+    
 </script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/helpdesk/urls.py b/helpdesk/urls.py
index 4ede8e64b..269390238 100644
--- a/helpdesk/urls.py
+++ b/helpdesk/urls.py
@@ -470,5 +470,9 @@ def get_context_data(self, **kwargs):
         staff.mark_announcement_as_read,
         name="mark_announcement_as_read"),
     
+     url(r'^run_actions/$',
+        staff.run_actions,
+        name="run_actions"),
+    
 
 ]
diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py
index 31a247443..ac29c7733 100644
--- a/helpdesk/views/staff.py
+++ b/helpdesk/views/staff.py
@@ -1409,18 +1409,30 @@ def update_ticket(request, ticket_id, public=False):
         if SHOW_SUBSCRIBE:
             subscribe_staff_member_to_ticket(ticket, request.user)
 
-    if old_owner != ticket.assigned_to:
+    if reassigned:
         message = "A ticket has been assigned to you"
     else:
-        if request.user:
-            message = "Ticket " + str(ticket.id) + " has been updated by " + str(request.user.get_full_name())
+        if request.user and request.user.is_authenticated and hasattr(request.user, 'usersettings_helpdesk'):
+            if new_status != old_status:
+                if len(comment) > 0:
+                    message = f"{request.user.get_full_name()} changed status to <strong>{ticket.get_status_display()}</strong> and replied \"{comment}\""
+                else:
+                    message = f"{request.user.get_full_name()} changed status to <strong>{ticket.get_status_display()}</strong>"
+            else:
+                message = str(request.user.get_full_name) + " replied \"" + str(comment) + "\""
         else:
             if request.user.email:
-                message = "Ticket " + str(ticket.id) + " has been updated (" + str(request.user.email) + ")"
+                if new_status != old_status:
+                    if len(comment) > 0:
+                        message = f"{request.user.email} changed status to <strong>{ticket.get_status_display()}</strong> and replied \"{comment}\""
+                    else:
+                        message = f"{request.user.email} changed status to <strong>{ticket.get_status_display()}</strong>"
+                else:
+                    message = str(request.user.email) + " replied \"" + str(comment) + "\""
             else:
                 message = "Ticket " + str(ticket.id) + " has been updated"
     
-    if ticket.assigned_to and ticket.assigned_to.usersettings_helpdesk.enable_notifications:
+    if ticket.assigned_to and ticket.assigned_to.usersettings_helpdesk.enable_notifications and request.user != ticket.assigned_to:
         new_notification = Notification(
             user=ticket.assigned_to,
             ticket=ticket,
@@ -1433,12 +1445,24 @@ def update_ticket(request, ticket_id, public=False):
         new_notification.save()
 
     for ticketcc in ticket.ticketcc_set.all():
-        if is_helpdesk_staff(ticketcc.user, ticket.ticket_form.organization_id) and ticketcc.user.usersettings_helpdesk.enable_notifications:
-            if request.user:
-                message = "A ticket you have been CC'd on has been updated by " + str(request.user.get_full_name())
+        if is_helpdesk_staff(ticketcc.user, ticket.ticket_form.organization_id) and ticketcc.user.usersettings_helpdesk.enable_notifications and request.user != ticketcc.user:
+            if request.user and request.user.is_authenticated and hasattr(request.user, 'usersettings_helpdesk'):
+                if new_status != old_status:
+                    if len(comment) > 0:
+                        message = f"{request.user.get_full_name()} changed status to <strong>{ticket.get_status_display()}</strong> and replied \"{comment}\""
+                    else:
+                        message = f"{request.user.get_full_name()} changed status to <strong>{ticket.get_status_display()}</strong>"
+                else:
+                    message = str(request.user.get_full_name) + " replied \"" + str(comment) + "\""
             else:
                 if request.user.email:
-                    message = "A ticket you have been CC'd on has been updated (" + str(request.user.email) + ")"
+                    if new_status != old_status:
+                        if len(comment) > 0:
+                            message = f"{request.user.email} changed status to <strong>{ticket.get_status_display()}</strong> and replied \"{comment}\""
+                        else:
+                            message = f"{request.user.email} changed status to <strong>{ticket.get_status_display()}</strong>"
+                    else:
+                        message = str(request.user.email) + " replied \"" + str(comment) + "\""
                 else:
                     message = "A ticket you have been CC'd on has been updated"
             new_notification = Notification(
@@ -1555,12 +1579,12 @@ def mass_update(request):
                              user=request.user)
                 f.save()
 
-                if user.usersettings_helpdesk.enable_notifications:
+                if user.usersettings_helpdesk.enable_notifications and t.assigned_to != request.user:
                     new_notification = Notification(
                         user=user,
                         ticket=t,
                         organization=t.ticket_form.organization,
-                        message='You\'ve been assigned to ticket ' + str(t.id),
+                        message='You\'ve been assigned to ticket ' + str(t.id) + " by " + str(request.user.get_full_name()),
                         is_read=False,
                         delete_by = timezone.now() + timedelta(days=60)
                     )
@@ -1607,7 +1631,8 @@ def mass_update(request):
                              user=request.user)
                 f.save()
 
-                message = 'You\'ve been assigned to ticket ' + str(t.id)
+                if user.usersettings_helpdesk.enable_notifications and t.assigned_to != request.user:
+                    message = f"{request.user.get_full_name()} assigned you to ticket {t.id}"
             elif action == 'unassign' and t.assigned_to is not None:
                 t.assigned_to = None
                 t.save()
@@ -1618,7 +1643,8 @@ def mass_update(request):
                              user=request.user)
                 f.save()
 
-                message = 'You\ve been unassigned from ticket ' + str(t.id)
+                if user.usersettings_helpdesk.enable_notifications and t.assigned_to != request.user:
+                    message = f"{request.user.get_full_name()} unassinged you from ticket {t.id}"
             elif action == 'set_kbitem':
                 t.kbitem = kbitem
                 t.save()
@@ -1646,6 +1672,8 @@ def mass_update(request):
                     t.assigned_to = new_user
                     f.save()
                     t.save()
+                if user.usersettings_helpdesk.enable_notifications and t.assigned_to != request.user:
+                    message = f"{request.user.get_full_name()} changed status to <strong>Closed</strong> in mass update"
             elif action == 'close_public' and t.status != Ticket.CLOSED_STATUS:
                 t.status = Ticket.CLOSED_STATUS
                 t.save()
@@ -1711,11 +1739,14 @@ def mass_update(request):
                         ticket=t
                     )
 
-                message = 'Ticket ' + str(t.id) + ' has been closed'
+                if user.usersettings_helpdesk.enable_notifications and t.assigned_to != request.user:
+                    message = f"{request.user.get_full_name()} changed status to <strong>Closed</strong> in mass update"
             elif action == 'delete':
                 # todo create a note of this somewhere?
                 t.delete()
-            
+                if user.usersettings_helpdesk.enable_notifications and t.assigned_to != request.user:
+                    message = f"{request.user.get_full_name()} deleted ticket {t.id}"
+
             if message:
                 if t.assigned_to.usersettings_helpdesk.enable_notifications:
                     new_notification = Notification(
@@ -3937,7 +3968,8 @@ def notifications_json(request):
         'message': notification.message,
         'date': notification.get_time_since_created(),
         'ticket_title': notification.ticket.title,
-        'ticket_queue': notification.ticket.queue.title, 
+        'ticket_id': notification.ticket.id,
+        'ticket_queue': notification.ticket.queue.slug, 
         'is_read': notification.is_read,
         'created': notification.created
     } for notification in notifications]
@@ -3977,6 +4009,29 @@ def mark_announcement_as_read(request, notification_id):
 
     return JsonResponse({'notification_id': notification_id}, status=status.HTTP_200_OK)
 
+def run_actions(request):
+    selected = request.POST.getlist('selected[]')
+
+    if request.method == 'POST':
+        action = request.POST.get('action', None)
+
+        if action == 'mark-read':
+            for id in selected:
+                notification = Notification.objects.get(id=int(id), user=request.user)
+                notification.is_read = True
+                notification.save()
+        elif action == 'mark-unread':
+            for id in selected:
+                notification = Notification.objects.get(id=int(id), user=request.user)
+                notification.is_read = False
+                notification.save()
+        elif action == 'delete':
+            for id in selected:
+                notification = Notification.objects.get(id=int(id), user=request.user)
+                notification.delete()
+
+    
+    return JsonResponse({'action': action}, status=status.HTTP_200_OK)
 
 class CreateAnnouncementView(FormView):
     template_name = 'helpdesk/create_announcement.html'

From 18e2cd13fc9a5abd20649bd80d2b2c76a9d13280 Mon Sep 17 00:00:00 2001
From: awwang0628 <awwang0628@gmail.com>
Date: Fri, 26 Jul 2024 12:29:27 -0400
Subject: [PATCH 11/14] Removed unused code

---
 .../helpdesk/notifications_index.html         | 48 -------------------
 helpdesk/urls.py                              |  8 ----
 helpdesk/views/staff.py                       | 19 --------
 3 files changed, 75 deletions(-)

diff --git a/helpdesk/templates/helpdesk/notifications_index.html b/helpdesk/templates/helpdesk/notifications_index.html
index da050ee1f..6bbaa068f 100644
--- a/helpdesk/templates/helpdesk/notifications_index.html
+++ b/helpdesk/templates/helpdesk/notifications_index.html
@@ -42,11 +42,6 @@
                 <div class="input-group-append">
                     <button id="runActionButton" type="button" onclick="runActions()" class="btn btn-outline-secondary" disabled> Run Action <i class="fa fa-arrow-circle-right mr-1"></i></button>
                 </div>
-
-                <!-- <div class="input-group-append">
-                    <button id="mark_as_read_btn" class="btn btn-outline-primary rounded-left font-weight-semibold ml-2" type="button" method="POST"> {% csrf_token %} Mark As Read <i class="fa fa-check mr-1"></i></button>
-                    <button id="delete_btn" class="btn btn-outline-danger font-weight-semibold ml-2" type="button" method="POST"> {% csrf_token %} Delete Selected <i class="fa fa-trash-alt mr-1"></i></button>
-                </div> -->
                 
             </div>
         </form>
@@ -314,50 +309,8 @@
                 $("#runActionButton").attr("disabled", true)
             }
 
-            console.log(selected);
         })
         
-        // Deletes all selected notifications
-        $("#delete_btn").click(function (e) {
-            if (selected.length > 0) {
-                $.ajax({
-                    url: "{% url 'helpdesk:delete_selected_notifications' %}",
-                    type: 'POST',
-                    data: {
-                        csrfmiddlewaretoken: '{{ csrf_token }}',
-                        'selected[]': selected
-                    },
-                    success: function(response) {
-                        console.log(response)
-                        location.reload();
-                    }
-                });
-            } else {
-                console.log("NOTHING HERE")
-                location.reload();
-            }
-        })
- 
-        // Mark all selected notifications as read
-        $('#mark_as_read_btn').click(function() {
-            if (selected.length > 0) {
-                $.ajax({
-                    url: "{% url 'helpdesk:mark_selected_as_read' %}",
-                    type: 'POST',
-                    data: {
-                        csrfmiddlewaretoken: '{{ csrf_token }}',
-                        'selected[]': selected,
-                    },
-                    success: function(response) {
-                        console.log(response);
-                        location.reload();
-                    }
-                });
-            } else {
-                console.log("NOTHING HERE");
-                location.reload();
-            }
-        })
     });
 
     function runActions() {
@@ -370,7 +323,6 @@
                 'action': document.getElementById('tableActions').value
             },
             success: function(response) {
-                console.log(response);
                 location.reload();
             }
         })
diff --git a/helpdesk/urls.py b/helpdesk/urls.py
index 269390238..fa072e7fc 100644
--- a/helpdesk/urls.py
+++ b/helpdesk/urls.py
@@ -449,14 +449,6 @@ def get_context_data(self, **kwargs):
     url(r'^notifications/(?P<notification_id>[0-9]+)/$',
         staff.mark_notification_as_read,
         name="mark_notification_as_read"),
-
-    url(r'^notifications/delete_notifications/$',
-        staff.delete_selected_notifications,
-        name="delete_selected_notifications"),
-
-    url(r'^notifications/mark_as_read/$',
-        staff.mark_selected_as_read,
-        name="mark_selected_as_read"),
     
     url(r'^notifications/json/$',
         staff.notifications_json,
diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py
index ac29c7733..b810855cf 100644
--- a/helpdesk/views/staff.py
+++ b/helpdesk/views/staff.py
@@ -3983,25 +3983,6 @@ def mark_notification_as_read(request, notification_id):
 
     return redirect(notification.ticket.get_absolute_url())
 
-def mark_selected_as_read(request):
-    selected = request.POST.getlist('selected[]')
-
-    if request.method == 'POST':
-        for id in selected:
-            notification = Notification.objects.get(id=int(id), user=request.user)
-            notification.is_read = True
-            notification.save()
-        return JsonResponse({"selected": selected})
-
-def delete_selected_notifications(request):
-    selected = request.POST.getlist('selected[]')
-
-    if request.method == 'POST':
-        for id in selected:
-            notification = Notification.objects.get(id=int(id), user=request.user)
-            notification.delete()
-        return JsonResponse({"selected": selected})
-
 def mark_announcement_as_read(request, notification_id):
     notification = get_object_or_404(Notification, id=notification_id, user=request.user)
     notification.is_read = True

From 01aaee4187a81124f9f0ca53471e64096af08fd7 Mon Sep 17 00:00:00 2001
From: awwang0628 <awwang0628@gmail.com>
Date: Wed, 31 Jul 2024 09:25:05 -0400
Subject: [PATCH 12/14] Changes to announcements

---
 helpdesk/forms.py                            |  4 ++--
 helpdesk/templates/helpdesk/dashboard.html   | 12 ++++++++++
 helpdesk/templates/helpdesk/kb_index.html    | 11 +++++++++
 helpdesk/templates/helpdesk/public_base.html |  2 ++
 helpdesk/templates/helpdesk/ticket_list.html |  6 +----
 helpdesk/views/kb.py                         |  5 +++-
 helpdesk/views/staff.py                      | 24 +++++++++++---------
 7 files changed, 45 insertions(+), 19 deletions(-)

diff --git a/helpdesk/forms.py b/helpdesk/forms.py
index c1cd8ce24..e1779e055 100644
--- a/helpdesk/forms.py
+++ b/helpdesk/forms.py
@@ -1361,8 +1361,8 @@ class Meta:
         model = Notification
         exclude = ['user', 'ticket', 'organization', 'is_read', 'created', 'announcement']
         widgets = {
-            'message': PreviewWidget,
-            'delete_by': forms.DateInput(attrs={'id': 'datefield', 'class': 'form-control', 'type': 'date', 'style': 'width: 25%'})
+            'message': forms.Textarea(attrs={'class': 'form-control'}),
+            'delete_by': forms.DateInput(attrs={'id': 'datefield', 'class': 'form-control', 'type': 'datetime-local', 'style': 'width: 25%'})
         }
         help_texts = {
             'message': 'Message to be displayed'
diff --git a/helpdesk/templates/helpdesk/dashboard.html b/helpdesk/templates/helpdesk/dashboard.html
index b5b5b0635..94ac713fd 100644
--- a/helpdesk/templates/helpdesk/dashboard.html
+++ b/helpdesk/templates/helpdesk/dashboard.html
@@ -9,6 +9,18 @@
 <li class="breadcrumb-item active">{% trans "Overview" %}</li>
 {% endblock %}
 
+{% block announcements %}
+{% for announcement in unread_announcements %}
+<div class="alert alert-primary alert-dismissible fade show" role="alert">
+    {{announcement.message}}
+    <button type="button" class="close checkmarkbutton" data-id="{{announcement.id}}" data-dismiss="alert" aria-label="Close" title= "Mark as read" data-action="mark-read">
+        <span aria-hidden="true"><i class="fas fa-check">{% csrf_token %}</i></span>
+    </button>
+  </div>
+{% endfor %}
+
+{% endblock %}
+
 {% block helpdesk_body %}
 
 <div class="row">
diff --git a/helpdesk/templates/helpdesk/kb_index.html b/helpdesk/templates/helpdesk/kb_index.html
index 92fbc819e..bf61264a8 100644
--- a/helpdesk/templates/helpdesk/kb_index.html
+++ b/helpdesk/templates/helpdesk/kb_index.html
@@ -8,6 +8,17 @@
 <li class="breadcrumb-item active">{% trans "Overview" %}</li>
 {% endblock %}
 
+{% block announcements %}
+{% for announcement in unread_announcements %}
+<div class="alert alert-primary alert-dismissible fade show" role="alert">
+    {{announcement.message}}
+    <button type="button" class="close checkmarkbutton" data-id="{{announcement.id}}" data-dismiss="alert" aria-label="Close" title= "Mark as read" data-action="mark-read">
+        <span aria-hidden="true"><i class="fas fa-check">{% csrf_token %}</i></span>
+    </button>
+  </div>
+{% endfor %}
+{% endblock %}
+
 {% block helpdesk_body %}
 
 {% if helpdesk_settings.HELPDESK_VIEW_A_TICKET_PUBLIC and not user.is_authenticated and not user|is_helpdesk_staff %}
diff --git a/helpdesk/templates/helpdesk/public_base.html b/helpdesk/templates/helpdesk/public_base.html
index d64e5fb74..c46e5512b 100644
--- a/helpdesk/templates/helpdesk/public_base.html
+++ b/helpdesk/templates/helpdesk/public_base.html
@@ -26,6 +26,8 @@
 
             <div class="container-fluid">
 
+                {% block announcements %}{% endblock %}
+
                 <!-- Breadcrumbs-->
                 <ol class="breadcrumb">
                     {% block helpdesk_breadcrumb %}{% endblock %}
diff --git a/helpdesk/templates/helpdesk/ticket_list.html b/helpdesk/templates/helpdesk/ticket_list.html
index cc61cbf17..b90bfc7aa 100644
--- a/helpdesk/templates/helpdesk/ticket_list.html
+++ b/helpdesk/templates/helpdesk/ticket_list.html
@@ -18,16 +18,12 @@
 {% endblock %}
 
 {% block announcements %}
-<!-- Random Comment -->
 {% for announcement in unread_announcements %}
 <div class="alert alert-primary alert-dismissible fade show" role="alert">
     {{announcement.message}}
-    <button type="button" class="close checkmarkbutton" data-id="{{announcement.id}}" data-dismiss="alert" aria-label="Close" title= "Mark as read" style="margin-right: 30px;" data-action="mark-read">
+    <button type="button" class="close checkmarkbutton" data-id="{{announcement.id}}" data-dismiss="alert" aria-label="Close" title= "Mark as read" data-action="mark-read">
         <span aria-hidden="true"><i class="fas fa-check">{% csrf_token %}</i></span>
     </button>
-    <button type="button" class="close" data-dismiss="alert" aria-label="Close" title="Close announcement">
-      <span aria-hidden="true"><i class="fas fa-times"></i></span>
-    </button>
   </div>
 {% endfor %}
 
diff --git a/helpdesk/views/kb.py b/helpdesk/views/kb.py
index 31010f531..a42a5f29f 100644
--- a/helpdesk/views/kb.py
+++ b/helpdesk/views/kb.py
@@ -16,7 +16,7 @@
 
 from helpdesk import settings as helpdesk_settings
 from helpdesk import user
-from helpdesk.models import KBCategory, KBItem, KBIAttachment
+from helpdesk.models import KBCategory, KBItem, KBIAttachment, Notification
 from helpdesk.decorators import is_helpdesk_staff, helpdesk_staff_member_required
 from helpdesk.forms import EditKBCategoryForm, EditKBItemForm
 
@@ -25,10 +25,13 @@
 
 def index(request):
     huser = user.huser_from_request(request)
+    org = request.GET.get('org')
+    announcements = Notification.objects.filter(organization__name=org, announcement=True, is_read=False).order_by('-created')
     # TODO: It'd be great to have a list of most popular items here.
     return render(request, 'helpdesk/kb_index.html', {
         'kb_categories': huser.get_allowed_kb_categories(),
         'helpdesk_settings': helpdesk_settings,
+        'unread_announcements': announcements,
         'debug': settings.DEBUG,
     })
 
diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py
index b810855cf..599f5da3d 100644
--- a/helpdesk/views/staff.py
+++ b/helpdesk/views/staff.py
@@ -734,6 +734,8 @@ def dashboard(request):
         unassigned_tickets = paginator.page(
             paginator.num_pages)
 
+    announcements = Notification.objects.filter(organization=request.user.default_organization.helpdesk_organization, announcement=True, is_read=False).order_by('-created')
+
     return render(request, 'helpdesk/dashboard.html', {
         'user_tickets': tickets,
         'user_tickets_closed_resolved': tickets_closed_resolved,
@@ -741,6 +743,7 @@ def dashboard(request):
         'kbitems': kbitems,
         'all_tickets_reported_by_current_user': all_tickets_reported_by_current_user,
         'basic_ticket_stats': basic_ticket_stats,
+        'unread_announcements': announcements,
         'debug': settings.DEBUG,
     })
 
@@ -1421,7 +1424,7 @@ def update_ticket(request, ticket_id, public=False):
             else:
                 message = str(request.user.get_full_name) + " replied \"" + str(comment) + "\""
         else:
-            if request.user.email:
+            try:
                 if new_status != old_status:
                     if len(comment) > 0:
                         message = f"{request.user.email} changed status to <strong>{ticket.get_status_display()}</strong> and replied \"{comment}\""
@@ -1429,9 +1432,8 @@ def update_ticket(request, ticket_id, public=False):
                         message = f"{request.user.email} changed status to <strong>{ticket.get_status_display()}</strong>"
                 else:
                     message = str(request.user.email) + " replied \"" + str(comment) + "\""
-            else:
-                message = "Ticket " + str(ticket.id) + " has been updated"
-    
+            except AttributeError:
+                message = "An anonymous user replied \"" + str(comment) + "\""    
     if ticket.assigned_to and ticket.assigned_to.usersettings_helpdesk.enable_notifications and request.user != ticket.assigned_to:
         new_notification = Notification(
             user=ticket.assigned_to,
@@ -1455,7 +1457,7 @@ def update_ticket(request, ticket_id, public=False):
                 else:
                     message = str(request.user.get_full_name) + " replied \"" + str(comment) + "\""
             else:
-                if request.user.email:
+                try:
                     if new_status != old_status:
                         if len(comment) > 0:
                             message = f"{request.user.email} changed status to <strong>{ticket.get_status_display()}</strong> and replied \"{comment}\""
@@ -1463,8 +1465,8 @@ def update_ticket(request, ticket_id, public=False):
                             message = f"{request.user.email} changed status to <strong>{ticket.get_status_display()}</strong>"
                     else:
                         message = str(request.user.email) + " replied \"" + str(comment) + "\""
-                else:
-                    message = "A ticket you have been CC'd on has been updated"
+                except AttributeError:
+                    message = "An anonymous user replied \"" + str(comment) + "\""   
             new_notification = Notification(
                 user=ticketcc.user,
                 ticket=ticket,
@@ -3961,15 +3963,15 @@ def get_context_data(self, **kwargs):
 
 def notifications_json(request):
     
-    notifications = Notification.objects.filter(user=request.user, organization=request.user.default_organization.helpdesk_organization, announcement=False).order_by("-created")
+    notifications = Notification.objects.filter(user=request.user, organization=request.user.default_organization.helpdesk_organization).order_by("-created")
 
     data = [{
         'id': notification.id,
         'message': notification.message,
         'date': notification.get_time_since_created(),
-        'ticket_title': notification.ticket.title,
-        'ticket_id': notification.ticket.id,
-        'ticket_queue': notification.ticket.queue.slug, 
+        'ticket_title': notification.ticket.title if notification.ticket else None,
+        'ticket_id': notification.ticket.id if notification.ticket else None,
+        'ticket_queue': notification.ticket.queue.slug if notification.ticket else None, 
         'is_read': notification.is_read,
         'created': notification.created
     } for notification in notifications]

From 2bfd6fb43a6e41505d422b3d73fd843e36927471 Mon Sep 17 00:00:00 2001
From: Elizabeth <ebeers86@gmail.com>
Date: Fri, 9 Aug 2024 15:24:50 -0400
Subject: [PATCH 13/14] Notifs: Display fixes

---
 helpdesk/templates/helpdesk/notifications_index.html |  8 ++++++--
 helpdesk/views/kb.py                                 | 11 +++++++++--
 helpdesk/views/staff.py                              |  4 ++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/helpdesk/templates/helpdesk/notifications_index.html b/helpdesk/templates/helpdesk/notifications_index.html
index 6bbaa068f..ffcd5049e 100644
--- a/helpdesk/templates/helpdesk/notifications_index.html
+++ b/helpdesk/templates/helpdesk/notifications_index.html
@@ -149,8 +149,12 @@
                 {
                     "data": null,
                     "render": function(data, type, row) {
-                        var baseUrl = "{% url 'helpdesk:mark_notification_as_read' 0 %}".replace('0', row.id);
-                        return `<a href="${baseUrl}">${row.ticket_id}. ${$.fn.dataTable.render.ellipsis(40, true)(row.ticket_title, type, row)}</a>`;
+                        if (row.ticket_id === null) {
+                            return '';
+                        } else {
+                            var baseUrl = "{% url 'helpdesk:mark_notification_as_read' 0 %}".replace('0', row.id);
+                            return `<a href="${baseUrl}">${row.ticket_id}. ${$.fn.dataTable.render.ellipsis(40, true)(row.ticket_title, type, row)}</a>`;
+                        }
                     }
                 },
                 // Displays message
diff --git a/helpdesk/views/kb.py b/helpdesk/views/kb.py
index a42a5f29f..c6d60cfdf 100644
--- a/helpdesk/views/kb.py
+++ b/helpdesk/views/kb.py
@@ -25,8 +25,15 @@
 
 def index(request):
     huser = user.huser_from_request(request)
-    org = request.GET.get('org')
-    announcements = Notification.objects.filter(organization__name=org, announcement=True, is_read=False).order_by('-created')
+    if is_helpdesk_staff(request.user):
+        announcements = Notification.objects.filter(
+            organization=request.user.default_organization.helpdesk_organization,
+            announcement=True,
+            is_read=False
+        ).order_by('-created')
+    else:
+        org = request.GET.get('org')
+        announcements = Notification.objects.filter(organization__name=org, announcement=True, is_read=False).order_by('-created')
     # TODO: It'd be great to have a list of most popular items here.
     return render(request, 'helpdesk/kb_index.html', {
         'kb_categories': huser.get_allowed_kb_categories(),
diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py
index 599f5da3d..983f23939 100644
--- a/helpdesk/views/staff.py
+++ b/helpdesk/views/staff.py
@@ -1422,7 +1422,7 @@ def update_ticket(request, ticket_id, public=False):
                 else:
                     message = f"{request.user.get_full_name()} changed status to <strong>{ticket.get_status_display()}</strong>"
             else:
-                message = str(request.user.get_full_name) + " replied \"" + str(comment) + "\""
+                message = f"{request.user.get_full_name()} replied \"{comment}\""
         else:
             try:
                 if new_status != old_status:
@@ -1431,7 +1431,7 @@ def update_ticket(request, ticket_id, public=False):
                     else:
                         message = f"{request.user.email} changed status to <strong>{ticket.get_status_display()}</strong>"
                 else:
-                    message = str(request.user.email) + " replied \"" + str(comment) + "\""
+                    message = f"{request.user.email} replied \"{comment}\""
             except AttributeError:
                 message = "An anonymous user replied \"" + str(comment) + "\""    
     if ticket.assigned_to and ticket.assigned_to.usersettings_helpdesk.enable_notifications and request.user != ticket.assigned_to:

From 5c954797d2683b278e4a0c276a1f2ee92c215768 Mon Sep 17 00:00:00 2001
From: awwang0628 <awwang0628@gmail.com>
Date: Mon, 12 Aug 2024 10:53:11 -0400
Subject: [PATCH 14/14] Created delete_notifications command. Added
 notifications for more cases when ticket is changed

---
 helpdesk/forms.py                             |   5 +-
 .../commands/delete_notifications.py          |  27 +++
 .../helpdesk/create_announcement.html         |   2 +-
 .../helpdesk/notifications_index.html         |   2 +-
 helpdesk/views/staff.py                       | 204 +++++++++++++-----
 5 files changed, 182 insertions(+), 58 deletions(-)
 create mode 100644 helpdesk/management/commands/delete_notifications.py

diff --git a/helpdesk/forms.py b/helpdesk/forms.py
index e1779e055..66ef21397 100644
--- a/helpdesk/forms.py
+++ b/helpdesk/forms.py
@@ -1353,16 +1353,13 @@ def clean_tickets(self):
             raise ValidationError(_('All selected tickets must share the same queue in order to be merged.'))
         return tickets
     
-class AnnouncementDateWidget(forms.widgets.DateInput):
-    template_name = 'helpdesk/include/announcement_date.html'
-    
 class AnnouncementForm(forms.ModelForm):
     class Meta:
         model = Notification
         exclude = ['user', 'ticket', 'organization', 'is_read', 'created', 'announcement']
         widgets = {
             'message': forms.Textarea(attrs={'class': 'form-control'}),
-            'delete_by': forms.DateInput(attrs={'id': 'datefield', 'class': 'form-control', 'type': 'datetime-local', 'style': 'width: 25%'})
+            'delete_by': forms.DateInput(attrs={'id': 'datefield', 'class': 'form-control', 'type': 'datetime-local'})
         }
         help_texts = {
             'message': 'Message to be displayed'
diff --git a/helpdesk/management/commands/delete_notifications.py b/helpdesk/management/commands/delete_notifications.py
new file mode 100644
index 000000000..5a0750ad7
--- /dev/null
+++ b/helpdesk/management/commands/delete_notifications.py
@@ -0,0 +1,27 @@
+#!/usr/bin/python
+
+
+from django.core.management.base import BaseCommand, CommandError
+
+import datetime
+
+from helpdesk.models import Notification
+
+class Command(BaseCommand):
+    help = "Deletes read notifications over a day old and any expired announcements"
+
+    def handle(self, *args, **options):
+        notifications = Notification.objects.filter(announcement=False, is_read=True, delete_by__lt=datetime.datetime.now())
+        announcements = Notification.objects.filter(announcement=True, is_read=True, delete_by__lt=datetime.datetime.now())
+
+        if notifications.exists():
+            count_notifs = notifications.delete()[0]
+            self.stdout.write(self.style.SUCCESS(f'Successfully deleted {count_notifs} old read notifications'))
+        else:
+            self.stdout.write(self.style.WARNING('No old read notifications to delete'))
+
+        if announcements.exists():
+            count_announcements = announcements.delete()[0]
+            self.stdout.write(self.style.SUCCESS(f'Successfully deleted {count_announcements} expired announcements'))
+        else:
+            self.stdout.write(self.style.WARNING('No old read announcements to delete'))
diff --git a/helpdesk/templates/helpdesk/create_announcement.html b/helpdesk/templates/helpdesk/create_announcement.html
index ba64732e1..1ea8f9550 100644
--- a/helpdesk/templates/helpdesk/create_announcement.html
+++ b/helpdesk/templates/helpdesk/create_announcement.html
@@ -8,7 +8,7 @@
 <li class="breadcrumb-item">
     <a href="{% url 'helpdesk:notifications' %}">{% trans "Notifications" %}</a>
 </li>
-<li class="breadcrumb-item active">Create Annoucement</li>
+<li class="breadcrumb-item active">Create Announcement</li>
 {% endblock %}
 
 {% block helpdesk_body %}
diff --git a/helpdesk/templates/helpdesk/notifications_index.html b/helpdesk/templates/helpdesk/notifications_index.html
index ffcd5049e..fc423ba5c 100644
--- a/helpdesk/templates/helpdesk/notifications_index.html
+++ b/helpdesk/templates/helpdesk/notifications_index.html
@@ -15,7 +15,7 @@
 <div class="d-flex align-items-center">    
     
     <div class="input-group justify-content-start">
-        <a href="{% url 'helpdesk:create_announcement' %}"><button id="announcements_btn" class="btn btn-outline-primary rounded-left font-weight-semibold ml-2" type="button">Create Annoucement<i class="fa fa-plus ml-2"></i></button></a>
+        <a href="{% url 'helpdesk:create_announcement' %}"><button id="announcements_btn" class="btn btn-outline-primary rounded-left font-weight-semibold ml-2" type="button">Create Announcement<i class="fa fa-plus ml-2"></i></button></a>
         <div class="input-group-prepend">
             <label class="input-group-text bg-white border-0">Select:</label>
         </div>
diff --git a/helpdesk/views/staff.py b/helpdesk/views/staff.py
index 983f23939..a51281a4f 100644
--- a/helpdesk/views/staff.py
+++ b/helpdesk/views/staff.py
@@ -1222,6 +1222,40 @@ def update_ticket(request, ticket_id, public=False):
     if request.FILES:
         files = process_attachments(f, request.FILES.getlist('attachment'))
 
+        if request.user and request.user.is_authenticated and hasattr(request.user, 'usersettings_helpdesk'):
+            message = f"{request.user.get_full_name()} has attached a file to ticket {ticket.id}"
+        else:
+            try:
+                message = f"{request.user.email} has attached a file to ticket {ticket.id}"
+            except AttributeError:
+                message = f"An anonymous user has attached a file to ticket {ticket.id}"
+        if ticket.assigned_to and ticket.assigned_to.usersettings_helpdesk.enable_notifications and request.user != ticket.assigned_to:
+            new_notification = Notification(
+                user=ticket.assigned_to,
+                ticket=ticket,
+                organization=ticket.ticket_form.organization,
+                message=message,
+                is_read=False,
+                delete_by = timezone.now() + timedelta(days=60)
+            )
+
+            new_notification.save()
+        
+        for ticketcc in ticket.ticketcc_set.all():
+            if is_helpdesk_staff(ticketcc.user, ticket.ticket_form.organization_id) and ticketcc.user.usersettings_helpdesk.enable_notifications and request.user != ticketcc.user:
+                new_notification = Notification(
+                    user=ticketcc.user,
+                    ticket=ticket,
+                    organization=ticket.ticket_form.organization,
+                    message=message,
+                    is_read=False,
+                    delete_by = timezone.now() + timedelta(days=60)
+                )
+
+                new_notification.save()
+        
+        message = ""
+
     if title and title != ticket.title:
         c = TicketChange(
             followup=f,
@@ -1232,6 +1266,41 @@ def update_ticket(request, ticket_id, public=False):
         c.save()
         ticket.title = title
 
+        if request.user and request.user.is_authenticated and hasattr(request.user, 'usersettings_helpdesk'):
+            message = f"{request.user.get_full_name()} has changed the title of ticket {ticket.id}"
+        else:
+            try:
+                message = f"{request.user.email} has changed the title of ticket {ticket.id}"
+            except AttributeError:
+                message = f"An anonymous user has changed the title of ticket {ticket.id}"
+        if ticket.assigned_to and ticket.assigned_to.usersettings_helpdesk.enable_notifications and request.user != ticket.assigned_to:
+            new_notification = Notification(
+                user=ticket.assigned_to,
+                ticket=ticket,
+                organization=ticket.ticket_form.organization,
+                message=message,
+                is_read=False,
+                delete_by = timezone.now() + timedelta(days=60)
+            )
+
+            new_notification.save()
+        
+        for ticketcc in ticket.ticketcc_set.all():
+            if is_helpdesk_staff(ticketcc.user, ticket.ticket_form.organization_id) and ticketcc.user.usersettings_helpdesk.enable_notifications and request.user != ticketcc.user:
+                new_notification = Notification(
+                    user=ticketcc.user,
+                    ticket=ticket,
+                    organization=ticket.ticket_form.organization,
+                    message=message,
+                    is_read=False,
+                    delete_by = timezone.now() + timedelta(days=60)
+                )
+
+                new_notification.save()
+        
+        message = ""
+
+
     if new_status != old_status:
         c = TicketChange(
             followup=f,
@@ -1265,6 +1334,41 @@ def update_ticket(request, ticket_id, public=False):
         c.save()
         ticket.priority = priority
 
+        if request.user and request.user.is_authenticated and hasattr(request.user, 'usersettings_helpdesk'):
+            message = f"{request.user.get_full_name()} has changed the priority of ticket {ticket.id} to <strong> {ticket.get_priority_display().split()[1]} </strong>"
+        else:
+            try:
+                message = f"{request.user.email} has changed the priority of ticket {ticket.id} to <strong> {ticket.get_priority_display().split()[1]} </strong>"
+            except AttributeError:
+                message = f"An anonymous user has changed the priority of ticket {ticket.id} to <strong> {ticket.get_priority_display().split()[1]} </strong>"
+        
+        if ticket.assigned_to and ticket.assigned_to.usersettings_helpdesk.enable_notifications and request.user != ticket.assigned_to:
+            new_notification = Notification(
+                user=ticket.assigned_to,
+                ticket=ticket,
+                organization=ticket.ticket_form.organization,
+                message=message,
+                is_read=False,
+                delete_by = timezone.now() + timedelta(days=60)
+            )
+
+            new_notification.save()
+        
+        for ticketcc in ticket.ticketcc_set.all():
+            if is_helpdesk_staff(ticketcc.user, ticket.ticket_form.organization_id) and ticketcc.user.usersettings_helpdesk.enable_notifications and request.user != ticketcc.user:
+                new_notification = Notification(
+                    user=ticketcc.user,
+                    ticket=ticket,
+                    organization=ticket.ticket_form.organization,
+                    message=message,
+                    is_read=False,
+                    delete_by = timezone.now() + timedelta(days=60)
+                )
+
+                new_notification.save()
+        
+        message = ""
+
     if due_date != ticket.due_date:
         old_value = ticket.due_date.astimezone(timezone.get_current_timezone()).strftime(CUSTOMFIELD_DATETIME_FORMAT) if ticket.due_date else 'None'
         new_value = due_date.astimezone(timezone.get_current_timezone()).strftime(CUSTOMFIELD_DATETIME_FORMAT) if due_date else 'None'
@@ -1413,7 +1517,7 @@ def update_ticket(request, ticket_id, public=False):
             subscribe_staff_member_to_ticket(ticket, request.user)
 
     if reassigned:
-        message = "A ticket has been assigned to you"
+        message = f"You have been assigned to ticket {ticket.id} by {request.user.get_full_name()}"
     else:
         if request.user and request.user.is_authenticated and hasattr(request.user, 'usersettings_helpdesk'):
             if new_status != old_status:
@@ -1422,7 +1526,8 @@ def update_ticket(request, ticket_id, public=False):
                 else:
                     message = f"{request.user.get_full_name()} changed status to <strong>{ticket.get_status_display()}</strong>"
             else:
-                message = f"{request.user.get_full_name()} replied \"{comment}\""
+                if len(comment) > 0:
+                    message = f"{request.user.get_full_name()} replied \"{comment}\""
         else:
             try:
                 if new_status != old_status:
@@ -1431,52 +1536,40 @@ def update_ticket(request, ticket_id, public=False):
                     else:
                         message = f"{request.user.email} changed status to <strong>{ticket.get_status_display()}</strong>"
                 else:
-                    message = f"{request.user.email} replied \"{comment}\""
+                    if len(comment) > 0:
+                        message = f"{request.user.email} replied \"{comment}\""
             except AttributeError:
-                message = "An anonymous user replied \"" + str(comment) + "\""    
-    if ticket.assigned_to and ticket.assigned_to.usersettings_helpdesk.enable_notifications and request.user != ticket.assigned_to:
-        new_notification = Notification(
-            user=ticket.assigned_to,
-            ticket=ticket,
-            organization=ticket.ticket_form.organization,
-            message=message,
-            is_read=False,
-            delete_by = timezone.now() + timedelta(days=60)
-        )
+                if len(comment) > 0:
+                    message = "An anonymous user replied \"" + str(comment) + "\""    
+    if len(message) > 0:
+        if ticket.assigned_to and ticket.assigned_to.usersettings_helpdesk.enable_notifications and request.user != ticket.assigned_to:
+            if len(message) > 0:
+                new_notification = Notification(
+                    user=ticket.assigned_to,
+                    ticket=ticket,
+                    organization=ticket.ticket_form.organization,
+                    message=message,
+                    is_read=False,
+                    delete_by = timezone.now() + timedelta(days=60)
+                )
 
-        new_notification.save()
+                new_notification.save()
 
-    for ticketcc in ticket.ticketcc_set.all():
-        if is_helpdesk_staff(ticketcc.user, ticket.ticket_form.organization_id) and ticketcc.user.usersettings_helpdesk.enable_notifications and request.user != ticketcc.user:
-            if request.user and request.user.is_authenticated and hasattr(request.user, 'usersettings_helpdesk'):
-                if new_status != old_status:
-                    if len(comment) > 0:
-                        message = f"{request.user.get_full_name()} changed status to <strong>{ticket.get_status_display()}</strong> and replied \"{comment}\""
-                    else:
-                        message = f"{request.user.get_full_name()} changed status to <strong>{ticket.get_status_display()}</strong>"
-                else:
-                    message = str(request.user.get_full_name) + " replied \"" + str(comment) + "\""
-            else:
-                try:
-                    if new_status != old_status:
-                        if len(comment) > 0:
-                            message = f"{request.user.email} changed status to <strong>{ticket.get_status_display()}</strong> and replied \"{comment}\""
-                        else:
-                            message = f"{request.user.email} changed status to <strong>{ticket.get_status_display()}</strong>"
-                    else:
-                        message = str(request.user.email) + " replied \"" + str(comment) + "\""
-                except AttributeError:
-                    message = "An anonymous user replied \"" + str(comment) + "\""   
-            new_notification = Notification(
-                user=ticketcc.user,
-                ticket=ticket,
-                organization=ticket.ticket_form.organization,
-                message= message,
-                is_read=False,
-                delete_by = timezone.now() + timedelta(days=60)
-            )
+        for ticketcc in ticket.ticketcc_set.all():
+            if is_helpdesk_staff(ticketcc.user, ticket.ticket_form.organization_id) and ticketcc.user.usersettings_helpdesk.enable_notifications and request.user != ticketcc.user:
 
-            new_notification.save()
+                new_notification = Notification(
+                    user=ticketcc.user,
+                    ticket=ticket,
+                    organization=ticket.ticket_form.organization,
+                    message= message,
+                    is_read=False,
+                    delete_by = timezone.now() + timedelta(days=60)
+                )
+
+                new_notification.save()
+    else:
+        message = ""
 
     return return_to_ticket(request.user, request, helpdesk_settings, ticket)
 
@@ -3980,15 +4073,18 @@ def notifications_json(request):
 
 def mark_notification_as_read(request, notification_id):
     notification = get_object_or_404(Notification, id=notification_id, user=request.user)
-    notification.is_read = True
-    notification.save()
+    if not notification.is_read:
+        notification.is_read = True
+        notification.delete_by = timezone.now() + timedelta(days=1)
+        notification.save()
 
     return redirect(notification.ticket.get_absolute_url())
 
 def mark_announcement_as_read(request, notification_id):
     notification = get_object_or_404(Notification, id=notification_id, user=request.user)
-    notification.is_read = True
-    notification.save()
+    if not notification.is_read:
+        notification.is_read = True
+        notification.save()
 
     return JsonResponse({'notification_id': notification_id}, status=status.HTTP_200_OK)
 
@@ -4001,13 +4097,17 @@ def run_actions(request):
         if action == 'mark-read':
             for id in selected:
                 notification = Notification.objects.get(id=int(id), user=request.user)
-                notification.is_read = True
-                notification.save()
+                if not notification.is_read:
+                    notification.is_read = True
+                    notification.delete_by = timezone.now()
+                    notification.save()
         elif action == 'mark-unread':
             for id in selected:
                 notification = Notification.objects.get(id=int(id), user=request.user)
-                notification.is_read = False
-                notification.save()
+                if notification.is_read:
+                    notification.is_read = False
+                    notification.delete_by = timezone.now() + timedelta(days=60)
+                    notification.save()
         elif action == 'delete':
             for id in selected:
                 notification = Notification.objects.get(id=int(id), user=request.user)