From e14cdc0cfc4fe69ab5ced0e36edd6b5d23bc23d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B3=D0=BE=D1=80=20=D0=9F=D1=8B=D0=B6=D0=BE=D0=B2?= Date: Mon, 9 Dec 2024 04:58:31 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D0=BD?= =?UTF-8?q?=D1=8B=D0=B9=20=D0=B2=D0=B0=D1=80=D0=B8=D0=B0=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ITServiceManager/Entities/Order.cs | 13 ++ .../ITServiceManager/Entities/TempOrder.cs | 12 ++ .../FormItCompany.Designer.cs | 42 +++--- .../ITServiceManager/FormItCompany.cs | 19 +++ .../ITServiceManager/FormItCompany.resx | 4 +- ...r.cs => FormAppointmentReport.Designer.cs} | 60 +++++---- ...viceReport.cs => FormAppointmentReport.cs} | 6 +- ...Report.resx => FormAppointmentReport.resx} | 4 +- .../FormCompaniesSpendingReport.Designer.cs | 111 ++++++++++++++++ .../Forms/FormCompaniesSpendingReport.cs | 54 ++++++++ .../Forms/FormCompaniesSpendingReport.resx | 120 ++++++++++++++++++ .../Forms/FormDirectoryReport.Designer.cs | 25 ++-- .../Forms/FormDirectoryReport.resx | 4 +- .../ITServiceManager/Reports/ChartReport.cs | 80 ++++++++++++ .../ITServiceManager/Reports/DocReport.cs | 4 +- .../ITServiceManager/Reports/TableReport.cs | 70 +++++----- .../Implementations/OrderRepository.cs | 18 ++- 17 files changed, 540 insertions(+), 106 deletions(-) create mode 100644 ITServiceManager/ITServiceManager/Entities/TempOrder.cs rename ITServiceManager/ITServiceManager/Forms/{FormServiceReport.Designer.cs => FormAppointmentReport.Designer.cs} (71%) rename ITServiceManager/ITServiceManager/Forms/{FormServiceReport.cs => FormAppointmentReport.cs} (91%) rename ITServiceManager/ITServiceManager/Forms/{FormServiceReport.resx => FormAppointmentReport.resx} (99%) create mode 100644 ITServiceManager/ITServiceManager/Forms/FormCompaniesSpendingReport.Designer.cs create mode 100644 ITServiceManager/ITServiceManager/Forms/FormCompaniesSpendingReport.cs create mode 100644 ITServiceManager/ITServiceManager/Forms/FormCompaniesSpendingReport.resx create mode 100644 ITServiceManager/ITServiceManager/Reports/ChartReport.cs diff --git a/ITServiceManager/ITServiceManager/Entities/Order.cs b/ITServiceManager/ITServiceManager/Entities/Order.cs index 978bccc..65ccd77 100644 --- a/ITServiceManager/ITServiceManager/Entities/Order.cs +++ b/ITServiceManager/ITServiceManager/Entities/Order.cs @@ -20,4 +20,17 @@ public class Order OrderService = orderService }; } + + public static Order CreateOperation(TempOrder tempOrder, IEnumerable orderService) + { + return new Order + { + Id = tempOrder.Id, + CompanyId = tempOrder.CompanyId, + Date = tempOrder.Date, + Price = tempOrder.Price, + OrderService = orderService + }; + } + } diff --git a/ITServiceManager/ITServiceManager/Entities/TempOrder.cs b/ITServiceManager/ITServiceManager/Entities/TempOrder.cs new file mode 100644 index 0000000..761b835 --- /dev/null +++ b/ITServiceManager/ITServiceManager/Entities/TempOrder.cs @@ -0,0 +1,12 @@ +namespace ITServiceManager.Entities; + +public class TempOrder +{ + public int Id { get; private set; } + public int CompanyId { get; private set; } + public int ServiceId { get; private set; } + public DateTime Date { get; private set; } + public decimal Price { get; private set; } + public int Quantity { get; private set; } + public DateTime ExecutionTime { get; private set; } +} diff --git a/ITServiceManager/ITServiceManager/FormItCompany.Designer.cs b/ITServiceManager/ITServiceManager/FormItCompany.Designer.cs index add9b2f..a1b7641 100644 --- a/ITServiceManager/ITServiceManager/FormItCompany.Designer.cs +++ b/ITServiceManager/ITServiceManager/FormItCompany.Designer.cs @@ -39,15 +39,18 @@ отчетыToolStripMenuItem = new ToolStripMenuItem(); DocumentReportToolStripMenuItem = new ToolStripMenuItem(); TableReportToolStripMenuItem = new ToolStripMenuItem(); + ChartReportToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); SuspendLayout(); // // menuStrip1 // + menuStrip1.ImageScalingSize = new Size(20, 20); menuStrip1.Items.AddRange(new ToolStripItem[] { справочникиToolStripMenuItem, операцииToolStripMenuItem, отчетыToolStripMenuItem }); menuStrip1.Location = new Point(0, 0); menuStrip1.Name = "menuStrip1"; - menuStrip1.Size = new Size(784, 24); + menuStrip1.Padding = new Padding(7, 3, 0, 3); + menuStrip1.Size = new Size(896, 30); menuStrip1.TabIndex = 0; menuStrip1.Text = "menuStrip1"; // @@ -55,27 +58,27 @@ // справочникиToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { компанииToolStripMenuItem, сотрудникиToolStripMenuItem, услугиToolStripMenuItem }); справочникиToolStripMenuItem.Name = "справочникиToolStripMenuItem"; - справочникиToolStripMenuItem.Size = new Size(94, 20); + справочникиToolStripMenuItem.Size = new Size(117, 24); справочникиToolStripMenuItem.Text = "Справочники"; // // компанииToolStripMenuItem // компанииToolStripMenuItem.Name = "компанииToolStripMenuItem"; - компанииToolStripMenuItem.Size = new Size(140, 22); + компанииToolStripMenuItem.Size = new Size(174, 26); компанииToolStripMenuItem.Text = "Компании"; компанииToolStripMenuItem.Click += CompaniesToolStripMenuItem_Click; // // сотрудникиToolStripMenuItem // сотрудникиToolStripMenuItem.Name = "сотрудникиToolStripMenuItem"; - сотрудникиToolStripMenuItem.Size = new Size(140, 22); + сотрудникиToolStripMenuItem.Size = new Size(174, 26); сотрудникиToolStripMenuItem.Text = "Сотрудники"; сотрудникиToolStripMenuItem.Click += EmployeesToolStripMenuItem_Click; // // услугиToolStripMenuItem // услугиToolStripMenuItem.Name = "услугиToolStripMenuItem"; - услугиToolStripMenuItem.Size = new Size(140, 22); + услугиToolStripMenuItem.Size = new Size(174, 26); услугиToolStripMenuItem.Text = "Услуги"; услугиToolStripMenuItem.Click += ServicesToolStripMenuItem_Click; // @@ -83,53 +86,61 @@ // операцииToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { заказыToolStripMenuItem, назначениеСотрудниковToolStripMenuItem }); операцииToolStripMenuItem.Name = "операцииToolStripMenuItem"; - операцииToolStripMenuItem.Size = new Size(75, 20); + операцииToolStripMenuItem.Size = new Size(95, 24); операцииToolStripMenuItem.Text = "Операции"; // // заказыToolStripMenuItem // заказыToolStripMenuItem.Name = "заказыToolStripMenuItem"; - заказыToolStripMenuItem.Size = new Size(213, 22); + заказыToolStripMenuItem.Size = new Size(269, 26); заказыToolStripMenuItem.Text = "Заказы"; заказыToolStripMenuItem.Click += OrdersToolStripMenuItem_Click; // // назначениеСотрудниковToolStripMenuItem // назначениеСотрудниковToolStripMenuItem.Name = "назначениеСотрудниковToolStripMenuItem"; - назначениеСотрудниковToolStripMenuItem.Size = new Size(213, 22); + назначениеСотрудниковToolStripMenuItem.Size = new Size(269, 26); назначениеСотрудниковToolStripMenuItem.Text = "Назначение сотрудников"; назначениеСотрудниковToolStripMenuItem.Click += AppointmentsToolStripMenuItem_Click; // // отчетыToolStripMenuItem // - отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { DocumentReportToolStripMenuItem, TableReportToolStripMenuItem }); + отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { DocumentReportToolStripMenuItem, TableReportToolStripMenuItem, ChartReportToolStripMenuItem }); отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - отчетыToolStripMenuItem.Size = new Size(60, 20); + отчетыToolStripMenuItem.Size = new Size(73, 24); отчетыToolStripMenuItem.Text = "Отчеты"; // // DocumentReportToolStripMenuItem // DocumentReportToolStripMenuItem.Name = "DocumentReportToolStripMenuItem"; - DocumentReportToolStripMenuItem.Size = new Size(239, 22); + DocumentReportToolStripMenuItem.Size = new Size(317, 26); DocumentReportToolStripMenuItem.Text = "Документ со справочниками"; DocumentReportToolStripMenuItem.Click += DocumentReportToolStripMenuItem_Click; // // TableReportToolStripMenuItem // TableReportToolStripMenuItem.Name = "TableReportToolStripMenuItem"; - TableReportToolStripMenuItem.Size = new Size(239, 22); - TableReportToolStripMenuItem.Text = "Сводка по выполнению услуг"; + TableReportToolStripMenuItem.Size = new Size(317, 26); + TableReportToolStripMenuItem.Text = "Отчёт по использованию услуги"; TableReportToolStripMenuItem.Click += TableReportToolStripMenuItem_Click; // + // ChartReportToolStripMenuItem + // + ChartReportToolStripMenuItem.Name = "ChartReportToolStripMenuItem"; + ChartReportToolStripMenuItem.Size = new Size(317, 26); + ChartReportToolStripMenuItem.Text = "Учёт компаний"; + ChartReportToolStripMenuItem.Click += ChartReportToolStripMenuItem_Click; + // // FormItCompany // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; BackgroundImage = Properties.Resources.company; BackgroundImageLayout = ImageLayout.Stretch; - ClientSize = new Size(784, 411); + ClientSize = new Size(896, 548); Controls.Add(menuStrip1); MainMenuStrip = menuStrip1; + Margin = new Padding(3, 4, 3, 4); Name = "FormItCompany"; StartPosition = FormStartPosition.CenterScreen; Text = "IT компания"; @@ -152,5 +163,6 @@ private ToolStripMenuItem отчетыToolStripMenuItem; private ToolStripMenuItem DocumentReportToolStripMenuItem; private ToolStripMenuItem TableReportToolStripMenuItem; + private ToolStripMenuItem ChartReportToolStripMenuItem; } } diff --git a/ITServiceManager/ITServiceManager/FormItCompany.cs b/ITServiceManager/ITServiceManager/FormItCompany.cs index eea4adb..ec8c1b4 100644 --- a/ITServiceManager/ITServiceManager/FormItCompany.cs +++ b/ITServiceManager/ITServiceManager/FormItCompany.cs @@ -88,7 +88,26 @@ namespace ITServiceManager private void TableReportToolStripMenuItem_Click(object sender, EventArgs e) { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + private void ChartReportToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); + } } } } diff --git a/ITServiceManager/ITServiceManager/FormItCompany.resx b/ITServiceManager/ITServiceManager/FormItCompany.resx index b48baf1..a0623c8 100644 --- a/ITServiceManager/ITServiceManager/FormItCompany.resx +++ b/ITServiceManager/ITServiceManager/FormItCompany.resx @@ -1,7 +1,7 @@  + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ITServiceManager/ITServiceManager/Forms/FormDirectoryReport.Designer.cs b/ITServiceManager/ITServiceManager/Forms/FormDirectoryReport.Designer.cs index 5829379..f56f968 100644 --- a/ITServiceManager/ITServiceManager/Forms/FormDirectoryReport.Designer.cs +++ b/ITServiceManager/ITServiceManager/Forms/FormDirectoryReport.Designer.cs @@ -36,9 +36,10 @@ // // buttonBuild // - buttonBuild.Location = new Point(178, 61); + buttonBuild.Location = new Point(185, 63); + buttonBuild.Margin = new Padding(3, 4, 3, 4); buttonBuild.Name = "buttonBuild"; - buttonBuild.Size = new Size(102, 23); + buttonBuild.Size = new Size(137, 31); buttonBuild.TabIndex = 0; buttonBuild.Text = "Сформировать"; buttonBuild.UseVisualStyleBackColor = true; @@ -47,9 +48,10 @@ // checkBoxCompanies // checkBoxCompanies.AutoSize = true; - checkBoxCompanies.Location = new Point(38, 12); + checkBoxCompanies.Location = new Point(43, 16); + checkBoxCompanies.Margin = new Padding(3, 4, 3, 4); checkBoxCompanies.Name = "checkBoxCompanies"; - checkBoxCompanies.Size = new Size(83, 19); + checkBoxCompanies.Size = new Size(104, 24); checkBoxCompanies.TabIndex = 1; checkBoxCompanies.Text = "Компании"; checkBoxCompanies.UseVisualStyleBackColor = true; @@ -57,9 +59,10 @@ // checkBoxEmployees // checkBoxEmployees.AutoSize = true; - checkBoxEmployees.Location = new Point(38, 50); + checkBoxEmployees.Location = new Point(43, 67); + checkBoxEmployees.Margin = new Padding(3, 4, 3, 4); checkBoxEmployees.Name = "checkBoxEmployees"; - checkBoxEmployees.Size = new Size(92, 19); + checkBoxEmployees.Size = new Size(113, 24); checkBoxEmployees.TabIndex = 2; checkBoxEmployees.Text = "Сотрудники"; checkBoxEmployees.UseVisualStyleBackColor = true; @@ -67,22 +70,24 @@ // checkBoxServices // checkBoxServices.AutoSize = true; - checkBoxServices.Location = new Point(38, 92); + checkBoxServices.Location = new Point(43, 123); + checkBoxServices.Margin = new Padding(3, 4, 3, 4); checkBoxServices.Name = "checkBoxServices"; - checkBoxServices.Size = new Size(64, 19); + checkBoxServices.Size = new Size(77, 24); checkBoxServices.TabIndex = 3; checkBoxServices.Text = "Услуги"; checkBoxServices.UseVisualStyleBackColor = true; // // FormDirectoryReport // - AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(292, 123); + ClientSize = new Size(334, 164); Controls.Add(checkBoxServices); Controls.Add(checkBoxEmployees); Controls.Add(checkBoxCompanies); Controls.Add(buttonBuild); + Margin = new Padding(3, 4, 3, 4); Name = "FormDirectoryReport"; Text = "FormDirectotyReport"; ResumeLayout(false); diff --git a/ITServiceManager/ITServiceManager/Forms/FormDirectoryReport.resx b/ITServiceManager/ITServiceManager/Forms/FormDirectoryReport.resx index 8b2ff64..af32865 100644 --- a/ITServiceManager/ITServiceManager/Forms/FormDirectoryReport.resx +++ b/ITServiceManager/ITServiceManager/Forms/FormDirectoryReport.resx @@ -1,7 +1,7 @@