Merge pull request #2676 from carpentries/feature/2675-ui-improvement…

…s-for-emails

[Emails] UI improvements for emails

amy/emails/filters.py

@@ -0,0 +1,56 @@
+import django_filters
+
+from emails.models import EmailTemplate, ScheduledEmail
+from workshops.filters import AMYFilterSet
+
+
+class EmailTemplateFilter(AMYFilterSet):
+    name = django_filters.CharFilter(lookup_expr="icontains")
+    signal = django_filters.CharFilter(lookup_expr="icontains")
+    from_header = django_filters.CharFilter(lookup_expr="icontains")
+    subject = django_filters.CharFilter(lookup_expr="icontains")
+    body = django_filters.CharFilter(lookup_expr="icontains")
+
+    order_by = django_filters.OrderingFilter(
+        fields=(
+            "name",
+            "signal",
+        ),
+    )
+
+    class Meta:
+        model = EmailTemplate
+        fields = [
+            "name",
+            "active",
+            "signal",
+            "from_header",
+            "subject",
+            "body",
+        ]
+
+
+class ScheduledEmailFilter(AMYFilterSet):
+    name = django_filters.CharFilter(
+        field_name="template__name",
+        lookup_expr="icontains",
+        label="Name",
+    )
+    subject = django_filters.CharFilter(lookup_expr="icontains")
+
+    order_by = django_filters.OrderingFilter(
+        fields=(
+            "template__name",
+            "state",
+            "scheduled_at",
+            "subject",
+        ),
+    )
+
+    class Meta:
+        model = ScheduledEmail
+        fields = [
+            "name",
+            "state",
+            "subject",
+        ]

amy/emails/views.py

@@ -7,6 +7,7 @@
 from markdownx.utils import markdownify
 
 from emails.controller import EmailController
+from emails.filters import EmailTemplateFilter, ScheduledEmailFilter
 from emails.forms import (
     EmailTemplateCreateForm,
     EmailTemplateUpdateForm,
@@ -42,6 +43,7 @@ class AllEmailTemplates(OnlyForAdminsMixin, FlaggedViewMixin, AMYListView):
     template_name = "emails/email_template_list.html"
     queryset = EmailTemplate.objects.order_by("name")
     title = "Email templates"
+    filter_class = EmailTemplateFilter
 
 
 class EmailTemplateDetails(OnlyForAdminsMixin, FlaggedViewMixin, AMYDetailView):
@@ -123,6 +125,7 @@ class AllScheduledEmails(OnlyForAdminsMixin, FlaggedViewMixin, AMYListView):
     template_name = "emails/scheduled_email_list.html"
     queryset = ScheduledEmail.objects.select_related("template").order_by("-created_at")
     title = "Scheduled emails"
+    filter_class = ScheduledEmailFilter
 
 
 class ScheduledEmailDetails(OnlyForAdminsMixin, FlaggedViewMixin, AMYDetailView):

amy/templates/emails/email_template_list.html

@@ -1,4 +1,4 @@
-{% extends "base_nav.html" %}
+{% extends "base_nav_sidebar.html" %}
 
 {% load pagination %}
 {% load tags %}

amy/templates/emails/scheduled_email_list.html

@@ -1,4 +1,4 @@
-{% extends "base_nav.html" %}
+{% extends "base_nav_sidebar.html" %}
 
 {% load pagination %}
 {% load tags %}

amy/templates/includes/related_scheduled_emails.html

@@ -4,7 +4,7 @@
 {% if related_scheduled_emails %}
 <ul>
   {% for email in related_scheduled_emails %}
-  <li><a href="{{ email.get_absolute_url }}">{{ email.subject }} | {{ email.pk }} | {{ email.get_state_display }}</a></li>
+  <li><a href="{{ email.get_absolute_url }}">{{ email.template.name }}</a></li>
   {% endfor %}
 </ul>
 {% else %}

amy/templates/includes/related_scheduled_emails_no_empty_msg.html

@@ -4,7 +4,7 @@
 {% if related_scheduled_emails %}
 <ul>
   {% for email in related_scheduled_emails %}
-  <li><a href="{{ email.get_absolute_url }}">{{ email.subject }} | {{ email.pk }} | {{ email.get_state_display }}</a></li>
+  <li><a href="{{ email.get_absolute_url }}">{{ email.template.name }}</a></li>
   {% endfor %}
 </ul>
 {% endif %}