Merge pull request #17 from jake1164/feature/room-table-fields

Added Vault row / col and sort by that by default
jake1164 · Jan 2, 2025 · 78b0756 · 78b0756
2 parents ccf84e1 + 3e68a4c
commit 78b0756
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/ShelterViewer.Shared/Pages/Rooms.razor b/ShelterViewer.Shared/Pages/Rooms.razor
@@ -9,7 +9,13 @@
 
 <MudDataGrid T="Room" Items="RoomList" Filterable="true">
     <Columns>
-        <PropertyColumn Property="x => x.Name" Title="Name" />
+        <PropertyColumn Property="x => x.Name" Title="Room Name"/>
+        <TemplateColumn T="Room" Title="Vault Level / Position" Sortable="true" InitialDirection="SortDirection.Ascending" SortBy="x => x.row * 1000 + x.col">
+            <CellTemplate>
+                <span>@context.Item.row / @context.Item.col</span>
+            </CellTemplate>
+        </TemplateColumn>
+
         <PropertyColumn Property="x => x.Trait" Title="Room trait" />
         <PropertyColumn Property="x => x.level" Title="Room Level" />
         <PropertyColumn Property="x => x.mergeLevel" Title="Merge Level" />
@@ -55,20 +61,22 @@
     List<Room> RoomList { get; set; } = new();
     Room? selectedRoom;
     string[] speedRooms =
-    { 
-        "Cafeteria", "WaterPlant", "Geothermal", "Energy2", 
-        "Water2", "NukaCola", "MedBay", "ScienceLab", "Radio", 
+    {
+        "Cafeteria", "WaterPlant", "Geothermal", "Energy2",
+        "Water2", "NukaCola", "MedBay", "ScienceLab", "Radio",
         "BarberShop", "Hydroponic"
     };
+
     protected override void OnInitialized()
     {
         if (VaultService.IsVaultEmpty())
         {
             NavigationManager.NavigateTo("/");
         }
 
-        RoomList = VaultService.Rooms;
+        RoomList = VaultService.Rooms.OrderBy(r => r.row).ThenBy(r => r.col).ToList();
     }
+
     private Task ShowRoom(Room selected)
     {
         selectedRoom = selected;