ГОТОВОООООООООООООООО

Publication/Forms/FormMaterialsDistributionReport.Designer.cs

@@ -0,0 +1,109 @@
+namespace Publication.Forms
+{
+    partial class FormMaterialsDistributionReport
+    {
+        /// <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()
+        {
+            buttonSelectFileName = new Button();
+            labelFileName = new Label();
+            label1 = new Label();
+            dateTimePicker = new DateTimePicker();
+            buttonCreate = new Button();
+            SuspendLayout();
+            // 
+            // buttonSelectFileName
+            // 
+            buttonSelectFileName.BackColor = Color.FromArgb(192, 255, 192);
+            buttonSelectFileName.Location = new Point(12, 23);
+            buttonSelectFileName.Name = "buttonSelectFileName";
+            buttonSelectFileName.Size = new Size(129, 29);
+            buttonSelectFileName.TabIndex = 0;
+            buttonSelectFileName.Text = "Выбрать";
+            buttonSelectFileName.UseVisualStyleBackColor = false;
+            buttonSelectFileName.Click += ButtonSelectFileName_Click;
+            // 
+            // labelFileName
+            // 
+            labelFileName.AutoSize = true;
+            labelFileName.Location = new Point(179, 27);
+            labelFileName.Name = "labelFileName";
+            labelFileName.Size = new Size(45, 20);
+            labelFileName.TabIndex = 1;
+            labelFileName.Text = "Файл";
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new Point(12, 81);
+            label1.Name = "label1";
+            label1.Size = new Size(44, 20);
+            label1.TabIndex = 2;
+            label1.Text = "Дата:";
+            // 
+            // dateTimePicker
+            // 
+            dateTimePicker.Location = new Point(179, 76);
+            dateTimePicker.Name = "dateTimePicker";
+            dateTimePicker.Size = new Size(183, 27);
+            dateTimePicker.TabIndex = 3;
+            // 
+            // buttonCreate
+            // 
+            buttonCreate.BackColor = Color.FromArgb(192, 255, 192);
+            buttonCreate.Location = new Point(12, 146);
+            buttonCreate.Name = "buttonCreate";
+            buttonCreate.Size = new Size(350, 29);
+            buttonCreate.TabIndex = 4;
+            buttonCreate.Text = "Сформировать";
+            buttonCreate.UseVisualStyleBackColor = false;
+            buttonCreate.Click += ButtonCreate_Click;
+            // 
+            // FormMaterialsDistributionReport
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(395, 227);
+            Controls.Add(buttonCreate);
+            Controls.Add(dateTimePicker);
+            Controls.Add(label1);
+            Controls.Add(labelFileName);
+            Controls.Add(buttonSelectFileName);
+            Name = "FormMaterialsDistributionReport";
+            Text = "FormInvoiceDistributionReport";
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private Button buttonSelectFileName;
+        private Label labelFileName;
+        private Label label1;
+        private DateTimePicker dateTimePicker;
+        private Button buttonCreate;
+    }
+}

Publication/Forms/FormMaterialsDistributionReport.cs

@@ -0,0 +1,65 @@
+using Publication.Reports;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+using Unity;
+
+namespace Publication.Forms;
+
+public partial class FormMaterialsDistributionReport : Form
+{
+    private string _fileName = string.Empty;
+
+    private readonly IUnityContainer _container;
+
+    public FormMaterialsDistributionReport(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);
+        }
+    }
+}

Publication/Forms/FormMaterialsDistributionReport.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>

Publication/Forms/Publication.Designer.cs

@@ -40,6 +40,7 @@
             ReportsToolStripMenuItem = new ToolStripMenuItem();
             DirectoryReportToolStripMenuItem = new ToolStripMenuItem();
             CountReportToolStripMenuItem = new ToolStripMenuItem();
+            MaterialDistributionToolStripMenuItem = new ToolStripMenuItem();
             menuStrip.SuspendLayout();
             SuspendLayout();
             // 
@@ -94,7 +95,7 @@
             // 
             // ReportsToolStripMenuItem
             // 
-            ReportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { DirectoryReportToolStripMenuItem, CountReportToolStripMenuItem });
+            ReportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { DirectoryReportToolStripMenuItem, CountReportToolStripMenuItem, MaterialDistributionToolStripMenuItem });
             ReportsToolStripMenuItem.Name = "ReportsToolStripMenuItem";
             resources.ApplyResources(ReportsToolStripMenuItem, "ReportsToolStripMenuItem");
             // 
@@ -110,6 +111,12 @@
             resources.ApplyResources(CountReportToolStripMenuItem, "CountReportToolStripMenuItem");
             CountReportToolStripMenuItem.Click += CountReportToolStripMenuItem_Click;
             // 
+            // MaterialDistributionToolStripMenuItem
+            // 
+            MaterialDistributionToolStripMenuItem.Name = "MaterialDistributionToolStripMenuItem";
+            resources.ApplyResources(MaterialDistributionToolStripMenuItem, "MaterialDistributionToolStripMenuItem");
+            MaterialDistributionToolStripMenuItem.Click += MaterialDistributionToolStripMenuItem_Click;
+            // 
             // Publication
             // 
             resources.ApplyResources(this, "$this");
@@ -136,5 +143,6 @@
         private ToolStripMenuItem ReportsToolStripMenuItem;
         private ToolStripMenuItem DirectoryReportToolStripMenuItem;
         private ToolStripMenuItem CountReportToolStripMenuItem;
+        private ToolStripMenuItem MaterialDistributionToolStripMenuItem;
     }
 }

Publication/Forms/Publication.cs

@@ -105,4 +105,16 @@ public partial class Publication : Form
             MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå", MessageBoxButtons.OK, MessageBoxIcon.Error);
         }
     }
