From a2631c83cba746161e9c99ed12423d0907a2a361 Mon Sep 17 00:00:00 2001
From: maksim <kashin20031984@mail.ru>
Date: Sat, 30 Nov 2024 18:09:32 +0400
Subject: [PATCH] =?UTF-8?q?=D0=9D=D1=83=20=D0=B2=D1=80=D0=BE=D0=B4=D0=B5?=
 =?UTF-8?q?=20=D0=B1=D1=8B=20=D0=B1=D0=BB=D0=BE=D0=BA=20=D1=84=D0=B8=D0=B7?=
 =?UTF-8?q?.=D0=BB=D0=B8=D1=86=D0=B0=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0?=
 =?UTF-8?q?=D0=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AddPhysicalPersonWindow.xaml.cs            |  1 -
 .../DeletePhysicalPersonWindow.xaml            | 18 +++++++++++++-----
 .../DeletePhysicalPersonWindow.xaml.cs         | 10 +++++++++-
 .../EditPhysicalPersonWindow.xaml.cs           | 14 +++++++++++++-
 .../ViewPhysicalPersonsWindow.xaml             | 16 +++++++++++++---
 5 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/EmployeeManagmentView/PhysicalPerson/AddPhysicalPersonWindow.xaml.cs b/EmployeeManagmentView/PhysicalPerson/AddPhysicalPersonWindow.xaml.cs
index 437d2b7..f0d7f6b 100644
--- a/EmployeeManagmentView/PhysicalPerson/AddPhysicalPersonWindow.xaml.cs
+++ b/EmployeeManagmentView/PhysicalPerson/AddPhysicalPersonWindow.xaml.cs
@@ -33,7 +33,6 @@ namespace EmployeeManagmentView.PhysicalPerson
                 _phisicalPersonLogic.Insert(model);
 
                 MessageBox.Show("Данные успешно сохранены!");
-                this.Close();
             }
             catch (Exception ex)
             {
diff --git a/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml b/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml
index 1866a25..ff8fea5 100644
--- a/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml
+++ b/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Удаление физического лица"
-        Height="400" Width="600"
+        Height="500" Width="800"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
         Background="#0D2D4F">
@@ -27,10 +27,18 @@
         <!-- Таблица для отображения -->
         <DataGrid x:Name="PhysicalPersonsDataGrid"
                   Margin="20,100,20,80"
-                  AutoGenerateColumns="True"
-                  Background="#FFFFFF"
-                  Foreground="#000000" 
-                  Style="{StaticResource RoundedDataGridStyle}" />
+                  AutoGenerateColumns="False"
+                  Style="{StaticResource RoundedDataGridStyle}">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Фамилия" Binding="{Binding Surname}" Width="*" />
+                <DataGridTextColumn Header="Имя" Binding="{Binding Name}" Width="*" />
+                <DataGridTextColumn Header="Отчество" Binding="{Binding Patronymic}" Width="*" />
+                <DataGridTextColumn Header="Дата рождения" Binding="{Binding Birthday, StringFormat=dd.MM.yyyy}" Width="*" />
+                <DataGridTextColumn Header="Пол" Binding="{Binding Gender}" Width="*" />
+                <DataGridTextColumn Header="Адрес" Binding="{Binding Address}" Width="*" />
+                <DataGridTextColumn Header="Телефон" Binding="{Binding Telephone}" Width="*" />
+            </DataGrid.Columns>
+        </DataGrid>
 
         <!-- Кнопка для удаления -->
         <Button Content="Удалить"
diff --git a/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml.cs b/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml.cs
index f03620a..9b62b75 100644
--- a/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml.cs
+++ b/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml.cs
@@ -31,8 +31,14 @@ namespace EmployeeManagmentView.PhysicalPerson
                 {
                     _phisicalPersonLogic.Delete(selectedPerson.Id);  // Используем Id для удаления
                     LoadPhysicalPersons();  // Перезагружаем список
+                    MessageBox.Show("Данные успешно удалены!");
+
+                    // Очистка поля поиска после удаления
+                    SearchTextBox.Text = string.Empty;
                 }
             }
