Сделанный вариант

ITServiceManager/ITServiceManager/Entities/Order.cs

@@ -20,4 +20,17 @@ public class Order
             OrderService = orderService
         };
     }
+
+    public static Order CreateOperation(TempOrder tempOrder, IEnumerable<OrderService> orderService)
+    {
+        return new Order
+        {
+            Id = tempOrder.Id,
+            CompanyId = tempOrder.CompanyId,
+            Date = tempOrder.Date,
+            Price = tempOrder.Price,
+            OrderService = orderService
+        };
+    }
+
 }

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

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.Size = new Size(317, 26);
-            TableReportToolStripMenuItem.Text = "Сводка по выполнению услуг";
+            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;
     }
 }

ITServiceManager/ITServiceManager/FormItCompany.cs

@@ -88,7 +88,26 @@ namespace ITServiceManager
 
         private void TableReportToolStripMenuItem_Click(object sender, EventArgs e)
         {
+            try
+            {
+                _container.Resolve<FormAppointmentReport>().ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
 
+        private void ChartReportToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                _container.Resolve<FormCompaniesSpendingReport>().ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
         }
     }
 }

ITServiceManager/ITServiceManager/Forms/FormAppointmentReport.Designer.cs

@@ -1,6 +1,6 @@
 namespace ITServiceManager.Forms
 {
-    partial class FormServiceReport
+    partial class FormAppointmentReport
     {
         /// <summary>
         /// Required designer variable.
@@ -38,96 +38,103 @@
             textBoxFilePath = new TextBox();
             buttonSelectFilePath = new Button();
             buttonMakeReport = new Button();
+            SuspendLayout();
             // 
             // labelFilePath
             // 
             labelFilePath.AutoSize = true;
-            labelFilePath.Location = new Point(21, 37);
+            labelFilePath.Location = new Point(24, 49);
             labelFilePath.Name = "labelFilePath";
-            labelFilePath.Size = new Size(87, 15);
+            labelFilePath.Size = new Size(109, 20);
             labelFilePath.TabIndex = 1;
             labelFilePath.Text = "Путь до файла";
             // 
             // labelService
             // 
             labelService.AutoSize = true;
-            labelService.Location = new Point(21, 97);
+            labelService.Location = new Point(24, 129);
             labelService.Name = "labelService";
-            labelService.Size = new Size(44, 15);
+            labelService.Size = new Size(54, 20);
             labelService.TabIndex = 2;
             labelService.Text = "Услуга";
             // 
             // labelDateStart
             // 
             labelDateStart.AutoSize = true;
-            labelDateStart.Location = new Point(21, 153);
+            labelDateStart.Location = new Point(24, 204);
             labelDateStart.Name = "labelDateStart";
-            labelDateStart.Size = new Size(74, 15);
+            labelDateStart.Size = new Size(94, 20);
             labelDateStart.TabIndex = 3;
             labelDateStart.Text = "Дата начала";
             // 
             // labelDateEnd
             // 
             labelDateEnd.AutoSize = true;
-            labelDateEnd.Location = new Point(21, 219);
+            labelDateEnd.Location = new Point(24, 292);
             labelDateEnd.Name = "labelDateEnd";
-            labelDateEnd.Size = new Size(68, 15);
+            labelDateEnd.Size = new Size(87, 20);
             labelDateEnd.TabIndex = 4;
             labelDateEnd.Text = "Дата конца";
             // 
             // comboBoxService
             // 
             comboBoxService.FormattingEnabled = true;
-            comboBoxService.Location = new Point(138, 97);
+            comboBoxService.Location = new Point(158, 129);
+            comboBoxService.Margin = new Padding(3, 4, 3, 4);
             comboBoxService.Name = "comboBoxService";
-            comboBoxService.Size = new Size(121, 23);
+            comboBoxService.Size = new Size(138, 28);
             comboBoxService.TabIndex = 5;
             // 
             // dateTimePickerStart
             // 
-            dateTimePickerStart.Location = new Point(138, 153);
+            dateTimePickerStart.Location = new Point(158, 204);
+            dateTimePickerStart.Margin = new Padding(3, 4, 3, 4);
             dateTimePickerStart.Name = "dateTimePickerStart";
-            dateTimePickerStart.Size = new Size(200, 23);
+            dateTimePickerStart.Size = new Size(228, 27);
             dateTimePickerStart.TabIndex = 6;
             // 
             // dateTimePickerEnd
             // 
-            dateTimePickerEnd.Location = new Point(138, 211);
+            dateTimePickerEnd.Location = new Point(158, 281);
+            dateTimePickerEnd.Margin = new Padding(3, 4, 3, 4);
             dateTimePickerEnd.Name = "dateTimePickerEnd";
-            dateTimePickerEnd.Size = new Size(200, 23);
+            dateTimePickerEnd.Size = new Size(228, 27);
             dateTimePickerEnd.TabIndex = 7;
             // 
             // textBoxFilePath
             // 
-            textBoxFilePath.Location = new Point(135, 38);
+            textBoxFilePath.Location = new Point(154, 51);
+            textBoxFilePath.Margin = new Padding(3, 4, 3, 4);
             textBoxFilePath.Name = "textBoxFilePath";
-            textBoxFilePath.Size = new Size(165, 23);
+            textBoxFilePath.Size = new Size(188, 27);
             textBoxFilePath.TabIndex = 8;
             // 
             // buttonSelectFilePath
             // 
-            buttonSelectFilePath.Location = new Point(308, 38);
+            buttonSelectFilePath.Location = new Point(352, 51);
+            buttonSelectFilePath.Margin = new Padding(3, 4, 3, 4);
             buttonSelectFilePath.Name = "buttonSelectFilePath";
-            buttonSelectFilePath.Size = new Size(30, 23);
+            buttonSelectFilePath.Size = new Size(34, 31);
             buttonSelectFilePath.TabIndex = 9;
             buttonSelectFilePath.UseVisualStyleBackColor = true;
             buttonSelectFilePath.Click += buttonSelectFilePath_Click;
             // 
             // buttonMakeReport
             // 
-            buttonMakeReport.Location = new Point(21, 256);
+            buttonMakeReport.Location = new Point(24, 341);
+            buttonMakeReport.Margin = new Padding(3, 4, 3, 4);
             buttonMakeReport.Name = "buttonMakeReport";
-            buttonMakeReport.Size = new Size(317, 23);
+            buttonMakeReport.Size = new Size(362, 31);
             buttonMakeReport.TabIndex = 10;
             buttonMakeReport.Text = "Сформировать";
             buttonMakeReport.UseVisualStyleBackColor = true;
             buttonMakeReport.Click += buttonMakeReport_Click;
             // 
-            // FormServiceReport
+            // FormAppointmentReport
             // 
-            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleDimensions = new SizeF(8F, 20F);
             AutoScaleMode = AutoScaleMode.Font;
-            ClientSize = new Size(366, 290);
+            ClientSize = new Size(418, 387);
             Controls.Add(buttonMakeReport);
             Controls.Add(buttonSelectFilePath);
             Controls.Add(textBoxFilePath);
@@ -138,8 +145,9 @@
             Controls.Add(labelDateStart);
             Controls.Add(labelService);
             Controls.Add(labelFilePath);
-            Name = "FormServiceReport";
+            Margin = new Padding(3, 4, 3, 4);
-            Text = "Сводка по выполнению услуг";
+            Name = "FormAppointmentReport";
+            Text = "Сводка по использованию услуги";
             ResumeLayout(false);
             PerformLayout();
         }

ITServiceManager/ITServiceManager/Forms/FormAppointmentReport.cs

@@ -4,16 +4,16 @@ using Unity;
 
 namespace ITServiceManager.Forms;
 
-public partial class FormServiceReport : Form
+public partial class FormAppointmentReport : Form
 {
     private readonly IUnityContainer _container;
 
-    public FormServiceReport(IUnityContainer container, IServiceRepository IServiceRepository)
+    public FormAppointmentReport(IUnityContainer container, IServiceRepository serviceRepository)
     {
         InitializeComponent();
         _container = container;
 
-        comboBoxService.DataSource = IServiceRepository.ReadServices();
+        comboBoxService.DataSource = serviceRepository.ReadServices();
         comboBoxService.DisplayMember = "Name";
         comboBoxService.ValueMember = "Id";
     }

ITServiceManager/ITServiceManager/Forms/FormCompaniesSpendingReport.Designer.cs

@@ -0,0 +1,111 @@
+namespace ITServiceManager.Forms
+{
+    partial class FormCompaniesSpendingReport
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            dateTimePicker = new DateTimePicker();
+            labelFileName = new Label();
+            buttonCreate = new Button();
+            buttonSelectFileName = new Button();
+            labelDate = new Label();
+            SuspendLayout();
+            // 
+            // dateTimePicker
+            // 
+            dateTimePicker.Location = new Point(119, 85);
+            dateTimePicker.Margin = new Padding(3, 4, 3, 4);
+            dateTimePicker.Name = "dateTimePicker";
+            dateTimePicker.Size = new Size(228, 27);
+            dateTimePicker.TabIndex = 7;
+            // 
+            // labelFileName
+            // 
+            labelFileName.AutoSize = true;
+            labelFileName.Location = new Point(119, 33);
+            labelFileName.Name = "labelFileName";
+            labelFileName.Size = new Size(45, 20);
+            labelFileName.TabIndex = 8;
+            labelFileName.Text = "Файл";
+            // 
+            // buttonCreate
+            // 
+            buttonCreate.Location = new Point(72, 141);
+            buttonCreate.Margin = new Padding(3, 4, 3, 4);
+            buttonCreate.Name = "buttonCreate";
+            buttonCreate.Size = new Size(362, 31);
+            buttonCreate.TabIndex = 11;
+            buttonCreate.Text = "Сформировать";
+            buttonCreate.UseVisualStyleBackColor = true;
+            buttonCreate.Click += buttonCreate_Click;
+            // 
+            // buttonSelectFileName
+            // 
+            buttonSelectFileName.Location = new Point(14, 28);
+            buttonSelectFileName.Margin = new Padding(3, 4, 3, 4);
+            buttonSelectFileName.Name = "buttonSelectFileName";
+            buttonSelectFileName.Size = new Size(98, 31);
+            buttonSelectFileName.TabIndex = 12;
+            buttonSelectFileName.Text = "Выбрать";
+            buttonSelectFileName.UseVisualStyleBackColor = true;
+            buttonSelectFileName.Click += buttonSelectFileName_Click;
+            // 
+            // labelDate
+            // 
+            labelDate.AutoSize = true;
+            labelDate.Location = new Point(41, 93);
+            labelDate.Name = "labelDate";
+            labelDate.Size = new Size(41, 20);
+            labelDate.TabIndex = 13;
+            labelDate.Text = "Дата";
+            // 
+            // FormOrderDistibutionReport
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(509, 185);
+            Controls.Add(labelDate);
+            Controls.Add(buttonSelectFileName);
+            Controls.Add(buttonCreate);
+            Controls.Add(labelFileName);
+            Controls.Add(dateTimePicker);
+            Margin = new Padding(3, 4, 3, 4);
+            Name = "FormOrderDistibutionReport";
+            Text = "Распределение услуг";
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private DateTimePicker dateTimePicker;
+        private Label labelFileName;
+        private Button buttonCreate;
+        private Button buttonSelectFileName;
+        private Label labelDate;
+    }
+}

ITServiceManager/ITServiceManager/Forms/FormCompaniesSpendingReport.cs

@@ -0,0 +1,54 @@
+using ITServiceManager.Reports;
+using Unity;
+
+namespace ITServiceManager.Forms;
+
+public partial class FormCompaniesSpendingReport : Form
+{
+    private string _fileName = string.Empty;
+    private readonly IUnityContainer _container;
+
+    public FormCompaniesSpendingReport(IUnityContainer container)
+    {
+        InitializeComponent();
+        _container = container ?? throw new ArgumentNullException(nameof(container));
+    }
+
+    private void buttonSelectFileName_Click(object sender, EventArgs e)
+    {
+        var sfd = new SaveFileDialog()
+        {
+            Filter = "Pdf Files | *.pdf"
+        };
+        if (sfd.ShowDialog() == DialogResult.OK)
+        {
+            _fileName = sfd.FileName;
+            labelFileName.Text = Path.GetFileName(_fileName);
+        }
+    }
+
+    private void buttonCreate_Click(object sender, EventArgs e)
+    {
+        try
+        {
+            if (string.IsNullOrWhiteSpace(_fileName))
+            {
+                throw new Exception("Отсутствует имя файла для отчета");
+            }
+            if (_container.Resolve<ChartReport>().CreateChart(_fileName, dateTimePicker.Value))
+            {
+                MessageBox.Show("Документ сформирован", "Формирование документа", MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+            else
+            {
+                MessageBox.Show("Возникли ошибки при формировании документа. Подробности в логах", "Формирование документа",
+                                MessageBoxButtons.OK, MessageBoxIcon.Information);
+            }
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Ошибка при создании очета",
+            MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
+}

ITServiceManager/ITServiceManager/Forms/FormCompaniesSpendingReport.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

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);

ITServiceManager/ITServiceManager/Reports/ChartReport.cs

@@ -0,0 +1,80 @@
+using ITServiceManager.Entities;
+using ITServiceManager.Repositories;
+using ITServiceManager.Repositories.Implementations;
+using Microsoft.Extensions.Logging;
+
+namespace ITServiceManager.Reports;
+
+public class ChartReport
+{
+    private readonly IOrderRepository _orderRepository;
+    private readonly ICompanyRepository _companyRepository;
+    private readonly ILogger<ChartReport> _logger;
+
+    public ChartReport(IOrderRepository orderRepository, ICompanyRepository companyRepository, ILogger<ChartReport> logger)
+    {
+        _orderRepository = orderRepository ?? throw new ArgumentNullException(nameof(orderRepository));
+        _companyRepository = companyRepository ?? throw new ArgumentNullException(nameof(companyRepository));
+        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
+    }
+
+    public bool CreateChart(string filePath, DateTime dateTime)
+    {
+        try
+        {
+            new PdfBuilder(filePath)
+                .AddHeader("Расходы компаний на заказы")
+                .AddPieChart("Компании и расходы", GetData(dateTime))
+                .Build();
+            return true;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Ошибка при формировании документа");
+            return false;
+        }
+    }
+
+    //private List<(string Caption, double Value)> GetData(DateTime dateTime)
+    //{
+    //    return _orderRepository
+    //     .ReadOrders()  // Получаем все заказы
+    //     .Where(order => order.Date.Date == dateTime.Date)  // Фильтруем по дате заказа
+    //     .SelectMany(order => order.OrderService)  // Разворачиваем список услуг в заказах
+    //     .GroupBy(service => service.ServiceId, (key, group) => new { ServiceId = key, Count = group.Sum(service => service.Quantity) })  // Группируем по ID услуги и суммируем количество
+    //     .Select(group =>
+    //     {
+    //         var service = _serviceRepository.ReadServiceById(group.ServiceId);  // Получаем информацию о услуге по ID
+    //         return (service.ServiceType.ToString(), (double)group.Count);  // Возвращаем название услуги и ее количество
+    //     })
+    //     .ToList();
+    //}
+
+    private List<(string Caption, double Value)> GetData(DateTime dateTime)
+    {
+        // Получаем заказы за указанную дату
+        var orders = _orderRepository
+            .ReadOrders()
+            .Where(order => order.Date.Date == dateTime.Date) // Фильтруем заказы по дате
+            .ToList();
+
+        // Группируем заказы по CompanyId и вычисляем общую сумму затрат
+        var groupedOrders = orders
+            .GroupBy(order => order.CompanyId)
+            .Select(group => new
+            {
+                CompanyId = group.Key,
+                TotalSpent = group.Sum(order => (double)order.Price) // Суммируем стоимость заказов
+            });
+
+        // Получаем названия компаний и формируем данные для диаграммы
+        return groupedOrders
+            .Select(group =>
+            {
+                var company = _companyRepository.ReadCompanyById(group.CompanyId); // Получаем информацию о компании
+                return (Caption: company.Name, Value: group.TotalSpent);
+            })
+            .ToList();
+    }
+
+}

ITServiceManager/ITServiceManager/Reports/DocReport.cs

@@ -26,11 +26,11 @@ public class DocReport
             var builder = new WordBuilder(filePath).AddHeader("Документ со справочниками");
             if (includeCompanies)
             {
-                builder.AddParagraph("Компании").AddTable([2400, 2400, 2400], GetCompanies());
+                builder.AddParagraph("Компании").AddTable([2400, 2400], GetCompanies());
             }
             if (includeServices)
             {
-                builder.AddParagraph("Услуги").AddTable([2400, 2400, 2400], GetServices());
+                builder.AddParagraph("Услуги").AddTable([2400, 2400], GetServices());
             }
             if (includeEmployees)
             {

ITServiceManager/ITServiceManager/Reports/TableReport.cs

@@ -1,6 +1,7 @@
 
 using ITServiceManager.Entities;
 using ITServiceManager.Repositories;
+using ITServiceManager.Repositories.Implementations;
 using Microsoft.Extensions.Logging;
 
 namespace ITServiceManager.Reports;
@@ -8,28 +9,26 @@ namespace ITServiceManager.Reports;
 public class TableReport
 {
     private readonly IOrderRepository _orderRepository;
-    private readonly IServiceRepository _serviceRepository;
     private readonly IAppointmentRepository _appointmentRepository;
     private readonly ILogger<TableReport> _logger;
-    internal static readonly string[] item = ["Услуга", "Количество выполнений"];
+    internal static readonly string[] item = ["Сотрудник", "Дата", "Количество"];
 
     public TableReport(IOrderRepository orderRepository,
-                        IServiceRepository serviceRepository, IAppointmentRepository appointmentRepository, ILogger<TableReport> logger)
+                        IAppointmentRepository appointmentRepository, ILogger<TableReport> logger)
     {
         _orderRepository = orderRepository ?? throw new ArgumentNullException(nameof(orderRepository));
-        _serviceRepository = serviceRepository ?? throw new ArgumentNullException(nameof(serviceRepository));
         _appointmentRepository = appointmentRepository ?? throw new ArgumentNullException(nameof(appointmentRepository));
         _logger = logger ?? throw new ArgumentNullException(nameof(logger));
     }
 
-    public bool CreateTable(string filePath, int materialId, DateTime startDate, DateTime endDate)
+    public bool CreateTable(string filePath, int employeeId, DateTime startDate, DateTime endDate)
     {
         try
         {
             new ExcelBuilder(filePath)
-                .AddHeader("Сводка по выполнению услуг", 0, 3)
+                .AddHeader("Сводка по обслуживанию услуг", 0, 3)
                 .AddParagraph("за период", 0)
-                .AddTable([10, 15, 15], GetData(materialId, startDate, endDate))
+                .AddTable([10, 30, 30], GetData(employeeId, startDate, endDate))
                 .Build();
             return true;
         }
@@ -42,38 +41,31 @@ public class TableReport
 
     private List<string[]> GetData(int serviceId, DateTime startDate, DateTime endDate)
     {
-        var orders = _orderRepository.ReadOrders(startDate, endDate);
-        var services = _serviceRepository.ReadServices();
-        var appointments = _appointmentRepository
-            .ReadAppointments()
-            .Where(appointment => appointment.StartDate >= startDate && appointment.EndDate <= endDate);
-        var serviceCounts = appointments
-            .Join(
-                _orderRepository.ReadOrders(), // Соединяем с заказами
-                appointment => appointment.OrderId, // По полю OrderId из Appointment
-                order => order.Id, // И Id из Order
-                (appointment, order) => order.OrderService // Берём список услуг из заказа
-            )
-            .SelectMany(orderServices => orderServices) // Разворачиваем список услуг
-            .GroupBy(service => service.ServiceId) // Группируем по услугам
-            .Select(group => new
-            {
-                ServiceName = _serviceRepository.ReadServiceById(group.Key).ServiceType.ToString(), // Название услуги
-                Count = group.Count() // Количество выполнений услуги
-            })
-            .ToList();
-
-        var data = new List<string[]> {item };
-        foreach (var service in serviceCounts)
-        {
-            data.Add(new string[] { service.ServiceName, service.Count.ToString() });
-        }
-
-        // Итоговая сумма выполненных услуг
-        var totalServices = serviceCounts.Sum(x => x.Count);
-        data.Add(new string[] { "Итого", totalServices.ToString() });
-
-        return data;
 
+        var data = _orderRepository
+            .ReadOrders()
+            .Where(order =>
+                order.Date >= startDate &&
+                order.Date <= endDate &&
+                order.OrderService.Any(service => service.ServiceId == serviceId))
+            .SelectMany(order => order.OrderService
+                .Where(service => service.ServiceId == serviceId)
+                .Select(service => new
+                {
+                    EmployeeId = _appointmentRepository
+                        .ReadAppointments()
+                        .FirstOrDefault(app => app.OrderId == order.Id)?.EmployeeId,
+                    Date = order.Date,
+                    Quantity = service.Quantity
+                }))
+            .OrderBy(result => result.Date);
+        return new List<string[]>() { item }
+                .Union(
+                    data
+                        .Select(x => new string[] { x.EmployeeId?.ToString() ?? "Не назначен", x.Date.ToString(), x.Quantity.ToString()}))
+                .Union(
+                    [["Всего", string.Empty, data.Sum(x => x.Quantity).ToString()]])
+                .ToList();
     }
+
 }

ITServiceManager/ITServiceManager/Repositories/Implementations/OrderRepository.cs

@@ -16,16 +16,24 @@ public class OrderRepository : IOrderRepository
         _connectionString = connectionString;
         _logger = logger;
     }
-    public IEnumerable<Order> ReadOrders(DateTime? dateForm = null, DateTime? dateTo = null, int? orderId = null, int? companyId = null)
+    public IEnumerable<Order> ReadOrders(DateTime? dateForm = null, DateTime? dateTo = null, int? serviceId = null, int? companyId = null)
     {
         _logger.LogInformation("Получение всех объектов");
         try
         {
             using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
-            var querySelect = @"SELECT * FROM Orders";
+            var querySelect = @"
-            var order = connection.Query<Order>(querySelect);
+                SELECT o.*,  os.serviceId, os.quantity 
-            _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(order));
+                FROM Orders AS o
-            return order;
+                INNER JOIN Order_Service AS os ON o.id = os.orderId
+                Where os.serviceId = @serviceId";
+            var orders = connection.Query<TempOrder>(querySelect);
+            _logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(orders));
+            return orders.GroupBy(x => x.Id, y => y,
+                (key, value) =>
+                Order.CreateOperation(value.First(),
+                value.Select(z =>
+                OrderService.CreateOperation(0, z.ServiceId, z.Quantity, z.ExecutionTime)))).ToList();
         }
         catch (Exception ex)
         {