From 43903ceb958ae4cf6b27f2268be5e05e07535748 Mon Sep 17 00:00:00 2001
From: maksim <kashin20031984@mail.ru>
Date: Sat, 30 Nov 2024 16:06:37 +0400
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BB=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B8=D1=81=D0=BA.=20=D0=9C=D0=B1=20=D0=BF=D0=BE?=
 =?UTF-8?q?=20=D0=BA=D0=BE=D0=B4=D1=83,=20=D0=BD=D0=BE=20=D1=82=D0=B0?=
 =?UTF-8?q?=D0=BA=20=D1=82=D0=BE=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?=
 =?UTF-8?q?=D0=B5=D1=82.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeletePhysicalPersonWindow.xaml           | 10 ++-
 .../DeletePhysicalPersonWindow.xaml.cs        | 28 ++++++-
 .../EditPhysicalPersonWindow.xaml             | 79 ++++++++++---------
 .../EditPhysicalPersonWindow.xaml.cs          | 21 ++++-
 .../ViewPhysicalPersonsWindow.xaml            | 10 ++-
 .../ViewPhysicalPersonsWindow.xaml.cs         | 32 +++++++-
 6 files changed, 138 insertions(+), 42 deletions(-)

diff --git a/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml b/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml
index 4fb005c..3fbc099 100644
--- a/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml
+++ b/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml
@@ -15,9 +15,17 @@
                    Foreground="#FFFFFF"
                    Margin="0,20,0,0" />
 
+        <!-- Поиск -->
+        <TextBox x:Name="SearchTextBox"
+                 Width="560"
+                 VerticalAlignment="Top"
+                 Margin="0,60,0,0"
+                 HorizontalAlignment="Center"
+                 TextChanged="SearchTextBox_TextChanged" />
+
         <!-- Таблица для отображения -->
         <DataGrid x:Name="PhysicalPersonsDataGrid"
-                  Margin="20,60,20,80"
+                  Margin="20,100,20,80"
                   AutoGenerateColumns="True"
                   Background="#FFFFFF"
                   Foreground="#000000" />
diff --git a/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml.cs b/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml.cs
index 0d21282..f03620a 100644
--- a/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml.cs
+++ b/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml.cs
@@ -7,6 +7,7 @@ namespace EmployeeManagmentView.PhysicalPerson
     public partial class DeletePhysicalPersonWindow : Window
     {
         private readonly IPhisicalPersonLogic _phisicalPersonLogic;
+        private IEnumerable<PhisicalPersonViewModel> _allPersons; // Храним все записи для фильтрации
 
         public DeletePhysicalPersonWindow(IPhisicalPersonLogic phisicalPersonLogic)
         {
@@ -17,7 +18,8 @@ namespace EmployeeManagmentView.PhysicalPerson
 
         private void LoadPhysicalPersons()
         {
-            PhysicalPersonsDataGrid.ItemsSource = _phisicalPersonLogic.GetFullList();
+            _allPersons = _phisicalPersonLogic.GetFullList();
+            PhysicalPersonsDataGrid.ItemsSource = _allPersons;
         }
 
         private void DeleteButton_Click(object sender, RoutedEventArgs e)
@@ -36,5 +38,29 @@ namespace EmployeeManagmentView.PhysicalPerson
                 MessageBox.Show("Пожалуйста, выберите физическое лицо для удаления.");
             }
         }
+
+        private void SearchTextBox_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
+        {
+            string searchQuery = SearchTextBox.Text.ToLower(); // Получаем текст для поиска
+
+            if (string.IsNullOrWhiteSpace(searchQuery))
+            {
+                // Если поле пустое, показываем все записи
+                PhysicalPersonsDataGrid.ItemsSource = _allPersons;
+            }
+            else
+            {
+                // Фильтруем записи по всем полям
+                var filteredList = _allPersons.Where(p =>
+                    p.FullName.ToLower().Contains(searchQuery) ||  // Поиск по ФИО
+                    p.Address.ToLower().Contains(searchQuery) ||   // Поиск по адресу
+                    p.Telephone.Contains(searchQuery) ||           // Поиск по телефону
+                    p.Gender.ToLower().Contains(searchQuery) ||    // Поиск по полу
+                    p.Birthday.ToString("dd.MM.yyyy").Contains(searchQuery)  // Поиск по дате рождения
+                ).ToList();
+
+                PhysicalPersonsDataGrid.ItemsSource = filteredList;
+            }
+        }
     }
 }
