третий шаг

This commit is contained in:
mara-1 2024-12-13 03:15:49 +04:00
parent 0ed0d71bc8
commit 596f40441a
8 changed files with 513 additions and 10 deletions

View File

@ -37,6 +37,9 @@
RacingHorsesToolStripMenuItem = new ToolStripMenuItem(); RacingHorsesToolStripMenuItem = new ToolStripMenuItem();
RaceEntryDetalisToolStripMenuItem = new ToolStripMenuItem(); RaceEntryDetalisToolStripMenuItem = new ToolStripMenuItem();
ReportsToolStripMenuItem = new ToolStripMenuItem(); ReportsToolStripMenuItem = new ToolStripMenuItem();
DirectoryReportToolStripMenuItem = new ToolStripMenuItem();
raceReportToolStripMenuItem = new ToolStripMenuItem();
raceDistributionToolStripMenuItem = new ToolStripMenuItem();
menuStrip1.SuspendLayout(); menuStrip1.SuspendLayout();
SuspendLayout(); SuspendLayout();
// //
@ -60,21 +63,21 @@
// JockeysToolStripMenuItem // JockeysToolStripMenuItem
// //
JockeysToolStripMenuItem.Name = "JockeysToolStripMenuItem"; JockeysToolStripMenuItem.Name = "JockeysToolStripMenuItem";
JockeysToolStripMenuItem.Size = new Size(224, 26); JockeysToolStripMenuItem.Size = new Size(195, 26);
JockeysToolStripMenuItem.Text = "Жокеи"; JockeysToolStripMenuItem.Text = "Жокеи";
JockeysToolStripMenuItem.Click += JockeysToolStripMenuItem_Click; JockeysToolStripMenuItem.Click += JockeysToolStripMenuItem_Click;
// //
// HorsesToolStripMenuItem // HorsesToolStripMenuItem
// //
HorsesToolStripMenuItem.Name = "HorsesToolStripMenuItem"; HorsesToolStripMenuItem.Name = "HorsesToolStripMenuItem";
HorsesToolStripMenuItem.Size = new Size(224, 26); HorsesToolStripMenuItem.Size = new Size(195, 26);
HorsesToolStripMenuItem.Text = "Лошади"; HorsesToolStripMenuItem.Text = "Лошади";
HorsesToolStripMenuItem.Click += HorsesToolStripMenuItem_Click; HorsesToolStripMenuItem.Click += HorsesToolStripMenuItem_Click;
// //
// RacesToolStripMenuItem // RacesToolStripMenuItem
// //
RacesToolStripMenuItem.Name = "RacesToolStripMenuItem"; RacesToolStripMenuItem.Name = "RacesToolStripMenuItem";
RacesToolStripMenuItem.Size = new Size(224, 26); RacesToolStripMenuItem.Size = new Size(195, 26);
RacesToolStripMenuItem.Text = "Соревнования"; RacesToolStripMenuItem.Text = "Соревнования";
RacesToolStripMenuItem.Click += RacesToolStripMenuItem_Click; RacesToolStripMenuItem.Click += RacesToolStripMenuItem_Click;
// //
@ -88,23 +91,48 @@
// RacingHorsesToolStripMenuItem // RacingHorsesToolStripMenuItem
// //
RacingHorsesToolStripMenuItem.Name = "RacingHorsesToolStripMenuItem"; RacingHorsesToolStripMenuItem.Name = "RacingHorsesToolStripMenuItem";
RacingHorsesToolStripMenuItem.Size = new Size(224, 26); RacingHorsesToolStripMenuItem.Size = new Size(218, 26);
RacingHorsesToolStripMenuItem.Text = "Участие лошадей"; RacingHorsesToolStripMenuItem.Text = "Участие лошадей";
RacingHorsesToolStripMenuItem.Click += RacingHorsesToolStripMenuItem_Click; RacingHorsesToolStripMenuItem.Click += RacingHorsesToolStripMenuItem_Click;
// //
// RaceEntryDetalisToolStripMenuItem // RaceEntryDetalisToolStripMenuItem
// //
RaceEntryDetalisToolStripMenuItem.Name = "RaceEntryDetalisToolStripMenuItem"; RaceEntryDetalisToolStripMenuItem.Name = "RaceEntryDetalisToolStripMenuItem";
RaceEntryDetalisToolStripMenuItem.Size = new Size(224, 26); RaceEntryDetalisToolStripMenuItem.Size = new Size(218, 26);
RaceEntryDetalisToolStripMenuItem.Text = "Заявки на участие"; RaceEntryDetalisToolStripMenuItem.Text = "Заявки на участие";
RaceEntryDetalisToolStripMenuItem.Click += RaceEntryDetalisToolStripMenuItem_Click; RaceEntryDetalisToolStripMenuItem.Click += RaceEntryDetalisToolStripMenuItem_Click;
// //
// ReportsToolStripMenuItem // ReportsToolStripMenuItem
// //
ReportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { DirectoryReportToolStripMenuItem, raceReportToolStripMenuItem, raceDistributionToolStripMenuItem });
ReportsToolStripMenuItem.Name = "ReportsToolStripMenuItem"; ReportsToolStripMenuItem.Name = "ReportsToolStripMenuItem";
ReportsToolStripMenuItem.Size = new Size(73, 24); ReportsToolStripMenuItem.Size = new Size(73, 24);
ReportsToolStripMenuItem.Text = "Отчеты"; ReportsToolStripMenuItem.Text = "Отчеты";
// //
// DirectoryReportToolStripMenuItem
//
DirectoryReportToolStripMenuItem.Name = "DirectoryReportToolStripMenuItem";
DirectoryReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.W;
DirectoryReportToolStripMenuItem.Size = new Size(355, 26);
DirectoryReportToolStripMenuItem.Text = "Документ со справочниками";
DirectoryReportToolStripMenuItem.Click += DirectoryReportToolStripMenuItem_Click;
//
// raceReportToolStripMenuItem
//
raceReportToolStripMenuItem.Name = "raceReportToolStripMenuItem";
raceReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.E;
raceReportToolStripMenuItem.Size = new Size(355, 26);
raceReportToolStripMenuItem.Text = "Движение соревнований";
raceReportToolStripMenuItem.Click += RaceReportToolStripMenuItem_Click;
//
// raceDistributionToolStripMenuItem
//
raceDistributionToolStripMenuItem.Name = "raceDistributionToolStripMenuItem";
raceDistributionToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.P;
raceDistributionToolStripMenuItem.Size = new Size(355, 26);
raceDistributionToolStripMenuItem.Text = "Распределение соревнований";
raceDistributionToolStripMenuItem.Click += RaceDistributionToolStripMenuItem_Click;
//
// FormHorseRacing // FormHorseRacing
// //
AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleDimensions = new SizeF(8F, 20F);
@ -133,5 +161,8 @@
private ToolStripMenuItem ReportsToolStripMenuItem; private ToolStripMenuItem ReportsToolStripMenuItem;
private ToolStripMenuItem RacingHorsesToolStripMenuItem; private ToolStripMenuItem RacingHorsesToolStripMenuItem;
private ToolStripMenuItem RaceEntryDetalisToolStripMenuItem; private ToolStripMenuItem RaceEntryDetalisToolStripMenuItem;
private ToolStripMenuItem DirectoryReportToolStripMenuItem;
private ToolStripMenuItem raceReportToolStripMenuItem;
private ToolStripMenuItem raceDistributionToolStripMenuItem;
} }
} }

