diff --git a/FurnitureCompany/FurnitureCompany/FormFurnitureCompany.Designer.cs b/FurnitureCompany/FurnitureCompany/FormFurnitureCompany.Designer.cs index 10264be..f417623 100644 --- a/FurnitureCompany/FurnitureCompany/FormFurnitureCompany.Designer.cs +++ b/FurnitureCompany/FurnitureCompany/FormFurnitureCompany.Designer.cs @@ -39,6 +39,7 @@ отчётыToolStripMenuItem = new ToolStripMenuItem(); DirectoryReportToolStripMenuItem = new ToolStripMenuItem(); productReportToolStripMenuItem = new ToolStripMenuItem(); + productDistributionToolStripMenuItem = new ToolStripMenuItem(); menuStrip1.SuspendLayout(); SuspendLayout(); // @@ -103,7 +104,7 @@ // // отчётыToolStripMenuItem // - отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { DirectoryReportToolStripMenuItem, productReportToolStripMenuItem }); + отчётыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { DirectoryReportToolStripMenuItem, productReportToolStripMenuItem, productDistributionToolStripMenuItem }); отчётыToolStripMenuItem.Name = "отчётыToolStripMenuItem"; отчётыToolStripMenuItem.Size = new Size(73, 24); отчётыToolStripMenuItem.Text = "Отчёты"; @@ -124,6 +125,14 @@ productReportToolStripMenuItem.Text = "Движение изделий"; productReportToolStripMenuItem.Click += ProductReportToolStripMenuItem_Click; // + // productDistributionToolStripMenuItem + // + productDistributionToolStripMenuItem.Name = "распределениеИзделийToolStripMenuItem"; + productDistributionToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.P; + productDistributionToolStripMenuItem.Size = new Size(350, 26); + productDistributionToolStripMenuItem.Text = "Распределение изделий"; + productDistributionToolStripMenuItem.Click += ProductDistributionToolStripMenuItem_Click; + // // FormFurnitureCompany // AutoScaleDimensions = new SizeF(8F, 20F); @@ -155,5 +164,6 @@ private ToolStripMenuItem DeliveryToolStripMenuItem; private ToolStripMenuItem DirectoryReportToolStripMenuItem; private ToolStripMenuItem productReportToolStripMenuItem; + private ToolStripMenuItem productDistributionToolStripMenuItem; } } diff --git a/FurnitureCompany/FurnitureCompany/FormFurnitureCompany.cs b/FurnitureCompany/FurnitureCompany/FormFurnitureCompany.cs index 13c81aa..7249f81 100644 --- a/FurnitureCompany/FurnitureCompany/FormFurnitureCompany.cs +++ b/FurnitureCompany/FurnitureCompany/FormFurnitureCompany.cs @@ -97,5 +97,17 @@ namespace FurnitureCompany MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); } } + + private void ProductDistributionToolStripMenuItem_Click(object sender, EventArgs e) + { + try + { + _container.Resolve().ShowDialog(); + } + catch (Exception ex) + { + MessageBox.Show(ex.Message, " ", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } } } diff --git a/FurnitureCompany/FurnitureCompany/Forms/FormProductClientDistributionReport.Designer.cs b/FurnitureCompany/FurnitureCompany/Forms/FormProductClientDistributionReport.Designer.cs new file mode 100644 index 0000000..2839c90 --- /dev/null +++ b/FurnitureCompany/FurnitureCompany/Forms/FormProductClientDistributionReport.Designer.cs @@ -0,0 +1,107 @@ +namespace FurnitureCompany.Forms +{ + partial class FormProductClientDistributionReport + { + /// + /// 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() + { + dateTimePickerDate = new DateTimePicker(); + buttonCreate = new Button(); + labelDate = new Label(); + labelFile = new Label(); + buttonSelectFileName = new Button(); + SuspendLayout(); + // + // dateTimePickerDate + // + dateTimePickerDate.Location = new Point(76, 71); + dateTimePickerDate.Name = "dateTimePickerDate"; + dateTimePickerDate.Size = new Size(210, 27); + dateTimePickerDate.TabIndex = 0; + // + // buttonCreate + // + buttonCreate.Location = new Point(88, 124); + buttonCreate.Name = "buttonCreate"; + buttonCreate.Size = new Size(125, 29); + buttonCreate.TabIndex = 1; + buttonCreate.Text = "Сформировать"; + buttonCreate.UseVisualStyleBackColor = true; + buttonCreate.Click += ButtonCreate_Click; + // + // labelDate + // + labelDate.AutoSize = true; + labelDate.Location = new Point(26, 76); + labelDate.Name = "labelDate"; + labelDate.Size = new Size(44, 20); + labelDate.TabIndex = 2; + labelDate.Text = "Дата:"; + // + // labelFile + // + labelFile.AutoSize = true; + labelFile.Location = new Point(178, 27); + labelFile.Name = "labelFile"; + labelFile.Size = new Size(45, 20); + labelFile.TabIndex = 3; + labelFile.Text = "Файл"; + // + // buttonSelectFileName + // + buttonSelectFileName.Location = new Point(55, 23); + buttonSelectFileName.Name = "buttonSelectFileName"; + buttonSelectFileName.Size = new Size(94, 29); + buttonSelectFileName.TabIndex = 4; + buttonSelectFileName.Text = "Выбрать"; + buttonSelectFileName.UseVisualStyleBackColor = true; + buttonSelectFileName.Click += ButtonSelectFileName_Click; + // + // FormProductClientDistributionReport + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(319, 190); + Controls.Add(buttonSelectFileName); + Controls.Add(labelFile); + Controls.Add(labelDate); + Controls.Add(buttonCreate); + Controls.Add(dateTimePickerDate); + Name = "FormProductClientDistributionReport"; + Text = "Распределение изделий"; + ResumeLayout(false); + PerformLayout(); + } + + #endregion + + private DateTimePicker dateTimePickerDate; + private Button buttonCreate; + private Label labelDate; + private Label labelFile; + private Button buttonSelectFileName; + } +} \ No newline at end of file diff --git a/FurnitureCompany/FurnitureCompany/Forms/FormProductClientDistributionReport.cs b/FurnitureCompany/FurnitureCompany/Forms/FormProductClientDistributionReport.cs new file mode 100644 index 0000000..82fbf44 --- /dev/null +++ b/FurnitureCompany/FurnitureCompany/Forms/FormProductClientDistributionReport.cs @@ -0,0 +1,67 @@ +using FurnitureCompany.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 FurnitureCompany.Forms +{ + public partial class FormProductClientDistributionReport : Form + { + private string _fileName = string.Empty; + + private readonly IUnityContainer _container; + + public FormProductClientDistributionReport(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; + labelFile.Text = Path.GetFileName(_fileName); + } + } + + private void ButtonCreate_Click(object sender, EventArgs e) + { + try + { + if (string.IsNullOrWhiteSpace(_fileName)) + { + throw new Exception("Отсутствует имя файла для отчета"); + } + + if (_container.Resolve().CreateChart(_fileName, dateTimePickerDate.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/FurnitureCompany/FurnitureCompany/Forms/FormProductClientDistributionReport.resx b/FurnitureCompany/FurnitureCompany/Forms/FormProductClientDistributionReport.resx new file mode 100644 index 0000000..8b2ff64 --- /dev/null +++ b/FurnitureCompany/FurnitureCompany/Forms/FormProductClientDistributionReport.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/FurnitureCompany/FurnitureCompany/FurnitureCompany.csproj b/FurnitureCompany/FurnitureCompany/FurnitureCompany.csproj index b531b1e..aa15695 100644 --- a/FurnitureCompany/FurnitureCompany/FurnitureCompany.csproj +++ b/FurnitureCompany/FurnitureCompany/FurnitureCompany.csproj @@ -17,6 +17,7 @@ + diff --git a/FurnitureCompany/FurnitureCompany/Reports/ChartReport.cs b/FurnitureCompany/FurnitureCompany/Reports/ChartReport.cs new file mode 100644 index 0000000..823eb3e --- /dev/null +++ b/FurnitureCompany/FurnitureCompany/Reports/ChartReport.cs @@ -0,0 +1,50 @@ +using FurnitureCompany.Repositories; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace FurnitureCompany.Reports; + +internal class ChartReport +{ + private readonly IInvoiceRepository _invoiceRepository; + + private readonly ILogger _logger; + + public ChartReport(IInvoiceRepository invoiceRepository, ILogger logger) + { + _invoiceRepository = invoiceRepository ?? + throw new ArgumentNullException(nameof(invoiceRepository)); + _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 _invoiceRepository + .ReadInvoices() + .Where(x => x.Date.Date == dateTime.Date) + .GroupBy(x => x.ClientId, (key, group) => new { Id = key, Count = group.Sum(x => x.CountProduct) }) + .Select(x => (x.Id.ToString(), (double)x.Count)) + .ToList(); + } +} diff --git a/FurnitureCompany/FurnitureCompany/Reports/PdfBuilder.cs b/FurnitureCompany/FurnitureCompany/Reports/PdfBuilder.cs new file mode 100644 index 0000000..a9e87df --- /dev/null +++ b/FurnitureCompany/FurnitureCompany/Reports/PdfBuilder.cs @@ -0,0 +1,94 @@ +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 FurnitureCompany.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.Styles.AddStyle("NormalBold", "Normal"); + headerStyle.Font.Bold = true; + headerStyle.Font.Size = 14; + } +} diff --git a/FurnitureCompany/FurnitureCompany/Reports/TableReport.cs b/FurnitureCompany/FurnitureCompany/Reports/TableReport.cs index 4eb75b5..f8a096d 100644 --- a/FurnitureCompany/FurnitureCompany/Reports/TableReport.cs +++ b/FurnitureCompany/FurnitureCompany/Reports/TableReport.cs @@ -34,9 +34,9 @@ internal class TableReport try { new ExcelBuilder(filePath) - .AddHeader("Сводка по доставке изделий", 0, 2) + .AddHeader("Сводка по доставке изделий", 0, 4) .AddParagraph("за период", 0) - .AddTable([10, 10, 15], GetData(productId, startDate, endDate)) + .AddTable([10, 10, 15, 15], GetData(productId, startDate, endDate)) .Build(); return true; @@ -66,7 +66,7 @@ internal class TableReport data .Select(x => new string[] { x.WorkerId.ToString(), x.Date.ToString(), x.CountIn?.ToString() ?? string.Empty, x.CountOut?.ToString() ?? string.Empty })) .Union( - [["Всего", data.Sum(x => x.CountIn ?? 0).ToString(), data.Sum(x => x.CountOut ?? 0).ToString()]]) + [["Всего", "", data.Sum(x => x.CountIn ?? 0).ToString(), data.Sum(x => x.CountOut ?? 0).ToString()]]) .ToList(); } }