fix(announcements): improve teacher announcement approval ux

Author: amcsz

intranet/apps/announcements/migrations/0037_announcementrequest_atleast_one_approved.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.25 on 2025-05-03 02:03
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('announcements', '0036_auto_20250415_1251'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='announcementrequest',
+            name='atleast_one_approved',
+            field=models.BooleanField(default=False),
+        ),
+    ]

intranet/apps/announcements/migrations/0038_remove_announcementrequest_atleast_one_approved.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.2.25 on 2025-05-03 16:47
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('announcements', '0037_announcementrequest_atleast_one_approved'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='announcementrequest',
+            name='atleast_one_approved',
+        ),
+    ]

intranet/apps/announcements/migrations/0039_announcementrequest_teachers_rejected.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.25 on 2025-05-03 17:10
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('announcements', '0038_remove_announcementrequest_atleast_one_approved'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='announcementrequest',
+            name='teachers_rejected',
+            field=models.ManyToManyField(blank=True, related_name='teachers_rejected', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

intranet/apps/announcements/models.py

@@ -288,6 +288,7 @@ class AnnouncementRequest(models.Model):
 
     teachers_requested = models.ManyToManyField(settings.AUTH_USER_MODEL, blank=False, related_name="teachers_requested")
     teachers_approved = models.ManyToManyField(settings.AUTH_USER_MODEL, blank=True, related_name="teachers_approved")
+    teachers_rejected = models.ManyToManyField(settings.AUTH_USER_MODEL, blank=True, related_name="teachers_rejected")
 
     posted = models.ForeignKey(Announcement, null=True, blank=True, on_delete=models.CASCADE)
     posted_by = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True, related_name="posted_by", on_delete=set_historical_user)

intranet/apps/announcements/views.py

@@ -256,6 +256,7 @@ def approve_announcement_view(request, req_id):
 
                 return redirect("approve_announcement_success")
             else:
+                obj.teachers_rejected.add(request.user)
                 obj.save()
                 return redirect("approve_announcement_reject")
 

intranet/apps/dashboard/views.py

@@ -8,7 +8,7 @@
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
 from django.core.paginator import Page, Paginator
-from django.db.models import QuerySet
+from django.db.models import Q, QuerySet
 from django.http import HttpRequest
 from django.shortcuts import redirect, render
 from django.urls import reverse
@@ -683,9 +683,18 @@ def dashboard_view(request, show_widgets=True, show_expired=False, show_hidden_c
 
         context.update({"awaiting_teacher": awaiting_teacher, "awaiting_approval": awaiting_approval})
 
-    self_awaiting_teacher = AnnouncementRequest.objects.filter(posted=None, rejected=False, teachers_requested=request.user).this_year()
+    self_awaiting_teacher = (
+        AnnouncementRequest.objects.filter(posted=None, rejected=False, teachers_requested=request.user)
+        .exclude(Q(teachers_rejected=request.user) | Q(teachers_approved=request.user))
+        .this_year()
+    )
     context.update({"self_awaiting_teacher": self_awaiting_teacher})
 
+    already_teacher_approved = AnnouncementRequest.objects.filter(
+        posted=None, rejected=False, teachers_requested=request.user, teachers_approved=request.user
+    )
+    context.update({"already_teacher_approved": already_teacher_approved})
+
     if show_welcome:
         return render(request, "welcome/student.html", context)
     else:

intranet/templates/dashboard/dashboard.html

@@ -201,8 +201,9 @@ <h3> <i class="fas fa-info-circle"></i> There {% if awaiting_teacher|length == 1
                 </div>
             {% endif %}
         {% endif %}
-        {% if self_awaiting_teacher %}
+        {% if self_awaiting_teacher or already_teacher_approved %}
             <div class="announcement announcement-meta">
+                {% if self_awaiting_teacher %}
                 <h3>
                     <i class="fas fa-exclamation-circle" style="color: red"></i> There {% if self_awaiting_teacher|length == 1 %}is 1 announcement request{% else %}are {{ self_awaiting_teacher|length }} announcement requests{% endif %} waiting for your approval
                 </h3>
@@ -213,6 +214,19 @@ <h3>
                 </ul>
                 <br>
                 Click on the link{{ self_awaiting_teacher|length|pluralize }} above to approve or reject {% if self_awaiting_teacher|length == 1 %}this announcement{% else %}these announcements{% endif %}.
+                {% endif %}
+                {% if already_teacher_approved %}
+                    {% if self_awaiting_teacher %}<br>{% endif %}
+                    <h3>
+                    <i class="fas fa-info-circle"></i>
+                    There {{ already_teacher_approved|length|pluralize:"is,are" }} {{ already_teacher_approved|length }} announcement request{{ already_teacher_approved|length|pluralize }} you have approved and {{ already_teacher_approved|length|pluralize:"is,are" }} pending admin approval
+                    </h3>
+                    <ul>
+                        {% for req in already_teacher_approved %}
+                            <li>{{ req }} -- requested by {{ req.user.full_name }}</li>
+                        {% endfor %}
+                    </ul>   
+                {% endif %}
             </div>
         {% endif %}