diff --git a/ComputerShopImplementerApp/Views/Home/ReportOrdersAssembliesToFile.cshtml b/ComputerShopImplementerApp/Views/Home/ReportOrdersAssembliesToFile.cshtml
new file mode 100644
index 0000000..b9896cf
--- /dev/null
+++ b/ComputerShopImplementerApp/Views/Home/ReportOrdersAssembliesToFile.cshtml
@@ -0,0 +1,66 @@
+@using ComputerShopContracts.ViewModels
+@{
+ ViewData["Title"] = "Create report with assemblies by orders";
+}
+
+
+
+@* *@
\ No newline at end of file
diff --git a/ComputerShopImplementerApp/Views/Shared/_Layout.cshtml b/ComputerShopImplementerApp/Views/Shared/_Layout.cshtml
index 415e4fa..88b0f27 100644
--- a/ComputerShopImplementerApp/Views/Shared/_Layout.cshtml
+++ b/ComputerShopImplementerApp/Views/Shared/_Layout.cshtml
@@ -3,7 +3,7 @@
-
@ViewData["Title"] - GarmentFactoryClientApp
+
@ViewData["Title"] - ComputerShopImplementerApp
@@ -32,6 +32,16 @@
Заявки
+
+
+ @* !!!СЮДА ВСТАВИТЬ 2 ССЫЛКИ НА СТРАНИЦЫ С ПОЛУЧЕНИЕМ ОТЧЁТОВ *@
+
+ Отчёт по заказам в файле
+
+
+
+
+
Личные данные
diff --git a/ComputerShopRestApi/Controllers/OrderController.cs b/ComputerShopRestApi/Controllers/OrderController.cs
index cd4014a..c56d65f 100644
--- a/ComputerShopRestApi/Controllers/OrderController.cs
+++ b/ComputerShopRestApi/Controllers/OrderController.cs
@@ -16,10 +16,13 @@ namespace ComputerShopRestApi.Controllers
private readonly IOrderLogic _logic;
- public OrderController(IOrderLogic logic, ILogger
logger)
+ private readonly IReportImplementerLogic _reportLogic;
+
+ public OrderController(IOrderLogic logic, ILogger logger, IReportImplementerLogic reportLogic)
{
_logger = logger;
_logic = logic;
+ _reportLogic = reportLogic;
}
[HttpGet]
@@ -58,17 +61,45 @@ namespace ComputerShopRestApi.Controllers
}
}
- //МБ ИЗМЕНИТЬ IEnumerable на List
- //!!!ПОТОМ УДАЛИТЬ
- //[HttpGet]
- //public IEnumerable GetOrderStatuses()
- //{
- // // Получаем все значения из перечисления и возвращаем как список строк
- // var allStatuses = Enum.GetValues(typeof(OrderStatus)).Cast().Select(status => status.ToString());
- // return allStatuses;
- //}
+ [HttpPost]
+ public void CreateReportToWordFile(ReportBindingModel model)
+ {
+ try
+ {
+ _reportLogic.SaveReportOrderAssembliesToWordFile(model);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка создания отчета");
+ throw;
+ }
+ }
- [HttpPost]
+ [HttpPost]
+ public void CreateReportToExcelFile(ReportBindingModel model)
+ {
+ try
+ {
+ _reportLogic.SaveReportOrderAssembliesToExcelFile(model);
+ }
+ catch (Exception ex)
+ {
+ _logger.LogError(ex, "Ошибка создания отчета");
+ throw;
+ }
+ }
+
+ //МБ ИЗМЕНИТЬ IEnumerable на List
+ //!!!ПОТОМ УДАЛИТЬ
+ //[HttpGet]
+ //public IEnumerable GetOrderStatuses()
+ //{
+ // // Получаем все значения из перечисления и возвращаем как список строк
+ // var allStatuses = Enum.GetValues(typeof(OrderStatus)).Cast().Select(status => status.ToString());
+ // return allStatuses;
+ //}
+
+ [HttpPost]
public void CreateOrder(OrderBindingModel model)
{
try
diff --git a/ComputerShopRestApi/Controllers/RequestController.cs b/ComputerShopRestApi/Controllers/RequestController.cs
index da3e4da..ef282fd 100644
--- a/ComputerShopRestApi/Controllers/RequestController.cs
+++ b/ComputerShopRestApi/Controllers/RequestController.cs
@@ -74,11 +74,11 @@ namespace ComputerShopRestApi.Controllers
//параметры для удобного использования в swagger, потом скорее всего будет передаваться RequestBindingModel model
[HttpPost]
- public void ConnectRequestAssembly(int requestId, int assemblyId)
+ public void ConnectRequestAssembly(RequestBindingModel model)
{
try
{
- _logic.ConnectRequestAssembly(new RequestBindingModel { Id = requestId, AssemblyId = assemblyId });
+ _logic.ConnectRequestAssembly(model);
}
catch (Exception ex)
{
diff --git a/ComputerShopRestApi/Program.cs b/ComputerShopRestApi/Program.cs
index a956d72..0112c74 100644
--- a/ComputerShopRestApi/Program.cs
+++ b/ComputerShopRestApi/Program.cs
@@ -4,6 +4,8 @@ using ComputerShopContracts.StorageContracts;
using ComputerShopDatabaseImplement.Implements;
using ComputerShopDatabaseImplement.Models;
using ComputerShopDataModels.Models;
+using GarmentFactoryBusinessLogic.OfficePackage;
+using GarmentFactoryBusinessLogic.OfficePackage.Implements;
using Microsoft.OpenApi.Models;
var Builder = WebApplication.CreateBuilder(args);
@@ -31,8 +33,12 @@ Builder.Services.AddTransient();
Builder.Services.AddTransient();
Builder.Services.AddTransient();
+Builder.Services.AddTransient();
Builder.Services.AddTransient();
+Builder.Services.AddTransient();
+Builder.Services.AddTransient();
+Builder.Services.AddTransient();
Builder.Services.AddControllers();
Builder.Services.AddEndpointsApiExplorer();