|
@@ -730,9 +730,9 @@ public partial class TasksByStatusControl : UserControl, ITaskControl, INotifyPr
|
|
|
|
|
|
#region Refresh
|
|
|
|
|
|
- private static Columns<IKanban> GetKanbanColumns()
|
|
|
+ private static Columns<Kanban> GetKanbanColumns()
|
|
|
{
|
|
|
- return new Columns<IKanban>(
|
|
|
+ return new Columns<Kanban>(
|
|
|
x => x.ID,
|
|
|
x => x.DueDate,
|
|
|
x => x.Completed,
|
|
@@ -749,6 +749,7 @@ public partial class TasksByStatusControl : UserControl, ITaskControl, INotifyPr
|
|
|
x => x.Type.Code,
|
|
|
x => x.Number,
|
|
|
x => x.Attachments,
|
|
|
+ x => x.EstimatedTime,
|
|
|
x => x.Locked);
|
|
|
}
|
|
|
|
|
@@ -756,7 +757,7 @@ public partial class TasksByStatusControl : UserControl, ITaskControl, INotifyPr
|
|
|
{
|
|
|
using var cursor = new WaitCursor();
|
|
|
|
|
|
- IEnumerable<IKanban> kanbans;
|
|
|
+ IEnumerable<Kanban> kanbans;
|
|
|
if (SelectedEmployee.ID != CoreUtils.FullGuid && SelectedEmployee.ID != Guid.Empty)
|
|
|
{
|
|
|
kanbans = Client.Query(
|
|
@@ -777,7 +778,7 @@ public partial class TasksByStatusControl : UserControl, ITaskControl, INotifyPr
|
|
|
AllTasks = CreateModels(kanbans).ToList();
|
|
|
FilterKanbans();
|
|
|
}
|
|
|
- private IEnumerable<TaskModel> CreateModels(IEnumerable<IKanban> kanbans)
|
|
|
+ private IEnumerable<TaskModel> CreateModels(IEnumerable<Kanban> kanbans)
|
|
|
{
|
|
|
foreach(var kanban in kanbans)
|
|
|
{
|
|
@@ -811,6 +812,7 @@ public partial class TasksByStatusControl : UserControl, ITaskControl, INotifyPr
|
|
|
model.DueDate = kanban.DueDate;
|
|
|
model.CompletedDate = kanban.Completed;
|
|
|
model.Locked = kanban.Locked;
|
|
|
+ model.EstimatedTime = kanban.EstimatedTime;
|
|
|
|
|
|
var notes = new List<List<string>> { new() };
|
|
|
if (kanban.Notes is not null)
|
|
@@ -911,7 +913,6 @@ public partial class TasksByStatusControl : UserControl, ITaskControl, INotifyPr
|
|
|
/// </summary>
|
|
|
private void FilterKanbans()
|
|
|
{
|
|
|
- Progress.Show("Loading");
|
|
|
IEnumerable<TaskModel> filtered;
|
|
|
if (JobFilterID == Guid.Empty)
|
|
|
{
|
|
@@ -948,6 +949,7 @@ public partial class TasksByStatusControl : UserControl, ITaskControl, INotifyPr
|
|
|
{
|
|
|
column.Tasks.Clear();
|
|
|
}
|
|
|
+
|
|
|
foreach (var task in filtered)
|
|
|
{
|
|
|
var column = GetColumn(task.Category);
|
|
@@ -957,7 +959,6 @@ public partial class TasksByStatusControl : UserControl, ITaskControl, INotifyPr
|
|
|
SelectedTasks.Add(task);
|
|
|
}
|
|
|
}
|
|
|
- Progress.Close();
|
|
|
}
|
|
|
|
|
|
#endregion
|