Consolidate status markup.

Improved charting error reporting.
2017-02-24 10:44:13 -05:00
parent 61cbc942c1
commit 3ff815082a
12 changed files with 119 additions and 72 deletions
@@ -1,3 +1,36 @@
-@using LeafWeb.Core.Utility
-@model string
-<span class="status status-@Model.ToLower()">@Model.SplitCamelCase()</span>
+@using LeafWeb.Core.Entities
+@model LeafInput
+
+@if (Model.IsPending)
+{
+    <span class="text-nowrap">
+        <span class="text-muted" title="@Model.PendingPriority.ToString() Priority">
+            @Html.Partial("DisplayTemplates/PriorityIcon", Model.PendingPriority)
+        </span>
+        @Html.Partial("DisplayTemplates/_Status", Model.CurrentStatus.ToString())
+    </span>
+}
+else
+{
+    <span class="text-nowrap">
+        @if (Model.IsRunning)
+        {
+            <span title="Time in progress: @Model.TimeInProgress.ToRoundedReadableString()">
+            @Html.Partial("DisplayTemplates/_Status", Model.CurrentStatus.ToString())
+            </span>
+        }
+        else
+        {
+            @Html.Partial("DisplayTemplates/_Status", Model.CurrentStatus.ToString())
+        }
+        
+        @if (Model.OutputErrorMessage != null)
+        {
+            <i class="fa fa-warning text-danger" title="Generated Error Message"></i>
+        }
+        else if (Model.OutputWarningMessage != null)
+        {
+            <i class="fa fa-warning text-info" title="Generated Warning Message"></i>
+        }
+    </span>
+}