admin/marco.pms.api
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Added WorkCategoryName and WorkCategoryId Parameters in view models

Browse Source
This commit is contained in:
ashutosh.nehete 2025-07-02 13:15:28 +05:30
parent 8353c384a5
commit 1f5a71ef09
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Marco.Pms.Services/Controllers/ImageController.cs
View File

@ -81,8 +81,9 @@ namespace Marco.Pms.Services.Controllers
var workItems = await _context.WorkItems var workItems = await _context.WorkItems
.Include(wi => wi.ActivityMaster) .Include(wi => wi.ActivityMaster)
.Include(wi => wi.WorkCategoryMaster)
.Where(wi => workAreaIds.Contains(wi.WorkAreaId)) .Where(wi => workAreaIds.Contains(wi.WorkAreaId))
.Select(wi => new { wi.Id, wi.WorkAreaId, wi.ActivityMaster }) .Select(wi => new { wi.Id, wi.WorkAreaId, wi.ActivityMaster, wi.WorkCategoryMaster })
.ToListAsync(); .ToListAsync();
var workItemIds = workItems.Select(wi => wi.Id).ToList(); var workItemIds = workItems.Select(wi => wi.Id).ToList();
@ -163,6 +164,8 @@ namespace Marco.Pms.Services.Controllers
WorkAreaName = workArea?.AreaName, WorkAreaName = workArea?.AreaName,
TaskId = task?.Id, TaskId = task?.Id,
ActivityName = workItem?.ActivityMaster?.ActivityName, ActivityName = workItem?.ActivityMaster?.ActivityName,
WorkCategoryId = workItem?.WorkCategoryMaster?.Id,
WorkCategoryName = workItem?.WorkCategoryMaster?.Name,
CommentId = comment?.Id, CommentId = comment?.Id,
Comment = comment?.Comment Comment = comment?.Comment
}; };
@ -216,6 +219,7 @@ namespace Marco.Pms.Services.Controllers
uploadedBy = task.ReportedBy; uploadedBy = task.ReportedBy;
workItem = await _context.WorkItems workItem = await _context.WorkItems
.Include(wi => wi.ActivityMaster) .Include(wi => wi.ActivityMaster)
.Include(wi => wi.WorkCategoryMaster)
.FirstOrDefaultAsync(wi => wi.Id == task.WorkItemId); .FirstOrDefaultAsync(wi => wi.Id == task.WorkItemId);
source = "Report"; source = "Report";
} }
@ -230,6 +234,7 @@ namespace Marco.Pms.Services.Controllers
uploadedBy = comment?.Employee; uploadedBy = comment?.Employee;
workItem = await _context.WorkItems workItem = await _context.WorkItems
.Include(wi => wi.ActivityMaster) .Include(wi => wi.ActivityMaster)
.Include(wi => wi.WorkCategoryMaster)
.FirstOrDefaultAsync(wi => wi.Id == workItemId); .FirstOrDefaultAsync(wi => wi.Id == workItemId);
source = "Comment"; source = "Comment";
} }
@ -265,6 +270,8 @@ namespace Marco.Pms.Services.Controllers
WorkAreaName = workArea?.AreaName, WorkAreaName = workArea?.AreaName,
TaskId = task?.Id, TaskId = task?.Id,
ActivityName = workItem?.ActivityMaster?.ActivityName, ActivityName = workItem?.ActivityMaster?.ActivityName,
WorkCategoryId = workItem?.WorkCategoryMaster?.Id,
WorkCategoryName = workItem?.WorkCategoryMaster?.Name,
CommentId = comment?.Id, CommentId = comment?.Id,
Comment = comment?.Comment Comment = comment?.Comment
}).ToList(); }).ToList();