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-04 13:03:40 +03:30
parent 5d2a917168 6f64ee1ce4
commit 0d0f643058
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,22 +40,20 @@ public class ProjectSetTimeDetailsQueryHandler
.Where(x => userIds.Contains(x.Id))
.AsNoTracking()
.ToListAsync(cancellationToken);
var skillIds = task.Sections.Select(x => x.SkillId)
.Distinct().ToList();
var skills = await _context.Skills
.Where(x => skillIds.Contains(x.Id))
.AsNoTracking()
.ToListAsync(cancellationToken);
var res = new ProjectSetTimeResponse(
task.Sections.Select(ts =>
skills.Select(skill =>
{
var user = users.FirstOrDefault(x => x.Id == ts.OriginalAssignedUserId);
var skill = skills.FirstOrDefault(x => x.Id == ts.SkillId);
var section = task.Sections
.FirstOrDefault(x => x.SkillId == skill.Id);
var user = users.FirstOrDefault(x => x.Id == section?.OriginalAssignedUserId);
return new ProjectSetTimeResponseSkill
{
AdditionalTimes = ts.AdditionalTimes
AdditionalTimes = section?.AdditionalTimes
.Select(x => new ProjectSetTimeResponseSectionAdditionalTime
{
Description = x.Reason ?? "",
@@ -63,16 +61,16 @@ public class ProjectSetTimeDetailsQueryHandler
Minutes = x.Hours.Minutes,
CreationDate = x.CreationDate.ToFarsi()
}).ToList(),
InitCreationTime = ts.CreationDate.ToFarsi(),
}).OrderBy(x=>x.CreationDate).ToList()??[],
InitCreationTime = section?.CreationDate.ToFarsi()??"",
SkillName = skill?.Name ?? "",
UserFullName = user?.FullName ?? "",
SectionId = ts.Id,
InitialDescription = ts.InitialDescription ?? "",
InitialHours = (int)ts.InitialEstimatedHours.TotalHours,
InitialMinutes = ts.InitialEstimatedHours.Minutes,
UserId = ts.OriginalAssignedUserId,
SkillId = ts.SkillId,
SectionId = section?.Id??Guid.Empty,
InitialDescription = section?.InitialDescription ?? "",
InitialHours = (int)(section?.InitialEstimatedHours.TotalHours ?? 0),
InitialMinutes = section?.InitialEstimatedHours.Minutes??0,
UserId = section?.OriginalAssignedUserId??0,
SkillId = task.Id,
};
}).OrderBy(x=>x.SkillId).ToList(),
task.Id,