From 01d04cf3dcc892ffbb7b1e82677a9c206ecdfdd8 Mon Sep 17 00:00:00 2001 From: goldfest Date: Fri, 19 Apr 2024 10:47:05 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TravelCompany/TravelCompany/ReportOrder.rdlc | 572 ------------------ TravelCompany/TravelCompany/ReportOrders.rdlc | 94 +-- .../BusinessLogic/ReportLogic.cs | 2 +- .../OfficePackage/AbstractSaveToPdf.cs | 2 +- .../ViewModels/ReportOrdersViewModel.cs | 2 +- 5 files changed, 50 insertions(+), 622 deletions(-) delete mode 100644 TravelCompany/TravelCompany/ReportOrder.rdlc diff --git a/TravelCompany/TravelCompany/ReportOrder.rdlc b/TravelCompany/TravelCompany/ReportOrder.rdlc deleted file mode 100644 index 17f8967..0000000 --- a/TravelCompany/TravelCompany/ReportOrder.rdlc +++ /dev/null @@ -1,572 +0,0 @@ - - - 0 - - - - System.Data.DataSet - /* Local Connection */ - - 10791c83-cee8-4a38-bbd0-245fc17cefb3 - - - - - - TravelCompanyContractsViewModels - /* Local Query */ - - - - Id - System.Int32 - - - DateCreate - System.DateTime - - - TravelName - System.String - - - Sum - System.Decimal - - - Status - System.String - - - - TravelCompanyContracts.ViewModels - ReportOrdersViewModel - TravelCompanyContracts.ViewModels.ReportOrdersViewModel, TravelCompanyContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - - - - - - - true - true - - - - - Заказы - - - - 0.6cm - 16.51cm - - - Middle - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Parameters!ReportParameterPeriod.Value - - - - ReportParameterPeriod - 0.6cm - 0.6cm - 16.51cm - 1 - - - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - 2.60583cm - - - 3.262cm - - - 4.8495cm - - - 2.5cm - - - 2.5cm - - - - - 0.6cm - - - - - true - true - - - - - Номер - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Дата создания - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Путевка - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Статус - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - Сумма - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - 0.6cm - - - - - true - true - - - - - =Fields!Id.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!DateCreate.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!TravelName.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!Status.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!Sum.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - - - - - - - - - After - - - - - - - DataSetOrders - 1.9177cm - 0.79267cm - 1.2cm - 15.71733cm - 2 - - - - - - true - true - - - - - Итого: - - - - 3.46287cm - 11.51cm - 0.6cm - 2.5cm - 3 - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Sum(Fields!Sum.Value, "DataSetOrders") - - - 2pt - 2pt - 2pt - 2pt - - - - 2in - @@ -235,6 +235,38 @@ + + + + true + true + + + + + Статус Заказа + + + + + + 2pt + 2pt + 2pt + 2pt + + + + @@ -267,38 +299,6 @@ - - - - true - true - - - - - Статус - - - - - - 2pt - 2pt - 2pt - 2pt - - - - @@ -398,21 +398,21 @@ - + true true - =Fields!Sum.Value + =Fields!OrderStatus.Value