diff --git a/CarCenter/CarCenterAdministratorAPP/Views/Home/IndexCarSales.cshtml b/CarCenter/CarCenterAdministratorAPP/Views/Home/IndexCarSales.cshtml index ecbb066..580476e 100644 --- a/CarCenter/CarCenterAdministratorAPP/Views/Home/IndexCarSales.cshtml +++ b/CarCenter/CarCenterAdministratorAPP/Views/Home/IndexCarSales.cshtml @@ -33,6 +33,9 @@ Модель машины + + Стоимость машины + Изменить машину diff --git a/CarCenter/CarCenterAdministratorAPP/Views/Home/IndexInspection.cshtml b/CarCenter/CarCenterAdministratorAPP/Views/Home/IndexInspection.cshtml index 44b2aa2..520579a 100644 --- a/CarCenter/CarCenterAdministratorAPP/Views/Home/IndexInspection.cshtml +++ b/CarCenter/CarCenterAdministratorAPP/Views/Home/IndexInspection.cshtml @@ -36,6 +36,12 @@ Дата осмотра + + Сотрудник + + + Привязка сотрудника к осмотру + Изменить осмотр @@ -60,6 +66,12 @@ @Html.DisplayFor(modelItem => item.InspectionDate) + + @Html.DisplayFor(modelItem => item.EmployeeName) + + + Привязать сотрудника + Изменить diff --git a/CarCenter/CarCenterAdministratorAPP/Views/Home/InspectionEmployeeAdd.cshtml b/CarCenter/CarCenterAdministratorAPP/Views/Home/InspectionEmployeeAdd.cshtml new file mode 100644 index 0000000..d0ccea8 --- /dev/null +++ b/CarCenter/CarCenterAdministratorAPP/Views/Home/InspectionEmployeeAdd.cshtml @@ -0,0 +1,32 @@ +@using CarCenterContracts.ViewModels + +@model List + +@{ + ViewData["Title"] = "Inspection-Add-Employee"; +} + +
+

Осмотр - @ViewBag.Inspection.InspectionName

+
+ +
+

Список сотрудников