diff --git a/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml b/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml
index 17c4d6a..0a85f33 100644
--- a/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml
+++ b/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml
@@ -8,7 +8,6 @@
         Background="#0D2D4F">
 
     <Grid>
-        
         <!-- Заголовок окна -->
         <TextBlock Text="Редактирование физического лица"
                    HorizontalAlignment="Center" VerticalAlignment="Top"
@@ -16,10 +15,7 @@
                    Foreground="#FFFFFF"
                    Margin="0,20,0,0" />
 
-        <!-- Остальная часть как в AddPhysicalPersonWindow.xaml -->
-        <!-- Сетка для ввода данных в два столбца -->
         <Grid Margin="0,60">
-
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
@@ -40,49 +36,49 @@
             <StackPanel Grid.Row="0" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10">
                 <Label Content="Имя" Foreground="White" HorizontalAlignment="Center"/>
                 <TextBox x:Name="NameTextBox"
-                 Width="250" Height="40"
-                 Style="{StaticResource RoundedTextBoxStyle}" 
-                 Margin="0,5"
-                 ToolTip="Введите имя" HorizontalAlignment="Center"/>
+                         Width="250" Height="40"
+                         Style="{StaticResource RoundedTextBoxStyle}" 
+                         Margin="0,5"
+                         ToolTip="Введите имя" HorizontalAlignment="Center"/>
             </StackPanel>
 
             <!-- Поле для фамилии -->
             <StackPanel Grid.Row="0" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10">
                 <Label Content="Фамилия" Foreground="White" HorizontalAlignment="Center"/>
                 <TextBox x:Name="SurnameTextBox"
-                 Width="250" Height="40"
-                 Style="{StaticResource RoundedTextBoxStyle}"
-                 Margin="0,5"
-                 ToolTip="Введите фамилию" HorizontalAlignment="Center"/>
+                         Width="250" Height="40"
+                         Style="{StaticResource RoundedTextBoxStyle}"
+                         Margin="0,5"
+                         ToolTip="Введите фамилию" HorizontalAlignment="Center"/>
             </StackPanel>
 
             <!-- Поле для отчества -->
             <StackPanel Grid.Row="1" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10">
                 <Label Content="Отчество" Foreground="White" HorizontalAlignment="Center"/>
                 <TextBox x:Name="PatronomicTextBox"
-                 Width="250" Height="40"
-                 Style="{StaticResource RoundedTextBoxStyle}"
-                 Margin="0,5"
-                 ToolTip="Введите отчество" HorizontalAlignment="Center"/>
+                         Width="250" Height="40"
+                         Style="{StaticResource RoundedTextBoxStyle}"
+                         Margin="0,5"
+                         ToolTip="Введите отчество" HorizontalAlignment="Center"/>
             </StackPanel>
 
             <!-- Поле для выбора даты рождения -->
             <StackPanel Grid.Row="1" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10">
                 <Label Content="Дата рождения" Foreground="White" HorizontalAlignment="Center"/>
                 <DatePicker x:Name="BirthdayPicker" 
-                    Width="250" Height="40"
-                    Margin="0,5"
-                    ToolTip="Выберите дату рождения" HorizontalAlignment="Center"/>
+                            Width="250" Height="40"
+                            Margin="0,5"
+                            ToolTip="Выберите дату рождения" HorizontalAlignment="Center"/>
             </StackPanel>
 
             <!-- Поле для выбора пола -->
             <StackPanel Grid.Row="2" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10">
                 <Label Content="Пол" Foreground="White" HorizontalAlignment="Center"/>
                 <ComboBox x:Name="GenderComboBox" 
-                  Width="250" Height="40"
-                  Margin="0,5"
-                  ToolTip="Выберите пол"
-                  Background="White" HorizontalAlignment="Center">
+                          Width="250" Height="40"
+                          Margin="0,5"
+                          ToolTip="Выберите пол"
+                          Background="White" HorizontalAlignment="Center">
                     <ComboBoxItem Content="Мужчина"/>
                     <ComboBoxItem Content="Женщина"/>
                 </ComboBox>
