From 206ffc4c762625441ba3b3bbcd2918b0e6c7ab8f Mon Sep 17 00:00:00 2001
From: maksim <kashin20031984@mail.ru>
Date: Tue, 3 Dec 2024 00:16:38 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A7=D1=83=D1=82=D1=8C-=D1=87=D1=83=D1=82?=
 =?UTF-8?q?=D1=8C=20=D0=BF=D0=BE=D0=B4=D0=BE=D0=BD=D0=B0=D0=BB=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Employee/AddEmployeeWindow.xaml           |  2 +-
 .../Employee/EditEmployeeWindow.xaml          | 11 ++++----
 .../Employee/Salary/AddSalaryWindow.xaml      |  1 -
 .../Employee/Salary/EditSalaryWindow.xaml     | 28 +++++++++----------
 .../Employee/Vacation/AddVacationWindow.xaml  |  2 +-
 .../Employee/Vacation/EditVacationWindow.xaml | 22 +++++++--------
 .../EditPhysicalPersonWindow.xaml             |  7 +++--
 7 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/EmployeeManagmentView/Employee/AddEmployeeWindow.xaml b/EmployeeManagmentView/Employee/AddEmployeeWindow.xaml
index 6a72d26..6c0f320 100644
--- a/EmployeeManagmentView/Employee/AddEmployeeWindow.xaml
+++ b/EmployeeManagmentView/Employee/AddEmployeeWindow.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="600" Width="600"
+        Height="500" Width="600"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
         Background="#0D2D4F">
diff --git a/EmployeeManagmentView/Employee/EditEmployeeWindow.xaml b/EmployeeManagmentView/Employee/EditEmployeeWindow.xaml
index 26b000e..48a505b 100644
--- a/EmployeeManagmentView/Employee/EditEmployeeWindow.xaml
+++ b/EmployeeManagmentView/Employee/EditEmployeeWindow.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="704" Width="600"
+        Height="600" Width="600"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
         Background="#0D2D4F">
@@ -27,7 +27,7 @@
             </Grid.RowDefinitions>
 
             <!-- Блок поиска -->
-            <Grid Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10">
+            <Grid Grid.Row="0" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0, 0, 0, 0">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />
@@ -39,20 +39,21 @@
 
                 <!-- Поле для поиска сотрудников -->
                 <Label Grid.Row="0" Grid.Column="0" 
-                       Content="Поиск сотрудника" Foreground="White" HorizontalAlignment="Right" Margin="0,0,10,0" VerticalContentAlignment="Center"/>
+                       Content="Поиск сотрудника" Foreground="White" HorizontalAlignment="Center" Margin="0,10,0,10" VerticalContentAlignment="Center"/>
                 <TextBox x:Name="SearchTextBox" Grid.Row="0" Grid.Column="1"
                          Width="250" Height="30"
                          Style="{StaticResource RoundedTextBoxStyle}"
-                         Margin="0,5,0,5"
+                         Margin="0,10,0,10"
                          VerticalContentAlignment="Center"
                          ToolTip="Введите для поиска"
                          TextChanged="SearchTextBox_TextChanged"/>
 
                 <!-- Поле для выбора сотрудника -->
                 <Label Grid.Row="1" Grid.Column="0" 
-                       Content="Выберите сотрудника" Foreground="White" HorizontalAlignment="Right" Margin="0,0,10,0" VerticalContentAlignment="Center"/>
+                       Content="Выберите сотрудника" Foreground="White" HorizontalAlignment="Center" Margin="0,10,0,10" VerticalContentAlignment="Center"/>
                 <ComboBox x:Name="EmployeeComboBox" Grid.Row="1" Grid.Column="1"
                           Width="400" Height="30"
+                          Margin="0,10,0,10"
                           VerticalAlignment="Top"
                           ToolTip="Выберите сотрудника"
                           SelectionChanged="EmployeeComboBox_SelectionChanged" />
diff --git a/EmployeeManagmentView/Employee/Salary/AddSalaryWindow.xaml b/EmployeeManagmentView/Employee/Salary/AddSalaryWindow.xaml
index df78d81..01a5bd8 100644
--- a/EmployeeManagmentView/Employee/Salary/AddSalaryWindow.xaml
+++ b/EmployeeManagmentView/Employee/Salary/AddSalaryWindow.xaml
@@ -20,7 +20,6 @@
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
                 <RowDefinition Height="Auto"/>
-                <RowDefinition Height="Auto"/>
             </Grid.RowDefinitions>
 
             <Grid.ColumnDefinitions>
