|
@@ -23,7 +23,6 @@ namespace ROGOZ.Pages
|
|
|
public partial class AddEditPage : Page
|
|
|
{
|
|
|
private user1Entities _context = new user1Entities();
|
|
|
- private List<User> listUsers = new List<User>();
|
|
|
private Task _currentTask = null;
|
|
|
|
|
|
|
|
@@ -33,17 +32,9 @@ namespace ROGOZ.Pages
|
|
|
DataContext = _currentTask;
|
|
|
CmbStatus.ItemsSource = Status.FillStatus();
|
|
|
CmbTaskType.ItemsSource = WorkType.FillWorkType();
|
|
|
+ //CmbExecutor.ItemsSource = user1Entities.GetContext().Executor.ToList();
|
|
|
|
|
|
- //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";
|
|
|
+ CmbExecutor.ItemsSource = _context.User.Where(u=>u.Executor != null).ToList();
|
|
|
}
|
|
|
|
|
|
public AddEditPage(Task selectedTask)
|
|
@@ -51,23 +42,14 @@ namespace ROGOZ.Pages
|
|
|
InitializeComponent();
|
|
|
_currentTask = selectedTask;
|
|
|
CmbStatus.ItemsSource = Status.FillStatus();
|
|
|
- //CmbExecutor.ItemsSource = user1Entities.GetContext().User.ToList();
|
|
|
+ //CmbExecutor.ItemsSource = user1Entities.GetContext().Executor.ToList();
|
|
|
+
|
|
|
+ CmbExecutor.ItemsSource = _context.User.Where(u => u.Executor != null).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)
|
|
|
{
|
|
@@ -104,6 +86,7 @@ namespace ROGOZ.Pages
|
|
|
{
|
|
|
//ExecutorID = int.Parse(CmbExecutor.SelectedItem.ToString()),
|
|
|
ExecutorID = (CmbExecutor.SelectedItem as User)?.ID ?? 0,
|
|
|
+ //ExecutorID =int.Parse(CmbExecutor.Text),
|
|
|
Title = TaskNameTB.Text,
|
|
|
Description = TaskDescriptionTB.Text,
|
|
|
CreateDateTime = DateTime.Parse(DPCreateDateTime.Text),
|
|
@@ -119,33 +102,6 @@ namespace ROGOZ.Pages
|
|
|
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
|
|
|
{
|