From fab7391ca76a91e16abbb5aedadc41f0db88e34b Mon Sep 17 00:00:00 2001 From: Oleg Shabunov Date: Tue, 14 May 2024 22:29:05 +0400 Subject: [PATCH] Finish report forms --- .../BusinessLogics/ReportLogic.cs | 2 +- .../OfficePackage/AbstractSaveToExcel.cs | 2 +- .../Forms/FormReportGroupedOrders.Designer.cs | 126 ++++++------------ .../Forms/FormReportGroupedOrders.cs | 2 +- .../Forms/FormReportGroupedOrders.resx | 50 +++---- .../Forms/FormReportShop.Designer.cs | 66 ++++----- AutoWorkshopView/Forms/FormReportShop.cs | 10 +- AutoWorkshopView/MainForm.Designer.cs | 86 +++++++----- AutoWorkshopView/MainForm.cs | 6 +- AutoWorkshopView/Program.cs | 2 +- 10 files changed, 167 insertions(+), 185 deletions(-) diff --git a/AutoWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs b/AutoWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs index 2d37f47..fb84e1c 100644 --- a/AutoWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs +++ b/AutoWorkshopBusinessLogic/BusinessLogics/ReportLogic.cs @@ -121,7 +121,7 @@ namespace AutoWorkshopBusinessLogic.BusinessLogics public void SaveShopsToExcelFile(ReportBindingModel model) { - _saveToExcel.CreateShopPizzasReport(new ExcelShopsInfo + _saveToExcel.CreateShopRepairsReport(new ExcelShopsInfo { FileName = model.FileName, Title = "Загруженность магазинов", diff --git a/AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs index 81f1bba..66341bb 100644 --- a/AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs +++ b/AutoWorkshopBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -79,7 +79,7 @@ namespace AutoWorkshopBusinessLogic.OfficePackage SaveExcel(Info); } - public void CreateShopPizzasReport(ExcelShopsInfo Info) + public void CreateShopRepairsReport(ExcelShopsInfo Info) { CreateExcel(Info); diff --git a/AutoWorkshopView/Forms/FormReportGroupedOrders.Designer.cs b/AutoWorkshopView/Forms/FormReportGroupedOrders.Designer.cs index 1fe7c32..6cfd4fa 100644 --- a/AutoWorkshopView/Forms/FormReportGroupedOrders.Designer.cs +++ b/AutoWorkshopView/Forms/FormReportGroupedOrders.Designer.cs @@ -28,104 +28,62 @@ /// private void InitializeComponent() { - panel = new Panel(); - labelFrom = new Label(); - dateTimePickerFrom = new DateTimePicker(); - dateTimePickerTo = new DateTimePicker(); - labelTo = new Label(); - buttonMake = new Button(); - buttonToPDF = new Button(); - panel.SuspendLayout(); + Panel = new Panel(); + ToPdfButton = new Button(); + CreateButton = new Button(); + Panel.SuspendLayout(); SuspendLayout(); // - // panel + // Panel // - panel.Controls.Add(buttonToPDF); - panel.Controls.Add(buttonMake); - panel.Controls.Add(dateTimePickerTo); - panel.Controls.Add(labelTo); - panel.Controls.Add(dateTimePickerFrom); - panel.Controls.Add(labelFrom); - panel.Dock = DockStyle.Top; - panel.Location = new Point(0, 0); - panel.Name = "panel"; - panel.Size = new Size(958, 52); - panel.TabIndex = 0; + Panel.Controls.Add(ToPdfButton); + Panel.Controls.Add(CreateButton); + Panel.Dock = DockStyle.Top; + Panel.Location = new Point(0, 0); + Panel.Margin = new Padding(3, 2, 3, 2); + Panel.Name = "Panel"; + Panel.Size = new Size(849, 39); + Panel.TabIndex = 1; // - // labelFrom + // ToPdfButton // - labelFrom.AutoSize = true; - labelFrom.Location = new Point(12, 14); - labelFrom.Name = "labelFrom"; - labelFrom.Size = new Size(18, 20); - labelFrom.TabIndex = 0; - labelFrom.Text = "C"; + ToPdfButton.Location = new Point(425, 9); + ToPdfButton.Margin = new Padding(3, 2, 3, 2); + ToPdfButton.Name = "ToPdfButton"; + ToPdfButton.Size = new Size(360, 22); + ToPdfButton.TabIndex = 5; + ToPdfButton.Text = "В PDF"; + ToPdfButton.UseVisualStyleBackColor = true; + ToPdfButton.Click += ButtonToPdf_Click; // - // dateTimePickerFrom + // CreateButton // - dateTimePickerFrom.Location = new Point(36, 9); - dateTimePickerFrom.Name = "dateTimePickerFrom"; - dateTimePickerFrom.Size = new Size(199, 27); - dateTimePickerFrom.TabIndex = 1; + CreateButton.Location = new Point(43, 9); + CreateButton.Margin = new Padding(3, 2, 3, 2); + CreateButton.Name = "CreateButton"; + CreateButton.Size = new Size(330, 22); + CreateButton.TabIndex = 4; + CreateButton.Text = "Сформировать"; + CreateButton.UseVisualStyleBackColor = true; + CreateButton.Click += ButtonMake_Click; // - // dateTimePickerTo + // FormReportGroupedOrders // - dateTimePickerTo.Location = new Point(300, 9); - dateTimePickerTo.Name = "dateTimePickerTo"; - dateTimePickerTo.Size = new Size(199, 27); - dateTimePickerTo.TabIndex = 3; - // - // labelTo - // - labelTo.AutoSize = true; - labelTo.Location = new Point(254, 14); - labelTo.Name = "labelTo"; - labelTo.Size = new Size(27, 20); - labelTo.TabIndex = 2; - labelTo.Text = "по"; - // - // buttonMake - // - buttonMake.Location = new Point(542, 10); - buttonMake.Name = "buttonMake"; - buttonMake.Size = new Size(165, 29); - buttonMake.TabIndex = 4; - buttonMake.Text = "Сформировать"; - buttonMake.UseVisualStyleBackColor = true; - buttonMake.Click += new System.EventHandler(ButtonMake_Click); - // - // buttonToPDF - // - buttonToPDF.Location = new Point(781, 9); - buttonToPDF.Name = "buttonToPDF"; - buttonToPDF.Size = new Size(165, 29); - buttonToPDF.TabIndex = 5; - buttonToPDF.Text = "В PDF"; - buttonToPDF.UseVisualStyleBackColor = true; - buttonToPDF.Click += new System.EventHandler(ButtonToPdf_Click); - // - // FormReportOrders - // - AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(958, 450); - Controls.Add(panel); - Name = "FormReportOrders"; - Text = "Заказы"; - panel.ResumeLayout(false); - panel.PerformLayout(); + ClientSize = new Size(849, 338); + Controls.Add(Panel); + Margin = new Padding(3, 2, 3, 2); + Name = "FormReportGroupedOrders"; + Text = "Объединенные по датам заказы"; + Panel.ResumeLayout(false); ResumeLayout(false); - } #endregion - private Panel panel; - private Button buttonToPDF; - private Button buttonMake; - private DateTimePicker dateTimePickerTo; - private Label labelTo; - private DateTimePicker dateTimePickerFrom; - private Label labelFrom; + private Panel Panel; + private Button ToPdfButton; + private Button CreateButton; } } \ No newline at end of file diff --git a/AutoWorkshopView/Forms/FormReportGroupedOrders.cs b/AutoWorkshopView/Forms/FormReportGroupedOrders.cs index 64967e4..20d155d 100644 --- a/AutoWorkshopView/Forms/FormReportGroupedOrders.cs +++ b/AutoWorkshopView/Forms/FormReportGroupedOrders.cs @@ -25,7 +25,7 @@ namespace AutoWorkshopView.Forms Controls.Clear(); Controls.Add(_reportViewer); - Controls.Add(panel); + Controls.Add(Panel); } private void ButtonMake_Click(object sender, EventArgs e) diff --git a/AutoWorkshopView/Forms/FormReportGroupedOrders.resx b/AutoWorkshopView/Forms/FormReportGroupedOrders.resx index 1af7de1..af32865 100644 --- a/AutoWorkshopView/Forms/FormReportGroupedOrders.resx +++ b/AutoWorkshopView/Forms/FormReportGroupedOrders.resx @@ -1,17 +1,17 @@  - diff --git a/AutoWorkshopView/Forms/FormReportShop.Designer.cs b/AutoWorkshopView/Forms/FormReportShop.Designer.cs index c7465cf..fa4a2c3 100644 --- a/AutoWorkshopView/Forms/FormReportShop.Designer.cs +++ b/AutoWorkshopView/Forms/FormReportShop.Designer.cs @@ -28,42 +28,42 @@ /// private void InitializeComponent() { - buttonSaveToExcel = new Button(); - dataGridView = new DataGridView(); + SaveToExcelButton = new Button(); + DataGridView = new DataGridView(); ColumnShop = new DataGridViewTextBoxColumn(); ColumnRepair = new DataGridViewTextBoxColumn(); ColumnCount = new DataGridViewTextBoxColumn(); - ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + ((System.ComponentModel.ISupportInitialize)DataGridView).BeginInit(); SuspendLayout(); // - // buttonSaveToExcel + // SaveToExcelButton // - buttonSaveToExcel.Location = new Point(12, 10); - buttonSaveToExcel.Margin = new Padding(3, 2, 3, 2); - buttonSaveToExcel.Name = "buttonSaveToExcel"; - buttonSaveToExcel.Size = new Size(195, 27); - buttonSaveToExcel.TabIndex = 3; - buttonSaveToExcel.Text = "Сохранить в Excel"; - buttonSaveToExcel.UseVisualStyleBackColor = true; - buttonSaveToExcel.Click += ButtonSaveToExcel_Click; + SaveToExcelButton.Location = new Point(12, 10); + SaveToExcelButton.Margin = new Padding(3, 2, 3, 2); + SaveToExcelButton.Name = "SaveToExcelButton"; + SaveToExcelButton.Size = new Size(195, 27); + SaveToExcelButton.TabIndex = 3; + SaveToExcelButton.Text = "Сохранить в Excel"; + SaveToExcelButton.UseVisualStyleBackColor = true; + SaveToExcelButton.Click += ButtonSaveToExcel_Click; // - // dataGridView + // DataGridView // - dataGridView.AllowUserToAddRows = false; - dataGridView.AllowUserToDeleteRows = false; - dataGridView.AllowUserToOrderColumns = true; - dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; - dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnShop, ColumnRepair, ColumnCount }); - dataGridView.Dock = DockStyle.Bottom; - dataGridView.Location = new Point(0, 50); - dataGridView.Margin = new Padding(3, 2, 3, 2); - dataGridView.Name = "dataGridView"; - dataGridView.ReadOnly = true; - dataGridView.RowHeadersWidth = 51; - dataGridView.RowTemplate.Height = 29; - dataGridView.Size = new Size(523, 288); - dataGridView.TabIndex = 2; + DataGridView.AllowUserToAddRows = false; + DataGridView.AllowUserToDeleteRows = false; + DataGridView.AllowUserToOrderColumns = true; + DataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; + DataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + DataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnShop, ColumnRepair, ColumnCount }); + DataGridView.Dock = DockStyle.Bottom; + DataGridView.Location = new Point(0, 50); + DataGridView.Margin = new Padding(3, 2, 3, 2); + DataGridView.Name = "DataGridView"; + DataGridView.ReadOnly = true; + DataGridView.RowHeadersWidth = 51; + DataGridView.RowTemplate.Height = 29; + DataGridView.Size = new Size(523, 288); + DataGridView.TabIndex = 2; // // ColumnShop // @@ -94,20 +94,20 @@ AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(523, 338); - Controls.Add(buttonSaveToExcel); - Controls.Add(dataGridView); + Controls.Add(SaveToExcelButton); + Controls.Add(DataGridView); Margin = new Padding(3, 2, 3, 2); Name = "FormReportShop"; Text = "Загруженность магазинов"; Load += FormReportShop_Load; - ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ((System.ComponentModel.ISupportInitialize)DataGridView).EndInit(); ResumeLayout(false); } #endregion - private Button buttonSaveToExcel; - private DataGridView dataGridView; + private Button SaveToExcelButton; + private DataGridView DataGridView; private DataGridViewTextBoxColumn ColumnShop; private DataGridViewTextBoxColumn ColumnRepair; private DataGridViewTextBoxColumn ColumnCount; diff --git a/AutoWorkshopView/Forms/FormReportShop.cs b/AutoWorkshopView/Forms/FormReportShop.cs index b751e0a..95530d4 100644 --- a/AutoWorkshopView/Forms/FormReportShop.cs +++ b/AutoWorkshopView/Forms/FormReportShop.cs @@ -24,19 +24,19 @@ namespace AutoWorkshopView.Forms var Shops = _logic.GetShops(); if (Shops != null) { - dataGridView.Rows.Clear(); + DataGridView.Rows.Clear(); foreach (var Shop in Shops) { - dataGridView.Rows.Add(new object[] { Shop.ShopName, "", "" }); + DataGridView.Rows.Add(new object[] { Shop.ShopName, "", "" }); foreach (var Repair in Shop.Repairs) { - dataGridView.Rows.Add(new object[] { "", Repair.Item1, Repair.Item2 }); + DataGridView.Rows.Add(new object[] { "", Repair.Item1, Repair.Item2 }); } - dataGridView.Rows.Add(new object[] { "Итого", "", Shop.TotalCount }); - dataGridView.Rows.Add(Array.Empty()); + DataGridView.Rows.Add(new object[] { "Итого", "", Shop.TotalCount }); + DataGridView.Rows.Add(Array.Empty()); } } diff --git a/AutoWorkshopView/MainForm.Designer.cs b/AutoWorkshopView/MainForm.Designer.cs index 869fa1f..09ab7c7 100644 --- a/AutoWorkshopView/MainForm.Designer.cs +++ b/AutoWorkshopView/MainForm.Designer.cs @@ -37,9 +37,12 @@ TransactionToolStripMenuItem = new ToolStripMenuItem(); SaleToolStripMenuItem = new ToolStripMenuItem(); ReportsToolStripMenuItem = new ToolStripMenuItem(); - ComponentsToolStripMenuItem1 = new ToolStripMenuItem(); - ComponentRepairToolStripMenuItem1 = new ToolStripMenuItem(); + ReportRepairsToolStripMenuItem = new ToolStripMenuItem(); + ReportRepCompToolStripMenuItem = new ToolStripMenuItem(); OrdersToolStripMenuItem = new ToolStripMenuItem(); + ReportShopsToolStripMenuItem = new ToolStripMenuItem(); + RepostBusyShopsToolStripMenuItem = new ToolStripMenuItem(); + ReportGroupOrdersToolStripMenuItem = new ToolStripMenuItem(); DataGridView = new DataGridView(); CreateOrderButton = new Button(); TakeInWorkButton = new Button(); @@ -71,21 +74,21 @@ // ComponentsStripMenuItem // ComponentsStripMenuItem.Name = "ComponentsStripMenuItem"; - ComponentsStripMenuItem.Size = new Size(145, 22); + ComponentsStripMenuItem.Size = new Size(180, 22); ComponentsStripMenuItem.Text = "Компоненты"; ComponentsStripMenuItem.Click += ComponentsStripMenuItem_Click; // // RepairStripMenuItem // RepairStripMenuItem.Name = "RepairStripMenuItem"; - RepairStripMenuItem.Size = new Size(145, 22); + RepairStripMenuItem.Size = new Size(180, 22); RepairStripMenuItem.Text = "Ремонты"; RepairStripMenuItem.Click += RepairsStripMenuItem_Click; // // ShopsToolStripMenuItem // ShopsToolStripMenuItem.Name = "ShopsToolStripMenuItem"; - ShopsToolStripMenuItem.Size = new Size(145, 22); + ShopsToolStripMenuItem.Size = new Size(180, 22); ShopsToolStripMenuItem.Text = "Магазины"; ShopsToolStripMenuItem.Click += ShopsToolStripMenuItem_Click; // @@ -99,40 +102,65 @@ // TransactionToolStripMenuItem // TransactionToolStripMenuItem.Name = "TransactionToolStripMenuItem"; - TransactionToolStripMenuItem.Size = new Size(125, 22); + TransactionToolStripMenuItem.Size = new Size(180, 22); TransactionToolStripMenuItem.Text = "Поставка"; TransactionToolStripMenuItem.Click += TransactionToolStripMenuItem_Click; // + // SaleToolStripMenuItem + // + SaleToolStripMenuItem.Name = "SaleToolStripMenuItem"; + SaleToolStripMenuItem.Size = new Size(180, 22); + SaleToolStripMenuItem.Text = "Продажа"; + SaleToolStripMenuItem.Click += SellToolStripMenuItem_Click; + // // ReportsToolStripMenuItem // - ReportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { - ComponentsToolStripMenuItem1, - ComponentRepairToolStripMenuItem1, - OrdersToolStripMenuItem}); + ReportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ReportRepairsToolStripMenuItem, ReportRepCompToolStripMenuItem, OrdersToolStripMenuItem, ReportShopsToolStripMenuItem, RepostBusyShopsToolStripMenuItem, ReportGroupOrdersToolStripMenuItem }); ReportsToolStripMenuItem.Name = "ReportsToolStripMenuItem"; ReportsToolStripMenuItem.Size = new Size(60, 20); ReportsToolStripMenuItem.Text = "Отчёты"; // - // ComponentsToolStripMenuItem1 + // ReportRepairsToolStripMenuItem // - ComponentsToolStripMenuItem1.Name = "ComponentsToolStripMenuItem1"; - ComponentsToolStripMenuItem1.Size = new Size(205, 22); - ComponentsToolStripMenuItem1.Text = "Ремонты"; - ComponentsToolStripMenuItem1.Click += new EventHandler(ComponentsToolStripMenuItem_Click); + ReportRepairsToolStripMenuItem.Name = "ReportRepairsToolStripMenuItem"; + ReportRepairsToolStripMenuItem.Size = new Size(219, 22); + ReportRepairsToolStripMenuItem.Text = "Ремонты"; + ReportRepairsToolStripMenuItem.Click += ComponentsToolStripMenuItem_Click; // - // ComponentRepairToolStripMenuItem1 + // ReportRepCompToolStripMenuItem // - ComponentRepairToolStripMenuItem1.Name = "ComponentRepairToolStripMenuItem1"; - ComponentRepairToolStripMenuItem1.Size = new Size(205, 22); - ComponentRepairToolStripMenuItem1.Text = "Ремонт с компонентами"; - ComponentRepairToolStripMenuItem1.Click += new EventHandler(ComponentRepairToolStripMenuItem_Click); + ReportRepCompToolStripMenuItem.Name = "ReportRepCompToolStripMenuItem"; + ReportRepCompToolStripMenuItem.Size = new Size(219, 22); + ReportRepCompToolStripMenuItem.Text = "Ремонт с компонентами"; + ReportRepCompToolStripMenuItem.Click += ComponentRepairToolStripMenuItem_Click; // // OrdersToolStripMenuItem // OrdersToolStripMenuItem.Name = "OrdersToolStripMenuItem"; - OrdersToolStripMenuItem.Size = new Size(205, 22); + OrdersToolStripMenuItem.Size = new Size(219, 22); OrdersToolStripMenuItem.Text = "Заказы"; - OrdersToolStripMenuItem.Click += new EventHandler(OrdersToolStripMenuItem_Click); + OrdersToolStripMenuItem.Click += OrdersToolStripMenuItem_Click; + // + // ReportShopsToolStripMenuItem + // + ReportShopsToolStripMenuItem.Name = "ReportShopsToolStripMenuItem"; + ReportShopsToolStripMenuItem.Size = new Size(219, 22); + ReportShopsToolStripMenuItem.Text = "Список магазинов"; + ReportShopsToolStripMenuItem.Click += ReportShopsToolStripMenuItem_Click; + // + // RepostBusyShopsToolStripMenuItem + // + RepostBusyShopsToolStripMenuItem.Name = "RepostBusyShopsToolStripMenuItem"; + RepostBusyShopsToolStripMenuItem.Size = new Size(219, 22); + RepostBusyShopsToolStripMenuItem.Text = "Загруженность магазинов"; + RepostBusyShopsToolStripMenuItem.Click += ReportBusyShopsToolStripMenuItem_Click; + // + // ReportGroupOrdersToolStripMenuItem + // + ReportGroupOrdersToolStripMenuItem.Name = "ReportGroupOrdersToolStripMenuItem"; + ReportGroupOrdersToolStripMenuItem.Size = new Size(219, 22); + ReportGroupOrdersToolStripMenuItem.Text = "Объединенные заказы"; + ReportGroupOrdersToolStripMenuItem.Click += ReportGroupOrdersToolStripMenuItem_Click; // // DataGridView // @@ -201,13 +229,6 @@ RefreshButton.UseVisualStyleBackColor = true; RefreshButton.Click += RefreshButton_Click; // - // SaleToolStripMenuItem - // - SaleToolStripMenuItem.Name = "SaleToolStripMenuItem"; - SaleToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - SaleToolStripMenuItem.Text = "Продажа"; - SaleToolStripMenuItem.Click += new System.EventHandler(SellToolStripMenuItem_Click); - // // MainForm // AutoScaleDimensions = new SizeF(7F, 15F); @@ -249,8 +270,11 @@ private ToolStripMenuItem TransactionToolStripMenuItem; private ToolStripMenuItem SaleToolStripMenuItem; private ToolStripMenuItem ReportsToolStripMenuItem; - private ToolStripMenuItem ComponentsToolStripMenuItem1; - private ToolStripMenuItem ComponentRepairToolStripMenuItem1; + private ToolStripMenuItem ReportRepairsToolStripMenuItem; + private ToolStripMenuItem ReportRepCompToolStripMenuItem; private ToolStripMenuItem OrdersToolStripMenuItem; + private ToolStripMenuItem ReportShopsToolStripMenuItem; + private ToolStripMenuItem RepostBusyShopsToolStripMenuItem; + private ToolStripMenuItem ReportGroupOrdersToolStripMenuItem; } } \ No newline at end of file diff --git a/AutoWorkshopView/MainForm.cs b/AutoWorkshopView/MainForm.cs index cb8cc46..e5a6d7f 100644 --- a/AutoWorkshopView/MainForm.cs +++ b/AutoWorkshopView/MainForm.cs @@ -230,7 +230,7 @@ namespace AutoWorkshopView } } - private void InfoToolStripMenuItem_Click(object sender, EventArgs e) + private void ReportShopsToolStripMenuItem_Click(object sender, EventArgs e) { using var Dialog = new SaveFileDialog { Filter = "docx|*.docx" }; @@ -241,7 +241,7 @@ namespace AutoWorkshopView } } - private void BusyShopsToolStripMenuItem_Click(object sender, EventArgs e) + private void ReportBusyShopsToolStripMenuItem_Click(object sender, EventArgs e) { var Service = Program.ServiceProvider?.GetService(typeof(FormReportShop)); @@ -251,7 +251,7 @@ namespace AutoWorkshopView } } - private void GroupOrdersToolStripMenuItem_Click(object sender, EventArgs e) + private void ReportGroupOrdersToolStripMenuItem_Click(object sender, EventArgs e) { var Service = Program.ServiceProvider?.GetService(typeof(FormReportGroupedOrders)); diff --git a/AutoWorkshopView/Program.cs b/AutoWorkshopView/Program.cs index fecb046..03c681e 100644 --- a/AutoWorkshopView/Program.cs +++ b/AutoWorkshopView/Program.cs @@ -47,11 +47,11 @@ namespace AutoWorkshopView Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); + Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); Services.AddTransient(); - Services.AddTransient(); Services.AddTransient(); Services.AddTransient();