|
@@ -82,20 +82,17 @@ namespace ROGOZ.Pages
|
|
|
}
|
|
|
private void UpdateTasks()
|
|
|
{
|
|
|
+ var searchText = TBoxSearch.Text.ToLower();
|
|
|
var tasks = user1Entities.GetContext().Task.ToList();
|
|
|
|
|
|
//сортировка по статусу
|
|
|
//if (CmbStatusSort.SelectedIndex == -1 || CmbStatusSort.Text == null)
|
|
|
// DGTasks.ItemsSource = tasks.OrderBy(p => p.Status).ToList();
|
|
|
|
|
|
- //сортировка по исполнителю
|
|
|
- //if (CmbExecutorSort.SelectedIndex == -1)
|
|
|
- // tasks = tasks.OrderBy(p => p.Executor.User.MiddleName).ToList();
|
|
|
- //else
|
|
|
- // tasks = tasks.Where(p => p.Executor.User.getFIO().ToString() == CmbStatusSort.Text).ToList();
|
|
|
-
|
|
|
//сортировка по поиску
|
|
|
- DGTasks.ItemsSource = tasks.Where(p => p.Title.ToLower().Contains(TBoxSearch.Text.ToLower())).ToList(); //
|
|
|
+ DGTasks.ItemsSource = tasks.Where(p => p.Title.ToLower().Contains(searchText)
|
|
|
+ || p.Executor.User.MiddleName.ToLower().Contains(searchText)).ToList();
|
|
|
+
|
|
|
}
|
|
|
|
|
|
//Сортировка по статусу
|