diff --git a/Marco.Pms.Model/ViewModels/Report/ProjectStatisticReport.cs b/Marco.Pms.Model/ViewModels/Report/ProjectStatisticReport.cs index 17847aa..dbf1f45 100644 --- a/Marco.Pms.Model/ViewModels/Report/ProjectStatisticReport.cs +++ b/Marco.Pms.Model/ViewModels/Report/ProjectStatisticReport.cs @@ -18,6 +18,7 @@ public double TaskPercentage { get; set; } public int ReportPending { get; set; } public int TodaysAssignTasks { get; set; } + public int TodaysCompletedTasks { get; set; } public List TeamOnSite { get; set; } = new List(); public List PerformedTasks { get; set; } = new List(); public List PerformedAttendance { get; set; } = new List(); diff --git a/Marco.Pms.Services/Helpers/ReportHelper.cs b/Marco.Pms.Services/Helpers/ReportHelper.cs index 0374fd6..573c8b8 100644 --- a/Marco.Pms.Services/Helpers/ReportHelper.cs +++ b/Marco.Pms.Services/Helpers/ReportHelper.cs @@ -190,6 +190,7 @@ namespace Marco.Pms.Services.Helpers double totalCompletedWork = workItems.Sum(w => w.CompletedWork); var todayAssignedTasks = tasks.Where(t => t.AssignmentDate.Date == reportDate).ToList(); + var todaysCompletedTasks = tasks.Where(t => t.AssignmentDate.Date == reportDate && t.ReportedById != null).ToList(); var reportPending = tasks.Where(t => t.ReportedDate == null).ToList(); double totalPlannedTask = todayAssignedTasks.Sum(t => t.PlannedTask); @@ -273,6 +274,7 @@ namespace Marco.Pms.Services.Helpers statisticReport.TotalCompletedTask = totalCompletedTask; statisticReport.AttendancePercentage = totalCompletedTask > 0 ? (totalCompletedTask / totalPlannedTask) * 100 : 0; statisticReport.TodaysAssignTasks = todayAssignedTasks.Count; + statisticReport.TodaysCompletedTasks = todaysCompletedTasks.Count; statisticReport.ReportPending = reportPending.Count; statisticReport.TeamOnSite = teamOnSite; statisticReport.PerformedTasks = performedTasks;