From b83fcba0aa085fae4766a88ba3a0a906b183260c Mon Sep 17 00:00:00 2001
From: maksim <kashin20031984@mail.ru>
Date: Mon, 2 Dec 2024 23:23:57 +0400
Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D0=B8=20=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B8=D0=B2?=
 =?UTF-8?q?=D1=8F=D0=B7=D0=BA=D0=B8=20=D1=81=D0=BE=D1=82=D1=80=D1=83=D0=B4?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Employee/Salary/EditSalaryWindow.xaml           |  5 -----
 .../Employee/Salary/EditSalaryWindow.xaml.cs        | 13 -------------
 .../Employee/Vacation/EditVacationWindow.xaml       |  4 ----
 .../Employee/Vacation/EditVacationWindow.xaml.cs    | 12 ------------
 4 files changed, 34 deletions(-)

diff --git a/EmployeeManagmentView/Employee/Salary/EditSalaryWindow.xaml b/EmployeeManagmentView/Employee/Salary/EditSalaryWindow.xaml
index 5368d66..85c4d70 100644
--- a/EmployeeManagmentView/Employee/Salary/EditSalaryWindow.xaml
+++ b/EmployeeManagmentView/Employee/Salary/EditSalaryWindow.xaml
@@ -70,11 +70,6 @@
                 <Label Content="Сохранить" Foreground="White" HorizontalAlignment="Center"/>
                 <CheckBox x:Name="PassedCheckBox" Content="Завершено" Foreground="White" />
             </StackPanel>
-
-            <StackPanel Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" Margin="10">
-                <Label Content="Сотрудник" Foreground="White" HorizontalAlignment="Center"/>
-                <ComboBox x:Name="EmployeeComboBox" Width="250" Height="40" />
-            </StackPanel>
         </Grid>
 
         <!-- Кнопка сохранения -->
diff --git a/EmployeeManagmentView/Employee/Salary/EditSalaryWindow.xaml.cs b/EmployeeManagmentView/Employee/Salary/EditSalaryWindow.xaml.cs
index 06d1601..498dc29 100644
--- a/EmployeeManagmentView/Employee/Salary/EditSalaryWindow.xaml.cs
+++ b/EmployeeManagmentView/Employee/Salary/EditSalaryWindow.xaml.cs
@@ -32,7 +32,6 @@ namespace EmployeeManagmentView.Employee.Salary
             _employeeLogic = employeeLogic;
             InitializeComponent();
             LoadSalaries();
-            LoadEmployees();
         }
 
         private void LoadSalaries()
@@ -43,14 +42,6 @@ namespace EmployeeManagmentView.Employee.Salary
             SalaryComboBox.SelectedValuePath = "Id";
         }
 
-        private void LoadEmployees()
-        {
-            _employees = _employeeLogic.GetFullList(); // Получение списка всех сотрудников
-            EmployeeComboBox.ItemsSource = _employees;
-            EmployeeComboBox.DisplayMemberPath = "FullName"; // Предполагается, что у сотрудника есть свойство FullName
-            EmployeeComboBox.SelectedValuePath = "Id";
-        }
-
         private void SalaryComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (SalaryComboBox.SelectedValue is int selectedSalaryId)
@@ -69,9 +60,6 @@ namespace EmployeeManagmentView.Employee.Salary
                 PremiumTextBox.Text = salary.Premium?.ToString() ?? string.Empty;
                 DatePicker.SelectedDate = salary.Date;
                 PassedCheckBox.IsChecked = salary.Passed;
-
-                // Устанавливаем выбранного сотрудника
-                EmployeeComboBox.SelectedValue = salary.EmployeeId;
             }
             else
             {
@@ -103,7 +91,6 @@ namespace EmployeeManagmentView.Employee.Salary
                         Premium = float.TryParse(PremiumTextBox.Text, out var premium) ? premium : (float?)null,
                         Date = DatePicker.SelectedDate.Value.ToUniversalTime(),
                         Passed = PassedCheckBox.IsChecked ?? false,
-                        EmployeeId = (int?)EmployeeComboBox.SelectedValue // Устанавливаем выбранного сотрудника
                     };
 
                     _salaryLogic.Update(updatedSalary);
diff --git a/EmployeeManagmentView/Employee/Vacation/EditVacationWindow.xaml b/EmployeeManagmentView/Employee/Vacation/EditVacationWindow.xaml
index d52dcb4..5598f49 100644
--- a/EmployeeManagmentView/Employee/Vacation/EditVacationWindow.xaml
+++ b/EmployeeManagmentView/Employee/Vacation/EditVacationWindow.xaml
@@ -62,10 +62,6 @@
                 <CheckBox x:Name="PassedCheckBox" Content="Завершено" Foreground="White" />
             </StackPanel>
 
-            <StackPanel Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" Margin="10">
-                <Label Content="Сотрудник" Foreground="White" HorizontalAlignment="Center"/>
-                <ComboBox x:Name="EmployeeComboBox" Width="250" Height="40" />
-            </StackPanel>
         </Grid>
 
         <!-- Кнопка сохранения -->
diff --git a/EmployeeManagmentView/Employee/Vacation/EditVacationWindow.xaml.cs b/EmployeeManagmentView/Employee/Vacation/EditVacationWindow.xaml.cs
index b0b4ee8..00066d1 100644
--- a/EmployeeManagmentView/Employee/Vacation/EditVacationWindow.xaml.cs
+++ b/EmployeeManagmentView/Employee/Vacation/EditVacationWindow.xaml.cs
@@ -32,7 +32,6 @@ namespace EmployeeManagmentView.Employee.Vacation
             _employeeLogic = employeeLogic;
             InitializeComponent();
             LoadVacations();
-            LoadEmployees();
         }
 
         private void LoadVacations()
@@ -43,14 +42,6 @@ namespace EmployeeManagmentView.Employee.Vacation
             VacationComboBox.SelectedValuePath = "Id";
         }
 
-        private void LoadEmployees()
-        {
-            _employees = _employeeLogic.GetFullList(); // Получение списка всех сотрудников
-            EmployeeComboBox.ItemsSource = _employees;
-            EmployeeComboBox.DisplayMemberPath = "FullName"; // Предполагается, что у сотрудника есть свойство FullName
-            EmployeeComboBox.SelectedValuePath = "Id";
-        }
-
         private void VacationComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
         {
             if (VacationComboBox.SelectedValue is int selectedVacationId)
@@ -68,8 +59,6 @@ namespace EmployeeManagmentView.Employee.Vacation
                 EndDatePicker.SelectedDate = vacation.EndData;
                 PassedCheckBox.IsChecked = vacation.Passed;
 
-                // Устанавливаем выбранного сотрудника
-                EmployeeComboBox.SelectedValue = vacation.EmployeeId;
             }
             else
             {
@@ -99,7 +88,6 @@ namespace EmployeeManagmentView.Employee.Vacation
                         StartData = StartDatePicker.SelectedDate.Value.ToUniversalTime(),
                         EndData = EndDatePicker.SelectedDate.Value.ToUniversalTime(),
                         Passed = PassedCheckBox.IsChecked ?? false,
-                        EmployeeId = (int?)EmployeeComboBox.SelectedValue // Устанавливаем выбранного сотрудника
                     };
 
                     _vacationLogic.Update(updatedVacation);