From 6aa9a9e742750ce6679f609dad24ce148d4fcacc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=93=D0=BE=D1=80=D0=B4?=
 =?UTF-8?q?=D0=B5=D0=B5=D0=B2?= <89176335310x@gmail.com>
Date: Sat, 1 Jun 2024 01:46:04 +0400
Subject: [PATCH] =?UTF-8?q?=D0=AD=D1=82=D0=BE=20=D0=BF=D1=80=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D0=BE=20Jopa=20=D0=93=D0=B8=D1=82=20=D0=B2=D1=81=D1=91?=
 =?UTF-8?q?=20=D1=81=D0=BB=D0=BE=D0=BC=D0=B0=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HelperModels/ExcelInfoEmployee.cs         |  2 +-
 .../HelperModels/WordInfoClient.cs            |  2 +-
 .../HelperModels/WordInfoEmployee.cs          |  2 +-
 .../IReportClientLogic.cs                     |  6 ++--
 .../IReportEmployeeLogic.cs                   |  6 ++--
 .../ViewModels/ReportPaymeantsViewModel.cs    | 14 +++++---
 .../Views/Home/Report.cshtml                  | 36 +++++++++++++++++++
 7 files changed, 55 insertions(+), 13 deletions(-)
 create mode 100644 ElectronicsShop/ElectronicsShopShopClientApp/Views/Home/Report.cshtml

diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoEmployee.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoEmployee.cs
index 9e5b755..8cca808 100644
--- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoEmployee.cs
+++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/ExcelInfoEmployee.cs
@@ -8,6 +8,6 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels
 
         public string Title { get; set; } = string.Empty;
 
-        public List<ReportProductsViewModel> Products { get; set; } = new();
+        public List<ProductViewModel> Products { get; set; } = new();
     }
 }
diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoClient.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoClient.cs
index 101c841..d1d2430 100644
--- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoClient.cs
+++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoClient.cs
@@ -9,6 +9,6 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels
 
         public string Title { get; set; } = string.Empty;
 
-        public List<ReportPaymeantsViewModel> ListPaymeant { get; set; } = new();
+        public List<PaymeantViewModel> ListPaymeant { get; set; } = new();
     }
 }
diff --git a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoEmployee.cs b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoEmployee.cs
index ff98c64..5956264 100644
--- a/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoEmployee.cs
+++ b/ElectronicsShop/ElectronicsShopBusinessLogic/OfficePackage/HelperModels/WordInfoEmployee.cs
@@ -9,6 +9,6 @@ namespace ElectronicsShopBusinessLogic.OfficePackage.HelperModels
 
         public string Title { get; set; } = string.Empty;
 
-        public List<ReportProductsViewModel> ListProduct { get; set; } = new();
+        public List<ProductViewModel> ListProduct { get; set; } = new();
     }
 }
diff --git a/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportClientLogic.cs b/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportClientLogic.cs
index 4132e7f..7e439a4 100644
--- a/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportClientLogic.cs
+++ b/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportClientLogic.cs
@@ -10,8 +10,8 @@ namespace ElectronicsShopContracts.BusinessLogicContracts
 {
 	public interface IReportClientLogic
 	{
-		List<ReportPaymeantsViewModel> GetPaymeants(ReportPaymeantBindingModel model);
-		void SavePreservesToWordFile(ReportPaymeantBindingModel model);
-		void SavePreservesToExcelFile(ReportPaymeantBindingModel model);
+		List<ReportPaymeantsViewModel> GetPaymeants(ReportBindingModel model);
+		void SavePaymeantToWordFile(ReportBindingModel model);
+		void SavePaymeantToExcelFile(ReportBindingModel model);
 	}
 }
diff --git a/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportEmployeeLogic.cs b/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportEmployeeLogic.cs
index 4f58760..c584ce6 100644
--- a/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportEmployeeLogic.cs
+++ b/ElectronicsShop/ElectronicsShopContracts/BusinessLogicContracts/IReportEmployeeLogic.cs
@@ -10,8 +10,8 @@ namespace ElectronicsShopContracts.BusinessLogicContracts
 {
 	public interface IReportEmployeeLogic
 	{
-		List<ReportProductsViewModel> GetRoute(ReportProductBindingModel model);
-		void SaveRoutesToWordFile(ReportProductBindingModel model);
-		void SaveRoutesToExcelFile(ReportProductBindingModel model);
+		List<ReportProductsViewModel> GetProduct(ReportProductBindingModel model);
+		void SaveProductsToWordFile(ReportProductBindingModel model);
+		void SaveProductsToExcelFile(ReportProductBindingModel model);
 	}
 }
diff --git a/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportPaymeantsViewModel.cs b/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportPaymeantsViewModel.cs
index dca6f74..0c8a943 100644
--- a/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportPaymeantsViewModel.cs
+++ b/ElectronicsShop/ElectronicsShopContracts/ViewModels/ReportPaymeantsViewModel.cs
@@ -1,4 +1,5 @@
-using System;
+using ElectronicsShopDataModels.Enums;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,7 +9,12 @@ namespace ElectronicsShopContracts.ViewModels
 {
 	public class ReportPaymeantsViewModel
 	{
-		public string PaymeantName { get; set; } = string.Empty;
-		public List<PaymeantViewModel> PaymeantsList { get; set; } = new();
-	}
+        public int PaymeantID { get; set; }
+
+        public int ProductID { get; set; }
+
+        public int OrderID { get; set; }
+        public double SumPayment { get; set; }
+        public PaymeantOption PayOption { get; set; } = PaymeantOption.Неоплачено;
+    }
 }
diff --git a/ElectronicsShop/ElectronicsShopShopClientApp/Views/Home/Report.cshtml b/ElectronicsShop/ElectronicsShopShopClientApp/Views/Home/Report.cshtml
new file mode 100644
index 0000000..596e149
--- /dev/null
+++ b/ElectronicsShop/ElectronicsShopShopClientApp/Views/Home/Report.cshtml
@@ -0,0 +1,36 @@
+@{
+	ViewData["Title"] = "Report";
+}
+
+<div class="text-center">
+	<h2 class="display-4">Отчёты</h2>
+    <div class="list-group">
+        <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="ListPreserves">Списки оплат word</a>
+        <a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="AnimalVisitsAndDrugs">Заповедники и стоимость животных</a>
+    </div>
+</div>
+
+<form method="post">
+    <div class="align-content-center row mb-3">
+        <div class="col-sm-auto">
+            <label for="startDate">С:</label>
+        </div>
+        <div class="col-3">
+            <input name="startDate" id="startDate" class="form-control" type="date" />
+        </div>
+        <div class="col-sm-auto">
+            <label for="endDate">По:</label>
+        </div>
+        <div class="col-3">
+            <input name="endDate" id="endDate" class="form-control" type="date" />
+        </div>
+        <div class="col-2">
+            <input type="submit" name="getReport" class="btn btn-primary" value="Сформировать отчет" />
+        </div>
+        <div class="col-3">
+            <input type="submit" name="sendToMail" class="btn btn-primary" value="Отправить на почту" />
+        </div>
+    </div>
+</form>
+
+