From cbe4ef67ced9aeb0edb140fe79ab6d582f8bdc23 Mon Sep 17 00:00:00 2001 From: maxnes3 <112558334+maxnes3@users.noreply.github.com> Date: Mon, 27 Mar 2023 18:34:08 +0400 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=BF=20=D0=B7=D0=B0=D0=B4=D0=B0?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OfficePackage/AbstractSaveToPdf.cs | 4 +- .../Models/Order.cs | 2 +- .../FormReportOrders.Designer.cs | 6 +- .../ComputersShopView/ReportOrders.rdlc | 242 +++++++++++------- 4 files changed, 152 insertions(+), 102 deletions(-) diff --git a/ComputersShop/ComputersShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs b/ComputersShop/ComputersShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs index 30fcc4d..b17bdce 100644 --- a/ComputersShop/ComputersShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs +++ b/ComputersShop/ComputersShopBusinessLogic/OfficePackage/AbstractSaveToPdf.cs @@ -32,7 +32,7 @@ namespace ComputersShopBusinessLogic.OfficePackage CreateRow(new PdfRowParameters { - Texts = new List { "Номер", "Дата заказа", "Букет", "Сумма", "Статус" }, + Texts = new List { "Номер", "Дата заказа", "Компьютер", "Статус", "Сумма" }, Style = "NormalTitle", ParagraphAlignment = PdfParagraphAlignmentType.Center }); @@ -41,7 +41,7 @@ namespace ComputersShopBusinessLogic.OfficePackage { CreateRow(new PdfRowParameters { - Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.ComputerName, order.Sum.ToString(), order.Status }, + Texts = new List { order.Id.ToString(), order.DateCreate.ToShortDateString(), order.ComputerName, order.Status, order.Sum.ToString() }, Style = "Normal", ParagraphAlignment = PdfParagraphAlignmentType.Left }); diff --git a/ComputersShop/ComputersShopListImplement/Models/Order.cs b/ComputersShop/ComputersShopListImplement/Models/Order.cs index 5221fbb..afe8570 100644 --- a/ComputersShop/ComputersShopListImplement/Models/Order.cs +++ b/ComputersShop/ComputersShopListImplement/Models/Order.cs @@ -1,4 +1,4 @@ -using ComputersShopContracts.BindingModels; +using ComputersShopContracts.BindingModels; using ComputersShopContracts.ViewModels; using ComputersShopDataModels.Enums; using ComputersShopDataModels.Models; diff --git a/ComputersShop/ComputersShopView/FormReportOrders.Designer.cs b/ComputersShop/ComputersShopView/FormReportOrders.Designer.cs index 1155483..dcddf8d 100644 --- a/ComputersShop/ComputersShopView/FormReportOrders.Designer.cs +++ b/ComputersShop/ComputersShopView/FormReportOrders.Designer.cs @@ -86,11 +86,11 @@ // labelTo // labelTo.AutoSize = true; - labelTo.Location = new Point(256, 10); + labelTo.Location = new Point(266, 12); labelTo.Name = "labelTo"; - labelTo.Size = new Size(38, 15); + labelTo.Size = new Size(23, 15); labelTo.TabIndex = 2; - labelTo.Text = "label1"; + labelTo.Text = "По"; // // dateTimePickerFrom // diff --git a/ComputersShop/ComputersShopView/ReportOrders.rdlc b/ComputersShop/ComputersShopView/ReportOrders.rdlc index d71228a..ed40dd8 100644 --- a/ComputersShop/ComputersShopView/ReportOrders.rdlc +++ b/ComputersShop/ComputersShopView/ReportOrders.rdlc @@ -29,6 +29,10 @@ ComputerName System.String + + Status + System.String + Sum System.Decimal @@ -45,41 +49,7 @@ - - true - true - - - - - =Parameters!ReportParameterPeriod.Value - - - - - - - ReportParameterPeriod - 1cm - 1cm - 21cm - - - Middle - 2pt - 2pt - 2pt - 2pt - - - + true true @@ -98,14 +68,46 @@ - 1cm - 21cm + Textbox1 + 0.70583cm + 19.67885cm + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Parameters!ReportParameterPeriod.Value + + + + + + + ReportParameterPeriod + 0.70583cm + 0.6cm + 19.67885cm 1 - Middle 2pt 2pt 2pt @@ -116,41 +118,42 @@ - 2.5cm + 4.56494cm - 3.21438cm - - - 8.23317cm + 4.56494cm 2.5cm + + 2.5cm + + + 4.56494cm + - 0.6cm + 0.74083cm - + true true - Номер - + Id + + Date Create + + Computer Name + + Статус + + + 2pt + 2pt + 2pt + 2pt + + + + - 0.6cm + 0.74083cm @@ -305,9 +332,7 @@ =Fields!DateCreate.Value - + + + 2pt + 2pt + 2pt + 2pt + + + + @@ -397,6 +452,7 @@ + @@ -410,18 +466,18 @@ DataSetOrders - 2.48391cm - 0.55245cm - 1.2cm - 16.44755cm + 1.87537cm + 0.98403cm + 1.48166cm + 18.69482cm 2 + - + true true @@ -429,18 +485,15 @@ Итого: - + + - + true true @@ -462,18 +515,15 @@ =Sum(Fields!Sum.Value, "DataSetOrders") - + + - 5.72875cm + 2in