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

Fixed the error of empty checkList in get activities

Browse Source
This commit is contained in:
ashutosh.nehete 2025-04-14 17:03:56 +05:30
parent 40d9c335c4
commit 9b1a1d1fe7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Marco.Pms.Model/Mapper/ActivitiesMapper.cs
View File

@ -103,7 +103,7 @@ namespace Marco.Pms.Model.Mapper
AssignmentDate = taskAllocation.AssignmentDate, AssignmentDate = taskAllocation.AssignmentDate,
PlannedTask = taskAllocation.PlannedTask, PlannedTask = taskAllocation.PlannedTask,
CompletedTask = taskAllocation.CompletedTask, CompletedTask = taskAllocation.CompletedTask,
AssignedBy = taskAllocation.Employee.ToEmployeeVMFromEmployee(), AssignedBy = taskAllocation.Employee.ToBasicEmployeeVMFromEmployee(),
WorkItemId = taskAllocation.WorkItemId, WorkItemId = taskAllocation.WorkItemId,
WorkItem = taskAllocation.WorkItem, WorkItem = taskAllocation.WorkItem,
TenantId = taskAllocation.TenantId TenantId = taskAllocation.TenantId
@ -144,12 +144,13 @@ namespace Marco.Pms.Model.Mapper
IsMandatory = checkList.IsMandatory, 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 return new ActivityCheckList
{ {
Id = checkListDto.Id, Id = checkListDto.Id,
Check = checkListDto.Check, Check = checkListDto.Check,
ActivityMasterId = activityId,
IsMandatory = checkListDto.IsMandatory, IsMandatory = checkListDto.IsMandatory,
TenantId = tenantId TenantId = tenantId
}; };

7
Marco.Pms.Services/Controllers/MasterController.cs
View File

@ -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.Dtos.Activities;
using Marco.Pms.Model.Entitlements; using Marco.Pms.Model.Entitlements;
using Marco.Pms.Model.Mapper; using Marco.Pms.Model.Mapper;
@ -66,7 +65,7 @@ namespace Marco.Pms.Services.Controllers
List<ActivityCheckList> activityCheckList = new List<ActivityCheckList>(); List<ActivityCheckList> activityCheckList = new List<ActivityCheckList>();
foreach (var check in createActivity.CheckList) foreach (var check in createActivity.CheckList)
{ {
ActivityCheckList checkList = check.ToActivityCheckListFromCreateCheckListDto(tenantId); ActivityCheckList checkList = check.ToActivityCheckListFromCreateCheckListDto(tenantId,activityMaster.Id);
activityCheckList.Add(checkList); activityCheckList.Add(checkList);
} }
_context.ActivityCheckLists.AddRange(activityCheckList); _context.ActivityCheckLists.AddRange(activityCheckList);
@ -100,7 +99,7 @@ namespace Marco.Pms.Services.Controllers
List<ActivityCheckList> activityCheckList = new List<ActivityCheckList>(); List<ActivityCheckList> activityCheckList = new List<ActivityCheckList>();
foreach (var check in createActivity.CheckList) foreach (var check in createActivity.CheckList)
{ {
ActivityCheckList checkList = check.ToActivityCheckListFromCreateCheckListDto(tenantId); ActivityCheckList checkList = check.ToActivityCheckListFromCreateCheckListDto(tenantId,activity.Id);
activityCheckList.Add(checkList); activityCheckList.Add(checkList);
} }
_context.ActivityCheckLists.UpdateRange(activityCheckList); _context.ActivityCheckLists.UpdateRange(activityCheckList);