diff --git a/EmployeeManagmentDataBaseImplement/Implements/EmployeeStorage.cs b/EmployeeManagmentDataBaseImplement/Implements/EmployeeStorage.cs index dfcbeb2..ef13084 100644 --- a/EmployeeManagmentDataBaseImplement/Implements/EmployeeStorage.cs +++ b/EmployeeManagmentDataBaseImplement/Implements/EmployeeStorage.cs @@ -70,10 +70,13 @@ namespace EmployeeManagmentDataBaseImplement.Implements PartTimeJob = entity.PartTimeJob, Bid = entity.Bid, PhysicalPersonsId = entity.PhisicalPersonsId, - PhysicalPersonName = $"{entity.PhisicalPerson.Surname} {entity.PhisicalPerson.Name}" + PhysicalPersonName = entity.PhisicalPerson != null + ? $"{entity.PhisicalPerson.Surname} {entity.PhisicalPerson.Name}" + : "Не указано" // Обработка отсутствующего физического лица }; } + // Добавить нового сотрудника public void Insert(EmployeeViewModel model) { diff --git a/EmployeeManagmentView/Employee/DeleteEmployeeWindow.xaml b/EmployeeManagmentView/Employee/DeleteEmployeeWindow.xaml index 6f2688d..a700642 100644 --- a/EmployeeManagmentView/Employee/DeleteEmployeeWindow.xaml +++ b/EmployeeManagmentView/Employee/DeleteEmployeeWindow.xaml @@ -1,12 +1,52 @@  + Title="Удаление сотрудников" + Height="500" Width="800" + ResizeMode="NoResize" + WindowStartupLocation="CenterScreen" + Background="#0D2D4F"> + - + + + + + + + + + + + + + + + + + + + +