From a3dda6e6797cbfbcf2569852eb09fb578173c236 Mon Sep 17 00:00:00 2001
From: maksim <kashin20031984@mail.ru>
Date: Sat, 30 Nov 2024 17:27:32 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A2=D1=83=D0=B4=D0=B0=20=D1=81=D1=8E=D0=B4?=
 =?UTF-8?q?=D0=B0=20=D0=BF=D0=B0=D1=80=D1=83=20=D0=BF=D0=B8=D0=BA=D1=81?=
 =?UTF-8?q?=D0=B5=D0=BB=D0=B5=D0=B9,=20=D1=87=D0=B8=D1=81=D1=82=D0=BE=20?=
 =?UTF-8?q?=D0=B4=D0=B5=D0=B7=D0=B8=D0=B3=D0=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DeletePhysicalPersonWindow.xaml           |   2 +
 .../EditPhysicalPersonWindow.xaml             | 210 +++++++++---------
 .../ViewPhysicalPersonsWindow.xaml            |   5 +-
 3 files changed, 104 insertions(+), 113 deletions(-)

diff --git a/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml b/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml
index b6040f6..1866a25 100644
--- a/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml
+++ b/EmployeeManagmentView/PhysicalPerson/DeletePhysicalPersonWindow.xaml
@@ -21,6 +21,7 @@
                  VerticalAlignment="Top"
                  Margin="0,60,0,0"
                  HorizontalAlignment="Center"
+                 Style="{StaticResource RoundedTextBoxStyle}"
                  TextChanged="SearchTextBox_TextChanged" />
 
         <!-- Таблица для отображения -->
@@ -38,6 +39,7 @@
                 Margin="0,0,0,20"
                 Background="#004890"
                 Foreground="#FFFFFF"
+                Style="{StaticResource RoundedButtonStyle}"
                 Click="DeleteButton_Click"/>
     </Grid>
 </Window>
diff --git a/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml b/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml
index 0a85f33..2951a12 100644
--- a/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml
+++ b/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml
@@ -2,12 +2,12 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         Title="Редактирование физического лица"
-        Height="600" Width="600"
+        Height="704" Width="600"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
         Background="#0D2D4F">
 
-    <Grid>
+    <Grid Margin="0,0,0,-6">
         <!-- Заголовок окна -->
         <TextBlock Text="Редактирование физического лица"
                    HorizontalAlignment="Center" VerticalAlignment="Top"
@@ -15,123 +15,111 @@
                    Foreground="#FFFFFF"
                    Margin="0,20,0,0" />
 
-        <Grid Margin="0,60">
+        <!-- Основная сетка -->
+        <Grid Margin="0,70,0,60">
             <Grid.RowDefinitions>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
+                <!-- Поиск -->
+                <RowDefinition Height="2*" />
+                <!-- Редактирование -->
+                <RowDefinition Height="5*" />
+                <!-- Кнопка сохранения -->
+                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="*" />
-                <ColumnDefinition Width="*" />
-            </Grid.ColumnDefinitions>
+            <!-- Блок поиска -->
+            <Grid Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="Auto" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
 
-            <!-- Поле для имени -->
-            <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"/>
-            </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"
+                <!-- Поле для поиска физического лица -->
+                <Label Grid.Row="0" Grid.Column="0" 
+                       Content="Поиск физического лица" Foreground="White" HorizontalAlignment="Right" Margin="0,0,10,0"  VerticalContentAlignment="Center"/>
+                <TextBox x:Name="SearchTextBox" Grid.Row="0" Grid.Column="1"
+                         Width="250" Height="30"
                          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"/>
-            </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"/>
-            </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">
-                    <ComboBoxItem Content="Мужчина"/>
-                    <ComboBoxItem Content="Женщина"/>
-                </ComboBox>
-            </StackPanel>
-
-            <!-- Поле для адреса -->
-            <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"/>
-            </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"/>
-            </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"
+                         Margin="0,5,0,5"
+                         VerticalContentAlignment="Center"
                          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"/>