@@ -92,31 +88,43 @@
             <StackPanel Grid.Row="2" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10">
                 <Label Content="Адрес" Foreground="White" HorizontalAlignment="Center"/>
                 <TextBox x:Name="AddressTextBox"
-                 Width="250" Height="40"
-                 Style="{StaticResource RoundedTextBoxStyle}"
-                 Margin="0,5"
-                 ToolTip="Введите адрес" HorizontalAlignment="Center"/>
+                         Width="250" Height="40"
+                         Style="{StaticResource RoundedTextBoxStyle}"
+                         Margin="0,5"
+                         ToolTip="Введите адрес" HorizontalAlignment="Center"/>
             </StackPanel>
 
             <!-- Поле для телефона -->
             <StackPanel Grid.Row="3" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10">
                 <Label Content="Телефон" Foreground="White" HorizontalAlignment="Center"/>
                 <TextBox x:Name="TelephoneTextBox"
-                 Width="250" Height="40"
-                 Style="{StaticResource RoundedTextBoxStyle}"
-                 Margin="0,5"
-                 ToolTip="Введите номер телефона" HorizontalAlignment="Center"/>
+                         Width="250" Height="40"
+                         Style="{StaticResource RoundedTextBoxStyle}"
+                         Margin="0,5"
+                         ToolTip="Введите номер телефона" HorizontalAlignment="Center"/>
             </StackPanel>
+
+            <!-- Поле для поиска физических лиц -->
             <StackPanel Grid.Row="3" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10">
+                <Label Content="Поиск физического лица" Foreground="White" HorizontalAlignment="Center"/>
+                <TextBox x:Name="SearchTextBox"
+                         Width="250" Height="40"
+                         Margin="0,5"
+                         ToolTip="Введите для поиска"
+                         HorizontalAlignment="Center" 
+                         TextChanged="SearchTextBox_TextChanged"/>
+            </StackPanel>
+
+            <!-- Поле для выбора физического лица -->
+            <StackPanel Grid.Row="4" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10">
                 <Label Content="Выберите физическое лицо" Foreground="White" HorizontalAlignment="Center"/>
                 <ComboBox x:Name="PhysicalPersonComboBox"
-              Width="400" Height="40"
-              SelectionChanged="PhysicalPersonComboBox_SelectionChanged"
-              ToolTip="Выберите физическое лицо" HorizontalAlignment="Center"/>
+                          Width="400" Height="40"
+                          SelectionChanged="PhysicalPersonComboBox_SelectionChanged"
+                          ToolTip="Выберите физическое лицо" HorizontalAlignment="Center"/>
             </StackPanel>
         </Grid>
 
-
         <!-- Кнопка для сохранения изменений -->
         <Button Content="Сохранить изменения" 
                 Width="250" Height="40"
@@ -125,6 +133,5 @@
                 Background="#004890" Foreground="#FFFFFF"
                 Click="SaveButton_Click"
                 HorizontalAlignment="Center" Margin="0,10,0,10"/>
-
     </Grid>
 </Window>
diff --git a/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml.cs b/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml.cs
index ea18150..99f5cd9 100644
--- a/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml.cs
+++ b/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml.cs
@@ -23,8 +23,8 @@ namespace EmployeeManagmentView.PhysicalPerson
         {
             _physicalPersons = _phisicalPersonLogic.GetFullList();
             PhysicalPersonComboBox.ItemsSource = _physicalPersons;
-            PhysicalPersonComboBox.DisplayMemberPath = "FullNameWithBirthday"; 
-            PhysicalPersonComboBox.SelectedValuePath = "Id";       
+            PhysicalPersonComboBox.DisplayMemberPath = "FullNameWithBirthday";
+            PhysicalPersonComboBox.SelectedValuePath = "Id";
         }
 
         // Событие при выборе физ.лица
@@ -52,6 +52,23 @@ namespace EmployeeManagmentView.PhysicalPerson
             }
         }
 
