diff --git a/PrecastConcretePlantBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/PrecastConcretePlantBusinessLogic/OfficePackage/AbstractSaveToPdf.cs index 6f0784b..7455dd1 100644 --- a/PrecastConcretePlantBusinessLogic/OfficePackage/AbstractSaveToPdf.cs +++ b/PrecastConcretePlantBusinessLogic/OfficePackage/AbstractSaveToPdf.cs @@ -13,20 +13,14 @@ namespace PrecastConcretePlantBusinessLogic.OfficePackage 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" }); + 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", "3cm" }); + CreateRow(new PdfRowParameters { - Texts = new List { "Номер", "Дата заказа", "ЖБИ","Сумма" }, + Texts = new List { "Номер", "Дата заказа", "ЖБИ", "Статус", "Сумма" }, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center }); @@ -34,16 +28,16 @@ namespace PrecastConcretePlantBusinessLogic.OfficePackage { CreateRow(new PdfRowParameters { - Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.ReinforcedName, order.Sum.ToString() }, + Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.ReinforcedName, order.OrderStatus, order.Sum.ToString() }, Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Left }); } CreateParagraph(new PdfParagraph { - Text = $"Итого: {info.Orders.Sum(x=> x.Sum)}\t", + Text = $"Итого: {info.Orders.Sum(x => x.Sum)}\t", Style = "Normal", - ParagraphAlignment =PdfParagraphAlignmentType.Rigth + ParagraphAlignment = PdfParagraphAlignmentType.Rigth }); SavePdf(info); } diff --git a/PrecastConcretePlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs b/PrecastConcretePlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs index 8e2e1df..7044b8e 100644 --- a/PrecastConcretePlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs +++ b/PrecastConcretePlantBusinessLogic/OfficePackage/AbstractSaveToWord.cs @@ -27,7 +27,7 @@ namespace PrecastConcretePlantBusinessLogic.OfficePackage { CreateParagraph(new WordParagraph { - Texts = new List<(string, WordTextProperties)> { (component.ReinforcedName, new WordTextProperties { Size = "24", }), (". Цена: " + component.Price.ToString(), new WordTextProperties { Size = "24", }) }, + Texts = new List<(string, WordTextProperties)> { (component.ReinforcedName, new WordTextProperties { Bold = true, Size = "24", }), (". Цена: " + component.Price.ToString(), new WordTextProperties { Size = "24", }) }, TextProperties = new WordTextProperties { Size = "24", diff --git a/PrecastConcretePlantContracts/ViewModels/ReportOrdersViewModel.cs b/PrecastConcretePlantContracts/ViewModels/ReportOrdersViewModel.cs index 8c7f0eb..3591c0c 100644 --- a/PrecastConcretePlantContracts/ViewModels/ReportOrdersViewModel.cs +++ b/PrecastConcretePlantContracts/ViewModels/ReportOrdersViewModel.cs @@ -14,7 +14,7 @@ namespace PrecastConcretePlantContracts.ViewModels public string ReinforcedName { get; set; } = string.Empty; - public string OrderStatus { get; set; } = string.Empty; + public string OrderStatus { get; set; } = string.Empty; public double Sum { get; set; } }