From dfc0fb1c1f1e45026189f46b9a8fc0604f94ea0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=92=D0=BB=D0=B0=D0=B4=D0=B8=D0=BC=D0=B8=D1=80=20=D0=94?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=BB=D0=BE=D0=B2?= Date: Fri, 19 Apr 2024 02:04:26 +0400 Subject: [PATCH] v2 --- RenovationWork/RenovationWork/FormMain.Designer.cs | 4 ++-- RenovationWork/RenovationWork/FormReportOrders.cs | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/RenovationWork/RenovationWork/FormMain.Designer.cs b/RenovationWork/RenovationWork/FormMain.Designer.cs index f45f970..a8a472b 100644 --- a/RenovationWork/RenovationWork/FormMain.Designer.cs +++ b/RenovationWork/RenovationWork/FormMain.Designer.cs @@ -94,8 +94,8 @@ // ComponentToolStripMenuItem.Name = "ComponentToolStripMenuItem"; ComponentToolStripMenuItem.Size = new Size(228, 22); - ComponentToolStripMenuItem.Text = "Список ремонтов"; - ComponentToolStripMenuItem.Click += ComponentRepairToolStripMenuItem_Click; + ComponentToolStripMenuItem.Text = "Список компонентов"; + ComponentToolStripMenuItem.Click += ComponentToolStripMenuItem_Click; // // ComponentRepairToolStripMenuItem // diff --git a/RenovationWork/RenovationWork/FormReportOrders.cs b/RenovationWork/RenovationWork/FormReportOrders.cs index fca704c..44aa9f7 100644 --- a/RenovationWork/RenovationWork/FormReportOrders.cs +++ b/RenovationWork/RenovationWork/FormReportOrders.cs @@ -21,7 +21,7 @@ namespace RenovationWorkView { Dock = DockStyle.Fill }; - reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrders.rdlc", FileMode.Open)); + reportViewer.LocalReport.LoadReportDefinition(new FileStream("C:\\Users\\danil\\source\\repos\\PIbd-21_Danilov_V.V._RenovationWork\\RenovationWork\\RenovationWork\\ReportOrders.rdlc", FileMode.Open)); Controls.Clear(); Controls.Add(reportViewer); Controls.Add(panel); @@ -34,7 +34,7 @@ namespace RenovationWorkView MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; } - try + //try { var dataSource = _logic.GetOrders(new ReportBindingModel { @@ -51,11 +51,11 @@ namespace RenovationWorkView reportViewer.RefreshReport(); _logger.LogInformation("Loading list of orders for period {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString()); } - catch (Exception ex) - { - _logger.LogError(ex, "Loading list of orders for period error"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); - } + //catch (Exception ex) + //{ + // _logger.LogError(ex, "Loading list of orders for period error"); + // MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + //} } private void ButtonToPdf_Click(object sender, EventArgs e)