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

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

Browse source
This commit is contained in:
Kittapath 2024-06-25 10:21:57 +07:00
commit d0cf79d08f
1 changed files with 60 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

120
src/controllers/ReportController.ts
View file

@ -1181,7 +1181,7 @@ export class ReportController extends Controller {
: Extension.ToThaiNumber(node.profilePosLevel.toString()), : Extension.ToThaiNumber(node.profilePosLevel.toString()),
education: education:
node.education == null ? "" : Extension.ToThaiNumber(node.education.toString()), node.education == null ? "" : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
}; };
data.push(_head); data.push(_head);
} else { } else {
@ -1255,7 +1255,7 @@ export class ReportController extends Controller {
: Extension.ToThaiNumber(node.profilePosLevel.toString()), : Extension.ToThaiNumber(node.profilePosLevel.toString()),
education: education:
node.education == null ? "" : Extension.ToThaiNumber(node.education.toString()), node.education == null ? "" : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
}; };
data.push(head); data.push(head);
} }
@ -1552,7 +1552,7 @@ export class ReportController extends Controller {
node.education == null node.education == null
? "" ? ""
: Extension.ToThaiNumber(node.education.toString()), : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
}; };
data.push(_head); data.push(_head);
} else { } else {
@ -1630,7 +1630,7 @@ export class ReportController extends Controller {
node.education == null node.education == null
? "" ? ""
: Extension.ToThaiNumber(node.education.toString()), : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
}; };
data.push(head); data.push(head);
} }
@ -1933,7 +1933,7 @@ export class ReportController extends Controller {
node.education == null node.education == null
? "" ? ""
: Extension.ToThaiNumber(node.education.toString()), : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
}; };
data.push(_head); data.push(_head);
} else { } else {
@ -2015,7 +2015,7 @@ export class ReportController extends Controller {
node.education == null node.education == null
? "" ? ""
: Extension.ToThaiNumber(node.education.toString()), : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
}; };
data.push(head); data.push(head);
} }
@ -2322,7 +2322,7 @@ export class ReportController extends Controller {
node.education == null node.education == null
? "" ? ""
: Extension.ToThaiNumber(node.education.toString()), : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
}; };
data.push(_head); data.push(_head);
} else { } else {
@ -2407,7 +2407,7 @@ export class ReportController extends Controller {
node.education == null node.education == null
? "" ? ""
: Extension.ToThaiNumber(node.education.toString()), : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
}; };
data.push(head); data.push(head);
} }
@ -2713,7 +2713,7 @@ export class ReportController extends Controller {
node.education == null node.education == null
? "" ? ""
: Extension.ToThaiNumber(node.education.toString()), : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
}; };
data.push(_head); data.push(_head);
} else { } else {
@ -2798,7 +2798,7 @@ export class ReportController extends Controller {
node.education == null node.education == null
? "" ? ""
: Extension.ToThaiNumber(node.education.toString()), : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
}; };
data.push(head); data.push(head);
} }
@ -3139,13 +3139,13 @@ export class ReportController extends Controller {
node.posLevel == null ? "" : Extension.ToThaiNumber(node.posLevel.toString()), node.posLevel == null ? "" : Extension.ToThaiNumber(node.posLevel.toString()),
education: education:
node.education == null ? "" : Extension.ToThaiNumber(node.education.toString()), node.education == null ? "" : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
positionSalaryAmount: Extension.ToThaiNumber( positionSalaryAmount: node.positionSalaryAmount ? Extension.ToThaiNumber(
node.positionSalaryAmount.toLocaleString(), node.positionSalaryAmount.toLocaleString(),
), ) : "",
mouthSalaryAmount: Extension.ToThaiNumber( mouthSalaryAmount: node.mouthSalaryAmount ? Extension.ToThaiNumber(
node.mouthSalaryAmount.toLocaleString(), node.mouthSalaryAmount.toLocaleString(),
), ) : "",
reason: node.reason == null ? "" : Extension.ToThaiNumber(node.reason.toString()), reason: node.reason == null ? "" : Extension.ToThaiNumber(node.reason.toString()),
}; };
data.push(_head); data.push(_head);
@ -3192,13 +3192,13 @@ export class ReportController extends Controller {
node.posLevel == null ? "" : Extension.ToThaiNumber(node.posLevel.toString()), node.posLevel == null ? "" : Extension.ToThaiNumber(node.posLevel.toString()),
education: education:
node.education == null ? "" : Extension.ToThaiNumber(node.education.toString()), node.education == null ? "" : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
positionSalaryAmount: Extension.ToThaiNumber( positionSalaryAmount: node.positionSalaryAmount ? Extension.ToThaiNumber(
node.positionSalaryAmount.toLocaleString(), node.positionSalaryAmount.toLocaleString(),
), ) : "",
mouthSalaryAmount: Extension.ToThaiNumber( mouthSalaryAmount: node.mouthSalaryAmount ? Extension.ToThaiNumber(
node.mouthSalaryAmount.toLocaleString(), node.mouthSalaryAmount.toLocaleString(),
), ) : "",
reason: node.reason == null ? "" : Extension.ToThaiNumber(node.reason.toString()), reason: node.reason == null ? "" : Extension.ToThaiNumber(node.reason.toString()),
}; };
data.push(head); data.push(head);
@ -3333,13 +3333,13 @@ export class ReportController extends Controller {
node.education == null node.education == null
? "" ? ""
: Extension.ToThaiNumber(node.education.toString()), : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
positionSalaryAmount: Extension.ToThaiNumber( positionSalaryAmount: node.positionSalaryAmount ? Extension.ToThaiNumber(
node.positionSalaryAmount.toLocaleString(), node.positionSalaryAmount.toLocaleString(),
), ) : "",
mouthSalaryAmount: Extension.ToThaiNumber( mouthSalaryAmount: node.mouthSalaryAmount ? Extension.ToThaiNumber(
node.mouthSalaryAmount.toLocaleString(), node.mouthSalaryAmount.toLocaleString(),
), ) : "",
reason: reason:
node.reason == null ? "" : Extension.ToThaiNumber(node.reason.toString()), node.reason == null ? "" : Extension.ToThaiNumber(node.reason.toString()),
}; };
@ -3391,13 +3391,13 @@ export class ReportController extends Controller {
node.education == null node.education == null
? "" ? ""
: Extension.ToThaiNumber(node.education.toString()), : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
positionSalaryAmount: Extension.ToThaiNumber( positionSalaryAmount: node.positionSalaryAmount ? Extension.ToThaiNumber(
node.positionSalaryAmount.toLocaleString(), node.positionSalaryAmount.toLocaleString(),
), ) : "",
mouthSalaryAmount: Extension.ToThaiNumber( mouthSalaryAmount: node.mouthSalaryAmount ? Extension.ToThaiNumber(
node.mouthSalaryAmount.toLocaleString(), node.mouthSalaryAmount.toLocaleString(),
), ) : "",
reason: reason:
node.reason == null ? "" : Extension.ToThaiNumber(node.reason.toString()), node.reason == null ? "" : Extension.ToThaiNumber(node.reason.toString()),
}; };
@ -3534,13 +3534,13 @@ export class ReportController extends Controller {
node.education == null node.education == null
? "" ? ""
: Extension.ToThaiNumber(node.education.toString()), : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
positionSalaryAmount: Extension.ToThaiNumber( positionSalaryAmount: node.positionSalaryAmount ? Extension.ToThaiNumber(
node.positionSalaryAmount.toLocaleString(), node.positionSalaryAmount.toLocaleString(),
), ) : "",
mouthSalaryAmount: Extension.ToThaiNumber( mouthSalaryAmount: node.mouthSalaryAmount ? Extension.ToThaiNumber(
node.mouthSalaryAmount.toLocaleString(), node.mouthSalaryAmount.toLocaleString(),
), ) : "",
reason: reason:
node.reason == null ? "" : Extension.ToThaiNumber(node.reason.toString()), node.reason == null ? "" : Extension.ToThaiNumber(node.reason.toString()),
}; };
@ -3595,13 +3595,13 @@ export class ReportController extends Controller {
node.education == null node.education == null
? "" ? ""
: Extension.ToThaiNumber(node.education.toString()), : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
positionSalaryAmount: Extension.ToThaiNumber( positionSalaryAmount: node.positionSalaryAmount ? Extension.ToThaiNumber(
node.positionSalaryAmount.toLocaleString(), node.positionSalaryAmount.toLocaleString(),
), ) : "",
mouthSalaryAmount: Extension.ToThaiNumber( mouthSalaryAmount: node.mouthSalaryAmount ? Extension.ToThaiNumber(
node.mouthSalaryAmount.toLocaleString(), node.mouthSalaryAmount.toLocaleString(),
), ) : "",
reason: reason:
node.reason == null ? "" : Extension.ToThaiNumber(node.reason.toString()), node.reason == null ? "" : Extension.ToThaiNumber(node.reason.toString()),
}; };
@ -3740,13 +3740,13 @@ export class ReportController extends Controller {
node.education == null node.education == null
? "" ? ""
: Extension.ToThaiNumber(node.education.toString()), : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
positionSalaryAmount: Extension.ToThaiNumber( positionSalaryAmount: node.positionSalaryAmount ? Extension.ToThaiNumber(
node.positionSalaryAmount.toLocaleString(), node.positionSalaryAmount.toLocaleString(),
), ) : "",
mouthSalaryAmount: Extension.ToThaiNumber( mouthSalaryAmount: node.mouthSalaryAmount ? Extension.ToThaiNumber(
node.mouthSalaryAmount.toLocaleString(), node.mouthSalaryAmount.toLocaleString(),
), ) : "",
reason: reason:
node.reason == null ? "" : Extension.ToThaiNumber(node.reason.toString()), node.reason == null ? "" : Extension.ToThaiNumber(node.reason.toString()),
}; };
@ -3804,13 +3804,13 @@ export class ReportController extends Controller {
node.education == null node.education == null
? "" ? ""
: Extension.ToThaiNumber(node.education.toString()), : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
positionSalaryAmount: Extension.ToThaiNumber( positionSalaryAmount: node.positionSalaryAmount ? Extension.ToThaiNumber(
node.positionSalaryAmount.toLocaleString(), node.positionSalaryAmount.toLocaleString(),
), ) : "",
mouthSalaryAmount: Extension.ToThaiNumber( mouthSalaryAmount: node.mouthSalaryAmount ? Extension.ToThaiNumber(
node.mouthSalaryAmount.toLocaleString(), node.mouthSalaryAmount.toLocaleString(),
), ) : "",
reason: reason:
node.reason == null ? "" : Extension.ToThaiNumber(node.reason.toString()), node.reason == null ? "" : Extension.ToThaiNumber(node.reason.toString()),
}; };
@ -3951,13 +3951,13 @@ export class ReportController extends Controller {
node.education == null node.education == null
? "" ? ""
: Extension.ToThaiNumber(node.education.toString()), : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
positionSalaryAmount: Extension.ToThaiNumber( positionSalaryAmount: node.positionSalaryAmount ? Extension.ToThaiNumber(
node.positionSalaryAmount.toLocaleString(), node.positionSalaryAmount.toLocaleString(),
), ) : "",
mouthSalaryAmount: Extension.ToThaiNumber( mouthSalaryAmount: node.mouthSalaryAmount ? Extension.ToThaiNumber(
node.mouthSalaryAmount.toLocaleString(), node.mouthSalaryAmount.toLocaleString(),
), ) : "",
reason: reason:
node.reason == null node.reason == null
? "" ? ""
@ -4017,13 +4017,13 @@ export class ReportController extends Controller {
node.education == null node.education == null
? "" ? ""
: Extension.ToThaiNumber(node.education.toString()), : Extension.ToThaiNumber(node.education.toString()),
salary: Extension.ToThaiNumber(node.salary.toLocaleString()), salary: node.salary ? Extension.ToThaiNumber(node.salary.toLocaleString()) : "",
positionSalaryAmount: Extension.ToThaiNumber( positionSalaryAmount: node.positionSalaryAmount ? Extension.ToThaiNumber(
node.positionSalaryAmount.toLocaleString(), node.positionSalaryAmount.toLocaleString(),
), ) : "",
mouthSalaryAmount: Extension.ToThaiNumber( mouthSalaryAmount: node.mouthSalaryAmount ? Extension.ToThaiNumber(
node.mouthSalaryAmount.toLocaleString(), node.mouthSalaryAmount.toLocaleString(),
), ) : "",
reason: reason:
node.reason == null node.reason == null
? "" ? ""