1 files changed, 51 insertions, 3 deletions
diff --git a/Omni/Jr/Web.hs b/Omni/Jr/Web.hs
index 28f42a2..d117169 100644
--- a/Omni/Jr/Web.hs
+++ b/Omni/Jr/Web.hs
@@ -21,6 +21,7 @@ import qualified Data.List as List
 import qualified Data.Text as Text
 import qualified Data.Text.Lazy as LazyText
 import qualified Data.Text.Lazy.Encoding as LazyText
+import Data.Time (UTCTime, defaultTimeLocale, formatTime)
 import qualified Lucid
 import qualified Network.Wai.Handler.Warp as Warp
 import qualified Omni.Jr.Web.Style as Style
@@ -74,7 +75,7 @@ newtype ReadyQueuePage = ReadyQueuePage [TaskCore.Task]
 data TaskListPage = TaskListPage [TaskCore.Task] TaskFilters
 
 data TaskDetailPage
-  = TaskDetailFound TaskCore.Task [TaskCore.Task]
+  = TaskDetailFound TaskCore.Task [TaskCore.Task] [TaskCore.TaskActivity]
   | TaskDetailNotFound Text
 
 data TaskReviewPage
@@ -271,7 +272,7 @@ instance Lucid.ToHtml TaskDetailPage where
             Lucid.code_ (Lucid.toHtml tid)
             " could not be found."
           Lucid.p_ [Lucid.class_ "back-link"] <| Lucid.a_ [Lucid.href_ "/tasks"] "← Back to Tasks"
-  toHtml (TaskDetailFound task allTasks) =
+  toHtml (TaskDetailFound task allTasks activities) =
     Lucid.doctypehtml_ <| do
       pageHead (TaskCore.taskId task <> " - Jr")
       Lucid.body_ <| do
@@ -342,6 +343,12 @@ instance Lucid.ToHtml TaskDetailPage where
                 Lucid.ul_ [Lucid.class_ "child-list"] <| do
                   traverse_ renderChild children
 
+          when (TaskCore.taskStatus task == TaskCore.InProgress && not (null activities)) <| do
+            Lucid.div_ [Lucid.class_ "activity-section"] <| do
+              Lucid.h3_ "Activity Timeline"
+              Lucid.div_ [Lucid.class_ "activity-timeline"] <| do
+                traverse_ renderActivity activities
+
           when (TaskCore.taskStatus task == TaskCore.Review) <| do
             Lucid.div_ [Lucid.class_ "review-link-section"] <| do
               Lucid.a_
@@ -387,6 +394,45 @@ instance Lucid.ToHtml TaskDetailPage where
           Lucid.span_ [Lucid.class_ "child-title"] <| Lucid.toHtml (" - " <> TaskCore.taskTitle child)
           Lucid.span_ [Lucid.class_ "child-status"] <| Lucid.toHtml (" [" <> tshow (TaskCore.taskStatus child) <> "]")
 
+      renderActivity :: (Monad m) => TaskCore.TaskActivity -> Lucid.HtmlT m ()
+      renderActivity act =
+        Lucid.div_ [Lucid.class_ ("activity-item " <> stageClass (TaskCore.activityStage act))] <| do
+          Lucid.div_ [Lucid.class_ "activity-icon"] (stageIcon (TaskCore.activityStage act))
+          Lucid.div_ [Lucid.class_ "activity-content"] <| do
+            Lucid.div_ [Lucid.class_ "activity-header"] <| do
+              Lucid.span_ [Lucid.class_ "activity-stage"] (Lucid.toHtml (tshow (TaskCore.activityStage act)))
+              Lucid.span_ [Lucid.class_ "activity-time"] (Lucid.toHtml (formatTimestamp (TaskCore.activityTimestamp act)))
+            case TaskCore.activityMessage act of
+              Nothing -> pure ()
+              Just msg -> Lucid.p_ [Lucid.class_ "activity-message"] (Lucid.toHtml msg)
+            case TaskCore.activityMetadata act of
+              Nothing -> pure ()
+              Just meta ->
+                Lucid.details_ [Lucid.class_ "activity-metadata"] <| do
+                  Lucid.summary_ "Metadata"
+                  Lucid.pre_ [Lucid.class_ "metadata-json"] (Lucid.toHtml meta)
+
+      stageClass :: TaskCore.ActivityStage -> Text
+      stageClass stage = case stage of
+        TaskCore.Claiming -> "stage-claiming"
+        TaskCore.Running -> "stage-running"
+        TaskCore.Reviewing -> "stage-reviewing"
+        TaskCore.Retrying -> "stage-retrying"
+        TaskCore.Completed -> "stage-completed"
+        TaskCore.Failed -> "stage-failed"
+
+      stageIcon :: (Monad m) => TaskCore.ActivityStage -> Lucid.HtmlT m ()
+      stageIcon stage = case stage of
+        TaskCore.Claiming -> "●"
+        TaskCore.Running -> "▶"
+        TaskCore.Reviewing -> "◎"
+        TaskCore.Retrying -> "↻"
+        TaskCore.Completed -> "✓"
+        TaskCore.Failed -> "✗"
+
+      formatTimestamp :: UTCTime -> Text
+      formatTimestamp = Text.pack <. formatTime defaultTimeLocale "%Y-%m-%d %H:%M:%S"
+
 instance Lucid.ToHtml TaskReviewPage where
   toHtmlRaw = Lucid.toHtml
   toHtml (ReviewPageNotFound tid) =
@@ -645,7 +691,9 @@ server =
       tasks <- liftIO TaskCore.loadTasks
       case TaskCore.findTask tid tasks of
         Nothing -> pure (TaskDetailNotFound tid)
-        Just task -> pure (TaskDetailFound task tasks)
+        Just task -> do
+          activities <- liftIO (TaskCore.getActivitiesForTask tid)
+          pure (TaskDetailFound task tasks activities)
 
     taskStatusHandler :: Text -> StatusForm -> Servant.Handler (Headers '[Header "Location" Text] NoContent)
     taskStatusHandler tid (StatusForm newStatus) = do