wip

Author: cunla

scheduler/admin/task_admin.py

@@ -7,7 +7,7 @@
 from scheduler import tools
 from scheduler.models import TaskArg, TaskKwarg, Task
 from scheduler.settings import SCHEDULER_CONFIG, logger
-from scheduler.tools import get_job_executions_for_task
+from scheduler.tools import get_job_executions_for_task, TaskType
 
 
 class HiddenMixin(object):
@@ -56,9 +56,7 @@ class Media:
         "function_string",
         "is_scheduled",
         "queue",
-        "scheduled_time",
-        "interval_display",
-        "cron_string",
+        "task_schedule",
         "next_run",
         "successful_runs",
         "last_successful_run",
@@ -88,15 +86,15 @@ class Media:
         ),
         (
             None,
-            dict(fields=("scheduled_time",), classes=("tasktype-OnceTask",)),
+            dict(fields=("scheduled_time",), classes=("tasktype-OnceTaskType",)),
         ),
         (
             None,
-            dict(fields=("cron_string",), classes=("tasktype-CronTask",)),
+            dict(fields=("cron_string",), classes=("tasktype-CronTaskType",)),
         ),
         (
             None,
-            dict(fields=("interval", "interval_unit", "repeat"), classes=("tasktype-RepeatableTask",)),
+            dict(fields=("interval", "interval_unit", "repeat"), classes=("tasktype-RepeatableTaskType",)),
         ),
         (_("RQ Settings"), dict(fields=(("queue", "at_front"), "job_id"))),
         (
@@ -105,8 +103,19 @@ class Media:
         ),
     )
 
+    @admin.display(description="Schedule")
+    def task_schedule(self, o: Task) -> str:
+        if o.task_type == TaskType.ONCE.value:
+            return f"Run once: {o.scheduled_time:%Y-%m-%d %H:%M:%S}"
+        elif o.task_type == TaskType.CRON.value:
+            return f"Cron: {o.cron_string}"
+        elif o.task_type == TaskType.REPEATABLE.value:
+            if o.interval is None or o.interval_unit is None:
+                return ""
+            return "Repeatable: {} {}".format(o.interval, o.get_interval_unit_display())
+
     @admin.display(description="Next run")
-    def next_run(self, o: Task):
+    def next_run(self, o: Task) -> str:
         return tools.get_next_cron_time(o.cron_string)
 
     def change_view(self, request, object_id, form_url="", extra_context=None):

scheduler/models/task.py

@@ -394,11 +394,6 @@ def delete(self, **kwargs):
         self.unschedule()
         super(Task, self).delete(**kwargs)
 
-    def interval_display(self):
-        if self.interval is None or self.interval_unit is None:
-            return ""
-        return "{} {}".format(self.interval, self.get_interval_unit_display())
-
     def interval_seconds(self):
         kwargs = {
             self.interval_unit: self.interval,

scheduler/static/admin/js/select-fields.js

@@ -1,9 +1,9 @@
 (function ($) {
     $(function () {
         const tasktypes = {
-            "CronTask": $(".tasktype-CronTask"),
-            "RepeatableTask": $(".tasktype-RepeatableTask"),
-            "OnceTask": $(".tasktype-OnceTask"),
+            "CronTaskType": $(".tasktype-CronTaskType"),
+            "RepeatableTaskType": $(".tasktype-RepeatableTaskType"),
+            "OnceTaskType": $(".tasktype-OnceTaskType"),
         };
         var taskTypeField = $('#id_task_type');