изменены главная форма и еще что-то для работы с отчетами

SushiBar/FormMain.Designer.cs

@@ -32,6 +32,10 @@
             ToolStripMenuItemRef = new ToolStripMenuItem();
             компонентыToolStripMenuItem = new ToolStripMenuItem();
             сушиToolStripMenuItem = new ToolStripMenuItem();
+            отчетыToolStripMenuItem = new ToolStripMenuItem();
+            списокКомпонентовToolStripMenuItem = new ToolStripMenuItem();
+            компонентыПоИзделиямToolStripMenuItem = new ToolStripMenuItem();
+            списокЗаказовToolStripMenuItem = new ToolStripMenuItem();
             dataGridView = new DataGridView();
             buttonCreateOrder = new Button();
             buttonTakeOrderInWork = new Button();
@@ -45,7 +49,7 @@
             // menuStrip1
             // 
             menuStrip1.ImageScalingSize = new Size(20, 20);
-            menuStrip1.Items.AddRange(new ToolStripItem[] { ToolStripMenuItemRef });
+            menuStrip1.Items.AddRange(new ToolStripItem[] { ToolStripMenuItemRef, отчетыToolStripMenuItem });
             menuStrip1.Location = new Point(0, 0);
             menuStrip1.Name = "menuStrip1";
             menuStrip1.Size = new Size(1140, 28);
@@ -73,6 +77,34 @@
             сушиToolStripMenuItem.Text = "Суши";
             сушиToolStripMenuItem.Click += сушиToolStripMenuItem_Click;
             // 
+            // отчетыToolStripMenuItem
+            // 
+            отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокКомпонентовToolStripMenuItem, компонентыПоИзделиямToolStripMenuItem, списокЗаказовToolStripMenuItem });
+            отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
+            отчетыToolStripMenuItem.Size = new Size(73, 24);
+            отчетыToolStripMenuItem.Text = "Отчеты";
+            // 
+            // списокКомпонентовToolStripMenuItem
+            // 
+            списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem";
+            списокКомпонентовToolStripMenuItem.Size = new Size(276, 26);
+            списокКомпонентовToolStripMenuItem.Text = "Список компонентов";
+            списокКомпонентовToolStripMenuItem.Click += списокКомпонентовToolStripMenuItem_Click;
+            // 
+            // компонентыПоИзделиямToolStripMenuItem
+            // 
+            компонентыПоИзделиямToolStripMenuItem.Name = "компонентыПоИзделиямToolStripMenuItem";
+            компонентыПоИзделиямToolStripMenuItem.Size = new Size(276, 26);
+            компонентыПоИзделиямToolStripMenuItem.Text = "Компоненты по изделиям";
+            компонентыПоИзделиямToolStripMenuItem.Click += компонентыПоИзделиямToolStripMenuItem_Click;
+            // 
+            // списокЗаказовToolStripMenuItem
+            // 
+            списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem";
+            списокЗаказовToolStripMenuItem.Size = new Size(276, 26);
+            списокЗаказовToolStripMenuItem.Text = "Список заказов";
+            списокЗаказовToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click;
+            // 
             // dataGridView
             // 
             dataGridView.BackgroundColor = Color.White;
@@ -170,5 +202,9 @@
         private Button buttonRefreshOrders;
         private ToolStripMenuItem компонентыToolStripMenuItem;
         private ToolStripMenuItem сушиToolStripMenuItem;
+        private ToolStripMenuItem отчетыToolStripMenuItem;
+        private ToolStripMenuItem списокКомпонентовToolStripMenuItem;
+        private ToolStripMenuItem компонентыПоИзделиямToolStripMenuItem;
+        private ToolStripMenuItem списокЗаказовToolStripMenuItem;
     }
 }

SushiBar/FormMain.cs

@@ -2,6 +2,7 @@
 using SushiBar;
 using SushiBarContracts.BindingModel;
 using SushiBarContracts.BusinessLogicsContracts;
