ПИбд-23 Захаров Ростислав Андреевич Лабораторная работа №4 усложненная #14

Closed
Zakharov_Rostislav wants to merge 15 commits from lab-4-hard into lab-3-hard
7 changed files with 26 additions and 26 deletions
Showing only changes of commit 2b4d5876ea - Show all commits

View File

@ -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;
}
}

View File

@ -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();
}

View File

@ -1,6 +1,6 @@
namespace BlacksmithWorkshop
{
partial class FormReportManufactureComponents
partial class FormReportManufacturesComponents
{
/// <summary>
/// Required designer variable.

View File

@ -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<FormReportManufactureComponents> logger, IReportLogic logic)
public FormReportManufacturesComponents(
ILogger<FormReportManufacturesComponents> logger, IReportLogic logic)
{
InitializeComponent();
_logger = logger;
@ -65,7 +65,7 @@ namespace BlacksmithWorkshop
{
try
{
_logic.SaveManufactureComponentToExcelFile(
_logic.SaveManufacturesComponentsToExcelFile(
new ReportBindingModel
{
FileName = dialog.FileName

View File

@ -53,7 +53,7 @@ namespace BlacksmithWorkshop
services.AddTransient<FormManufacture>();
services.AddTransient<FormManufactures>();
services.AddTransient<FormManufactureComponent>();
services.AddTransient<FormReportManufactureComponents>();
services.AddTransient<FormReportManufacturesComponents>();
services.AddTransient<FormReportOrders>();
}
}

View File

@ -85,7 +85,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
/// Сохранение компонент в файл-Word
/// </summary>
/// <param name="model"></param>
public void SaveComponentsToWordFile(ReportBindingModel model)
public void SaveManufacturesToWordFile(ReportBindingModel model)
{
_saveToWord.CreateDoc(new WordInfo
{
@ -98,7 +98,7 @@ namespace BlacksmithWorkshopBusinessLogic.BusinessLogics
/// Сохранение компонент с указаеним продуктов в файл-Excel
/// </summary>
/// <param name="model"></param>
public void SaveManufactureComponentToExcelFile(ReportBindingModel model)
public void SaveManufacturesComponentsToExcelFile(ReportBindingModel model)
{
_saveToExcel.CreateReport(new ExcelInfo
{

View File

@ -25,12 +25,12 @@ namespace BlacksmithWorkshopContracts.BusinessLogicsContracts
/// Сохранение компонент в файл-Word
/// </summary>
/// <param name="model"></param>
void SaveComponentsToWordFile(ReportBindingModel model);
void SaveManufacturesToWordFile(ReportBindingModel model);
/// <summary>
/// Сохранение компонент с указаеним продуктов в файл-Excel
/// </summary>
/// <param name="model"></param>
void SaveManufactureComponentToExcelFile(ReportBindingModel model);
void SaveManufacturesComponentsToExcelFile(ReportBindingModel model);
/// <summary>
/// Сохранение заказов в файл-Pdf
/// </summary>