Екзекьюторы сломаны

ROGOZ/Pages/AddEditPage.xaml.cs

@@ -25,6 +25,8 @@ namespace ROGOZ.Pages
         private user1Entities _context = new user1Entities();
         private List<string> listUsers = new List<string>();
         private Task _currentTask = null;
+
+        
         public AddEditPage()
         {
             InitializeComponent();
@@ -47,6 +49,7 @@ namespace ROGOZ.Pages
             //DPDeadLine.SelectedDate = DateTime.Today;
             _currentTask = selectedTask;
             CmbStatus.ItemsSource = Status.FillStatus();
+            CmbExecutor.Text = _currentTask.Executor.User.getFIO();
             //CmbExecutor.ItemsSource = user1Entities.GetContext().Executor.ToList();
             CmbTaskType.ItemsSource = WorkType.FillWorkType();
             if (selectedTask != null)
@@ -93,7 +96,8 @@ namespace ROGOZ.Pages
                     {
                         var selectedTask = new Task
                         {
-                            ExecutorID = int.Parse(CmbExecutor.Text),
+                            //ExecutorID = int.Parse(CmbExecutor.Text),
+                            Executor = user1Entities.GetContext().Executor.FirstOrDefault(o=>o.User.getFIO()== CmbExecutor.Text),
                             Title = TaskNameTB.Text,
                             Description = TaskDescriptionTB.Text,
                             CreateDateTime = DateTime.Parse(DPCreateDateTime.Text),
@@ -119,13 +123,12 @@ namespace ROGOZ.Pages
                 {
                     var context = user1Entities.GetContext();
                     context.SaveChanges();
-                    MessageBox.Show("Задача отредактирован");
+                    MessageBox.Show("Задача отредактирована");
                     NavigationService.GoBack();
                 }
 
             }
 
-        }
-
+        }   
     }
 }

ROGOZ/Pages/TaskList.xaml.cs

@@ -31,7 +31,6 @@ namespace ROGOZ.Pages
             
 
             DGTasks.ItemsSource = user1Entities.GetContext().Task.ToList();
-            //DGTasks.ItemsSource = user1Entities.GetContext().Manager.ToList();
 
             foreach (var user in _context.User.ToList())
             {
@@ -68,19 +67,18 @@ namespace ROGOZ.Pages
             }
         }
 
-
-
+        //сортировка по названию
         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()
         {
@@ -89,10 +87,6 @@ namespace ROGOZ.Pages
             //сортировка по статусу
             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)
@@ -102,35 +96,15 @@ namespace ROGOZ.Pages
 
             //сортировка по поиску
             DGTasks.ItemsSource = tasks.Where(p => p.Title.ToLower().Contains(TBoxSearch.Text.ToLower())).ToList(); // 
-
-
-
-            //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();