admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'Feature/program-manager/set-user-time' into Main

Browse Source
This commit is contained in:
mahan
2026-01-01 13:17:24 +03:30
parent de4e2de2e7 f99f199a77
commit a22dbd8811
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQuery.cs
View File

@@ -6,7 +6,7 @@ namespace GozareshgirProgramManager.Application.Modules.Projects.Queries.Project
public record ProjectSetTimeDetailsQuery(Guid TaskId) public record ProjectSetTimeDetailsQuery(Guid TaskId)
: IBaseQuery<ProjectSetTimeResponse>; : IBaseQuery<ProjectSetTimeResponse>;
public record ProjectSetTimeResponse( public record ProjectSetTimeResponse(
List<ProjectSetTimeResponseSkill> SectionItems, List<ProjectSetTimeResponseSkill> SkillItems,
Guid Id, Guid Id,
ProjectHierarchyLevel Level); ProjectHierarchyLevel Level);
@@ -29,4 +29,5 @@ public class ProjectSetTimeResponseSectionAdditionalTime
public int Hours { get; init; } public int Hours { get; init; }
public int Minutes { get; init; } public int Minutes { get; init; }
public string Description { get; init; } public string Description { get; init; }
public string CreationDate { get; set; }
} }

6
ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/Projects/Queries/ProjectSetTimeDetails/ProjectSetTimeDetailsQueryHandler.cs
View File

@@ -60,7 +60,9 @@ public class ProjectSetTimeDetailsQueryHandler
{ {
Description = x.Reason ?? "", Description = x.Reason ?? "",
Hours = (int)x.Hours.TotalHours, Hours = (int)x.Hours.TotalHours,
Minutes = x.Hours.Minutes Minutes = x.Hours.Minutes,
CreationDate = x.CreationDate.ToFarsi()
}).ToList(), }).ToList(),
InitCreationTime = ts.CreationDate.ToFarsi(), InitCreationTime = ts.CreationDate.ToFarsi(),
SkillName = skill?.Name ?? "", SkillName = skill?.Name ?? "",
@@ -70,7 +72,7 @@ public class ProjectSetTimeDetailsQueryHandler
InitialHours = (int)ts.InitialEstimatedHours.TotalHours, InitialHours = (int)ts.InitialEstimatedHours.TotalHours,
InitialMinutes = ts.InitialEstimatedHours.Minutes, InitialMinutes = ts.InitialEstimatedHours.Minutes,
}; };
}).ToList(), }).OrderBy(x=>x.SkillId).ToList(),
task.Id, task.Id,
ProjectHierarchyLevel.Task); ProjectHierarchyLevel.Task);