+        // Фильтрация списка физических лиц по всем полям
+        private void SearchTextBox_TextChanged(object sender, TextChangedEventArgs e)
+        {
+            var searchText = SearchTextBox.Text.ToLower();
+            var filteredPersons = _physicalPersons
+                .Where(p => p.Name.ToLower().Contains(searchText) ||
+                            p.Surname.ToLower().Contains(searchText) ||
+                            p.Patronymic.ToLower().Contains(searchText) ||
+                            p.Gender.ToLower().Contains(searchText) ||
+                            p.Address.ToLower().Contains(searchText) ||
+                            p.Telephone.ToLower().Contains(searchText) ||
+                            p.Birthday.ToString("dd.MM.yyyy").Contains(searchText)  // Поиск по дате рождения
+                ).ToList();
+
+            PhysicalPersonComboBox.ItemsSource = filteredPersons;
+        }
+
         private void SaveButton_Click(object sender, RoutedEventArgs e)
         {
             if (PhysicalPersonComboBox.SelectedValue is int selectedPersonId)
diff --git a/EmployeeManagmentView/PhysicalPerson/ViewPhysicalPersonsWindow.xaml b/EmployeeManagmentView/PhysicalPerson/ViewPhysicalPersonsWindow.xaml
index 6dcf5d0..1010a2d 100644
--- a/EmployeeManagmentView/PhysicalPerson/ViewPhysicalPersonsWindow.xaml
+++ b/EmployeeManagmentView/PhysicalPerson/ViewPhysicalPersonsWindow.xaml
@@ -15,9 +15,17 @@
                    Foreground="#FFFFFF"
                    Margin="0,20,0,0" />
 
+        <!-- Поиск -->
+        <TextBox x:Name="SearchTextBox"
+                 Width="560"
+                 VerticalAlignment="Top"
+                 Margin="0,60,0,0"
+                 HorizontalAlignment="Center"
+                 TextChanged="SearchTextBox_TextChanged" Height="20" />
+
         <!-- Таблица для отображения -->
         <DataGrid x:Name="PhysicalPersonsDataGrid"
-                  Margin="20,60,20,20"
+                  Margin="20,100,20,20"
                   AutoGenerateColumns="True"
                   Background="#FFFFFF"
                   Foreground="#000000" />
diff --git a/EmployeeManagmentView/PhysicalPerson/ViewPhysicalPersonsWindow.xaml.cs b/EmployeeManagmentView/PhysicalPerson/ViewPhysicalPersonsWindow.xaml.cs
index b5266a1..4866f83 100644
--- a/EmployeeManagmentView/PhysicalPerson/ViewPhysicalPersonsWindow.xaml.cs
+++ b/EmployeeManagmentView/PhysicalPerson/ViewPhysicalPersonsWindow.xaml.cs
@@ -1,4 +1,6 @@
 using EmployeeManagmentContracts.BusinessLogicContracts;
+using EmployeeManagmentContracts.ViewModels;
+using System.Linq;
 using System.Windows;
 
 namespace EmployeeManagmentView.PhysicalPerson
@@ -6,6 +8,7 @@ namespace EmployeeManagmentView.PhysicalPerson
     public partial class ViewPhysicalPersonsWindow : Window
     {
         private readonly IPhisicalPersonLogic _phisicalPersonLogic;
+        private IEnumerable<PhisicalPersonViewModel> _allPersons; // Храним все записи для фильтрации
 
         public ViewPhysicalPersonsWindow(IPhisicalPersonLogic phisicalPersonLogic)
         {
@@ -16,7 +19,34 @@ namespace EmployeeManagmentView.PhysicalPerson
 
         private void LoadPhysicalPersons()
         {
-            PhysicalPersonsDataGrid.ItemsSource = _phisicalPersonLogic.GetFullList();
+            _allPersons = _phisicalPersonLogic.GetFullList();
+            PhysicalPersonsDataGrid.ItemsSource = _allPersons;
+        }
+
+        private void SearchTextBox_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
+        {
+            string searchQuery = SearchTextBox.Text.ToLower(); // Получаем текст для поиска
+
+            if (string.IsNullOrWhiteSpace(searchQuery))
+            {
+                // Если поле пустое, показываем все записи
+                PhysicalPersonsDataGrid.ItemsSource = _allPersons;
+            }
+            else
+            {
+                // Фильтруем записи по всем полям
+                var filteredList = _allPersons.Where(p =>
+                    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) ||    // Поиск по полу
+                    p.Birthday.ToString("dd.MM.yyyy").Contains(searchQuery)  // Поиск по дате рождения
+                ).ToList();
+
+                PhysicalPersonsDataGrid.ItemsSource = filteredList;
+            }
         }
     }
 }