diff --git a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQuery.cs b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQuery.cs index 764d5127..d0bfd45f 100644 --- a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQuery.cs +++ b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQuery.cs @@ -6,7 +6,7 @@ namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.Project public record ProjectSetTimeDetailsQuery(Guid TaskId) : IBaseQuery; public record ProjectSetTimeResponse( - List SectionItems, + List SkillItems, Guid Id, ProjectHierarchyLevel Level); @@ -29,4 +29,5 @@ public class ProjectSetTimeResponseSectionAdditionalTime public int Hours { get; init; } public int Minutes { get; init; } public string Description { get; init; } + public string CreationDate { get; set; } } diff --git a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQueryHandler.cs b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQueryHandler.cs index 38e3d8e9..f57dd1c3 100644 --- a/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQueryHandler.cs +++ b/ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQueryHandler.cs @@ -60,7 +60,9 @@ public class ProjectSetTimeDetailsQueryHandler { Description = x.Reason ?? "", Hours = (int)x.Hours.TotalHours, - Minutes = x.Hours.Minutes + Minutes = x.Hours.Minutes, + CreationDate = x.CreationDate.ToFarsi() + }).ToList(), InitCreationTime = ts.CreationDate.ToFarsi(), SkillName = skill?.Name ?? "", @@ -70,7 +72,7 @@ public class ProjectSetTimeDetailsQueryHandler InitialHours = (int)ts.InitialEstimatedHours.TotalHours, InitialMinutes = ts.InitialEstimatedHours.Minutes, }; - }).ToList(), + }).OrderBy(x=>x.SkillId).ToList(), task.Id, ProjectHierarchyLevel.Task);