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

Added the todays completed tasks

Browse Source
This commit is contained in:
ashutosh.nehete 2025-10-06 18:33:37 +05:30
parent 3bd38f3c68
commit 26acfec408
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Marco.Pms.Model/ViewModels/Report/ProjectStatisticReport.cs
View File

@ -18,6 +18,7 @@
public double TaskPercentage { get; set; } public double TaskPercentage { get; set; }
public int ReportPending { get; set; } public int ReportPending { get; set; }
public int TodaysAssignTasks { get; set; } public int TodaysAssignTasks { get; set; }
public int TodaysCompletedTasks { get; set; }
public List<TeamOnSite> TeamOnSite { get; set; } = new List<TeamOnSite>(); public List<TeamOnSite> TeamOnSite { get; set; } = new List<TeamOnSite>();
public List<PerformedTask> PerformedTasks { get; set; } = new List<PerformedTask>(); public List<PerformedTask> PerformedTasks { get; set; } = new List<PerformedTask>();
public List<PerformedAttendance> PerformedAttendance { get; set; } = new List<PerformedAttendance>(); public List<PerformedAttendance> PerformedAttendance { get; set; } = new List<PerformedAttendance>();

2
Marco.Pms.Services/Helpers/ReportHelper.cs
View File

@ -190,6 +190,7 @@ namespace Marco.Pms.Services.Helpers
double totalCompletedWork = workItems.Sum(w => w.CompletedWork); double totalCompletedWork = workItems.Sum(w => w.CompletedWork);
var todayAssignedTasks = tasks.Where(t => t.AssignmentDate.Date == reportDate).ToList(); 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(); var reportPending = tasks.Where(t => t.ReportedDate == null).ToList();
double totalPlannedTask = todayAssignedTasks.Sum(t => t.PlannedTask); double totalPlannedTask = todayAssignedTasks.Sum(t => t.PlannedTask);
@ -273,6 +274,7 @@ namespace Marco.Pms.Services.Helpers
statisticReport.TotalCompletedTask = totalCompletedTask; statisticReport.TotalCompletedTask = totalCompletedTask;
statisticReport.AttendancePercentage = totalCompletedTask > 0 ? (totalCompletedTask / totalPlannedTask) * 100 : 0; statisticReport.AttendancePercentage = totalCompletedTask > 0 ? (totalCompletedTask / totalPlannedTask) * 100 : 0;
statisticReport.TodaysAssignTasks = todayAssignedTasks.Count; statisticReport.TodaysAssignTasks = todayAssignedTasks.Count;
statisticReport.TodaysCompletedTasks = todaysCompletedTasks.Count;
statisticReport.ReportPending = reportPending.Count; statisticReport.ReportPending = reportPending.Count;
statisticReport.TeamOnSite = teamOnSite; statisticReport.TeamOnSite = teamOnSite;
statisticReport.PerformedTasks = performedTasks; statisticReport.PerformedTasks = performedTasks;