diff --git a/EmployeeManagmentView/Employee/Salary/DeleteSalaryWindow.xaml b/EmployeeManagmentView/Employee/Salary/DeleteSalaryWindow.xaml index 8f34689..c81e4a5 100644 --- a/EmployeeManagmentView/Employee/Salary/DeleteSalaryWindow.xaml +++ b/EmployeeManagmentView/Employee/Salary/DeleteSalaryWindow.xaml @@ -34,6 +34,7 @@ + diff --git a/EmployeeManagmentView/Employee/Salary/DeleteSalaryWindow.xaml.cs b/EmployeeManagmentView/Employee/Salary/DeleteSalaryWindow.xaml.cs index 95aedfb..e63c1ad 100644 --- a/EmployeeManagmentView/Employee/Salary/DeleteSalaryWindow.xaml.cs +++ b/EmployeeManagmentView/Employee/Salary/DeleteSalaryWindow.xaml.cs @@ -70,6 +70,7 @@ namespace EmployeeManagmentView.Employee.Salary (sal.EmployeeName?.ToLower().Contains(query) ?? false) || sal.CountHours.ToString().Contains(query) || sal.PriceHour.ToString().Contains(query) || + sal.Passed.ToString().ToLower().Contains(query) || (sal.Premium.HasValue && sal.Premium.Value.ToString().Contains(query)) || (sal.Date.HasValue && sal.Date.Value.ToString("dd.MM.yyyy").Contains(query)) ).ToList(); diff --git a/EmployeeManagmentView/Employee/Salary/ViewSalaryWindow.xaml b/EmployeeManagmentView/Employee/Salary/ViewSalaryWindow.xaml index 7b37d0f..c0ced1a 100644 --- a/EmployeeManagmentView/Employee/Salary/ViewSalaryWindow.xaml +++ b/EmployeeManagmentView/Employee/Salary/ViewSalaryWindow.xaml @@ -1,12 +1,52 @@  + Title="Управление зарплатами" + Height="600" Width="800" + ResizeMode="NoResize" + WindowStartupLocation="CenterScreen" + Background="#0D2D4F"> + - + + + + + + + + + + + + + + + + + + + +