From db7f79ed81e8890c8f5debb0c9ea1bb9e6e449d1 Mon Sep 17 00:00:00 2001
From: dasha <amayashimizu89@gmail.com>
Date: Fri, 7 Apr 2023 01:56:19 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=B8=D0=BD=D0=B8=20=D0=B8=D0=B7=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HardwareShop/HardwareShopClientApp/Program.cs | 26 +------------------
 .../Views/Storekeeper/Components.cshtml       |  7 +++++
 .../Views/Storekeeper/CreateComponent.cshtml  |  4 +++
 .../Views/Storekeeper/Goods.cshtml            |  3 ---
 4 files changed, 12 insertions(+), 28 deletions(-)

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 @@
 				<th>
 					Цена
 				</th>
+				<th>
+					Дата приобретения
+				</th>
 			</tr>
 		</thead>
 		<tbody>
@@ -49,6 +52,10 @@
 						<label class="form-label">Стоимость</label>
 						<input type="number" step="0.01" class="form-control" name="cost" min="0.01">
 					</div>
+					<div class="col">
+						<label class="form-label">Дата приобретения</label>
+						<input type="date" class="form-control" name="date">
+					</div>
 				</div>
 				<div class="modal-footer">
 					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Закрыть</button>
diff --git a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateComponent.cshtml b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateComponent.cshtml
index 2064247..af2339b 100644
--- a/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateComponent.cshtml
+++ b/HardwareShop/HardwareShopClientApp/Views/Storekeeper/CreateComponent.cshtml
@@ -16,6 +16,10 @@
 		<label class="form-label">Стоимость</label>
 		<input type="number" step="0.01" class="form-control" name="cost" min="0.01">
 	</div>
+	<div class="col-sm-3">
+		<label class="form-label">Дата приобретения</label>
+		<input type="date" class="form-control" name="date">
+	</div>
 	<div class="col-sm-2 d-flex justify-content-evenly align-items-baseline">
 		<button type="submit" class="btn btn-primary mt-3 px-4">Сохранить</button>
 	</div>
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 @@
 				<th>
 					Цена
 				</th>
-				<th>
-					Комплектующие
-				</th>
 			</tr>
 		</thead>
 		<tbody>