diff --git a/ProjectShedule/ProjectShedule/Entities/CurriculumSubject.cs b/ProjectShedule/ProjectShedule/Entities/CurriculumSubject.cs index f5099f4..b190bf8 100644 --- a/ProjectShedule/ProjectShedule/Entities/CurriculumSubject.cs +++ b/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 }; } diff --git a/ProjectShedule/ProjectShedule/FormSchedulingBureau.Designer.cs b/ProjectShedule/ProjectShedule/FormSchedulingBureau.Designer.cs index 7f38ef2..3c6f151 100644 --- a/ProjectShedule/ProjectShedule/FormSchedulingBureau.Designer.cs +++ b/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; } } diff --git a/ProjectShedule/ProjectShedule/FormSchedulingBureau.cs b/ProjectShedule/ProjectShedule/FormSchedulingBureau.cs index bc7bdec..d648dfa 100644 --- a/ProjectShedule/ProjectShedule/FormSchedulingBureau.cs +++ b/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().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", + MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } } } diff --git a/ProjectShedule/ProjectShedule/Forms/FormCurriculumSubject.cs b/ProjectShedule/ProjectShedule/Forms/FormCurriculumSubject.cs index 8dfffe9..afcc79e 100644 --- a/ProjectShedule/ProjectShedule/Forms/FormCurriculumSubject.cs +++ b/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) diff --git a/ProjectShedule/ProjectShedule/Forms/FormCurriculumSubjectDistributionReport.Designer.cs b/ProjectShedule/ProjectShedule/Forms/FormCurriculumSubjectDistributionReport.Designer.cs new file mode 100644 index 0000000..0574e9b --- /dev/null +++ b/ProjectShedule/ProjectShedule/Forms/FormCurriculumSubjectDistributionReport.Designer.cs @@ -0,0 +1,110 @@ +namespace ProjectShedule.Forms +{ + partial class FormCurriculumSubjectDistributionReport + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + 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; + } +} \ No newline at end of file diff --git a/ProjectShedule/ProjectShedule/Forms/FormCurriculumSubjectDistributionReport.cs b/ProjectShedule/ProjectShedule/Forms/FormCurriculumSubjectDistributionReport.cs new file mode 100644 index 0000000..1af7f13 --- /dev/null +++ b/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().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); + } + } + } +} diff --git a/ProjectShedule/ProjectShedule/Forms/FormCurriculumSubjectDistributionReport.resx b/ProjectShedule/ProjectShedule/Forms/FormCurriculumSubjectDistributionReport.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectShedule/ProjectShedule/Forms/FormCurriculumSubjectDistributionReport.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/ProjectShedule/ProjectShedule/ProjectShedule.csproj b/ProjectShedule/ProjectShedule/ProjectShedule.csproj index 9c7e82f..ced594c 100644 --- a/ProjectShedule/ProjectShedule/ProjectShedule.csproj +++ b/ProjectShedule/ProjectShedule/ProjectShedule.csproj @@ -16,6 +16,7 @@ + diff --git a/ProjectShedule/ProjectShedule/Reports/ChartReport.cs b/ProjectShedule/ProjectShedule/Reports/ChartReport.cs new file mode 100644 index 0000000..9a9d787 --- /dev/null +++ b/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 _logger; + + public ChartReport(ICurriculumSubjectRepository curriculumSubjectRepository, ISubjectRepository subjectRepository, ILogger 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(); + } +} diff --git a/ProjectShedule/ProjectShedule/Reports/PdfBuilder.cs b/ProjectShedule/ProjectShedule/Reports/PdfBuilder.cs new file mode 100644 index 0000000..36ba8f7 --- /dev/null +++ b/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; + } +} diff --git a/ProjectShedule/ProjectShedule/Repositories/Implementations/CurriculumSubjectRepository.cs b/ProjectShedule/ProjectShedule/Repositories/Implementations/CurriculumSubjectRepository.cs index 7929572..0b358f5 100644 --- a/ProjectShedule/ProjectShedule/Repositories/Implementations/CurriculumSubjectRepository.cs +++ b/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 - WHERE Id=@id"; - connection.Execute(queryDelete, new { id }); + DELETE FROM CurriculumSubject + WHERE Id = @id"; + connection.Execute(queryDelete, new { id }, transaction); + + transaction.Commit(); } catch (Exception ex) {