View File

@ -8,11 +8,11 @@ namespace ProjectHorseRacingOrg
private readonly IUnityContainer _container; private readonly IUnityContainer _container;
public FormHorseRacing(IUnityContainer container) public FormHorseRacing(IUnityContainer container)
{ {
InitializeComponent(); InitializeComponent();
_container = container ?? _container = container ??
throw new ArgumentNullException(nameof(container)); throw new ArgumentNullException(nameof(container));
} }
private void JockeysToolStripMenuItem_Click(object sender, EventArgs e) private void JockeysToolStripMenuItem_Click(object sender, EventArgs e)
@ -85,7 +85,44 @@ namespace ProjectHorseRacingOrg
} }
} }
private void DirectoryReportToolStripMenuItem_Click(object sender, EventArgs e)
{
try
{
_container.Resolve<FormDirectoryReport>().ShowDialog();
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void RaceReportToolStripMenuItem_Click(object sender, EventArgs e)
{
try
{
_container.Resolve<FormRaceReport>().ShowDialog();
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
private void RaceDistributionToolStripMenuItem_Click(object sender, EventArgs e)
{
try
{
_container.Resolve<FormRaceEntryReport>().ShowDialog();
}
catch (Exception ex)
{
MessageBox.Show(ex.Message, "Îøèáêà ïðè çàãðóçêå",
MessageBoxButtons.OK, MessageBoxIcon.Error);
}
}
} }
} }

View File

