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

Added pending report and todays assigned conut in activity report view model

Browse Source
This commit is contained in:
ashutosh.nehete 2025-05-31 09:46:29 +05:30
parent b479c7cf19
commit 2f3203c524
3 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marco.Pms.Model/ViewModels/DashBoard/ActivityReport.cs
View File

@ -5,5 +5,7 @@
public List<PerformedActivites>? PerformedActivites { get; set; } public List<PerformedActivites>? PerformedActivites { get; set; }
public double TotalPlannedWork { get; set; } public double TotalPlannedWork { get; set; }
public double TotalCompletedWork { get; set; } public double TotalCompletedWork { get; set; }
public int ReportPending { get; set; }
public int TodaysAssigned { get; set; }
} }
} }

2
Marco.Pms.Model/ViewModels/DashBoard/PerformedActivites.cs
View File

@ -6,8 +6,6 @@
public string? FloorName { get; set; } public string? FloorName { get; set; }
public string? WorkAreaName { get; set; } public string? WorkAreaName { get; set; }
public string? ActivityName { get; set; } public string? ActivityName { get; set; }
public string? Comment { get; set; }
public double Pending { get; set; }
public double AssignedToday { get; set; } public double AssignedToday { get; set; }
public double CompletedToday { get; set; } public double CompletedToday { get; set; }

15
Marco.Pms.Services/Controllers/DashboardController.cs
View File

@ -159,7 +159,6 @@ namespace Marco.Pms.Services.Controllers
return Ok(ApiResponse<object>.SuccessResponse(projectDashboardVM, "Success", 200)); return Ok(ApiResponse<object>.SuccessResponse(projectDashboardVM, "Success", 200));
} }
[HttpGet("teams")] [HttpGet("teams")]
public async Task<IActionResult> GetTotalEmployees() public async Task<IActionResult> GetTotalEmployees()
{ {
@ -223,7 +222,7 @@ namespace Marco.Pms.Services.Controllers
return NotFound(ApiResponse<object>.ErrorResponse("No attendance entry was found for this employee", "No attendance entry was found for this employee", 404)); return NotFound(ApiResponse<object>.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<IActionResult> GetProjectAttendance(Guid projectId, [FromQuery] string? date) public async Task<IActionResult> GetProjectAttendance(Guid projectId, [FromQuery] string? date)
{ {
Guid tenantId = _userHelper.GetTenantId(); Guid tenantId = _userHelper.GetTenantId();
@ -277,7 +276,6 @@ namespace Marco.Pms.Services.Controllers
return Ok(ApiResponse<object>.SuccessResponse(projectAttendanceVM, $"Attendance record for project {project.Name} for date {currentDate.Date}", 200)); return Ok(ApiResponse<object>.SuccessResponse(projectAttendanceVM, $"Attendance record for project {project.Name} for date {currentDate.Date}", 200));
} }
[HttpGet("activities/{projectId}")] [HttpGet("activities/{projectId}")]
public async Task<IActionResult> GetActivities(Guid projectId, [FromQuery] string? date) public async Task<IActionResult> GetActivities(Guid projectId, [FromQuery] string? date)
{ {
@ -285,7 +283,6 @@ namespace Marco.Pms.Services.Controllers
var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync(); var LoggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
DateTime currentDate = DateTime.UtcNow; DateTime currentDate = DateTime.UtcNow;
List<ProjectProgressionVM>? projectProgressionVMs = new List<ProjectProgressionVM>();
if (date != null && DateTime.TryParse(date, out currentDate) == false) if (date != null && DateTime.TryParse(date, out currentDate) == false)
{ {
_logger.LogError($"user send invalid date"); _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(); Building building = buildings.FirstOrDefault(b => b.Id == floor.BuildingId) ?? new Building();
string buildingName = building.Name ?? ""; string buildingName = building.Name ?? "";
double pending = workItem.PlannedWork - workItem.CompletedWork;
PerformedActivites performedTask = new PerformedActivites PerformedActivites performedTask = new PerformedActivites
{ {
ActivityName = activityName, ActivityName = activityName,
@ -342,17 +337,19 @@ namespace Marco.Pms.Services.Controllers
FloorName = floorName, FloorName = floorName,
WorkAreaName = areaName, WorkAreaName = areaName,
AssignedToday = task.PlannedTask, AssignedToday = task.PlannedTask,
Pending = pending,
CompletedToday = task.CompletedTask, CompletedToday = task.CompletedTask,
Comment = task.Description
}; };
performedActivites.Add(performedTask); performedActivites.Add(performedTask);
} }
var pendingReport = tasks.Where(t => t.ReportedDate == null).ToList().Count;
ActivityReport report = new ActivityReport ActivityReport report = new ActivityReport
{ {
PerformedActivites = performedActivites, PerformedActivites = performedActivites,
TotalCompletedWork = totalCompletedTask, 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}"); _logger.LogInfo($"Record of performed activities for project {projectId} for date {currentDate.Date} by employee {LoggedInEmployee.Id}");
return Ok(ApiResponse<object>.SuccessResponse(report, $"Record of performed activities for project {project.Name} for date {currentDate.Date}", 200)); return Ok(ApiResponse<object>.SuccessResponse(report, $"Record of performed activities for project {project.Name} for date {currentDate.Date}", 200));