diff --git a/EmployeeManagmentView/Employee/Salary/EditSalaryWindow.xaml b/EmployeeManagmentView/Employee/Salary/EditSalaryWindow.xaml
index 85c4d70..ed785bc 100644
--- a/EmployeeManagmentView/Employee/Salary/EditSalaryWindow.xaml
+++ b/EmployeeManagmentView/Employee/Salary/EditSalaryWindow.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="500" Width="600"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
         Background="#0D2D4F">
 
-    <Grid Margin="0,0,0,-6">
+    <Grid Margin="0,0,0,0">
         <TextBlock Text="Редактирование зарплаты"
                    HorizontalAlignment="Center" VerticalAlignment="Top"
                    FontSize="18" FontWeight="Bold"
@@ -25,24 +25,23 @@
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
 
-            <Label Grid.Row="0" Grid.Column="0" Content="Поиск зарплаты" Foreground="White" HorizontalAlignment="Right" Margin="0,0,10,0" />
+            <Label Grid.Row="0" Grid.Column="0" Content="Поиск зарплаты" Foreground="White" HorizontalAlignment="Center" Margin="0,0,10,10" />
             <TextBox x:Name="SearchTextBox" Grid.Row="0" Grid.Column="1" Width="250" Height="30"
                      Style="{StaticResource RoundedTextBoxStyle}" ToolTip="Введите для поиска"
                      TextChanged="SearchTextBox_TextChanged" />
 
-            <Label Grid.Row="1" Grid.Column="0" Content="Выберите зарплату" Foreground="White" HorizontalAlignment="Right" Margin="0,10,10,0" />
+            <Label Grid.Row="1" Grid.Column="0" Content="Выберите зарплату" Foreground="White" HorizontalAlignment="Center" Margin="0,10,10,10" />
             <ComboBox x:Name="SalaryComboBox" Grid.Row="1" Grid.Column="1" Width="250" Height="30"
                       SelectionChanged="SalaryComboBox_SelectionChanged" />
         </Grid>
 
         <!-- Блок редактирования зарплаты -->
-        <Grid Margin="0,140,0,60">
+        <Grid Margin="0,150,0,10">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
             <Grid.ColumnDefinitions>
@@ -66,16 +65,15 @@
                 <Label Content="Дата" Foreground="White" HorizontalAlignment="Center"/>
                 <DatePicker x:Name="DatePicker" Width="250" Height="40" />
             </StackPanel>
-            <StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="10">
-                <Label Content="Сохранить" Foreground="White" HorizontalAlignment="Center"/>
-                <CheckBox x:Name="PassedCheckBox" Content="Завершено" Foreground="White" />
+            <StackPanel Grid.Row="2" Grid.ColumnSpan="2" Margin="10">
+                <Label Content="Зарплата выплачена" Foreground="White" HorizontalAlignment="Center"/>
+                <CheckBox x:Name="PassedCheckBox" Content="Выплачено" Foreground="White" HorizontalAlignment="Center"/>
             </StackPanel>
-        </Grid>
-
-        <!-- Кнопка сохранения -->
-        <Button Grid.Row="4" Content="Сохранить изменения" Width="250" Height="40"
-                VerticalAlignment="Bottom" Style="{StaticResource RoundedButtonStyle}"
+            <!-- Кнопка сохранения -->
+            <Button Grid.Row="4"  Grid.ColumnSpan="2" Content="Сохранить изменения" Width="250" Height="40" 
+                 Style="{StaticResource RoundedButtonStyle}" 
                 Background="#004890" Foreground="#FFFFFF"
-                Click="SaveButton_Click" HorizontalAlignment="Center" Margin="0,10,0,0"/>
+                Click="SaveButton_Click" Margin="0,10,0,0"/>
+        </Grid>
     </Grid>
 </Window>
\ No newline at end of file
diff --git a/EmployeeManagmentView/Employee/Vacation/AddVacationWindow.xaml b/EmployeeManagmentView/Employee/Vacation/AddVacationWindow.xaml
index 646fda1..f70031d 100644
--- a/EmployeeManagmentView/Employee/Vacation/AddVacationWindow.xaml
+++ b/EmployeeManagmentView/Employee/Vacation/AddVacationWindow.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="450" Width="600"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
         Background="#0D2D4F">
diff --git a/EmployeeManagmentView/Employee/Vacation/EditVacationWindow.xaml b/EmployeeManagmentView/Employee/Vacation/EditVacationWindow.xaml
index 1a7a6f8..d937187 100644
--- a/EmployeeManagmentView/Employee/Vacation/EditVacationWindow.xaml
+++ b/EmployeeManagmentView/Employee/Vacation/EditVacationWindow.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="450" Width="600"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
         Background="#0D2D4F">
 
