diff --git a/Marco.Pms.Model/ViewModels/DashBoard/ActivityReport.cs b/Marco.Pms.Model/ViewModels/DashBoard/ActivityReport.cs index 02cc945..259037b 100644 --- a/Marco.Pms.Model/ViewModels/DashBoard/ActivityReport.cs +++ b/Marco.Pms.Model/ViewModels/DashBoard/ActivityReport.cs @@ -5,5 +5,7 @@ public List? PerformedActivites { get; set; } public double TotalPlannedWork { get; set; } public double TotalCompletedWork { get; set; } + public int ReportPending { get; set; } + public int TodaysAssigned { get; set; } } } diff --git a/Marco.Pms.Model/ViewModels/DashBoard/PerformedActivites.cs b/Marco.Pms.Model/ViewModels/DashBoard/PerformedActivites.cs index 473b4e3..13f180d 100644 --- a/Marco.Pms.Model/ViewModels/DashBoard/PerformedActivites.cs +++ b/Marco.Pms.Model/ViewModels/DashBoard/PerformedActivites.cs @@ -6,8 +6,6 @@ public string? FloorName { get; set; } public string? WorkAreaName { get; set; } public string? ActivityName { get; set; } - public string? Comment { get; set; } - public double Pending { get; set; } public double AssignedToday { get; set; } public double CompletedToday { get; set; } diff --git a/Marco.Pms.Services/Controllers/DashboardController.cs b/Marco.Pms.Services/Controllers/DashboardController.cs index 72ca31d..9dcde97 100644 --- a/Marco.Pms.Services/Controllers/DashboardController.cs +++ b/Marco.Pms.Services/Controllers/DashboardController.cs @@ -159,7 +159,6 @@ namespace Marco.Pms.Services.Controllers return Ok(ApiResponse.SuccessResponse(projectDashboardVM, "Success", 200)); } - [HttpGet("teams")] public async Task GetTotalEmployees() { @@ -223,7 +222,7 @@ namespace Marco.Pms.Services.Controllers return NotFound(ApiResponse.ErrorResponse("No attendance entry was found for this employee", "No attendance entry was found for this employee", 404)); } - [HttpGet("project-attdendance/{projectId}")] + [HttpGet("project-attendance/{projectId}")] public async Task GetProjectAttendance(Guid projectId, [FromQuery] string? date) { Guid tenantId = _userHelper.GetTenantId(); @@ -277,7 +276,6 @@ namespace Marco.Pms.Services.Controllers return Ok(ApiResponse.SuccessResponse(projectAttendanceVM, $"Attendance record for project {project.Name} for date {currentDate.Date}", 200)); } - [HttpGet("activities/{projectId}")] public async Task GetActivities(Guid projectId, [FromQuery] string? date) { @@ -285,7 +283,6 @@ namespace Marco.Pms.Services.Controllers var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); DateTime currentDate = DateTime.UtcNow; - List? projectProgressionVMs = new List(); if (date != null && DateTime.TryParse(date, out currentDate) == false) { _logger.LogError($"user send invalid date"); @@ -333,8 +330,6 @@ namespace Marco.Pms.Services.Controllers Building building = buildings.FirstOrDefault(b => b.Id == floor.BuildingId) ?? new Building(); string buildingName = building.Name ?? ""; - double pending = workItem.PlannedWork - workItem.CompletedWork; - PerformedActivites performedTask = new PerformedActivites { ActivityName = activityName, @@ -342,17 +337,19 @@ namespace Marco.Pms.Services.Controllers FloorName = floorName, WorkAreaName = areaName, AssignedToday = task.PlannedTask, - Pending = pending, CompletedToday = task.CompletedTask, - Comment = task.Description }; performedActivites.Add(performedTask); } + var pendingReport = tasks.Where(t => t.ReportedDate == null).ToList().Count; + ActivityReport report = new ActivityReport { PerformedActivites = performedActivites, TotalCompletedWork = totalCompletedTask, - TotalPlannedWork = totalPlannedTask + TotalPlannedWork = totalPlannedTask, + ReportPending = pendingReport, + TodaysAssigned = tasks.Count }; _logger.LogInfo($"Record of performed activities for project {projectId} for date {currentDate.Date} by employee {LoggedInEmployee.Id}"); return Ok(ApiResponse.SuccessResponse(report, $"Record of performed activities for project {project.Name} for date {currentDate.Date}", 200));