|
@@ -68,14 +68,10 @@ namespace ROGOZ.Pages
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private void CmbStatusSort_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
|
|
- {
|
|
|
- UpdateTasks();
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
private void TBoxSearch_TextChanged(object sender, TextChangedEventArgs e)
|
|
|
{
|
|
|
-
|
|
|
UpdateTasks();
|
|
|
}
|
|
|
|
|
@@ -84,32 +80,60 @@ namespace ROGOZ.Pages
|
|
|
CmbExecutorSort.SelectedIndex = -1;
|
|
|
CmbStatusSort.SelectedIndex = -1;
|
|
|
TBoxSearch.Clear();
|
|
|
- //UpdateTasks();
|
|
|
+ UpdateTasks();
|
|
|
}
|
|
|
private void UpdateTasks()
|
|
|
{
|
|
|
var tasks = user1Entities.GetContext().Task.ToList();
|
|
|
- //var manager = user1Entities.GetContext().Executor.ToList();
|
|
|
|
|
|
//сортировка по статусу
|
|
|
-
|
|
|
- // работает но список обновляется после нажатия есчо раз
|
|
|
- if (CmbStatusSort.SelectedIndex == -1)
|
|
|
- tasks = tasks.OrderBy(p => p.Status).ToList();
|
|
|
- else
|
|
|
- tasks = tasks.Where(p => p.Status == CmbStatusSort.Text).ToList();
|
|
|
-
|
|
|
+ if (CmbStatusSort.SelectedIndex == -1 || CmbStatusSort.Text == null)
|
|
|
+ DGTasks.ItemsSource = tasks.OrderBy(p => p.Status).ToList();
|
|
|
+ //if (CmbStatusSort.SelectedIndex != -1 || CmbStatusSort.Text != null)
|
|
|
+ // DGTasks.ItemsSource = tasks.Where(p => p.Status == CmbStatusSort.Text).ToList();
|
|
|
+ //else
|
|
|
+ // 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();
|
|
|
+ //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();
|
|
|
|
|
|
//сортировка по поиску
|
|
|
- tasks = tasks.Where(p => p.Title.ToLower().Contains(TBoxSearch.Text.ToLower())).ToList(); // работает
|
|
|
+ DGTasks.ItemsSource = tasks.Where(p => p.Title.ToLower().Contains(TBoxSearch.Text.ToLower())).ToList(); //
|
|
|
+
|
|
|
+
|
|
|
|
|
|
- DGTasks.ItemsSource = tasks;
|
|
|
+ //private void CmbStatusSort_LostFocus(object sender, RoutedEventArgs e)
|
|
|
+ //{
|
|
|
+ // var tasks = user1Entities.GetContext().Task.ToList();
|
|
|
+ // if(CmbStatusSort.Text != null || CmbStatusSort.SelectedIndex != -1)
|
|
|
+ // {
|
|
|
+ // DGTasks.ItemsSource = tasks.Where(x => x.Status == CmbStatusSort.Text).ToList();
|
|
|
+ // }
|
|
|
+ // else
|
|
|
+ // DGTasks.ItemsSource = user1Entities.GetContext().Task.ToList();
|
|
|
+ //}
|
|
|
+ }
|
|
|
+
|
|
|
+ //private void CmbStatusSort_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
|
|
+ //{
|
|
|
+ // UpdateTasks();
|
|
|
+ //}
|
|
|
+
|
|
|
+ private void CmbStatusSort_LostFocus(object sender, RoutedEventArgs e)
|
|
|
+ {
|
|
|
+ var tasks = user1Entities.GetContext().Task.ToList();
|
|
|
+ if (CmbStatusSort.SelectedIndex != -1 )
|
|
|
+ DGTasks.ItemsSource = tasks.Where(p => p.Status == CmbStatusSort.Text).ToList();
|
|
|
+ //if (CmbStatusSort.SelectedIndex == -1 )
|
|
|
+ // DGTasks.ItemsSource = user1Entities.GetContext().Task.ToList();
|
|
|
+ }
|
|
|
+
|
|
|
+ private void CmbStatusSort_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
|
|
+ {
|
|
|
+ UpdateTasks();
|
|
|
}
|
|
|
}
|
|
|
}
|