refactor LeaveController to update image URL handling for check-in and check-out #2188
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m12s
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m12s
This commit is contained in:
parent
86790cf9f3
commit
5415019b3c
1 changed files with 3 additions and 2 deletions
|
|
@ -3069,7 +3069,8 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
CheckInPOI = d.CheckInPOI,
|
CheckInPOI = d.CheckInPOI,
|
||||||
CheckInLat = d.CheckInLat,
|
CheckInLat = d.CheckInLat,
|
||||||
CheckInLon = d.CheckInLon,
|
CheckInLon = d.CheckInLon,
|
||||||
CheckInImg = $"{imgUrl}/{d.CheckInImageUrl}",
|
// CheckInImg = $"{imgUrl}/{d.CheckInImageUrl}",
|
||||||
|
CheckInImg = await _minIOService.ImagesPathByName(d.CheckInImageUrl),
|
||||||
CheckInStatus = DateTime.Parse(d.CheckIn.ToString("yyyy-MM-dd HH:mm")) >
|
CheckInStatus = DateTime.Parse(d.CheckIn.ToString("yyyy-MM-dd HH:mm")) >
|
||||||
DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}") ?
|
DateTime.Parse($"{d.CheckIn.Date.ToString("yyyy-MM-dd")} {duty.StartTimeMorning}") ?
|
||||||
|
|
||||||
|
|
@ -3086,7 +3087,7 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
CheckOutPOI = d.CheckOut == null ? "" : d.CheckOutPOI,
|
CheckOutPOI = d.CheckOut == null ? "" : d.CheckOutPOI,
|
||||||
CheckOutLat = d.CheckOut == null ? null : d.CheckOutLat,
|
CheckOutLat = d.CheckOut == null ? null : d.CheckOutLat,
|
||||||
CheckOutLon = d.CheckOut == null ? null : d.CheckOutLon,
|
CheckOutLon = d.CheckOut == null ? null : d.CheckOutLon,
|
||||||
CheckOutImg = d.CheckOut == null ? "" : $"{imgUrl}/{d.CheckOutImageUrl}",
|
CheckOutImg = d.CheckOut == null ? "" : await _minIOService.ImagesPathByName(d.CheckOutImageUrl),
|
||||||
|
|
||||||
CheckOutStatus = d.CheckOut == null ? null :
|
CheckOutStatus = d.CheckOut == null ? null :
|
||||||
DateTime.Parse(d.CheckOut.Value.ToString("yyyy-MM-dd HH:mm")) <
|
DateTime.Parse(d.CheckOut.Value.ToString("yyyy-MM-dd HH:mm")) <
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue