|
@@ -85,8 +85,8 @@ namespace ROGOZ.Pages
|
|
|
var tasks = user1Entities.GetContext().Task.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.OrderBy(p => p.Status).ToList();
|
|
|
|
|
|
//сортировка по исполнителю
|
|
|
//if (CmbExecutorSort.SelectedIndex == -1)
|
|
@@ -104,6 +104,8 @@ namespace ROGOZ.Pages
|
|
|
var tasks = user1Entities.GetContext().Task.ToList();
|
|
|
if (CmbStatusSort.SelectedIndex != -1 )
|
|
|
DGTasks.ItemsSource = tasks.Where(p => p.Status == CmbStatusSort.Text).ToList();
|
|
|
+ if (CmbStatusSort.SelectedIndex == -1 || CmbStatusSort.Text == null)
|
|
|
+ DGTasks.ItemsSource = tasks.OrderBy(p => p.Status).ToList();
|
|
|
}
|
|
|
private void CmbStatusSort_SelectionChanged(object sender, SelectionChangedEventArgs e)
|
|
|
{
|