Tasklist

Webreaper · Nov 8, 2021 · 982ebba · 982ebba
1 parent d6999da
commit 982ebba
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/Damselfly.Web/Shared/TaskList.razor b/Damselfly.Web/Shared/TaskList.razor
@@ -20,8 +20,8 @@
                 {
                     <tr>
                         <td>@task.Type.ToString()</td>
-                        <td>@task.LastStarted.ToHumanReadableString(now) ago</td>
-                        <td>@task.LastCompleted.ToHumanReadableString(now) ago</td>
+                        <td>@ElapsedString( task.LastStarted )</td>
+                        <td>@ElapsedString( task.LastCompleted )</td>
                         <td>@GetTimeTaken(task)</td>
                         <td>In @now.ToHumanReadableString(task.NextRun)</td>
                         <td align="center"><button class="btn btn-primary" type="submit" @onclick="@(() => RunTask(task))">Run</button></td>
@@ -40,12 +40,24 @@
     ScheduledTask[] tasks;
     private DateTime now = DateTime.UtcNow;
 
+    private string ElapsedString( DateTime dateTime )
+    {
+        if (dateTime < new DateTime(1990, 1, 1))
+            return "Never";
+
+        var diff = (dateTime - now);
+
+        return dateTime.ToHumanReadableString(now) + " ago";
+    }
+
     private string GetTimeTaken(ScheduledTask task)
     {
+        if (task.LastCompleted < new DateTime(1990, 1, 1))
+            return "N/A";
+
         if (task.LastStarted > task.LastCompleted)
         {
-            var running = DateTime.UtcNow.ToHumanReadableString(task.LastStarted);
-            return $"Running for {running}";
+            return DateTime.UtcNow.ToHumanReadableString(task.LastStarted);
         }
         else
         {