This commit is contained in:
AdisakKanthawilang 2025-04-22 17:26:47 +07:00
parent 14f3a90d9b
commit 3b2c5f2cfd
2 changed files with 20 additions and 17 deletions

View file

@ -411,8 +411,8 @@ export class ReoportController {
certificateNo: certificate.certificateNo
? Extension.ToThaiNumber(certificate.certificateNo)
: "-",
issueDate: certificate.issueDate,
expireDate: certificate.expireDate,
issueDate: certificate.issueDate ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(certificate.issueDate)) : "-",
expireDate: certificate.expireDate ? Extension.ToThaiNumber(Extension.ToThaiFullDate2(certificate.expireDate)) : "-",
}))
: [
{
@ -460,10 +460,10 @@ export class ReoportController {
name: training.name ? Extension.ToThaiNumber(training.name) : "-",
topic: training.topic ? Extension.ToThaiNumber(training.topic) : "-",
startDate: training.startDate
? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(training.startDate))
? Extension.ToThaiNumber(Extension.ToThaiFullDate2(training.startDate))
: "-",
endDate: training.endDate
? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(training.endDate))
? Extension.ToThaiNumber(Extension.ToThaiFullDate2(training.endDate))
: "-",
yearly: training.yearly ? Extension.ToThaiNumber(training.yearly.toString()) : "-",
place: training.place,