瀏覽代碼

Ладно пусть будет так

Danila Alekseev 1 年之前
父節點
當前提交
6fab573e95
共有 1 個文件被更改,包括 43 次插入24 次删除
  1. 43 24
      ROGOZ/Pages/TaskList.xaml.cs

+ 43 - 24
ROGOZ/Pages/TaskList.xaml.cs

@@ -58,48 +58,67 @@ namespace ROGOZ.Pages
             }
         }
 
+        private void CmbStatusSort_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            UpdateTasks();
+        }
+
+        private void TBoxSearch_TextChanged(object sender, TextChangedEventArgs e)
+        {
+
+            UpdateTasks();
+        }
 
+        private void ClearFilters_Click(object sender, RoutedEventArgs e)
+        {
+            CmbExecutorSort.SelectedIndex = -1;
+            CmbStatusSort.SelectedIndex = -1;
+            TBoxSearch.Clear();
+            //UpdateTasks();
+        }
         private void UpdateTasks()
         {
             var tasks = user1Entities.GetContext().Task.ToList();
 
             //сортировка по статусу
-            if (CmbStatusSort.SelectedIndex == 0)
+
+            // работает но список обновляется после нажатия есчо раз
+            if (CmbStatusSort.SelectedIndex == -1)
                 tasks = tasks.OrderBy(p => p.Status).ToList();
             else
-                tasks = tasks.OrderByDescending(p => p.Status).ToList();
-            //if (CmbStatusSort.SelectedIndex==0)
-            //    tasks = tasks.OrderBy(p=> p.Status).ToList();
-            //else
-            //tasks = tasks.Where(p=> p.Status.ToLower().Contains(CmbStatusSort.Text.ToLower())).ToList();
+                tasks = tasks.Where(p => p.Status == CmbStatusSort.Text).ToList();
+
 
             //сортировка по исполнителю
-            if (CmbExecutorSort.SelectedIndex == 0)
-                tasks = tasks.OrderBy(p => p.ExecutorID).ToList();
+            if (CmbExecutorSort.SelectedIndex == -1)
+                tasks = tasks.OrderBy(p => p.Executor.User.MiddleName).ToList();
             else
-                tasks = tasks.OrderByDescending(p => p.ExecutorID).ToList();
+                tasks = tasks.Where(p => p.Executor.User.MiddleName.ToString() == CmbStatusSort.Text).ToList();
 
             //сортировка по поиску
-            tasks = tasks.Where(p => p.Title.ToLower().Contains(TBoxSearch.Text.ToLower())).ToList();
+            tasks = tasks.Where(p => p.Title.ToLower().Contains(TBoxSearch.Text.ToLower())).ToList(); // работает
 
             DGTasks.ItemsSource = tasks;
-        }
 
-        private void CmbStatusSort_SelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            UpdateTasks();
-        }
+            //сортировка по исполнителю
+            //tasks = tasks.Where(p=>p.ExecutorID.Equals(CmbExecutorSort.Text)).ToList() ;
+            //if (CmbExecutorSort.SelectedIndex == 0)
+            //    tasks = tasks.OrderBy(p => p.ExecutorID).ToList();
+            //else
+            //    tasks = tasks.OrderByDescending(p => p.ExecutorID).ToList();
 
-        private void TBoxSearch_TextChanged(object sender, TextChangedEventArgs e)
-        {
-            UpdateTasks();
-        }
+            //if (CmbExecutorSort.SelectedIndex != -1)
+            //    tasks = tasks.Where(p => p.ID.Equals(CmbExecutorSort.Text.ToLower())).ToList();
 
-        private void ClearFilters_Click(object sender, RoutedEventArgs e)
-        {
-            CmbExecutorSort.SelectedIndex = 0;
-            CmbStatusSort.SelectedIndex = 0;
-            TBoxSearch.Clear();
+            //tasks = tasks.Where(p => p.ID.ToString() == CmbExecutorSort.Text).ToList();
+
+
+            //сортировка по поиску
+            //tasks = tasks.Where(p => p.Title.ToLower().Contains(TBoxSearch.Text.ToLower())).ToList(); // работает
+
+            //DGTasks.ItemsSource = tasks;
         }
+
+       
     }
 }