+
+
             else
             {
                 MessageBox.Show("Пожалуйста, выберите физическое лицо для удаления.");
@@ -52,7 +58,9 @@ namespace EmployeeManagmentView.PhysicalPerson
             {
                 // Фильтруем записи по всем полям
                 var filteredList = _allPersons.Where(p =>
-                    p.FullName.ToLower().Contains(searchQuery) ||  // Поиск по ФИО
+                    p.Name.ToLower().Contains(searchQuery) ||
+                    p.Surname.ToLower().Contains(searchQuery) ||
+                    p.Patronymic.ToLower().Contains(searchQuery) ||
                     p.Address.ToLower().Contains(searchQuery) ||   // Поиск по адресу
                     p.Telephone.Contains(searchQuery) ||           // Поиск по телефону
                     p.Gender.ToLower().Contains(searchQuery) ||    // Поиск по полу
diff --git a/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml.cs b/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml.cs
index 99f5cd9..95b95e2 100644
--- a/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml.cs
+++ b/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml.cs
@@ -46,12 +46,23 @@ namespace EmployeeManagmentView.PhysicalPerson
                 SurnameTextBox.Text = person.Surname;
                 PatronomicTextBox.Text = person.Patronymic;
                 BirthdayPicker.SelectedDate = person.Birthday;
-                GenderComboBox.Text = person.Gender;
+
+                // Устанавливаем выбранное значение для GenderComboBox
+                foreach (ComboBoxItem item in GenderComboBox.Items)
+                {
+                    if (item.Content.ToString() == person.Gender)
+                    {
+                        GenderComboBox.SelectedItem = item;
+                        break;
+                    }
+                }
+
                 AddressTextBox.Text = person.Address;
                 TelephoneTextBox.Text = person.Telephone;
             }
         }
 
+
         // Фильтрация списка физических лиц по всем полям
         private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
         {
@@ -89,6 +100,7 @@ namespace EmployeeManagmentView.PhysicalPerson
 
                     _phisicalPersonLogic.Update(updatedPerson);
                     MessageBox.Show("Данные успешно обновлены!");
+                    this.Close();
                 }
                 catch (Exception ex)
                 {
diff --git a/EmployeeManagmentView/PhysicalPerson/ViewPhysicalPersonsWindow.xaml b/EmployeeManagmentView/PhysicalPerson/ViewPhysicalPersonsWindow.xaml
index 325fe07..d92eef3 100644
--- a/EmployeeManagmentView/PhysicalPerson/ViewPhysicalPersonsWindow.xaml
+++ b/EmployeeManagmentView/PhysicalPerson/ViewPhysicalPersonsWindow.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Список физических лиц"
-        Height="500" Width="600"
+        Height="500" Width="800"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
         Background="#0D2D4F">
@@ -28,7 +28,17 @@
         <!-- Таблица для отображения -->
         <DataGrid x:Name="PhysicalPersonsDataGrid"
                   Margin="20,100,20,20"
-                  AutoGenerateColumns="True"
-                  Style="{StaticResource RoundedDataGridStyle}" />
+                  AutoGenerateColumns="False"
+                  Style="{StaticResource RoundedDataGridStyle}">
+            <DataGrid.Columns>
+                <DataGridTextColumn Header="Фамилия" Binding="{Binding Surname}" Width="*" />
+                <DataGridTextColumn Header="Имя" Binding="{Binding Name}" Width="*" />
+                <DataGridTextColumn Header="Отчество" Binding="{Binding Patronymic}" Width="*" />
+                <DataGridTextColumn Header="Дата рождения" Binding="{Binding Birthday, StringFormat=dd.MM.yyyy}" Width="*" />
+                <DataGridTextColumn Header="Пол" Binding="{Binding Gender}" Width="*" />
+                <DataGridTextColumn Header="Адрес" Binding="{Binding Address}" Width="*" />
+                <DataGridTextColumn Header="Телефон" Binding="{Binding Telephone}" Width="*" />
+            </DataGrid.Columns>
+        </DataGrid>
     </Grid>
 </Window>