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">
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EmployeeManagmentView/Employee/Salary/ViewSalaryWindow.xaml.cs b/EmployeeManagmentView/Employee/Salary/ViewSalaryWindow.xaml.cs
index 634d50f..33544c1 100644
--- a/EmployeeManagmentView/Employee/Salary/ViewSalaryWindow.xaml.cs
+++ b/EmployeeManagmentView/Employee/Salary/ViewSalaryWindow.xaml.cs
@@ -1,4 +1,5 @@
using EmployeeManagmentContracts.BusinessLogicContracts;
+using EmployeeManagmentContracts.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -21,12 +22,46 @@ namespace EmployeeManagmentView.Employee.Salary
public partial class ViewSalaryWindow : Window
{
+
private readonly ISalaryLogic _salaryLogic;
+ private IEnumerable _allSalaries;
public ViewSalaryWindow(ISalaryLogic salaryLogic)
{
_salaryLogic = salaryLogic;
InitializeComponent();
+ LoadSalaries();
+ }
+
+ private void LoadSalaries()
+ {
+ _allSalaries = _salaryLogic.GetFullList(); // Загрузка всех данных
+ SalariesDataGrid.ItemsSource = _allSalaries;
+ }
+
+ private void SearchTextBox_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
+ {
+ string query = SearchTextBox.Text.ToLower();
+
+ if (string.IsNullOrWhiteSpace(query))
+ {
+ // Отображаем все записи
+ SalariesDataGrid.ItemsSource = _allSalaries;
+ }
+ else
+ {
+ // Фильтрация по всем полям сущности
+ var filteredList = _allSalaries.Where(sal =>
+ (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();
+
+ SalariesDataGrid.ItemsSource = filteredList;
+ }
}
}
}
diff --git a/EmployeeManagmentView/Employee/Vacation/DeleteVacationWindow.xaml b/EmployeeManagmentView/Employee/Vacation/DeleteVacationWindow.xaml
index ce9f831..d6061f7 100644
--- a/EmployeeManagmentView/Employee/Vacation/DeleteVacationWindow.xaml
+++ b/EmployeeManagmentView/Employee/Vacation/DeleteVacationWindow.xaml
@@ -32,6 +32,7 @@
+
diff --git a/EmployeeManagmentView/Employee/Vacation/DeleteVacationWindow.xaml.cs b/EmployeeManagmentView/Employee/Vacation/DeleteVacationWindow.xaml.cs
index 842d026..57a6a9b 100644
--- a/EmployeeManagmentView/Employee/Vacation/DeleteVacationWindow.xaml.cs
+++ b/EmployeeManagmentView/Employee/Vacation/DeleteVacationWindow.xaml.cs
@@ -68,7 +68,8 @@ namespace EmployeeManagmentView.Employee.Vacation
var filteredList = _allVacations.Where(vac =>
(vac.EmployeeName?.ToLower().Contains(query) ?? false) ||
(vac.StartData.ToString("dd.MM.yyyy").Contains(query)) ||
- (vac.EndData.ToString("dd.MM.yyyy").Contains(query))
+ (vac.EndData.ToString("dd.MM.yyyy").Contains(query)) ||
+ (vac.Passed.ToString().ToLower().Contains(query))
).ToList();
VacationsDataGrid.ItemsSource = filteredList;
diff --git a/EmployeeManagmentView/Employee/Vacation/EditVacationWindow.xaml b/EmployeeManagmentView/Employee/Vacation/EditVacationWindow.xaml
index 5598f49..1a7a6f8 100644
--- a/EmployeeManagmentView/Employee/Vacation/EditVacationWindow.xaml
+++ b/EmployeeManagmentView/Employee/Vacation/EditVacationWindow.xaml
@@ -57,9 +57,9 @@
-
-
-
+
+
+
diff --git a/EmployeeManagmentView/Employee/Vacation/ViewVacationWindow.xaml b/EmployeeManagmentView/Employee/Vacation/ViewVacationWindow.xaml
index 4aa0222..631bdb5 100644
--- a/EmployeeManagmentView/Employee/Vacation/ViewVacationWindow.xaml
+++ b/EmployeeManagmentView/Employee/Vacation/ViewVacationWindow.xaml
@@ -1,12 +1,49 @@
+ Title="Управление отпусками"
+ Height="600" Width="800"
+ ResizeMode="NoResize"
+ WindowStartupLocation="CenterScreen"
+ Background="#0D2D4F">
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/EmployeeManagmentView/Employee/Vacation/ViewVacationWindow.xaml.cs b/EmployeeManagmentView/Employee/Vacation/ViewVacationWindow.xaml.cs
index 4e57c32..697a3fd 100644
--- a/EmployeeManagmentView/Employee/Vacation/ViewVacationWindow.xaml.cs
+++ b/EmployeeManagmentView/Employee/Vacation/ViewVacationWindow.xaml.cs
@@ -1,4 +1,5 @@
using EmployeeManagmentContracts.BusinessLogicContracts;
+using EmployeeManagmentContracts.ViewModels;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -22,11 +23,42 @@ namespace EmployeeManagmentView.Employee.Vacation
{
private readonly IVacationLogic _vacationLogic;
+ private IEnumerable _allVacations;
public ViewVacationWindow(IVacationLogic vacationLogic)
{
_vacationLogic = vacationLogic;
InitializeComponent();
+ LoadVacations();
+ }
+
+ private void LoadVacations()
+ {
+ _allVacations = _vacationLogic.GetFullList(); // Загрузка всех данных
+ VacationsDataGrid.ItemsSource = _allVacations;
+ }
+
+ private void SearchTextBox_TextChanged(object sender, System.Windows.Controls.TextChangedEventArgs e)
+ {
+ string query = SearchTextBox.Text.ToLower();
+
+ if (string.IsNullOrWhiteSpace(query))
+ {
+ // Отображаем все записи
+ VacationsDataGrid.ItemsSource = _allVacations;
+ }
+ else
+ {
+ // Фильтрация по всем полям сущности
+ var filteredList = _allVacations.Where(vac =>
+ (vac.EmployeeName?.ToLower().Contains(query) ?? false) ||
+ (vac.StartData.ToString("dd.MM.yyyy").Contains(query)) ||
+ (vac.EndData.ToString("dd.MM.yyyy").Contains(query)) ||
+ (vac.Passed.ToString().ToLower().Contains(query))
+ ).ToList();
+
+ VacationsDataGrid.ItemsSource = filteredList;
+ }
}
}
}