правки

Atelier/Atelier/Forms/FormOrderReports.cs

@@ -1,29 +1,24 @@
 using Atelier.Reports;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using Unity;
 
-namespace Atelier.Forms;
+namespace Atelier.Forms
-
-public partial class FormOrderReports : Form
 {
+    public partial class FormOrderReports : Form
+    {
         private readonly IUnityContainer _container;
+
         public FormOrderReports(IUnityContainer container, IOrderRepository orderRepository, IModelRepository modelRepository)
         {
             InitializeComponent();
-        _container = container ??
+            _container = container ?? throw new ArgumentNullException(nameof(container));
-        throw new ArgumentNullException(nameof(container));
             comboBoxModel.DataSource = modelRepository.ReadModels();
             comboBoxModel.DisplayMember = "ModelType";
             comboBoxModel.ValueMember = "Id";
         }
+
         private void ButtonFile_Click(object sender, EventArgs e)
         {
             var sfd = new SaveFileDialog()
@@ -36,6 +31,7 @@ public partial class FormOrderReports : Form
             }
             textBoxFile.Text = sfd.FileName;
         }
+
         private void ButtonBuild_Click(object sender, EventArgs e)
         {
             try
@@ -46,32 +42,25 @@ public partial class FormOrderReports : Form
                 }
                 if (comboBoxModel.SelectedIndex < 0)
                 {
-                throw new Exception("Не выбран клиент");
+                    throw new Exception("Не выбрана модель");
                 }
                 if (dateTimePickerEnd.Value <= dateTimePickerStart.Value)
                 {
                     throw new Exception("Дата начала должна быть раньше даты окончания");
                 }
-            if
+                if (_container.Resolve<TableReport>().CreateTable(textBoxFile.Text, (int)comboBoxModel.SelectedValue!, dateTimePickerStart.Value, dateTimePickerEnd.Value))
-            (_container.Resolve<TableReport>().CreateTable(textBoxFile.Text,
-            (int)comboBoxModel.SelectedValue!, dateTimePickerStart.Value, dateTimePickerEnd.Value))
                 {
-                MessageBox.Show("Документ сформирован",
+                    MessageBox.Show("Документ сформирован", "Формирование документа", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                "Формирование документа",
-                MessageBoxButtons.OK,
-                MessageBoxIcon.Information);
                 }
                 else
                 {
-                MessageBox.Show("Возникли ошибки при формировании документа.Подробности в логах",
+                    MessageBox.Show("Возникли ошибки при формировании документа. Подробности в логах", "Формирование документа", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                "Формирование документа",
-                MessageBoxButtons.OK, MessageBoxIcon.Information);
                 }
             }
             catch (Exception ex)
             {
-            MessageBox.Show(ex.Message, "Ошибка при создании очета",
+                MessageBox.Show(ex.Message, "Ошибка при создании отчета", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
         }
     }
 }

Atelier/Atelier/Reports/DocReport.cs

@@ -3,17 +3,16 @@ using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
-namespace Atelier.Reports;
+namespace Atelier.Reports
-
-internal class DocReport
 {
+    internal class DocReport
+    {
         private readonly IClientRepository _clientRepository;
         private readonly IFabricRepository _fabricRepository;
         private readonly IModelRepository _modelRepository;
         private readonly ILogger<DocReport> _logger;
+
         public DocReport(IClientRepository clientRepository, IFabricRepository fabricRepository, IModelRepository modelRepository, ILogger<DocReport> logger)
         {
             _clientRepository = clientRepository ?? throw new ArgumentNullException(nameof(clientRepository));
@@ -21,6 +20,7 @@ internal class DocReport
             _modelRepository = modelRepository ?? throw new ArgumentNullException(nameof(modelRepository));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         }
+
         public bool CreateDoc(string filePath, bool includeClients, bool includeFabrics, bool includeModels)
         {
             try
@@ -30,17 +30,17 @@ internal class DocReport
                 if (includeClients)
                 {
                     builder.AddParagraph("Клиенты")
-                .AddTable([2400, 2400, 2400], GetClients());
+                        .AddTable(new[] { 2400, 2400, 2400 }, GetClients());
                 }
                 if (includeFabrics)
                 {
                     builder.AddParagraph("Ткани")
-                .AddTable([2400, 2400, 2400], GetFabrics());
+                        .AddTable(new[] { 2400, 2400, 2400 }, GetFabrics());
                 }
                 if (includeModels)
                 {
                     builder.AddParagraph("Модели")
-                .AddTable([2400, 2400, 1200, 1200], GetModels());
+                        .AddTable(new[] { 2400, 2400, 1200, 1200 }, GetModels());
                 }
                 builder.Build();
                 return true;
@@ -51,24 +51,37 @@ internal class DocReport
                 return false;
             }
         }
+
         private List<string[]> GetClients()
         {
-        return [
+            var clients = _clientRepository.ReadClients()
-        ["Имя", "Фамилия", "Контактные данные"],
+                .Select(x => new string[] { x.FirstName, x.LastName, x.ContactInformation })
-.. _clientRepository
+                .ToList();
-.ReadClients()
+
-.Select(x => new string[] { x.FirstName, x.LastName, x.ContactInformation }),
+            var result = new List<string[]>
-];
+            {
+                new[] { "Имя", "Фамилия", "Контактные данные" }
+            };
+
+            result.AddRange(clients);
+            return result;
         }
+
         private List<string[]> GetFabrics()
         {
-        return [
+            var fabrics = _fabricRepository.ReadFabrics()
-        ["Тип ткани", "Цвет", "Метраж"],
+                .Select(x => new string[] { x.FabricType.ToString(), x.Color.ToString(), x.Metrage.ToString() })
-.. _fabricRepository
+                .ToList();
-.ReadFabrics()
+
-.Select(x => new string[] { x.FabricType.ToString(), x.Color.ToString(), x.Metrage.ToString() }),
+            var result = new List<string[]>
-];
+            {
+                new[] { "Тип ткани", "Цвет", "Метраж" }
+            };
+
+            result.AddRange(fabrics);
+            return result;
         }
+
         private List<string[]> GetModels()
         {
             // Заголовок таблицы
@@ -103,4 +116,5 @@ internal class DocReport
 
             return result;
         }
+    }
 }

Atelier/Atelier/Reports/TableReport.cs

@@ -9,14 +9,14 @@ namespace Atelier.Reports
     internal class TableReport
     {
         private readonly IOrderRepository _orderRepository;
-        private readonly IStorageRepository _storageRepository;
+        private readonly IModelRepository _modelRepository;
         private readonly ILogger<TableReport> _logger;
-        internal static readonly string[] item = ["Клиент", "Дата", "Модель", "Количество"];
+        internal static readonly string[] item = ["Клиент", "Дата", "Модель", "Статус", "Новые заказы", "Заказы в работе", "Выполненные заказы"];
 
-        public TableReport(IOrderRepository orderRepository, IStorageRepository storageRepository, ILogger<TableReport> logger)
+        public TableReport(IOrderRepository orderRepository, IModelRepository modelRepository, ILogger<TableReport> logger)
         {
             _orderRepository = orderRepository ?? throw new ArgumentNullException(nameof(orderRepository));
-            _storageRepository = storageRepository ?? throw new ArgumentNullException(nameof(storageRepository));
+            _modelRepository = modelRepository ?? throw new ArgumentNullException(nameof(modelRepository));
             _logger = logger ?? throw new ArgumentNullException(nameof(logger));
         }
 
@@ -27,7 +27,7 @@ namespace Atelier.Reports
                 new ExcelBuilder(filePath)
                     .AddHeader("Сводка по заказам", 0, 4)
                     .AddParagraph("за период", 0)
-                    .AddTable(new[] { 15, 15, 20, 15 }, GetData(modelId, startDate, endDate))
+                    .AddTable(new[] { 15, 15, 15, 15, 15, 15, 15 }, GetData(modelId, startDate, endDate))
                     .Build();
                 return true;
             }
@@ -40,27 +40,34 @@ namespace Atelier.Reports
 
         private List<string[]> GetData(int modelId, DateTime startDate, DateTime endDate)
         {
-            var orderData = _orderRepository
+            var orders = _orderRepository
-                .ReadOrders()
+                .ReadOrders(modelId, startDate, endDate)
-                .Where(x => x.Date >= startDate && x.Date <= endDate && x.ModelOrder.Any(y => y.ModelId == modelId))
+                .ToList();
-                .SelectMany(x => x.ModelOrder, (order, modelOrder) => new { order.ClientId, order.Date, modelOrder.ModelId, modelOrder.Count })
-                .OrderBy(x => x.Date);
 
-            var storageData = _storageRepository
+            _logger.LogDebug("Orders: {Orders}", JsonConvert.SerializeObject(orders));
-                .ReadStorage()
-                .Where(x => x.DateStorage >= startDate && x.DateStorage <= endDate)
-                .Select(x => new { x.FabricId, x.DateStorage, x.StockMetrage })
-                .OrderBy(x => x.DateStorage);
-
-            _logger.LogDebug("Order Data: {OrderData}", JsonConvert.SerializeObject(orderData));
-            _logger.LogDebug("Storage Data: {StorageData}", JsonConvert.SerializeObject(storageData));
 
             var result = new List<string[]>() { item };
 
-            result.AddRange(orderData.Select(x => new string[] { x.ClientId.ToString(), x.Date.ToString("yyyy-MM-dd"), x.ModelId.ToString(), x.Count.ToString() }));
+            var newOrdersCount = 0;
-            result.AddRange(storageData.Select(x => new string[] { "", x.DateStorage.ToString("yyyy-MM-dd"), x.FabricId.ToString(), x.StockMetrage.ToString() }));
+            var inProcessOrdersCount = 0;
+            var doneOrdersCount = 0;
 
-            result.Add(new[] { "Всего", "", "", (orderData.Sum(x => x.Count) + storageData.Sum(x => x.StockMetrage)).ToString() });
+            foreach (var order in orders)
+            {
+                var model = _modelRepository.ReadModelById(modelId);
+                var modelName = model?.ModelType.ToString() ?? "Неизвестно";
+                var newOrder = order.Status == Status.Waiting ? "1" : "0";
+                var inProcessOrder = order.Status == Status.InProcess ? "1" : "0";
+                var doneOrder = order.Status == Status.Done ? "1" : "0";
+
+                result.Add(new string[] { order.ClientId.ToString(), order.Date.ToString("yyyy-MM-dd"), modelName, order.Status.ToString(), newOrder, inProcessOrder, doneOrder });
+
+                if (order.Status == Status.Waiting) newOrdersCount++;
+                if (order.Status == Status.InProcess) inProcessOrdersCount++;
+                if (order.Status == Status.Done) doneOrdersCount++;
+            }
+
+            result.Add(new[] { "Всего", "", "", "", newOrdersCount.ToString(), inProcessOrdersCount.ToString(), doneOrdersCount.ToString() });
 
             return result;
         }

Atelier/Atelier/Repositories/Implementations/OrderRepository.cs

@@ -75,26 +75,69 @@ WHERE Id=@id";
         }
 
     }
