Merge branch 'develop' of github.com:Frappet/BMA-EHR-BackEnd into develop

BMA.EHR.Application/Repositories/Leaves/TimeAttendants/ProcessUserTimeStampRepository.cs

@@ -56,6 +56,23 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
 
         #region " Methods "
 
+        public async Task<List<Guid>> GetCheckInKeycloakId()
+        {
+            try
+            {
+                var data = await _dbContext.Set<ProcessUserTimeStamp>()
+                                   .Select(x => x.KeycloakUserId)
+                                   .Distinct()
+                                   .ToListAsync();
+
+                return data;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
         public bool IsEditRequest(Guid userId, DateTime checkDate)
         {
             try

BMA.EHR.Application/Repositories/UserProfileRepository.cs

@@ -80,6 +80,23 @@ namespace BMA.EHR.Application.Repositories
             }
         }
 
+        public async Task<List<Profile>> GetProfileWithKeycloak()
+        {
+            try
+            {
+                var data = await _dbContext.Set<Profile>().AsQueryable()
+                                           .Where(x => x.ProfileType == "officer")
+                                           .Where(x => x.KeycloakId != null)
+                                           .ToListAsync();
+
+                return data;
+            }
+            catch
+            {
+                throw;
+            }
+        }
+
         public async Task<List<Profile>> SearchProfile(string? citizenId, string? firstName, string? lastName)
         {
             try

BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs

@@ -698,7 +698,9 @@ namespace BMA.EHR.Leave.Service.Controllers
         {
             try
             {
-                var profile = await _userProfileRepository.SearchProfile(null, null, null);
+                //var profile = await _userProfileRepository.SearchProfile(null, null, null);
+                var profile = await _userProfileRepository.GetProfileWithKeycloak();
+
                 var count = 1;
                 var employees = new List<dynamic>();
 
@@ -1083,12 +1085,10 @@ namespace BMA.EHR.Leave.Service.Controllers
         {
             try
             {
-                var profile = await _userProfileRepository.SearchProfile(null, null, null);
+                //var profile = await _userProfileRepository.SearchProfile(null, null, null);
+                var profile = await _userProfileRepository.GetProfileWithKeycloak();
+                var date = req.StartDate.Date;
 
-                var data = new List<dynamic>();
-
-                for (DateTime date = req.StartDate.Date; date.Date <= req.EndDate.Date; date = date.AddDays(1))
-                {
                 var employees = new List<dynamic>();
                 var count = 1;
                 foreach (var p in profile)
@@ -1146,14 +1146,13 @@ namespace BMA.EHR.Leave.Service.Controllers
                     employees = employees
                 };
 
-                    data.Add(item);
+
-                }
 
                 var result = new
                 {
                     template = "TimeStamp",
                     reportName = "TimeStamp",
-                    data = data
+                    data = item
                 };
 
                 return Success(result);

BMA.EHR.Leave.Service/DTOs/Reports/GetLeaveDetailReportDto.cs

@@ -4,7 +4,7 @@ namespace BMA.EHR.Leave.Service.DTOs.Reports
     {
         public DateTime StartDate { get; set; } = DateTime.MinValue;
 
-        public DateTime EndDate { get; set; } = DateTime.MinValue;
+        //public DateTime EndDate { get; set; } = DateTime.MinValue;
 
     }
 }