From 3a37421bb62874c9f21e6880c78104d1450779f2 Mon Sep 17 00:00:00 2001 From: Ino Date: Mon, 10 Apr 2023 16:40:13 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BD=D0=B0=D0=B4=D0=B5=D1=8E=D1=81=20=D0=B2?= =?UTF-8?q?=D1=81=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OfficePackage/AbstractSaveToPdf.cs | 10 +- .../OfficePackage/HelperModels/ExcelInfo.cs | 1 + .../IceCreamShop/FormReportShopWorkload.cs | 2 +- .../IceCreamShop/ReportOrdersByDate.rdlc | 792 +++++++++--------- .../BusinessLogicsContracts/IReportLogic.cs | 4 +- 5 files changed, 398 insertions(+), 411 deletions(-) diff --git a/IceCreamShop/IceCreamBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/AbstractSaveToPdf.cs index d1d2db2..bff9b67 100644 --- a/IceCreamShop/IceCreamBusinessLogic/OfficePackage/AbstractSaveToPdf.cs +++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/AbstractSaveToPdf.cs @@ -50,16 +50,10 @@ namespace IceCreamBusinessLogic.OfficePackage Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center }); - CreateParagraph(new PdfParagraph - { - Text = $"с{info.DateFrom.ToShortDateString()} по {info.DateTo.ToShortDateString()}", - Style = "Normal", - ParagraphAlignment = PdfParagraphAlignmentType.Center - }); CreateTable(new List { "3cm", "3cm", "7cm" }); CreateRow(new PdfRowParameters { - Texts = new List { "Дата заказа", "Количество заказов", "Сумма" }, + Texts = new List { "Дата", "Количество", "Сумма" }, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center }); @@ -76,7 +70,7 @@ namespace IceCreamBusinessLogic.OfficePackage { Text = $"Итого: {info.DateOrders.Sum(x => x.SumOrders)}\t", Style = "Normal", - ParagraphAlignment = PdfParagraphAlignmentType.Right + ParagraphAlignment = PdfParagraphAlignmentType.Center }); SavePdf(info); } diff --git a/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs index 214c123..81ec313 100644 --- a/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs +++ b/IceCreamShop/IceCreamBusinessLogic/OfficePackage/HelperModels/ExcelInfo.cs @@ -9,6 +9,7 @@ namespace IceCreamBusinessLogic.OfficePackage.HelperModels public string Title { get; set; } = string.Empty; public List IceCreamComponents { get; set; } = new(); + public List ShopIceCreams { get; set; } = new(); } } \ No newline at end of file diff --git a/IceCreamShop/IceCreamShop/FormReportShopWorkload.cs b/IceCreamShop/IceCreamShop/FormReportShopWorkload.cs index 1ad0cd3..2239d50 100644 --- a/IceCreamShop/IceCreamShop/FormReportShopWorkload.cs +++ b/IceCreamShop/IceCreamShop/FormReportShopWorkload.cs @@ -25,7 +25,7 @@ namespace IceCreamShopView { try { - _logic.SaveIceCreamsToWordFile(new ReportBindingModel + _logic.SaveShopWorkloadToExcelFile(new ReportBindingModel { FileName = dialog.FileName }); diff --git a/IceCreamShop/IceCreamShop/ReportOrdersByDate.rdlc b/IceCreamShop/IceCreamShop/ReportOrdersByDate.rdlc index e2a0a52..1075fb0 100644 --- a/IceCreamShop/IceCreamShop/ReportOrdersByDate.rdlc +++ b/IceCreamShop/IceCreamShop/ReportOrdersByDate.rdlc @@ -1,409 +1,401 @@ - - + - - - true - true - - - - - Заказы - - - - - - - 1cm - 21cm - - - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - - 3cm - - - 3cm - - - 7cm - - - - - 0.6cm - - - - - true - true - - - - - Дата - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Количество - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Сумма - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - 0.6cm - - - - - true - true - - - - - =Fields!DateCreate.Value - - - - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!CountOrders.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!SumOrders.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - - - - - - - After - - - - - - - DataSetOrders - 2.48391cm - 0.55245cm - 1.2cm - 13cm - 1 - - - - - - - true - true - - - - - Всего: - - - - - - - 4cm - 8.55245cm - 0.6cm - 2.5cm - 2 - - - 2pt - 2pt - 2pt - 2pt - - - - - true - true - - - - - =Sum(Fields!SumOrders.Value, "DataSetOrders") - - - - - - - 4cm - 11.05245cm - 0.6cm - 2.5cm - 3 - - - 2pt - 2pt - 2pt - 2pt - - - + + true + true + + + + + Заказы + + + + + + + 0.24cm + 1cm + 21cm + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + 3cm + + + 3cm + + + 7cm + + + + + 0.6cm + + + + + true + true + + + + + Дата + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Количество + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + Сумма + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + 0.6cm + + + + + true + true + + + + + =Fields!DateCreate.Value + + + + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!CountOrders.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!SumOrders.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + After + + + + + + + DataSetOrders + 2.72391cm + 0.55245cm + 1.2cm + 13cm + 1 + + + + + + true + true + + + + + Всего: + + + + + + + 4.24cm + 8.55245cm + 0.6cm + 2.5cm + 2 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Sum(Fields!SumOrders.Value, "DataSetOrders") + + + + + + + 4.24cm + 11.05245cm + 0.6cm + 2.5cm + 3 + + + 2pt + 2pt + 2pt + 2pt + + - 5.72875cm + 2in