-    <Grid Margin="0,0,0,-6">
+    <Grid Margin="0,0,0,0">
         <TextBlock Text="Редактирование отпуска"
                    HorizontalAlignment="Center" VerticalAlignment="Top"
                    FontSize="18" FontWeight="Bold"
@@ -25,23 +25,22 @@
                 <ColumnDefinition Width="Auto" />
             </Grid.ColumnDefinitions>
 
-            <Label Grid.Row="0" Grid.Column="0" Content="Поиск отпуска" Foreground="White" HorizontalAlignment="Right" Margin="0,0,10,0" />
+            <Label Grid.Row="0" Grid.Column="0" Content="Поиск отпуска" Foreground="White" HorizontalAlignment="Center" Margin="0,0,10,10" />
             <TextBox x:Name="SearchTextBox" Grid.Row="0" Grid.Column="1" Width="250" Height="30"
                      Style="{StaticResource RoundedTextBoxStyle}" ToolTip="Введите для поиска"
                      TextChanged="SearchTextBox_TextChanged" />
 
-            <Label Grid.Row="1" Grid.Column="0" Content="Выберите отпуск" Foreground="White" HorizontalAlignment="Right" Margin="0,10,10,0" />
+            <Label Grid.Row="1" Grid.Column="0" Content="Выберите отпуск" Foreground="White" HorizontalAlignment="Center" Margin="0,10,10,10" />
             <ComboBox x:Name="VacationComboBox" Grid.Row="1" Grid.Column="1" Width="250" Height="30"
                       SelectionChanged="VacationComboBox_SelectionChanged" />
         </Grid>
 
         <!-- Блок редактирования отпуска -->
-        <Grid Margin="0,140,0,60">
+        <Grid Margin="0,150,0,60">
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
 
             <Grid.ColumnDefinitions>
@@ -61,13 +60,12 @@
                 <Label Content="Завершение отпуска" Foreground="White" HorizontalAlignment="Center"/>
                 <CheckBox x:Name="PassedCheckBox" Content="Завершено" Foreground="White"  HorizontalAlignment="Center" />
             </StackPanel>
+            <!-- Кнопка сохранения -->
+            <Button Grid.Row="4"  Grid.ColumnSpan="2" Content="Сохранить изменения" Width="250" Height="40" 
+                 Style="{StaticResource RoundedButtonStyle}" 
+                Background="#004890" Foreground="#FFFFFF"
+                Click="SaveButton_Click" Margin="0,10,0,0"/>
 
         </Grid>
-
-        <!-- Кнопка сохранения -->
-        <Button Grid.Row="3" 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>
 </Window>
diff --git a/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml b/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml
index 2951a12..e8f8ec9 100644
--- a/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml
+++ b/EmployeeManagmentView/PhysicalPerson/EditPhysicalPersonWindow.xaml
@@ -39,21 +39,22 @@
 
                 <!-- Поле для поиска физического лица -->
                 <Label Grid.Row="0" Grid.Column="0" 
-                       Content="Поиск физического лица" Foreground="White" HorizontalAlignment="Right" Margin="0,0,10,0"  VerticalContentAlignment="Center"/>
+                       Content="Поиск физического лица" Foreground="White" HorizontalAlignment="Center" Margin="0,10,0,10"  VerticalContentAlignment="Center"/>
                 <TextBox x:Name="SearchTextBox" Grid.Row="0" Grid.Column="1"
                          Width="250" Height="30"
                          Style="{StaticResource RoundedTextBoxStyle}"
-                         Margin="0,5,0,5"
+                         Margin="0,10,0,10"
                          VerticalContentAlignment="Center"
                          ToolTip="Введите для поиска"
                          TextChanged="SearchTextBox_TextChanged"/>
 
                 <!-- Поле для выбора физического лица -->
                 <Label Grid.Row="1" Grid.Column="0" 
-                       Content="Выберите физическое лицо" Foreground="White" HorizontalAlignment="Right" Margin="0,0,10,0"  VerticalContentAlignment="Center"/>
+                       Content="Выберите физическое лицо" Foreground="White" HorizontalAlignment="Center" Margin="0,10,0,10"  VerticalContentAlignment="Center"/>
                 <ComboBox x:Name="PhysicalPersonComboBox" Grid.Row="1" Grid.Column="1"
                           Width="400" Height="30"
                           VerticalAlignment="Top"
+                          Margin="0,10,0,10"
                           ToolTip="Выберите физическое лицо"
                           SelectionChanged="PhysicalPersonComboBox_SelectionChanged" />
             </Grid>