экзекуторы

ROGOZ/Pages/AddEditPage.xaml

@@ -42,7 +42,7 @@
             <StackPanel Orientation="Vertical">
                 <TextBlock Text="Исполнитель:" FontSize="25" FontFamily="Comic Sans Ms" Foreground="#52a8ff" HorizontalAlignment="Left" Width="220" Margin="50,0,0,5"/>
                 <!--<ComboBox x:Name="CmbExecutor" Style="{DynamicResource ComboBoxStyle1}" ItemContainerStyle="{DynamicResource AddTaskCmbItem}" Text="{Binding ExecutorID}" DisplayMemberPath="ID" Width="770" HorizontalAlignment="Left" Margin="25,0,0,0"/>-->
-                <ComboBox x:Name="CmbExecutor" DisplayMemberPath="ID" Text="{Binding ExecutorID}" Style="{DynamicResource ComboBoxStyle1}" ItemContainerStyle="{DynamicResource AddTaskCmbItem}" Width="770" HorizontalAlignment="Left" Margin="25,0,0,0"/>
+                <ComboBox x:Name="CmbExecutor" Style="{DynamicResource ComboBoxStyle1}" ItemContainerStyle="{DynamicResource AddTaskCmbItem}" Width="770" HorizontalAlignment="Left" Margin="25,0,0,0"/>
             </StackPanel>
 
             <StackPanel Orientation="Horizontal">

ROGOZ/Pages/AddEditPage.xaml.cs

@@ -22,8 +22,8 @@ namespace ROGOZ.Pages
     /// </summary>
     public partial class AddEditPage : Page
     {
-        //private user1Entities _context = new user1Entities();
-        //private List<string> listUsers = new List<string>();
+        private user1Entities _context = new user1Entities();
+        private List<User> listUsers = new List<User>();
         private Task _currentTask = null;
 
         
@@ -34,13 +34,16 @@ namespace ROGOZ.Pages
             CmbStatus.ItemsSource = Status.FillStatus();
             CmbTaskType.ItemsSource = WorkType.FillWorkType();
 
-
-
             //foreach (var user in _context.User.ToList())
             //{
             //    listUsers.Add(user.getFamilia());
             //}
             //CmbExecutor.ItemsSource = listUsers;
+
+            //listUsers = _context.User.ToList();
+            //CmbExecutor.ItemsSource = listUsers;
+            //CmbExecutor.ItemsSource = listUsers.Select(user => user.getFamilia());
+            //CmbExecutor.DisplayMemberPath = "getFamilia";
         }
 
         public AddEditPage(Task selectedTask)
@@ -48,21 +51,23 @@ namespace ROGOZ.Pages
             InitializeComponent();
             _currentTask = selectedTask;
             CmbStatus.ItemsSource = Status.FillStatus();
-            CmbExecutor.ItemsSource = user1Entities.GetContext().User.ToList();
+            //CmbExecutor.ItemsSource = user1Entities.GetContext().User.ToList();
             CmbTaskType.ItemsSource = WorkType.FillWorkType();
             if (selectedTask != null)
                 _currentTask = selectedTask;
             DataContext = _currentTask;
 
-
-
-
             //foreach (var user in _context.User.ToList())
             //{
             //    listUsers.Add(user.getFamilia());
             //}
             //CmbExecutor.ItemsSource = listUsers;
             //CmbExecutor.ItemsSource = _currentTask.Executor.User.getFamilia();
+            listUsers = _context.User.ToList();
+            CmbExecutor.ItemsSource = listUsers;
+            //CmbExecutor.ItemsSource = listUsers.Select(user => user.getFamilia());
+            //CmbExecutor.DisplayMemberPath = "getFamilia";
+            //CmbExecutor.ItemsSource = listUsers.Select(user => user.getFamilia());
         }
         private void BtnCancel_Click(object sender, RoutedEventArgs e)
         {
@@ -89,7 +94,6 @@ namespace ROGOZ.Pages
         }
         private void BtnSaveTask_Click(object sender, RoutedEventArgs e)
         {
-            //var errorMessage = CheckErrors();
             if (CheckErrors() == null)
             {
                 if (_currentTask == null)
@@ -98,10 +102,8 @@ namespace ROGOZ.Pages
                     {
                         var selectedTask = new Task
                         {
-                            //ExecutorID = CmbExecutor.,
-
-                            //Executor = int.Parse(user1Entities.GetContext().Executor.FirstOrDefault(o=>o.User.getFamilia()== CmbExecutor.Text)),
-                            ExecutorID = int.Parse(CmbExecutor.Text),
+                            //ExecutorID = int.Parse(CmbExecutor.SelectedItem.ToString()),
+                            ExecutorID = (CmbExecutor.SelectedItem as User)?.ID ?? 0,
                             Title = TaskNameTB.Text,
                             Description = TaskDescriptionTB.Text,
                             CreateDateTime = DateTime.Parse(DPCreateDateTime.Text),
@@ -116,6 +118,34 @@ namespace ROGOZ.Pages
                         user1Entities.GetContext().SaveChanges();
                         MessageBox.Show("Задача добавлена");
                         NavigationService.GoBack();
+
+                        //var selectedUser = listUsers.FirstOrDefault(user => user.getFamilia() == CmbExecutor.SelectedItem.ToString());
+                        //if (selectedUser != null)
+                        //{
+                        //    var selectedTask = new Task
+                        //    {
+                        //        //ExecutorID = int.Parse(CmbExecutor.SelectedItem.ToString()),
+                        //        ExecutorID = (CmbExecutor.SelectedItem as User)?.ID ?? 0,
+                        //        //ExecutorID = selectedUser.ID,
+                        //        Title = TaskNameTB.Text,
+                        //        Description = TaskDescriptionTB.Text,
+                        //        CreateDateTime = DateTime.Parse(DPCreateDateTime.Text),
+                        //        Deadline = DateTime.Parse(DPDeadLine.Text),
+                        //        Difficulty = Double.Parse(DifficultyTB.Text),
+                        //        Time = int.Parse(TimeTB.Text),
+                        //        Status = CmbStatus.Text,
+                        //        WorkType = CmbTaskType.Text,
+                        //        IsDeleted = false
+                        //    };
+                        //    user1Entities.GetContext().Task.Add(selectedTask);
+                        //    user1Entities.GetContext().SaveChanges();
+                        //    MessageBox.Show("Задача добавлена");
+                        //    NavigationService.GoBack();
+                        //}
+                        //else
+                        //{
+                        //    MessageBox.Show("Выберите исполнителя!");
+                        //}
                     }
                     catch
                     {

ROGOZ/Pages/TaskList.xaml.cs

@@ -27,7 +27,7 @@ namespace ROGOZ.Pages
             InitializeComponent();
 
             CmbStatusSort.ItemsSource = Status.FillStatus();
-            CmbExecutorSort.ItemsSource = user1Entities.GetContext().Executor.ToList();
+            //CmbExecutorSort.ItemsSource = user1Entities.GetContext().Executor.ToList();
             
 
             DGTasks.ItemsSource = user1Entities.GetContext().Task.ToList();
@@ -76,7 +76,7 @@ namespace ROGOZ.Pages
         //Очистка фильтров
         private void ClearFilters_Click(object sender, RoutedEventArgs e)
         {
-            CmbExecutorSort.SelectedIndex = -1;
+            //CmbExecutorSort.SelectedIndex = -1;
             CmbStatusSort.SelectedIndex = -1;
             TBoxSearch.Clear();
         }