Marco.Pms.Model/Mapper/ActivitiesMapper.cs

@@ -103,11 +103,11 @@ namespace Marco.Pms.Model.Mapper
                 AssignmentDate = taskAllocation.AssignmentDate,
                 PlannedTask = taskAllocation.PlannedTask,
                 CompletedTask = taskAllocation.CompletedTask,
-                AssignedBy = taskAllocation.Employee.ToBasicEmployeeVMFromEmployee(),
+                AssignedBy = taskAllocation.Employee.ToEmployeeVMFromEmployee(),
                 WorkItemId = taskAllocation.WorkItemId,
                 WorkItem = taskAllocation.WorkItem,
-                TenantId = taskAllocation.TenantId,
+                TenantId = taskAllocation.TenantId
-                //CheckList = 
+
             };
         }
         public static CommentVM ToCommentVMFromTaskComment(this TaskComment comment)
@@ -119,7 +119,7 @@ namespace Marco.Pms.Model.Mapper
                 CommentDate = comment.CommentDate,
                 Comment = comment.Comment,
                 CommentedBy = comment.CommentedBy,
-                Employee = comment.Employee.ToBasicEmployeeVMFromEmployee()
+                Employee = comment.Employee.ToEmployeeVMFromEmployee()
             };
         }
 
@@ -144,13 +144,12 @@ namespace Marco.Pms.Model.Mapper
                 IsMandatory = checkList.IsMandatory,
             };
         }
-        public static ActivityCheckList ToActivityCheckListFromCreateCheckListDto(this CreateCheckListDto checkListDto,int tenantId,int activityId)
+        public static ActivityCheckList ToActivityCheckListFromCreateCheckListDto(this CreateCheckListDto checkListDto,int tenantId)
         {
             return new ActivityCheckList
             {
                 Id = checkListDto.Id,
                 Check = checkListDto.Check,
-                ActivityMasterId = activityId,
                 IsMandatory = checkListDto.IsMandatory,
                 TenantId = tenantId
             };

Marco.Pms.Model/Mapper/EmployeeMapper.cs

@@ -1,5 +1,4 @@
 using Marco.Pms.Model.Employees;
-using Marco.Pms.Model.ViewModels.Activities;
 using Marco.Pms.Model.ViewModels.Employee;
 
 namespace Marco.Pms.Model.Mapper
@@ -32,17 +31,5 @@ namespace Marco.Pms.Model.Mapper
                 JoiningDate = model.JoiningDate
             };
         }
-        public static BasicEmployeeVM ToBasicEmployeeVMFromEmployee(this Employee employee)
-        {
-            return new BasicEmployeeVM
-            {
-                Id = employee.Id,
-                FirstName = employee.FirstName,
-                LastName = employee.LastName,
-                Photo = employee.Photo,
-                JobRoleId = employee.JobRoleId,
-                JobRoleName = employee.JobRole.Name
-            };
-        }
     }
 }

Marco.Pms.Model/ViewModels/Activities/BasicEmployeeVM.cs

@@ -1,14 +0,0 @@
-using System;
-
-namespace Marco.Pms.Model.ViewModels.Activities
-{
-    public class BasicEmployeeVM
-    {
-        public int Id { get; set; }
-        public string? FirstName { get; set; }
-        public string? LastName { get; set; }
-        public byte[]? Photo { get; set; }
-        public int? JobRoleId { get; set; }
-        public string? JobRoleName { get; set; }
-    }
-}

Marco.Pms.Model/ViewModels/Activities/CommentVM.cs

@@ -9,6 +9,6 @@ namespace Marco.Pms.Model.ViewModels.Activities
         public DateTime CommentDate { get; set; }
         public string? Comment { get; set; }
         public int CommentedBy { get; set; }
-        public BasicEmployeeVM? Employee { get; set; }
+        public EmployeeVM? Employee { get; set; }
     }
 }

Marco.Pms.Model/ViewModels/Activities/ListTaskVM.cs

@@ -9,12 +9,11 @@ namespace Marco.Pms.Model.ViewModels.Activities
         public DateTime AssignmentDate { get; set; }
         public double PlannedTask { get; set; }
         public double CompletedTask { get; set; }
-        public BasicEmployeeVM? AssignedBy { get; set; }
+        public EmployeeVM? AssignedBy { get; set; }
         public int WorkItemId { get; set; }
         public WorkItem? WorkItem { get; set; }
         public int TenantId { get; set; }
-        public List<BasicEmployeeVM>? teamMembers { get; set; }
+        public List<EmployeeVM>? teamMembers { get; set; }
         public List<CommentVM>? comments { get; set; }
-        public  List<CheckListVM>? CheckList { get; set; }
     }
 }