+
+ @foreach (var employee in Model) + { +
+
+
+
@employee.EmployeeFIO
+
+ + + +
+
+
+
+ } +
+
\ No newline at end of file diff --git a/CarCenter/CarCenterContracts/BindingModels/InspectionBindingModel.cs b/CarCenter/CarCenterContracts/BindingModels/InspectionBindingModel.cs index fb36db1..6336d1c 100644 --- a/CarCenter/CarCenterContracts/BindingModels/InspectionBindingModel.cs +++ b/CarCenter/CarCenterContracts/BindingModels/InspectionBindingModel.cs @@ -12,7 +12,7 @@ namespace CarCenterContracts.BindingModels public int Id { get; set; } public string InspectionName { get; set; } = string.Empty; public double InspectionCost { get; set; } - public DateTime? InspectionDate { get; set; } + public DateTime? InspectionDate { get; set; } = DateTime.Now; public int AdministratorId { get; set; } public int? EmployeeId { get; set; } public Dictionary InspectionCars { get; set; } = new(); diff --git a/CarCenter/CarCenterContracts/BindingModels/PreSaleWorkBindingModel.cs b/CarCenter/CarCenterContracts/BindingModels/PreSaleWorkBindingModel.cs index 53b6504..471c2f2 100644 --- a/CarCenter/CarCenterContracts/BindingModels/PreSaleWorkBindingModel.cs +++ b/CarCenter/CarCenterContracts/BindingModels/PreSaleWorkBindingModel.cs @@ -7,7 +7,7 @@ namespace CarCenterContracts.BindingModels public int Id { get; set; } public string PreSaleWorkType { get; set; } = string.Empty; public double PreSaleWorkPrice { get; set; } - public DateTime? PreSaleWorkDate { get; set; } + public DateTime? PreSaleWorkDate { get; set; } = DateTime.Now; public int ManagerId { get; set; } public int? CompletionsId { get; set; } public Dictionary PreSaleWorkSales { get; set; } = new(); diff --git a/CarCenter/CarCenterContracts/SearchModels/EmployeeSearchModel.cs b/CarCenter/CarCenterContracts/SearchModels/EmployeeSearchModel.cs index b1d3c67..e5c93c5 100644 --- a/CarCenter/CarCenterContracts/SearchModels/EmployeeSearchModel.cs +++ b/CarCenter/CarCenterContracts/SearchModels/EmployeeSearchModel.cs @@ -6,5 +6,7 @@ public string? EmployeeFIO { get; set; } public int? ManagerId { get; set; } public int? SaleId { get; set; } + public DateTime? DateFrom { get; set; } + public DateTime? DateTo { get; set; } } } \ No newline at end of file diff --git a/CarCenter/CarCenterDataBaseImplement/CarCenterDataBase.cs b/CarCenter/CarCenterDataBaseImplement/CarCenterDataBase.cs index bcab7d9..56119d9 100644 --- a/CarCenter/CarCenterDataBaseImplement/CarCenterDataBase.cs +++ b/CarCenter/CarCenterDataBaseImplement/CarCenterDataBase.cs @@ -9,7 +9,7 @@ namespace CarCenterDataBaseImplement { if (optionsBuilder.IsConfigured == false) { - optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-D5A5OOG\GOLDFEST;Initial Catalog=CarCenter;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); + optionsBuilder.UseSqlServer(@"Data Source=DESKTOP-D5A5OOG\GOLDFEST;Initial Catalog=CarCenter2;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); } base.OnConfiguring(optionsBuilder); diff --git a/CarCenter/CarCenterDataBaseImplement/Implements/EmployeeStorage.cs b/CarCenter/CarCenterDataBaseImplement/Implements/EmployeeStorage.cs index f42e318..0c8ef5f 100644 --- a/CarCenter/CarCenterDataBaseImplement/Implements/EmployeeStorage.cs +++ b/CarCenter/CarCenterDataBaseImplement/Implements/EmployeeStorage.cs @@ -29,15 +29,15 @@ namespace CarCenterDataBaseImplement.Implements public List GetFilteredList(EmployeeSearchModel model) { - if (!model.ManagerId.HasValue && !model.SaleId.HasValue) + if (!model.ManagerId.HasValue && !model.DateFrom.HasValue && !model.DateTo.HasValue) { return new(); } using var context = new CarCenterDataBase(); - if (model.SaleId.HasValue) - return context.Employees.Include(x => x.Sales).ThenInclude(x => x.Sale).Where(x => x.ManagerId == model.ManagerId).Where(x => x.Sales.FirstOrDefault(y => y.SaleId == model.SaleId) != null).Include(x => x.Manager).Select(x => x.GetViewModel).ToList(); + if (model.DateFrom.HasValue) + return context.Employees.Where(x => x.ManagerId == model.ManagerId).Where(x => x.DateCreate <= model.DateTo && x.DateCreate >= model.DateFrom).Select(x => x.GetViewModel).ToList(); else - return context.Employees.Include(x => x.Sales).ThenInclude(x => x.Sale).Where(x => x.ManagerId == model.ManagerId).Select(x => x.GetViewModel).ToList(); + return context.Employees.Where(x => x.ManagerId == model.ManagerId).Select(x => x.GetViewModel).ToList(); } public List GetFullList() diff --git a/CarCenter/CarCenterDataBaseImplement/Migrations/20240528154442_InitialCreate.Designer.cs b/CarCenter/CarCenterDataBaseImplement/Migrations/20240528181101_InitialCreate.Designer.cs similarity index 99% rename from CarCenter/CarCenterDataBaseImplement/Migrations/20240528154442_InitialCreate.Designer.cs rename to CarCenter/CarCenterDataBaseImplement/Migrations/20240528181101_InitialCreate.Designer.cs index 568a1d8..507ccc8 100644 --- a/CarCenter/CarCenterDataBaseImplement/Migrations/20240528154442_InitialCreate.Designer.cs +++ b/CarCenter/CarCenterDataBaseImplement/Migrations/20240528181101_InitialCreate.Designer.cs @@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace CarCenterDataBaseImplement.Migrations { [DbContext(typeof(CarCenterDataBase))] - [Migration("20240528154442_InitialCreate")] + [Migration("20240528181101_InitialCreate")] partial class InitialCreate { /// @@ -150,6 +150,9 @@ namespace CarCenterDataBaseImplement.Migrations SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + b.Property("DateCreate") + .HasColumnType("datetime2"); + b.Property("EmployeeFIO") .IsRequired() .HasColumnType("nvarchar(max)"); diff --git a/CarCenter/CarCenterDataBaseImplement/Migrations/20240528154442_InitialCreate.cs b/CarCenter/CarCenterDataBaseImplement/Migrations/20240528181101_InitialCreate.cs similarity index 99% rename from CarCenter/CarCenterDataBaseImplement/Migrations/20240528154442_InitialCreate.cs rename to CarCenter/CarCenterDataBaseImplement/Migrations/20240528181101_InitialCreate.cs index 1634df8..f02398a 100644 --- a/CarCenter/CarCenterDataBaseImplement/Migrations/20240528154442_InitialCreate.cs +++ b/CarCenter/CarCenterDataBaseImplement/Migrations/20240528181101_InitialCreate.cs @@ -99,6 +99,7 @@ namespace CarCenterDataBaseImplement.Migrations EmployeeFIO = table.Column(type: "nvarchar(max)", nullable: false), EmployeePost = table.Column(type: "nvarchar(max)", nullable: false), EmployeeSalary = table.Column(type: "float", nullable: false), + DateCreate = table.Column(type: "datetime2", nullable: false), ManagerId = table.Column(type: "int", nullable: false) }, constraints: table => diff --git a/CarCenter/CarCenterDataBaseImplement/Migrations/CarCenterDataBaseModelSnapshot.cs b/CarCenter/CarCenterDataBaseImplement/Migrations/CarCenterDataBaseModelSnapshot.cs index bd8c6b2..b74cba5 100644 --- a/CarCenter/CarCenterDataBaseImplement/Migrations/CarCenterDataBaseModelSnapshot.cs +++ b/CarCenter/CarCenterDataBaseImplement/Migrations/CarCenterDataBaseModelSnapshot.cs @@ -147,6 +147,9 @@ namespace CarCenterDataBaseImplement.Migrations SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); + b.Property("DateCreate") + .HasColumnType("datetime2"); + b.Property("EmployeeFIO") .IsRequired() .HasColumnType("nvarchar(max)"); diff --git a/CarCenter/CarCenterDataBaseImplement/Models/Employee.cs b/CarCenter/CarCenterDataBaseImplement/Models/Employee.cs index 78ff501..9b8c244 100644 --- a/CarCenter/CarCenterDataBaseImplement/Models/Employee.cs +++ b/CarCenter/CarCenterDataBaseImplement/Models/Employee.cs @@ -18,6 +18,8 @@ namespace CarCenterDataBaseImplement.Models [Required] public double EmployeeSalary { get; set; } + [Required] + public DateTime DateCreate { get; set; } = DateTime.Now; public int ManagerId { get; private set; } diff --git a/CarCenter/CarCenterManagerAPP/Views/Home/IndexPreSaleWork.cshtml b/CarCenter/CarCenterManagerAPP/Views/Home/IndexPreSaleWork.cshtml index bae5efe..901560c 100644 --- a/CarCenter/CarCenterManagerAPP/Views/Home/IndexPreSaleWork.cshtml +++ b/CarCenter/CarCenterManagerAPP/Views/Home/IndexPreSaleWork.cshtml @@ -36,6 +36,12 @@ Дата предпродажной работы + + Комплектация + + + Привязка комплектации к предпродажной работе + Изменить предпродажную работу @@ -60,6 +66,12 @@ @Html.DisplayFor(modelItem => item.PreSaleWorkDate) + + @Html.DisplayFor(modelItem => item.CompletionName) + + + Привязать комплектацию + Изменить diff --git a/CarCenter/CarCenterManagerAPP/Views/Home/PreSaleWorkCompletionsAdd.cshtml b/CarCenter/CarCenterManagerAPP/Views/Home/PreSaleWorkCompletionsAdd.cshtml new file mode 100644 index 0000000..5deabb0 --- /dev/null +++ b/CarCenter/CarCenterManagerAPP/Views/Home/PreSaleWorkCompletionsAdd.cshtml @@ -0,0 +1,32 @@ +@using CarCenterContracts.ViewModels + +@model List + +@{ + ViewData["Title"] = "PreSaleWork-Add-Completion"; +} + +
+

Предпродажная работа - @ViewBag.PreSaleWork.PreSaleWorkType

+
+ +
+

Список комплектаций

+
+ @foreach (var Completions in Model) + { +
+
+
+
@Completions.СompletionName
+
+ + + +
+
+
+
+ } +
+
\ No newline at end of file