@ -0,0 +1,107 @@
namespace ProjectHorseRacingOrg.Forms
{
partial class FormRaceEntryReport
{
/// <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()
{
buttonCreate = new Button();
buttonSelectFileName = new Button();
labelData = new Label();
labelFileName = new Label();
dateTimePicker = new DateTimePicker();
SuspendLayout();
//
// buttonCreate
//
buttonCreate.Location = new Point(132, 155);
buttonCreate.Name = "buttonCreate";
buttonCreate.Size = new Size(140, 29);
buttonCreate.TabIndex = 0;
buttonCreate.Text = "Сформировать";
buttonCreate.UseVisualStyleBackColor = true;
buttonCreate.Click += ButtonCreate_Click;
//
// buttonSelectFileName
//
buttonSelectFileName.Location = new Point(39, 30);
buttonSelectFileName.Name = "buttonSelectFileName";
buttonSelectFileName.Size = new Size(94, 29);
buttonSelectFileName.TabIndex = 1;
buttonSelectFileName.Text = "Выбрать";
buttonSelectFileName.UseVisualStyleBackColor = true;
buttonSelectFileName.Click += ButtonSelectFileName_Click;
//
// labelData
//
labelData.AutoSize = true;
labelData.Location = new Point(39, 100);
labelData.Name = "labelData";
labelData.Size = new Size(44, 20);
labelData.TabIndex = 2;
labelData.Text = "Дата:";
//
// labelFileName
//
labelFileName.AutoSize = true;
labelFileName.Location = new Point(166, 34);
labelFileName.Name = "labelFileName";
labelFileName.Size = new Size(45, 20);
labelFileName.TabIndex = 3;
labelFileName.Text = "Файл";
//
// dateTimePicker
//
dateTimePicker.Location = new Point(100, 100);
dateTimePicker.Name = "dateTimePicker";
dateTimePicker.Size = new Size(250, 27);
dateTimePicker.TabIndex = 4;
//
// FormRaceEntryReport
//
AutoScaleDimensions = new SizeF(8F, 20F);
AutoScaleMode = AutoScaleMode.Font;
ClientSize = new Size(402, 230);
Controls.Add(dateTimePicker);
Controls.Add(labelFileName);
Controls.Add(labelData);
Controls.Add(buttonSelectFileName);
Controls.Add(buttonCreate);
Name = "FormRaceEntryReport";
Text = "FormRaceEntryReport";
ResumeLayout(false);
PerformLayout();
}
#endregion
private Button buttonCreate;
private Button buttonSelectFileName;
private Label labelData;
private Label labelFileName;
private DateTimePicker dateTimePicker;
}
}

View File

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

View File

@ -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>

View File

@ -17,6 +17,7 @@
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Npgsql" Version="9.0.2" /> <PackageReference Include="Npgsql" Version="9.0.2" />
<PackageReference Include="PdfSharp.MigraDoc.Standard" Version="1.51.15" />
<PackageReference Include="Serilog" Version="4.2.0" /> <PackageReference Include="Serilog" Version="4.2.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0" /> <PackageReference Include="Serilog.Extensions.Logging" Version="9.0.0" />
<PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" /> <PackageReference Include="Serilog.Settings.Configuration" Version="9.0.0" />

View File

@ -0,0 +1,53 @@
using Microsoft.Extensions.Logging;
using ProjectHorseRacingOrg.Repositories;
using ProjectHorseRacingOrg.Repositories.Implementations;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ProjectHorseRacingOrg.Reports;
public class ChartReport
{
private readonly IRacingHorsesRepository _racingHorsesRepository;
private readonly ILogger<ChartReport> _logger;
public ChartReport(IRacingHorsesRepository racingHorsesRepository, ILogger<ChartReport> logger)
{
_racingHorsesRepository = racingHorsesRepository ??
throw new ArgumentNullException(nameof(racingHorsesRepository));
_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 _racingHorsesRepository
.ReadRacingHorses()
.Where(x => x.RacingDate.Date == dateTime.Date)
.GroupBy(x => x.HorseId, (key, group) => new {
Id = key,
Count = group.Sum(x => x.Result)
})
.Select(x => (x.Id.ToString(), (double)x.Count))
.ToList();
}
}

View File

@ -0,0 +1,88 @@
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;
namespace ProjectHorseRacingOrg.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.AddStyle("NormalBold", "Normal");
headerStyle.Font.Bold = true;
headerStyle.Font.Size = 14;
headerStyle.Font.Color = Colors.DeepPink;
}
}