конец или почти конец

ProjectPolyclinic/ProjectPolyclinic/FormPolyclinic.Designer.cs

@@ -39,6 +39,7 @@
             отчетыToolStripMenuItem = new ToolStripMenuItem();
             directoryReportToolStripMenuItem = new ToolStripMenuItem();
             visitingReportToolStripMenuItem = new ToolStripMenuItem();
+            повышениеКвалификацииToolStripMenuItem = new ToolStripMenuItem();
             menuStrip1.SuspendLayout();
             SuspendLayout();
             // 
@@ -102,7 +103,7 @@
             // 
             // отчетыToolStripMenuItem
             // 
-            отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { directoryReportToolStripMenuItem, visitingReportToolStripMenuItem });
+            отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { directoryReportToolStripMenuItem, visitingReportToolStripMenuItem, повышениеКвалификацииToolStripMenuItem });
             отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
             отчетыToolStripMenuItem.Size = new Size(60, 20);
             отчетыToolStripMenuItem.Text = "Отчеты";
@@ -123,6 +124,14 @@
             visitingReportToolStripMenuItem.Text = "Движение визитов";
             visitingReportToolStripMenuItem.Click += VisitingReportToolStripMenuItem_Click;
             // 
+            // повышениеКвалификацииToolStripMenuItem
+            // 
+            повышениеКвалификацииToolStripMenuItem.Name = "повышениеКвалификацииToolStripMenuItem";
+            повышениеКвалификацииToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.P;
+            повышениеКвалификацииToolStripMenuItem.Size = new Size(280, 22);
+            повышениеКвалификацииToolStripMenuItem.Text = "Повышение квалификации";
+            повышениеКвалификацииToolStripMenuItem.Click += ProfessionalDevelopmentDistributionToolStripMenuItem_Click;
+            // 
             // FormPolyclinic
             // 
             AutoScaleDimensions = new SizeF(7F, 15F);
@@ -154,5 +163,6 @@
         private ToolStripMenuItem отчетыToolStripMenuItem;
         private ToolStripMenuItem directoryReportToolStripMenuItem;
         private ToolStripMenuItem visitingReportToolStripMenuItem;
+        private ToolStripMenuItem повышениеКвалификацииToolStripMenuItem;
     }
 }

ProjectPolyclinic/ProjectPolyclinic/FormPolyclinic.cs

@@ -105,5 +105,18 @@ namespace ProjectPolyclinic
                 MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
+
+        private void ProfessionalDevelopmentDistributionToolStripMenuItem_Click(object sender, EventArgs e)
+        {
+            try
+            {
+                _container.Resolve<FormProfessionalDevelopmentDistributionReport>().ShowDialog();
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
+                MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
     }
 }

ProjectPolyclinic/ProjectPolyclinic/Forms/FormProfessionalDevelopmentDistributionReport.Designer.cs

