From edcc68aa9d3437d2ec8599cdb9760a8b600eaf3e Mon Sep 17 00:00:00 2001 From: "[USERNAME]" Date: Wed, 3 Apr 2024 20:58:35 +0400 Subject: [PATCH 1/6] start Lab4 --- .../BindingModels/ReportBindingModel.cs | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 MotorPlant/MotorPlantContracts/BindingModels/ReportBindingModel.cs diff --git a/MotorPlant/MotorPlantContracts/BindingModels/ReportBindingModel.cs b/MotorPlant/MotorPlantContracts/BindingModels/ReportBindingModel.cs new file mode 100644 index 0000000..23c5d65 --- /dev/null +++ b/MotorPlant/MotorPlantContracts/BindingModels/ReportBindingModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantContracts.BindingModels +{ + internal class ReportBindingModel + { + public string FileName { get; set; } = string.Empty; + public DateTime? DateFrom { get; set; } + public DateTime? DateTo { get; set; } + } +} -- 2.25.1 From f8b61183330be41f02d1c570841e54da7378e227 Mon Sep 17 00:00:00 2001 From: "[USERNAME]" Date: Thu, 4 Apr 2024 02:08:53 +0400 Subject: [PATCH 2/6] =?UTF-8?q?=D0=BF=D0=BE=D1=87=D1=82=D0=B8=20=D1=81?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MotorPlantBusinessLogic.csproj | 3 + .../OfficePackage/AbstractSaveToExcel.cs | 83 +++++ .../OfficePackage/AbstractSaveToPdf.cs | 58 +++ .../OfficePackage/AbstractSaveToWord.cs | 45 +++ .../HelperEnums/ExcelStyleInfoType.cs | 15 + .../HelperEnums/PdfParagraphAlignmentType.cs | 15 + .../HelperEnums/WordJustificationType.cs | 14 + .../HelperModels/ExcelCellParameters.cs | 18 + .../OfficePackage/HelperModels/ExcelInfo.cs | 21 ++ .../HelperModels/ExcelMergeParameters.cs | 15 + .../OfficePackage/HelperModels/PdfInfo.cs | 18 + .../HelperModels/PdfParagraph.cs | 16 + .../HelperModels/PdfRowParameters.cs | 16 + .../OfficePackage/HelperModels/WordInfo.cs | 16 + .../HelperModels/WordParagraph.cs | 14 + .../HelperModels/WordTextProperties.cs | 16 + .../OfficePackage/Implements/SaveToExcel.cs | 337 ++++++++++++++++++ .../OfficePackage/Implements/SaveToPdf.cs | 106 ++++++ .../OfficePackage/Implements/SaveToWord.cs | 103 ++++++ .../MotorPlantBusinessLogic/ReportLogic.cs | 105 ++++++ .../BindingModels/ReportBindingModel.cs | 2 +- .../BusinessLogicsContracts/IReportLogic.cs | 19 + .../SearchModels/OrderSearchModel.cs | 2 + .../ReportEngineComponentViewModel.cs | 15 + .../ViewModels/ReportOrdersViewModel.cs | 17 + .../MotorPlantView/FormMain.Designer.cs | 8 +- MotorPlant/MotorPlantView/FormMain.resx | 53 +-- .../MotorPlantView/MotorPlantView.csproj | 15 + .../Properties/Resources.Designer.cs | 63 ++++ .../MotorPlantView/Properties/Resources.resx | 120 +++++++ 30 files changed, 1317 insertions(+), 31 deletions(-) create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToExcel.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToPdf.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/WordInfo.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/Implements/SaveToExcel.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/Implements/SaveToPdf.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/OfficePackage/Implements/SaveToWord.cs create mode 100644 MotorPlant/MotorPlantBusinessLogic/ReportLogic.cs create mode 100644 MotorPlant/MotorPlantContracts/BusinessLogicsContracts/IReportLogic.cs create mode 100644 MotorPlant/MotorPlantContracts/ViewModels/ReportEngineComponentViewModel.cs create mode 100644 MotorPlant/MotorPlantContracts/ViewModels/ReportOrdersViewModel.cs create mode 100644 MotorPlant/MotorPlantView/Properties/Resources.Designer.cs create mode 100644 MotorPlant/MotorPlantView/Properties/Resources.resx diff --git a/MotorPlant/MotorPlantBusinessLogic/MotorPlantBusinessLogic.csproj b/MotorPlant/MotorPlantBusinessLogic/MotorPlantBusinessLogic.csproj index 4d4599c..3616447 100644 --- a/MotorPlant/MotorPlantBusinessLogic/MotorPlantBusinessLogic.csproj +++ b/MotorPlant/MotorPlantBusinessLogic/MotorPlantBusinessLogic.csproj @@ -7,12 +7,15 @@ + + + diff --git a/MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToExcel.cs new file mode 100644 index 0000000..61d868b --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -0,0 +1,83 @@ +using MotorPlantBusinessLogic.OfficePackage.HelperEnums; +using MotorPlantBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.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.EngineComponents) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "A", + RowIndex = rowIndex, + Text = pc.EngineName, + StyleInfo = ExcelStyleInfoType.Text + }); + rowIndex++; + foreach (var Engine in pc.Components) + { + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "B", + RowIndex = rowIndex, + Text = Engine.Item1, + StyleInfo = + ExcelStyleInfoType.TextWithBroder + }); + InsertCellInWorksheet(new ExcelCellParameters + { + ColumnName = "C", + RowIndex = rowIndex, + Text = Engine.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); + } + 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/MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToPdf.cs new file mode 100644 index 0000000..cb040a4 --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToPdf.cs @@ -0,0 +1,58 @@ +using MotorPlantBusinessLogic.OfficePackage.HelperEnums; +using MotorPlantBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.OfficePackage +{ + 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", "4cm" }); + 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.EngineName, order.Sum.ToString(), order.Status }, + Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Left + }); + } + CreateParagraph(new PdfParagraph + { + Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t", + Style = "Normal", + ParagraphAlignment = PdfParagraphAlignmentType.Right + }); + SavePdf(info); + } + 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/MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs new file mode 100644 index 0000000..f4f676b --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs @@ -0,0 +1,45 @@ +using MotorPlantBusinessLogic.OfficePackage.HelperEnums; +using MotorPlantBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.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.Engines) + { + CreateParagraph(new WordParagraph + { + Texts = new List<(string, WordTextProperties)> { +(component.EngineName, new WordTextProperties { Size = "24", }) }, + TextProperties = new WordTextProperties + { + Size = "24", + JustificationType = WordJustificationType.Both + } + }); + } + SaveWord(info); + } + protected abstract void CreateWord(WordInfo info); + protected abstract void CreateParagraph(WordParagraph paragraph); + protected abstract void SaveWord(WordInfo info); + } +} diff --git a/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs new file mode 100644 index 0000000..46c4fef --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperEnums/ExcelStyleInfoType.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.OfficePackage.HelperEnums +{ + public enum ExcelStyleInfoType + { + Title, + Text, + TextWithBroder + } +} diff --git a/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs new file mode 100644 index 0000000..2fdcbe0 --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperEnums/PdfParagraphAlignmentType.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.OfficePackage.HelperEnums +{ + public enum PdfParagraphAlignmentType + { + Center, + Left, + Right + } +} diff --git a/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs new file mode 100644 index 0000000..8ef02a6 --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperEnums/WordJustificationType.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.OfficePackage.HelperEnums +{ + public enum WordJustificationType + { + Center, + Both + } +} diff --git a/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs new file mode 100644 index 0000000..77fc2f0 --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/ExcelCellParameters.cs @@ -0,0 +1,18 @@ +using MotorPlantBusinessLogic.OfficePackage.HelperEnums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.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/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs new file mode 100644 index 0000000..2c7aa43 --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs @@ -0,0 +1,21 @@ +using MotorPlantContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.OfficePackage.HelperModels +{ + public class ExcelInfo + { + public string FileName { get; set; } = string.Empty; + public string Title { get; set; } = string.Empty; + public List EngineComponents + { + get; + set; + } = new(); + + } +} diff --git a/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs new file mode 100644 index 0000000..756f660 --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/ExcelMergeParameters.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.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/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs new file mode 100644 index 0000000..541d0c9 --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/PdfInfo.cs @@ -0,0 +1,18 @@ +using MotorPlantContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.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/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs new file mode 100644 index 0000000..a52172a --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/PdfParagraph.cs @@ -0,0 +1,16 @@ +using MotorPlantBusinessLogic.OfficePackage.HelperEnums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.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/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs new file mode 100644 index 0000000..0208ff6 --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/PdfRowParameters.cs @@ -0,0 +1,16 @@ +using MotorPlantBusinessLogic.OfficePackage.HelperEnums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.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/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/WordInfo.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/WordInfo.cs new file mode 100644 index 0000000..8fdeca6 --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/WordInfo.cs @@ -0,0 +1,16 @@ +using MotorPlantContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.OfficePackage.HelperModels +{ + public class WordInfo + { + public string FileName { get; set; } = string.Empty; + public string Title { get; set; } = string.Empty; + public List Engines { get; set; } = new(); + } +} diff --git a/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs new file mode 100644 index 0000000..b99e6b2 --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/WordParagraph.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.OfficePackage.HelperModels +{ + public class WordParagraph + { + public List<(string, WordTextProperties)> Texts { get; set; } = new(); + public WordTextProperties? TextProperties { get; set; } + } +} diff --git a/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs new file mode 100644 index 0000000..4cc60cf --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/HelperModels/WordTextProperties.cs @@ -0,0 +1,16 @@ +using MotorPlantBusinessLogic.OfficePackage.HelperEnums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.OfficePackage.HelperModels +{ + public class WordTextProperties + { + public string Size { get; set; } = string.Empty; + public bool Bold { get; set; } + public WordJustificationType JustificationType { get; set; } + } +} diff --git a/MotorPlant/MotorPlantBusinessLogic/OfficePackage/Implements/SaveToExcel.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/Implements/SaveToExcel.cs new file mode 100644 index 0000000..d8374ca --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/Implements/SaveToExcel.cs @@ -0,0 +1,337 @@ +using DocumentFormat.OpenXml.Office2010.Excel; +using DocumentFormat.OpenXml.Office2013.Excel; +using DocumentFormat.OpenXml.Office2016.Excel; +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Spreadsheet; +using DocumentFormat.OpenXml; +using MotorPlantBusinessLogic.OfficePackage.HelperEnums; +using MotorPlantBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.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(); + 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/MotorPlant/MotorPlantBusinessLogic/OfficePackage/Implements/SaveToPdf.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/Implements/SaveToPdf.cs new file mode 100644 index 0000000..d70a61a --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/Implements/SaveToPdf.cs @@ -0,0 +1,106 @@ +using MigraDoc.DocumentObjectModel; +using MigraDoc.DocumentObjectModel.Tables; +using MigraDoc.Rendering; +using MotorPlantBusinessLogic.OfficePackage.HelperEnums; +using MotorPlantBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.OfficePackage.Implements +{ + 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); + } + } +} diff --git a/MotorPlant/MotorPlantBusinessLogic/OfficePackage/Implements/SaveToWord.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/Implements/SaveToWord.cs new file mode 100644 index 0000000..6830053 --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/Implements/SaveToWord.cs @@ -0,0 +1,103 @@ +using DocumentFormat.OpenXml.Packaging; +using DocumentFormat.OpenXml.Wordprocessing; +using DocumentFormat.OpenXml; +using MotorPlantBusinessLogic.OfficePackage.HelperEnums; +using MotorPlantBusinessLogic.OfficePackage.HelperModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic.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(); + } + } +} diff --git a/MotorPlant/MotorPlantBusinessLogic/ReportLogic.cs b/MotorPlant/MotorPlantBusinessLogic/ReportLogic.cs new file mode 100644 index 0000000..79f6b02 --- /dev/null +++ b/MotorPlant/MotorPlantBusinessLogic/ReportLogic.cs @@ -0,0 +1,105 @@ +using MotorPlantBusinessLogic.OfficePackage.HelperModels; +using MotorPlantBusinessLogic.OfficePackage; +using MotorPlantContracts.BindingModels; +using MotorPlantContracts.BusinessLogicsContracts; +using MotorPlantContracts.SearchModels; +using MotorPlantContracts.StoragesContracts; +using MotorPlantContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantBusinessLogic +{ + public class ReportLogic : IReportLogic + { + private readonly IComponentStorage _componentStorage; + private readonly IEngineStorage _EngineStorage; + private readonly IOrderStorage _orderStorage; + private readonly AbstractSaveToExcel _saveToExcel; + private readonly AbstractSaveToWord _saveToWord; + private readonly AbstractSaveToPdf _saveToPdf; + public ReportLogic(IEngineStorage EngineStorage, IComponentStorage componentStorage, IOrderStorage orderStorage, AbstractSaveToExcel saveToExcel, AbstractSaveToWord saveToWord, AbstractSaveToPdf saveToPdf) + { + _EngineStorage = EngineStorage; + _componentStorage = componentStorage; + _orderStorage = orderStorage; + _saveToExcel = saveToExcel; + _saveToWord = saveToWord; + _saveToPdf = saveToPdf; + } + public List GetEngineComponents() + { + var components = _componentStorage.GetFullList(); + var Engines = _EngineStorage.GetFullList(); + var list = new List(); + foreach (var Engine in Engines) + { + var record = new ReportEngineComponentViewModel + { + EngineName = Engine.EngineName, + Components = new List<(string Component, int Count)>(), + TotalCount = 0 + }; + foreach (var component in components) + { + if (Engine.EngineComponents.ContainsKey(component.Id)) + { + record.Components.Add(new(component.ComponentName, Engine.EngineComponents[component.Id].Item2)); + record.TotalCount += Engine.EngineComponents[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, + EngineName = x.EngineName, + Sum = x.Sum, + Status = x.Status.ToString(), + }) + .ToList(); + } + public void SaveEnginesToWordFile(ReportBindingModel model) + { + _saveToWord.CreateDoc(new WordInfo + { + FileName = model.FileName, + Title = "Список ЖИ", + Engines = _EngineStorage.GetFullList() + }); + } + public void SaveEngineComponentToExcelFile(ReportBindingModel model) + { + _saveToExcel.CreateReport(new ExcelInfo + { + FileName = model.FileName, + Title = "Список ЖИ", + EngineComponents = GetEngineComponents() + }); + } + 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/MotorPlant/MotorPlantContracts/BindingModels/ReportBindingModel.cs b/MotorPlant/MotorPlantContracts/BindingModels/ReportBindingModel.cs index 23c5d65..94ff460 100644 --- a/MotorPlant/MotorPlantContracts/BindingModels/ReportBindingModel.cs +++ b/MotorPlant/MotorPlantContracts/BindingModels/ReportBindingModel.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; namespace MotorPlantContracts.BindingModels { - internal class ReportBindingModel + public class ReportBindingModel { public string FileName { get; set; } = string.Empty; public DateTime? DateFrom { get; set; } diff --git a/MotorPlant/MotorPlantContracts/BusinessLogicsContracts/IReportLogic.cs b/MotorPlant/MotorPlantContracts/BusinessLogicsContracts/IReportLogic.cs new file mode 100644 index 0000000..79c4b7a --- /dev/null +++ b/MotorPlant/MotorPlantContracts/BusinessLogicsContracts/IReportLogic.cs @@ -0,0 +1,19 @@ +using MotorPlantContracts.BindingModels; +using MotorPlantContracts.ViewModels; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantContracts.BusinessLogicsContracts +{ + public interface IReportLogic + { + List GetEngineComponents(); + List GetOrders(ReportBindingModel model); + void SaveEnginesToWordFile(ReportBindingModel model); + void SaveEngineComponentToExcelFile(ReportBindingModel model); + void SaveOrdersToPdfFile(ReportBindingModel model); + } +} diff --git a/MotorPlant/MotorPlantContracts/SearchModels/OrderSearchModel.cs b/MotorPlant/MotorPlantContracts/SearchModels/OrderSearchModel.cs index 2255ebd..f185c8f 100644 --- a/MotorPlant/MotorPlantContracts/SearchModels/OrderSearchModel.cs +++ b/MotorPlant/MotorPlantContracts/SearchModels/OrderSearchModel.cs @@ -3,5 +3,7 @@ public class OrderSearchModel { public int? Id { get; set; } + public DateTime? DateFrom { get; set; } + public DateTime? DateTo { get; set; } } } diff --git a/MotorPlant/MotorPlantContracts/ViewModels/ReportEngineComponentViewModel.cs b/MotorPlant/MotorPlantContracts/ViewModels/ReportEngineComponentViewModel.cs new file mode 100644 index 0000000..ae6cb5d --- /dev/null +++ b/MotorPlant/MotorPlantContracts/ViewModels/ReportEngineComponentViewModel.cs @@ -0,0 +1,15 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantContracts.ViewModels +{ + public class ReportEngineComponentViewModel + { + public string EngineName { get; set; } = string.Empty; + public int TotalCount { get; set; } + public List<(string Component, int Count)> Components { get; set; } = new(); + } +} diff --git a/MotorPlant/MotorPlantContracts/ViewModels/ReportOrdersViewModel.cs b/MotorPlant/MotorPlantContracts/ViewModels/ReportOrdersViewModel.cs new file mode 100644 index 0000000..47cd7b7 --- /dev/null +++ b/MotorPlant/MotorPlantContracts/ViewModels/ReportOrdersViewModel.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MotorPlantContracts.ViewModels +{ + public class ReportOrdersViewModel + { + public int Id { get; set; } + public DateTime DateCreate { get; set; } + public string EngineName { get; set; } = string.Empty; + public double Sum { get; set; } + public string Status { get; set; } = string.Empty; + } +} diff --git a/MotorPlant/MotorPlantView/FormMain.Designer.cs b/MotorPlant/MotorPlantView/FormMain.Designer.cs index eb3bef1..f3fd39e 100644 --- a/MotorPlant/MotorPlantView/FormMain.Designer.cs +++ b/MotorPlant/MotorPlantView/FormMain.Designer.cs @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain)); toolStrip1 = new ToolStrip(); toolStripDropDownButton1 = new ToolStripDropDownButton(); КомпонентыToolStripMenuItem = new ToolStripMenuItem(); @@ -57,7 +56,6 @@ // toolStripDropDownButton1.DisplayStyle = ToolStripItemDisplayStyle.Text; toolStripDropDownButton1.DropDownItems.AddRange(new ToolStripItem[] { КомпонентыToolStripMenuItem, ДвигателиToolStripMenuItem }); - toolStripDropDownButton1.Image = (Image)resources.GetObject("toolStripDropDownButton1.Image"); toolStripDropDownButton1.ImageTransparentColor = Color.Magenta; toolStripDropDownButton1.Name = "toolStripDropDownButton1"; toolStripDropDownButton1.Size = new Size(88, 22); @@ -65,15 +63,15 @@ // // КомпонентыToolStripMenuItem // - КомпонентыToolStripMenuItem.Name = "компонентыToolStripMenuItem"; - КомпонентыToolStripMenuItem.Size = new Size(174, 22); + КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem"; + КомпонентыToolStripMenuItem.Size = new Size(180, 22); КомпонентыToolStripMenuItem.Text = "Компоненты"; КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; // // ДвигателиToolStripMenuItem // ДвигателиToolStripMenuItem.Name = "ДвигателиToolStripMenuItem"; - ДвигателиToolStripMenuItem.Size = new Size(174, 22); + ДвигателиToolStripMenuItem.Size = new Size(180, 22); ДвигателиToolStripMenuItem.Text = "Двигатели"; ДвигателиToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click; // diff --git a/MotorPlant/MotorPlantView/FormMain.resx b/MotorPlant/MotorPlantView/FormMain.resx index 1af7de1..c354583 100644 --- a/MotorPlant/MotorPlantView/FormMain.resx +++ b/MotorPlant/MotorPlantView/FormMain.resx @@ -1,17 +1,17 @@  - @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/MotorPlant/MotorPlantView/MotorPlantView.csproj b/MotorPlant/MotorPlantView/MotorPlantView.csproj index b63b22d..cf749f6 100644 --- a/MotorPlant/MotorPlantView/MotorPlantView.csproj +++ b/MotorPlant/MotorPlantView/MotorPlantView.csproj @@ -29,4 +29,19 @@ + + + True + True + Resources.resx + + + + + + ResXFileCodeGenerator + Resources.Designer.cs + + + \ No newline at end of file diff --git a/MotorPlant/MotorPlantView/Properties/Resources.Designer.cs b/MotorPlant/MotorPlantView/Properties/Resources.Designer.cs new file mode 100644 index 0000000..eae4a4d --- /dev/null +++ b/MotorPlant/MotorPlantView/Properties/Resources.Designer.cs @@ -0,0 +1,63 @@ +//------------------------------------------------------------------------------ +// +// Этот код создан программой. +// Исполняемая версия:4.0.30319.42000 +// +// Изменения в этом файле могут привести к неправильной работе и будут потеряны в случае +// повторной генерации кода. +// +//------------------------------------------------------------------------------ + +namespace MotorPlantView.Properties { + using System; + + + /// + /// Класс ресурса со строгой типизацией для поиска локализованных строк и т.д. + /// + // Этот класс создан автоматически классом StronglyTypedResourceBuilder + // с помощью такого средства, как ResGen или Visual Studio. + // Чтобы добавить или удалить член, измените файл .ResX и снова запустите ResGen + // с параметром /str или перестройте свой проект VS. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class Resources { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal Resources() { + } + + /// + /// Возвращает кэшированный экземпляр ResourceManager, использованный этим классом. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("MotorPlantView.Properties.Resources", typeof(Resources).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Перезаписывает свойство CurrentUICulture текущего потока для всех + /// обращений к ресурсу с помощью этого класса ресурса со строгой типизацией. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + } +} diff --git a/MotorPlant/MotorPlantView/Properties/Resources.resx b/MotorPlant/MotorPlantView/Properties/Resources.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/MotorPlant/MotorPlantView/Properties/Resources.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 -- 2.25.1 From bad59033bf1c8750a98cab83f15f06e0ed3bc29b Mon Sep 17 00:00:00 2001 From: "[USERNAME]" Date: Thu, 4 Apr 2024 10:05:15 +0400 Subject: [PATCH 3/6] =?UTF-8?q?=D0=BF=D0=BE=D1=87=D1=82=D0=B8=20=D1=81?= =?UTF-8?q?=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MotorPlantView/FormMain.Designer.cs | 39 ++++- MotorPlant/MotorPlantView/FormMain.cs | 36 ++++- .../FormReportEngineComponents.Designer.cs | 96 ++++++++++++ .../FormReportEngineComponents.cs | 78 ++++++++++ .../FormReportEngineComponents.resx | 138 ++++++++++++++++++ .../FormReportOrders.Designer.cs | 137 +++++++++++++++++ MotorPlant/MotorPlantView/FormReportOrders.cs | 101 +++++++++++++ .../MotorPlantView/FormReportOrders.resx | 120 +++++++++++++++ .../MotorPlantView/MotorPlantView.csproj | 5 +- MotorPlant/MotorPlantView/Program.cs | 9 ++ 10 files changed, 753 insertions(+), 6 deletions(-) create mode 100644 MotorPlant/MotorPlantView/FormReportEngineComponents.Designer.cs create mode 100644 MotorPlant/MotorPlantView/FormReportEngineComponents.cs create mode 100644 MotorPlant/MotorPlantView/FormReportEngineComponents.resx create mode 100644 MotorPlant/MotorPlantView/FormReportOrders.Designer.cs create mode 100644 MotorPlant/MotorPlantView/FormReportOrders.cs create mode 100644 MotorPlant/MotorPlantView/FormReportOrders.resx diff --git a/MotorPlant/MotorPlantView/FormMain.Designer.cs b/MotorPlant/MotorPlantView/FormMain.Designer.cs index f3fd39e..9fa23ac 100644 --- a/MotorPlant/MotorPlantView/FormMain.Designer.cs +++ b/MotorPlant/MotorPlantView/FormMain.Designer.cs @@ -32,6 +32,10 @@ toolStripDropDownButton1 = new ToolStripDropDownButton(); КомпонентыToolStripMenuItem = new ToolStripMenuItem(); ДвигателиToolStripMenuItem = new ToolStripMenuItem(); + отчетыToolStripMenuItem = new ToolStripMenuItem(); + списокКомпонентовToolStripMenuItem = new ToolStripMenuItem(); + компонентыПоДвигателямToolStripMenuItem = new ToolStripMenuItem(); + списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); buttonCreateOrder = new Button(); buttonTakeOrderInWork = new Button(); buttonOrderReady = new Button(); @@ -45,7 +49,7 @@ // toolStrip1 // toolStrip1.ImageScalingSize = new Size(20, 20); - toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1 }); + toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, отчетыToolStripMenuItem }); toolStrip1.Location = new Point(0, 0); toolStrip1.Name = "toolStrip1"; toolStrip1.Size = new Size(969, 25); @@ -64,17 +68,42 @@ // КомпонентыToolStripMenuItem // КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem"; - КомпонентыToolStripMenuItem.Size = new Size(180, 22); + КомпонентыToolStripMenuItem.Size = new Size(145, 22); КомпонентыToolStripMenuItem.Text = "Компоненты"; КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; // // ДвигателиToolStripMenuItem // ДвигателиToolStripMenuItem.Name = "ДвигателиToolStripMenuItem"; - ДвигателиToolStripMenuItem.Size = new Size(180, 22); + ДвигателиToolStripMenuItem.Size = new Size(145, 22); ДвигателиToolStripMenuItem.Text = "Двигатели"; ДвигателиToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click; // + // отчетыToolStripMenuItem + // + отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокКомпонентовToolStripMenuItem, компонентыПоДвигателямToolStripMenuItem, списокЗаказовToolStripMenuItem }); + отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; + отчетыToolStripMenuItem.Size = new Size(60, 25); + отчетыToolStripMenuItem.Text = "Отчеты"; + // + // списокКомпонентовToolStripMenuItem + // + списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem"; + списокКомпонентовToolStripMenuItem.Size = new Size(228, 22); + списокКомпонентовToolStripMenuItem.Text = "Список компонентов"; + // + // компонентыПоДвигателямToolStripMenuItem + // + компонентыПоДвигателямToolStripMenuItem.Name = "компонентыПоДвигателямToolStripMenuItem"; + компонентыПоДвигателямToolStripMenuItem.Size = new Size(228, 22); + компонентыПоДвигателямToolStripMenuItem.Text = "Компоненты по двигателям"; + // + // списокЗаказовToolStripMenuItem + // + списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; + списокЗаказовToolStripMenuItem.Size = new Size(228, 22); + списокЗаказовToolStripMenuItem.Text = "Список заказов"; + // // buttonCreateOrder // buttonCreateOrder.Location = new Point(800, 56); @@ -171,5 +200,9 @@ private ToolStripDropDownButton toolStripDropDownButton1; private ToolStripMenuItem КомпонентыToolStripMenuItem; private ToolStripMenuItem ДвигателиToolStripMenuItem; + private ToolStripMenuItem отчетыToolStripMenuItem; + private ToolStripMenuItem списокКомпонентовToolStripMenuItem; + private ToolStripMenuItem компонентыПоДвигателямToolStripMenuItem; + private ToolStripMenuItem списокЗаказовToolStripMenuItem; } } \ No newline at end of file diff --git a/MotorPlant/MotorPlantView/FormMain.cs b/MotorPlant/MotorPlantView/FormMain.cs index 9b14b89..2e13083 100644 --- a/MotorPlant/MotorPlantView/FormMain.cs +++ b/MotorPlant/MotorPlantView/FormMain.cs @@ -1,6 +1,7 @@ using Microsoft.Extensions.Logging; using MotorPlantContracts.BindingModels; using MotorPlantContracts.BusinessLogicsContracts; +using MotorPlantBusinessLogic; namespace MotorPlantView.Forms { @@ -8,11 +9,13 @@ namespace MotorPlantView.Forms { private readonly ILogger _logger; private readonly IOrderLogic _orderLogic; - public FormMain(ILogger logger, 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) { @@ -142,5 +145,36 @@ namespace MotorPlantView.Forms { LoadData(); } + private void списокКомпонентовToolStripMenuItem_Click(object sender, EventArgs e) + { + using var dialog = new SaveFileDialog { Filter = "docx|*.docx" }; + if (dialog.ShowDialog() == DialogResult.OK) + { + _reportLogic.SaveEnginesToWordFile(new ReportBindingModel + { + FileName = dialog.FileName + }); + MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, + MessageBoxIcon.Information); + } + } + + private void компонентыПоДвигателямToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormReportEngineComponents)); + if (service is FormReportEngineComponents form) + { + form.ShowDialog(); + } + } + + private void списокЗаказовToolStripMenuItem_Click(object sender, EventArgs e) + { + var service = Program.ServiceProvider?.GetService(typeof(FormReportOrders)); + if (service is FormReportOrders form) + { + form.ShowDialog(); + } + } } } diff --git a/MotorPlant/MotorPlantView/FormReportEngineComponents.Designer.cs b/MotorPlant/MotorPlantView/FormReportEngineComponents.Designer.cs new file mode 100644 index 0000000..8bdda7e --- /dev/null +++ b/MotorPlant/MotorPlantView/FormReportEngineComponents.Designer.cs @@ -0,0 +1,96 @@ +namespace MotorPlantView.Forms +{ + partial class FormReportEngineComponents + { + /// + /// 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() + { + SaveButton = new Button(); + dataGridView = new DataGridView(); + ComponentColumn = new DataGridViewTextBoxColumn(); + EngineColumn = new DataGridViewTextBoxColumn(); + CountColumn = new DataGridViewTextBoxColumn(); + ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); + SuspendLayout(); + // + // SaveButton + // + SaveButton.Location = new Point(12, 12); + SaveButton.Name = "SaveButton"; + SaveButton.Size = new Size(128, 23); + SaveButton.TabIndex = 0; + SaveButton.Text = "Сохранить в Excel"; + SaveButton.UseVisualStyleBackColor = true; + // + // dataGridView + // + dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; + dataGridView.Columns.AddRange(new DataGridViewColumn[] { ComponentColumn, EngineColumn, CountColumn }); + dataGridView.Location = new Point(12, 46); + dataGridView.Name = "dataGridView"; + dataGridView.Size = new Size(570, 392); + dataGridView.TabIndex = 1; + // + // ComponentColumn + // + ComponentColumn.HeaderText = "Компонент"; + ComponentColumn.Name = "ComponentColumn"; + ComponentColumn.Width = 200; + // + // EngineColumn + // + EngineColumn.HeaderText = "Изделие"; + EngineColumn.Name = "EngineColumn"; + EngineColumn.Width = 200; + // + // CountColumn + // + CountColumn.HeaderText = "Количество"; + CountColumn.Name = "CountColumn"; + CountColumn.Width = 200; + // + // FormReportEngineComponents + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(594, 450); + Controls.Add(dataGridView); + Controls.Add(SaveButton); + Name = "FormReportEngineComponents"; + Text = "Компоненты по изделиям"; + ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); + ResumeLayout(false); + } + + #endregion + + private Button SaveButton; + private DataGridView dataGridView; + private DataGridViewTextBoxColumn ComponentColumn; + private DataGridViewTextBoxColumn EngineColumn; + private DataGridViewTextBoxColumn CountColumn; + } +} \ No newline at end of file diff --git a/MotorPlant/MotorPlantView/FormReportEngineComponents.cs b/MotorPlant/MotorPlantView/FormReportEngineComponents.cs new file mode 100644 index 0000000..fa69417 --- /dev/null +++ b/MotorPlant/MotorPlantView/FormReportEngineComponents.cs @@ -0,0 +1,78 @@ +using Microsoft.Extensions.Logging; +using MotorPlantContracts.BindingModels; +using MotorPlantContracts.BusinessLogicsContracts; +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 MotorPlantView.Forms +{ + public partial class FormReportEngineComponents : Form + { + private readonly ILogger _logger; + private readonly IReportLogic _logic; + + public FormReportEngineComponents(ILogger logger, IReportLogic logic) + { + InitializeComponent(); + _logger = logger; + _logic = logic; + } + + private void FormReportEngineComponents_Load(object sender, EventArgs e) + { + try + { + var dict = _logic.GetEngineComponents(); + if (dict != null) + { + dataGridView.Rows.Clear(); + foreach (var elem in dict) + { + dataGridView.Rows.Add(new object[] { elem.EngineName, "", "" }); + foreach (var listElem in elem.Components) + { + 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.SaveEngineComponentToExcelFile(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/MotorPlant/MotorPlantView/FormReportEngineComponents.resx b/MotorPlant/MotorPlantView/FormReportEngineComponents.resx new file mode 100644 index 0000000..b33b3be --- /dev/null +++ b/MotorPlant/MotorPlantView/FormReportEngineComponents.resx @@ -0,0 +1,138 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + True + + + True + + + True + + \ No newline at end of file diff --git a/MotorPlant/MotorPlantView/FormReportOrders.Designer.cs b/MotorPlant/MotorPlantView/FormReportOrders.Designer.cs new file mode 100644 index 0000000..03c5cd4 --- /dev/null +++ b/MotorPlant/MotorPlantView/FormReportOrders.Designer.cs @@ -0,0 +1,137 @@ +namespace MotorPlantView.Forms +{ + 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() + { + this.panel = new System.Windows.Forms.Panel(); + this.buttonCreateToPdf = new System.Windows.Forms.Button(); + this.buttonCreateReport = new System.Windows.Forms.Button(); + this.label2 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.dateTimePickerEnd = new System.Windows.Forms.DateTimePicker(); + this.dateTimePickerStart = new System.Windows.Forms.DateTimePicker(); + this.panel.SuspendLayout(); + this.SuspendLayout(); + // + // panel + // + this.panel.Controls.Add(this.buttonCreateToPdf); + this.panel.Controls.Add(this.buttonCreateReport); + this.panel.Controls.Add(this.label2); + this.panel.Controls.Add(this.label1); + this.panel.Controls.Add(this.dateTimePickerEnd); + this.panel.Controls.Add(this.dateTimePickerStart); + this.panel.Dock = System.Windows.Forms.DockStyle.Top; + this.panel.Location = new System.Drawing.Point(0, 0); + this.panel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.panel.Name = "panel"; + this.panel.Size = new System.Drawing.Size(861, 56); + this.panel.TabIndex = 0; + // + // buttonCreateToPdf + // + this.buttonCreateToPdf.Location = new System.Drawing.Point(684, 29); + this.buttonCreateToPdf.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonCreateToPdf.Name = "buttonCreateToPdf"; + this.buttonCreateToPdf.Size = new System.Drawing.Size(166, 23); + this.buttonCreateToPdf.TabIndex = 5; + this.buttonCreateToPdf.Text = "PDF"; + this.buttonCreateToPdf.UseVisualStyleBackColor = true; + this.buttonCreateToPdf.Click += new System.EventHandler(this.buttonCreateToPdf_Click); + // + // buttonCreateReport + // + this.buttonCreateReport.Location = new System.Drawing.Point(485, 29); + this.buttonCreateReport.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.buttonCreateReport.Name = "buttonCreateReport"; + this.buttonCreateReport.Size = new System.Drawing.Size(166, 23); + this.buttonCreateReport.TabIndex = 4; + this.buttonCreateReport.Text = "Сформировать"; + this.buttonCreateReport.UseVisualStyleBackColor = true; + this.buttonCreateReport.Click += new System.EventHandler(this.buttonCreateReport_Click); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(323, 7); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(44, 15); + this.label2.TabIndex = 3; + this.label2.Text = "Конец:"; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(76, 4); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(52, 15); + this.label1.TabIndex = 2; + this.label1.Text = "Начало:"; + // + // dateTimePickerEnd + // + this.dateTimePickerEnd.Location = new System.Drawing.Point(269, 29); + this.dateTimePickerEnd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.dateTimePickerEnd.Name = "dateTimePickerEnd"; + this.dateTimePickerEnd.Size = new System.Drawing.Size(164, 23); + this.dateTimePickerEnd.TabIndex = 1; + // + // dateTimePickerStart + // + this.dateTimePickerStart.Location = new System.Drawing.Point(31, 29); + this.dateTimePickerStart.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.dateTimePickerStart.Name = "dateTimePickerStart"; + this.dateTimePickerStart.Size = new System.Drawing.Size(164, 23); + this.dateTimePickerStart.TabIndex = 0; + // + // FormReportOrders + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(861, 338); + this.Controls.Add(this.panel); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Name = "FormReportOrders"; + this.Text = "Заказы"; + this.panel.ResumeLayout(false); + this.panel.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private Panel panel; + private DateTimePicker dateTimePickerEnd; + private DateTimePicker dateTimePickerStart; + private Button buttonCreateToPdf; + private Button buttonCreateReport; + private Label label2; + private Label label1; + } +} \ No newline at end of file diff --git a/MotorPlant/MotorPlantView/FormReportOrders.cs b/MotorPlant/MotorPlantView/FormReportOrders.cs new file mode 100644 index 0000000..71af91a --- /dev/null +++ b/MotorPlant/MotorPlantView/FormReportOrders.cs @@ -0,0 +1,101 @@ +using Microsoft.Extensions.Logging; +using Microsoft.Reporting.WinForms; +using MotorPlantContracts.BindingModels; +using MotorPlantContracts.BusinessLogicsContracts; +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 MotorPlantView.Forms +{ + 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("C:\\Users\\goldfest\\Desktop\\EngineCompany\\PrecastConcretePlant\\PrecastConcretePlantView\\ReportOrders.rdlc", FileMode.Open)); + Controls.Clear(); + Controls.Add(reportViewer); + Controls.Add(panel); + } + + private void buttonCreateReport_Click(object sender, EventArgs e) + { + if (dateTimePickerStart.Value.Date >= dateTimePickerEnd.Value.Date) + { + MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); + return; + } + try + { + var dataSource = _logic.GetOrders(new ReportBindingModel + { + DateFrom = dateTimePickerStart.Value, + DateTo = dateTimePickerEnd.Value + }); + var source = new ReportDataSource("DataSetOrders", dataSource); + reportViewer.LocalReport.DataSources.Clear(); + reportViewer.LocalReport.DataSources.Add(source); + var parameters = new[] { new ReportParameter("ReportParameterPeriod", $"c{dateTimePickerStart.Value.ToShortDateString()} по {dateTimePickerEnd.Value.ToShortDateString()}") }; + reportViewer.LocalReport.SetParameters(parameters); + reportViewer.RefreshReport(); + _logger.LogInformation("Загрузка списка заказов на период {From}-{ To}", dateTimePickerStart.Value.ToShortDateString(), dateTimePickerEnd.Value.ToShortDateString()); + } + catch (Exception ex) + { + _logger.LogError(ex, "Ошибка загрузки списка заказов на период"); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, + MessageBoxIcon.Error); + } + + } + + private void buttonCreateToPdf_Click(object sender, EventArgs e) + { + if (dateTimePickerStart.Value.Date >= dateTimePickerEnd.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 = dateTimePickerStart.Value, + DateTo = dateTimePickerEnd.Value + }); + _logger.LogInformation("Сохранение списка заказов на период { From} -{ To}", dateTimePickerStart.Value.ToShortDateString(), dateTimePickerEnd.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/MotorPlant/MotorPlantView/FormReportOrders.resx b/MotorPlant/MotorPlantView/FormReportOrders.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/MotorPlant/MotorPlantView/FormReportOrders.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/MotorPlant/MotorPlantView/MotorPlantView.csproj b/MotorPlant/MotorPlantView/MotorPlantView.csproj index cf749f6..63277b7 100644 --- a/MotorPlant/MotorPlantView/MotorPlantView.csproj +++ b/MotorPlant/MotorPlantView/MotorPlantView.csproj @@ -2,14 +2,14 @@ WinExe - net8.0-windows + net8.0-windows7.0 enable true enable - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -19,6 +19,7 @@ + diff --git a/MotorPlant/MotorPlantView/Program.cs b/MotorPlant/MotorPlantView/Program.cs index 1d41c4e..5e33594 100644 --- a/MotorPlant/MotorPlantView/Program.cs +++ b/MotorPlant/MotorPlantView/Program.cs @@ -5,6 +5,9 @@ using Microsoft.Extensions.Logging; using NLog.Extensions.Logging; using MotorPlantBusinessLogic.BusinessLogics; using MotorPlantDatabaseImplement.Implements; +using MotorPlantBusinessLogic.OfficePackage.Implements; +using MotorPlantBusinessLogic.OfficePackage; +using MotorPlantBusinessLogic; namespace MotorPlantView.Forms { @@ -41,6 +44,7 @@ namespace MotorPlantView.Forms services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); services.AddTransient(); services.AddTransient(); @@ -49,6 +53,11 @@ namespace MotorPlantView.Forms services.AddTransient(); services.AddTransient(); services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); + services.AddTransient(); } } } \ No newline at end of file -- 2.25.1 From 7f831ad75d7a3735178ab2dc840039ccb8af262a Mon Sep 17 00:00:00 2001 From: "[USERNAME]" Date: Thu, 4 Apr 2024 13:52:30 +0400 Subject: [PATCH 4/6] =?UTF-8?q?=D0=B5=D1=89=D1=91=20=D1=80=D0=B0=D0=B7=20?= =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=B8=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MotorPlantBusinessLogic.csproj | 4 +- .../OfficePackage/AbstractSaveToWord.cs | 7 +- .../MotorPlantBusinessLogic/ReportLogic.cs | 30 +- .../ViewModels/ReportOrdersViewModel.cs | 2 +- .../MotorPlantView/FormMain.Designer.cs | 59 +- .../FormReportEngineComponents.Designer.cs | 67 +- .../FormReportEngineComponents.cs | 31 +- .../FormReportEngineComponents.resx | 9 - .../FormReportOrders.Designer.cs | 156 ++--- MotorPlant/MotorPlantView/FormReportOrders.cs | 44 +- .../MotorPlantView/FormReportOrders.resx | 50 +- .../MotorPlantView/MotorPlantView.csproj | 3 +- MotorPlant/MotorPlantView/ReportOrders.rdlc | 633 ++++++++++++++++++ 13 files changed, 862 insertions(+), 233 deletions(-) create mode 100644 MotorPlant/MotorPlantView/ReportOrders.rdlc diff --git a/MotorPlant/MotorPlantBusinessLogic/MotorPlantBusinessLogic.csproj b/MotorPlant/MotorPlantBusinessLogic/MotorPlantBusinessLogic.csproj index 3616447..83215cb 100644 --- a/MotorPlant/MotorPlantBusinessLogic/MotorPlantBusinessLogic.csproj +++ b/MotorPlant/MotorPlantBusinessLogic/MotorPlantBusinessLogic.csproj @@ -10,12 +10,12 @@ - + - + diff --git a/MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs index f4f676b..a091505 100644 --- a/MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs +++ b/MotorPlant/MotorPlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs @@ -27,8 +27,11 @@ WordTextProperties { Bold = true, Size = "24", }) }, { CreateParagraph(new WordParagraph { - Texts = new List<(string, WordTextProperties)> { -(component.EngineName, new WordTextProperties { Size = "24", }) }, + Texts = new List<(string, WordTextProperties)> + { + (component.EngineName, new WordTextProperties { Size = "24", Bold = true}), + ("\t" + component.Price.ToString(), new WordTextProperties { Size = "24"}), + }, TextProperties = new WordTextProperties { Size = "24", diff --git a/MotorPlant/MotorPlantBusinessLogic/ReportLogic.cs b/MotorPlant/MotorPlantBusinessLogic/ReportLogic.cs index 79f6b02..0b33161 100644 --- a/MotorPlant/MotorPlantBusinessLogic/ReportLogic.cs +++ b/MotorPlant/MotorPlantBusinessLogic/ReportLogic.cs @@ -32,28 +32,12 @@ namespace MotorPlantBusinessLogic } public List GetEngineComponents() { - var components = _componentStorage.GetFullList(); - var Engines = _EngineStorage.GetFullList(); - var list = new List(); - foreach (var Engine in Engines) + return _EngineStorage.GetFullList().Select(x => new ReportEngineComponentViewModel { - var record = new ReportEngineComponentViewModel - { - EngineName = Engine.EngineName, - Components = new List<(string Component, int Count)>(), - TotalCount = 0 - }; - foreach (var component in components) - { - if (Engine.EngineComponents.ContainsKey(component.Id)) - { - record.Components.Add(new(component.ComponentName, Engine.EngineComponents[component.Id].Item2)); - record.TotalCount += Engine.EngineComponents[component.Id].Item2; - } - } - list.Add(record); - } - return list; + EngineName = x.EngineName, + Components = x.EngineComponents.Select(x => (x.Value.Item1.ComponentName, x.Value.Item2)).ToList(), + TotalCount = x.EngineComponents.Select(x => x.Value.Item2).Sum() + }).ToList(); } public List GetOrders(ReportBindingModel model) { @@ -77,7 +61,7 @@ namespace MotorPlantBusinessLogic _saveToWord.CreateDoc(new WordInfo { FileName = model.FileName, - Title = "Список ЖИ", + Title = "Список двигателей", Engines = _EngineStorage.GetFullList() }); } @@ -86,7 +70,7 @@ namespace MotorPlantBusinessLogic _saveToExcel.CreateReport(new ExcelInfo { FileName = model.FileName, - Title = "Список ЖИ", + Title = "Список компонентов", EngineComponents = GetEngineComponents() }); } diff --git a/MotorPlant/MotorPlantContracts/ViewModels/ReportOrdersViewModel.cs b/MotorPlant/MotorPlantContracts/ViewModels/ReportOrdersViewModel.cs index 47cd7b7..46ac62f 100644 --- a/MotorPlant/MotorPlantContracts/ViewModels/ReportOrdersViewModel.cs +++ b/MotorPlant/MotorPlantContracts/ViewModels/ReportOrdersViewModel.cs @@ -12,6 +12,6 @@ namespace MotorPlantContracts.ViewModels public DateTime DateCreate { get; set; } public string EngineName { get; set; } = string.Empty; public double Sum { get; set; } - public string Status { get; set; } = string.Empty; + public string Status { get; set; } } } diff --git a/MotorPlant/MotorPlantView/FormMain.Designer.cs b/MotorPlant/MotorPlantView/FormMain.Designer.cs index 9fa23ac..a9cdc92 100644 --- a/MotorPlant/MotorPlantView/FormMain.Designer.cs +++ b/MotorPlant/MotorPlantView/FormMain.Designer.cs @@ -32,10 +32,10 @@ toolStripDropDownButton1 = new ToolStripDropDownButton(); КомпонентыToolStripMenuItem = new ToolStripMenuItem(); ДвигателиToolStripMenuItem = new ToolStripMenuItem(); - отчетыToolStripMenuItem = new ToolStripMenuItem(); - списокКомпонентовToolStripMenuItem = new ToolStripMenuItem(); - компонентыПоДвигателямToolStripMenuItem = new ToolStripMenuItem(); - списокЗаказовToolStripMenuItem = new ToolStripMenuItem(); + ReportsToolStripMenuItem = new ToolStripMenuItem(); + ListComponentsToolStripMenuItem = new ToolStripMenuItem(); + EngineComponentsToolStripMenuItem = new ToolStripMenuItem(); + ListOrdersToolStripMenuItem = new ToolStripMenuItem(); buttonCreateOrder = new Button(); buttonTakeOrderInWork = new Button(); buttonOrderReady = new Button(); @@ -49,7 +49,7 @@ // toolStrip1 // toolStrip1.ImageScalingSize = new Size(20, 20); - toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, отчетыToolStripMenuItem }); + toolStrip1.Items.AddRange(new ToolStripItem[] { toolStripDropDownButton1, ReportsToolStripMenuItem }); toolStrip1.Location = new Point(0, 0); toolStrip1.Name = "toolStrip1"; toolStrip1.Size = new Size(969, 25); @@ -68,41 +68,44 @@ // КомпонентыToolStripMenuItem // КомпонентыToolStripMenuItem.Name = "КомпонентыToolStripMenuItem"; - КомпонентыToolStripMenuItem.Size = new Size(145, 22); + КомпонентыToolStripMenuItem.Size = new Size(180, 22); КомпонентыToolStripMenuItem.Text = "Компоненты"; КомпонентыToolStripMenuItem.Click += КомпонентыToolStripMenuItem_Click; // // ДвигателиToolStripMenuItem // ДвигателиToolStripMenuItem.Name = "ДвигателиToolStripMenuItem"; - ДвигателиToolStripMenuItem.Size = new Size(145, 22); + ДвигателиToolStripMenuItem.Size = new Size(180, 22); ДвигателиToolStripMenuItem.Text = "Двигатели"; ДвигателиToolStripMenuItem.Click += ИзделияToolStripMenuItem_Click; // - // отчетыToolStripMenuItem + // ReportsToolStripMenuItem // - отчетыToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { списокКомпонентовToolStripMenuItem, компонентыПоДвигателямToolStripMenuItem, списокЗаказовToolStripMenuItem }); - отчетыToolStripMenuItem.Name = "отчетыToolStripMenuItem"; - отчетыToolStripMenuItem.Size = new Size(60, 25); - отчетыToolStripMenuItem.Text = "Отчеты"; + ReportsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { ListComponentsToolStripMenuItem, EngineComponentsToolStripMenuItem, ListOrdersToolStripMenuItem }); + ReportsToolStripMenuItem.Name = "ReportsToolStripMenuItem"; + ReportsToolStripMenuItem.Size = new Size(60, 25); + ReportsToolStripMenuItem.Text = "Отчеты"; // - // списокКомпонентовToolStripMenuItem + // ListComponentsToolStripMenuItem // - списокКомпонентовToolStripMenuItem.Name = "списокКомпонентовToolStripMenuItem"; - списокКомпонентовToolStripMenuItem.Size = new Size(228, 22); - списокКомпонентовToolStripMenuItem.Text = "Список компонентов"; + ListComponentsToolStripMenuItem.Name = "ListComponentsToolStripMenuItem"; + ListComponentsToolStripMenuItem.Size = new Size(228, 22); + ListComponentsToolStripMenuItem.Text = "Список компонентов"; + ListComponentsToolStripMenuItem.Click += списокКомпонентовToolStripMenuItem_Click; // - // компонентыПоДвигателямToolStripMenuItem + // EngineComponentsToolStripMenuItem // - компонентыПоДвигателямToolStripMenuItem.Name = "компонентыПоДвигателямToolStripMenuItem"; - компонентыПоДвигателямToolStripMenuItem.Size = new Size(228, 22); - компонентыПоДвигателямToolStripMenuItem.Text = "Компоненты по двигателям"; + EngineComponentsToolStripMenuItem.Name = "EngineComponentsToolStripMenuItem"; + EngineComponentsToolStripMenuItem.Size = new Size(228, 22); + EngineComponentsToolStripMenuItem.Text = "Компоненты по двигателям"; + EngineComponentsToolStripMenuItem.Click += компонентыПоДвигателямToolStripMenuItem_Click; // - // списокЗаказовToolStripMenuItem + // ListOrdersToolStripMenuItem // - списокЗаказовToolStripMenuItem.Name = "списокЗаказовToolStripMenuItem"; - списокЗаказовToolStripMenuItem.Size = new Size(228, 22); - списокЗаказовToolStripMenuItem.Text = "Список заказов"; + ListOrdersToolStripMenuItem.Name = "ListOrdersToolStripMenuItem"; + ListOrdersToolStripMenuItem.Size = new Size(228, 22); + ListOrdersToolStripMenuItem.Text = "Список заказов"; + ListOrdersToolStripMenuItem.Click += списокЗаказовToolStripMenuItem_Click; // // buttonCreateOrder // @@ -200,9 +203,9 @@ private ToolStripDropDownButton toolStripDropDownButton1; private ToolStripMenuItem КомпонентыToolStripMenuItem; private ToolStripMenuItem ДвигателиToolStripMenuItem; - private ToolStripMenuItem отчетыToolStripMenuItem; - private ToolStripMenuItem списокКомпонентовToolStripMenuItem; - private ToolStripMenuItem компонентыПоДвигателямToolStripMenuItem; - private ToolStripMenuItem списокЗаказовToolStripMenuItem; + private ToolStripMenuItem ReportsToolStripMenuItem; + private ToolStripMenuItem ListComponentsToolStripMenuItem; + private ToolStripMenuItem EngineComponentsToolStripMenuItem; + private ToolStripMenuItem ListOrdersToolStripMenuItem; } } \ No newline at end of file diff --git a/MotorPlant/MotorPlantView/FormReportEngineComponents.Designer.cs b/MotorPlant/MotorPlantView/FormReportEngineComponents.Designer.cs index 8bdda7e..b5c0dbe 100644 --- a/MotorPlant/MotorPlantView/FormReportEngineComponents.Designer.cs +++ b/MotorPlant/MotorPlantView/FormReportEngineComponents.Designer.cs @@ -28,69 +28,70 @@ /// private void InitializeComponent() { - SaveButton = new Button(); + ButtonSaveToExcel = new Button(); dataGridView = new DataGridView(); - ComponentColumn = new DataGridViewTextBoxColumn(); - EngineColumn = new DataGridViewTextBoxColumn(); - CountColumn = new DataGridViewTextBoxColumn(); + Component = new DataGridViewTextBoxColumn(); + Engine = new DataGridViewTextBoxColumn(); + Count = new DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); SuspendLayout(); // - // SaveButton + // buttonSaveToExcel // - SaveButton.Location = new Point(12, 12); - SaveButton.Name = "SaveButton"; - SaveButton.Size = new Size(128, 23); - SaveButton.TabIndex = 0; - SaveButton.Text = "Сохранить в Excel"; - SaveButton.UseVisualStyleBackColor = true; + ButtonSaveToExcel.Location = new Point(12, 12); + ButtonSaveToExcel.Name = "ButtonSaveToExcel"; + ButtonSaveToExcel.Size = new Size(150, 30); + ButtonSaveToExcel.TabIndex = 0; + ButtonSaveToExcel.Text = "Сохранить в Excel"; + ButtonSaveToExcel.UseVisualStyleBackColor = true; + ButtonSaveToExcel.Click += ButtonSaveToExcel_Click; // // dataGridView // + dataGridView.BackgroundColor = SystemColors.ButtonHighlight; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Columns.AddRange(new DataGridViewColumn[] { ComponentColumn, EngineColumn, CountColumn }); - dataGridView.Location = new Point(12, 46); + dataGridView.Columns.AddRange(new DataGridViewColumn[] { Component, Engine, Count }); + dataGridView.Location = new Point(12, 48); dataGridView.Name = "dataGridView"; - dataGridView.Size = new Size(570, 392); + dataGridView.RowTemplate.Height = 25; + dataGridView.Size = new Size(560, 501); dataGridView.TabIndex = 1; // - // ComponentColumn + // Component // - ComponentColumn.HeaderText = "Компонент"; - ComponentColumn.Name = "ComponentColumn"; - ComponentColumn.Width = 200; + Component.HeaderText = "Компонент"; + Component.Name = "Component"; // - // EngineColumn + // Computer // - EngineColumn.HeaderText = "Изделие"; - EngineColumn.Name = "EngineColumn"; - EngineColumn.Width = 200; + Engine.HeaderText = "Двигатель"; + Engine.Name = "Engine"; // - // CountColumn + // Count // - CountColumn.HeaderText = "Количество"; - CountColumn.Name = "CountColumn"; - CountColumn.Width = 200; + Count.HeaderText = "Количество"; + Count.Name = "Count"; // - // FormReportEngineComponents + // FormReportComputerComponents // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(594, 450); + ClientSize = new Size(584, 561); Controls.Add(dataGridView); - Controls.Add(SaveButton); + Controls.Add(ButtonSaveToExcel); Name = "FormReportEngineComponents"; Text = "Компоненты по изделиям"; + Load += FormReportEngineComponents_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); ResumeLayout(false); } #endregion - private Button SaveButton; + private Button ButtonSaveToExcel; private DataGridView dataGridView; - private DataGridViewTextBoxColumn ComponentColumn; - private DataGridViewTextBoxColumn EngineColumn; - private DataGridViewTextBoxColumn CountColumn; + private DataGridViewTextBoxColumn Component; + private DataGridViewTextBoxColumn Engine; + private DataGridViewTextBoxColumn Count; } } \ No newline at end of file diff --git a/MotorPlant/MotorPlantView/FormReportEngineComponents.cs b/MotorPlant/MotorPlantView/FormReportEngineComponents.cs index fa69417..4f59435 100644 --- a/MotorPlant/MotorPlantView/FormReportEngineComponents.cs +++ b/MotorPlant/MotorPlantView/FormReportEngineComponents.cs @@ -17,14 +17,12 @@ namespace MotorPlantView.Forms { private readonly ILogger _logger; private readonly IReportLogic _logic; - public FormReportEngineComponents(ILogger logger, IReportLogic logic) { InitializeComponent(); _logger = logger; _logic = logic; } - private void FormReportEngineComponents_Load(object sender, EventArgs e) { try @@ -35,12 +33,27 @@ namespace MotorPlantView.Forms dataGridView.Rows.Clear(); foreach (var elem in dict) { - dataGridView.Rows.Add(new object[] { elem.EngineName, "", "" }); + dataGridView.Rows.Add(new object[] + { + elem.EngineName, + "", + "" + }); foreach (var listElem in elem.Components) { - dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 }); + dataGridView.Rows.Add(new object[] + { + "", + listElem.Item1, + listElem.Item2, + }); } - dataGridView.Rows.Add(new object[] { "Итого", "", elem.TotalCount }); + dataGridView.Rows.Add(new object[] + { + "Итого:", + "", + elem.TotalCount + }); dataGridView.Rows.Add(Array.Empty()); } } @@ -52,17 +65,19 @@ namespace MotorPlantView.Forms MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } } - private void ButtonSaveToExcel_Click(object sender, EventArgs e) { - using var dialog = new SaveFileDialog { Filter = "xlsx|*.xlsx" }; + using var dialog = new SaveFileDialog + { + Filter = "xlsx|*.xlsx" + }; if (dialog.ShowDialog() == DialogResult.OK) { try { _logic.SaveEngineComponentToExcelFile(new ReportBindingModel { - FileName = dialog.FileName + FileName = dialog.FileName, }); _logger.LogInformation("Сохранение списка изделий по компонентам"); MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); diff --git a/MotorPlant/MotorPlantView/FormReportEngineComponents.resx b/MotorPlant/MotorPlantView/FormReportEngineComponents.resx index b33b3be..c75e919 100644 --- a/MotorPlant/MotorPlantView/FormReportEngineComponents.resx +++ b/MotorPlant/MotorPlantView/FormReportEngineComponents.resx @@ -126,13 +126,4 @@ True - - True - - - True - - - True - \ No newline at end of file diff --git a/MotorPlant/MotorPlantView/FormReportOrders.Designer.cs b/MotorPlant/MotorPlantView/FormReportOrders.Designer.cs index 03c5cd4..53f8bf8 100644 --- a/MotorPlant/MotorPlantView/FormReportOrders.Designer.cs +++ b/MotorPlant/MotorPlantView/FormReportOrders.Designer.cs @@ -28,110 +28,102 @@ /// private void InitializeComponent() { - this.panel = new System.Windows.Forms.Panel(); - this.buttonCreateToPdf = new System.Windows.Forms.Button(); - this.buttonCreateReport = new System.Windows.Forms.Button(); - this.label2 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); - this.dateTimePickerEnd = new System.Windows.Forms.DateTimePicker(); - this.dateTimePickerStart = new System.Windows.Forms.DateTimePicker(); - this.panel.SuspendLayout(); - this.SuspendLayout(); + 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 // - this.panel.Controls.Add(this.buttonCreateToPdf); - this.panel.Controls.Add(this.buttonCreateReport); - this.panel.Controls.Add(this.label2); - this.panel.Controls.Add(this.label1); - this.panel.Controls.Add(this.dateTimePickerEnd); - this.panel.Controls.Add(this.dateTimePickerStart); - this.panel.Dock = System.Windows.Forms.DockStyle.Top; - this.panel.Location = new System.Drawing.Point(0, 0); - this.panel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.panel.Name = "panel"; - this.panel.Size = new System.Drawing.Size(861, 56); - this.panel.TabIndex = 0; + 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(785, 40); + panel.TabIndex = 0; // - // buttonCreateToPdf + // buttonToPdf // - this.buttonCreateToPdf.Location = new System.Drawing.Point(684, 29); - this.buttonCreateToPdf.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.buttonCreateToPdf.Name = "buttonCreateToPdf"; - this.buttonCreateToPdf.Size = new System.Drawing.Size(166, 23); - this.buttonCreateToPdf.TabIndex = 5; - this.buttonCreateToPdf.Text = "PDF"; - this.buttonCreateToPdf.UseVisualStyleBackColor = true; - this.buttonCreateToPdf.Click += new System.EventHandler(this.buttonCreateToPdf_Click); + buttonToPdf.Location = new Point(580, 5); + buttonToPdf.Name = "buttonToPdf"; + buttonToPdf.Size = new Size(100, 23); + buttonToPdf.TabIndex = 5; + buttonToPdf.Text = "В Pdf"; + buttonToPdf.UseVisualStyleBackColor = true; + buttonToPdf.Click += buttonToPdf_Click; // - // buttonCreateReport + // buttonMake // - this.buttonCreateReport.Location = new System.Drawing.Point(485, 29); - this.buttonCreateReport.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.buttonCreateReport.Name = "buttonCreateReport"; - this.buttonCreateReport.Size = new System.Drawing.Size(166, 23); - this.buttonCreateReport.TabIndex = 4; - this.buttonCreateReport.Text = "Сформировать"; - this.buttonCreateReport.UseVisualStyleBackColor = true; - this.buttonCreateReport.Click += new System.EventHandler(this.buttonCreateReport_Click); + buttonMake.Location = new Point(474, 5); + buttonMake.Name = "buttonMake"; + buttonMake.Size = new Size(100, 23); + buttonMake.TabIndex = 4; + buttonMake.Text = "Сформировать"; + buttonMake.UseVisualStyleBackColor = true; + buttonMake.Click += buttonMake_Click; // - // label2 + // dateTimePickerTo // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(323, 7); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(44, 15); - this.label2.TabIndex = 3; - this.label2.Text = "Конец:"; + dateTimePickerTo.Location = new Point(268, 3); + dateTimePickerTo.Name = "dateTimePickerTo"; + dateTimePickerTo.Size = new Size(200, 23); + dateTimePickerTo.TabIndex = 3; // - // label1 + // labelTo // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(76, 4); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(52, 15); - this.label1.TabIndex = 2; - this.label1.Text = "Начало:"; + labelTo.AutoSize = true; + labelTo.Location = new Point(239, 9); + labelTo.Name = "labelTo"; + labelTo.Size = new Size(23, 15); + labelTo.TabIndex = 2; + labelTo.Text = "По"; // - // dateTimePickerEnd + // dateTimePickerFrom // - this.dateTimePickerEnd.Location = new System.Drawing.Point(269, 29); - this.dateTimePickerEnd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.dateTimePickerEnd.Name = "dateTimePickerEnd"; - this.dateTimePickerEnd.Size = new System.Drawing.Size(164, 23); - this.dateTimePickerEnd.TabIndex = 1; + dateTimePickerFrom.Location = new Point(33, 3); + dateTimePickerFrom.Name = "dateTimePickerFrom"; + dateTimePickerFrom.Size = new Size(200, 23); + dateTimePickerFrom.TabIndex = 1; // - // dateTimePickerStart + // labelFrom // - this.dateTimePickerStart.Location = new System.Drawing.Point(31, 29); - this.dateTimePickerStart.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.dateTimePickerStart.Name = "dateTimePickerStart"; - this.dateTimePickerStart.Size = new System.Drawing.Size(164, 23); - this.dateTimePickerStart.TabIndex = 0; + labelFrom.AutoSize = true; + labelFrom.Location = new Point(12, 9); + labelFrom.Name = "labelFrom"; + labelFrom.Size = new Size(15, 15); + labelFrom.TabIndex = 1; + labelFrom.Text = "C"; // // FormReportOrders // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(861, 338); - this.Controls.Add(this.panel); - this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); - this.Name = "FormReportOrders"; - this.Text = "Заказы"; - this.panel.ResumeLayout(false); - this.panel.PerformLayout(); - this.ResumeLayout(false); - + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(784, 361); + Controls.Add(panel); + Name = "FormReportOrders"; + Text = "Заказы"; + panel.ResumeLayout(false); + panel.PerformLayout(); + ResumeLayout(false); } #endregion private Panel panel; - private DateTimePicker dateTimePickerEnd; - private DateTimePicker dateTimePickerStart; - private Button buttonCreateToPdf; - private Button buttonCreateReport; - private Label label2; - private Label label1; + 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/MotorPlant/MotorPlantView/FormReportOrders.cs b/MotorPlant/MotorPlantView/FormReportOrders.cs index 71af91a..a5b3622 100644 --- a/MotorPlant/MotorPlantView/FormReportOrders.cs +++ b/MotorPlant/MotorPlantView/FormReportOrders.cs @@ -19,7 +19,6 @@ namespace MotorPlantView.Forms private readonly ReportViewer reportViewer; private readonly ILogger _logger; private readonly IReportLogic _logic; - public FormReportOrders(ILogger logger, IReportLogic logic) { InitializeComponent(); @@ -29,15 +28,15 @@ namespace MotorPlantView.Forms { Dock = DockStyle.Fill }; - reportViewer.LocalReport.LoadReportDefinition(new FileStream("C:\\Users\\goldfest\\Desktop\\EngineCompany\\PrecastConcretePlant\\PrecastConcretePlantView\\ReportOrders.rdlc", FileMode.Open)); + var path = Directory.GetParent(Directory.GetCurrentDirectory())?.Parent?.Parent?.ToString() + "\\ReportOrders.rdlc"; + reportViewer.LocalReport.LoadReportDefinition(new FileStream(path, FileMode.Open)); Controls.Clear(); - Controls.Add(reportViewer); Controls.Add(panel); + Controls.Add(reportViewer); } - - private void buttonCreateReport_Click(object sender, EventArgs e) + private void buttonMake_Click(object sender, EventArgs e) { - if (dateTimePickerStart.Value.Date >= dateTimePickerEnd.Value.Date) + if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date) { MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; @@ -46,29 +45,35 @@ namespace MotorPlantView.Forms { var dataSource = _logic.GetOrders(new ReportBindingModel { - DateFrom = dateTimePickerStart.Value, - DateTo = dateTimePickerEnd.Value + DateFrom = dateTimePickerFrom.Value, + DateTo = dateTimePickerTo.Value }); + double sum = 0; + foreach (var order in dataSource) + { + sum += order.Sum; + } var source = new ReportDataSource("DataSetOrders", dataSource); reportViewer.LocalReport.DataSources.Clear(); reportViewer.LocalReport.DataSources.Add(source); - var parameters = new[] { new ReportParameter("ReportParameterPeriod", $"c{dateTimePickerStart.Value.ToShortDateString()} по {dateTimePickerEnd.Value.ToShortDateString()}") }; + var parameters = new[] { new ReportParameter("ReportParameterPeriod", + $"c {dateTimePickerFrom.Value.ToShortDateString()} по {dateTimePickerTo.Value.ToShortDateString()}"), + new ReportParameter("ReportParameterSum", sum.ToString()) + }; reportViewer.LocalReport.SetParameters(parameters); reportViewer.RefreshReport(); - _logger.LogInformation("Загрузка списка заказов на период {From}-{ To}", dateTimePickerStart.Value.ToShortDateString(), dateTimePickerEnd.Value.ToShortDateString()); + _logger.LogInformation("Загрузка списка заказов на период {From}-{ To}", + dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString()); } catch (Exception ex) { _logger.LogError(ex, "Ошибка загрузки списка заказов на период"); - MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, - MessageBoxIcon.Error); + MessageBox.Show(ex.Message, "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); } - } - - private void buttonCreateToPdf_Click(object sender, EventArgs e) + private void buttonToPdf_Click(object sender, EventArgs e) { - if (dateTimePickerStart.Value.Date >= dateTimePickerEnd.Value.Date) + if (dateTimePickerFrom.Value.Date >= dateTimePickerTo.Value.Date) { MessageBox.Show("Дата начала должна быть меньше даты окончания", "Ошибка", MessageBoxButtons.OK, MessageBoxIcon.Error); return; @@ -84,10 +89,11 @@ namespace MotorPlantView.Forms _logic.SaveOrdersToPdfFile(new ReportBindingModel { FileName = dialog.FileName, - DateFrom = dateTimePickerStart.Value, - DateTo = dateTimePickerEnd.Value + DateFrom = dateTimePickerFrom.Value, + DateTo = dateTimePickerTo.Value }); - _logger.LogInformation("Сохранение списка заказов на период { From} -{ To}", dateTimePickerStart.Value.ToShortDateString(), dateTimePickerEnd.Value.ToShortDateString()); + _logger.LogInformation("Сохранение списка заказов на период { From} -{ To}", + dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString()); MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); } catch (Exception ex) diff --git a/MotorPlant/MotorPlantView/FormReportOrders.resx b/MotorPlant/MotorPlantView/FormReportOrders.resx index 1af7de1..af32865 100644 --- a/MotorPlant/MotorPlantView/FormReportOrders.resx +++ b/MotorPlant/MotorPlantView/FormReportOrders.resx @@ -1,17 +1,17 @@  - diff --git a/MotorPlant/MotorPlantView/MotorPlantView.csproj b/MotorPlant/MotorPlantView/MotorPlantView.csproj index 63277b7..49be11e 100644 --- a/MotorPlant/MotorPlantView/MotorPlantView.csproj +++ b/MotorPlant/MotorPlantView/MotorPlantView.csproj @@ -2,7 +2,7 @@ WinExe - net8.0-windows7.0 + net8.0-windows enable true enable @@ -14,6 +14,7 @@ runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/MotorPlant/MotorPlantView/ReportOrders.rdlc b/MotorPlant/MotorPlantView/ReportOrders.rdlc new file mode 100644 index 0000000..00c941e --- /dev/null +++ b/MotorPlant/MotorPlantView/ReportOrders.rdlc @@ -0,0 +1,633 @@ + + + 0 + + + + System.Data.DataSet + /* Local Connection */ + + 10791c83-cee8-4a38-bbd0-245fc17cefb3 + + + + + + MotorPlantContractsViewModels + /* Local Query */ + + + + Id + System.Int32 + + + DateCreate + System.DateTime + + + EngineName + System.String + + + Sum + System.Decimal + + + Status + System.String + + + + MotorPlantContracts.ViewModels + ReportOrdersViewModel + MotorPlantContracts.ViewModels.ReportOrdersViewModel, MotorPlantContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + + + + + + + + + true + true + + + + + Заказы + + + + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + 5.50333cm + + + 5.50333cm + + + 6.82331cm + + + 6.1195cm + + + 5.17229cm + + + + + 1.235cm + + + + + 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 + + + + + + + + 1.235cm + + + + + true + true + + + + + =Fields!Id.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!DateCreate.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!EngineName.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Sum.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Status.Value + + + 2pt + 2pt + 2pt + 2pt + + + true + + + + + + + + + + + + + + + + + + + After + + + + + + + DataSetOrders + 2.34103cm + 0.42333cm + 2.47cm + 29.12176cm + 1 + + + + + + true + true + + + + + =Parameters!ReportParameterPeriod.Value + + + + 0.77639cm + 0.70583cm + 21.71934cm + 2 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + Итого: + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!ReportParameterSum.Value + + + 2pt + 2pt + 2pt + 2pt + + + + 2.81911in +