From 9b1a1d1fe7681c7e0cb5b38f1f5f382835b6df2a Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 14 Apr 2025 17:03:56 +0530
Subject: [PATCH] Fixed the error of empty checkList in get activities

---
 Marco.Pms.Model/Mapper/ActivitiesMapper.cs         | 5 +++--
 Marco.Pms.Services/Controllers/MasterController.cs | 7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
index 1076ce4..e5e42f9 100644
--- a/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
+++ b/Marco.Pms.Model/Mapper/ActivitiesMapper.cs
@@ -103,7 +103,7 @@ namespace Marco.Pms.Model.Mapper
                 AssignmentDate = taskAllocation.AssignmentDate,
                 PlannedTask = taskAllocation.PlannedTask,
                 CompletedTask = taskAllocation.CompletedTask,
-                AssignedBy = taskAllocation.Employee.ToEmployeeVMFromEmployee(),
+                AssignedBy = taskAllocation.Employee.ToBasicEmployeeVMFromEmployee(),
                 WorkItemId = taskAllocation.WorkItemId,
                 WorkItem = taskAllocation.WorkItem,
                 TenantId = taskAllocation.TenantId
@@ -144,12 +144,13 @@ namespace Marco.Pms.Model.Mapper
                 IsMandatory = checkList.IsMandatory,
             };
         }
-        public static ActivityCheckList ToActivityCheckListFromCreateCheckListDto(this CreateCheckListDto checkListDto,int tenantId)
+        public static ActivityCheckList ToActivityCheckListFromCreateCheckListDto(this CreateCheckListDto checkListDto,int tenantId,int activityId)
         {
             return new ActivityCheckList
             {
                 Id = checkListDto.Id,
                 Check = checkListDto.Check,
+                ActivityMasterId = activityId,
                 IsMandatory = checkListDto.IsMandatory,
                 TenantId = tenantId
             };
diff --git a/Marco.Pms.Services/Controllers/MasterController.cs b/Marco.Pms.Services/Controllers/MasterController.cs
index f1bb056..b1110f8 100644
--- a/Marco.Pms.Services/Controllers/MasterController.cs
+++ b/Marco.Pms.Services/Controllers/MasterController.cs
@@ -1,5 +1,4 @@
-using System.Diagnostics;
-using Marco.Pms.DataAccess.Data;
+using Marco.Pms.DataAccess.Data;
 using Marco.Pms.Model.Dtos.Activities;
 using Marco.Pms.Model.Entitlements;
 using Marco.Pms.Model.Mapper;
@@ -66,7 +65,7 @@ namespace Marco.Pms.Services.Controllers
                 List<ActivityCheckList> activityCheckList = new List<ActivityCheckList>();
                 foreach (var check in createActivity.CheckList)
                 {
-                    ActivityCheckList checkList = check.ToActivityCheckListFromCreateCheckListDto(tenantId);
+                    ActivityCheckList checkList = check.ToActivityCheckListFromCreateCheckListDto(tenantId,activityMaster.Id);
                     activityCheckList.Add(checkList);
                 }
                 _context.ActivityCheckLists.AddRange(activityCheckList);
@@ -100,7 +99,7 @@ namespace Marco.Pms.Services.Controllers
                     List<ActivityCheckList> activityCheckList = new List<ActivityCheckList>();
                     foreach (var check in createActivity.CheckList)
                     {
-                        ActivityCheckList checkList = check.ToActivityCheckListFromCreateCheckListDto(tenantId);
+                        ActivityCheckList checkList = check.ToActivityCheckListFromCreateCheckListDto(tenantId,activity.Id);
                         activityCheckList.Add(checkList);
                     }
                     _context.ActivityCheckLists.UpdateRange(activityCheckList);