From cbc46a25560e62ab65791f5267ba4913758aed28 Mon Sep 17 00:00:00 2001 From: malimova Date: Thu, 11 Apr 2024 22:16:06 +0400 Subject: [PATCH 01/20] =?UTF-8?q?=D0=9D=D0=B0=D1=87=D0=B0=D0=BB=D0=BE=20La?= =?UTF-8?q?b4.=20Report-=20classes?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BindingModels/ReportBindingModel.cs | 16 ++++++++++++++++ .../BindingModels/ReportOrdersViewModel.cs | 16 ++++++++++++++++ .../ReportPastryComponentViewModel.cs | 15 +++++++++++++++ 3 files changed, 47 insertions(+) create mode 100644 Confectionery/ConfectioneryContracts/BindingModels/ReportBindingModel.cs create mode 100644 Confectionery/ConfectioneryContracts/BindingModels/ReportOrdersViewModel.cs create mode 100644 Confectionery/ConfectioneryContracts/BindingModels/ReportPastryComponentViewModel.cs diff --git a/Confectionery/ConfectioneryContracts/BindingModels/ReportBindingModel.cs b/Confectionery/ConfectioneryContracts/BindingModels/ReportBindingModel.cs new file mode 100644 index 0000000..a2f79c8 --- /dev/null +++ b/Confectionery/ConfectioneryContracts/BindingModels/ReportBindingModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ConfectioneryContracts.BindingModels +{ + public class ReportBindingModel + { + public string FileName { get; set; } = string.Empty; + public DateTime? DateFrom { get; set; } + public DateTime? DateTo { get; set; } + + } +} diff --git a/Confectionery/ConfectioneryContracts/BindingModels/ReportOrdersViewModel.cs b/Confectionery/ConfectioneryContracts/BindingModels/ReportOrdersViewModel.cs new file mode 100644 index 0000000..bfb537c --- /dev/null +++ b/Confectionery/ConfectioneryContracts/BindingModels/ReportOrdersViewModel.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ConfectioneryContracts.BindingModels +{ + public class ReportOrdersViewModel + { + public int Id { get; set; } + public DateTime DateCreate { get; set; } + public string PastryName { get; set; } = string.Empty; + public double Sum { get; set; } + } +} diff --git a/Confectionery/ConfectioneryContracts/BindingModels/ReportPastryComponentViewModel.cs b/Confectionery/ConfectioneryContracts/BindingModels/ReportPastryComponentViewModel.cs new file mode 100644 index 0000000..bc147f6 --- /dev/null +++ b/Confectionery/ConfectioneryContracts/BindingModels/ReportPastryComponentViewModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ConfectioneryContracts.BindingModels +{ + public class ReportPastryComponentViewModel + { + public string ComponentName { get; set; } = string.Empty; + public int TotalCount { get; set; } + public List> Pastrys { get; set; } = new(); + } +} -- 2.25.1 From ac3182b886cfecf3b4cd92192c46f5e4017bcb36 Mon Sep 17 00:00:00 2001 From: malimova Date: Thu, 11 Apr 2024 22:20:53 +0400 Subject: [PATCH 02/20] IReportLogic --- .../BusinessLogicsContracts/IReportLogic.cs | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IReportLogic.cs diff --git a/Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IReportLogic.cs b/Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IReportLogic.cs new file mode 100644 index 0000000..49db05a --- /dev/null +++ b/Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IReportLogic.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ConfectioneryContracts.BindingModels; +using ConfectioneryContracts.ViewModels; +using System.Collections.Generic; + + +namespace ConfectioneryContracts.BusinessLogicsContracts +{ + public class IReportLogic + { + /// + /// Получение списка компонент с указанием, в каких изделиях используются + /// + /// + List GetPastryComponent(); + /// + /// Получение списка заказов за определенный период + /// + /// + /// + List GetOrders(ReportBindingModel model); + /// + /// Сохранение компонент в файл-Word + /// + /// + void SaveComponentsToWordFile(ReportBindingModel model); + /// + /// Сохранение компонент с указаеним продуктов в файл-Excel + /// + /// + void SavePastryComponentToExcelFile(ReportBindingModel model); + /// + /// Сохранение заказов в файл-Pdf + /// + /// + void SaveOrdersToPdfFile(ReportBindingModel model); + } +} -- 2.25.1 From 728cbe7081f3ea9b8a297228e453f6e139093c30 Mon Sep 17 00:00:00 2001 From: malimova Date: Thu, 11 Apr 2024 22:33:25 +0400 Subject: [PATCH 03/20] Word- classes --- .../ConfectioneryBusinessLogic/WordInfo.cs | 16 ++++++++++++++++ .../WordJustificationType.cs | 14 ++++++++++++++ .../ConfectioneryBusinessLogic/WordParagraph.cs | 14 ++++++++++++++ .../WordTextProperties.cs | 17 +++++++++++++++++ 4 files changed, 61 insertions(+) create mode 100644 Confectionery/ConfectioneryBusinessLogic/WordInfo.cs create mode 100644 Confectionery/ConfectioneryBusinessLogic/WordJustificationType.cs create mode 100644 Confectionery/ConfectioneryBusinessLogic/WordParagraph.cs create mode 100644 Confectionery/ConfectioneryBusinessLogic/WordTextProperties.cs diff --git a/Confectionery/ConfectioneryBusinessLogic/WordInfo.cs b/Confectionery/ConfectioneryBusinessLogic/WordInfo.cs new file mode 100644 index 0000000..b3bfc0b --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/WordInfo.cs @@ -0,0 +1,16 @@ +using ConfectioneryContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ConfectioneryBusinessLogic.OfficePackage.HelperModels +{ + public class WordInfo + { + public string FileName { get; set; } = string.Empty; + public string Title { get; set; } = string.Empty; + public List Components { get; set; } = new(); + } +} diff --git a/Confectionery/ConfectioneryBusinessLogic/WordJustificationType.cs b/Confectionery/ConfectioneryBusinessLogic/WordJustificationType.cs new file mode 100644 index 0000000..7efdd1f --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/WordJustificationType.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ConfectioneryBusinessLogic.OfficePackage.HelperEnums +{ + public enum WordJustificationType + { + Center, + Both + } +} diff --git a/Confectionery/ConfectioneryBusinessLogic/WordParagraph.cs b/Confectionery/ConfectioneryBusinessLogic/WordParagraph.cs new file mode 100644 index 0000000..206e712 --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/WordParagraph.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ConfectioneryBusinessLogic.OfficePackage.HelperModels +{ + public class WordParagraph + { + public List<(string, WordTextProperties)> Texts { get; set; } = new(); + public WordTextProperties? TextProperties { get; set; } + } +} diff --git a/Confectionery/ConfectioneryBusinessLogic/WordTextProperties.cs b/Confectionery/ConfectioneryBusinessLogic/WordTextProperties.cs new file mode 100644 index 0000000..abd0860 --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/WordTextProperties.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ConfectioneryBusinessLogic.OfficePackage.HelperEnums; + + +namespace ConfectioneryBusinessLogic.OfficePackage.HelperModels +{ + public class WordTextProperties + { + public string Size { get; set; } = string.Empty; + public bool Bold { get; set; } + public WordJustificationType JustificationType { get; set; } + } +} -- 2.25.1 From 1c38a829b903944ca8fb6f0c035b30492ea2a5d3 Mon Sep 17 00:00:00 2001 From: malimova Date: Thu, 11 Apr 2024 22:45:53 +0400 Subject: [PATCH 04/20] Word all done --- .../AbstractSaveToWord.cs | 56 ++++++++ .../ConfectioneryBusinessLogic.csproj | 1 + .../ConfectioneryBusinessLogic/SaveToWord.cs | 124 ++++++++++++++++++ 3 files changed, 181 insertions(+) create mode 100644 Confectionery/ConfectioneryBusinessLogic/AbstractSaveToWord.cs create mode 100644 Confectionery/ConfectioneryBusinessLogic/SaveToWord.cs diff --git a/Confectionery/ConfectioneryBusinessLogic/AbstractSaveToWord.cs b/Confectionery/ConfectioneryBusinessLogic/AbstractSaveToWord.cs new file mode 100644 index 0000000..c1080bd --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/AbstractSaveToWord.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ConfectioneryBusinessLogic.OfficePackage.HelperEnums; +using ConfectioneryBusinessLogic.OfficePackage.HelperModels; + +namespace ConfectioneryBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToWord + { + public void CreateDoc(WordInfo info) + { + CreateWord(info); + CreateParagraph(new WordParagraph + { + Texts = new List<(string, WordTextProperties)> { (info.Title, new WordTextProperties { Bold = true, Size = "24", }) }, + TextProperties = new WordTextProperties + { + Size = "24", + JustificationType = WordJustificationType.Center + } + }); + foreach (var component in info.Components) + { + CreateParagraph(new WordParagraph + { + Texts = new List<(string, WordTextProperties)> {(component.ComponentName, new WordTextProperties { Size = "24", }) }, + TextProperties = new WordTextProperties + { + Size = "24", + JustificationType = WordJustificationType.Both + } + }); + } + SaveWord(info); + } + /// + /// Создание doc-файла + /// + /// + protected abstract void CreateWord(WordInfo info); + /// + /// Создание абзаца с текстом + /// + /// + /// + protected abstract void CreateParagraph(WordParagraph paragraph); + /// + /// Сохранение файла + /// + /// + protected abstract void SaveWord(WordInfo info); + } +} diff --git a/Confectionery/ConfectioneryBusinessLogic/ConfectioneryBusinessLogic.csproj b/Confectionery/ConfectioneryBusinessLogic/ConfectioneryBusinessLogic.csproj index 6c8a45e..50558a1 100644 --- a/Confectionery/ConfectioneryBusinessLogic/ConfectioneryBusinessLogic.csproj +++ b/Confectionery/ConfectioneryBusinessLogic/ConfectioneryBusinessLogic.csproj @@ -7,6 +7,7 @@ + diff --git a/Confectionery/ConfectioneryBusinessLogic/SaveToWord.cs b/Confectionery/ConfectioneryBusinessLogic/SaveToWord.cs new file mode 100644 index 0000000..c9e97e6 --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/SaveToWord.cs @@ -0,0 +1,124 @@ +using ConfectioneryBusinessLogic.OfficePackage.HelperEnums; +using ConfectioneryBusinessLogic.OfficePackage.HelperModels; +using DocumentFormat.OpenXml; +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Wordprocessing; + +namespace ConfectioneryBusinessLogic.OfficePackage.Implements +{ + public class SaveToWord : AbstractSaveToWord + { + private WordprocessingDocument? _wordDocument; + private Body? _docBody; + /// + /// Получение типа выравнивания + /// + /// + /// + private static JustificationValues + GetJustificationValues(WordJustificationType type) + { + return type switch + { + WordJustificationType.Both => JustificationValues.Both, + WordJustificationType.Center => JustificationValues.Center, + _ => JustificationValues.Left, + }; + } + /// + /// Настройки страницы + /// + /// + private static SectionProperties CreateSectionProperties() + { + var properties = new SectionProperties(); + var pageSize = new PageSize + { + Orient = PageOrientationValues.Portrait + }; + properties.AppendChild(pageSize); + return properties; + } + /// + /// Задание форматирования для абзаца + /// + /// + /// + private static ParagraphProperties? + CreateParagraphProperties(WordTextProperties? paragraphProperties) + { + if (paragraphProperties == null) + { + return null; + } + var properties = new ParagraphProperties(); + properties.AppendChild(new Justification() + { + Val = GetJustificationValues(paragraphProperties.JustificationType) + }); + properties.AppendChild(new SpacingBetweenLines + { + LineRule = LineSpacingRuleValues.Auto + }); + properties.AppendChild(new Indentation()); + var paragraphMarkRunProperties = new ParagraphMarkRunProperties(); + if (!string.IsNullOrEmpty(paragraphProperties.Size)) + { + paragraphMarkRunProperties.AppendChild(new FontSize + { + Val = + paragraphProperties.Size + }); + } + properties.AppendChild(paragraphMarkRunProperties); + return properties; + } + protected override void CreateWord(WordInfo info) + { + _wordDocument = WordprocessingDocument.Create(info.FileName, + WordprocessingDocumentType.Document); + MainDocumentPart mainPart = _wordDocument.AddMainDocumentPart(); + mainPart.Document = new Document(); + _docBody = mainPart.Document.AppendChild(new Body()); + } + protected override void CreateParagraph(WordParagraph paragraph) + { + if (_docBody == null || paragraph == null) + { + return; + } + var docParagraph = new Paragraph(); + + docParagraph.AppendChild(CreateParagraphProperties(paragraph.TextProperties)); + foreach (var run in paragraph.Texts) + { + var docRun = new Run(); + var properties = new RunProperties(); + properties.AppendChild(new FontSize { Val = run.Item2.Size }); + if (run.Item2.Bold) + { + properties.AppendChild(new Bold()); + } + docRun.AppendChild(properties); + docRun.AppendChild(new Text + { + Text = run.Item1, + Space = + SpaceProcessingModeValues.Preserve + }); + docParagraph.AppendChild(docRun); + } + _docBody.AppendChild(docParagraph); + } + protected override void SaveWord(WordInfo info) + { + if (_docBody == null || _wordDocument == null) + { + return; + } + _docBody.AppendChild(CreateSectionProperties()); + _wordDocument.MainDocumentPart!.Document.Save(); + _wordDocument.Dispose(); + } + } +} -- 2.25.1 From 65dabf026f56a83197c04bc7552f48fdd44011a6 Mon Sep 17 00:00:00 2001 From: malimova Date: Thu, 11 Apr 2024 23:04:23 +0400 Subject: [PATCH 05/20] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D0=BE=D1=88?= =?UTF-8?q?=D0=B8=D0=B1=D0=BE=D0=BA......?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfectioneryBusinessLogic/ExcelInfo.cs | 21 +++++++++++++++++++ .../ReportOrdersViewModel.cs | 2 +- .../ReportPastryComponentViewModel.cs | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 Confectionery/ConfectioneryBusinessLogic/ExcelInfo.cs rename Confectionery/ConfectioneryContracts/{BindingModels => ViewModels}/ReportOrdersViewModel.cs (88%) rename Confectionery/ConfectioneryContracts/{BindingModels => ViewModels}/ReportPastryComponentViewModel.cs (88%) diff --git a/Confectionery/ConfectioneryBusinessLogic/ExcelInfo.cs b/Confectionery/ConfectioneryBusinessLogic/ExcelInfo.cs new file mode 100644 index 0000000..a6e19c2 --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/ExcelInfo.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ConfectioneryContracts.ViewModels; + +namespace ConfectioneryBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelInfo + { + public string FileName { get; set; } = string.Empty; + public string Title { get; set; } = string.Empty; + public List PastryComponents + { + get; + set; + } = new(); + + } +} diff --git a/Confectionery/ConfectioneryContracts/BindingModels/ReportOrdersViewModel.cs b/Confectionery/ConfectioneryContracts/ViewModels/ReportOrdersViewModel.cs similarity index 88% rename from Confectionery/ConfectioneryContracts/BindingModels/ReportOrdersViewModel.cs rename to Confectionery/ConfectioneryContracts/ViewModels/ReportOrdersViewModel.cs index bfb537c..88e4738 100644 --- a/Confectionery/ConfectioneryContracts/BindingModels/ReportOrdersViewModel.cs +++ b/Confectionery/ConfectioneryContracts/ViewModels/ReportOrdersViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ConfectioneryContracts.BindingModels +namespace ConfectioneryContracts.ViewModels { public class ReportOrdersViewModel { diff --git a/Confectionery/ConfectioneryContracts/BindingModels/ReportPastryComponentViewModel.cs b/Confectionery/ConfectioneryContracts/ViewModels/ReportPastryComponentViewModel.cs similarity index 88% rename from Confectionery/ConfectioneryContracts/BindingModels/ReportPastryComponentViewModel.cs rename to Confectionery/ConfectioneryContracts/ViewModels/ReportPastryComponentViewModel.cs index bc147f6..6813316 100644 --- a/Confectionery/ConfectioneryContracts/BindingModels/ReportPastryComponentViewModel.cs +++ b/Confectionery/ConfectioneryContracts/ViewModels/ReportPastryComponentViewModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace ConfectioneryContracts.BindingModels +namespace ConfectioneryContracts.ViewModels { public class ReportPastryComponentViewModel { -- 2.25.1 From 491a2c0ecf99c4f7345cf8a482505ee0a56bd16e Mon Sep 17 00:00:00 2001 From: malimova Date: Thu, 11 Apr 2024 23:37:27 +0400 Subject: [PATCH 06/20] Excel- all done --- .../AbstractSaveToExcel.cs | 104 ++++++ .../ExcelCellParameters.cs | 20 + .../ExcelMergeParameters.cs | 16 + .../ExcelStyleInfoType.cs | 15 + .../ConfectioneryBusinessLogic/SaveToExcel.cs | 341 ++++++++++++++++++ .../BusinessLogicsContracts/IReportLogic.cs | 2 +- 6 files changed, 497 insertions(+), 1 deletion(-) create mode 100644 Confectionery/ConfectioneryBusinessLogic/AbstractSaveToExcel.cs create mode 100644 Confectionery/ConfectioneryBusinessLogic/ExcelCellParameters.cs create mode 100644 Confectionery/ConfectioneryBusinessLogic/ExcelMergeParameters.cs create mode 100644 Confectionery/ConfectioneryBusinessLogic/ExcelStyleInfoType.cs create mode 100644 Confectionery/ConfectioneryBusinessLogic/SaveToExcel.cs diff --git a/Confectionery/ConfectioneryBusinessLogic/AbstractSaveToExcel.cs b/Confectionery/ConfectioneryBusinessLogic/AbstractSaveToExcel.cs new file mode 100644 index 0000000..6135ea8 --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/AbstractSaveToExcel.cs @@ -0,0 +1,104 @@ +using ConfectioneryBusinessLogic.OfficePackage.HelperEnums; +using ConfectioneryBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ConfectioneryBusinessLogic.OfficePackage +{ + public abstract class AbstractSaveToExcel + { + /// + /// Создание отчета + /// + /// + public void CreateReport(ExcelInfo info) + { + CreateExcel(info); + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = 1, + Text = info.Title, + StyleInfo = ExcelStyleInfoType.Title + }); + MergeCells(new ExcelMergeParameters + { + CellFromName = "A1", + CellToName = "C1" + }); + uint rowIndex = 2; + foreach (var pc in info.PastryComponents) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = rowIndex, + Text = pc.ComponentName, + StyleInfo = ExcelStyleInfoType.Text + }); + rowIndex++; + foreach (var product in pc.Pastrys) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "B", + RowIndex = rowIndex, + Text = product.Item1, + StyleInfo = + ExcelStyleInfoType.TextWithBroder + }); + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "C", + RowIndex = rowIndex, + Text = product.Item2.ToString(), + StyleInfo = + ExcelStyleInfoType.TextWithBroder + }); + rowIndex++; + } + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = rowIndex, + Text = "Итого", + StyleInfo = ExcelStyleInfoType.Text + }); + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "C", + RowIndex = rowIndex, + Text = pc.TotalCount.ToString(), + StyleInfo = ExcelStyleInfoType.Text + }); + rowIndex++; + } + SaveExcel(info); + } + /// + /// Создание excel-файла + /// + /// + protected abstract void CreateExcel(ExcelInfo info); + /// + /// Добавляем новую ячейку в лист + /// + /// + protected abstract void InsertCellInWorksheet(ExcelCellParameters + excelParams); + /// + /// Объединение ячеек + /// + /// + protected abstract void MergeCells(ExcelMergeParameters excelParams); + /// + /// Сохранение файла + /// + /// + protected abstract void SaveExcel(ExcelInfo info); + + } +} diff --git a/Confectionery/ConfectioneryBusinessLogic/ExcelCellParameters.cs b/Confectionery/ConfectioneryBusinessLogic/ExcelCellParameters.cs new file mode 100644 index 0000000..726a540 --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/ExcelCellParameters.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ConfectioneryBusinessLogic.OfficePackage.HelperEnums; + + +namespace ConfectioneryBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelCellParameters + { + public string ColumnName { get; set; } = string.Empty; + public uint RowIndex { get; set; } + public string Text { get; set; } = string.Empty; + public string CellReference => $"{ColumnName}{RowIndex}"; + public ExcelStyleInfoType StyleInfo { get; set; } + + } +} diff --git a/Confectionery/ConfectioneryBusinessLogic/ExcelMergeParameters.cs b/Confectionery/ConfectioneryBusinessLogic/ExcelMergeParameters.cs new file mode 100644 index 0000000..f79b110 --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/ExcelMergeParameters.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ConfectioneryBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelMergeParameters + { + public string CellFromName { get; set; } = string.Empty; + public string CellToName { get; set; } = string.Empty; + public string Merge => $"{CellFromName}:{CellToName}"; + + } +} diff --git a/Confectionery/ConfectioneryBusinessLogic/ExcelStyleInfoType.cs b/Confectionery/ConfectioneryBusinessLogic/ExcelStyleInfoType.cs new file mode 100644 index 0000000..b379cbc --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/ExcelStyleInfoType.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ConfectioneryBusinessLogic.OfficePackage.HelperEnums +{ + public enum ExcelStyleInfoType + { + Title, + Text, + TextWithBroder + } +} diff --git a/Confectionery/ConfectioneryBusinessLogic/SaveToExcel.cs b/Confectionery/ConfectioneryBusinessLogic/SaveToExcel.cs new file mode 100644 index 0000000..44d426f --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/SaveToExcel.cs @@ -0,0 +1,341 @@ +using ConfectioneryBusinessLogic.OfficePackage.HelperEnums; +using ConfectioneryBusinessLogic.OfficePackage.HelperModels; +using DocumentFormat.OpenXml.Office2010.Excel; +using DocumentFormat.OpenXml.Office2013.Excel; +using DocumentFormat.OpenXml; +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Spreadsheet; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using DocumentFormat.OpenXml.Office2016.Excel; + +namespace ConfectioneryBusinessLogic.OfficePackage.Implements +{ + public class SaveToExcel : AbstractSaveToExcel + { + private SpreadsheetDocument? _spreadsheetDocument; + private SharedStringTablePart? _shareStringPart; + private Worksheet? _worksheet; + /// + /// Настройка стилей для файла + /// + /// + private static void CreateStyles(WorkbookPart workbookpart) + { + var sp = workbookpart.AddNewPart(); + sp.Stylesheet = new Stylesheet(); + var fonts = new Fonts() { Count = 2U, KnownFonts = true }; + var fontUsual = new Font(); + fontUsual.Append(new FontSize() { Val = 12D }); + fontUsual.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() + { Theme = 1U }); + fontUsual.Append(new FontName() { Val = "Times New Roman" }); + fontUsual.Append(new FontFamilyNumbering() { Val = 2 }); + fontUsual.Append(new FontScheme() { Val = FontSchemeValues.Minor }); + var fontTitle = new Font(); + fontTitle.Append(new Bold()); + fontTitle.Append(new FontSize() { Val = 14D }); + fontTitle.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() + { Theme = 1U }); + fontTitle.Append(new FontName() { Val = "Times New Roman" }); + fontTitle.Append(new FontFamilyNumbering() { Val = 2 }); + fontTitle.Append(new FontScheme() { Val = FontSchemeValues.Minor }); + fonts.Append(fontUsual); + fonts.Append(fontTitle); + var fills = new Fills() { Count = 2U }; + var fill1 = new Fill(); + fill1.Append(new PatternFill() { PatternType = PatternValues.None }); + var fill2 = new Fill(); + fill2.Append(new PatternFill() + { + PatternType = PatternValues.Gray125 + }); + fills.Append(fill1); + fills.Append(fill2); + var borders = new Borders() { Count = 2U }; + var borderNoBorder = new Border(); + borderNoBorder.Append(new LeftBorder()); + borderNoBorder.Append(new RightBorder()); + borderNoBorder.Append(new TopBorder()); + borderNoBorder.Append(new BottomBorder()); + borderNoBorder.Append(new DiagonalBorder()); + var borderThin = new Border(); + var leftBorder = new LeftBorder() { Style = BorderStyleValues.Thin }; + leftBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() + { Indexed = 64U }); + var rightBorder = new RightBorder() + { + Style = BorderStyleValues.Thin + }; + rightBorder.Append(new + DocumentFormat.OpenXml.Office2010.Excel.Color() + { Indexed = 64U }); + var topBorder = new TopBorder() { Style = BorderStyleValues.Thin }; + topBorder.Append(new DocumentFormat.OpenXml.Office2010.Excel.Color() + { Indexed = 64U }); + var bottomBorder = new BottomBorder() + { + Style = + BorderStyleValues.Thin + }; + bottomBorder.Append(new + DocumentFormat.OpenXml.Office2010.Excel.Color() + { Indexed = 64U }); + borderThin.Append(leftBorder); + borderThin.Append(rightBorder); + borderThin.Append(topBorder); + borderThin.Append(bottomBorder); + borderThin.Append(new DiagonalBorder()); + borders.Append(borderNoBorder); + borders.Append(borderThin); + var cellStyleFormats = new CellStyleFormats() { Count = 1U }; + var cellFormatStyle = new CellFormat() + { + NumberFormatId = 0U, + FontId + = 0U, + FillId = 0U, + BorderId = 0U + }; + cellStyleFormats.Append(cellFormatStyle); + var cellFormats = new CellFormats() { Count = 3U }; + var cellFormatFont = new CellFormat() + { + NumberFormatId = 0U, + FontId = + 0U, + FillId = 0U, + BorderId = 0U, + FormatId = 0U, + ApplyFont = true + }; + var cellFormatFontAndBorder = new CellFormat() + { + NumberFormatId = 0U, + FontId = 0U, + FillId = 0U, + BorderId = 1U, + FormatId = 0U, + ApplyFont = true, + ApplyBorder = true + }; + var cellFormatTitle = new CellFormat() + { + NumberFormatId = 0U, + FontId + = 1U, + FillId = 0U, + BorderId = 0U, + FormatId = 0U, + Alignment = new Alignment() + { + Vertical = VerticalAlignmentValues.Center, + WrapText = true, + Horizontal = + HorizontalAlignmentValues.Center + }, + ApplyFont = true + }; + cellFormats.Append(cellFormatFont); + cellFormats.Append(cellFormatFontAndBorder); + cellFormats.Append(cellFormatTitle); + var cellStyles = new CellStyles() { Count = 1U }; + cellStyles.Append(new CellStyle() + { + Name = "Normal", + FormatId = 0U, + BuiltinId = 0U + }); + var differentialFormats = new + DocumentFormat.OpenXml.Office2013.Excel.DifferentialFormats() + { Count = 0U }; + + var tableStyles = new TableStyles() + { + Count = 0U, + DefaultTableStyle = + "TableStyleMedium2", + DefaultPivotStyle = "PivotStyleLight16" + }; + var stylesheetExtensionList = new StylesheetExtensionList(); + var stylesheetExtension1 = new StylesheetExtension() + { + Uri = + "{EB79DEF2-80B8-43e5-95BD-54CBDDF9020C}" + }; + stylesheetExtension1.AddNamespaceDeclaration("x14", + "http://schemas.microsoft.com/office/spreadsheetml/2009/9/main"); + stylesheetExtension1.Append(new SlicerStyles() + { + DefaultSlicerStyle = + "SlicerStyleLight1" + }); + var stylesheetExtension2 = new StylesheetExtension() + { + Uri = + "{9260A510-F301-46a8-8635-F512D64BE5F5}" + }; + stylesheetExtension2.AddNamespaceDeclaration("x15", + "http://schemas.microsoft.com/office/spreadsheetml/2010/11/main"); + stylesheetExtension2.Append(new TimelineStyles() + { + DefaultTimelineStyle = "TimeSlicerStyleLight1" + }); + stylesheetExtensionList.Append(stylesheetExtension1); + stylesheetExtensionList.Append(stylesheetExtension2); + sp.Stylesheet.Append(fonts); + sp.Stylesheet.Append(fills); + sp.Stylesheet.Append(borders); + sp.Stylesheet.Append(cellStyleFormats); + sp.Stylesheet.Append(cellFormats); + sp.Stylesheet.Append(cellStyles); + sp.Stylesheet.Append(differentialFormats); + sp.Stylesheet.Append(tableStyles); + sp.Stylesheet.Append(stylesheetExtensionList); + } + /// + /// Получение номера стиля из типа + /// + /// + /// + private static uint GetStyleValue(ExcelStyleInfoType styleInfo) + { + return styleInfo switch + { + ExcelStyleInfoType.Title => 2U, + ExcelStyleInfoType.TextWithBroder => 1U, + ExcelStyleInfoType.Text => 0U, + _ => 0U, + }; + } + protected override void CreateExcel(ExcelInfo info) + { + _spreadsheetDocument = SpreadsheetDocument.Create(info.FileName, + SpreadsheetDocumentType.Workbook); + // Создаем книгу (в ней хранятся листы) + var workbookpart = _spreadsheetDocument.AddWorkbookPart(); + workbookpart.Workbook = new Workbook(); CreateStyles(workbookpart); + // Получаем/создаем хранилище текстов для книги + _shareStringPart = + _spreadsheetDocument.WorkbookPart!.GetPartsOfType().Any() + ? + _spreadsheetDocument.WorkbookPart.GetPartsOfType().First() + : + _spreadsheetDocument.WorkbookPart.AddNewPart(); + // Создаем SharedStringTable, если его нет + if (_shareStringPart.SharedStringTable == null) + { + _shareStringPart.SharedStringTable = new SharedStringTable(); + } + // Создаем лист в книгу + var worksheetPart = workbookpart.AddNewPart(); + worksheetPart.Worksheet = new Worksheet(new SheetData()); + // Добавляем лист в книгу + var sheets = _spreadsheetDocument.WorkbookPart.Workbook.AppendChild(new Sheets()); + var sheet = new Sheet() + { + Id = _spreadsheetDocument.WorkbookPart.GetIdOfPart(worksheetPart), + SheetId = 1, + Name = "Лист" + }; + sheets.Append(sheet); + _worksheet = worksheetPart.Worksheet; + } + protected override void InsertCellInWorksheet(ExcelCellParameters excelParams) + { + if (_worksheet == null || _shareStringPart == null) + { + return; + } + var sheetData = _worksheet.GetFirstChild(); + if (sheetData == null) + { + return; + } + // Ищем строку, либо добавляем ее + Row row; + if (sheetData.Elements().Where(r => r.RowIndex! == excelParams.RowIndex).Any()) + { + row = sheetData.Elements().Where(r => r.RowIndex! == excelParams.RowIndex).First(); + } + else + { + row = new Row() { RowIndex = excelParams.RowIndex }; + sheetData.Append(row); + } + // Ищем нужную ячейку + Cell cell; if (row.Elements().Where(c => c.CellReference!.Value == excelParams.CellReference).Any()) + { + cell = row.Elements().Where(c => c.CellReference!.Value == excelParams.CellReference).First(); + } + else + { + // Все ячейки должны быть последовательно друг за другом расположены + // нужно определить, после какой вставлять + Cell? refCell = null; + foreach (Cell rowCell in row.Elements()) + { + if (string.Compare(rowCell.CellReference!.Value, excelParams.CellReference, true) > 0) + { + refCell = rowCell; + break; + } + } + var newCell = new Cell() + { + CellReference = excelParams.CellReference + }; + row.InsertBefore(newCell, refCell); + cell = newCell; + } + // вставляем новый текст + _shareStringPart.SharedStringTable.AppendChild(new SharedStringItem(new Text(excelParams.Text))); + _shareStringPart.SharedStringTable.Save(); + cell.CellValue = new CellValue((_shareStringPart.SharedStringTable.Elements().Count() - 1).ToString()); + cell.DataType = new EnumValue(CellValues.SharedString); + cell.StyleIndex = GetStyleValue(excelParams.StyleInfo); + } + protected override void MergeCells(ExcelMergeParameters excelParams) + { + if (_worksheet == null) + { + return; + } + MergeCells mergeCells; + if (_worksheet.Elements().Any()) + { + mergeCells = _worksheet.Elements().First(); + } + else + { + mergeCells = new MergeCells(); + if (_worksheet.Elements().Any()) + { + _worksheet.InsertAfter(mergeCells, + _worksheet.Elements().First()); + } + else + { + _worksheet.InsertAfter(mergeCells, _worksheet.Elements().First()); + } + } + var mergeCell = new MergeCell() + { + Reference = new StringValue(excelParams.Merge) + }; + mergeCells.Append(mergeCell); + } + protected override void SaveExcel(ExcelInfo info) + { + if (_spreadsheetDocument == null) + { + return; + } + _spreadsheetDocument.WorkbookPart!.Workbook.Save(); + _spreadsheetDocument.Dispose(); + } + } +} diff --git a/Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IReportLogic.cs b/Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IReportLogic.cs index 49db05a..2edf25c 100644 --- a/Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IReportLogic.cs +++ b/Confectionery/ConfectioneryContracts/BusinessLogicsContracts/IReportLogic.cs @@ -10,7 +10,7 @@ using System.Collections.Generic; namespace ConfectioneryContracts.BusinessLogicsContracts { - public class IReportLogic + public interface IReportLogic { /// /// Получение списка компонент с указанием, в каких изделиях используются -- 2.25.1 From 8212ec648a352cd77645fe6ede90a77b8fd20cb2 Mon Sep 17 00:00:00 2001 From: malimova Date: Thu, 11 Apr 2024 23:54:48 +0400 Subject: [PATCH 07/20] Pdf- all done --- .../AbstractSaveToPdf.cs | 79 ++++++++++++++ .../ConfectioneryBusinessLogic.csproj | 3 + .../ConfectioneryBusinessLogic/PdfInfo.cs | 19 ++++ .../PdfParagraph.cs | 18 ++++ .../PdfParagraphAlignmentType.cs | 15 +++ .../PdfRowParameters.cs | 16 +++ .../ConfectioneryBusinessLogic/SaveToPdf.cs | 102 ++++++++++++++++++ 7 files changed, 252 insertions(+) create mode 100644 Confectionery/ConfectioneryBusinessLogic/AbstractSaveToPdf.cs create mode 100644 Confectionery/ConfectioneryBusinessLogic/PdfInfo.cs create mode 100644 Confectionery/ConfectioneryBusinessLogic/PdfParagraph.cs create mode 100644 Confectionery/ConfectioneryBusinessLogic/PdfParagraphAlignmentType.cs create mode 100644 Confectionery/ConfectioneryBusinessLogic/PdfRowParameters.cs create mode 100644 Confectionery/ConfectioneryBusinessLogic/SaveToPdf.cs diff --git a/Confectionery/ConfectioneryBusinessLogic/AbstractSaveToPdf.cs b/Confectionery/ConfectioneryBusinessLogic/AbstractSaveToPdf.cs new file mode 100644 index 0000000..050c2eb --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/AbstractSaveToPdf.cs @@ -0,0 +1,79 @@ +using ConfectioneryBusinessLogic.OfficePackage.HelperEnums; +using ConfectioneryBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ConfectioneryBusinessLogic +{ + public abstract class AbstractSaveToPdf + { + public void CreateDoc(PdfInfo info) + { + CreatePdf(info); + CreateParagraph(new PdfParagraph + { + Text = info.Title, + Style = "NormalTitle", + ParagraphAlignment = PdfParagraphAlignmentType.Center + }); + CreateParagraph(new PdfParagraph + { + Text = $"с { info.DateFrom.ToShortDateString() } по { info.DateTo.ToShortDateString() }", Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Center + }); + CreateTable(new List { "2cm", "3cm", "6cm", "3cm" }); + CreateRow(new PdfRowParameters + { + Texts = new List { "Номер", "Дата заказа", "Изделие", "Сумма" }, + Style = "NormalTitle", + ParagraphAlignment = PdfParagraphAlignmentType.Center + }); + foreach (var order in info.Orders) + { + CreateRow(new PdfRowParameters + { + Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.PastryName, order.Sum.ToString() }, + Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Left + }); + } + CreateParagraph(new PdfParagraph + { + Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t", + Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Right + }); + SavePdf(info); + } + /// + /// Создание doc-файла + /// + /// + protected abstract void CreatePdf(PdfInfo info); + /// + /// Создание параграфа с текстом + /// + /// + /// + protected abstract void CreateParagraph(PdfParagraph paragraph); + /// + /// Создание таблицы + /// + /// + /// + protected abstract void CreateTable(List columns); + /// + /// Создание и заполнение строки + /// + /// + protected abstract void CreateRow(PdfRowParameters rowParameters); + /// + /// Сохранение файла + /// + /// + protected abstract void SavePdf(PdfInfo info); + } +} diff --git a/Confectionery/ConfectioneryBusinessLogic/ConfectioneryBusinessLogic.csproj b/Confectionery/ConfectioneryBusinessLogic/ConfectioneryBusinessLogic.csproj index 50558a1..eec37d3 100644 --- a/Confectionery/ConfectioneryBusinessLogic/ConfectioneryBusinessLogic.csproj +++ b/Confectionery/ConfectioneryBusinessLogic/ConfectioneryBusinessLogic.csproj @@ -9,7 +9,10 @@ + + + diff --git a/Confectionery/ConfectioneryBusinessLogic/PdfInfo.cs b/Confectionery/ConfectioneryBusinessLogic/PdfInfo.cs new file mode 100644 index 0000000..1087926 --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/PdfInfo.cs @@ -0,0 +1,19 @@ +using ConfectioneryContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ConfectioneryBusinessLogic.OfficePackage.HelperModels +{ + public class PdfInfo + { + public string FileName { get; set; } = string.Empty; + public string Title { get; set; } = string.Empty; + public DateTime DateFrom { get; set; } + public DateTime DateTo { get; set; } + public List Orders { get; set; } = new(); + + } +} diff --git a/Confectionery/ConfectioneryBusinessLogic/PdfParagraph.cs b/Confectionery/ConfectioneryBusinessLogic/PdfParagraph.cs new file mode 100644 index 0000000..471c064 --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/PdfParagraph.cs @@ -0,0 +1,18 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ConfectioneryBusinessLogic.OfficePackage.HelperEnums; + + +namespace ConfectioneryBusinessLogic.OfficePackage.HelperModels +{ + public class PdfParagraph + { + public string Text { get; set; } = string.Empty; + public string Style { get; set; } = string.Empty; + public PdfParagraphAlignmentType ParagraphAlignment { get; set; } + + } +} diff --git a/Confectionery/ConfectioneryBusinessLogic/PdfParagraphAlignmentType.cs b/Confectionery/ConfectioneryBusinessLogic/PdfParagraphAlignmentType.cs new file mode 100644 index 0000000..f0a8f4f --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/PdfParagraphAlignmentType.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ConfectioneryBusinessLogic.OfficePackage.HelperEnums +{ + public enum PdfParagraphAlignmentType + { + Center, + Left, + Right + } +} diff --git a/Confectionery/ConfectioneryBusinessLogic/PdfRowParameters.cs b/Confectionery/ConfectioneryBusinessLogic/PdfRowParameters.cs new file mode 100644 index 0000000..d0ec0ae --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/PdfRowParameters.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ConfectioneryBusinessLogic.OfficePackage.HelperEnums; + +namespace ConfectioneryBusinessLogic.OfficePackage.HelperModels +{ + public class PdfRowParameters + { + public List Texts { get; set; } = new(); + public string Style { get; set; } = string.Empty; + public PdfParagraphAlignmentType ParagraphAlignment { get; set; } + } +} diff --git a/Confectionery/ConfectioneryBusinessLogic/SaveToPdf.cs b/Confectionery/ConfectioneryBusinessLogic/SaveToPdf.cs new file mode 100644 index 0000000..c9a3b3c --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/SaveToPdf.cs @@ -0,0 +1,102 @@ +using MigraDoc.DocumentObjectModel; +using MigraDoc.DocumentObjectModel.Tables; +using MigraDoc.Rendering; +using ConfectioneryBusinessLogic.OfficePackage.HelperEnums; +using ConfectioneryBusinessLogic.OfficePackage.HelperModels; + + +namespace ConfectioneryBusinessLogic +{ + public class SaveToPdf : AbstractSaveToPdf + { + private Document? _document; + private Section? _section; + private Table? _table; + private static ParagraphAlignment + GetParagraphAlignment(PdfParagraphAlignmentType type) + { + return type switch + { + PdfParagraphAlignmentType.Center => ParagraphAlignment.Center, + PdfParagraphAlignmentType.Left => ParagraphAlignment.Left, + PdfParagraphAlignmentType.Right => ParagraphAlignment.Right, + _ => ParagraphAlignment.Justify, + }; + } + /// + /// Создание стилей для документа + /// + /// + private static void DefineStyles(Document document) + { + var style = document.Styles["Normal"]; + style.Font.Name = "Times New Roman"; + style.Font.Size = 14; + style = document.Styles.AddStyle("NormalTitle", "Normal"); + style.Font.Bold = true; + } + protected override void CreatePdf(PdfInfo info) + { + _document = new Document(); + DefineStyles(_document); + _section = _document.AddSection(); + } + protected override void CreateParagraph(PdfParagraph pdfParagraph) + { + if (_section == null) + { + return; + } + var paragraph = _section.AddParagraph(pdfParagraph.Text); + paragraph.Format.SpaceAfter = "1cm"; + paragraph.Format.Alignment = + GetParagraphAlignment(pdfParagraph.ParagraphAlignment); + paragraph.Style = pdfParagraph.Style; + } + protected override void CreateTable(List columns) + { + if (_document == null) + { + return; + } + _table = _document.LastSection.AddTable(); + foreach (var elem in columns) + { + _table.AddColumn(elem); + } + } + protected override void CreateRow(PdfRowParameters rowParameters) + { + if (_table == null) + { + return; + } + var row = _table.AddRow(); + for (int i = 0; i < rowParameters.Texts.Count; ++i) + { + row.Cells[i].AddParagraph(rowParameters.Texts[i]); + if (!string.IsNullOrEmpty(rowParameters.Style)) + { + row.Cells[i].Style = rowParameters.Style; + } + Unit borderWidth = 0.5; + row.Cells[i].Borders.Left.Width = borderWidth; + row.Cells[i].Borders.Right.Width = borderWidth; + row.Cells[i].Borders.Top.Width = borderWidth; + row.Cells[i].Borders.Bottom.Width = borderWidth; + row.Cells[i].Format.Alignment = + GetParagraphAlignment(rowParameters.ParagraphAlignment); + row.Cells[i].VerticalAlignment = VerticalAlignment.Center; + } + } + protected override void SavePdf(PdfInfo info) + { + var renderer = new PdfDocumentRenderer(true) + { + Document = _document + }; + renderer.RenderDocument(); + renderer.PdfDocument.Save(info.FileName); + } + } +} -- 2.25.1 From 9151fe816c8389be7b87f3c7be90674556c2e241 Mon Sep 17 00:00:00 2001 From: malimova Date: Fri, 12 Apr 2024 00:00:13 +0400 Subject: [PATCH 08/20] ordersearchmodel, reportlogic --- .../ConfectioneryBusinessLogic/ReportLogic.cs | 126 ++++++++++++++++++ .../SearchModels/OrderSearchModel.cs | 2 + 2 files changed, 128 insertions(+) create mode 100644 Confectionery/ConfectioneryBusinessLogic/ReportLogic.cs diff --git a/Confectionery/ConfectioneryBusinessLogic/ReportLogic.cs b/Confectionery/ConfectioneryBusinessLogic/ReportLogic.cs new file mode 100644 index 0000000..a818b48 --- /dev/null +++ b/Confectionery/ConfectioneryBusinessLogic/ReportLogic.cs @@ -0,0 +1,126 @@ +using ConfectioneryBusinessLogic.OfficePackage; +using ConfectioneryBusinessLogic.OfficePackage.HelperModels; +using ConfectioneryContracts.BindingModels; +using ConfectioneryContracts.BusinessLogicsContracts; +using ConfectioneryContracts.SearchModels; +using ConfectioneryContracts.StoragesContracts; +using ConfectioneryContracts.ViewModels; + +namespace ConfectioneryBusinessLogic +{ + internal class ReportLogic : IReportLogic + { + private readonly IComponentStorage _componentStorage; + private readonly IPastryStorage _productStorage; + private readonly IOrderStorage _orderStorage; + private readonly AbstractSaveToExcel _saveToExcel; + private readonly AbstractSaveToWord _saveToWord; + private readonly AbstractSaveToPdf _saveToPdf; + public ReportLogic(IPastryStorage productStorage, IComponentStorage + componentStorage, IOrderStorage orderStorage, + AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, + AbstractSaveToPdf saveToPdf) + { + _productStorage = productStorage; + _componentStorage = componentStorage; + _orderStorage = orderStorage; + _saveToExcel = saveToExcel; + _saveToWord = saveToWord; + _saveToPdf = saveToPdf; + } + /// + /// Получение списка компонент с указанием, в каких изделиях используются + /// + /// + public List GetPastryComponent() + { + var components = _componentStorage.GetFullList(); + var products = _productStorage.GetFullList(); + var list = new List(); + foreach (var component in components) + { + var record = new ReportPastryComponentViewModel + { + ComponentName = component.ComponentName, + Pastrys = new List>(), + TotalCount = 0 + }; + foreach (var product in products) + { + if (product.PastryComponents.ContainsKey(component.Id)) + { + record.Pastrys.Add(new Tuple(product.PastryName, product.PastryComponents[component.Id].Item2)); + record.TotalCount += + product.PastryComponents[component.Id].Item2; + } + } + list.Add(record); + } + return list; + } + /// + /// Получение списка заказов за определенный период + /// + /// + /// + public List GetOrders(ReportBindingModel model) + { + return _orderStorage.GetFilteredList(new OrderSearchModel + { + DateFrom + = model.DateFrom, + DateTo = model.DateTo + }) + .Select(x => new ReportOrdersViewModel + { + Id = x.Id, + DateCreate = x.DateCreate, + PastryName = x.PastryName, + Sum = x.Sum + }) + .ToList(); + } + /// + /// Сохранение компонент в файл-Word + /// + /// + public void SaveComponentsToWordFile(ReportBindingModel model) + { + _saveToWord.CreateDoc(new WordInfo + { + FileName = model.FileName, + Title = "Список компонент", + Components = _componentStorage.GetFullList() + }); + } + /// + /// Сохранение компонент с указаеним продуктов в файл-Excel + /// + /// + public void SavePastryComponentToExcelFile(ReportBindingModel model) + { + _saveToExcel.CreateReport(new ExcelInfo + { + FileName = model.FileName, + Title = "Список компонент", + PastryComponents = GetPastryComponent() + }); + } + /// + /// Сохранение заказов в файл-Pdf + /// + /// + public void SaveOrdersToPdfFile(ReportBindingModel model) + { + _saveToPdf.CreateDoc(new PdfInfo + { + FileName = model.FileName, + Title = "Список заказов", + DateFrom = model.DateFrom!.Value, + DateTo = model.DateTo!.Value, + Orders = GetOrders(model) + }); + } + } +} diff --git a/Confectionery/ConfectioneryContracts/SearchModels/OrderSearchModel.cs b/Confectionery/ConfectioneryContracts/SearchModels/OrderSearchModel.cs index 9393fab..9c4821b 100644 --- a/Confectionery/ConfectioneryContracts/SearchModels/OrderSearchModel.cs +++ b/Confectionery/ConfectioneryContracts/SearchModels/OrderSearchModel.cs @@ -9,5 +9,7 @@ namespace ConfectioneryContracts.SearchModels public class OrderSearchModel { public int? Id { get; set; } + public DateTime? DateFrom { get; set; } + public DateTime? DateTo { get; set; } } } -- 2.25.1 From 7ef9f12ae75535edc811ae43bea72b9bd4324b6b Mon Sep 17 00:00:00 2001 From: malimova Date: Fri, 12 Apr 2024 01:04:02 +0400 Subject: [PATCH 09/20] form --- .../ConfectioneryBusinessLogic/ReportLogic.cs | 2 +- .../ConfectioneryView/FormMain.Designer.cs | 37 ++++- Confectionery/ConfectioneryView/FormMain.cs | 21 ++- .../FormReportPastryComponents.Designer.cs | 130 ++++++++++++++++++ .../FormReportPastryComponents.cs | 86 ++++++++++++ .../FormReportPastryComponents.resx | 69 ++++++++++ Confectionery/ConfectioneryView/Program.cs | 8 ++ 7 files changed, 349 insertions(+), 4 deletions(-) create mode 100644 Confectionery/ConfectioneryView/FormReportPastryComponents.Designer.cs create mode 100644 Confectionery/ConfectioneryView/FormReportPastryComponents.cs create mode 100644 Confectionery/ConfectioneryView/FormReportPastryComponents.resx diff --git a/Confectionery/ConfectioneryBusinessLogic/ReportLogic.cs b/Confectionery/ConfectioneryBusinessLogic/ReportLogic.cs index a818b48..85c5ea4 100644 --- a/Confectionery/ConfectioneryBusinessLogic/ReportLogic.cs +++ b/Confectionery/ConfectioneryBusinessLogic/ReportLogic.cs @@ -8,7 +8,7 @@ using ConfectioneryContracts.ViewModels; namespace ConfectioneryBusinessLogic { - internal class ReportLogic : IReportLogic + public class ReportLogic : IReportLogic { private readonly IComponentStorage _componentStorage; private readonly IPastryStorage _productStorage; diff --git a/Confectionery/ConfectioneryView/FormMain.Designer.cs b/Confectionery/ConfectioneryView/FormMain.Designer.cs index 3c95edf..658ef3b 100644 --- a/Confectionery/ConfectioneryView/FormMain.Designer.cs +++ b/Confectionery/ConfectioneryView/FormMain.Designer.cs @@ -33,6 +33,10 @@ toolStripMenuItem = new ToolStripMenuItem(); componentsToolStripMenuItem = new ToolStripMenuItem(); pastryToolStripMenuItem = new ToolStripMenuItem(); + отчетыToolStripMenuItem = new ToolStripMenuItem(); + componentsListToolStripMenuItem = new ToolStripMenuItem(); + componentPastryToolStripMenuItem = new ToolStripMenuItem(); + ordersListToolStripMenuItem = new ToolStripMenuItem(); buttonCreateOrder = new Button(); buttonTakeOrderInWork = new Button(); buttonOrderReady = new Button(); @@ -56,7 +60,7 @@ // menuStrip // menuStrip.ImageScalingSize = new Size(24, 24); - menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem }); + menuStrip.Items.AddRange(new ToolStripItem[] { toolStripMenuItem, отчетыToolStripMenuItem }); menuStrip.Location = new Point(0, 0); menuStrip.Name = "menuStrip"; menuStrip.Size = new Size(1375, 33); @@ -84,6 +88,33 @@ pastryToolStripMenuItem.Text = "Кондитерские изделия"; pastryToolStripMenuItem.Click += pastryToolStripMenuItem_Click; // + // отчетыToolStripMenuItem + // + отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { componentsListToolStripMenuItem, componentPastryToolStripMenuItem, ordersListToolStripMenuItem }); + отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; + отчетыToolStripMenuItem.Size = new Size(88, 29); + отчетыToolStripMenuItem.Text = "Отчеты"; + // + // componentsListToolStripMenuItem + // + componentsListToolStripMenuItem.Name = "componentsListToolStripMenuItem"; + componentsListToolStripMenuItem.Size = new Size(327, 34); + componentsListToolStripMenuItem.Text = "Список компонентов"; + // + // componentPastryToolStripMenuItem + // + componentPastryToolStripMenuItem.Name = "componentPastryToolStripMenuItem"; + componentPastryToolStripMenuItem.Size = new Size(327, 34); + componentPastryToolStripMenuItem.Text = "Компоненты по изделиям"; + componentPastryToolStripMenuItem.Click += componentPastryToolStripMenuItem_Click; + // + // ordersListToolStripMenuItem + // + ordersListToolStripMenuItem.Name = "ordersListToolStripMenuItem"; + ordersListToolStripMenuItem.Size = new Size(327, 34); + ordersListToolStripMenuItem.Text = "Список заказов"; + ordersListToolStripMenuItem.Click += ordersListToolStripMenuItem_Click; + // // buttonCreateOrder // buttonCreateOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right; @@ -174,5 +205,9 @@ private Button buttonRef; private ToolStripMenuItem componentsToolStripMenuItem; private ToolStripMenuItem pastryToolStripMenuItem; + private ToolStripMenuItem отчетыToolStripMenuItem; + private ToolStripMenuItem componentsListToolStripMenuItem; + private ToolStripMenuItem componentPastryToolStripMenuItem; + private ToolStripMenuItem ordersListToolStripMenuItem; } } \ No newline at end of file diff --git a/Confectionery/ConfectioneryView/FormMain.cs b/Confectionery/ConfectioneryView/FormMain.cs index 0cd8423..d2d1aee 100644 --- a/Confectionery/ConfectioneryView/FormMain.cs +++ b/Confectionery/ConfectioneryView/FormMain.cs @@ -16,12 +16,15 @@ namespace ConfectioneryView public partial class FormMain : Form { private readonly ILogger _logger; - private readonly IOrderLogic _orderLogic; - public FormMain(ILogger logger, IOrderLogic orderLogic) + private readonly IOrderLogic _orderLogic; + private readonly IReportLogic _reportLogic; + + public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic) { InitializeComponent(); _logger = logger; _orderLogic = orderLogic; + _reportLogic = reportLogic; } private void FormMain_Load(object sender, EventArgs e) { @@ -157,5 +160,19 @@ namespace ConfectioneryView { LoadData(); } + + private void componentPastryToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormReportPastryComponents)); + if (service is FormReportPastryComponents form) + { + form.ShowDialog(); + } + } + + private void ordersListToolStripMenuItem_Click(object sender, EventArgs e) + { + + } } } diff --git a/Confectionery/ConfectioneryView/FormReportPastryComponents.Designer.cs b/Confectionery/ConfectioneryView/FormReportPastryComponents.Designer.cs new file mode 100644 index 0000000..a018221 --- /dev/null +++ b/Confectionery/ConfectioneryView/FormReportPastryComponents.Designer.cs @@ -0,0 +1,130 @@ +namespace ConfectioneryView +{ + partial class FormReportPastryComponents + { + /// + /// 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() + { + DataGridViewCellStyle dataGridViewCellStyle1 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle2 = new DataGridViewCellStyle(); + DataGridViewCellStyle dataGridViewCellStyle3 = new DataGridViewCellStyle(); + dataGridView = new DataGridView(); + ColumnComponent = new DataGridViewTextBoxColumn(); + ColumnPastry = new DataGridViewTextBoxColumn(); + ColumnCount = new DataGridViewTextBoxColumn(); + buttonSaveToExcel = new Button(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // dataGridView + // + dataGridView.BackgroundColor = Color.AliceBlue; + dataGridViewCellStyle1.Alignment = DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = SystemColors.Control; + dataGridViewCellStyle1.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + dataGridViewCellStyle1.ForeColor = SystemColors.WindowText; + dataGridViewCellStyle1.SelectionBackColor = SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = DataGridViewTriState.True; + dataGridView.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Columns.AddRange(new DataGridViewColumn[] { ColumnComponent, ColumnPastry, ColumnCount }); + dataGridViewCellStyle2.Alignment = DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = SystemColors.Window; + dataGridViewCellStyle2.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + dataGridViewCellStyle2.ForeColor = SystemColors.ControlText; + dataGridViewCellStyle2.SelectionBackColor = SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = DataGridViewTriState.False; + dataGridView.DefaultCellStyle = dataGridViewCellStyle2; + dataGridView.Location = new Point(12, 141); + dataGridView.Name = "dataGridView"; + dataGridViewCellStyle3.Alignment = DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = SystemColors.Control; + dataGridViewCellStyle3.Font = new Font("Segoe UI", 9F, FontStyle.Regular, GraphicsUnit.Point); + dataGridViewCellStyle3.ForeColor = SystemColors.WindowText; + dataGridViewCellStyle3.SelectionBackColor = SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = DataGridViewTriState.True; + dataGridView.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; + dataGridView.RowHeadersWidth = 62; + dataGridView.RowTemplate.Height = 33; + dataGridView.Size = new Size(875, 498); + dataGridView.TabIndex = 0; + // + // ColumnComponent + // + ColumnComponent.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + ColumnComponent.HeaderText = "Компонент"; + ColumnComponent.MinimumWidth = 8; + ColumnComponent.Name = "ColumnComponent"; + // + // ColumnPastry + // + ColumnPastry.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + ColumnPastry.HeaderText = "Изделие"; + ColumnPastry.MinimumWidth = 8; + ColumnPastry.Name = "ColumnPastry"; + // + // ColumnCount + // + ColumnCount.AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill; + ColumnCount.HeaderText = "Количество"; + ColumnCount.MinimumWidth = 8; + ColumnCount.Name = "ColumnCount"; + // + // buttonSaveToExcel + // + buttonSaveToExcel.Location = new Point(66, 45); + buttonSaveToExcel.Name = "buttonSaveToExcel"; + buttonSaveToExcel.Size = new Size(187, 52); + buttonSaveToExcel.TabIndex = 1; + buttonSaveToExcel.Text = "Сохранить в Excel"; + buttonSaveToExcel.UseVisualStyleBackColor = true; + buttonSaveToExcel.Click += buttonSaveToExcel_Click; + // + // FormReportPastryComponents + // + AutoScaleDimensions = new SizeF(10F, 25F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(899, 651); + Controls.Add(buttonSaveToExcel); + Controls.Add(dataGridView); + Name = "FormReportPastryComponents"; + Text = "Компоненты по изделиям"; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private DataGridView dataGridView; + private DataGridViewTextBoxColumn ColumnComponent; + private DataGridViewTextBoxColumn ColumnPastry; + private DataGridViewTextBoxColumn ColumnCount; + private Button buttonSaveToExcel; + } +} \ No newline at end of file diff --git a/Confectionery/ConfectioneryView/FormReportPastryComponents.cs b/Confectionery/ConfectioneryView/FormReportPastryComponents.cs new file mode 100644 index 0000000..763058d --- /dev/null +++ b/Confectionery/ConfectioneryView/FormReportPastryComponents.cs @@ -0,0 +1,86 @@ +using ConfectioneryContracts.BindingModels; +using ConfectioneryContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +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; + +namespace ConfectioneryView +{ + public partial class FormReportPastryComponents : Form + { + private readonly ILogger _logger; + private readonly IReportLogic _logic; + + public FormReportPastryComponents(ILogger logger, IReportLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormReportPastryComponents_Load(object sender, EventArgs e) + { + try + { + var dict = _logic.GetPastryComponent(); + if (dict != null) + { + dataGridView.Rows.Clear(); + foreach (var elem in dict) + { + dataGridView.Rows.Add(new object[] { elem.ComponentName, "", "" }); + foreach (var listElem in elem.Pastrys) + { + dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 }); + } + dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount }); + dataGridView.Rows.Add(Array.Empty()); + } + } + _logger.LogInformation("Загрузка списка кондитерских изделий по компонентам"); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка кондитерских изделий по компонентам"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + + private void buttonSaveToExcel_Click(object sender, EventArgs e) + { + using var dialog = new SaveFileDialog + { + Filter = "xlsx|*.xlsx" + }; + if (dialog.ShowDialog() == DialogResult.OK) + { + try + { + _logic.SavePastryComponentToExcelFile(new + ReportBindingModel + { + FileName = dialog.FileName + }); + _logger.LogInformation("Сохранение списка изделий по компонентам"); + + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, + MessageBoxIcon.Information); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения списка изделий по компонентам"); + + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + } + } +} diff --git a/Confectionery/ConfectioneryView/FormReportPastryComponents.resx b/Confectionery/ConfectioneryView/FormReportPastryComponents.resx new file mode 100644 index 0000000..c5d5fde --- /dev/null +++ b/Confectionery/ConfectioneryView/FormReportPastryComponents.resx @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/Confectionery/ConfectioneryView/Program.cs b/Confectionery/ConfectioneryView/Program.cs index b6afcc3..74a30b4 100644 --- a/Confectionery/ConfectioneryView/Program.cs +++ b/Confectionery/ConfectioneryView/Program.cs @@ -1,4 +1,6 @@ using ConfectioneryBusinessLogic; +using ConfectioneryBusinessLogic.OfficePackage.Implements; +using ConfectioneryBusinessLogic.OfficePackage; using ConfectioneryContracts.BusinessLogicsContracts; using ConfectioneryContracts.StoragesContracts; using ConfectioneryDatabaseImplement.Implements; @@ -38,6 +40,10 @@ namespace ConfectioneryView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -45,6 +51,8 @@ namespace ConfectioneryView services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + //services.AddTransient(); } } } \ No newline at end of file -- 2.25.1 From 0618c74ff32a14e5c478da244cd455ff1cc217a7 Mon Sep 17 00:00:00 2001 From: malimova Date: Thu, 25 Apr 2024 20:14:44 +0400 Subject: [PATCH 10/20] =?UTF-8?q?=D1=8F=20=D0=B4=D0=B5=D0=BB=D0=B0=D1=8E,?= =?UTF-8?q?=20=D1=81=20=D0=BF=D0=B4=D1=84=20=D0=BF=D0=BE=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ViewModels/ReportOrdersViewModel.cs | 1 + .../ConfectioneryFileImplement.csproj | 4 + .../ConfectioneryListImplement.csproj | 1 + .../ConfectioneryView.csproj | 7 + .../ConfectioneryView/FormMain.Designer.cs | 1 + Confectionery/ConfectioneryView/FormMain.cs | 23 +- .../FormReportOrders.Designer.cs | 130 ++++ .../ConfectioneryView/FormReportOrders.cs | 107 ++++ .../ConfectioneryView/FormReportOrders.resx | 60 ++ Confectionery/ConfectioneryView/Program.cs | 2 +- .../ConfectioneryView/ReportOrders.rdlc | 572 ++++++++++++++++++ 11 files changed, 905 insertions(+), 3 deletions(-) create mode 100644 Confectionery/ConfectioneryView/FormReportOrders.Designer.cs create mode 100644 Confectionery/ConfectioneryView/FormReportOrders.cs create mode 100644 Confectionery/ConfectioneryView/FormReportOrders.resx create mode 100644 Confectionery/ConfectioneryView/ReportOrders.rdlc diff --git a/Confectionery/ConfectioneryContracts/ViewModels/ReportOrdersViewModel.cs b/Confectionery/ConfectioneryContracts/ViewModels/ReportOrdersViewModel.cs index 88e4738..3521275 100644 --- a/Confectionery/ConfectioneryContracts/ViewModels/ReportOrdersViewModel.cs +++ b/Confectionery/ConfectioneryContracts/ViewModels/ReportOrdersViewModel.cs @@ -12,5 +12,6 @@ namespace ConfectioneryContracts.ViewModels public DateTime DateCreate { get; set; } public string PastryName { get; set; } = string.Empty; public double Sum { get; set; } + public string Status { get; set; } = string.Empty; } } diff --git a/Confectionery/ConfectioneryFileImplement/ConfectioneryFileImplement.csproj b/Confectionery/ConfectioneryFileImplement/ConfectioneryFileImplement.csproj index 41b6c3e..778307f 100644 --- a/Confectionery/ConfectioneryFileImplement/ConfectioneryFileImplement.csproj +++ b/Confectionery/ConfectioneryFileImplement/ConfectioneryFileImplement.csproj @@ -6,6 +6,10 @@ enable + + + + diff --git a/Confectionery/ConfectioneryListImplement/ConfectioneryListImplement.csproj b/Confectionery/ConfectioneryListImplement/ConfectioneryListImplement.csproj index 48a2e81..f7206a4 100644 --- a/Confectionery/ConfectioneryListImplement/ConfectioneryListImplement.csproj +++ b/Confectionery/ConfectioneryListImplement/ConfectioneryListImplement.csproj @@ -8,6 +8,7 @@ + diff --git a/Confectionery/ConfectioneryView/ConfectioneryView.csproj b/Confectionery/ConfectioneryView/ConfectioneryView.csproj index ce7d654..88f69ae 100644 --- a/Confectionery/ConfectioneryView/ConfectioneryView.csproj +++ b/Confectionery/ConfectioneryView/ConfectioneryView.csproj @@ -13,7 +13,9 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive + + @@ -23,4 +25,9 @@ + + + + + \ No newline at end of file diff --git a/Confectionery/ConfectioneryView/FormMain.Designer.cs b/Confectionery/ConfectioneryView/FormMain.Designer.cs index 658ef3b..fdff896 100644 --- a/Confectionery/ConfectioneryView/FormMain.Designer.cs +++ b/Confectionery/ConfectioneryView/FormMain.Designer.cs @@ -100,6 +100,7 @@ componentsListToolStripMenuItem.Name = "componentsListToolStripMenuItem"; componentsListToolStripMenuItem.Size = new Size(327, 34); componentsListToolStripMenuItem.Text = "Список компонентов"; + componentsListToolStripMenuItem.Click += componentsListToolStripMenuItem_Click; // // componentPastryToolStripMenuItem // diff --git a/Confectionery/ConfectioneryView/FormMain.cs b/Confectionery/ConfectioneryView/FormMain.cs index d2d1aee..8e93937 100644 --- a/Confectionery/ConfectioneryView/FormMain.cs +++ b/Confectionery/ConfectioneryView/FormMain.cs @@ -16,7 +16,7 @@ namespace ConfectioneryView public partial class FormMain : Form { private readonly ILogger _logger; - private readonly IOrderLogic _orderLogic; + private readonly IOrderLogic _orderLogic; private readonly IReportLogic _reportLogic; public FormMain(ILogger logger, IOrderLogic orderLogic, IReportLogic reportLogic) @@ -168,11 +168,30 @@ namespace ConfectioneryView { form.ShowDialog(); } + } private void ordersListToolStripMenuItem_Click(object sender, EventArgs e) { - + var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); + if (service is FormReportOrders form) + { + form.ShowDialog(); + } + } + + private void componentsListToolStripMenuItem_Click(object sender, EventArgs e) + { + using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; + if (dialog.ShowDialog() == DialogResult.OK) + { + _reportLogic.SaveComponentsToWordFile(new ReportBindingModel + { + FileName = dialog.FileName + }); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, + MessageBoxIcon.Information); + } } } } diff --git a/Confectionery/ConfectioneryView/FormReportOrders.Designer.cs b/Confectionery/ConfectioneryView/FormReportOrders.Designer.cs new file mode 100644 index 0000000..7262b61 --- /dev/null +++ b/Confectionery/ConfectioneryView/FormReportOrders.Designer.cs @@ -0,0 +1,130 @@ +namespace ConfectioneryView +{ + partial class FormReportOrders + { + /// + /// 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() + { + panel = new Panel(); + buttonToPdf = new Button(); + buttonMake = new Button(); + dateTimePickerTo = new DateTimePicker(); + labelTo = new Label(); + dateTimePickerFrom = new DateTimePicker(); + labelFrom = new Label(); + panel.SuspendLayout(); + SuspendLayout(); + // + // panel + // + panel.Controls.Add(buttonToPdf); + panel.Controls.Add(buttonMake); + panel.Controls.Add(dateTimePickerTo); + panel.Controls.Add(labelTo); + panel.Controls.Add(dateTimePickerFrom); + panel.Controls.Add(labelFrom); + panel.Location = new Point(0, 0); + panel.Name = "panel"; + panel.Size = new Size(1332, 69); + panel.TabIndex = 0; + // + // buttonToPdf + // + buttonToPdf.Location = new Point(1094, 12); + buttonToPdf.Name = "buttonToPdf"; + buttonToPdf.Size = new Size(156, 45); + buttonToPdf.TabIndex = 5; + buttonToPdf.Text = "В PDF"; + buttonToPdf.UseVisualStyleBackColor = true; + buttonToPdf.Click += buttonToPdf_Click; + // + // buttonMake + // + buttonMake.Location = new Point(800, 12); + buttonMake.Name = "buttonMake"; + buttonMake.Size = new Size(189, 48); + buttonMake.TabIndex = 4; + buttonMake.Text = "Сформировать"; + buttonMake.UseVisualStyleBackColor = true; + buttonMake.Click += buttonMake_Click; + // + // dateTimePickerTo + // + dateTimePickerTo.Location = new Point(447, 21); + dateTimePickerTo.Name = "dateTimePickerTo"; + dateTimePickerTo.Size = new Size(300, 31); + dateTimePickerTo.TabIndex = 3; + // + // labelTo + // + labelTo.AutoSize = true; + labelTo.Location = new Point(399, 26); + labelTo.Name = "labelTo"; + labelTo.Size = new Size(33, 25); + labelTo.TabIndex = 2; + labelTo.Text = "по"; + // + // dateTimePickerFrom + // + dateTimePickerFrom.Location = new Point(80, 21); + dateTimePickerFrom.Name = "dateTimePickerFrom"; + dateTimePickerFrom.Size = new Size(300, 31); + dateTimePickerFrom.TabIndex = 1; + // + // labelFrom + // + labelFrom.AutoSize = true; + labelFrom.Location = new Point(39, 26); + labelFrom.Name = "labelFrom"; + labelFrom.Size = new Size(23, 25); + labelFrom.TabIndex = 0; + labelFrom.Text = "С"; + // + // FormReportOrders + // + AutoScaleDimensions = new SizeF(10F, 25F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1331, 465); + Controls.Add(panel); + Name = "FormReportOrders"; + Text = "Заказы"; + panel.ResumeLayout(false); + panel.PerformLayout(); + ResumeLayout(false); + } + + #endregion + + private Panel panel; + private TextBox textBox1; + private Label labelFrom; + private Button buttonToPdf; + private Button buttonMake; + private DateTimePicker dateTimePickerTo; + private Label labelTo; + private DateTimePicker dateTimePickerFrom; + } +} \ No newline at end of file diff --git a/Confectionery/ConfectioneryView/FormReportOrders.cs b/Confectionery/ConfectioneryView/FormReportOrders.cs new file mode 100644 index 0000000..d03cd6f --- /dev/null +++ b/Confectionery/ConfectioneryView/FormReportOrders.cs @@ -0,0 +1,107 @@ +using ConfectioneryContracts.BindingModels; +using ConfectioneryContracts.BusinessLogicsContracts; +using Microsoft.Extensions.Logging; +using Microsoft.Reporting.WinForms; +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; + +namespace ConfectioneryView +{ + public partial class FormReportOrders : Form + { + private readonly ReportViewer reportViewer; + private readonly ILogger _logger; + private readonly IReportLogic _logic; + public FormReportOrders(ILogger logger, IReportLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + reportViewer = new ReportViewer + { + Dock = DockStyle.Fill + }; + reportViewer.LocalReport.LoadReportDefinition(new FileStream("ReportOrders.rdlc", FileMode.Open)); + Controls.Clear(); + Controls.Add(reportViewer); + Controls.Add(panel); + } + + + private void buttonMake_Click(object sender, EventArgs e) + { + if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date) + { + MessageBox.Show("Дата начала должна быть меньше даты окончания", + "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + try + { + var dataSource = _logic.GetOrders(new ReportBindingModel + { + DateFrom = dateTimePickerFrom.Value, + DateTo = dateTimePickerTo.Value + }); + var source = new ReportDataSource("DataSetOrders", dataSource); + reportViewer.LocalReport.DataSources.Clear(); + reportViewer.LocalReport.DataSources.Add(source); + var parameters = new[] { new ReportParameter("ReportParameterPeriod", $"c{dateTimePickerFrom.Value.ToShortDateString()} по{dateTimePickerTo.Value.ToShortDateString()}") }; + reportViewer.LocalReport.SetParameters(parameters); + reportViewer.RefreshReport(); + _logger.LogInformation("Загрузка списка заказов на период {From}-{ To}", dateTimePickerFrom.Value.ToShortDateString(), + dateTimePickerTo.Value.ToShortDateString()); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка заказов на период"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + } + + private void buttonToPdf_Click(object sender, EventArgs e) + { + if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date) + { + MessageBox.Show("Дата начала должна быть меньше даты окончания", + "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + using var dialog = new SaveFileDialog + { + Filter = "pdf|*.pdf" + }; + if (dialog.ShowDialog() == DialogResult.OK) + { + try + { + _logic.SaveOrdersToPdfFile(new ReportBindingModel + { + FileName = dialog.FileName, + DateFrom = dateTimePickerFrom.Value, + DateTo = dateTimePickerTo.Value + }); + _logger.LogInformation("Сохранение списка заказов на период{ From}-{ To}", + dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString()); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, + MessageBoxIcon.Information); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка сохранения списка заказов на период"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + } +} + diff --git a/Confectionery/ConfectioneryView/FormReportOrders.resx b/Confectionery/ConfectioneryView/FormReportOrders.resx new file mode 100644 index 0000000..f298a7b --- /dev/null +++ b/Confectionery/ConfectioneryView/FormReportOrders.resx @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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/Confectionery/ConfectioneryView/Program.cs b/Confectionery/ConfectioneryView/Program.cs index 74a30b4..50617db 100644 --- a/Confectionery/ConfectioneryView/Program.cs +++ b/Confectionery/ConfectioneryView/Program.cs @@ -52,7 +52,7 @@ namespace ConfectioneryView services.AddTransient(); services.AddTransient(); services.AddTransient(); - //services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file diff --git a/Confectionery/ConfectioneryView/ReportOrders.rdlc b/Confectionery/ConfectioneryView/ReportOrders.rdlc new file mode 100644 index 0000000..6b3375b --- /dev/null +++ b/Confectionery/ConfectioneryView/ReportOrders.rdlc @@ -0,0 +1,572 @@ + + + 0 + + + + System.Data.DataSet + /* Local Connection */ + + 10791c83-cee8-4a38-bbd0-245fc17cefb3 + + + + + + ConfectioneryContractsViewModels + /* Local Query */ + + + + Id + System.Int32 + + + DateCreate + System.DateTime + + + PastryName + System.String + + + Sum + System.Decimal + + + Status + System.String + + + + ConfectioneryContracts.ViewModels + ReportOrdersViewModel + ConfectioneryContracts.ViewModels.ReportOrdersViewModel, ConfectioneryContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + + + + + + + true + true + + + + + Заказы + + + + 0.6cm + 16.51cm + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!ReportParameterPeriod.Value + + + + ReportParameterPeriod + 0.6cm + 0.6cm + 16.51cm + 1 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + 2.60583cm + + + 3.262cm + + + 4.8495cm + + + 2.5cm + + + 2.5cm + + + + + 0.6cm + + + + + true + true + + + + + Номер + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Дата создания + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Изделие + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Статус + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Сумма + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + =Fields!Id.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!DateCreate.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!PastryName.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Status.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Sum.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + + + After + + + + + + + DataSetOrders + 1.9177cm + 0.79267cm + 1.2cm + 15.71733cm + 2 + + + + + + true + true + + + + + Итого: + + + + 3.46287cm + 11.51cm + 0.6cm + 2.5cm + 3 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Sum(Fields!Sum.Value, "DataSetOrders") + + + 2pt + 2pt + 2pt + 2pt + + + + 2in +