Fix node sort order on dashboard

Signed-off-by: Dave Thaler <[email protected]>
orcasound · Oct 9, 2024 · 8aa3dd9 · 8aa3dd9
1 parent 89d979e
commit 8aa3dd9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/OrcanodeMonitor/Pages/Index.cshtml b/OrcanodeMonitor/Pages/Index.cshtml
@@ -11,8 +11,8 @@
     </p>
     <table>
         <tr>
-            <th>Location</th>
             <th>Type</th>
+            <th>Location</th>
             <!--
             <th>Latest recorded</th>
             <th>Latest uploaded</th>
@@ -33,12 +33,12 @@
     @foreach (Models.Orcanode item in Model.Nodes)
     {
         <tr>
-            <td title="@Html.DisplayFor(modelItem => item.DataplicityDescription)">
-                @Html.DisplayFor(modelItem => item.DisplayName)
-            </td>
             <td>
                 @Html.DisplayFor(modelItem => item.Type)
             </td>
+            <td title="@Html.DisplayFor(modelItem => item.DataplicityDescription)">
+                @Html.DisplayFor(modelItem => item.DisplayName)
+            </td>
             <!--
             <td>
                 @Html.DisplayFor(modelItem => item.LatestRecordedLocal)

diff --git a/OrcanodeMonitor/Pages/Index.cshtml.cs b/OrcanodeMonitor/Pages/Index.cshtml.cs
@@ -93,7 +93,8 @@ public async Task OnGetAsync()
             _nodes = nodes.Where(n => n.DataplicityConnectionStatus != OrcanodeOnlineStatus.Absent ||
                                           n.OrcasoundStatus != OrcanodeOnlineStatus.Absent ||
                                           n.S3StreamStatus != OrcanodeOnlineStatus.Absent)
-                              .OrderBy(n => n.DisplayName)
+                              .OrderByDescending(n => n.Type)
+                              .ThenBy(n => n.DisplayName)
                               .ToList();
         }
     }