diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.Designer.cs index db2e6fc..7fa1d39 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.Designer.cs @@ -1,33 +1,33 @@ namespace BlacksmithWorkshop { - partial class FormReportManufactureWorkPieces - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class FormReportManufactureWorkPieces + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { dataGridView = new DataGridView(); buttonSaveToExcel = new Button(); ColumnManufacture = new DataGridViewTextBoxColumn(); @@ -35,9 +35,9 @@ ColumnCount = new DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); - // + // // dataGridView - // + // dataGridView.AllowUserToAddRows = false; dataGridView.AllowUserToDeleteRows = false; dataGridView.AllowUserToOrderColumns = true; @@ -56,9 +56,9 @@ dataGridView.RowHeadersWidth = 51; dataGridView.Size = new Size(704, 680); dataGridView.TabIndex = 0; - // + // // buttonSaveToExcel - // + // buttonSaveToExcel.Location = new Point(16, 18); buttonSaveToExcel.Margin = new Padding(4, 5, 4, 5); buttonSaveToExcel.Name = "buttonSaveToExcel"; @@ -67,33 +67,33 @@ buttonSaveToExcel.Text = "Сохранить в Excel"; buttonSaveToExcel.UseVisualStyleBackColor = true; buttonSaveToExcel.Click += ButtonSaveToExcel_Click; - // + // // ColumnManufacture - // + // ColumnManufacture.HeaderText = "Изделие"; ColumnManufacture.MinimumWidth = 6; ColumnManufacture.Name = "ColumnManufacture"; ColumnManufacture.ReadOnly = true; ColumnManufacture.Width = 200; - // + // // ColumnWorkPiece - // + // ColumnWorkPiece.HeaderText = "Заготовка"; ColumnWorkPiece.MinimumWidth = 6; ColumnWorkPiece.Name = "ColumnWorkPiece"; ColumnWorkPiece.ReadOnly = true; ColumnWorkPiece.Width = 200; - // - // ColumnCount - // + // + // ColumnCount + // ColumnCount.HeaderText = "Количество"; ColumnCount.MinimumWidth = 6; ColumnCount.Name = "ColumnCount"; ColumnCount.ReadOnly = true; ColumnCount.Width = 125; - // - // FormReportManufactureWorkPieces - // + // + // FormReportManufactureWorkPieces + // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(704, 743); @@ -105,14 +105,16 @@ Load += FormReportManufactureWorkPieces_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ResumeLayout(false); - } + } - #endregion + #endregion private DataGridView dataGridView; - private Button buttonSaveToExcel; - private DataGridViewTextBoxColumn ColumnManufacture; + private Button buttonSaveToExcel; + private DataGridView dataGridView; + private DataGridViewTextBoxColumn ColumWorkPiece; + private DataGridViewTextBoxColumn ColumnManufacture; private DataGridViewTextBoxColumn ColumnWorkPiece; - private DataGridViewTextBoxColumn ColumnCount; - } + private DataGridViewTextBoxColumn ColumnCount; + } } \ No newline at end of file diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.cs index d2d809a..0001b09 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.cs @@ -13,82 +13,82 @@ using System.Windows.Forms; namespace BlacksmithWorkshop { - public partial class FormReportManufactureWorkPieces : Form - { - private readonly ILogger _logger; + public partial class FormReportManufactureWorkPieces : Form + { + private readonly ILogger _logger; - private readonly IReportLogic _logic; + private readonly IReportLogic _logic; - public FormReportManufactureWorkPieces(ILogger logger, IReportLogic logic) - { - InitializeComponent(); + public FormReportManufactureWorkPieces(ILogger logger, IReportLogic logic) + { + InitializeComponent(); - _logger = logger; - _logic = logic; - } + _logger = logger; + _logic = logic; + } - private void FormReportManufactureWorkPieces_Load(object sender, EventArgs e) - { - try - { - var dict = _logic.GetManufactureWorkPiece(); + private void FormReportManufactureWorkPieces_Load(object sender, EventArgs e) + { + try + { + var dict = _logic.GetManufactureWorkPiece(); - if (dict != null) - { - dataGridView.Rows.Clear(); + if (dict != null) + { + dataGridView.Rows.Clear(); - foreach (var elem in dict) - { - dataGridView.Rows.Add(new object[] { elem.ManufactureName, "", "" }); + foreach (var elem in dict) + { + dataGridView.Rows.Add(new object[] { elem.ManufactureName, "", "" }); - foreach (var listElem in elem.WorkPieces) - { - dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 }); - } + foreach (var listElem in elem.WorkPieces) + { + dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 }); + } - dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount }); - dataGridView.Rows.Add(Array.Empty()); - } - } + dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount }); + dataGridView.Rows.Add(Array.Empty()); + } + } - _logger.LogInformation("Загрузка списка изделий по заготовкам"); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка загрузки списка изделий по заготовкам"); + _logger.LogInformation("Загрузка списка изделий по заготовкам"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка изделий по заготовкам"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } - private void ButtonSaveToExcel_Click(object sender, EventArgs e) - { - //фильтрация файлов для диалогового окна - using var dialog = new SaveFileDialog - { - Filter = "xlsx|*.xlsx" - }; + private void ButtonSaveToExcel_Click(object sender, EventArgs e) + { + //фильтрация файлов для диалогового окна + using var dialog = new SaveFileDialog + { + Filter = "xlsx|*.xlsx" + }; - if (dialog.ShowDialog() == DialogResult.OK) - { - try - { - _logic.SaveManufactureWorkPieceToExcelFile(new ReportBindingModel - { - FileName = dialog.FileName - }); + if (dialog.ShowDialog() == DialogResult.OK) + { + try + { + _logic.SaveManufactureWorkPieceToExcelFile(new ReportBindingModel + { + FileName = dialog.FileName + }); - _logger.LogInformation("Сохранение списка изделий по заготовкам"); + _logger.LogInformation("Сохранение списка изделий по заготовкам"); - MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); - } - catch (Exception ex) - { - _logger.LogError(ex, "Ошибка сохранения списка изделий по заготовкам"); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения списка изделий по заготовкам"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } - } - } - } + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.resx b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.resx index f298a7b..c9ea820 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.resx +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportManufactureWorkPieces.resx @@ -57,4 +57,22 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.Designer.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.Designer.cs index 101e048..6b09aa5 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.Designer.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.Designer.cs @@ -1,91 +1,95 @@ namespace BlacksmithWorkshop { - partial class FormReportOrders - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; + partial class FormReportOrders + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } - #region Windows Form Designer generated code + #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.panel = new System.Windows.Forms.Panel(); - this.buttonToPdf = new System.Windows.Forms.Button(); - this.buttonMake = new System.Windows.Forms.Button(); - this.dateTimePickerTo = new System.Windows.Forms.DateTimePicker(); + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.panel = new System.Windows.Forms.Panel(); + this.buttonToPdf = new System.Windows.Forms.Button(); + this.buttonMake = new System.Windows.Forms.Button(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.dateTimePickerTo = new System.Windows.Forms.DateTimePicker(); this.labelTo = new System.Windows.Forms.Label(); - this.dateTimePickerFrom = new System.Windows.Forms.DateTimePicker(); + this.dateTimePickerFrom = new System.Windows.Forms.DateTimePicker(); this.labelFrom = new System.Windows.Forms.Label(); - this.panel.SuspendLayout(); - this.SuspendLayout(); - // - // panel - // - this.panel.Controls.Add(this.buttonToPdf); - this.panel.Controls.Add(this.buttonMake); - this.panel.Controls.Add(this.dateTimePickerTo); + this.panel.SuspendLayout(); + this.SuspendLayout(); + // + // panel + // + this.panel.Controls.Add(this.buttonToPdf); + this.panel.Controls.Add(this.buttonMake); + this.panel.Controls.Add(this.label2); + this.panel.Controls.Add(this.label1); + this.panel.Controls.Add(this.dateTimePickerTo); this.panel.Controls.Add(this.labelTo); - this.panel.Controls.Add(this.dateTimePickerFrom); + this.panel.Controls.Add(this.dateTimePickerFrom); this.panel.Controls.Add(this.labelFrom); - this.panel.Dock = System.Windows.Forms.DockStyle.Top; - this.panel.Location = new System.Drawing.Point(0, 0); + this.panel.Dock = System.Windows.Forms.DockStyle.Top; + this.panel.Location = new System.Drawing.Point(0, 0); this.panel.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.panel.Name = "panel"; + this.panel.Name = "panel"; this.panel.Size = new System.Drawing.Size(1031, 40); - this.panel.TabIndex = 0; - // - // buttonToPdf - // + this.panel.TabIndex = 0; + // + // buttonToPdf + // this.buttonToPdf.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.buttonToPdf.Location = new System.Drawing.Point(878, 8); this.buttonToPdf.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.buttonToPdf.Name = "buttonToPdf"; + this.buttonToPdf.Name = "buttonToPdf"; this.buttonToPdf.Size = new System.Drawing.Size(139, 27); - this.buttonToPdf.TabIndex = 5; - this.buttonToPdf.Text = "В Pdf"; - this.buttonToPdf.UseVisualStyleBackColor = true; - this.buttonToPdf.Click += new System.EventHandler(this.ButtonToPdf_Click); - // - // buttonMake - // + this.buttonToPdf.TabIndex = 5; + this.buttonToPdf.Text = "В Pdf"; + this.buttonToPdf.UseVisualStyleBackColor = true; + this.buttonToPdf.Click += new System.EventHandler(this.ButtonToPdf_Click); + // + // buttonMake + // this.buttonMake.Location = new System.Drawing.Point(476, 8); this.buttonMake.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.buttonMake.Name = "buttonMake"; + this.buttonMake.Name = "buttonMake"; this.buttonMake.Size = new System.Drawing.Size(139, 27); - this.buttonMake.TabIndex = 4; - this.buttonMake.Text = "Сформировать"; - this.buttonMake.UseVisualStyleBackColor = true; - this.buttonMake.Click += new System.EventHandler(this.ButtonMake_Click); - // + this.buttonMake.TabIndex = 4; + this.buttonMake.Text = "Сформировать"; + this.buttonMake.UseVisualStyleBackColor = true; + this.buttonMake.Click += new System.EventHandler(this.ButtonMake_Click); + // // dateTimePickerTo - // + // this.dateTimePickerTo.Location = new System.Drawing.Point(237, 7); this.dateTimePickerTo.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); this.dateTimePickerTo.Name = "dateTimePickerTo"; this.dateTimePickerTo.Size = new System.Drawing.Size(163, 23); this.dateTimePickerTo.TabIndex = 3; - // + // // labelTo - // + // this.labelTo.AutoSize = true; this.labelTo.Location = new System.Drawing.Point(208, 10); this.labelTo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); @@ -93,12 +97,12 @@ this.labelTo.Size = new System.Drawing.Size(21, 15); this.labelTo.TabIndex = 2; this.labelTo.Text = "по"; - // - // dateTimePickerFrom - // + // + // dateTimePickerFrom + // this.dateTimePickerFrom.Location = new System.Drawing.Point(37, 7); this.dateTimePickerFrom.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.dateTimePickerFrom.Name = "dateTimePickerFrom"; + this.dateTimePickerFrom.Name = "dateTimePickerFrom"; this.dateTimePickerFrom.Size = new System.Drawing.Size(163, 23); this.dateTimePickerFrom.TabIndex = 1; // @@ -111,31 +115,33 @@ this.labelFrom.Size = new System.Drawing.Size(15, 15); this.labelFrom.TabIndex = 0; this.labelFrom.Text = "С"; - // - // FormReportOrders - // + // + // FormReportOrders + // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1031, 647); - this.Controls.Add(this.panel); + this.Controls.Add(this.panel); this.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); - this.Name = "FormReportOrders"; + this.Name = "FormReportOrders"; this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; - this.Text = "Заказы"; - this.panel.ResumeLayout(false); - this.panel.PerformLayout(); - this.ResumeLayout(false); + this.Text = "Заказы"; + this.panel.ResumeLayout(false); + this.panel.PerformLayout(); + this.ResumeLayout(false); - } + } - #endregion + #endregion - private Panel panel; + private Panel panel; private Button buttonToPdf; - private Button buttonMake; - private DateTimePicker dateTimePickerTo; + private Button buttonMake; + private Label label2; + private Label label1; + private DateTimePicker dateTimePickerTo; private Label labelTo; - private DateTimePicker dateTimePickerFrom; + private DateTimePicker dateTimePickerFrom; private Label labelFrom; - } + } } \ No newline at end of file diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs index 3760334..6ffe840 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.cs @@ -14,98 +14,102 @@ using System.Windows.Forms; namespace BlacksmithWorkshop { - public partial class FormReportOrders : Form - { - private readonly ReportViewer reportViewer; + //форма с отчётом + public partial class FormReportOrders : Form + { + private readonly ReportViewer reportViewer; - private readonly ILogger _logger; + private readonly ILogger _logger; - private readonly IReportLogic _logic; + private readonly IReportLogic _logic; - public FormReportOrders(ILogger logger, IReportLogic logic) - { - InitializeComponent(); + public FormReportOrders(ILogger logger, IReportLogic logic) + { + InitializeComponent(); - _logger = logger; - _logic = logic; + _logger = logger; + _logic = logic; - reportViewer = new ReportViewer - { - Dock = DockStyle.Fill - }; + reportViewer = new ReportViewer + { + Dock = DockStyle.Fill + }; - reportViewer.LocalReport.LoadReportDefinition(new FileStream("C:\\Users\\Programmist73\\Desktop\\Практика\\2-й курс\\4-й семестр\\PIbd-21_Eliseev_E.E._BlacksmithWorkshop\\BlacksmithWorkshop\\BlacksmithWorkshop\\ReportOrders.rdlc", FileMode.Open)); - - Controls.Clear(); - Controls.Add(reportViewer); - Controls.Add(panel); - } + reportViewer.LocalReport.LoadReportDefinition(new FileStream("C:\\Users\\Programmist73\\Desktop\\Практика\\2-й курс\\4-й семестр\\PIbd-21_Eliseev_E.E._BlacksmithWorkshop\\BlacksmithWorkshop\\BlacksmithWorkshop\\ReportOrders.rdlc", FileMode.Open)); - private void ButtonMake_Click(object sender, EventArgs e) - { - if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date) - { + Controls.Clear(); + Controls.Add(reportViewer); + Controls.Add(panel); + } + + 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 - }); + return; + } + try + { + var dataSource = _logic.GetOrders(new ReportBindingModel + { + DateFrom = dateTimePickerFrom.Value, + DateTo = dateTimePickerTo.Value + }); - var source = new ReportDataSource("DataSetOrders", dataSource); + var source = new ReportDataSource("DataSetOrders", dataSource); - reportViewer.LocalReport.DataSources.Clear(); - reportViewer.LocalReport.DataSources.Add(source); + 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); + $"c {dateTimePickerFrom.Value.ToShortDateString()} по {dateTimePickerTo.Value.ToShortDateString()}") }; + + reportViewer.LocalReport.SetParameters(parameters); - reportViewer.RefreshReport(); + 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); - } - } + } + 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; - } + 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 - { - _logic.SaveOrdersToPdfFile(new ReportBindingModel - { - FileName = dialog.FileName, - DateFrom = dateTimePickerFrom.Value, - DateTo = dateTimePickerTo.Value - }); + if (dialog.ShowDialog() == DialogResult.OK) + { + try + { + _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); - } - } - } - } + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения списка заказов на период"); + + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + } } diff --git a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.resx b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.resx index 1af7de1..dee2913 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.resx +++ b/BlacksmithWorkshop/BlacksmithWorkshop/FormReportOrders.resx @@ -1,5 +1,4 @@ - - +