+
+    private void MaterialDistributionToolStripMenuItem_Click(object sender, EventArgs e)
+    {
+        try
+        {
+            unityContainer.Resolve<FormMaterialsDistributionReport>().ShowDialog();
+        }
+        catch (Exception ex)
+        {
+            MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+    }
 }

Publication/Forms/Publication.resx

@@ -121,12 +121,42 @@
     <value>17, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="CustomersToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>185, 26</value>
+  </data>
+  <data name="CustomersToolStripMenuItem.Text" xml:space="preserve">
+    <value>Заказчики</value>
+  </data>
+  <data name="MaterialsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>185, 26</value>
+  </data>
+  <data name="MaterialsToolStripMenuItem.Text" xml:space="preserve">
+    <value>Материалы</value>
+  </data>
+  <data name="PublishingHousesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>185, 26</value>
+  </data>
+  <data name="PublishingHousesToolStripMenuItem.Text" xml:space="preserve">
+    <value>Издательства</value>
+  </data>
   <data name="DictionsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>117, 24</value>
   </data>
   <data name="DictionsToolStripMenuItem.Text" xml:space="preserve">
     <value>Справочники</value>
   </data>
+  <data name="CreateOrderToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>188, 26</value>
+  </data>
+  <data name="CreateOrderToolStripMenuItem.Text" xml:space="preserve">
+    <value>Создать заказ</value>
+  </data>
+  <data name="PrintingToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>188, 26</value>
+  </data>
+  <data name="PrintingToolStripMenuItem.Text" xml:space="preserve">
+    <value>Печать</value>
+  </data>
   <data name="OperationsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>95, 24</value>
   </data>
@@ -152,6 +182,12 @@
   <data name="CountReportToolStripMenuItem.Text" xml:space="preserve">
     <value>Движение заказов</value>
   </data>
+  <data name="MaterialDistributionToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>350, 26</value>
+  </data>
+  <data name="MaterialDistributionToolStripMenuItem.Text" xml:space="preserve">
+    <value>Распределение материалов</value>
+  </data>
   <data name="ReportsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>73, 24</value>
   </data>
@@ -183,36 +219,6 @@
   <data name="&gt;&gt;menuStrip.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="CustomersToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>185, 26</value>
-  </data>
-  <data name="CustomersToolStripMenuItem.Text" xml:space="preserve">
-    <value>Заказчики</value>
-  </data>
-  <data name="MaterialsToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>185, 26</value>
-  </data>
-  <data name="MaterialsToolStripMenuItem.Text" xml:space="preserve">
-    <value>Материалы</value>
-  </data>
-  <data name="PublishingHousesToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>185, 26</value>
-  </data>
-  <data name="PublishingHousesToolStripMenuItem.Text" xml:space="preserve">
-    <value>Издательства</value>
-  </data>
-  <data name="CreateOrderToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>188, 26</value>
-  </data>
-  <data name="CreateOrderToolStripMenuItem.Text" xml:space="preserve">
-    <value>Создать заказ</value>
-  </data>
-  <data name="PrintingToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>188, 26</value>
-  </data>
-  <data name="PrintingToolStripMenuItem.Text" xml:space="preserve">
-    <value>Печать</value>
-  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -2247,6 +2253,12 @@
   <data name="&gt;&gt;CountReportToolStripMenuItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;MaterialDistributionToolStripMenuItem.Name" xml:space="preserve">
+    <value>MaterialDistributionToolStripMenuItem</value>
+  </data>
+  <data name="&gt;&gt;MaterialDistributionToolStripMenuItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>Publication</value>
   </data>

Publication/Reports/ChartReport.cs

@@ -1,4 +1,6 @@
 using Microsoft.Extensions.Logging;
+using Publication.Repositories;
+using Publication.Repositories.Implementations;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -9,11 +11,11 @@ namespace Publication.Reports;
 
 public class ChartReport
 {
-    /*private readonly IOrderRepository _invoiceRepository;
+    private readonly IMaterialRepository _materialRepository;
     private readonly ILogger<ChartReport> _logger;
-    public ChartReport(IInvoiceRepository invoiceRepository, ILogger<ChartReport> logger)
+    public ChartReport(IMaterialRepository materialRepository, ILogger<ChartReport> logger)
     {
-        _invoiceRepository = invoiceRepository ?? throw new ArgumentNullException(nameof(invoiceRepository));
+        _materialRepository = materialRepository ?? throw new ArgumentNullException(nameof(materialRepository));
         _logger = logger ?? throw new ArgumentNullException(nameof(logger));
     }
     public bool CreateChart(string filePath, DateTime dateTime)
@@ -21,8 +23,8 @@ public class ChartReport
         try
         {
             new PdfBuilder(filePath)
-            .AddHeader("Сумма покупки каждого клиента")
+            .AddHeader("Количество материалов")
-            .AddPieChart("Клиенты", GetData(dateTime))
+            .AddPieChart("Материалы", GetData(dateTime))
             .Build();
             return true;
         }
@@ -35,11 +37,11 @@ public class ChartReport
 
     private List<(string Caption, double Value)> GetData(DateTime dateTime)
     {
-        return _invoiceRepository
+        return _materialRepository
-            .ReadInvoices()
+            .ReadMaterials()
-            .Where(x => x.DateInvoice.Date == dateTime.Date)
+            .Where(x => x.DateMaterials.Date == dateTime.Date)
-            .GroupBy(x => x.ClientID, (key, group) => new { ID = key, Count = group.Sum(y => y.SellingPrice) })
+            .GroupBy(x => x.Id, (key, group) => new { ID = key, Count = group.Sum(y => y.Count) })
             .Select(x => (x.ID.ToString(), (double)x.Count))
             .ToList();
-    }*/
+    }
 }