diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Implements/OrderStorage.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Implements/OrderStorage.cs index c442291..7e595fd 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Implements/OrderStorage.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Implements/OrderStorage.cs @@ -20,10 +20,11 @@ namespace CarRepairShopDatabaseImplement.Implements public List GetFilteredList(OrderSearchModel model) { - if (!model.Id.HasValue && !model.DateFrom.HasValue) - { - return new(); - } + if (!model.Id.HasValue) + if (!model.Id.HasValue && !model.DateFrom.HasValue) + { + return new(); + } using var context = new CarRepairShopDatabase(); if (model.DateFrom.HasValue) { diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240516210419_InitialCreate.Designer.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240523185555_Create.Designer.cs similarity index 98% rename from CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240516210419_InitialCreate.Designer.cs rename to CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240523185555_Create.Designer.cs index e23a1bb..bf215af 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240516210419_InitialCreate.Designer.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240523185555_Create.Designer.cs @@ -12,8 +12,8 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace CarRepairShopDatabaseImplement.Migrations { [DbContext(typeof(CarRepairShopDatabase))] - [Migration("20240516210419_InitialCreate")] - partial class InitialCreate + [Migration("20240523185555_Create")] + partial class Create { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) diff --git a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240516210419_InitialCreate.cs b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240523185555_Create.cs similarity index 99% rename from CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240516210419_InitialCreate.cs rename to CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240523185555_Create.cs index 5b1e1b3..b0caa39 100644 --- a/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240516210419_InitialCreate.cs +++ b/CarRepairShop/CarRepairShopDatabaseImplement/Migrations/20240523185555_Create.cs @@ -7,7 +7,7 @@ using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata; namespace CarRepairShopDatabaseImplement.Migrations { /// - public partial class InitialCreate : Migration + public partial class Create : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) diff --git a/CarRepairShop/CarRepairShopView/CarRepairShopView.csproj b/CarRepairShop/CarRepairShopView/CarRepairShopView.csproj index 096dcc2..9676aee 100644 --- a/CarRepairShop/CarRepairShopView/CarRepairShopView.csproj +++ b/CarRepairShop/CarRepairShopView/CarRepairShopView.csproj @@ -18,6 +18,17 @@ + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + diff --git a/CarRepairShop/CarRepairShopView/ReportOrders.rdlc b/CarRepairShop/CarRepairShopView/ReportOrders.rdlc index 3fee2a5..a0fbd5b 100644 --- a/CarRepairShop/CarRepairShopView/ReportOrders.rdlc +++ b/CarRepairShop/CarRepairShopView/ReportOrders.rdlc @@ -1,599 +1,599 @@ - 0 - - - - System.Data.DataSet - /* Local Connection */ - - 47cb53f0-7dde-4717-ba03-866a0bc4f4dd - - - - - - CarRepairShopContractsViewModels - /* Local Query */ - - - - Id - System.Int32 - - - DateCreate - System.DateTime - - - RepairName - System.String - - - Sum - System.Decimal - - - OrderStatus - CarRepairShopDataModels.OrderStatus - - - - CarRepairShopContracts.ViewModels - ReportOrderViewModel - CarRepairShopContracts.ViewModels.ReportOrderViewModel, CarRepairShopContracts, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - - - - - - - - - true - true - - - - - =Parameters!ReportParameterPeriod.Value - - - - - - - ReportParameterPeriod - 1cm - 1cm - 21cm - - - Middle - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - Заказы - - - - - - - 1cm - 21cm - 1 - - - Middle - 2pt - 2pt - 2pt - 2pt - - - - - - - 2.5cm - - - 3.21438cm - - - 8.23317cm - - - 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!RepairName.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!OrderStatus.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - true - true - - - - - =Fields!Sum.Value - - - 2pt - 2pt - 2pt - 2pt - - - - - - - - - - - - - - - - - - - - - After - - - - - - - DataSetOrders - 2.48391cm - 0.55245cm - 1.2cm - 18.94755cm - 2 - - - - - - true - true - - - - - Итого: - - - - - - - 4cm - 12cm - 0.6cm - 2.5cm - 3 - - - 2pt - 2pt - 2pt - 2pt - - - - true - true - - - - - =Sum(Fields!Sum.Value, "DataSetOrders") - - - - - - - 4cm - 14.5cm - 0.6cm - 2.5cm - 4 - - - 2pt - 2pt - 2pt - 2pt - - - - 5.72875cm - + + + + + + ReportParameterPeriod + 1cm + 1cm + 21cm + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + Заказы + + + + + + + 1cm + 21cm + 1 + + + Middle + 2pt + 2pt + 2pt + 2pt + + + + + + + 2.5cm + + + 3.21438cm + + + 8.23317cm + + + 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!RepairName.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!OrderStatus.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + true + true + + + + + =Fields!Sum.Value + + + 2pt + 2pt + 2pt + 2pt + + + + + + + + + + + + + + + + + + + + + After + + + + + + + DataSetOrders + 2.48391cm + 0.55245cm + 1.2cm + 18.94755cm + 2 + + + + + + true + true + + + + + Итого: + + + + + + + 4cm + 12cm + 0.6cm + 2.5cm + 3 + + + 2pt + 2pt + 2pt + 2pt + + + + true + true + + + + + =Sum(Fields!Sum.Value, "DataSetOrders") + + + + + + + 4cm + 14.5cm + 0.6cm + 2.5cm + 4 + + + 2pt + 2pt + 2pt + 2pt + + + + 5.72875cm +