+using SushiBarView.Reports;
 
 namespace SushiBarView
 {
@@ -9,11 +10,13 @@ namespace SushiBarView
     {
         private readonly ILogger _logger;
         private readonly IOrderLogic _orderLogic;
-        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic)
+        private readonly IReportLogic _reportLogic;
+        public FormMain(ILogger<FormMain> logger, IOrderLogic orderLogic, IReportLogic reportLogic)
         {
             InitializeComponent();
             _logger = logger;
             _orderLogic = orderLogic;
+            _reportLogic = reportLogic;
         }
         private void FormMain_Load(object sender, EventArgs e)
         {
@@ -52,7 +55,7 @@ namespace SushiBarView
         private void сушиToolStripMenuItem_Click(object sender, EventArgs e)
         {
             var service = Program.ServiceProvider?.GetService(typeof(FormSushis));
-            if(service is FormSushis formSushis) { formSushis.ShowDialog(); }
+            if (service is FormSushis formSushis) { formSushis.ShowDialog(); }
         }
 
         private void buttonCreateOrder_Click(object sender, EventArgs e)
@@ -140,6 +143,36 @@ namespace SushiBarView
             LoadData();
         }
 
+        private void списокКомпонентовToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                _reportLogic.SaveComponentsToWordFile(new ReportBindingModel
+                {
+                    FileName = dialog.FileName
+                });
+                MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+        }
+
+        private void компонентыПоИзделиямToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportSushiComponent));
+            if (service is FormReportSushiComponent form)
+            {
+                form.ShowDialog();
+            }
+        }
+
+        private void списокЗаказовToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders));
+            if (service is FormReportOrders form)
+            {
+                form.ShowDialog();
+            }
 
         }
+    }
 }

SushiBar/FormMain.resx

@@ -121,6 +121,6 @@
     <value>17, 17</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
+    <value>146</value>
   </metadata>
 </root>

SushiBar/Program.cs

@@ -1,11 +1,13 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NLog.Extensions.Logging;
+using SushiBarBusinessLogic;
 using SushiBarBusinessLogic.BusinessLogic;
 using SushiBarContracts.BusinessLogicsContracts;
 using SushiBarContracts.StoragesContracts;
 using SushiBarDatabaseImplement.Implements;
 using SushiBarView;
+using SushiBarView.Reports;
 
 namespace SushiBar
 {
@@ -40,9 +42,12 @@ namespace SushiBar
             services.AddTransient<IComponentStorage, ComponentStorage>();
             services.AddTransient<IOrderStorage, OrderStorage>();
             services.AddTransient<ISushiStorage, SushiStorage>();
+
             services.AddTransient<IComponentLogic, ComponentLogic>();
             services.AddTransient<IOrderLogic, OrderLogic>();
             services.AddTransient<ISushiLogic, SushiLogic>();
+            services.AddTransient<IReportLogic, ReportLogic>();
+
             services.AddTransient<FormMain>();
             services.AddTransient<FormComponent>();
             services.AddTransient<FormComponents>();
@@ -50,6 +55,9 @@ namespace SushiBar
             services.AddTransient<FormSushi>();
             services.AddTransient<FormSushiComponent>();
             services.AddTransient<FormSushis>();
+            services.AddTransient<FormReportOrders>();
+            services.AddTransient<FormReportSushiComponent>();
+
         }
     }
 }

SushiBar/SushiBarView.csproj

@@ -9,6 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@@ -18,6 +19,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
     <PackageReference Include="NLog.Extensions.Logging" Version="5.3.8" />
+    <PackageReference Include="ReportViewerCore.WinForms" Version="15.1.19" />
   </ItemGroup>
 
   <ItemGroup>

SushiBarBusinessLogic/Reportlogic.cs

@@ -53,9 +53,8 @@ namespace SushiBarBusinessLogic
                 {
                     if (sushi.SushiComponents.ContainsKey(component.Id))
                     {
-                        record.Sushis.Add((sushi.SushiName, sushi.SushiComponents[component.Id].Item2));
+                        record.Sushis.Add(new (sushi.SushiName, sushi.SushiComponents[component.Id].Item2));
-                        record.TotalCount +=
+                        record.TotalCount += sushi.SushiComponents[component.Id].Item2;
-                       sushi.SushiComponents[component.Id].Item2;
                     }
                 }
                 list.Add(record);

SushiBarDatabaseImplement/Implements/OrderStorage.cs

@@ -17,12 +17,15 @@ namespace SushiBarDatabaseImplement.Implements
 
         public List<OrderViewModel> GetFilteredList(OrderSearchModel model)
         {
-            if(!model.Id.HasValue)
+            if (!model.Id.HasValue && !model.DateTo.HasValue && !model.DateFrom.HasValue)
             {
                 return new();
             }
             using var context = new SushiBarDatabase();
+            if (model.Id.HasValue)
                 return context.Orders.Where(x => x.Id == model.Id).Select(x => AccessViewModel(x.GetViewModel)).ToList();
+            else
+                return context.Orders.Where(x => x.DateCreate >= model.DateFrom && x.DateCreate <= model.DateTo).Select(x => AccessViewModel(x.GetViewModel)).ToList();
         }
         public OrderViewModel? GetElement(OrderSearchModel model)
         {