From fb3d9bef9a95de96c37ed76ac8d452d189c7e451 Mon Sep 17 00:00:00 2001 From: goldfest Date: Mon, 27 May 2024 19:44:32 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D1=80=D0=B5=D0=B4=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D1=82=D1=80=D0=B0=D0=BA=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BindingModels/CarSalesBindingModel.cs | 3 ++- .../BindingModels/InspectionBindingModel.cs | 2 +- .../CarCenterContracts/SearchModels/CarSalesSearchModel.cs | 4 ++-- .../SearchModels/CopletionsSearchModel.cs | 3 +-- .../SearchModels/InspectionSearchModel.cs | 7 +++---- .../CarCenterContracts/ViewModels/CarSalesViewModel.cs | 3 +++ .../CarCenterContracts/ViewModels/InspectionViewModel.cs | 4 ++-- 7 files changed, 14 insertions(+), 12 deletions(-) diff --git a/CarCenter/CarCenterContracts/BindingModels/CarSalesBindingModel.cs b/CarCenter/CarCenterContracts/BindingModels/CarSalesBindingModel.cs index 96617bc..42a66e8 100644 --- a/CarCenter/CarCenterContracts/BindingModels/CarSalesBindingModel.cs +++ b/CarCenter/CarCenterContracts/BindingModels/CarSalesBindingModel.cs @@ -10,9 +10,10 @@ namespace CarCenterContracts.BindingModels public class CarSalesBindingModel : ICarSalesModel { public int Id { get; set; } + public int AdministratorId { get; set; } public string CarBrand{ get; set; } = string.Empty; public string CarModel { get; set; } = string.Empty; public decimal CarCost { get; set; } - public int AdministratorId { get; set; } + public DateTime DateCreate { get; set; } } } diff --git a/CarCenter/CarCenterContracts/BindingModels/InspectionBindingModel.cs b/CarCenter/CarCenterContracts/BindingModels/InspectionBindingModel.cs index ab6b1ca..4ae1dea 100644 --- a/CarCenter/CarCenterContracts/BindingModels/InspectionBindingModel.cs +++ b/CarCenter/CarCenterContracts/BindingModels/InspectionBindingModel.cs @@ -14,7 +14,7 @@ namespace CarCenterContracts.BindingModels public decimal InspectionCost { get; set; } public DateTime? InspectionDate { get; set; } public int AdministratorId { get; set; } - public int EmployeeId { get; set; } + public int? EmployeeId { get; set; } public Dictionary InspectionCars { get; set; } = new(); } } diff --git a/CarCenter/CarCenterContracts/SearchModels/CarSalesSearchModel.cs b/CarCenter/CarCenterContracts/SearchModels/CarSalesSearchModel.cs index bd7b735..3d502e4 100644 --- a/CarCenter/CarCenterContracts/SearchModels/CarSalesSearchModel.cs +++ b/CarCenter/CarCenterContracts/SearchModels/CarSalesSearchModel.cs @@ -10,8 +10,8 @@ namespace CarCenterContracts.SearchModels { public int? Id { get; set; } public string? CarBrand { get; set; } - public string? CarModel { get; set; } - public decimal? CarCost { get; set; } public int? AdministratorId { get; set; } + public DateTime? DateFrom { get; set; } + public DateTime? DateTo { get; set; } } } diff --git a/CarCenter/CarCenterContracts/SearchModels/CopletionsSearchModel.cs b/CarCenter/CarCenterContracts/SearchModels/CopletionsSearchModel.cs index cc451c8..3367962 100644 --- a/CarCenter/CarCenterContracts/SearchModels/CopletionsSearchModel.cs +++ b/CarCenter/CarCenterContracts/SearchModels/CopletionsSearchModel.cs @@ -10,8 +10,7 @@ namespace CarCenterContracts.SearchModels { public int? Id { get; set; } public string? СompletionName { get; set; } - public string? СompletionFeatures { get; set; } - public decimal? СompletionPrice { get; set; } public int? AdministratorId { get; set; } + public int? CarSalesId { get; set; } } } diff --git a/CarCenter/CarCenterContracts/SearchModels/InspectionSearchModel.cs b/CarCenter/CarCenterContracts/SearchModels/InspectionSearchModel.cs index fffeb79..a8d1ce9 100644 --- a/CarCenter/CarCenterContracts/SearchModels/InspectionSearchModel.cs +++ b/CarCenter/CarCenterContracts/SearchModels/InspectionSearchModel.cs @@ -11,10 +11,9 @@ namespace CarCenterContracts.SearchModels { public int? Id { get; set; } public string? InspectionName { get; set; } - public decimal? InspectionCost { get; set; } - public DateTime? InspectionDate { get; set; } public int? AdministratorId { get; set; } - public int? EmployeeId { get; set; } - + public int? SalesId { get; set; } + public int? CarSalesId { get; set; } + } } diff --git a/CarCenter/CarCenterContracts/ViewModels/CarSalesViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/CarSalesViewModel.cs index 070123b..6907ffb 100644 --- a/CarCenter/CarCenterContracts/ViewModels/CarSalesViewModel.cs +++ b/CarCenter/CarCenterContracts/ViewModels/CarSalesViewModel.cs @@ -21,5 +21,8 @@ namespace CarCenterContracts.ViewModels [DisplayName("Стоимость машины")] public decimal CarCost { get; set; } public int AdministratorId { get; set; } + + [DisplayName("Дата создания")] + public DateTime DateCreate { get; set; } } } diff --git a/CarCenter/CarCenterContracts/ViewModels/InspectionViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/InspectionViewModel.cs index 1ddd312..5f26ec4 100644 --- a/CarCenter/CarCenterContracts/ViewModels/InspectionViewModel.cs +++ b/CarCenter/CarCenterContracts/ViewModels/InspectionViewModel.cs @@ -21,9 +21,9 @@ namespace CarCenterContracts.ViewModels [DisplayName("Дата осмотра")] public DateTime? InspectionDate { get; set; } = DateTime.Now; public int AdministratorId { get; set; } - public int EmployeeId { get; set; } + public int? EmployeeId { get; set; } - public string EmployeeName { get; set; } = string.Empty; + public string? EmployeeName { get; set; } = string.Empty; public Dictionary InspectionCars { get; set; } = new(); } }