From 5426d94f47dd12fc4987880904331dc4589b93dc Mon Sep 17 00:00:00 2001 From: Danila_Mochalov Date: Sat, 11 Mar 2023 20:36:44 +0400 Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=B2=D0=BE=D0=B4=20=D0=BE=D1=82?= =?UTF-8?q?=D1=87=D0=B5=D1=82=D0=B0=20=D0=BF=D0=BE=20=D0=B4=D0=BE=D0=BA?= =?UTF-8?q?=D1=83=D0=BC=D0=B5=D0=BD=D1=82=D0=B0=D0=BC=20=D0=B2=20Excel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- LawFirm/LawFirm/FormReportDocumentBlanks.cs | 6 ++--- .../BusinessLogics/ReportLogic.cs | 22 +++++++++---------- .../OfficePackage/AbstractSaveToExcel.cs | 6 ++--- .../BusinessLogicContracts/IReportLogic.cs | 2 +- .../ReportDocumentBlankViewModel.cs | 4 ++-- 5 files changed, 20 insertions(+), 20 deletions(-) diff --git a/LawFirm/LawFirm/FormReportDocumentBlanks.cs b/LawFirm/LawFirm/FormReportDocumentBlanks.cs index 551d9d5..aab489b 100644 --- a/LawFirm/LawFirm/FormReportDocumentBlanks.cs +++ b/LawFirm/LawFirm/FormReportDocumentBlanks.cs @@ -29,14 +29,14 @@ namespace LawFirmView { try { - var dict = _logic.GetProductComponent(); + var dict = _logic.GetDocumentBlanks(); if (dict != null) { dataGridView.Rows.Clear(); foreach (var elem in dict) { - dataGridView.Rows.Add(new object[] { elem.BlankName, "", "" }); - foreach (var listElem in elem.Documents) + dataGridView.Rows.Add(new object[] { elem.DocumentName, "", "" }); + foreach (var listElem in elem.Blanks) { dataGridView.Rows.Add(new object[] { "", listElem.Item1, listElem.Item2 }); } diff --git a/LawFirm/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs b/LawFirm/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs index 1e80bc2..1a2618c 100644 --- a/LawFirm/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs +++ b/LawFirm/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs @@ -31,25 +31,25 @@ namespace LawFirmBusinessLogic.BusinessLogics _saveToPdf = saveToPdf; } /// Получение списка компонент с указанием, в каких изделиях используются - public List GetProductComponent() + public List GetDocumentBlanks() { var blanks = _blankStorage.GetFullList(); var documents = _documentStorage.GetFullList(); var list = new List(); - foreach (var blank in blanks) + foreach (var doc in documents) { var record = new ReportDocumentBlankViewModel { - BlankName = blank.BlankName, - Documents = new List<(string Document, int Count)>(), + DocumentName = doc.DocumentName, + Blanks = new List<(string Blank, int Count)>(), TotalCount = 0 - }; - foreach (var document in documents) + }; + foreach (var blank in blanks) { - if (document.DocumentBlanks.ContainsKey(blank.Id)) + if (doc.DocumentBlanks.ContainsKey(blank.Id)) { - record.Documents.Add((document.DocumentName, document.DocumentBlanks[blank.Id].Item2)); - record.TotalCount += document.DocumentBlanks[blank.Id].Item2; + record.Blanks.Add(new (blank.BlankName, doc.DocumentBlanks[blank.Id].Item2)); + record.TotalCount += doc.DocumentBlanks[blank.Id].Item2; } } list.Add(record); @@ -89,8 +89,8 @@ namespace LawFirmBusinessLogic.BusinessLogics _saveToExcel.CreateReport(new ExcelInfo { FileName = model.FileName, - Title = "Список бланков", - DocumentBlanks = GetProductComponent() + Title = "Список документов", + DocumentBlanks = GetDocumentBlanks() }); } /// Сохранение заказов в файл-Pdf diff --git a/LawFirm/LawFirmBusinessLogic/OfficePackage/AbstractSaveToExcel.cs b/LawFirm/LawFirmBusinessLogic/OfficePackage/AbstractSaveToExcel.cs index b7c3900..50dcd3b 100644 --- a/LawFirm/LawFirmBusinessLogic/OfficePackage/AbstractSaveToExcel.cs +++ b/LawFirm/LawFirmBusinessLogic/OfficePackage/AbstractSaveToExcel.cs @@ -33,17 +33,17 @@ namespace LawFirmBusinessLogic.OfficePackage { ColumnName = "A", RowIndex = rowIndex, - Text = pc.BlankName, + Text = pc.DocumentName, StyleInfo = ExcelStyleInfoType.Text }); rowIndex++; - foreach (var (Document, Count) in pc.Documents) + foreach (var (Blank, Count) in pc.Blanks) { InsertCellInWorksheet(new ExcelCellParameters { ColumnName = "B", RowIndex = rowIndex, - Text = Document, + Text = Blank, StyleInfo = ExcelStyleInfoType.TextWithBorder }); InsertCellInWorksheet(new ExcelCellParameters diff --git a/LawFirm/LawFirmContracts/BusinessLogicContracts/IReportLogic.cs b/LawFirm/LawFirmContracts/BusinessLogicContracts/IReportLogic.cs index 08a1594..5359cf7 100644 --- a/LawFirm/LawFirmContracts/BusinessLogicContracts/IReportLogic.cs +++ b/LawFirm/LawFirmContracts/BusinessLogicContracts/IReportLogic.cs @@ -11,7 +11,7 @@ namespace LawFirmContracts.BusinessLogicContracts public interface IReportLogic { /// Получение списка компонент с указанием, в каких изделиях используются - List GetProductComponent(); + List GetDocumentBlanks(); /// Получение списка заказов за определенный период List GetOrders(ReportBindingModel model); /// Сохранение компонент в файл-Word diff --git a/LawFirm/LawFirmContracts/ViewModels/ReportDocumentBlankViewModel.cs b/LawFirm/LawFirmContracts/ViewModels/ReportDocumentBlankViewModel.cs index a494117..ef8cc41 100644 --- a/LawFirm/LawFirmContracts/ViewModels/ReportDocumentBlankViewModel.cs +++ b/LawFirm/LawFirmContracts/ViewModels/ReportDocumentBlankViewModel.cs @@ -8,9 +8,9 @@ namespace LawFirmContracts.ViewModels { public class ReportDocumentBlankViewModel { - public string BlankName { get; set; } = string.Empty; + public string DocumentName { get; set; } = string.Empty; public int TotalCount { get; set; } - public List<(string Document, int Count)> Documents { get; set; } = new(); + public List<(string Blank, int Count)> Blanks { get; set; } = new(); } }