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

Merge branch 'develop' of github.com:Frappet/bma-ehr-development into develop

Browse source 
# Conflicts:
#	src/controllers/ReportController.ts
This commit is contained in:
Kittapath 2024-07-17 12:49:07 +07:00
commit fa157f57c0
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/controllers/ReportController.ts
View file

@ -287,7 +287,10 @@ export class ReportController extends Controller {
: Extension.ToThaiNumber(Extension.ToThaiFullDate(getDevelopment.graduatedDate)), : Extension.ToThaiNumber(Extension.ToThaiFullDate(getDevelopment.graduatedDate)),
graduatedReason: getDevelopment.graduatedReason, graduatedReason: getDevelopment.graduatedReason,
useOfficialTime: getDevelopment.useOfficialTime, useOfficialTime: getDevelopment.useOfficialTime,
useOffTime: getDevelopment.useOfficialTime == true ? "🗹 ใช้ ☐ ไม่ใช้" : "☐ ใช้ 🗹 ไม่ใช้",
isGraduated: getDevelopment.isGraduated, isGraduated: getDevelopment.isGraduated,
isG1: getDevelopment.isGraduated == true ? "🗹" : "☐",
isG2: getDevelopment.isGraduated == true ? "☐" : "🗹",
totalPeriod: totalPeriod:
getDevelopment.totalPeriod == null || getDevelopment.totalPeriod == "" getDevelopment.totalPeriod == null || getDevelopment.totalPeriod == ""
? "" ? ""