diff --git a/.idea/.idea.TRPZ_PrintService/.idea/workspace.xml b/.idea/.idea.TRPZ_PrintService/.idea/workspace.xml
index d75215f..34a3d78 100644
--- a/.idea/.idea.TRPZ_PrintService/.idea/workspace.xml
+++ b/.idea/.idea.TRPZ_PrintService/.idea/workspace.xml
@@ -1,66 +1,22 @@
+
+
+
TRPZ_PrintService/TRPZ_PrintService.csproj
WebApplication1/WebApplication1.csproj
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
@@ -68,22 +24,20 @@
+
+
-
-
-
-
-
-
-
-
@@ -106,15 +60,11 @@
-
-
-
-
@@ -124,6 +74,10 @@
+
+
+
+
@@ -144,7 +98,7 @@
-
+
@@ -221,6 +175,7 @@
+
1608600173009
@@ -263,7 +218,19 @@
@@ -279,10 +246,32 @@
+
+
+
+ file://$PROJECT_DIR$/TRPZ_PrintService/Pages/MyOrders.cshtml
+ 67
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.vs/TRPZ_PrintService/DesignTimeBuild/.dtbcache.v2 b/.vs/TRPZ_PrintService/DesignTimeBuild/.dtbcache.v2
index f3bfebc..f985a6e 100644
Binary files a/.vs/TRPZ_PrintService/DesignTimeBuild/.dtbcache.v2 and b/.vs/TRPZ_PrintService/DesignTimeBuild/.dtbcache.v2 differ
diff --git a/.vs/TRPZ_PrintService/v16/.suo b/.vs/TRPZ_PrintService/v16/.suo
index 4e97422..5e3dbba 100644
Binary files a/.vs/TRPZ_PrintService/v16/.suo and b/.vs/TRPZ_PrintService/v16/.suo differ
diff --git a/TRPZ_PrintService/Pages/EditMIO.cshtml b/TRPZ_PrintService/Pages/EditMIO.cshtml
index 82a66ec..d1a950f 100644
--- a/TRPZ_PrintService/Pages/EditMIO.cshtml
+++ b/TRPZ_PrintService/Pages/EditMIO.cshtml
@@ -18,11 +18,11 @@
-
+
-
+
@@ -30,7 +30,7 @@
-
+
diff --git a/TRPZ_PrintService/Pages/ManageOrders.cshtml b/TRPZ_PrintService/Pages/ManageOrders.cshtml
index 7ad6cb0..b5eca70 100644
--- a/TRPZ_PrintService/Pages/ManageOrders.cshtml
+++ b/TRPZ_PrintService/Pages/ManageOrders.cshtml
@@ -18,6 +18,9 @@
Order Status
|
+
+ Price
+ |
Models
|
@@ -63,6 +66,9 @@
throw new ArgumentOutOfRangeException();
}
+
+ @Html.DisplayFor(modelItem => order.PriceTotal)
+ |
@Html.DisplayFor(modelItem => order.Models.Count)
diff --git a/TRPZ_PrintService/Pages/ManageOrders.cshtml.cs b/TRPZ_PrintService/Pages/ManageOrders.cshtml.cs
index 81f5408..d8bad24 100644
--- a/TRPZ_PrintService/Pages/ManageOrders.cshtml.cs
+++ b/TRPZ_PrintService/Pages/ManageOrders.cshtml.cs
@@ -30,6 +30,7 @@ public async Task 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 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();
diff --git a/TRPZ_PrintService/Pages/MyOrders.cshtml.cs b/TRPZ_PrintService/Pages/MyOrders.cshtml.cs
index 1882233..127ddba 100644
--- a/TRPZ_PrintService/Pages/MyOrders.cshtml.cs
+++ b/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();
|