изменил контракты

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<int, ISaleModel> PreSaleWorkSales { get; set; } = new();
     }
 }

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; }
     }
 }

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; }
     }
 }

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; }
     }
 }

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; }
     }
 }

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<int, ISaleModel> EmployeeSales { get; set; } = new();
-
-        public EmployeeViewModel() { }
-
-        [JsonConstructor]
-        public EmployeeViewModel(Dictionary<int, SaleViewModel> EmployeeSales)
-        {
-            this.EmployeeSales = EmployeeSales.ToDictionary(x => x.Key, x => x.Value as ISaleModel);
-        }
     }
 }

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; }
     }
 }

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<int, ISaleModel> PreSaleWorkSales { get; set; } = new();
 
-        public PreSaleWorkViewModel() { }
-
-        [JsonConstructor]
-        public PreSaleWorkViewModel(Dictionary<int, SaleViewModel> PreSaleWorkSales, Dictionary<int, CarSalesViewModel> PreSaleWorkCars)
-        {
-            this.PreSaleWorkSales = PreSaleWorkSales.ToDictionary(x => x.Key, x => x.Value as ISaleModel);
-        }
     }
 }

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; }        
     }

CarCenter/CarCenterContracts/ViewModels/SalesPeriodReportViewModel.cs

@@ -10,6 +10,6 @@ namespace CarCenterContracts.ViewModels
     {
         public string SaleName { get; set; } = string.Empty;
         public List<string> Employee { get; set; } = new();
-        public List<string> Completions { get; set; } = new();
+        public List<string> PreSaleWork { get; set; } = new();
     }
 }