diff --git a/BeautySalonView/BeautySalonBusinessLogic/BusinessLogic/StaffMemberLogic.cs b/BeautySalonView/BeautySalonBusinessLogic/BusinessLogic/StaffMemberLogic.cs index bf22ed1..d622f65 100644 --- a/BeautySalonView/BeautySalonBusinessLogic/BusinessLogic/StaffMemberLogic.cs +++ b/BeautySalonView/BeautySalonBusinessLogic/BusinessLogic/StaffMemberLogic.cs @@ -112,14 +112,10 @@ namespace BeautySalonBusinessLogic.BusinessLogics { return; } - if (string.IsNullOrEmpty(model.StaffMemberName)) + if (string.IsNullOrEmpty(model.StaffMemberFIO)) { throw new ArgumentNullException("Нет имени сотрудника", nameof(model.StaffMemberLogin)); } - if (string.IsNullOrEmpty(model.StaffMemberSurname)) - { - throw new ArgumentNullException("Нет фамилии сотрудника", nameof(model.StaffMemberLogin)); - } if (string.IsNullOrEmpty(model.StaffMemberSpecialty)) { throw new ArgumentNullException("Нет специальности сотрудника", nameof(model.StaffMemberLogin)); diff --git a/BeautySalonView/BeautySalonContracts/BindingModels/ClientBindingModel.cs b/BeautySalonView/BeautySalonContracts/BindingModels/ClientBindingModel.cs index b1c3830..6382660 100644 --- a/BeautySalonView/BeautySalonContracts/BindingModels/ClientBindingModel.cs +++ b/BeautySalonView/BeautySalonContracts/BindingModels/ClientBindingModel.cs @@ -13,5 +13,7 @@ namespace BeautySalonContracts.BindingModels public string ClientEmail { get; set; } = string.Empty; public string ClientPassword { get; set; } = string.Empty; + + public string ClientPhone { get; set; } = string.Empty; } } diff --git a/BeautySalonView/BeautySalonContracts/BindingModels/CosmeticBindingModel.cs b/BeautySalonView/BeautySalonContracts/BindingModels/CosmeticBindingModel.cs index ae4d2fa..47e2ae5 100644 --- a/BeautySalonView/BeautySalonContracts/BindingModels/CosmeticBindingModel.cs +++ b/BeautySalonView/BeautySalonContracts/BindingModels/CosmeticBindingModel.cs @@ -1,4 +1,5 @@ -using BeautySalonDataModels; +using BeautySalonContracts.ViewModels; +using BeautySalonDataModels; using BeautySalonDataModels.Models; using System; using System.Collections.Generic; @@ -15,5 +16,7 @@ namespace BeautySalonContracts.BindingModels public string Brand { get; set; } = string.Empty; public double CosmeticPrice { get; set; } public int LaborCostId { get; set; } + public List ServiceCosmetic { get; set; } = new(); + public List CosmeticProcedure { get; set; } = new(); } } diff --git a/BeautySalonView/BeautySalonContracts/BindingModels/EvaluationBindingModel.cs b/BeautySalonView/BeautySalonContracts/BindingModels/EvaluationBindingModel.cs index 9928c28..262a724 100644 --- a/BeautySalonView/BeautySalonContracts/BindingModels/EvaluationBindingModel.cs +++ b/BeautySalonView/BeautySalonContracts/BindingModels/EvaluationBindingModel.cs @@ -9,6 +9,5 @@ namespace BeautySalonContracts.BindingModels public double PointsCosmetics { get; set; } public int ProcedureId { get; set; } public int ClientId { get; set; } - } } \ No newline at end of file diff --git a/BeautySalonView/BeautySalonContracts/BindingModels/OrderBindingModel.cs b/BeautySalonView/BeautySalonContracts/BindingModels/OrderBindingModel.cs index fd627da..46b669a 100644 --- a/BeautySalonView/BeautySalonContracts/BindingModels/OrderBindingModel.cs +++ b/BeautySalonView/BeautySalonContracts/BindingModels/OrderBindingModel.cs @@ -11,8 +11,8 @@ namespace BeautySalonContracts.BindingModels public DateTime OrderDate { get; set; } public double OrderAmount { get; set; } public int ClientId { get; set; } - public List OrderServices { get; set; } = new(); - public List OrderCosmetics { get; set; } = new(); - public List OrderProcedures { get; set; } = new(); + public List OrderService { get; set; } = new(); + public List OrderCosmetic { get; set; } = new(); + public List OrderProcedure { get; set; } = new(); } } diff --git a/BeautySalonView/BeautySalonContracts/BindingModels/ProcedureBindingModel.cs b/BeautySalonView/BeautySalonContracts/BindingModels/ProcedureBindingModel.cs index 7d1994e..f0ee247 100644 --- a/BeautySalonView/BeautySalonContracts/BindingModels/ProcedureBindingModel.cs +++ b/BeautySalonView/BeautySalonContracts/BindingModels/ProcedureBindingModel.cs @@ -11,6 +11,8 @@ namespace BeautySalonContracts.BindingModels public double ProcedurePrice { get; set; } public double ProcedureDuration { get; set; } public int ClientId { get; set; } - public List ProcedureCosmetics { get; set; } = new(); + public List ProcedureCosmetics { get; set; } = new(); + public List ServiceProcedure { get; set; } = new(); + public List OrderProcedure { get; set; } = new(); } } diff --git a/BeautySalonView/BeautySalonContracts/BindingModels/ServiceBindingModel.cs b/BeautySalonView/BeautySalonContracts/BindingModels/ServiceBindingModel.cs index 32e3694..c55b0cd 100644 --- a/BeautySalonView/BeautySalonContracts/BindingModels/ServiceBindingModel.cs +++ b/BeautySalonView/BeautySalonContracts/BindingModels/ServiceBindingModel.cs @@ -14,6 +14,8 @@ namespace BeautySalonContracts.BindingModels public string ServiceName { get; set; } = string.Empty; public double ServicePrice { get; set; } public int StaffMemberId { get; set; } - public List ServiceCosmetics { get; set; } = new(); + public List ServiceCosmetic { get; set; } = new(); + public List ServiceProcedure { get; set; } = new(); + public List OrderService { get; set; } = new(); } } diff --git a/BeautySalonView/BeautySalonContracts/BindingModels/StaffMemberBindingModel.cs b/BeautySalonView/BeautySalonContracts/BindingModels/StaffMemberBindingModel.cs index 4f3e0c5..3cee439 100644 --- a/BeautySalonView/BeautySalonContracts/BindingModels/StaffMemberBindingModel.cs +++ b/BeautySalonView/BeautySalonContracts/BindingModels/StaffMemberBindingModel.cs @@ -10,8 +10,7 @@ namespace BeautySalonContracts.BindingModels public class StaffMemberBindingModel : IStaffMemberModel { public int Id { get; set; } - public string StaffMemberName { get; set; } = string.Empty; - public string StaffMemberSurname { get; set; } = string.Empty; + public string StaffMemberFIO { get; set; } = string.Empty; public string StaffMemberSpecialty { get; set; } = string.Empty; public string StaffMemberLogin { get; set; } = string.Empty; public string StaffMemberEmail { get; set; } = string.Empty; diff --git a/BeautySalonView/BeautySalonContracts/SearchModels/CosmeticSearchModel.cs b/BeautySalonView/BeautySalonContracts/SearchModels/CosmeticSearchModel.cs index 4d7ca1e..a7507c7 100644 --- a/BeautySalonView/BeautySalonContracts/SearchModels/CosmeticSearchModel.cs +++ b/BeautySalonView/BeautySalonContracts/SearchModels/CosmeticSearchModel.cs @@ -10,7 +10,6 @@ namespace BeautySalonContracts.SearchModels { public int? Id {get; set; } public string? CosmeticName { get; set; } - public string? Brand { get; set; } public int? LaborCostId { get; set; } } } diff --git a/BeautySalonView/BeautySalonContracts/SearchModels/EvaluationSearchModel.cs b/BeautySalonView/BeautySalonContracts/SearchModels/EvaluationSearchModel.cs index d81150d..5ec647c 100644 --- a/BeautySalonView/BeautySalonContracts/SearchModels/EvaluationSearchModel.cs +++ b/BeautySalonView/BeautySalonContracts/SearchModels/EvaluationSearchModel.cs @@ -3,10 +3,7 @@ public class EvaluationSearchModel { public int? Id { get; set; } - public double? PointsProcedure { get; set; } - public double? PointsCosmetics { get; set; } public int? ClientId { get; set; } public int? ProcedureId { get; set; } - } } diff --git a/BeautySalonView/BeautySalonContracts/SearchModels/LaborCostsSearchModel.cs b/BeautySalonView/BeautySalonContracts/SearchModels/LaborCostsSearchModel.cs index acc11b0..f44c08f 100644 --- a/BeautySalonView/BeautySalonContracts/SearchModels/LaborCostsSearchModel.cs +++ b/BeautySalonView/BeautySalonContracts/SearchModels/LaborCostsSearchModel.cs @@ -9,7 +9,6 @@ namespace BeautySalonContracts.SearchModels public class LaborCostsSearchModel { public int? Id { get; set; } - public string? Difficulty { get; set; } public int? StaffMemberId { get; set; } } } diff --git a/BeautySalonView/BeautySalonContracts/SearchModels/ProcedureSearchModel.cs b/BeautySalonView/BeautySalonContracts/SearchModels/ProcedureSearchModel.cs index 2dfdfde..e49b367 100644 --- a/BeautySalonView/BeautySalonContracts/SearchModels/ProcedureSearchModel.cs +++ b/BeautySalonView/BeautySalonContracts/SearchModels/ProcedureSearchModel.cs @@ -5,7 +5,5 @@ public int? Id { get; set; } public string? ProcedureName { get; set; } public int? ClientId { get; set; } - public int? PageNumber { get; set; } - public int? PageSize { get; set; } } } diff --git a/BeautySalonView/BeautySalonContracts/SearchModels/StaffMemberSearchModel.cs b/BeautySalonView/BeautySalonContracts/SearchModels/StaffMemberSearchModel.cs index ac65fac..5f515ad 100644 --- a/BeautySalonView/BeautySalonContracts/SearchModels/StaffMemberSearchModel.cs +++ b/BeautySalonView/BeautySalonContracts/SearchModels/StaffMemberSearchModel.cs @@ -3,8 +3,7 @@ public class StaffMemberSearchModel { public int? Id { get; set; } - public string? StaffMemberName { get; set; } - public string? StaffMemberSpecialty { get; set; } + public string? StaffMemberFIO{ get; set; } public string? StaffMemberLogin { get; set; } public string? StaffMemberEmail { get; set; } public string? StaffMemberPassword { get; set; } diff --git a/BeautySalonView/BeautySalonContracts/StoragesContracts/IProcedureStorage.cs b/BeautySalonView/BeautySalonContracts/StoragesContracts/IProcedureStorage.cs index 8c9deb6..7478c8e 100644 --- a/BeautySalonView/BeautySalonContracts/StoragesContracts/IProcedureStorage.cs +++ b/BeautySalonView/BeautySalonContracts/StoragesContracts/IProcedureStorage.cs @@ -17,6 +17,6 @@ namespace BeautySalonContracts.StoragesContracts ProcedureViewModel? Insert(ProcedureBindingModel model); ProcedureViewModel? Update(ProcedureBindingModel model); ProcedureViewModel? Delete(ProcedureBindingModel model); - + List GetProcedureCosmetics(ProcedureSearchModel model); } } diff --git a/BeautySalonView/BeautySalonContracts/ViewModels/ClientViewModel.cs b/BeautySalonView/BeautySalonContracts/ViewModels/ClientViewModel.cs index f2257e8..ef02ec6 100644 --- a/BeautySalonView/BeautySalonContracts/ViewModels/ClientViewModel.cs +++ b/BeautySalonView/BeautySalonContracts/ViewModels/ClientViewModel.cs @@ -23,5 +23,8 @@ namespace BeautySalonContracts.ViewModels [DisplayName("Пароль клиента")] public string ClientPassword { get; set; } = string.Empty; + + [DisplayName("Телефон клиента")] + public string ClientPhone { get; set; } = string.Empty; } } diff --git a/BeautySalonView/BeautySalonContracts/ViewModels/CosmeticProcedureViewModel.cs b/BeautySalonView/BeautySalonContracts/ViewModels/CosmeticProcedureViewModel.cs index fd161e1..2bf533c 100644 --- a/BeautySalonView/BeautySalonContracts/ViewModels/CosmeticProcedureViewModel.cs +++ b/BeautySalonView/BeautySalonContracts/ViewModels/CosmeticProcedureViewModel.cs @@ -3,13 +3,15 @@ public class CosmeticProcedureViewModel { public CosmeticViewModel Cosmetic { get; set; } = null!; + public ProcedureViewModel Procedure { get; set; } = null!; public int Count { get; set; } public CosmeticProcedureViewModel() { } - public CosmeticProcedureViewModel(CosmeticViewModel cosmetic, int count) + public CosmeticProcedureViewModel(CosmeticViewModel cosmetic, ProcedureViewModel procedure, int count) { Cosmetic = cosmetic; + Procedure = procedure; Count = count; } } diff --git a/BeautySalonView/BeautySalonContracts/ViewModels/CosmeticViewModel.cs b/BeautySalonView/BeautySalonContracts/ViewModels/CosmeticViewModel.cs index cf12435..382034c 100644 --- a/BeautySalonView/BeautySalonContracts/ViewModels/CosmeticViewModel.cs +++ b/BeautySalonView/BeautySalonContracts/ViewModels/CosmeticViewModel.cs @@ -22,5 +22,8 @@ namespace BeautySalonContracts.ViewModels public double CosmeticPrice { get; set; } public int LaborCostId { get; set; } + + public List ServiceCosmetic { get; set; } = new(); + public List CosmeticProcedure { get; set; } = new(); } } diff --git a/BeautySalonView/BeautySalonContracts/ViewModels/OrderCosmeticViewModel.cs b/BeautySalonView/BeautySalonContracts/ViewModels/OrderCosmeticViewModel.cs index 8e045ba..9053e9e 100644 --- a/BeautySalonView/BeautySalonContracts/ViewModels/OrderCosmeticViewModel.cs +++ b/BeautySalonView/BeautySalonContracts/ViewModels/OrderCosmeticViewModel.cs @@ -2,12 +2,14 @@ { public class OrderCosmeticViewModel { + public int OrderId { get; set; } public CosmeticViewModel Cosmetic { get; set; } = null!; public OrderCosmeticViewModel() { } - public OrderCosmeticViewModel(CosmeticViewModel cosmetic) + public OrderCosmeticViewModel(int orderId, CosmeticViewModel cosmetic) { + OrderId = orderId; Cosmetic = cosmetic; } } diff --git a/BeautySalonView/BeautySalonContracts/ViewModels/OrderProcedureViewModel.cs b/BeautySalonView/BeautySalonContracts/ViewModels/OrderProcedureViewModel.cs index d8e8b9b..cc8defc 100644 --- a/BeautySalonView/BeautySalonContracts/ViewModels/OrderProcedureViewModel.cs +++ b/BeautySalonView/BeautySalonContracts/ViewModels/OrderProcedureViewModel.cs @@ -2,13 +2,15 @@ { public class OrderProcedureViewModel { + public int OrderId { get; set; } public ProcedureViewModel Procedure { get; set; } = null!; public int Count { get; set; } public OrderProcedureViewModel() { } - public OrderProcedureViewModel(ProcedureViewModel procedure, int count) + public OrderProcedureViewModel(int orderId, ProcedureViewModel procedure, int count) { + OrderId = orderId; Procedure = procedure; Count = count; } diff --git a/BeautySalonView/BeautySalonContracts/ViewModels/OrderServiceViewModel.cs b/BeautySalonView/BeautySalonContracts/ViewModels/OrderServiceViewModel.cs index c5ca135..24cd40c 100644 --- a/BeautySalonView/BeautySalonContracts/ViewModels/OrderServiceViewModel.cs +++ b/BeautySalonView/BeautySalonContracts/ViewModels/OrderServiceViewModel.cs @@ -2,13 +2,15 @@ { public class OrderServiceViewModel { + public int OrderId { get; set; } public ServiceViewModel Service { get; set; } = null!; public int Count { get; set; } public OrderServiceViewModel() { } - public OrderServiceViewModel(ServiceViewModel service, int count) + public OrderServiceViewModel(int orderId, ServiceViewModel service, int count) { + OrderId = orderId; Service = service; Count = count; } diff --git a/BeautySalonView/BeautySalonContracts/ViewModels/OrderViewModel.cs b/BeautySalonView/BeautySalonContracts/ViewModels/OrderViewModel.cs index 0402f47..dad121d 100644 --- a/BeautySalonView/BeautySalonContracts/ViewModels/OrderViewModel.cs +++ b/BeautySalonView/BeautySalonContracts/ViewModels/OrderViewModel.cs @@ -10,15 +10,18 @@ namespace BeautySalonContracts.ViewModels { public class OrderViewModel : IOrderModel { - [DisplayName("Дата заказа")] + public int Id { get; set; } + + [DisplayName("Дата оформления заказа")] public DateTime OrderDate { get; set; } - [DisplayName("Сумма")] + [DisplayName("Стоимость")] public double OrderAmount { get; set; } + public int ClientId { get; set; } - public int Id { get; set; } - public List OrderServices { get; set; } = new(); - public List OrderProcedures { get; set; } = new(); - public List OrderCosmetics { get; set; } = new(); + + public List OrderService { get; set; } = new(); + public List OrderCosmetic { get; set; } = new(); + public List OrderProcedure { get; set; } = new(); } } diff --git a/BeautySalonView/BeautySalonContracts/ViewModels/ProcedureEvaluationViewModel.cs b/BeautySalonView/BeautySalonContracts/ViewModels/ProcedureEvaluationViewModel.cs index 6116be8..990be09 100644 --- a/BeautySalonView/BeautySalonContracts/ViewModels/ProcedureEvaluationViewModel.cs +++ b/BeautySalonView/BeautySalonContracts/ViewModels/ProcedureEvaluationViewModel.cs @@ -2,14 +2,16 @@ { public class ProcedureEvaluationViewModel { - public CosmeticViewModel Cosmetic { get; set; } = null!; + public int OrderId { get; set; } + public EvaluationViewModel Evaluation { get; set; } = null!; public int Count { get; set; } public ProcedureEvaluationViewModel() { } - public ProcedureEvaluationViewModel(CosmeticViewModel cosmetic, int count) + public ProcedureEvaluationViewModel(int orderId, EvaluationViewModel evaluation, int count) { - Cosmetic = cosmetic; + OrderId = orderId; + Evaluation = evaluation; Count = count; } } diff --git a/BeautySalonView/BeautySalonContracts/ViewModels/ProcedureViewModel.cs b/BeautySalonView/BeautySalonContracts/ViewModels/ProcedureViewModel.cs index 7974be5..d76c377 100644 --- a/BeautySalonView/BeautySalonContracts/ViewModels/ProcedureViewModel.cs +++ b/BeautySalonView/BeautySalonContracts/ViewModels/ProcedureViewModel.cs @@ -10,17 +10,20 @@ namespace BeautySalonContracts.ViewModels { public class ProcedureViewModel : IProcedureModel { + public int Id { get; set; } + [DisplayName("Наименование процедуры")] public string ProcedureName { get; set; } = string.Empty; [DisplayName("Цена процедуры")] public double ProcedurePrice { get; set; } + [DisplayName("Продолжительность процедуры")] + public double ProcedureDuration { get; set; } public int ClientId { get; set; } - public int Id { get; set; } public List CosmeticProcedures { get; set; } = new(); - public List ProcedureEvaluations{ get; set; } = new(); - + public List OrderProcedures { get; set; } = new(); + public List ServiceProcedure { get; set; } = new(); } } diff --git a/BeautySalonView/BeautySalonContracts/ViewModels/ServiceCosmeticViewModel.cs b/BeautySalonView/BeautySalonContracts/ViewModels/ServiceCosmeticViewModel.cs index 595d3dd..e7c202a 100644 --- a/BeautySalonView/BeautySalonContracts/ViewModels/ServiceCosmeticViewModel.cs +++ b/BeautySalonView/BeautySalonContracts/ViewModels/ServiceCosmeticViewModel.cs @@ -2,14 +2,16 @@ { public class ServiceCosmeticViewModel { - public CosmeticViewModel Cosmetic { get; set; } = null!; + public int CosmeticId { get; set; } + public ServiceViewModel Service { get; set; } = null!; public int Count { get; set; } public ServiceCosmeticViewModel() { } - public ServiceCosmeticViewModel(CosmeticViewModel cosmetic, int count) + public ServiceCosmeticViewModel(int cosmeticId, ServiceViewModel service, int count) { - Cosmetic = cosmetic; + CosmeticId = cosmeticId; + Service = service; Count = count; } } diff --git a/BeautySalonView/BeautySalonContracts/ViewModels/ServiceProcedures.cs b/BeautySalonView/BeautySalonContracts/ViewModels/ServiceProceduresViewModel.cs similarity index 72% rename from BeautySalonView/BeautySalonContracts/ViewModels/ServiceProcedures.cs rename to BeautySalonView/BeautySalonContracts/ViewModels/ServiceProceduresViewModel.cs index 18dfea2..55c2cd8 100644 --- a/BeautySalonView/BeautySalonContracts/ViewModels/ServiceProcedures.cs +++ b/BeautySalonView/BeautySalonContracts/ViewModels/ServiceProceduresViewModel.cs @@ -8,13 +8,15 @@ namespace BeautySalonContracts.ViewModels { public class ServiceProcedureViewModel { + public int ServiceId { get; set; } public ProcedureViewModel Procedure { get; set; } = null!; public int Count { get; set; } public ServiceProcedureViewModel() { } - public ServiceProcedureViewModel(ProcedureViewModel procedure, int count) + public ServiceProcedureViewModel(int serviceId, ProcedureViewModel procedure, int count) { + ServiceId = serviceId; Procedure = procedure; Count = count; } diff --git a/BeautySalonView/BeautySalonContracts/ViewModels/ServiceViewModel.cs b/BeautySalonView/BeautySalonContracts/ViewModels/ServiceViewModel.cs index 4a9f5e8..f142423 100644 --- a/BeautySalonView/BeautySalonContracts/ViewModels/ServiceViewModel.cs +++ b/BeautySalonView/BeautySalonContracts/ViewModels/ServiceViewModel.cs @@ -23,7 +23,9 @@ namespace BeautySalonContracts.ViewModels [DisplayName("Сотрудник")] public string StaffMemberName { get; set; } = string.Empty; - public List ServiceCosmetics { get; set; } = new(); - + public List ServiceCosmetic { get; set; } = new(); + public List ServiceProcedure { get; set; } = new(); + public List OrderService { get; set; } = new(); + } } diff --git a/BeautySalonView/BeautySalonContracts/ViewModels/StaffMemberViewModel.cs b/BeautySalonView/BeautySalonContracts/ViewModels/StaffMemberViewModel.cs index 1eedbd5..c473b38 100644 --- a/BeautySalonView/BeautySalonContracts/ViewModels/StaffMemberViewModel.cs +++ b/BeautySalonView/BeautySalonContracts/ViewModels/StaffMemberViewModel.cs @@ -12,11 +12,8 @@ namespace BeautySalonContracts.ViewModels { public int Id { get; set; } - [DisplayName("Имя сотрудника")] - public string StaffMemberName { get; set; } = string.Empty; - - [DisplayName("Фамилия сотрудника")] - public string StaffMemberSurname { get; set; } = string.Empty; + [DisplayName("ФИО сотрудника")] + public string StaffMemberFIO { get; set; } = string.Empty; [DisplayName("Специальность сотрудника")] public string StaffMemberSpecialty{ get; set; } = string.Empty; diff --git a/BeautySalonView/BeautySalonDataModels/Models/IClientModel.cs b/BeautySalonView/BeautySalonDataModels/Models/IClientModel.cs index 1c1d0a6..4234959 100644 --- a/BeautySalonView/BeautySalonDataModels/Models/IClientModel.cs +++ b/BeautySalonView/BeautySalonDataModels/Models/IClientModel.cs @@ -6,6 +6,6 @@ string ClientFIO { get; } string ClientEmail { get; } string ClientPassword { get; } - + string ClientPhone { get; } } } \ No newline at end of file diff --git a/BeautySalonView/BeautySalonDataModels/Models/IEvaluationModel.cs b/BeautySalonView/BeautySalonDataModels/Models/IEvaluationModel.cs index 510159d..e260e1d 100644 --- a/BeautySalonView/BeautySalonDataModels/Models/IEvaluationModel.cs +++ b/BeautySalonView/BeautySalonDataModels/Models/IEvaluationModel.cs @@ -3,8 +3,8 @@ public interface IEvaluationModel : IId { double PointsProcedure { get; } + int ClientId { get; } double PointsCosmetics { get; } int ProcedureId { get; } - int ClientId { get; } } } diff --git a/BeautySalonView/BeautySalonDataModels/Models/IProcedureModel.cs b/BeautySalonView/BeautySalonDataModels/Models/IProcedureModel.cs index c0b0df3..d63b7ed 100644 --- a/BeautySalonView/BeautySalonDataModels/Models/IProcedureModel.cs +++ b/BeautySalonView/BeautySalonDataModels/Models/IProcedureModel.cs @@ -6,6 +6,7 @@ namespace BeautySalonDataModels.Models { string ProcedureName { get; } double ProcedurePrice { get; } + double ProcedureDuration { get; } int ClientId { get; } } diff --git a/BeautySalonView/BeautySalonDataModels/Models/IStaffMemberModel.cs b/BeautySalonView/BeautySalonDataModels/Models/IStaffMemberModel.cs index 06203c7..357a2f8 100644 --- a/BeautySalonView/BeautySalonDataModels/Models/IStaffMemberModel.cs +++ b/BeautySalonView/BeautySalonDataModels/Models/IStaffMemberModel.cs @@ -8,8 +8,7 @@ namespace BeautySalonDataModels.Models { public interface IStaffMemberModel : IId { - string StaffMemberName { get; } - string StaffMemberSurname { get; } + string StaffMemberFIO { get; } string StaffMemberSpecialty { get; } string StaffMemberLogin { get; } string StaffMemberEmail { get; } diff --git a/BeautySalonView/BeautySalonDatabaseImplement/BeautySalonDatabase.cs b/BeautySalonView/BeautySalonDatabaseImplement/BeautySalonDatabase.cs index 6b3c3ca..21478fa 100644 --- a/BeautySalonView/BeautySalonDatabaseImplement/BeautySalonDatabase.cs +++ b/BeautySalonView/BeautySalonDatabaseImplement/BeautySalonDatabase.cs @@ -18,7 +18,7 @@ namespace BeautySalonDatabaseImplement { if (optionsBuilder.IsConfigured == false) { - optionsBuilder.UseSqlServer(@"Data Source=ALYONA;Initial Catalog=BeautySalonDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); + optionsBuilder.UseSqlServer(@"Data Source=PRETTYNAME;Initial Catalog=BeautySalonDatabase;Integrated Security=True;MultipleActiveResultSets=True;;TrustServerCertificate=True"); } base.OnConfiguring(optionsBuilder); } diff --git a/BeautySalonView/BeautySalonDatabaseImplement/Migrations/20240501083122_InitMigration.Designer.cs b/BeautySalonView/BeautySalonDatabaseImplement/Migrations/20240501083122_InitMigration.Designer.cs deleted file mode 100644 index 3326438..0000000 --- a/BeautySalonView/BeautySalonDatabaseImplement/Migrations/20240501083122_InitMigration.Designer.cs +++ /dev/null @@ -1,615 +0,0 @@ -// -using System; -using BeautySalonDatabaseImplement; -using Microsoft.EntityFrameworkCore; -using Microsoft.EntityFrameworkCore.Infrastructure; -using Microsoft.EntityFrameworkCore.Metadata; -using Microsoft.EntityFrameworkCore.Migrations; -using Microsoft.EntityFrameworkCore.Storage.ValueConversion; - -#nullable disable - -namespace BeautySalonDatabaseImplement.Migrations -{ - [DbContext(typeof(BeautySalonDatabase))] - [Migration("20240501083122_InitMigration")] - partial class InitMigration - { - /// - protected override void BuildTargetModel(ModelBuilder modelBuilder) - { -#pragma warning disable 612, 618 - modelBuilder - .HasAnnotation("ProductVersion", "7.0.17") - .HasAnnotation("Relational:MaxIdentifierLength", 128); - - SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Client", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClientEmail") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("ClientFIO") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("ClientLogin") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("ClientPassword") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.HasKey("Id"); - - b.ToTable("Clients"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Cosmetic", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("Brand") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("CosmeticName") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("CosmeticPrice") - .HasColumnType("float"); - - b.Property("LaborCostId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("LaborCostId"); - - b.ToTable("Cosmetics"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.CosmeticProcedure", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("CosmeticId") - .HasColumnType("int"); - - b.Property("ProcedureCosmeticCount") - .HasColumnType("int"); - - b.Property("ProcedureId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("CosmeticId"); - - b.HasIndex("ProcedureId"); - - b.ToTable("CosmeticProcedures"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Evaluation", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClientId") - .HasColumnType("int"); - - b.Property("PointsCosmetics") - .HasColumnType("float"); - - b.Property("PointsProcedure") - .HasColumnType("float"); - - b.Property("ProcedureId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("ClientId"); - - b.HasIndex("ProcedureId"); - - b.ToTable("Evaluations"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.LaborCosts", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("Difficulty") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("NumberHours") - .HasColumnType("int"); - - b.Property("StaffMemberId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("StaffMemberId"); - - b.ToTable("LaborCosts"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.OrderCosmetic", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("CosmeticId") - .HasColumnType("int"); - - b.Property("OrderId") - .HasColumnType("int"); - - b.Property("ProcedureId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("CosmeticId"); - - b.HasIndex("OrderId"); - - b.HasIndex("ProcedureId"); - - b.ToTable("OrderCosmetics"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.OrderProcedure", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("OrderId") - .HasColumnType("int"); - - b.Property("OrderProcedureCount") - .HasColumnType("int"); - - b.Property("ProcedureId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("OrderId"); - - b.HasIndex("ProcedureId"); - - b.ToTable("OrderProcedures"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.OrderService", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("OrderId") - .HasColumnType("int"); - - b.Property("OrderServiceCount") - .HasColumnType("int"); - - b.Property("ServiceId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("OrderId"); - - b.HasIndex("ServiceId"); - - b.ToTable("OrderServices"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Order_", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClientId") - .HasColumnType("int"); - - b.Property("OrderAmount") - .HasColumnType("float"); - - b.Property("OrderDate") - .HasColumnType("datetime2"); - - b.HasKey("Id"); - - b.HasIndex("ClientId"); - - b.ToTable("Orders"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Procedure", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ClientId") - .HasColumnType("int"); - - b.Property("ProcedureName") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("ProcedurePrice") - .HasColumnType("float"); - - b.HasKey("Id"); - - b.HasIndex("ClientId"); - - b.ToTable("Procedures"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Service", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("ServiceName") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("ServicePrice") - .HasColumnType("float"); - - b.Property("StaffMemberId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("StaffMemberId"); - - b.ToTable("Services"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.ServiceCosmetic", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("CosmeticId") - .HasColumnType("int"); - - b.Property("ServiceCosmeticCount") - .HasColumnType("int"); - - b.Property("ServiceId") - .HasColumnType("int"); - - b.HasKey("Id"); - - b.HasIndex("CosmeticId"); - - b.HasIndex("ServiceId"); - - b.ToTable("ServiceCosmetics"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.StaffMember", b => - { - b.Property("Id") - .ValueGeneratedOnAdd() - .HasColumnType("int"); - - SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id")); - - b.Property("StaffMemberEmail") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("StaffMemberLogin") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("StaffMemberName") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("StaffMemberPassword") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("StaffMemberPhone") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("StaffMemberSpecialty") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.Property("StaffMemberSurname") - .IsRequired() - .HasColumnType("nvarchar(max)"); - - b.HasKey("Id"); - - b.ToTable("StaffMembers"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Cosmetic", b => - { - b.HasOne("BeautySalonDatabaseImplement.Models.LaborCosts", "LaborCost") - .WithMany("Cosmetics") - .HasForeignKey("LaborCostId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("LaborCost"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.CosmeticProcedure", b => - { - b.HasOne("BeautySalonDatabaseImplement.Models.Cosmetic", "Cosmetic") - .WithMany("Procedures") - .HasForeignKey("CosmeticId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("BeautySalonDatabaseImplement.Models.Procedure", "Procedure") - .WithMany("Cosmetics") - .HasForeignKey("ProcedureId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Cosmetic"); - - b.Navigation("Procedure"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Evaluation", b => - { - b.HasOne("BeautySalonDatabaseImplement.Models.Client", "Client") - .WithMany("Evaluations") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("BeautySalonDatabaseImplement.Models.Procedure", "Procedure") - .WithMany("Evaluations") - .HasForeignKey("ProcedureId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Client"); - - b.Navigation("Procedure"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.LaborCosts", b => - { - b.HasOne("BeautySalonDatabaseImplement.Models.StaffMember", "StaffMember") - .WithMany("LaborsCosts") - .HasForeignKey("StaffMemberId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("StaffMember"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.OrderCosmetic", b => - { - b.HasOne("BeautySalonDatabaseImplement.Models.Cosmetic", "Cosmetic") - .WithMany() - .HasForeignKey("CosmeticId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("BeautySalonDatabaseImplement.Models.Order_", "Order") - .WithMany("Cosmetics") - .HasForeignKey("OrderId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("BeautySalonDatabaseImplement.Models.Procedure", null) - .WithMany("Orders") - .HasForeignKey("ProcedureId"); - - b.Navigation("Cosmetic"); - - b.Navigation("Order"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.OrderProcedure", b => - { - b.HasOne("BeautySalonDatabaseImplement.Models.Order_", "Order") - .WithMany("Procedures") - .HasForeignKey("OrderId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("BeautySalonDatabaseImplement.Models.Procedure", "Procedure") - .WithMany() - .HasForeignKey("ProcedureId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Order"); - - b.Navigation("Procedure"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.OrderService", b => - { - b.HasOne("BeautySalonDatabaseImplement.Models.Order_", "Order") - .WithMany("Services") - .HasForeignKey("OrderId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("BeautySalonDatabaseImplement.Models.Service", "Service") - .WithMany("Orders") - .HasForeignKey("ServiceId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Order"); - - b.Navigation("Service"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Order_", b => - { - b.HasOne("BeautySalonDatabaseImplement.Models.Client", "Client") - .WithMany("Orders") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Client"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Procedure", b => - { - b.HasOne("BeautySalonDatabaseImplement.Models.Client", "Client") - .WithMany("Procedures") - .HasForeignKey("ClientId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Client"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Service", b => - { - b.HasOne("BeautySalonDatabaseImplement.Models.StaffMember", "StaffMember") - .WithMany("Services") - .HasForeignKey("StaffMemberId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("StaffMember"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.ServiceCosmetic", b => - { - b.HasOne("BeautySalonDatabaseImplement.Models.Cosmetic", "Cosmetic") - .WithMany("Services") - .HasForeignKey("CosmeticId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.HasOne("BeautySalonDatabaseImplement.Models.Service", "Service") - .WithMany("Cosmetics") - .HasForeignKey("ServiceId") - .OnDelete(DeleteBehavior.Cascade) - .IsRequired(); - - b.Navigation("Cosmetic"); - - b.Navigation("Service"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Client", b => - { - b.Navigation("Evaluations"); - - b.Navigation("Orders"); - - b.Navigation("Procedures"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Cosmetic", b => - { - b.Navigation("Procedures"); - - b.Navigation("Services"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.LaborCosts", b => - { - b.Navigation("Cosmetics"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Order_", b => - { - b.Navigation("Cosmetics"); - - b.Navigation("Procedures"); - - b.Navigation("Services"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Procedure", b => - { - b.Navigation("Cosmetics"); - - b.Navigation("Evaluations"); - - b.Navigation("Orders"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.Service", b => - { - b.Navigation("Cosmetics"); - - b.Navigation("Orders"); - }); - - modelBuilder.Entity("BeautySalonDatabaseImplement.Models.StaffMember", b => - { - b.Navigation("LaborsCosts"); - - b.Navigation("Services"); - }); -#pragma warning restore 612, 618 - } - } -}