Prechádzať zdrojové kódy

progressPerc : fix divide by 0

zinab_elgendy 2 mesiacov pred
rodič
commit
6844a22526

+ 2 - 2
MTWorkHR.API/Controllers/AttendanceController.cs

@@ -47,9 +47,9 @@ namespace MTWorkHR.API.Controllers
         [HttpPost("Update")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [AppAuthorize(Permissions = "Attendance.Update")]
-        public async Task Update([FromBody] AttendanceDto input)
+        public async Task<ActionResult<AttendanceDto>> Update([FromBody] AttendanceDto input)
         {
-            await _AttendanceService.Update(input);
+            return await _AttendanceService.Update(input);
         }
 
         [HttpDelete("Delete")]

+ 2 - 2
MTWorkHR.API/Controllers/OrderAllocationController.cs

@@ -47,9 +47,9 @@ namespace MTWorkHR.API.Controllers
         [HttpPost("Update")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [AppAuthorize(Permissions = "OrderAllocation.Update")]
-        public async Task Update([FromBody] OrderAllocationDto input)
+        public async Task<ActionResult<OrderAllocationDto>> Update([FromBody] OrderAllocationDto input)
         {
-            await _OrderAllocationService.Update(input);
+            return await _OrderAllocationService.Update(input);
         }
 
         [HttpDelete("Delete")]

+ 2 - 2
MTWorkHR.API/Controllers/OrderRequestController.cs

@@ -62,9 +62,9 @@ namespace MTWorkHR.API.Controllers
         [HttpPost("ChangeStatus")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [AppAuthorize(Permissions = "OrderRequest.Update")]
-        public async Task ChangeStatus([FromBody] OrderStatusDto input)
+        public async Task<ActionResult<OrderRequestDto>> ChangeStatus([FromBody] OrderStatusDto input)
         {
-            await _LeaveRequestService.ChangeStatus(input.OrderId, input.StatusId);
+            return await _LeaveRequestService.ChangeStatus(input.OrderId, input.StatusId);
         }
 
 

+ 2 - 2
MTWorkHR.API/Controllers/ProjectController.cs

@@ -47,9 +47,9 @@ namespace MTWorkHR.API.Controllers
         [HttpPost("Update")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [AppAuthorize(Permissions = "Project.Update")]
-        public async Task Update([FromBody] ProjectDto input)
+        public async Task<ActionResult<ProjectDto>> Update([FromBody] ProjectDto input)
         {
-            await _ProjectService.Update(input);
+            return await _ProjectService.Update(input);
         }
 
         [HttpDelete("Delete")]

+ 4 - 4
MTWorkHR.API/Controllers/UserTaskController.cs

@@ -75,9 +75,9 @@ namespace MTWorkHR.API.Controllers
         [ProducesResponseType(StatusCodes.Status200OK)]
         [Consumes("multipart/form-data")]
         [AppAuthorize(Permissions = "UserTask.Update")]
-        public async Task UpdateAttachment([FromForm] AttachmentDto input)
+        public async Task<ActionResult<AttachmentDto>> UpdateAttachment([FromForm] AttachmentDto input)
         {
-            await _attachmentService.Update(input);
+            return await _attachmentService.Update(input);
         }
 
         [HttpDelete("DeleteAttachment")]
@@ -102,9 +102,9 @@ namespace MTWorkHR.API.Controllers
         [HttpPost("UpdateTaskHistory")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [AppAuthorize(Permissions = "UserTask.Update")]
-        public async Task UpdateTaskHistory([FromBody] UserTaskHistoryDto input)
+        public async Task<ActionResult<UserTaskHistoryDto>> UpdateTaskHistory([FromBody] UserTaskHistoryDto input)
         {
-            await _taskHistoryService.Update(input);
+            return await _taskHistoryService.Update(input);
         }
         [HttpDelete("DeleteTaskHistory")]
         [ProducesResponseType(StatusCodes.Status200OK)]

+ 7 - 2
MTWorkHR.Application/Services/Task/ProjectService.cs

@@ -115,8 +115,13 @@ namespace MTWorkHR.Application.Services
             foreach (var project in list)
             {
                 var projectTasks = tasks.Item1.Where(a=> a.ProjectId == project.Id);
-                decimal countDone = projectTasks.Count(a=> a.TaskStatus.NameEn == "Done");
-                project.ProgressPercentage = countDone / (decimal)projectTasks.Count();
+                var totalCount = (decimal)projectTasks.Count();
+                if (totalCount > 0)
+                {
+                    decimal countDone = projectTasks.Count(a => a.TaskStatus.NameEn == "Done");
+                    project.ProgressPercentage = countDone / totalCount;
+                }
+                else project.ProgressPercentage = 0;
             }
 
             var response = new PagingResultDto<ProjectDto>