|
@@ -37,7 +37,7 @@ namespace ROGOZ.Pages
|
|
|
CmbTaskType.ItemsSource = WorkType.FillWorkType();
|
|
|
foreach (var user in _context.User.ToList())
|
|
|
{
|
|
|
- listUsers.Add(user.getFIO());
|
|
|
+ listUsers.Add(user.getFamilia());
|
|
|
}
|
|
|
CmbExecutor.ItemsSource = listUsers;
|
|
|
}
|
|
@@ -49,8 +49,8 @@ namespace ROGOZ.Pages
|
|
|
//DPDeadLine.SelectedDate = DateTime.Today;
|
|
|
_currentTask = selectedTask;
|
|
|
CmbStatus.ItemsSource = Status.FillStatus();
|
|
|
- //CmbExecutor.ItemsSource = user1Entities.GetContext().Executor.ToList();
|
|
|
- CmbExecutor.ItemsSource = listUsers;
|
|
|
+ CmbExecutor.ItemsSource = user1Entities.GetContext().User.ToList();
|
|
|
+ //CmbExecutor.ItemsSource = listUsers;
|
|
|
CmbTaskType.ItemsSource = WorkType.FillWorkType();
|
|
|
if (selectedTask != null)
|
|
|
_currentTask = selectedTask;
|
|
@@ -58,7 +58,7 @@ namespace ROGOZ.Pages
|
|
|
|
|
|
foreach (var user in _context.User.ToList())
|
|
|
{
|
|
|
- listUsers.Add(user.getFIO());
|
|
|
+ listUsers.Add(user.getFamilia());
|
|
|
}
|
|
|
CmbExecutor.ItemsSource = listUsers;
|
|
|
}
|
|
@@ -96,8 +96,8 @@ namespace ROGOZ.Pages
|
|
|
{
|
|
|
var selectedTask = new Task
|
|
|
{
|
|
|
- //ExecutorID = int.Parse(CmbExecutor.Text),
|
|
|
- Executor = user1Entities.GetContext().Executor.FirstOrDefault(o=>o.User.getFIO()== CmbExecutor.Text),
|
|
|
+ ExecutorID = CmbExecutor.TabIndex,
|
|
|
+ //Executor = user1Entities.GetContext().Executor.FirstOrDefault(o=>o.User.getFamilia()== CmbExecutor.Text),
|
|
|
Title = TaskNameTB.Text,
|
|
|
Description = TaskDescriptionTB.Text,
|
|
|
CreateDateTime = DateTime.Parse(DPCreateDateTime.Text),
|