@@ -0,0 +1,108 @@
+namespace ProjectPolyclinic.Forms
+{
+    partial class FormProfessionalDevelopmentDistributionReport
+    {
+        /// <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();
+            labelDate = new Label();
+            buttonCreate = new Button();
+            dateTimePicker = new DateTimePicker();
+            SuspendLayout();
+            // 
+            // buttonSelectFileName
+            // 
+            buttonSelectFileName.Location = new Point(46, 28);
+            buttonSelectFileName.Name = "buttonSelectFileName";
+            buttonSelectFileName.Size = new Size(75, 23);
+            buttonSelectFileName.TabIndex = 0;
+            buttonSelectFileName.Text = "Выбрать";
+            buttonSelectFileName.UseVisualStyleBackColor = true;
+            buttonSelectFileName.Click += ButtonSelectFileName_Click;
+            // 
+            // labelFileName
+            // 
+            labelFileName.AutoSize = true;
+            labelFileName.Location = new Point(152, 32);
+            labelFileName.Name = "labelFileName";
+            labelFileName.Size = new Size(36, 15);
+            labelFileName.TabIndex = 1;
+            labelFileName.Text = "Файл";
+            // 
+            // labelDate
+            // 
+            labelDate.AutoSize = true;
+            labelDate.Location = new Point(46, 79);
+            labelDate.Name = "labelDate";
+            labelDate.Size = new Size(38, 15);
+            labelDate.TabIndex = 2;
+            labelDate.Text = "Дата :";
+            // 
+            // buttonCreate
+            // 
+            buttonCreate.Location = new Point(113, 133);
+            buttonCreate.Name = "buttonCreate";
+            buttonCreate.Size = new Size(101, 23);
+            buttonCreate.TabIndex = 3;
+            buttonCreate.Text = "Сформировать";
+            buttonCreate.UseVisualStyleBackColor = true;
+            buttonCreate.Click += ButtonCreate_Click;
+            // 
+            // dateTimePicker
+            // 
+            dateTimePicker.Location = new Point(113, 79);
+            dateTimePicker.Name = "dateTimePicker";
+            dateTimePicker.Size = new Size(200, 23);
+            dateTimePicker.TabIndex = 4;
+            // 
+            // FormProfessionalDevelopmentDistributionReport
+            // 
+            AutoScaleDimensions = new SizeF(7F, 15F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(349, 178);
+            Controls.Add(dateTimePicker);
+            Controls.Add(buttonCreate);
+            Controls.Add(labelDate);
+            Controls.Add(labelFileName);
+            Controls.Add(buttonSelectFileName);
+            Name = "FormProfessionalDevelopmentDistributionReport";
+            StartPosition = FormStartPosition.CenterParent;
+            Text = "Повышение квалификации";
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private Button buttonSelectFileName;
+        private Label labelFileName;
+        private Label labelDate;
+        private Button buttonCreate;
+        private DateTimePicker dateTimePicker;
+    }
+}

ProjectPolyclinic/ProjectPolyclinic/Forms/FormProfessionalDevelopmentDistributionReport.cs

@@ -0,0 +1,72 @@
+using ProjectPolyclinic.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 ProjectPolyclinic.Forms
+{
+    public partial class FormProfessionalDevelopmentDistributionReport : Form
+    {
+        private string _fileName = string.Empty;
+        private readonly IUnityContainer _container;
+
+        public FormProfessionalDevelopmentDistributionReport(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);
+            }
+        }
+
+    }
+}
+

ProjectPolyclinic/ProjectPolyclinic/Forms/FormProfessionalDevelopmentDistributionReport.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>

ProjectPolyclinic/ProjectPolyclinic/Forms/FormVisitingReport.Designer.cs

@@ -143,7 +143,8 @@
             Controls.Add(dateTimePickerDateEnd);
             Controls.Add(dateTimePickerDateBegin);
             Name = "FormVisitingReport";
-            Text = "FormVisitingReport";
+            StartPosition = FormStartPosition.CenterParent;
+            Text = "Отчет по визитам";
             ResumeLayout(false);
             PerformLayout();
         }

ProjectPolyclinic/ProjectPolyclinic/ProjectPolyclinic.csproj

@@ -16,6 +16,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Npgsql" Version="9.0.1" />
+    <PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />
     <PackageReference Include="Serilog" Version="4.1.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="8.0.4" />

ProjectPolyclinic/ProjectPolyclinic/Reports/ChartReport.cs

@@ -0,0 +1,52 @@
+using Microsoft.Extensions.Logging;
+using ProjectPolyclinic.Repositories;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectPolyclinic.Reports;
+
+internal class ChartReport
+{
+    private readonly IProfessionalDevelopmentRepository _professionalDevelopmentRepository;
+    //private readonly IDoctorRepository _doctorRepository;
+    private readonly ILogger<ChartReport> _logger;
+    public ChartReport(IProfessionalDevelopmentRepository professionalDevelopmentRepository,
+    IDoctorRepository doctorRepository,
+    ILogger<ChartReport> logger)
+    {
+        _professionalDevelopmentRepository = professionalDevelopmentRepository ??
+            throw new ArgumentNullException(nameof(professionalDevelopmentRepository));
+        //_doctorRepository = doctorRepository ??
+          //  throw new ArgumentNullException(nameof(doctorRepository));
+        _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 _professionalDevelopmentRepository
+        .ReadProfessionalDevelopment()
+        .Where(x => x.ProfessionalDevelopmentTime.Date == dateTime.Date)
+        .GroupBy(x => x.DoctorId, (key, group) => new { Id = key, Count = group.Count() })
+        .Select(x => (x.Id.ToString(), (double)x.Count))
+        .ToList();
+    }
+}

ProjectPolyclinic/ProjectPolyclinic/Reports/ExcelBuilder.cs

@@ -34,7 +34,7 @@ internal class ExcelBuilder
     }
     public ExcelBuilder AddHeader(string header, int startIndex, int count)
     {
-        CreateCell(startIndex, _rowIndex, header,StyleIndex.SimpleTextWithoutBorder);
+        CreateCell(startIndex, _rowIndex, header,StyleIndex.BoldTextWithoutBorder);
         for (int i = startIndex + 1; i < startIndex + count; ++i)
         {
             CreateCell(i, _rowIndex, "",
@@ -80,7 +80,7 @@ internal class ExcelBuilder
         for (var j = 0; j < data.First().Length; ++j)
         {
             CreateCell(j, _rowIndex, data.First()[j],
-            StyleIndex.SimpleTextWithoutBorder);
+            StyleIndex.BoldTextWithBorder);
         }
         _rowIndex++;
         for (var i = 1; i < data.Count - 1; ++i)
@@ -95,7 +95,7 @@ internal class ExcelBuilder
         for (var j = 0; j < data.Last().Length; ++j)
         {
             CreateCell(j, _rowIndex, data.Last()[j],
-            StyleIndex.SimpleTextWithoutBorder);
+            StyleIndex.BoldTextWithBorder);
         }
         _rowIndex++;
         return this;

ProjectPolyclinic/ProjectPolyclinic/Reports/PdfBuilder.cs

@@ -0,0 +1,91 @@
+
+using MigraDoc.DocumentObjectModel;
+using MigraDoc.DocumentObjectModel.Shapes.Charts;
+using MigraDoc.Rendering;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Color = MigraDoc.DocumentObjectModel.Color;
+
+namespace ProjectPolyclinic.Reports;
+
+internal class PdfBuilder
+{
+    private readonly string _filePath;
+    private readonly Document _document;
+    public PdfBuilder(string filePath)
+    {
+        if (string.IsNullOrWhiteSpace(filePath))
+        {
+            throw new ArgumentNullException(nameof(filePath));
+        }
+        if (File.Exists(filePath))
+        {
+            File.Delete(filePath);
+        }
+        _filePath = filePath;
+        _document = new Document();
+        DefineStyles();
+    }
+    public PdfBuilder AddHeader(string header)
+    {
+        _document.AddSection().AddParagraph(header, "NormalBold");
+        return this;
+    }
+    public PdfBuilder AddPieChart(string title, List<(string Caption, double Value)> data)
+    {
+        if (data == null || data.Count == 0)
+        {
+            return this;
+        }
+        var chart = new Chart(ChartType.Pie2D);
+        var series = chart.SeriesCollection.AddSeries();
+        series.Add(data.Select(x => x.Value).ToArray());
+
+        var xseries = chart.XValues.AddXSeries();
+        xseries.Add(data.Select(x => x.Caption).ToArray());
+
+        chart.DataLabel.Type = DataLabelType.Percent;
+        chart.DataLabel.Position = DataLabelPosition.OutsideEnd;
+
+        chart.Width = Unit.FromCentimeter(16);
+        chart.Height = Unit.FromCentimeter(12);
+
+        chart.TopArea.AddParagraph(title);
+
+        chart.XAxis.MajorTickMark = TickMarkType.Outside;
+
+        chart.YAxis.MajorTickMark = TickMarkType.Outside;
+        chart.YAxis.HasMajorGridlines = true;
+
+        chart.PlotArea.LineFormat.Width = 1;
+        chart.PlotArea.LineFormat.Visible = true;
+
+        chart.TopArea.AddLegend();
+
+        _document.LastSection.Add(chart);
+        return this;
+    }
+
+    public void Build()
+    {
+        Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+        var renderer = new PdfDocumentRenderer(true)
+        {
+            Document = _document
+        };
+        renderer.RenderDocument();
+        renderer.PdfDocument.Save(_filePath);
+    }
+    private void DefineStyles()
+    {
+        var headerStyle = _document.AddStyle("NormalBold", "Normal");
+        headerStyle.Font.Bold = true;
+        headerStyle.Font.Size = 14;
+        headerStyle.Font.Color = Colors.DeepPink;
+    }
+}
+
+