Tp2000 1594 ordering of workflow templates list view (#1356)

* added 'created_at' and 'updated_at' fields to TaskWorkflowTemplateModel and sorting by date functionality for list view

* fixed mixin inheritance order for TaskWorkflowTemplateListView, ordering by dates works correctly now

* fixed inconsistency in datetime string formatting

* fixed datetime format inconsistencies by passing in settings.DATETIME_FORMAT as context variable

tasks/jinja2/tasks/workflows/template_list.jinja

@@ -40,7 +40,9 @@
           {"text": workflow_template_linked_id},
           {"text": object.title},
           {"text": object.description},
-          {"text": object.creator.get_displayname() if object.creator else "Unknown"}
+          {"text": object.creator.get_displayname() if object.creator else "Unknown"},
+          {"text": object.created_at.strftime(datetime_format)},
+          {"text": object.updated_at.strftime(datetime_format)},
         ]) or "" }}
       {% endfor %}
 
@@ -49,7 +51,9 @@
           {"text": "ID"},
           {"text": "Title"},
           {"text": "Description"},
-          {"text":"Created by"}
+          {"text": "Created by"},
+          {"text": create_sortable_anchor(request, "created_at", "Created", base_url)},
+          {"text": create_sortable_anchor(request, "updated_at", "Last Updated", base_url)},
         ],
           "rows": table_rows
         }) }}

tasks/migrations/0018_taskworkflowtemplate_created_at_and_more.py

@@ -0,0 +1,29 @@
+# Generated by Django 4.2.15 on 2024-12-09 14:53
+
+import django.utils.timezone
+from django.db import migrations
+from django.db import models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("tasks", "0017_rename_queue_taskitem_workflow_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="taskworkflowtemplate",
+            name="created_at",
+            field=models.DateTimeField(
+                auto_now_add=True,
+                default=django.utils.timezone.now,
+            ),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name="taskworkflowtemplate",
+            name="updated_at",
+            field=models.DateTimeField(auto_now=True),
+        ),
+    ]

tasks/models/workflow.py

@@ -4,6 +4,7 @@
 from django.urls import reverse
 
 from common.models import User
+from common.models.mixins import TimestampedMixin
 from tasks.models.queue import Queue
 from tasks.models.queue import QueueItem
 from tasks.models.task import Task
@@ -109,7 +110,7 @@ class Meta(QueueItem.Meta):
 # ----------------------------------------
 
 
-class TaskWorkflowTemplate(Queue):
+class TaskWorkflowTemplate(Queue, TimestampedMixin):
     """Template used to create TaskWorkflow instance."""
 
     title = models.CharField(

tasks/tests/test_views.py

@@ -3,6 +3,7 @@
 from bs4 import BeautifulSoup
 from django.urls import reverse
 
+import settings
 from common.tests.factories import ProgressStateFactory
 from common.tests.factories import SubTaskFactory
 from common.tests.factories import TaskFactory
@@ -573,6 +574,8 @@ def test_workflow_template_list_view(valid_user, client):
     assert str(template_instance.id) in row_text
     assert template_instance.description in row_text
     assert template_instance.creator.get_displayname() in row_text
+    assert f"{template_instance.strftime(settings.DATETIME_FORMAT)}" in row_text
+    assert f"{template_instance.strftime(settings.DATETIME_FORMAT)}" in row_text
 
 
 def test_workflow_detail_view_displays_tasks(

tasks/views.py

@@ -311,15 +311,28 @@ def get_queryset(self):
         return queryset
 
 
-class TaskWorkflowTemplateListView(PermissionRequiredMixin, WithPaginationListView):
+class TaskWorkflowTemplateListView(
+    PermissionRequiredMixin,
+    SortingMixin,
+    WithPaginationListView,
+):
     model = TaskWorkflowTemplate
     template_name = "tasks/workflows/template_list.jinja"
     permission_required = "tasks.view_taskworkflowtemplate"
     paginate_by = 20
     filterset_class = WorkflowTemplateFilter
+    sort_by_fields = ["created_at", "updated_at"]
+
+    def get_context_data(self, **kwargs):
+        context_data = super().get_context_data(**kwargs)
+        context_data["datetime_format"] = settings.DATETIME_FORMAT
 
     def get_queryset(self):
         queryset = TaskWorkflowTemplate.objects.all()
+        ordering = self.get_ordering()
+        if ordering:
+            ordering = (ordering,)
+            queryset = queryset.order_by(*ordering)
         return queryset