chtzsch/PIbd-21_Ievlewa_Zhirnova_Course_Work_Beauty_Salon1
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

множество исправлений

Browse Source
This commit is contained in:
Allllen4a 2024-05-01 15:37:43 +04:00
parent 7c7967bc94
commit 75d5cacd33
11 changed files with 29 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BeautySalonView/BeautySalonBusinessLogic/BusinessLogic/ClientLogic.cs
View File

@ -122,10 +122,14 @@ namespace BeautySalonBusinessLogic.BusinessLogics
{
throw new ArgumentNullException("Нет ФИО клиента", nameof(model.ClientFIO));
}
if (string.IsNullOrEmpty(model.ClientPhone))
{
throw new ArgumentNullException("Нет телефона клиента", nameof(model.ClientEmail));
}
if (string.IsNullOrEmpty(model.ClientEmail))
{
throw new ArgumentNullException("Нет почты клиента", nameof(model.ClientEmail));
}
}
if (string.IsNullOrEmpty(model.ClientPassword))
{
throw new ArgumentNullException("Нет пароля", nameof(model.ClientPassword));

6
BeautySalonView/BeautySalonContracts/BindingModels/OrderBindingModel.cs
View File

@ -11,8 +11,8 @@ namespace BeautySalonContracts.BindingModels
public DateTime OrderDate { get; set; }
public double OrderAmount { get; set; }
public int ClientId { get; set; }
public List<OrderServiceViewModel> OrderService { get; set; } = new();
public List<OrderCosmeticViewModel> OrderCosmetic { get; set; } = new();
public List<OrderProcedureViewModel> OrderProcedure { get; set; } = new();
public List<OrderServiceViewModel> OrderServices { get; set; } = new();
public List<OrderCosmeticViewModel> OrderCosmetics { get; set; } = new();
public List<OrderProcedureViewModel> OrderProcedures { get; set; } = new();
}
}

1
BeautySalonView/BeautySalonContracts/StoragesContracts/IProcedureStorage.cs
View File

@ -17,6 +17,7 @@ namespace BeautySalonContracts.StoragesContracts
ProcedureViewModel? Insert(ProcedureBindingModel model);
ProcedureViewModel? Update(ProcedureBindingModel model);
ProcedureViewModel? Delete(ProcedureBindingModel model);
List<CosmeticViewModel> GetProcedureCosmetics(ProcedureSearchModel model);
}
}

7
BeautySalonView/BeautySalonDatabaseImplement/Implements/LaborCostsStorage.cs
View File

@ -49,13 +49,6 @@ namespace BeautySalonDatabaseImplement.Implements
.Select(x => x.GetViewModel)
.ToList();
}
if (model.Id.HasValue)
{
return context.LaborCosts
.Where(x => x.Id == model.Id)
.Select(x => x.GetViewModel)
.ToList();
}
return new();
}

2
BeautySalonView/BeautySalonDatabaseImplement/Implements/ProcedureStorage.cs
View File

@ -55,7 +55,7 @@ namespace BeautySalonDatabaseImplement.Implements
.Select(x => x.GetViewModel)
.ToList();
}
if (model.ClientId.HasValue && model.PageNumber.HasValue && model.PageSize.HasValue)
if (model.ClientId.HasValue)
{
return context.Procedures
.Where(x => x.ClientId == model.ClientId)

3
BeautySalonView/BeautySalonDatabaseImplement/Models/Client.cs
View File

@ -18,6 +18,9 @@ namespace BeautySalonDatabaseImplement.Models
[Required]
public string ClientEmail { get; set; } = string.Empty;
[Required]
public string ClientPhone { get; set; } = string.Empty;
[Required]
public string ClientPassword { get; set; } = string.Empty;

3
BeautySalonView/BeautySalonDatabaseImplement/Models/Cosmetic.cs
View File

@ -26,6 +26,9 @@ namespace BeautySalonDatabaseImplement.Models
public int LaborCostId { get; set; }
public virtual LaborCosts LaborCost { get; set; }
[ForeignKey("CosmeticId")]
public virtual List<OrderCosmetic> Orders { get; set; } = new();
[ForeignKey("CosmeticId")]
public virtual List<CosmeticProcedure> Procedures { get; set; } = new();

6
BeautySalonView/BeautySalonDatabaseImplement/Models/LaborCosts.cs
View File

@ -22,7 +22,7 @@ namespace BeautySalonDatabaseImplement.Models
public virtual StaffMember StaffMember { get; set; }
// Связь трудозатрат и услуг один-ко-многим сущностью Cosmetic
// Связь трудозатрат и косметики один-ко-многим сущностью Cosmetic
public virtual List<Cosmetic> Cosmetics { get; set; } = new();
public static LaborCosts? Create(LaborCostsBindingModel? model)
@ -47,12 +47,14 @@ namespace BeautySalonDatabaseImplement.Models
return;
}
NumberHours = model.NumberHours;
Difficulty = model.Difficulty;
}
public LaborCostsViewModel GetViewModel => new()
{
Id = Id,
NumberHours = NumberHours
NumberHours = NumberHours,
Difficulty = Difficulty
};
}

6
BeautySalonView/BeautySalonDatabaseImplement/Models/Order_.cs
View File

@ -113,9 +113,9 @@ namespace BeautySalonDatabaseImplement.Models
Id = Id,
OrderDate = OrderDate,
OrderAmount = OrderAmount,
OrderServices = OrderServices,
OrderProcedures = OrderProcedures,
OrderCosmetics = OrderCosmetics,
OrderService = OrderServices,
OrderProcedure = OrderProcedures,
OrderCosmetic = OrderCosmetics,
ClientId = ClientId
};

3
BeautySalonView/BeautySalonDatabaseImplement/Models/Procedure.cs
View File

@ -21,6 +21,9 @@ namespace BeautySalonDatabaseImplement.Models
[Required]
public double ProcedurePrice { get; set; }
[Required]
public double ProcedureDuration { get; set; }
public int ClientId { get; set; }
public virtual Client Client { get; set; } = null!;

6
BeautySalonView/BeautySalonDatabaseImplement/Models/Service.cs
View File

@ -59,7 +59,7 @@ namespace BeautySalonDatabaseImplement.Models
Id = model.Id,
ServiceName = model.ServiceName,
ServicePrice = model.ServicePrice,
Cosmetics = model.ServiceCosmetics.Select(x => new ServiceCosmetic()
Cosmetics = model.ServiceCosmetic.Select(x => new ServiceCosmetic()
{
Cosmetic = context.Cosmetics.First(y => y.Id == x.Cosmetic.Id),
ServiceCosmeticCount = x.Count
@ -80,7 +80,7 @@ namespace BeautySalonDatabaseImplement.Models
Id = Id,
ServiceName = ServiceName,
ServicePrice = ServicePrice,
ServiceCosmetics = ServiceCosmetics,
ServiceCosmetic = ServiceCosmetics,
StaffMemberId = StaffMemberId,
};
@ -92,7 +92,7 @@ namespace BeautySalonDatabaseImplement.Models
context.ServiceCosmetics
.RemoveRange(serviceSosmetics);
var service = context.Services.First(x => x.Id == Id);
foreach (var record in model.ServiceCosmetics)
foreach (var record in model.ServiceCosmetic)
{
context.ServiceCosmetics.Add(new ServiceCosmetic
{