fix report reformat
This commit is contained in:
parent
3ce799f9be
commit
896c13709f
1 changed files with 105 additions and 105 deletions
|
|
@ -370,7 +370,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
return {
|
||||
|
|
@ -1209,10 +1209,10 @@ export class ReportController extends Controller {
|
|||
? salaryProfileGroup1.map((item: any, index: any) => ({
|
||||
no: Extension.ToThaiNumber(String(index + 1)),
|
||||
affiliation:
|
||||
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + "/") +
|
||||
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + "/") +
|
||||
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + "/") +
|
||||
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + "/") +
|
||||
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + " ") +
|
||||
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + " ") +
|
||||
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + " ") +
|
||||
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + " ") +
|
||||
(item.root == undefined && item.root == null ? "" : item.root),
|
||||
// สังกัด
|
||||
fullName: item.prefix + item.firstName + " " + item.lastName,
|
||||
|
|
@ -1260,10 +1260,10 @@ export class ReportController extends Controller {
|
|||
? salaryProfileGroup2.map((item: any, index: any) => ({
|
||||
no: Extension.ToThaiNumber(String(index + 1)),
|
||||
affiliation:
|
||||
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + "/") +
|
||||
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + "/") +
|
||||
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + "/") +
|
||||
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + "/") +
|
||||
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + " ") +
|
||||
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + " ") +
|
||||
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + " ") +
|
||||
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + " ") +
|
||||
(item.root == undefined && item.root == null ? "" : item.root),
|
||||
// สังกัด/ชื่อ-นามสกุล
|
||||
fullName: item.prefix + item.firstName + " " + item.lastName,
|
||||
|
|
@ -1468,10 +1468,10 @@ export class ReportController extends Controller {
|
|||
? salaryProfileGroup1.map((item: any, index: any) => ({
|
||||
no: Extension.ToThaiNumber(String(index + 1)),
|
||||
affiliation:
|
||||
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + "/") +
|
||||
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + "/") +
|
||||
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + "/") +
|
||||
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + "/") +
|
||||
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + " ") +
|
||||
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + " ") +
|
||||
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + " ") +
|
||||
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + " ") +
|
||||
(item.root == undefined && item.root == null ? "" : item.root),
|
||||
fullName: item.prefix + item.firstName + " " + item.lastName,
|
||||
posLevel: item.posLevel,
|
||||
|
|
@ -1544,10 +1544,10 @@ export class ReportController extends Controller {
|
|||
? salaryProfileGroup2.map((item, index) => ({
|
||||
no: Extension.ToThaiNumber(String(index + 1)),
|
||||
affiliation:
|
||||
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + "/") +
|
||||
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + "/") +
|
||||
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + "/") +
|
||||
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + "/") +
|
||||
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + " ") +
|
||||
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + " ") +
|
||||
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + " ") +
|
||||
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + " ") +
|
||||
(item.root == undefined && item.root == null ? "" : item.root),
|
||||
fullName: item.prefix + item.firstName + " " + item.lastName,
|
||||
posLevel: item.posLevel,
|
||||
|
|
@ -1684,18 +1684,18 @@ export class ReportController extends Controller {
|
|||
log_isNext: profile.isNext,
|
||||
// position:
|
||||
// profile.position +
|
||||
// "/" +
|
||||
// (profile.child4 == undefined && profile.child4 == null ? "" : profile.child4 + "/") +
|
||||
// (profile.child3 == undefined && profile.child3 == null ? "" : profile.child3 + "/") +
|
||||
// (profile.child2 == undefined && profile.child2 == null ? "" : profile.child2 + "/") +
|
||||
// (profile.child1 == undefined && profile.child1 == null ? "" : profile.child1 + "/") +
|
||||
// " " +
|
||||
// (profile.child4 == undefined && profile.child4 == null ? "" : profile.child4 + " ") +
|
||||
// (profile.child3 == undefined && profile.child3 == null ? "" : profile.child3 + " ") +
|
||||
// (profile.child2 == undefined && profile.child2 == null ? "" : profile.child2 + " ") +
|
||||
// (profile.child1 == undefined && profile.child1 == null ? "" : profile.child1 + " ") +
|
||||
// (profile.root == undefined && profile.root == null ? "" : profile.root),
|
||||
position: profile.position,
|
||||
affiliation:
|
||||
(profile.child4 == undefined && profile.child4 == null ? "" : profile.child4 + "/") +
|
||||
(profile.child3 == undefined && profile.child3 == null ? "" : profile.child3 + "/") +
|
||||
(profile.child2 == undefined && profile.child2 == null ? "" : profile.child2 + "/") +
|
||||
(profile.child1 == undefined && profile.child1 == null ? "" : profile.child1 + "/") +
|
||||
(profile.child4 == undefined && profile.child4 == null ? "" : profile.child4 + " ") +
|
||||
(profile.child3 == undefined && profile.child3 == null ? "" : profile.child3 + " ") +
|
||||
(profile.child2 == undefined && profile.child2 == null ? "" : profile.child2 + " ") +
|
||||
(profile.child1 == undefined && profile.child1 == null ? "" : profile.child1 + " ") +
|
||||
(profile.root == undefined && profile.root == null ? "" : profile.root),
|
||||
posLevel: profile.posLevel,
|
||||
orgShortName:
|
||||
|
|
@ -1801,10 +1801,10 @@ export class ReportController extends Controller {
|
|||
log_isNext: profile.isNext,
|
||||
position: profile.position,
|
||||
affiliation:
|
||||
(profile.child4 == undefined && profile.child4 == null ? "" : profile.child4 + "/") +
|
||||
(profile.child3 == undefined && profile.child3 == null ? "" : profile.child3 + "/") +
|
||||
(profile.child2 == undefined && profile.child2 == null ? "" : profile.child2 + "/") +
|
||||
(profile.child1 == undefined && profile.child1 == null ? "" : profile.child1 + "/") +
|
||||
(profile.child4 == undefined && profile.child4 == null ? "" : profile.child4 + " ") +
|
||||
(profile.child3 == undefined && profile.child3 == null ? "" : profile.child3 + " ") +
|
||||
(profile.child2 == undefined && profile.child2 == null ? "" : profile.child2 + " ") +
|
||||
(profile.child1 == undefined && profile.child1 == null ? "" : profile.child1 + " ") +
|
||||
(profile.root == undefined && profile.root == null ? "" : profile.root),
|
||||
posLevel: profile.posLevel,
|
||||
orgShortName:
|
||||
|
|
@ -1911,7 +1911,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
return {
|
||||
no: Extension.ToThaiNumber((index + 1).toLocaleString()),
|
||||
fullname: profile.prefix + profile.firstName + " " + profile.lastName,
|
||||
|
|
@ -2005,7 +2005,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
return {
|
||||
no: Extension.ToThaiNumber((index + 1).toLocaleString()),
|
||||
fullname: profile.prefix + profile.firstName + " " + profile.lastName,
|
||||
|
|
@ -2106,17 +2106,17 @@ export class ReportController extends Controller {
|
|||
fullname: item.prefix + item.firstName + " " + item.lastName,
|
||||
position: item.position??"-",
|
||||
affiliation:
|
||||
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + "/") +
|
||||
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + "/") +
|
||||
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + "/") +
|
||||
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + "/") +
|
||||
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + " ") +
|
||||
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + " ") +
|
||||
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + " ") +
|
||||
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + " ") +
|
||||
(item.root == undefined && item.root == null ? "" : item.root),
|
||||
posType: item.posType,
|
||||
posLevel: item.posLevel,
|
||||
posExecutive: item.posExecutive ? item.posExecutive : null,
|
||||
posExecutive: item.posExecutive ? item.posExecutive : "-",
|
||||
fullPositionName: item.posExecutive
|
||||
? item.position + " (" + item.posExecutive + ")"
|
||||
: item.position || null,
|
||||
: item.position || "-",
|
||||
posMasterNo:
|
||||
Extension.ToThaiNumber(item.orgShortName) +
|
||||
Extension.ToThaiNumber(String(item.posMasterNo.toLocaleString())),
|
||||
|
|
@ -2130,7 +2130,7 @@ export class ReportController extends Controller {
|
|||
: Extension.ToThaiNumber(String(item.positionSalaryAmount.toLocaleString())) +
|
||||
(item.amountSpecial > 0
|
||||
? `(${Extension.ToThaiNumber(String(item.positionSalaryAmount))})`
|
||||
: ""),
|
||||
: "-"),
|
||||
remark: [
|
||||
item.type === "FULL" ? "หนึ่งขั้น" : "",
|
||||
item.type === "FULLHAFT" ? "หนึ่งขั้นครึ่ง" : "",
|
||||
|
|
@ -2218,10 +2218,10 @@ export class ReportController extends Controller {
|
|||
fullname: item.prefix + item.firstName + " " + item.lastName,
|
||||
position: item.position,
|
||||
affiliation:
|
||||
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + "/") +
|
||||
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + "/") +
|
||||
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + "/") +
|
||||
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + "/") +
|
||||
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + " ") +
|
||||
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + " ") +
|
||||
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + " ") +
|
||||
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + " ") +
|
||||
(item.root == undefined && item.root == null ? "" : item.root),
|
||||
posType: item.posType,
|
||||
posLevel: item.posLevel,
|
||||
|
|
@ -2369,10 +2369,10 @@ export class ReportController extends Controller {
|
|||
fullname: item.prefix + item.firstName + " " + item.lastName,
|
||||
position: item.position,
|
||||
affiliation:
|
||||
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + "/") +
|
||||
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + "/") +
|
||||
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + "/") +
|
||||
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + "/") +
|
||||
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + " ") +
|
||||
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + " ") +
|
||||
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + " ") +
|
||||
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + " ") +
|
||||
(item.root == undefined && item.root == null ? "" : item.root),
|
||||
posType: item.posType,
|
||||
posLevel: item.posLevel,
|
||||
|
|
@ -2395,10 +2395,10 @@ export class ReportController extends Controller {
|
|||
fullname: item.prefix + item.firstName + " " + item.lastName,
|
||||
position: item.position,
|
||||
affiliation:
|
||||
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + "/") +
|
||||
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + "/") +
|
||||
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + "/") +
|
||||
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + "/") +
|
||||
(item.child4 == undefined && item.child4 == null ? "" : item.child4 + " ") +
|
||||
(item.child3 == undefined && item.child3 == null ? "" : item.child3 + " ") +
|
||||
(item.child2 == undefined && item.child2 == null ? "" : item.child2 + " ") +
|
||||
(item.child1 == undefined && item.child1 == null ? "" : item.child1 + " ") +
|
||||
(item.root == undefined && item.root == null ? "" : item.root),
|
||||
posType: item.posType,
|
||||
posLevel: item.posLevel,
|
||||
|
|
@ -2543,7 +2543,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -2637,11 +2637,11 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = affiliationParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
|
||||
const fullName_aff = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null && part !== "")
|
||||
.join("/");
|
||||
.join(" ");
|
||||
|
||||
return {
|
||||
no: Extension.ToThaiNumber((index + 1).toLocaleString()),
|
||||
|
|
@ -2725,7 +2725,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -2810,7 +2810,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -2898,7 +2898,7 @@ export class ReportController extends Controller {
|
|||
];
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -2980,7 +2980,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -3121,7 +3121,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -3262,7 +3262,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -3341,7 +3341,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const fullName = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
|
||||
return {
|
||||
no: Extension.ToThaiNumber((index + 1).toLocaleString()),
|
||||
|
|
@ -3414,7 +3414,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -3501,7 +3501,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -3582,7 +3582,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -3661,7 +3661,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -3756,7 +3756,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const fullName = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
|
||||
return {
|
||||
no: Extension.ToThaiNumber((index + 1).toLocaleString()),
|
||||
|
|
@ -3829,7 +3829,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const fullName = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
|
||||
return {
|
||||
no: Extension.ToThaiNumber((index + 1).toLocaleString()),
|
||||
|
|
@ -4155,7 +4155,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -4394,7 +4394,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -4552,20 +4552,20 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
no: Extension.ToThaiNumber((index + 1).toLocaleString()),
|
||||
fullName: fullName,
|
||||
affiliation: affiliation,
|
||||
position:
|
||||
position: //pos\n
|
||||
profile.position +
|
||||
"/" +
|
||||
(profile.child4 == undefined && profile.child4 == null ? "" : profile.child4 + "/") +
|
||||
(profile.child3 == undefined && profile.child3 == null ? "" : profile.child3 + "/") +
|
||||
(profile.child2 == undefined && profile.child2 == null ? "" : profile.child2 + "/") +
|
||||
(profile.child1 == undefined && profile.child1 == null ? "" : profile.child1 + "/") +
|
||||
"\n" +
|
||||
(profile.child4 == undefined && profile.child4 == null ? "" : profile.child4 + " ") +
|
||||
(profile.child3 == undefined && profile.child3 == null ? "" : profile.child3 + " ") +
|
||||
(profile.child2 == undefined && profile.child2 == null ? "" : profile.child2 + " ") +
|
||||
(profile.child1 == undefined && profile.child1 == null ? "" : profile.child1 + " ") +
|
||||
(profile.root == undefined && profile.root == null ? "" : profile.root),
|
||||
posLevel: profile.posLevel
|
||||
? `${profile.posTypeShort} ${Extension.ToThaiNumber(profile.posLevel.toLocaleString())}`
|
||||
|
|
@ -4655,7 +4655,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -4743,7 +4743,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
|
|
@ -4835,7 +4835,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -4921,7 +4921,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -5046,7 +5046,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -5200,20 +5200,20 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
no: Extension.ToThaiNumber((index + 1).toLocaleString()),
|
||||
fullName: fullName,
|
||||
affiliation: affiliation,
|
||||
position:
|
||||
position: //pos\n
|
||||
profile.position +
|
||||
"/" +
|
||||
(profile.child4 == undefined && profile.child4 == null ? "" : profile.child4 + "/") +
|
||||
(profile.child3 == undefined && profile.child3 == null ? "" : profile.child3 + "/") +
|
||||
(profile.child2 == undefined && profile.child2 == null ? "" : profile.child2 + "/") +
|
||||
(profile.child1 == undefined && profile.child1 == null ? "" : profile.child1 + "/") +
|
||||
"\n" +
|
||||
(profile.child4 == undefined && profile.child4 == null ? "" : profile.child4 + " ") +
|
||||
(profile.child3 == undefined && profile.child3 == null ? "" : profile.child3 + " ") +
|
||||
(profile.child2 == undefined && profile.child2 == null ? "" : profile.child2 + " ") +
|
||||
(profile.child1 == undefined && profile.child1 == null ? "" : profile.child1 + " ") +
|
||||
(profile.root == undefined && profile.root == null ? "" : profile.root),
|
||||
posLevel: profile.posLevel,
|
||||
posNumber:
|
||||
|
|
@ -5295,7 +5295,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -5406,7 +5406,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -5489,20 +5489,20 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
no: Extension.ToThaiNumber((index + 1).toLocaleString()),
|
||||
fullName: fullName,
|
||||
affiliation: affiliation,
|
||||
position:
|
||||
position: //pos\n
|
||||
profile.position +
|
||||
"/" +
|
||||
(profile.child4 == undefined && profile.child4 == null ? "" : profile.child4 + "/") +
|
||||
(profile.child3 == undefined && profile.child3 == null ? "" : profile.child3 + "/") +
|
||||
(profile.child2 == undefined && profile.child2 == null ? "" : profile.child2 + "/") +
|
||||
(profile.child1 == undefined && profile.child1 == null ? "" : profile.child1 + "/") +
|
||||
"\n" +
|
||||
(profile.child4 == undefined && profile.child4 == null ? "" : profile.child4 + " ") +
|
||||
(profile.child3 == undefined && profile.child3 == null ? "" : profile.child3 + " ") +
|
||||
(profile.child2 == undefined && profile.child2 == null ? "" : profile.child2 + " ") +
|
||||
(profile.child1 == undefined && profile.child1 == null ? "" : profile.child1 + " ") +
|
||||
(profile.root == undefined && profile.root == null ? "" : profile.root),
|
||||
posLevel: profile.posLevel,
|
||||
posNumber:
|
||||
|
|
@ -5577,7 +5577,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -5691,7 +5691,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -5777,7 +5777,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
|
|
@ -5864,7 +5864,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
|
||||
const positionParts = [
|
||||
profile.position,
|
||||
|
|
@ -5877,7 +5877,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const position = positionParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
|
|
@ -5973,7 +5973,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
@ -6087,7 +6087,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const fullName = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
|
||||
return {
|
||||
no: Extension.ToThaiNumber((index + 1).toLocaleString()),
|
||||
|
|
@ -6309,7 +6309,7 @@ export class ReportController extends Controller {
|
|||
|
||||
const affiliation = fullNameParts
|
||||
.filter((part) => part !== undefined && part !== null)
|
||||
.join("/");
|
||||
.join(" ");
|
||||
const fullName = `${profile.prefix}${profile.firstName} ${profile.lastName}`;
|
||||
|
||||
return {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue