PdfBuilder

ProjectShedule/ProjectShedule/Entities/CurriculumSubject.cs

@@ -27,7 +27,8 @@ public class CurriculumSubject
         { 
             Id = tempCurriculumSubject.Id,
             Date = tempCurriculumSubject.Date,
-            CurriculumId = tempCurriculumSubject.CurriculumId,             
+            CurriculumId = tempCurriculumSubject.CurriculumId,
+            Course = tempCurriculumSubject.Course,
             SubjectSubject = subjectSubject 
         };
     }

ProjectShedule/ProjectShedule/FormSchedulingBureau.Designer.cs

@@ -41,6 +41,7 @@
             отчетыToolStripMenuItem = new ToolStripMenuItem();
             directoryReportToolStripMenuItem = new ToolStripMenuItem();
             sheduleReportToolStripMenuItem = new ToolStripMenuItem();
+            lessonsCountToolStripMenuItem = new ToolStripMenuItem();
             menuStrip.SuspendLayout();
             SuspendLayout();
             // 
@@ -119,7 +120,7 @@
             // 
             // отчетыToolStripMenuItem
             // 
-            отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { directoryReportToolStripMenuItem, sheduleReportToolStripMenuItem });
+            отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { directoryReportToolStripMenuItem, sheduleReportToolStripMenuItem, lessonsCountToolStripMenuItem });
             отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem";
             отчетыToolStripMenuItem.Size = new Size(73, 24);
             отчетыToolStripMenuItem.Text = "Отчеты";
@@ -128,7 +129,7 @@
             // 
             directoryReportToolStripMenuItem.Name = "directoryReportToolStripMenuItem";
             directoryReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.W;
-            directoryReportToolStripMenuItem.Size = new Size(382, 26);
+            directoryReportToolStripMenuItem.Size = new Size(432, 26);
             directoryReportToolStripMenuItem.Text = "Документ со справочниками ";
             directoryReportToolStripMenuItem.Click += directoryReportToolStripMenuItem_Click;
             // 
@@ -140,6 +141,14 @@
             sheduleReportToolStripMenuItem.Text = "Cводка по прохождению учебного плана";
             sheduleReportToolStripMenuItem.Click += sheduleReportToolStripMenuItem_Click;
             // 
+            // lessonsCountToolStripMenuItem
+            // 
+            lessonsCountToolStripMenuItem.Name = "lessonsCountToolStripMenuItem";
+            lessonsCountToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.P;
+            lessonsCountToolStripMenuItem.Size = new Size(432, 26);
+            lessonsCountToolStripMenuItem.Text = "Количество занятий для дисциплин";
+            lessonsCountToolStripMenuItem.Click += lessonsCountToolStripMenuItem_Click;
+            // 
             // FormSchedulingBureau
             // 
             AutoScaleDimensions = new SizeF(8F, 20F);
@@ -173,5 +182,6 @@
         private ToolStripMenuItem createCurriculumToolStripMenuItem;
         private ToolStripMenuItem directoryReportToolStripMenuItem;
         private ToolStripMenuItem sheduleReportToolStripMenuItem;
+        private ToolStripMenuItem lessonsCountToolStripMenuItem;
     }
 }

ProjectShedule/ProjectShedule/FormSchedulingBureau.cs

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

ProjectShedule/ProjectShedule/Forms/FormCurriculumSubject.cs

@@ -26,8 +26,6 @@ namespace ProjectShedule.Forms
             ColumnSubject.DataSource = subjectRepository.ReadSubject();
             ColumnSubject.DisplayMember = "Name";
             ColumnSubject.ValueMember = "Id";
-
-
         }
 
         private void buttonSave_Click(object sender, EventArgs e)

ProjectShedule/ProjectShedule/Forms/FormCurriculumSubjectDistributionReport.Designer.cs

@@ -0,0 +1,110 @@
+namespace ProjectShedule.Forms
+{
+    partial class FormCurriculumSubjectDistributionReport
+    {
+        /// <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()
+        {
+            buttonBuild = new Button();
+            buttonFile = new Button();
+            labelFileName = new Label();
+            label1 = new Label();
+            dateTimePicker = new DateTimePicker();
+            SuspendLayout();
+            // 
+            // buttonBuild
+            // 
+            buttonBuild.Location = new Point(21, 111);
+            buttonBuild.Margin = new Padding(3, 4, 3, 4);
+            buttonBuild.Name = "buttonBuild";
+            buttonBuild.Size = new Size(275, 31);
+            buttonBuild.TabIndex = 9;
+            buttonBuild.Text = "Сформировать";
+            buttonBuild.UseVisualStyleBackColor = true;
+            buttonBuild.Click += buttonBuild_Click;
+            // 
+            // buttonFile
+            // 
+            buttonFile.Location = new Point(21, 14);
+            buttonFile.Margin = new Padding(3, 4, 3, 4);
+            buttonFile.Name = "buttonFile";
+            buttonFile.Size = new Size(86, 31);
+            buttonFile.TabIndex = 8;
+            buttonFile.Text = "Выбрать";
+            buttonFile.UseVisualStyleBackColor = true;
+            buttonFile.Click += buttonFile_Click;
+            // 
+            // labelFileName
+            // 
+            labelFileName.AutoSize = true;
+            labelFileName.Location = new Point(115, 19);
+            labelFileName.Name = "labelFileName";
+            labelFileName.Size = new Size(45, 20);
+            labelFileName.TabIndex = 7;
+            labelFileName.Text = "Файл";
+            // 
+            // label1
+            // 
+            label1.AutoSize = true;
+            label1.Location = new Point(21, 62);
+            label1.Name = "label1";
+            label1.Size = new Size(44, 20);
+            label1.TabIndex = 6;
+            label1.Text = "Дата:";
+            // 
+            // dateTimePicker
+            // 
+            dateTimePicker.Location = new Point(68, 57);
+            dateTimePicker.Margin = new Padding(3, 4, 3, 4);
+            dateTimePicker.Name = "dateTimePicker";
+            dateTimePicker.Size = new Size(228, 27);
+            dateTimePicker.TabIndex = 5;
+            // 
+            // FormCurriculumSubjectDistributionReport
+            // 
+            AutoScaleDimensions = new SizeF(8F, 20F);
+            AutoScaleMode = AutoScaleMode.Font;
+            ClientSize = new Size(323, 162);
+            Controls.Add(buttonBuild);
+            Controls.Add(buttonFile);
+            Controls.Add(labelFileName);
+            Controls.Add(label1);
+            Controls.Add(dateTimePicker);
+            Name = "FormCurriculumSubjectDistributionReport";
+            Text = "FormCurriculumSubjectDistributionReport";
+            ResumeLayout(false);
+            PerformLayout();
+        }
+
+        #endregion
+
+        private Button buttonBuild;
+        private Button buttonFile;
+        private Label labelFileName;
+        private Label label1;
+        private DateTimePicker dateTimePicker;
+    }
+}

ProjectShedule/ProjectShedule/Forms/FormCurriculumSubjectDistributionReport.cs

@@ -0,0 +1,59 @@
+using ProjectShedule.Reports;
+using Unity;
+
+namespace ProjectShedule.Forms
+{
+    public partial class FormCurriculumSubjectDistributionReport : Form
+    {
+        private string _fileName = string.Empty;
+        private readonly IUnityContainer _container;
+        public FormCurriculumSubjectDistributionReport(IUnityContainer container)
+        {
+            InitializeComponent();
+            _container = container ?? throw new ArgumentNullException(nameof(container));
+        }
+
+        private void buttonFile_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 buttonBuild_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);
+            }
+        }
+    }
+}

ProjectShedule/ProjectShedule/Forms/FormCurriculumSubjectDistributionReport.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>

ProjectShedule/ProjectShedule/ProjectShedule.csproj

@@ -16,6 +16,7 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="Npgsql" Version="8.0.5" />
+    <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" />

ProjectShedule/ProjectShedule/Reports/ChartReport.cs

@@ -0,0 +1,48 @@
+using Microsoft.Extensions.Logging;
+using ProjectShedule.Repositories;
+
+namespace ProjectShedule.Reports;
+
+internal class ChartReport
+{
+    private readonly ICurriculumSubjectRepository _curriculumSubjectRepository;
+    private readonly ISubjectRepository _subjectRepository;
+    private readonly ILogger<ChartReport> _logger;
+
+    public ChartReport(ICurriculumSubjectRepository curriculumSubjectRepository, ISubjectRepository subjectRepository, ILogger<ChartReport> logger)
+    {
+        _curriculumSubjectRepository = curriculumSubjectRepository ?? throw new ArgumentNullException(nameof(curriculumSubjectRepository));
+        _subjectRepository = subjectRepository ?? throw new ArgumentNullException(nameof(subjectRepository));
+        _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)
+    {
+        var subjectNames = _subjectRepository.ReadSubject()
+            .ToDictionary(f => f.Id, f => f.Name);
+
+        return _curriculumSubjectRepository
+            .ReadCurriculumSubject()
+            .Where(x => x.Date.Date == dateTime.Date)
+            .SelectMany(x => x.SubjectSubject)
+            .GroupBy(x => x.SubjectId)
+            .Select(g => (Caption: subjectNames[g.Key].ToString(), Value: (double)g.Sum(x => x.LessonsCount)))
+            .ToList();
+    }
+}

ProjectShedule/ProjectShedule/Reports/PdfBuilder.cs

@@ -0,0 +1,76 @@
+using MigraDoc.DocumentObjectModel;
+using MigraDoc.DocumentObjectModel.Shapes.Charts;
+using MigraDoc.Rendering;
+using System.Text;
+
+namespace ProjectShedule.Reports;
+
+public 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.Styles.AddStyle("NormalBold", "Normal");
+        headerStyle.Font.Bold = true;
+        headerStyle.Font.Size = 14;
+    }
+}

ProjectShedule/ProjectShedule/Repositories/Implementations/CurriculumSubjectRepository.cs

@@ -61,10 +61,19 @@ public class CurriculumSubjectRepository : ICurriculumSubjectRepository
         try
         {
             using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
+            connection.Open();
+            using var transaction = connection.BeginTransaction();
+            var queryDeleteSub = @"
+            DELETE FROM SubjectSubject
+            WHERE CurriculumSubjectId = @id";
+            connection.Execute(queryDeleteSub, new { id }, transaction);
+
             var queryDelete = @"
-                DELETE FROM CurriculumSubject
+            DELETE FROM CurriculumSubject
-                WHERE Id=@id";
+            WHERE Id = @id";
-            connection.Execute(queryDelete, new { id });
+            connection.Execute(queryDelete, new { id }, transaction);
+
+            transaction.Commit();
         }
         catch (Exception ex)
         {