From 464cebeb0f84f751638fe94f24e7cab4ae10b96c Mon Sep 17 00:00:00 2001 From: "ns.potapov" Date: Sun, 24 Mar 2024 22:50:41 +0400 Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BD=D0=BE=20=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D0=B0=D1=82=D1=83=D1=81?= =?UTF-8?q?=D0=B0=20=D0=B7=D0=B0=D0=BA=D0=B0=D0=B7=D0=BE=D0=B2=20=D0=B2=20?= =?UTF-8?q?PDF=20=D0=B8=20=D0=B2=20=D0=BE=D1=82=D1=87=D0=B5=D1=82=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusinessLogics/ReportLogic.cs | 1 + .../OfficePackage/AbstractSaveToPdf.cs | 6 +- .../ViewModels/ReportOrdersViewModel.cs | 1 + .../Report/FormReportOrders.cs | 8 +- .../Report/ReportOrders.rdlc | 96 +++++++++++++++++-- 5 files changed, 98 insertions(+), 14 deletions(-) diff --git a/SecuritySystem/SecuritySystemBusinessLogic/BusinessLogics/ReportLogic.cs b/SecuritySystem/SecuritySystemBusinessLogic/BusinessLogics/ReportLogic.cs index e6cbc92..ae29946 100644 --- a/SecuritySystem/SecuritySystemBusinessLogic/BusinessLogics/ReportLogic.cs +++ b/SecuritySystem/SecuritySystemBusinessLogic/BusinessLogics/ReportLogic.cs @@ -71,6 +71,7 @@ namespace SecuritySystemBusinessLogic.BusinessLogics Id = x.Id, DateCreate = x.DateCreate, SecureName = x.SecureName, + Status = x.Status.ToString(), Sum = x.Sum }) .ToList(); diff --git a/SecuritySystem/SecuritySystemBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/SecuritySystem/SecuritySystemBusinessLogic/OfficePackage/AbstractSaveToPdf.cs index 79da654..8cce121 100644 --- a/SecuritySystem/SecuritySystemBusinessLogic/OfficePackage/AbstractSaveToPdf.cs +++ b/SecuritySystem/SecuritySystemBusinessLogic/OfficePackage/AbstractSaveToPdf.cs @@ -20,10 +20,10 @@ namespace SecuritySystemBusinessLogic.OfficePackage Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Center }); - CreateTable(new List { "2cm", "3cm", "6cm", "3cm" }); + CreateTable(new List { "2cm", "3cm", "6cm", "3cm", "3cm" }); CreateRow(new PdfRowParameters { - Texts = new List { "Номер", "Дата заказа", "Изделие", "Сумма" }, + Texts = new List { "Номер", "Дата заказа", "Изделие", "Статус", "Сумма" }, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center }); @@ -31,7 +31,7 @@ namespace SecuritySystemBusinessLogic.OfficePackage { CreateRow(new PdfRowParameters { - Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.SecureName, order.Sum.ToString() }, + Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.SecureName, order.Status.ToString(), order.Sum.ToString() }, Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Left }); diff --git a/SecuritySystem/SecuritySystemContracts/ViewModels/ReportOrdersViewModel.cs b/SecuritySystem/SecuritySystemContracts/ViewModels/ReportOrdersViewModel.cs index e6c3623..668b898 100644 --- a/SecuritySystem/SecuritySystemContracts/ViewModels/ReportOrdersViewModel.cs +++ b/SecuritySystem/SecuritySystemContracts/ViewModels/ReportOrdersViewModel.cs @@ -5,6 +5,7 @@ public int Id { get; set; } public DateTime DateCreate { get; set; } public string SecureName { get; set; } = string.Empty; + public string Status { get; set; } = string.Empty; public double Sum { get; set; } } } diff --git a/SecuritySystem/SecuritySystemView/Report/FormReportOrders.cs b/SecuritySystem/SecuritySystemView/Report/FormReportOrders.cs index ba8fdde..a87ee34 100644 --- a/SecuritySystem/SecuritySystemView/Report/FormReportOrders.cs +++ b/SecuritySystem/SecuritySystemView/Report/FormReportOrders.cs @@ -70,11 +70,15 @@ namespace SecuritySystemView.Report { try { + DateTime dateFrom = dateTimePickerFrom.Value; + DateTime dateTo = dateTimePickerTo.Value; + dateFrom = new DateTime(dateFrom.Year, dateFrom.Month, dateFrom.Day, 0, 0, 0); + dateTo = new DateTime(dateTo.Year, dateTo.Month, dateTo.Day, 23, 59, 59); _logic.SaveOrdersToPdfFile(new ReportBindingModel { FileName = dialog.FileName, - DateFrom = dateTimePickerFrom.Value, - DateTo = dateTimePickerTo.Value + DateFrom = dateFrom, + DateTo = dateTo }); _logger.LogInformation("Сохранение списка заказов на период {From}-{To}", dateTimePickerFrom.Value.ToShortDateString(), dateTimePickerTo.Value.ToShortDateString()); MessageBox.Show("Выполнено", "Успех", MessageBoxButtons.OK, MessageBoxIcon.Information); diff --git a/SecuritySystem/SecuritySystemView/Report/ReportOrders.rdlc b/SecuritySystem/SecuritySystemView/Report/ReportOrders.rdlc index 8787f67..802d95d 100644 --- a/SecuritySystem/SecuritySystemView/Report/ReportOrders.rdlc +++ b/SecuritySystem/SecuritySystemView/Report/ReportOrders.rdlc @@ -29,6 +29,10 @@ SecureName System.String + + Status + System.String + Sum System.Decimal @@ -116,16 +120,19 @@ - 2.5cm + 1.39933cm 3.21438cm - 8.23317cm + 9.18567cm - 2.5cm + 2.64817cm + + + 3.47367cm @@ -228,6 +235,40 @@ + + + + true + true + + + + + Статус + + + + + + + Textbox2 + + + 2pt + 2pt + 2pt + 2pt + + + + @@ -243,7 +284,9 @@ - Textbox7 @@ -357,6 +400,38 @@ + + + + true + true + + + + + =Fields!Status.Value + + + + Status + + + 2pt + 2pt + 2pt + 2pt + + + + @@ -370,7 +445,9 @@ Sum @@ -397,6 +474,7 @@ + @@ -413,7 +491,7 @@ 2.48391cm 0.55245cm 1.2cm - 16.44755cm + 19.92122cm 2