-            </StackPanel>
+                <!-- Поле для выбора физического лица -->
+                <Label Grid.Row="1" Grid.Column="0" 
+                       Content="Выберите физическое лицо" Foreground="White" HorizontalAlignment="Right" Margin="0,0,10,0"  VerticalContentAlignment="Center"/>
+                <ComboBox x:Name="PhysicalPersonComboBox" Grid.Row="1" Grid.Column="1"
+                          Width="400" Height="30"
+                          VerticalAlignment="Top"
+                          ToolTip="Выберите физическое лицо"
+                          SelectionChanged="PhysicalPersonComboBox_SelectionChanged" />
+            </Grid>
+
+            <!-- Блок редактирования -->
+            <Grid Grid.Row="1" Margin="0,0,0,0">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="*" />
+                    <ColumnDefinition Width="*" />
+                </Grid.ColumnDefinitions>
+
+                <!-- Поля редактирования -->
+                <StackPanel Grid.Row="0" Grid.Column="0" Margin="10">
+                    <Label Content="Имя" Foreground="White" HorizontalAlignment="Center"/>
+                    <TextBox x:Name="NameTextBox" Width="250" Height="40"
+                             Style="{StaticResource RoundedTextBoxStyle}" ToolTip="Введите имя" />
+                </StackPanel>
+                <StackPanel Grid.Row="0" Grid.Column="1" Margin="10">
+                    <Label Content="Фамилия" Foreground="White" HorizontalAlignment="Center"/>
+                    <TextBox x:Name="SurnameTextBox" Width="250" Height="40"
+                             Style="{StaticResource RoundedTextBoxStyle}" ToolTip="Введите фамилию" />
+                </StackPanel>
+                <StackPanel Grid.Row="1" Grid.Column="0" Margin="10" >
+                    <Label Content="Отчество" Foreground="White" HorizontalAlignment="Center"/>
+                    <TextBox x:Name="PatronomicTextBox" Width="250" Height="40"
+                             Style="{StaticResource RoundedTextBoxStyle}" ToolTip="Введите отчество" />
+                </StackPanel>
+                <StackPanel Grid.Row="1" Grid.Column="1" Margin="10">
+                    <Label Content="Дата рождения" Foreground="White" HorizontalAlignment="Center"/>
+                    <DatePicker x:Name="BirthdayPicker" Width="250" Height="40"
+                                ToolTip="Выберите дату рождения" />
+                </StackPanel>
+                <StackPanel Grid.Row="2" Grid.Column="0" Margin="10">
+                    <Label Content="Пол" Foreground="White" HorizontalAlignment="Center"/>
+                    <ComboBox x:Name="GenderComboBox" Width="250" Height="40" ToolTip="Выберите пол">
+                        <ComboBoxItem Content="Мужчина" />
+                        <ComboBoxItem Content="Женщина" />
+                    </ComboBox>
+                </StackPanel>
+                <StackPanel Grid.Row="2" Grid.Column="1" Margin="10">
+                    <Label Content="Адрес" Foreground="White" HorizontalAlignment="Center"/>
+                    <TextBox x:Name="AddressTextBox" Width="250" Height="40"
+                             Style="{StaticResource RoundedTextBoxStyle}" ToolTip="Введите адрес" />
+                </StackPanel>
+                <StackPanel Grid.Row="3" Grid.Column="0" Margin="10">
+                    <Label Content="Телефон" Foreground="White" HorizontalAlignment="Center"/>
+                    <TextBox x:Name="TelephoneTextBox" Width="250" Height="40"
+                             Style="{StaticResource RoundedTextBoxStyle}" ToolTip="Введите номер телефона" />
+                </StackPanel>
+            </Grid>
+
+            <!-- Кнопка сохранения -->
+            <Button Grid.Row="2" Content="Сохранить изменения" 
+                    Width="250" Height="40"
+                    VerticalAlignment="Bottom"
+                    Style="{StaticResource RoundedButtonStyle}"
+                    Background="#004890" Foreground="#FFFFFF"
+                    Click="SaveButton_Click"
+                    HorizontalAlignment="Center" Margin="0,10,0,0"/>
         </Grid>
-
-        <!-- Кнопка для сохранения изменений -->
-        <Button Content="Сохранить изменения" 
-                Width="250" Height="40"
-                VerticalAlignment="Bottom"
-                Style="{StaticResource RoundedButtonStyle}"
-                Background="#004890" Foreground="#FFFFFF"
-                Click="SaveButton_Click"
-                HorizontalAlignment="Center" Margin="0,10,0,10"/>
     </Grid>
 </Window>
diff --git a/EmployeeManagmentView/PhysicalPerson/ViewPhysicalPersonsWindow.xaml b/EmployeeManagmentView/PhysicalPerson/ViewPhysicalPersonsWindow.xaml
index fde1be4..325fe07 100644
--- a/EmployeeManagmentView/PhysicalPerson/ViewPhysicalPersonsWindow.xaml
+++ b/EmployeeManagmentView/PhysicalPerson/ViewPhysicalPersonsWindow.xaml
@@ -19,9 +19,10 @@
         <TextBox x:Name="SearchTextBox"
                  Width="560"
                  VerticalAlignment="Top"
-                 Margin="0,60,0,0"
+                 Margin="0,49,0,0"
                  HorizontalAlignment="Center"
-                 TextChanged="SearchTextBox_TextChanged" Height="20" />
+                 Style="{StaticResource RoundedTextBoxStyle}"
+                 TextChanged="SearchTextBox_TextChanged" Height="35" />
 
 
         <!-- Таблица для отображения -->