changes

TRPZ_PrintService/Pages/EditMIO.cshtml

@@ -18,19 +18,19 @@
         <input class="form-control" type="text" asp-for="Fmodel.Description"/><br/>
 
         <label>Material</label>
-        <select asp-for="Fmodel.MaterialId" asp-items="Model.Materials"></select>
+        <select class="form-control" asp-for="Fmodel.MaterialId" asp-items="Model.Materials"></select>
         <br/>
 
         <label>Printer</label>
-        <select asp-for="Fmodel.PrinterId" asp-items="Model.Printers"></select>
+        <select class="form-control" asp-for="Fmodel.PrinterId" asp-items="Model.Printers"></select>
         <br/>
 
         <label>Scale</label>
         <input class="form-control" type="text" asp-for="Fmodel.Scale"/>
         <br/>
 
         <label>Post-processing</label>
-        <select asp-for="Fmodel.PostProcessingId" asp-items="Model.PostProcessings"></select>
+        <select class="form-control" asp-for="Fmodel.PostProcessingId" asp-items="Model.PostProcessings"></select>
         <br/>
 
         <label>HasSolubleSupports</label>

TRPZ_PrintService/Pages/ManageOrders.cshtml

@@ -18,6 +18,9 @@
         <th>
             Order Status
         </th>
+        <th>
+            Price
+        </th>
         <th>
             Models
         </th>
@@ -63,6 +66,9 @@
                         throw new ArgumentOutOfRangeException();
                 }
             </td>
+            <td>
+                @Html.DisplayFor(modelItem => order.PriceTotal)
+            </td>
             <td>
                 @Html.DisplayFor(modelItem => order.Models.Count)
 

TRPZ_PrintService/Pages/ManageOrders.cshtml.cs

@@ -30,6 +30,7 @@ public async Task<IActionResult> OnGet(string? type)
                 Orders = await _context.Orders
                     .Include(order => order.Client)
                     .Include(order => order.Models)
+                    .ThenInclude(order => order.PostProcessing)
                     .Where(order => order.Status == Order.OrderStatus.Sent ||
                                     order.Status == Order.OrderStatus.Confirmed)
                     .OrderByDescending(order => order.Timestamp)
@@ -38,6 +39,7 @@ public async Task<IActionResult> OnGet(string? type)
                 Orders = await _context.Orders
                     .Include(order => order.Client)
                     .Include(order => order.Models)
+                    .ThenInclude(order => order.PostProcessing)
                     .Where(order => order.Status != Order.OrderStatus.NotSent)
                     .OrderByDescending(order => order.Timestamp)
                     .ToListAsync();

TRPZ_PrintService/Pages/MyOrders.cshtml.cs

@@ -27,6 +27,7 @@ public void OnGet(string? id)
 
             Orders = _context.Orders
                 .Include(order => order.Models)
+                .ThenInclude(order => order.PostProcessing)
                 .Where(order => order.Client.Id == id)
                 .OrderByDescending(order => order.Timestamp)
                 .ToList();