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 aee31370..b3600159 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 @@ -56,6 +56,7 @@ public class ProjectSetTimeDetailsQueryHandler var skills = await _context.Skills .AsNoTracking() + .OrderBy(x=>x.CreationDate) .ToListAsync(cancellationToken); var res = new ProjectSetTimeResponse( @@ -84,7 +85,7 @@ public class ProjectSetTimeDetailsQueryHandler UserId = section?.OriginalAssignedUserId ?? 0, SkillId = skill.Id, }; - }).OrderBy(x => x.SkillId).ToList(), + }).ToList(), task.Id, level); @@ -114,6 +115,7 @@ public class ProjectSetTimeDetailsQueryHandler var skills = await _context.Skills .AsNoTracking() + .OrderBy(x=>x.CreationDate) .ToListAsync(cancellationToken); var res = new ProjectSetTimeResponse( @@ -135,7 +137,7 @@ public class ProjectSetTimeDetailsQueryHandler UserId = section?.UserId ?? 0, SkillId = skill.Id, }; - }).OrderBy(x => x.SkillId).ToList(), + }).ToList(), phase.Id, level); @@ -165,6 +167,7 @@ public class ProjectSetTimeDetailsQueryHandler var skills = await _context.Skills .AsNoTracking() + .OrderBy(x=>x.CreationDate) .ToListAsync(cancellationToken); var res = new ProjectSetTimeResponse( @@ -186,7 +189,7 @@ public class ProjectSetTimeDetailsQueryHandler UserId = section?.UserId ?? 0, SkillId = skill.Id, }; - }).OrderBy(x => x.SkillId).ToList(), + }).ToList(), project.Id, level);