ToThaiFullDate2
This commit is contained in:
parent
3786ef4b78
commit
a5b0d2e911
2 changed files with 14 additions and 2 deletions
|
|
@ -453,7 +453,7 @@ export class ReportController extends Controller {
|
||||||
reportName: "gov1-02",
|
reportName: "gov1-02",
|
||||||
data: {
|
data: {
|
||||||
date: Extension.ToThaiNumber(
|
date: Extension.ToThaiNumber(
|
||||||
Extension.ToThaiFullDate(new Date(`${salaryPeriod.year}-03-01`)),
|
Extension.ToThaiFullDate2(new Date(`${salaryPeriod.year}-03-01`)),
|
||||||
),
|
),
|
||||||
year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))),
|
year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))),
|
||||||
dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
|
dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
|
||||||
|
|
@ -922,7 +922,7 @@ export class ReportController extends Controller {
|
||||||
reportName: "gov2-02",
|
reportName: "gov2-02",
|
||||||
data: {
|
data: {
|
||||||
date: Extension.ToThaiNumber(
|
date: Extension.ToThaiNumber(
|
||||||
Extension.ToThaiFullDate(new Date(`${salaryPeriod.year}-03-01`)),
|
Extension.ToThaiFullDate2(new Date(`${salaryPeriod.year}-03-01`)),
|
||||||
),
|
),
|
||||||
year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))),
|
year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))),
|
||||||
dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
|
dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())),
|
||||||
|
|
|
||||||
|
|
@ -98,6 +98,18 @@ class Extension {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
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();
|
||||||
return (
|
return (
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue