Task Groups

Author: strongtigerman

src/Dto/TaskFullDto.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Runtime.Serialization;
 
 namespace Morph.Server.Sdk.Dto
@@ -19,7 +20,12 @@ internal class TaskFullDto
 
         [DataMember(Name = "name")]
         public string Name { get; set; } = string.Empty;
-        
-        
+        [DataMember(Name = "group")]
+        public string Group { get; set; } = string.Empty;
+
+        [DataMember(Name = "schedules")]
+        public ScheduleBaseDto[] Schedules { get; set; } = Array.Empty<ScheduleBaseDto>();
+
+
     }
 }

src/Dto/TaskShortDto.cs

@@ -27,7 +27,9 @@ internal class TaskShortDto
         public string Name { get; set; } = string.Empty;
 
         [DataMember(Name="nextRunText")]
-        public string NextRunText { get; set; } = "";
-     
+        public string NextRunText { get; set; } = string.Empty;
+        [DataMember(Name = "group")]
+        public string Group { get; set; } = string.Empty;
+
     }
 }

src/Mappers/SpaceTaskMapper.cs

@@ -23,6 +23,7 @@ public static SpaceTasksListItem MapItem(TaskShortDto dto)
                 TaskName = dto.Name,
                 Note = dto.Note,
                 ProjectPath = dto.ProjectFile,
+                Group = dto.Group ?? string.Empty,
                 Schedules = dto.Schedules?
                     .Select(sdto => new TaskSchedule { ScheduleType = sdto.ScheduleType, ScheduleDescription = sdto.ScheduleAsText })
                     .ToArray() ?? new[] { NoSchedule }
@@ -38,6 +39,10 @@ public static SpaceTask MapFull(TaskFullDto fullDto)
                 TaskName = fullDto.Name,
                 Note = fullDto.Note,
                 ProjectPath = fullDto.ProjectFile,
+                Group = fullDto.Group ?? string.Empty,
+                Schedules = fullDto.Schedules?
+                    .Select(sdto => new TaskSchedule { ScheduleType = sdto.ScheduleType, ScheduleDescription = sdto.ScheduleAsText })
+                    .ToArray() ?? new[] { NoSchedule }
             };
             if(fullDto.Parameters  != null)
             {

src/Model/SpaceTaskListItem.cs

@@ -10,12 +10,12 @@ public class SpaceTasksListItem
         public string ProjectPath { get; internal set; } = string.Empty;
         public string Note { get; internal set; } = string.Empty;
 
-        public TaskSchedule[] Schedules { get; internal set; } = Array.Empty<TaskSchedule>();
-        //public List<TaskParameter> TaskParameters { get; internal set; } = new List<TaskParameter>();
-        //public string StatusText { get; internal set; } = string.Empty;
+        public TaskSchedule[] Schedules { get; internal set; } = Array.Empty<TaskSchedule>();        
         public bool Enabled { get; internal set; } = false;
-        //public bool IsRunning { get; internal set; } = false;
-        //public TaskState TaskState { get; internal set; } = TaskState.Disabled;
+
+        public string Group { get; internal set; } = string.Empty;
+
+
     }
 
     public sealed class SpaceTask : SpaceTasksListItem