Marco.Pms.Services/Controllers/MasterController.cs

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

Marco.Pms.Services/Controllers/TaskController.cs

@@ -2,7 +2,6 @@
 using Marco.Pms.Model.Activities;
 using Marco.Pms.Model.Dtos.Activities;
 using Marco.Pms.Model.Employees;
-using Marco.Pms.Model.Entitlements;
 using Marco.Pms.Model.Mapper;
 using Marco.Pms.Model.Projects;
 using Marco.Pms.Model.Utilities;
@@ -177,17 +176,10 @@ namespace MarcoBMS.Services.Controllers
 
             List<WorkItem> workItems = await _context.WorkItems.Where(i => idList.Contains(i.WorkAreaId) && i.TenantId == tenantId).Include(i => i.ActivityMaster).ToListAsync();
             idList = workItems.Select(i => i.Id).ToList();
-            var activityIdList = workItems.Select(i => i.ActivityId).ToList();
 
             List<TaskAllocation> taskAllocations = await _context.TaskAllocations.Where(t => idList.Contains(t.WorkItemId) && t.AssignmentDate.Date >= fromDate.Date && t.AssignmentDate.Date <= toDate.Date && t.TenantId == tenantId).Include(t => t.WorkItem).Include(t=>t.Employee).ToListAsync();
             var taskIdList = taskAllocations.Select(t => t.Id).ToList();
-
+            List<TaskMembers> teamMembers = await _context.TaskMembers.Where(t => taskIdList.Contains(t.TaskAllocationId)).Include(t => t.Employee).ToListAsync();
-            List<TaskMembers> teamMembers = await _context.TaskMembers.Where(t => taskIdList.Contains(t.TaskAllocationId)).ToListAsync();
-            var employeeIdList = teamMembers.Select(e => e.EmployeeId).ToList();
-
-            
-
-            List<Employee> employees = await _context.Employees.Where(e => employeeIdList.Contains(e.Id)).Include(e => e.JobRole).ToListAsync();
 
             List<ListTaskVM> tasks = new List<ListTaskVM>();
             //foreach (var workItem in workItems)
@@ -198,15 +190,12 @@ namespace MarcoBMS.Services.Controllers
                     var response = taskAllocation.ToListTaskVMFromTaskAllocation();
 
                     List<TaskComment> comments = await _context.TaskComments.Where(c => c.TaskAllocationId == taskAllocation.Id).ToListAsync();
-                    List<BasicEmployeeVM> team = new List<BasicEmployeeVM>();
+                    List<EmployeeVM> team = new List<EmployeeVM>();
-                    List<TaskMembers> taskMembers = teamMembers.Where(m => m.TaskAllocationId == taskAllocation.Id).ToList();
+                    foreach (var taskMember in teamMembers)
-
-                    foreach (var taskMember in taskMembers)
                     {
-                    var teamMember = employees.Find(e => e.Id == taskMember.EmployeeId);
+                        if(taskMember != null)
-                        if(teamMember != null)
                         {
-                            team.Add(teamMember.ToBasicEmployeeVMFromEmployee());
+                            team.Add(taskMember.Employee.ToEmployeeVMFromEmployee());
                         }
                     }
                     List<CommentVM> commentVM = new List<CommentVM> { };
@@ -214,14 +203,8 @@ namespace MarcoBMS.Services.Controllers
                     {
                         commentVM.Add(comment.ToCommentVMFromTaskComment());
                     }
-                    List<ActivityCheckList> checkLists = await _context.ActivityCheckLists.Where(x => x.ActivityMasterId == taskAllocation.WorkItem.ActivityId).ToListAsync();
-                    List<CheckListVM>checkList = new List<CheckListVM>();
-                    foreach (var check in checkLists) {
-                        checkList.Add(check.ToCheckListVMFromActivityCheckList(check.ActivityMasterId));
-                    }
                     response.comments = commentVM;
                     response.teamMembers = team;
-                    response.CheckList = checkList;
                     tasks.Add(response);
                 }
                 

Marco.Pms.Services/appsettings.json

@@ -64,7 +64,8 @@
 
     "ConnectionStrings": {
         // "DefaultConnectionString": "Server=103.50.160.45;User ID=marcowvh_admin;Password=Marcoemp@123;Database=marcowvh_empattendanceci",
-        "DefaultConnectionString": "Server=localhost;port=3306;User ID=root;Password=root;Database=MarcoBMS2"
+        //"DefaultConnectionString": "Server=localhost;port=3306;User ID=root;Password=root;Database=MarcoBMS2"
+        "DefaultConnectionString": "Server=localhost;port=3306;User ID=root;Password=Ashutosh;Database=MarcoBMS2"
         //"DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMS1"
     },
   "AppSettings": {