-    public IEnumerable<Order> ReadOrders(int? id = null, DateTime?dateForm = null, DateTime? dateTo = null,
+
-        Status? status = null, int? clientId = null)
+
+    public IEnumerable<Order> ReadOrders(int? modelId = null, DateTime? startDate = null, DateTime? endDate = null, Status? status = null, int? clientId = null)
     {
         _logger.LogInformation("Получение всех объектов");
         try
         {
-            using var connection = new
+            using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            NpgsqlConnection(_connectionString.ConnectionString);
+            var querySelect = @"
-            var querySelect = @"SELECT * FROM Orders";
+                SELECT o.Id, o.Date, o.Status, o.ClientId, m.ModelId, m.Count, m.OrderId
-            var orders =
+                FROM Orders o
-            connection.Query<Order>(querySelect);
+                LEFT JOIN ModelOrder m ON o.Id = m.OrderId";
-            _logger.LogDebug("Полученные объекты: {json}",
+
-            JsonConvert.SerializeObject(orders));
+            var parameters = new DynamicParameters();
+            if (modelId.HasValue)
+            {
+                querySelect += " WHERE m.ModelId = @ModelId";
+                parameters.Add("@ModelId", modelId.Value);
+            }
+            if (startDate.HasValue)
+            {
+                querySelect += " AND o.Date >= @StartDate";
+                parameters.Add("@StartDate", startDate.Value);
+            }
+            if (endDate.HasValue)
+            {
+                querySelect += " AND o.Date <= @EndDate";
+                parameters.Add("@EndDate", endDate.Value);
+            }
+            if (status.HasValue)
+            {
+                querySelect += " AND o.Status = @Status";
+                parameters.Add("@Status", status.Value);
+            }
+            if (clientId.HasValue)
+            {
+                querySelect += " AND o.ClientId = @ClientId";
+                parameters.Add("@ClientId", clientId.Value);
+            }
+
+            var orders = connection.Query<Order, ModelOrder, Order>(
+                querySelect,
+                (order, modelOrder) =>
+                {
+                    var newOrder = Order.CreateOperation(order.Id, order.Date, order.Status, order.ClientId, new List<ModelOrder>());
+                    if (modelOrder != null)
+                    {
+                        var modelOrders = new List<ModelOrder>(newOrder.ModelOrder);
+                        modelOrders.Add(modelOrder);
+                        newOrder = Order.CreateOperation(order.Id, order.Date, order.Status, order.ClientId, modelOrders);
+                    }
+                    return newOrder;
+                },
+                param: parameters,
+                splitOn: "OrderId").ToList();
+
+            _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(orders));
             return orders;
         }
         catch (Exception ex)
         {
-            _logger.LogError(ex, "Ошибка при чтении объектов");
+            _logger.LogError(ex, "Ошибка при чтении данных о заказах");
             throw;
         }
-
     }
 }