hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

แก้ defect 17/12/66 11:05

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2023-12-17 11:05:48 +07:00
parent 178b63d51a
commit 8eafb7d70a
2 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
BMA.EHR.Application/Repositories/Leaves/TimeAttendants/ProcessUserTimeStampRepository.cs
View file

@ -56,11 +56,26 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
#region " Methods " #region " Methods "
public bool IsEditRequest(Guid userId, DateTime checkDate)
{
try
{
var data = _dbContext.Set<AdditionalCheckRequest>().AsQueryable()
.FirstOrDefault(x => x.KeycloakUserId == userId && x.CheckDate.Date == checkDate.Date);
return !(data == null);
}
catch
{
throw;
}
}
public async Task Copy() public async Task Copy()
{ {
var userTimeStamps = await _dbContext.Set<UserTimeStamp>().ToListAsync(); var userTimeStamps = await _dbContext.Set<UserTimeStamp>().ToListAsync();
foreach(var u in userTimeStamps) foreach (var u in userTimeStamps)
{ {
var p = new ProcessUserTimeStamp var p = new ProcessUserTimeStamp
{ {
@ -84,7 +99,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
CheckOutRemark = u.CheckOutRemark, CheckOutRemark = u.CheckOutRemark,
}; };
_dbContext.Set<ProcessUserTimeStamp>().Add(p); _dbContext.Set<ProcessUserTimeStamp>().Add(p);
} }
await _dbContext.SaveChangesAsync(); await _dbContext.SaveChangesAsync();
@ -135,7 +150,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
var data = await _dbContext.Set<ProcessUserTimeStamp>() var data = await _dbContext.Set<ProcessUserTimeStamp>()
.Where(u => u.CheckIn.Date >= startDate.Date && u.CheckIn.Date <= endDate.Date) .Where(u => u.CheckIn.Date >= startDate.Date && u.CheckIn.Date <= endDate.Date)
.ToListAsync(); .ToListAsync();
return data.Count; return data.Count;
} }
@ -145,7 +160,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.TimeAttendants
var data = await _dbContext.Set<ProcessUserTimeStamp>() var data = await _dbContext.Set<ProcessUserTimeStamp>()
.Where(u => u.CheckIn.Date >= startDate.Date && u.CheckIn.Date <= endDate.Date) .Where(u => u.CheckIn.Date >= startDate.Date && u.CheckIn.Date <= endDate.Date)
.OrderBy(u => u.CheckIn) .OrderBy(u => u.CheckIn)
.ToListAsync(); .ToListAsync();
return data; return data;

7
BMA.EHR.Leave.Service/Controllers/LeaveController.cs
View file

@ -533,6 +533,7 @@ namespace BMA.EHR.Leave.Service.Controllers
var checkin_base = DateTime.Parse($"{DateTime.Now.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}"); var checkin_base = DateTime.Parse($"{DateTime.Now.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}");
var checkout_base = DateTime.Parse($"{DateTime.Now.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}"); var checkout_base = DateTime.Parse($"{DateTime.Now.ToString("yyyy-MM-dd")} {duty.EndTimeAfternoon}");
var data = (await _processUserTimeStampRepository.GetTimeStampHistoryAsync(userId, year)) var data = (await _processUserTimeStampRepository.GetTimeStampHistoryAsync(userId, year))
.Select(d => new CheckInHistoryDto .Select(d => new CheckInHistoryDto
{ {
@ -553,9 +554,11 @@ namespace BMA.EHR.Leave.Service.Controllers
"LATE" : "LATE" :
"NORMAL", "NORMAL",
IsEdit = (d.EditStatus != null && d.EditStatus != "") IsEdit = _processUserTimeStampRepository.IsEditRequest(userId, d.CheckIn.Date)
//EditReason = d.EditReason ?? "", //IsEdit = (d.EditStatus != null && d.EditStatus != "")
//EditReason = d.EditReason ?? "",ß
//EditStatus = d.EditStatus ?? "" //EditStatus = d.EditStatus ?? ""
}) })