diff --git a/BMA.EHR.Leave/Controllers/LeaveController.cs b/BMA.EHR.Leave/Controllers/LeaveController.cs index 7a8c1a1c..388f8f97 100644 --- a/BMA.EHR.Leave/Controllers/LeaveController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveController.cs @@ -1210,7 +1210,7 @@ namespace BMA.EHR.Leave.Service.Controllers [ProducesResponseType(StatusCodes.Status200OK)] [ProducesResponseType(StatusCodes.Status401Unauthorized)] [ProducesResponseType(StatusCodes.Status500InternalServerError)] - public async Task> LogRecordAsync([Required] DateTime startDate, [Required] DateTime endDate, int page = 1, int pageSize = 10, string keyword = "") + public async Task> LogRecordAsync([Required] DateTime startDate, [Required] DateTime endDate, int page = 1, int pageSize = 10, string keyword = "", string profileType = "ALL") { var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_CHECKIN"); var jsonData = JsonConvert.DeserializeObject(getPermission); @@ -1265,6 +1265,9 @@ namespace BMA.EHR.Leave.Service.Controllers data = data.Where(x => x.FullName.Contains(keyword)).ToList(); } + if (profileType.Trim().ToUpper() != "ALL") + data = data.Where(x => x.ProfileType == profileType.Trim().ToUpper()).ToList(); + var pageData = data .Skip((page - 1) * pageSize) .Take(pageSize) @@ -1396,7 +1399,7 @@ namespace BMA.EHR.Leave.Service.Controllers [ProducesResponseType(StatusCodes.Status401Unauthorized)] [ProducesResponseType(StatusCodes.Status500InternalServerError)] [AllowAnonymous] - public async Task> GetTimeRecordAsync([Required] DateTime startDate, [Required] DateTime endDate, int page = 1, int pageSize = 10, string status = "NORMAL", string keyword = "") + public async Task> GetTimeRecordAsync([Required] DateTime startDate, [Required] DateTime endDate, int page = 1, int pageSize = 10, string status = "NORMAL", string keyword = "", string profileType = "ALL") { var getPermission = await _permission.GetPermissionAPIAsync("LIST", "SYS_CHECKIN"); var jsonData = JsonConvert.DeserializeObject(getPermission); @@ -1557,6 +1560,9 @@ namespace BMA.EHR.Leave.Service.Controllers data = data.Where(x => x.CheckInStatus == status || x.CheckOutStatus == status).ToList(); } + if (profileType.Trim().ToUpper() != "ALL") + data = data.Where(x => x.ProfileType == profileType.Trim().ToUpper()).ToList(); + var pageData = data .Skip((page - 1) * pageSize) .Take(pageSize)