Merge branch 'develop' into working

2024-10-22 14:32:20 +07:00 · 2024-10-22 14:32:20 +07:00 · 5dac4819ad
commit 5dac4819ad
parent f58ba90f62 f2df44cf6a
15 changed files with 59 additions and 20 deletions
--- a/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
+++ b/BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
@ -217,10 +217,9 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
            var rawData = _dbContext.Set<LeaveRequest>().AsNoTracking()
                                    .Include(x => x.Type)
                                    .Where(x => x.LeaveStatus != "DRAFT")
+                                    .OrderByDescending(x => x.CreatedAt.Date)
                                    .AsQueryable();

-
-
            if (year != 0)
                rawData = rawData.Where(x => x.LeaveStartDate.Year == year);