From a9f4610063d60826fa4ac1f45c5c2c8566836bfd Mon Sep 17 00:00:00 2001 From: "ashutosh.nehete" Date: Wed, 16 Apr 2025 09:21:39 +0530 Subject: [PATCH] In this commit fixed the Bug #74 where when the regularization request sent it takes the date of request as checkout date --- Marco.Pms.Services/Controllers/AttendanceController.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Marco.Pms.Services/Controllers/AttendanceController.cs b/Marco.Pms.Services/Controllers/AttendanceController.cs index d475906..20ce35d 100644 --- a/Marco.Pms.Services/Controllers/AttendanceController.cs +++ b/Marco.Pms.Services/Controllers/AttendanceController.cs @@ -275,7 +275,7 @@ namespace MarcoBMS.Services.Controllers if (recordAttendanceDot.MarkTime == null) return BadRequest(ApiResponse.ErrorResponse("Invalid Mark Time", "Invalid Mark Time",400)); - DateTime finalDateTime = GetDateFromTimeStamp(recordAttendanceDot, recordAttendanceDot.MarkTime); + DateTime finalDateTime = GetDateFromTimeStamp(recordAttendanceDot.Date, recordAttendanceDot.MarkTime); if (recordAttendanceDot.Comment == null) return BadRequest(ApiResponse.ErrorResponse("Invalid Comment", "Invalid Comment", 400)); if (attendance != null) @@ -298,7 +298,8 @@ namespace MarcoBMS.Services.Controllers } else if (recordAttendanceDot.Action == ATTENDANCE_MARK_TYPE.REQUEST_REGULARIZE) { - + DateTime date = attendance.AttendanceDate; + finalDateTime = GetDateFromTimeStamp(date.Date, recordAttendanceDot.MarkTime); attendance.OutTime = finalDateTime; attendance.Activity = ATTENDANCE_MARK_TYPE.REQUEST_REGULARIZE; // do nothing @@ -399,9 +400,9 @@ namespace MarcoBMS.Services.Controllers } - private static DateTime GetDateFromTimeStamp(RecordAttendanceDot recordAttendanceDot, string timeString) + private static DateTime GetDateFromTimeStamp(DateTime date, string timeString) { - DateTime date = recordAttendanceDot.Date; + //DateTime date = recordAttendanceDot.Date; -- 2.43.0