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

แก้รายงาน ก.พ.7

Browse source
This commit is contained in:
Bright 2024-07-05 13:59:55 +07:00
parent 538ec8f8a1
commit 16ca14fc51
2 changed files with 26 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/controllers/ProfileController.ts
View file

@ -189,7 +189,7 @@ export class ProfileController extends Controller {
Institute: item.institute, Institute: item.institute,
Date: Date:
item.startDate && item.endDate item.startDate && item.endDate
? `${Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.endDate))}` ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
: "", : "",
Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "", Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "",
})); }));
@ -340,7 +340,7 @@ export class ProfileController extends Controller {
BirthDayText: BirthDayText:
profiles.birthDate != null profiles.birthDate != null
? Extension.ToThaiNumber( ? Extension.ToThaiNumber(
Extension.ToThaiShortDate_noPrefix(profiles.birthDate).toString(), Extension.ToThaiFullDate2(profiles.birthDate).toString(),
) )
: "", : "",
BirthMonth: profiles?.birthDate BirthMonth: profiles?.birthDate
@ -352,7 +352,7 @@ export class ProfileController extends Controller {
BirthYearText: BirthYearText:
profiles.birthDate != null profiles.birthDate != null
? Extension.ToThaiNumber( ? Extension.ToThaiNumber(
Extension.ToThaiShortDate_noPrefix(profiles.birthDate).toString(), Extension.ToThaiFullDate2(profiles.birthDate).toString(),
) )
: "", : "",
Address: "", Address: "",
@ -388,11 +388,11 @@ export class ProfileController extends Controller {
StartDate: profiles?.dateStart, StartDate: profiles?.dateStart,
AppointDate: profiles?.dateAppoint ?? "", AppointDate: profiles?.dateAppoint ?? "",
BirthDate: profiles?.birthDate BirthDate: profiles?.birthDate
? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(profiles.birthDate)) ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(profiles.birthDate))
: null, : null,
RetireDate: RetireDate:
profiles.dateRetireLaw != null profiles.dateRetireLaw != null
? Extension.ToThaiNumber(profiles.dateRetireLaw.toString()) ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(profiles.dateRetireLaw))
: "", : "",
// AvatarId: profiles?.avatar ?? null, // AvatarId: profiles?.avatar ?? null,
}; };
@ -405,7 +405,7 @@ export class ProfileController extends Controller {
CertificateType: item.certificateType ?? null, CertificateType: item.certificateType ?? null,
Issuer: item.issuer ?? null, Issuer: item.issuer ?? null,
CertificateNo: Extension.ToThaiNumber(item.certificateNo) ?? null, CertificateNo: Extension.ToThaiNumber(item.certificateNo) ?? null,
IssueDate: Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.issueDate)) ?? null, IssueDate: Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.issueDate)) ?? null,
})); }));
const trainings = await this.trainingRepository.find({ const trainings = await this.trainingRepository.find({
select: ["startDate", "endDate", "place", "department", "name"], select: ["startDate", "endDate", "place", "department", "name"],
@ -416,14 +416,14 @@ export class ProfileController extends Controller {
Start: Start:
item.startDate == null item.startDate == null
? "" ? ""
: Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.startDate)), : Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate)),
End: End:
item.endDate == null item.endDate == null
? "" ? ""
: Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.endDate)), : Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate)),
Date: Date:
item.startDate && item.endDate item.startDate && item.endDate
? `${Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.endDate))}` ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
: "", : "",
Level: "", Level: "",
Degree: item.name, Degree: item.name,
@ -458,7 +458,7 @@ export class ProfileController extends Controller {
: Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString()), : Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString()),
Date: Date:
item.startDate && item.endDate item.startDate && item.endDate
? `${Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.endDate))}` ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
: "", : "",
Level: item.educationLevel ?? "", Level: item.educationLevel ?? "",
Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "", Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "",
@ -481,19 +481,19 @@ export class ProfileController extends Controller {
const Salary = salarys.map((item) => ({ const Salary = salarys.map((item) => ({
SalaryDate: item.date SalaryDate: item.date
? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(item.date)) ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.date))
: null, : null,
Position: item.position ?? null, Position: item.position != null ? Extension.ToThaiNumber(item.position) : null,
PosNo: item.posNo ?? null, PosNo: item.posNo != null ? Extension.ToThaiNumber(item.posNo) : null,
Salary: item.amount ?? null, Salary: item.amount != null ? Extension.ToThaiNumber(item.amount.toLocaleString()) : null,
Rank: item.positionLevel ?? null, Rank: item.positionLevel ?? null,
RefAll: item.templateDoc ? Extension.ToThaiNumber(item.templateDoc) : null, RefAll: item.templateDoc ? Extension.ToThaiNumber(item.templateDoc) : null,
PositionLevel: item.positionLevel ?? null, PositionLevel: item.positionLevel != null ? Extension.ToThaiNumber(item.positionLevel) : null,
PositionType: item.positionType ?? null, PositionType: item.positionType ?? null,
PositionAmount: PositionAmount:
item.positionSalaryAmount == null item.positionSalaryAmount == null
? null ? null
: Extension.ToThaiNumber(item.positionSalaryAmount.toString()), : Extension.ToThaiNumber(item.positionSalaryAmount.toLocaleString()),
FullName: `${profiles?.prefix}${profiles?.firstName} ${profiles?.lastName}`, FullName: `${profiles?.prefix}${profiles?.firstName} ${profiles?.lastName}`,
OcFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`, OcFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`,
})); }));

10
src/interfaces/extension.ts
View file

@ -99,6 +99,16 @@ class Extension {
yy yy
); );
} }
public static ToThaiFullDate2(value: Date) {
let yy = value.getFullYear() < 2400 ? value.getFullYear() + 543 : value.getFullYear();
return (
value.getDate() +
" " +
Extension.ToThaiMonth(value.getMonth() + 1) +
" " +
yy
);
}
public static ToThaiShortDate(value: Date) { public static ToThaiShortDate(value: Date) {
let yy = value.getFullYear() < 2400 ? value.getFullYear() + 543 : value.getFullYear(); let yy = value.getFullYear() < 2400 ? value.getFullYear() + 543 : value.getFullYear();