From 1f5a71ef092ad64b72899cad369c35c49b9775a6 Mon Sep 17 00:00:00 2001 From: "ashutosh.nehete" Date: Wed, 2 Jul 2025 13:15:28 +0530 Subject: [PATCH] Added WorkCategoryName and WorkCategoryId Parameters in view models --- Marco.Pms.Services/Controllers/ImageController.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Marco.Pms.Services/Controllers/ImageController.cs b/Marco.Pms.Services/Controllers/ImageController.cs index 635d357..19af70f 100644 --- a/Marco.Pms.Services/Controllers/ImageController.cs +++ b/Marco.Pms.Services/Controllers/ImageController.cs @@ -81,8 +81,9 @@ namespace Marco.Pms.Services.Controllers var workItems = await _context.WorkItems .Include(wi => wi.ActivityMaster) + .Include(wi => wi.WorkCategoryMaster) .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(); var workItemIds = workItems.Select(wi => wi.Id).ToList(); @@ -163,6 +164,8 @@ namespace Marco.Pms.Services.Controllers WorkAreaName = workArea?.AreaName, TaskId = task?.Id, ActivityName = workItem?.ActivityMaster?.ActivityName, + WorkCategoryId = workItem?.WorkCategoryMaster?.Id, + WorkCategoryName = workItem?.WorkCategoryMaster?.Name, CommentId = comment?.Id, Comment = comment?.Comment }; @@ -216,6 +219,7 @@ namespace Marco.Pms.Services.Controllers uploadedBy = task.ReportedBy; workItem = await _context.WorkItems .Include(wi => wi.ActivityMaster) + .Include(wi => wi.WorkCategoryMaster) .FirstOrDefaultAsync(wi => wi.Id == task.WorkItemId); source = "Report"; } @@ -230,6 +234,7 @@ namespace Marco.Pms.Services.Controllers uploadedBy = comment?.Employee; workItem = await _context.WorkItems .Include(wi => wi.ActivityMaster) + .Include(wi => wi.WorkCategoryMaster) .FirstOrDefaultAsync(wi => wi.Id == workItemId); source = "Comment"; } @@ -265,6 +270,8 @@ namespace Marco.Pms.Services.Controllers WorkAreaName = workArea?.AreaName, TaskId = task?.Id, ActivityName = workItem?.ActivityMaster?.ActivityName, + WorkCategoryId = workItem?.WorkCategoryMaster?.Id, + WorkCategoryName = workItem?.WorkCategoryMaster?.Name, CommentId = comment?.Id, Comment = comment?.Comment }).ToList();