SushiBar/SushiBar/Forms/FormMain.Designer.cs

@@ -30,7 +30,7 @@
         {
             dataGridView = new DataGridView();
             menuStrip1 = new MenuStrip();
-            ToolStripMenuItem = new ToolStripMenuItem();
+            toolStripMenuItem = new ToolStripMenuItem();
             sushiToolStripMenuItem = new ToolStripMenuItem();
             componentsToolStripMenuItem = new ToolStripMenuItem();
             отчётыToolStripMenuItem = new ToolStripMenuItem();
@@ -61,7 +61,7 @@
             // menuStrip1
             // 
             menuStrip1.ImageScalingSize = new Size(20, 20);
-            menuStrip1.Items.AddRange(new ToolStripItem[] { ToolStripMenuItem, отчётыToolStripMenuItem });
+            menuStrip1.Items.AddRange(new ToolStripItem[] { toolStripMenuItem,  });
             menuStrip1.Location = new Point(0, 0);
             menuStrip1.Name = "menuStrip1";
             menuStrip1.Size = new Size(1190, 28);
@@ -181,5 +181,9 @@
         private ToolStripMenuItem toolStripMenuItem;
         private ToolStripMenuItem sushiToolStripMenuItem;
         private ToolStripMenuItem componentsToolStripMenuItem;
+        private ToolStripMenuItem отчётыToolStripMenuItem;
+        private ToolStripMenuItem sushisToolStripMenuItem;
+        private ToolStripMenuItem componentSushisToolStripMenuItem;
+        private ToolStripMenuItem ordersToolStripMenuItem;
     }
 }

SushiBar/SushiBar/Forms/FormMain.cs

@@ -133,20 +133,5 @@ namespace SushiBar.Forms
         {
             LoadData();
         }
-
-        private void componentSushisToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            ComponentSushisToolStripMenuItem_Click(sender, e);
-        }
-
-        private void ordersToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            OrdersToolStripMenuItem_Click(sender, e);
-        }
-
-        private void sushisToolStripMenuItem_Click(object sender, EventArgs e)
-        {
-            SushisToolStripMenuItem_Click(sender, e);
-        }
     }
 }

SushiBar/SushiBar/Forms/FormReportOrders.cs

