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

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

Browse source
This commit is contained in:
Kittapath 2024-01-22 18:41:23 +07:00
commit 49fdfa62db
2 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

2
BMA.EHR.Application/Repositories/Leaves/LeaveRequests/LeaveRequestRepository.cs
View file

@ -625,7 +625,7 @@ namespace BMA.EHR.Application.Repositories.Leaves.LeaveRequests
.Include(x => x.Type) .Include(x => x.Type)
.Where(x => x.KeycloakUserId == keycloakUserId) .Where(x => x.KeycloakUserId == keycloakUserId)
.Where(x => x.LeaveStatus == "APPROVE") .Where(x => x.LeaveStatus == "APPROVE")
.Where(x => x.LeaveStartDate.Date >= date.Date && x.LeaveEndDate <= date.Date) .Where(x => x.LeaveStartDate.Date <= date.Date && x.LeaveEndDate >= date.Date)
.FirstOrDefaultAsync(); .FirstOrDefaultAsync();
return data; return data;
} }

41
BMA.EHR.Leave.Service/Controllers/LeaveReportController.cs
View file

@ -1128,6 +1128,7 @@ namespace BMA.EHR.Leave.Service.Controllers
var lateTotal = 0; var lateTotal = 0;
var wfhTotal = 0; var wfhTotal = 0;
var studyTotal = 0; var studyTotal = 0;
var workTotal = 0;
foreach (var dd in dateList) foreach (var dd in dateList)
@ -1245,31 +1246,31 @@ namespace BMA.EHR.Leave.Service.Controllers
if (timeStamps != null) if (timeStamps != null)
{ {
workTotal += 1;
if (timeStamps.IsLocationCheckIn) if (timeStamps.IsLocationCheckIn)
wfhTotal += 1; wfhTotal += 1;
else
{
if (leaveReq != null)
{
switch (leaveReq.Type.Code.ToUpper())
{
case "LV-001":
case "LV-002":
sickTotal += 1;
break;
case "LV-005":
restTotal += 1;
break;
case "LV-008":
studyTotal += 1;
break;
}
}
}
} }
if (leaveReq != null)
{
switch (leaveReq.Type.Code.ToUpper())
{
case "LV-001":
case "LV-002":
sickTotal += 1;
break;
case "LV-005":
restTotal += 1;
break;
case "LV-008":
studyTotal += 1;
break;
}
}
employees.Add(emp); employees.Add(emp);
count++; count++;
@ -1295,7 +1296,7 @@ namespace BMA.EHR.Leave.Service.Controllers
{ {
DateTimeStamp = dateStamp, DateTimeStamp = dateStamp,
officerTotal = profile.Count, officerTotal = profile.Count,
workTotal = (count - 1), workTotal = workTotal,
restTotal = restTotal, restTotal = restTotal,
sickTotal = sickTotal, sickTotal = sickTotal,
lateTotal = lateTotal, lateTotal = lateTotal,