浏览代码

Жесть кароче намутил чето с сортом и экзами

Almir Myxametszanov 1 年之前
父节点
当前提交
1047a6d77a
共有 2 个文件被更改,包括 6 次插入3 次删除
  1. 2 1
      ROGOZ/Pages/AddEditPage.xaml.cs
  2. 4 2
      ROGOZ/Pages/TaskList.xaml.cs

+ 2 - 1
ROGOZ/Pages/AddEditPage.xaml.cs

@@ -96,7 +96,8 @@ namespace ROGOZ.Pages
                     {
                         var selectedTask = new Task
                         {
-                            ExecutorID = CmbExecutor.TabIndex,
+                            //ExecutorID = CmbExecutor.,
+
                             //Executor = user1Entities.GetContext().Executor.FirstOrDefault(o=>o.User.getFamilia()== CmbExecutor.Text),
                             Title = TaskNameTB.Text,
                             Description = TaskDescriptionTB.Text,

+ 4 - 2
ROGOZ/Pages/TaskList.xaml.cs

@@ -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)
         {