@@ -1,25 +1,93 @@
-using System;
+using Microsoft.Extensions.Logging;
-using System.Collections.Generic;
+using Microsoft.Reporting.WinForms;
-using System.ComponentModel;
+using SushiBarContracts.BindingModels;
-using System.Data;
+using SushiBarContracts.BusinessLogicsContracts;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
 
 namespace SushiBar.Forms
 {
-    public partial class FormReportOrders
+    public partial class FormReportOrders : Form
     {
+        private readonly ReportViewer reportViewer;
+        private readonly ILogger _logger;
+        private readonly IReportLogic _logic;
+        public FormReportOrders(ILogger<FormReportOrders> logger, IReportLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+            reportViewer = new ReportViewer
+            {
+                Dock = DockStyle.Fill
+            };
+            reportViewer.LocalReport.LoadReportDefinition(
+                new FileStream("Report/ReportOrders.rdlc", FileMode.Open));
+            panelBody.Controls.Add(reportViewer);
+        }
         private void buttonMake_Click(object sender, EventArgs e)
         {
-            ButtonMake_Click(sender, e);
+            if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
+            {
+                MessageBox.Show("Дата начала должна быть меньше даты окончания",
+               "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            try
+            {
+                var dataSource = _logic.GetOrders(new ReportBindingModel
+                {
+                    DateFrom = dateTimePickerFrom.Value,
+                    DateTo = dateTimePickerTo.Value
+                });
+                var source = new ReportDataSource("DataSetOrders", dataSource);
+                reportViewer.LocalReport.DataSources.Clear();
+                reportViewer.LocalReport.DataSources.Add(source);
+                var parameters = new[] {
+                    new ReportParameter("ReportParameterPeriod",
+                    $"c{dateTimePickerFrom.Value.ToShortDateString()} по" +
+                    $" {dateTimePickerTo.Value.ToShortDateString()}") };
+                reportViewer.LocalReport.SetParameters(parameters);
+                reportViewer.RefreshReport();
+                _logger.LogInformation("Загрузка списка заказов на период {From}-{ To}",
+                    dateTimePickerFrom.Value.ToShortDateString(),
+                    dateTimePickerTo.Value.ToShortDateString());
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки списка заказов на период");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
         }
-
         private void buttonToPdf_Click(object sender, EventArgs e)
         {
-            ButtonToPdf_Click(sender, e);
+            if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
+            {
+                MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                return;
+            }
+            using var dialog = new SaveFileDialog
+            {
+                Filter = "pdf|*.pdf"
+            };
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
+                    _logic.SaveOrdersToPdfFile(new ReportBindingModel
+                    {
+                        FileName = dialog.FileName,
+                        DateFrom = dateTimePickerFrom.Value,
+                        DateTo = dateTimePickerTo.Value
+                    });
+                    _logger.LogInformation("Сохранение списка заказов на период { From}-{ To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
+                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Ошибка сохранения списка заказов на период");
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
         }
     }
 }

SushiBar/SushiBar/Forms/FormReportOrdersLogic.cs

@@ -1,93 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Microsoft.Reporting.WinForms;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-
-namespace SushiBar.Forms
-{
-    public partial class FormReportOrders : Form
-    {
-        private readonly ReportViewer reportViewer;
-        private readonly ILogger _logger;
-        private readonly IReportLogic _logic;
-        public FormReportOrders(ILogger<FormReportOrders> logger, IReportLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-            reportViewer = new ReportViewer
-            {
-                Dock = DockStyle.Fill
-            };
-            reportViewer.LocalReport.LoadReportDefinition(
-                new FileStream("Report/ReportOrders.rdlc", FileMode.Open));
-            panelBody.Controls.Add(reportViewer);
-        }
-        private void ButtonMake_Click(object sender, EventArgs e)
-        {
-            if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
-            {
-                MessageBox.Show("Дата начала должна быть меньше даты окончания",
-               "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            try
-            {
-                var dataSource = _logic.GetOrders(new ReportBindingModel
-                {
-                    DateFrom = dateTimePickerFrom.Value,
-                    DateTo = dateTimePickerTo.Value
-                });
-                var source = new ReportDataSource("DataSetOrders", dataSource);
-                reportViewer.LocalReport.DataSources.Clear();
-                reportViewer.LocalReport.DataSources.Add(source);
-                var parameters = new[] { 
-                    new ReportParameter("ReportParameterPeriod",
-                    $"c{dateTimePickerFrom.Value.ToShortDateString()} по" +
-                    $" {dateTimePickerTo.Value.ToShortDateString()}") };
-                reportViewer.LocalReport.SetParameters(parameters);
-                reportViewer.RefreshReport();
-                _logger.LogInformation("Загрузка списка заказов на период {From}-{ To}",
-                    dateTimePickerFrom.Value.ToShortDateString(),
-                    dateTimePickerTo.Value.ToShortDateString());
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка заказов на период");
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonToPdf_Click(object sender, EventArgs e)
-        {
-            if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date)
-            {
-                MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                return;
-            }
-            using var dialog = new SaveFileDialog
-            {
-                Filter = "pdf|*.pdf"
-            };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
-                    _logic.SaveOrdersToPdfFile(new ReportBindingModel
-                    {
-                        FileName = dialog.FileName,
-                        DateFrom = dateTimePickerFrom.Value,
-                        DateTo = dateTimePickerTo.Value
-                    });
-                    _logger.LogInformation("Сохранение списка заказов на период { From}-{ To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString());
-                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка сохранения списка заказов на период");
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-    }
-}

SushiBar/SushiBar/Forms/FormReportSushiComponents.cs

@@ -1,10 +1,79 @@
-namespace SushiBar.Forms
+using Microsoft.Extensions.Logging;
+using SushiBarContracts.BindingModels;
+using SushiBarContracts.BusinessLogicsContracts;
+using System.Windows.Forms;
+
+namespace SushiBar.Forms
 {
-    public partial class FormReportSushiComponents
+    public partial class FormReportSushiComponents : Form
     {
+        private readonly ILogger _logger;
+        private readonly IReportLogic _logic;
+        public FormReportSushiComponents(ILogger<FormReportSushiComponents>
+        logger, IReportLogic logic)
+        {
+            InitializeComponent();
+            _logger = logger;
+            _logic = logic;
+        }
+        private void FormReportSushiComponents_Load(object sender, EventArgs e)
+        {
+            try
+            {
+                var dict = _logic.GetSushiComponent();
+                if (dict != null)
+                {
+                    dataGridView.Rows.Clear();
+                    foreach (var elem in dict)
+                    {
+                        dataGridView.Rows.Add(new object[] {
+                            elem.SushiName, "", ""
+                        });
+                        foreach (var listElem in elem.Components)
+                        {
+                            dataGridView.Rows.Add(new object[] {
+                                "", listElem.Item1, listElem.Item2
+                            });
+                        }
+                        dataGridView.Rows.Add(new object[] {
+                            "Итого", "", elem.TotalCount
+                        });
+                        dataGridView.Rows.Add(Array.Empty<object>());
+                    }
+                }
+                _logger.LogInformation("Загрузка списка суши по компонентам");
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Ошибка загрузки списка изделий по компонентам");
+                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
         private void buttonSaveToExcel_Click(object sender, EventArgs e)
         {
-            ButtonSaveToExcel_Click(sender, e);
+            using var dialog = new SaveFileDialog
+            {
+                Filter = "xlsx|*.xlsx"
+            };
+            if (dialog.ShowDialog() == DialogResult.OK)
+            {
+                try
+                {
+                    _logic.SaveSushiComponentToExcelFile(new ReportBindingModel
+                    {
+                        FileName = dialog.FileName
+                    });
+                    _logger.LogInformation("Сохранение списка изделий по компонентам");
+
+                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+                catch (Exception ex)
+                {
+                    _logger.LogError(ex, "Ошибка сохранения списка изделий по компонентам");
+
+                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+            }
         }
     }
 }

SushiBar/SushiBar/Forms/FormReportSushiComponentsLogic.cs

@@ -1,79 +0,0 @@
-using Microsoft.Extensions.Logging;
-using SushiBarContracts.BindingModels;
-using SushiBarContracts.BusinessLogicsContracts;
-using System.Windows.Forms;
-
-namespace SushiBar.Forms
-{
-    public partial class FormReportSushiComponents : Form
-    {
-        private readonly ILogger _logger;
-        private readonly IReportLogic _logic;
-        public FormReportSushiComponents(ILogger<FormReportSushiComponents>
-        logger, IReportLogic logic)
-        {
-            InitializeComponent();
-            _logger = logger;
-            _logic = logic;
-        }
-        private void FormReportSushiComponents_Load(object sender, EventArgs e)
-        {
-            try
-            {
-                var dict = _logic.GetSushiComponent();
-                if (dict != null)
-                {
-                    dataGridView.Rows.Clear();
-                    foreach (var elem in dict)
-                    {
-                        dataGridView.Rows.Add(new object[] { 
-                            elem.SushiName, "", "" 
-                        });
-                        foreach (var listElem in elem.Components)
-                        {
-                            dataGridView.Rows.Add(new object[] { 
-                                "", listElem.Item1, listElem.Item2
-                            });
-                        }
-                        dataGridView.Rows.Add(new object[] {
-                            "Итого", "", elem.TotalCount
-                        });
-                        dataGridView.Rows.Add(Array.Empty<object>());
-                    }
-                }
-                _logger.LogInformation("Загрузка списка суши по компонентам");
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Ошибка загрузки списка изделий по компонентам");               
-                MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-        private void ButtonSaveToExcel_Click(object sender, EventArgs e)
-        {
-            using var dialog = new SaveFileDialog
-            {
-                Filter = "xlsx|*.xlsx"
-            };
-            if (dialog.ShowDialog() == DialogResult.OK)
-            {
-                try
-                {
-                    _logic.SaveSushiComponentToExcelFile(new ReportBindingModel
-                    {
-                        FileName = dialog.FileName
-                    });
-                    _logger.LogInformation("Сохранение списка изделий по компонентам");
-                   
-                    MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "Ошибка сохранения списка изделий по компонентам");
-                
-                    MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-        }
-    }
-}