diff --git a/HardwareShop/HardwareShopClientApp/Program.cs b/HardwareShop/HardwareShopClientApp/Program.cs index e3ee9ec..9ff3bc8 100644 --- a/HardwareShop/HardwareShopClientApp/Program.cs +++ b/HardwareShop/HardwareShopClientApp/Program.cs @@ -1,4 +1,4 @@ -/*using HardwareShopClientApp; +using HardwareShopClientApp; var builder = WebApplication.CreateBuilder(args); @@ -27,27 +27,3 @@ app.MapControllerRoute( pattern: "{controller=Home}/{action=Index}/{id?}"); app.Run(); -*/ -using HardwareShopBusinessLogic.BusinessLogics.Storekeeper; -using HardwareShopDatabaseImplement.Implements.Storekeeper; - -ComponentStorage _componentStorage = new(); - -ReportStorekeeperLogic reportLogic = new(_componentStorage); - -var reportRecords = reportLogic.GetComponents(new() { Id = 1 }, -new() { DateFrom = DateTime.MinValue, DateTo = DateTime.Now }); - -Console.WriteLine("start"); -Console.WriteLine(reportRecords.Count); -foreach (var reportRecord in reportRecords) -{ - Console.WriteLine("components: " + reportRecord.ComponentName); - Console.WriteLine("> good/build: "); - for (int i = 0; i < reportRecord.GoodOrBuilds.Count; i++) - { - Console.WriteLine(i + 1 + ". " + reportRecord.GoodOrBuilds[i].Item1 - + ". Count - " + reportRecord.GoodOrBuilds[i].Item2); - } - Console.WriteLine(" - " + reportRecord.TotalCount); -} \ No newline at end of file diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Components.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Components.cshtml index cc7c175..7fc0af3 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Components.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Components.cshtml @@ -25,6 +25,9 @@ Цена + + Дата приобретения + @@ -49,6 +52,10 @@ +
+ + +
+
+ + +
diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Goods.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Goods.cshtml index 1db1d9d..1deeb96 100644 --- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Goods.cshtml +++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/Goods.cshtml @@ -23,9 +23,6 @@ Цена - - Комплектующие -