diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs
index 9a04e3d..38456ee 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.Designer.cs
@@ -33,8 +33,8 @@
ComponentsToolStripMenuItem = new ToolStripMenuItem();
ManufacturesToolStripMenuItem = new ToolStripMenuItem();
ReportsToolStripMenuItem = new ToolStripMenuItem();
- ComponentsListToolStripMenuItem = new ToolStripMenuItem();
ManufacturesListToolStripMenuItem = new ToolStripMenuItem();
+ ManufacturesComponentsListToolStripMenuItem = new ToolStripMenuItem();
OrdersListToolStripMenuItem = new ToolStripMenuItem();
dataGridView = new DataGridView();
buttonCreateOrder = new Button();
@@ -78,24 +78,24 @@
//
// ReportsToolStripMenuItem
//
- ReportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ComponentsListToolStripMenuItem, ManufacturesListToolStripMenuItem, OrdersListToolStripMenuItem });
+ ReportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ManufacturesListToolStripMenuItem, ManufacturesComponentsListToolStripMenuItem, OrdersListToolStripMenuItem });
ReportsToolStripMenuItem.Name = "ReportsToolStripMenuItem";
ReportsToolStripMenuItem.Size = new Size(60, 20);
ReportsToolStripMenuItem.Text = "Отчёты";
//
// ComponentsListToolStripMenuItem
//
- ComponentsListToolStripMenuItem.Name = "ComponentsListToolStripMenuItem";
- ComponentsListToolStripMenuItem.Size = new Size(225, 22);
- ComponentsListToolStripMenuItem.Text = "Список кузнечных изделий";
- ComponentsListToolStripMenuItem.Click += ComponentsListToolStripMenuItem_Click;
+ ManufacturesListToolStripMenuItem.Name = "ComponentsListToolStripMenuItem";
+ ManufacturesListToolStripMenuItem.Size = new Size(225, 22);
+ ManufacturesListToolStripMenuItem.Text = "Список кузнечных изделий";
+ ManufacturesListToolStripMenuItem.Click += ManufacturesListToolStripMenuItem_Click;
//
// ManufacturesListToolStripMenuItem
//
- ManufacturesListToolStripMenuItem.Name = "ManufacturesListToolStripMenuItem";
- ManufacturesListToolStripMenuItem.Size = new Size(225, 22);
- ManufacturesListToolStripMenuItem.Text = "Компоненты по изделиям";
- ManufacturesListToolStripMenuItem.Click += ManufacturesListToolStripMenuItem_Click;
+ ManufacturesComponentsListToolStripMenuItem.Name = "ManufacturesListToolStripMenuItem";
+ ManufacturesComponentsListToolStripMenuItem.Size = new Size(225, 22);
+ ManufacturesComponentsListToolStripMenuItem.Text = "Компоненты по изделиям";
+ ManufacturesComponentsListToolStripMenuItem.Click += ManufacturesComponentsListToolStripMenuItem_Click;
//
// OrdersListToolStripMenuItem
//
@@ -200,8 +200,8 @@
private Button buttonReady;
private Button buttonTakeInWork;
private ToolStripMenuItem ReportsToolStripMenuItem;
- private ToolStripMenuItem ComponentsListToolStripMenuItem;
private ToolStripMenuItem ManufacturesListToolStripMenuItem;
+ private ToolStripMenuItem ManufacturesComponentsListToolStripMenuItem;
private ToolStripMenuItem OrdersListToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs
index e3c4bdd..14cf953 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormMain.cs
@@ -165,12 +165,12 @@ namespace BlacksmithWorkshop
{
LoadData();
}
- private void ComponentsListToolStripMenuItem_Click(object sender, EventArgs e)
+ private void ManufacturesListToolStripMenuItem_Click(object sender, EventArgs e)
{
using var dialog = new SaveFileDialog { Filter = "docx|*.docx" };
if (dialog.ShowDialog() == DialogResult.OK)
{
- _reportLogic.SaveComponentsToWordFile(new ReportBindingModel
+ _reportLogic.SaveManufacturesToWordFile(new ReportBindingModel
{
FileName = dialog.FileName
});
@@ -178,10 +178,10 @@ namespace BlacksmithWorkshop
MessageBoxIcon.Information);
}
}
- private void ManufacturesListToolStripMenuItem_Click(object sender, EventArgs e)
+ private void ManufacturesComponentsListToolStripMenuItem_Click(object sender, EventArgs e)
{
- var service = Program.ServiceProvider?.GetService(typeof(FormReportManufactureComponents));
- if (service is FormReportManufactureComponents form)
+ var service = Program.ServiceProvider?.GetService(typeof(FormReportManufacturesComponents));
+ if (service is FormReportManufacturesComponents form)
{
form.ShowDialog();
}
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.Designer.cs
index 488743d..57f6088 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.Designer.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.Designer.cs
@@ -1,6 +1,6 @@
namespace BlacksmithWorkshop
{
- partial class FormReportManufactureComponents
+ partial class FormReportManufacturesComponents
{
///
/// Required designer variable.
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.cs
index 708682b..5e4b0d9 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureComponents.cs
@@ -13,12 +13,12 @@ using System.Windows.Forms;
namespace BlacksmithWorkshop
{
- public partial class FormReportManufactureComponents : Form
+ public partial class FormReportManufacturesComponents : Form
{
private readonly ILogger _logger;
private readonly IReportLogic _logic;
- public FormReportManufactureComponents(
- ILogger logger, IReportLogic logic)
+ public FormReportManufacturesComponents(
+ ILogger logger, IReportLogic logic)
{
InitializeComponent();
_logger = logger;
@@ -65,7 +65,7 @@ namespace BlacksmithWorkshop
{
try
{
- _logic.SaveManufactureComponentToExcelFile(
+ _logic.SaveManufacturesComponentsToExcelFile(
new ReportBindingModel
{
FileName = dialog.FileName
diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/Program.cs b/BlacksmithWorkshop/BlacksmithWorkshop/Program.cs
index 0ca1e1b..01bc3e4 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshop/Program.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshop/Program.cs
@@ -53,7 +53,7 @@ namespace BlacksmithWorkshop
services.AddTransient();
services.AddTransient();
services.AddTransient();
- services.AddTransient();
+ services.AddTransient();
services.AddTransient();
}
}
diff --git a/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs b/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs
index 996f325..1675f73 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs
@@ -85,7 +85,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
/// Сохранение компонент в файл-Word
///
///
- public void SaveComponentsToWordFile(ReportBindingModel model)
+ public void SaveManufacturesToWordFile(ReportBindingModel model)
{
_saveToWord.CreateDoc(new WordInfo
{
@@ -98,7 +98,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
/// Сохранение компонент с указаеним продуктов в файл-Excel
///
///
- public void SaveManufactureComponentToExcelFile(ReportBindingModel model)
+ public void SaveManufacturesComponentsToExcelFile(ReportBindingModel model)
{
_saveToExcel.CreateReport(new ExcelInfo
{
diff --git a/BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IReportLogic.cs b/BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IReportLogic.cs
index 04205d5..c4fed9f 100644
--- a/BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IReportLogic.cs
+++ b/BlacksmithWorkshop/BlacksmithWorkshopContracts/BusinessLogicsContracts/IReportLogic.cs
@@ -25,12 +25,12 @@ namespace BlacksmithWorkshopContracts.BusinessLogicsContracts
/// Сохранение компонент в файл-Word
///
///
- void SaveComponentsToWordFile(ReportBindingModel model);
+ void SaveManufacturesToWordFile(ReportBindingModel model);
///
/// Сохранение компонент с указаеним продуктов в файл-Excel
///
///
- void SaveManufactureComponentToExcelFile(ReportBindingModel model);
+ void SaveManufacturesComponentsToExcelFile(ReportBindingModel model);
///
/// Сохранение заказов в файл-Pdf
///