From 63dad5988b44112b4e7dafafefecc98861ec8bf2 Mon Sep 17 00:00:00 2001 From: Stepan Date: Tue, 28 May 2024 14:29:16 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BA=D0=BE=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/PreSaleWorkBindingModel.cs | 2 +- .../BindingModels/SaleBindingModel.cs | 2 +- .../SearchModels/EmployeeSearchModel.cs | 3 +-- .../SearchModels/PreSaleWorkSearchModel.cs | 5 ++--- .../SearchModels/SaleSearchModel.cs | 4 ++-- .../ViewModels/EmployeeViewModel.cs | 11 ++--------- .../ViewModels/ManagerViewModel.cs | 4 ++-- .../ViewModels/PreSaleWorkViewModel.cs | 14 ++++---------- .../CarCenterContracts/ViewModels/SaleViewModel.cs | 2 +- .../ViewModels/SalesPeriodReportViewModel.cs | 2 +- 10 files changed, 17 insertions(+), 32 deletions(-) diff --git a/CarCenter/CarCenterContracts/BindingModels/PreSaleWorkBindingModel.cs b/CarCenter/CarCenterContracts/BindingModels/PreSaleWorkBindingModel.cs index 0f18b62..53b6504 100644 --- a/CarCenter/CarCenterContracts/BindingModels/PreSaleWorkBindingModel.cs +++ b/CarCenter/CarCenterContracts/BindingModels/PreSaleWorkBindingModel.cs @@ -9,7 +9,7 @@ namespace CarCenterContracts.BindingModels public double PreSaleWorkPrice { get; set; } public DateTime? PreSaleWorkDate { get; set; } public int ManagerId { get; set; } - public int CompletionsId { get; set; } + public int? CompletionsId { get; set; } public Dictionary PreSaleWorkSales { get; set; } = new(); } } \ No newline at end of file diff --git a/CarCenter/CarCenterContracts/BindingModels/SaleBindingModel.cs b/CarCenter/CarCenterContracts/BindingModels/SaleBindingModel.cs index efe0567..6f7bc53 100644 --- a/CarCenter/CarCenterContracts/BindingModels/SaleBindingModel.cs +++ b/CarCenter/CarCenterContracts/BindingModels/SaleBindingModel.cs @@ -7,7 +7,7 @@ namespace CarCenterContracts.BindingModels public int Id { get; set; } public string SaleName { get; set; } = string.Empty; public double SalePrice { get; set; } - public DateTime? SaleDate { get; set; } = DateTime.Now; + public DateTime SaleDate { get; set; } = DateTime.Now; public int ManagerId { get; set; } } } \ No newline at end of file diff --git a/CarCenter/CarCenterContracts/SearchModels/EmployeeSearchModel.cs b/CarCenter/CarCenterContracts/SearchModels/EmployeeSearchModel.cs index 135815b..b1d3c67 100644 --- a/CarCenter/CarCenterContracts/SearchModels/EmployeeSearchModel.cs +++ b/CarCenter/CarCenterContracts/SearchModels/EmployeeSearchModel.cs @@ -4,8 +4,7 @@ { public int? Id { get; set; } public string? EmployeeFIO { get; set; } - public string? EmployeePost { get; set; } - public string? EmployeeSalary { get; set; } public int? ManagerId { get; set; } + public int? SaleId { get; set; } } } \ No newline at end of file diff --git a/CarCenter/CarCenterContracts/SearchModels/PreSaleWorkSearchModel.cs b/CarCenter/CarCenterContracts/SearchModels/PreSaleWorkSearchModel.cs index a986ca9..385485f 100644 --- a/CarCenter/CarCenterContracts/SearchModels/PreSaleWorkSearchModel.cs +++ b/CarCenter/CarCenterContracts/SearchModels/PreSaleWorkSearchModel.cs @@ -4,9 +4,8 @@ { public int? Id { get; set; } public string? PreSaleWorkType { get; set; } - public double? PreSaleWorkPrice { get; set; } - public DateTime? PreSaleWorkDate { get; set; } public int? ManagerId { get; set; } - public int? CompletionsId { get; set; } + public int? SalesId { get; set; } + public int? CarSalesId { get; set; } } } diff --git a/CarCenter/CarCenterContracts/SearchModels/SaleSearchModel.cs b/CarCenter/CarCenterContracts/SearchModels/SaleSearchModel.cs index 9d5aed4..9b9781d 100644 --- a/CarCenter/CarCenterContracts/SearchModels/SaleSearchModel.cs +++ b/CarCenter/CarCenterContracts/SearchModels/SaleSearchModel.cs @@ -4,8 +4,8 @@ { public int? Id { get; set; } public string? SaleName { get; set; } - public double? SalePrice { get; set; } - public DateTime? SaleDate { get; set; } public int? ManagerId { get; set; } + public DateTime? DateFrom { get; set; } + public DateTime? DateTo { get; set; } } } diff --git a/CarCenter/CarCenterContracts/ViewModels/EmployeeViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/EmployeeViewModel.cs index fd83c0d..279a6a5 100644 --- a/CarCenter/CarCenterContracts/ViewModels/EmployeeViewModel.cs +++ b/CarCenter/CarCenterContracts/ViewModels/EmployeeViewModel.cs @@ -6,6 +6,8 @@ namespace CarCenterContracts.ViewModels { public class EmployeeViewModel : IEmployeeModel { + public int Id { get; set; } + [DisplayName("ФИО Сотрудника")] public string EmployeeFIO { get; set; } = string.Empty; @@ -17,15 +19,6 @@ namespace CarCenterContracts.ViewModels public int ManagerId { get; set; } - public int Id { get; set; } public Dictionary EmployeeSales { get; set; } = new(); - - public EmployeeViewModel() { } - - [JsonConstructor] - public EmployeeViewModel(Dictionary EmployeeSales) - { - this.EmployeeSales = EmployeeSales.ToDictionary(x => x.Key, x => x.Value as ISaleModel); - } } } diff --git a/CarCenter/CarCenterContracts/ViewModels/ManagerViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/ManagerViewModel.cs index 867ce5d..3a4c95e 100644 --- a/CarCenter/CarCenterContracts/ViewModels/ManagerViewModel.cs +++ b/CarCenter/CarCenterContracts/ViewModels/ManagerViewModel.cs @@ -5,6 +5,8 @@ namespace CarCenterContracts.ViewModels { public class ManagerViewModel : IManagerModel { + public int Id { get; set; } + [DisplayName("ФИО менеджера")] public string ManagerFIO { get; set; } = string.Empty; @@ -19,7 +21,5 @@ namespace CarCenterContracts.ViewModels [DisplayName("Пароль менеджера")] public string ManagerPassword { get; set; } = string.Empty; - - public int Id { get; set; } } } diff --git a/CarCenter/CarCenterContracts/ViewModels/PreSaleWorkViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/PreSaleWorkViewModel.cs index 5b9d24c..3900ce8 100644 --- a/CarCenter/CarCenterContracts/ViewModels/PreSaleWorkViewModel.cs +++ b/CarCenter/CarCenterContracts/ViewModels/PreSaleWorkViewModel.cs @@ -6,6 +6,8 @@ namespace CarCenterContracts.ViewModels { public class PreSaleWorkViewModel : IPreSaleWorkModel { + public int Id { get; set; } + [DisplayName("Тип предпродажной работы")] public string PreSaleWorkType { get; set; } = string.Empty; @@ -17,18 +19,10 @@ namespace CarCenterContracts.ViewModels public int ManagerId { get; set; } - public int CompletionsId { get; set; } - - public int Id { get; set; } + public int? CompletionsId { get; set; } + public string? CompletionName { get; set; } = string.Empty; public Dictionary PreSaleWorkSales { get; set; } = new(); - public PreSaleWorkViewModel() { } - - [JsonConstructor] - public PreSaleWorkViewModel(Dictionary PreSaleWorkSales, Dictionary PreSaleWorkCars) - { - this.PreSaleWorkSales = PreSaleWorkSales.ToDictionary(x => x.Key, x => x.Value as ISaleModel); - } } } diff --git a/CarCenter/CarCenterContracts/ViewModels/SaleViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/SaleViewModel.cs index bbea8a2..d8060b2 100644 --- a/CarCenter/CarCenterContracts/ViewModels/SaleViewModel.cs +++ b/CarCenter/CarCenterContracts/ViewModels/SaleViewModel.cs @@ -14,7 +14,7 @@ namespace CarCenterContracts.ViewModels public double SalePrice { get; set; } [DisplayName("Дата продажи")] - public DateTime? SaleDate { get; set; } + public DateTime SaleDate { get; set; } public int ManagerId { get; set; } } diff --git a/CarCenter/CarCenterContracts/ViewModels/SalesPeriodReportViewModel.cs b/CarCenter/CarCenterContracts/ViewModels/SalesPeriodReportViewModel.cs index 2113183..72f6440 100644 --- a/CarCenter/CarCenterContracts/ViewModels/SalesPeriodReportViewModel.cs +++ b/CarCenter/CarCenterContracts/ViewModels/SalesPeriodReportViewModel.cs @@ -10,6 +10,6 @@ namespace CarCenterContracts.ViewModels { public string SaleName { get; set; } = string.Empty; public List Employee { get; set; } = new(); - public List Completions { get; set; } = new(); + public List PreSaleWork { get; set; } = new(); } }