comma
This commit is contained in:
Bright
parent
45b3777d33
commit
a268b8e2cb
1 changed files with 83 additions and 83 deletions
|
|
@ -327,16 +327,16 @@ export class ReportController extends Controller {
|
|||
let formattedData1;
|
||||
if (data1 != null) {
|
||||
formattedData1 = {
|
||||
total: Extension.ToThaiNumber(data1.total.toString()),
|
||||
fifteenPercent: Extension.ToThaiNumber(data1.fifteenPercent.toString()),
|
||||
total: Extension.ToThaiNumber(data1.total.toLocaleString()),
|
||||
fifteenPercent: Extension.ToThaiNumber(data1.fifteenPercent.toLocaleString()),
|
||||
full: Extension.ToThaiNumber(
|
||||
data1.salaryProfiles.filter((x) => x.type == "FULL").length.toString(),
|
||||
data1.salaryProfiles.filter((x) => x.type == "FULL").length.toLocaleString(),
|
||||
),
|
||||
haft: Extension.ToThaiNumber(
|
||||
data1.salaryProfiles.filter((x) => x.type == "HAFT").length.toString(),
|
||||
data1.salaryProfiles.filter((x) => x.type == "HAFT").length.toLocaleString(),
|
||||
),
|
||||
notPromoted: Extension.ToThaiNumber(
|
||||
data1.salaryProfiles.filter((x) => x.type == "NONE").length.toString(),
|
||||
data1.salaryProfiles.filter((x) => x.type == "NONE").length.toLocaleString(),
|
||||
),
|
||||
reason: null,
|
||||
};
|
||||
|
|
@ -345,8 +345,8 @@ export class ReportController extends Controller {
|
|||
let formattedData2;
|
||||
if (data2 != null) {
|
||||
formattedData2 = {
|
||||
total: Extension.ToThaiNumber(data2.total.toString()),
|
||||
fifteenPercent: Extension.ToThaiNumber(data2.fifteenPercent.toString()),
|
||||
total: Extension.ToThaiNumber(data2.total.toLocaleString()),
|
||||
fifteenPercent: Extension.ToThaiNumber(data2.fifteenPercent.toLocaleString()),
|
||||
full: Extension.ToThaiNumber(
|
||||
data2.salaryProfiles
|
||||
.filter(
|
||||
|
|
@ -356,7 +356,7 @@ export class ReportController extends Controller {
|
|||
(x.posLevel == "ต้น" && x.posType == "อำนวยการ"),
|
||||
)
|
||||
.filter((x) => x.type == "FULL")
|
||||
.length.toString(),
|
||||
.length.toLocaleString(),
|
||||
),
|
||||
haft: Extension.ToThaiNumber(
|
||||
data2.salaryProfiles
|
||||
|
|
@ -367,7 +367,7 @@ export class ReportController extends Controller {
|
|||
(x.posLevel == "ต้น" && x.posType == "อำนวยการ"),
|
||||
)
|
||||
.filter((x) => x.type == "HAFT")
|
||||
.length.toString(),
|
||||
.length.toLocaleString(),
|
||||
),
|
||||
notPromoted: Extension.ToThaiNumber(
|
||||
data2.salaryProfiles
|
||||
|
|
@ -378,7 +378,7 @@ export class ReportController extends Controller {
|
|||
(x.posLevel == "ต้น" && x.posType == "อำนวยการ"),
|
||||
)
|
||||
.filter((x) => x.type == "NONE")
|
||||
.length.toString(),
|
||||
.length.toLocaleString(),
|
||||
),
|
||||
reason: null,
|
||||
};
|
||||
|
|
@ -387,8 +387,8 @@ export class ReportController extends Controller {
|
|||
let formattedData3;
|
||||
if (data3 != null) {
|
||||
formattedData3 = {
|
||||
total: Extension.ToThaiNumber(data3.total.toString()),
|
||||
fifteenPercent: Extension.ToThaiNumber(data3.fifteenPercent.toString()),
|
||||
total: Extension.ToThaiNumber(data3.total.toLocaleString()),
|
||||
fifteenPercent: Extension.ToThaiNumber(data3.fifteenPercent.toLocaleString()),
|
||||
full: Extension.ToThaiNumber(
|
||||
data3.salaryProfiles
|
||||
.filter(
|
||||
|
|
@ -399,7 +399,7 @@ export class ReportController extends Controller {
|
|||
x.posLevel == "ชำนาญการ",
|
||||
)
|
||||
.filter((x) => x.type == "FULL")
|
||||
.length.toString(),
|
||||
.length.toLocaleString(),
|
||||
),
|
||||
haft: Extension.ToThaiNumber(
|
||||
data3.salaryProfiles
|
||||
|
|
@ -411,7 +411,7 @@ export class ReportController extends Controller {
|
|||
x.posLevel == "ชำนาญการ",
|
||||
)
|
||||
.filter((x) => x.type == "HAFT")
|
||||
.length.toString(),
|
||||
.length.toLocaleString(),
|
||||
),
|
||||
notPromoted: Extension.ToThaiNumber(
|
||||
data3.salaryProfiles
|
||||
|
|
@ -423,7 +423,7 @@ export class ReportController extends Controller {
|
|||
x.posLevel == "ชำนาญการ",
|
||||
)
|
||||
.filter((x) => x.type == "NONE")
|
||||
.length.toString(),
|
||||
.length.toLocaleString(),
|
||||
),
|
||||
reason: null,
|
||||
};
|
||||
|
|
@ -432,16 +432,16 @@ export class ReportController extends Controller {
|
|||
let formattedData4;
|
||||
if (data4 != null) {
|
||||
formattedData4 = {
|
||||
total: Extension.ToThaiNumber(data4.total.toString()),
|
||||
fifteenPercent: Extension.ToThaiNumber(data4.fifteenPercent.toString()),
|
||||
total: Extension.ToThaiNumber(data4.total.toLocaleString()),
|
||||
fifteenPercent: Extension.ToThaiNumber(data4.fifteenPercent.toLocaleString()),
|
||||
full: Extension.ToThaiNumber(
|
||||
data4.salaryProfiles.filter((x) => x.type == "FULL").length.toString(),
|
||||
data4.salaryProfiles.filter((x) => x.type == "FULL").length.toLocaleString(),
|
||||
),
|
||||
haft: Extension.ToThaiNumber(
|
||||
data4.salaryProfiles.filter((x) => x.type == "HAFT").length.toString(),
|
||||
data4.salaryProfiles.filter((x) => x.type == "HAFT").length.toLocaleString(),
|
||||
),
|
||||
notPromoted: Extension.ToThaiNumber(
|
||||
data4.salaryProfiles.filter((x) => x.type == "NONE").length.toString(),
|
||||
data4.salaryProfiles.filter((x) => x.type == "NONE").length.toLocaleString(),
|
||||
),
|
||||
reason: null,
|
||||
};
|
||||
|
|
@ -518,35 +518,35 @@ export class ReportController extends Controller {
|
|||
);
|
||||
}, 0);
|
||||
formattedData1 = {
|
||||
totalSalary: Extension.ToThaiNumber(data1.currentAmount.toString()),
|
||||
totalUser: Extension.ToThaiNumber(data1.total.toString()),
|
||||
sixPercentAmount: Extension.ToThaiNumber(data1.sixPercentAmount.toString()),
|
||||
spentAmount: Extension.ToThaiNumber(data1.spentAmount.toString()),
|
||||
totalSalary: Extension.ToThaiNumber(data1.currentAmount.toLocaleString()),
|
||||
totalUser: Extension.ToThaiNumber(data1.total.toLocaleString()),
|
||||
sixPercentAmount: Extension.ToThaiNumber(data1.sixPercentAmount.toLocaleString()),
|
||||
spentAmount: Extension.ToThaiNumber(data1.spentAmount.toLocaleString()),
|
||||
remainingAmount: Extension.ToThaiNumber(
|
||||
(data1.sixPercentAmount - data1.spentAmount).toString(),
|
||||
(data1.sixPercentAmount - data1.spentAmount).toLocaleString(),
|
||||
),
|
||||
fifteenPercentOld: Extension.ToThaiNumber(
|
||||
(_salaryPeriodAPR2 == null ? 0 : _salaryPeriodAPR2.fifteenPercent).toString(),
|
||||
(_salaryPeriodAPR2 == null ? 0 : _salaryPeriodAPR2.fifteenPercent).toLocaleString(),
|
||||
),
|
||||
totalOld: Extension.ToThaiNumber(
|
||||
(_salaryPeriodAPR2 == null ? 0 : _salaryPeriodAPR2.total).toString(),
|
||||
(_salaryPeriodAPR2 == null ? 0 : _salaryPeriodAPR2.total).toLocaleString(),
|
||||
),
|
||||
haft: Extension.ToThaiNumber(
|
||||
data1.salaryProfiles.filter((x) => x.type == "HAFT").length.toString(),
|
||||
data1.salaryProfiles.filter((x) => x.type == "HAFT").length.toLocaleString(),
|
||||
),
|
||||
full: Extension.ToThaiNumber(
|
||||
data1.salaryProfiles.filter((x) => x.type == "FULL").length.toString(),
|
||||
data1.salaryProfiles.filter((x) => x.type == "FULL").length.toLocaleString(),
|
||||
),
|
||||
fullHaft: Extension.ToThaiNumber(
|
||||
data1.salaryProfiles.filter((x) => x.type == "FULLHAFT").length.toString(),
|
||||
),
|
||||
notPromoted: Extension.ToThaiNumber(
|
||||
data1.salaryProfiles.filter((x) => x.type == "NONE").length.toString(),
|
||||
data1.salaryProfiles.filter((x) => x.type == "NONE").length.toLocaleString(),
|
||||
),
|
||||
haftSalary: Extension.ToThaiNumber(haftSalary.toString()),
|
||||
fullSalary: Extension.ToThaiNumber(fullSalary.toString()),
|
||||
fullHaftSalary: Extension.ToThaiNumber(fullHaftSalary.toString()),
|
||||
total: Extension.ToThaiNumber((haftSalary + fullSalary + fullHaftSalary).toString()),
|
||||
haftSalary: Extension.ToThaiNumber(haftSalary.toLocaleString()),
|
||||
fullSalary: Extension.ToThaiNumber(fullSalary.toLocaleString()),
|
||||
fullHaftSalary: Extension.ToThaiNumber(fullHaftSalary.toLocaleString()),
|
||||
total: Extension.ToThaiNumber((haftSalary + fullSalary + fullHaftSalary).toLocaleString()),
|
||||
summary: Extension.ToThaiNumber(
|
||||
(
|
||||
data1.sixPercentAmount -
|
||||
|
|
@ -554,7 +554,7 @@ export class ReportController extends Controller {
|
|||
haftSalary -
|
||||
fullSalary -
|
||||
fullHaftSalary
|
||||
).toString(),
|
||||
).toLocaleString(),
|
||||
),
|
||||
reason: null,
|
||||
};
|
||||
|
|
@ -610,18 +610,18 @@ export class ReportController extends Controller {
|
|||
}, 0);
|
||||
|
||||
formattedData2 = {
|
||||
totalSalary: Extension.ToThaiNumber(data2.currentAmount.toString()),
|
||||
totalUser: Extension.ToThaiNumber(data2.total.toString()),
|
||||
sixPercentAmount: Extension.ToThaiNumber(data2.sixPercentAmount.toString()),
|
||||
spentAmount: Extension.ToThaiNumber(data2.spentAmount.toString()),
|
||||
totalSalary: Extension.ToThaiNumber(data2.currentAmount.toLocaleString()),
|
||||
totalUser: Extension.ToThaiNumber(data2.total.toLocaleString()),
|
||||
sixPercentAmount: Extension.ToThaiNumber(data2.sixPercentAmount.toLocaleString()),
|
||||
spentAmount: Extension.ToThaiNumber(data2.spentAmount.toLocaleString()),
|
||||
remainingAmount: Extension.ToThaiNumber(
|
||||
(data2.sixPercentAmount - data2.spentAmount).toString(),
|
||||
(data2.sixPercentAmount - data2.spentAmount).toLocaleString(),
|
||||
),
|
||||
fifteenPercentOld: Extension.ToThaiNumber(
|
||||
(_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent).toString(),
|
||||
(_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent).toLocaleString(),
|
||||
),
|
||||
totalOld: Extension.ToThaiNumber(
|
||||
(_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.total).toString(),
|
||||
(_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.total).toLocaleString(),
|
||||
),
|
||||
haft: Extension.ToThaiNumber(
|
||||
data2.salaryProfiles
|
||||
|
|
@ -632,7 +632,7 @@ export class ReportController extends Controller {
|
|||
(x.posLevel == "ต้น" && x.posType == "อำนวยการ"),
|
||||
)
|
||||
.filter((x) => x.type == "HAFT")
|
||||
.length.toString(),
|
||||
.length.toLocaleString(),
|
||||
),
|
||||
full: Extension.ToThaiNumber(
|
||||
data2.salaryProfiles
|
||||
|
|
@ -643,7 +643,7 @@ export class ReportController extends Controller {
|
|||
(x.posLevel == "ต้น" && x.posType == "อำนวยการ"),
|
||||
)
|
||||
.filter((x) => x.type == "FULL")
|
||||
.length.toString(),
|
||||
.length.toLocaleString(),
|
||||
),
|
||||
fullHaft: Extension.ToThaiNumber(
|
||||
data2.salaryProfiles
|
||||
|
|
@ -654,7 +654,7 @@ export class ReportController extends Controller {
|
|||
(x.posLevel == "ต้น" && x.posType == "อำนวยการ"),
|
||||
)
|
||||
.filter((x) => x.type == "FULLHAFT")
|
||||
.length.toString(),
|
||||
.length.toLocaleString(),
|
||||
),
|
||||
notPromoted: Extension.ToThaiNumber(
|
||||
data2.salaryProfiles
|
||||
|
|
@ -665,12 +665,12 @@ export class ReportController extends Controller {
|
|||
(x.posLevel == "ต้น" && x.posType == "อำนวยการ"),
|
||||
)
|
||||
.filter((x) => x.type == "NONE")
|
||||
.length.toString(),
|
||||
.length.toLocaleString(),
|
||||
),
|
||||
haftSalary: Extension.ToThaiNumber(haftSalary.toString()),
|
||||
fullSalary: Extension.ToThaiNumber(fullSalary.toString()),
|
||||
fullHaftSalary: Extension.ToThaiNumber(fullHaftSalary.toString()),
|
||||
total: Extension.ToThaiNumber((haftSalary + fullSalary + fullHaftSalary).toString()),
|
||||
haftSalary: Extension.ToThaiNumber(haftSalary.toLocaleString()),
|
||||
fullSalary: Extension.ToThaiNumber(fullSalary.toLocaleString()),
|
||||
fullHaftSalary: Extension.ToThaiNumber(fullHaftSalary.toLocaleString()),
|
||||
total: Extension.ToThaiNumber((haftSalary + fullSalary + fullHaftSalary).toLocaleString()),
|
||||
summary: Extension.ToThaiNumber(
|
||||
(
|
||||
data2.sixPercentAmount -
|
||||
|
|
@ -678,7 +678,7 @@ export class ReportController extends Controller {
|
|||
haftSalary -
|
||||
fullSalary -
|
||||
fullHaftSalary
|
||||
).toString(),
|
||||
).toLocaleString(),
|
||||
),
|
||||
reason: null,
|
||||
};
|
||||
|
|
@ -736,18 +736,18 @@ export class ReportController extends Controller {
|
|||
);
|
||||
}, 0);
|
||||
formattedData3 = {
|
||||
totalSalary: Extension.ToThaiNumber(data3.currentAmount.toString()),
|
||||
totalUser: Extension.ToThaiNumber(data3.total.toString()),
|
||||
sixPercentAmount: Extension.ToThaiNumber(data3.sixPercentAmount.toString()),
|
||||
spentAmount: Extension.ToThaiNumber(data3.spentAmount.toString()),
|
||||
totalSalary: Extension.ToThaiNumber(data3.currentAmount.toLocaleString()),
|
||||
totalUser: Extension.ToThaiNumber(data3.total.toLocaleString()),
|
||||
sixPercentAmount: Extension.ToThaiNumber(data3.sixPercentAmount.toLocaleString()),
|
||||
spentAmount: Extension.ToThaiNumber(data3.spentAmount.toLocaleString()),
|
||||
remainingAmount: Extension.ToThaiNumber(
|
||||
(data3.sixPercentAmount - data3.spentAmount).toString(),
|
||||
(data3.sixPercentAmount - data3.spentAmount).toLocaleString(),
|
||||
),
|
||||
fifteenPercentOld: Extension.ToThaiNumber(
|
||||
(_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent).toString(),
|
||||
(_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent).toLocaleString(),
|
||||
),
|
||||
totalOld: Extension.ToThaiNumber(
|
||||
(_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.total).toString(),
|
||||
(_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.total).toLocaleString(),
|
||||
),
|
||||
haft: Extension.ToThaiNumber(
|
||||
data3.salaryProfiles
|
||||
|
|
@ -759,7 +759,7 @@ export class ReportController extends Controller {
|
|||
x.posLevel == "ปฏิบัติการ" ||
|
||||
x.posLevel == "ชำนาญการ",
|
||||
)
|
||||
.length.toString(),
|
||||
.length.toLocaleString(),
|
||||
),
|
||||
full: Extension.ToThaiNumber(
|
||||
data3.salaryProfiles
|
||||
|
|
@ -771,7 +771,7 @@ export class ReportController extends Controller {
|
|||
x.posLevel == "ปฏิบัติการ" ||
|
||||
x.posLevel == "ชำนาญการ",
|
||||
)
|
||||
.length.toString(),
|
||||
.length.toLocaleString(),
|
||||
),
|
||||
fullHaft: Extension.ToThaiNumber(
|
||||
data3.salaryProfiles
|
||||
|
|
@ -783,7 +783,7 @@ export class ReportController extends Controller {
|
|||
x.posLevel == "ปฏิบัติการ" ||
|
||||
x.posLevel == "ชำนาญการ",
|
||||
)
|
||||
.length.toString(),
|
||||
.length.toLocaleString(),
|
||||
),
|
||||
notPromoted: Extension.ToThaiNumber(
|
||||
data3.salaryProfiles
|
||||
|
|
@ -795,12 +795,12 @@ export class ReportController extends Controller {
|
|||
x.posLevel == "ปฏิบัติการ" ||
|
||||
x.posLevel == "ชำนาญการ",
|
||||
)
|
||||
.length.toString(),
|
||||
.length.toLocaleString(),
|
||||
),
|
||||
haftSalary: Extension.ToThaiNumber(haftSalary.toString()),
|
||||
fullSalary: Extension.ToThaiNumber(fullSalary.toString()),
|
||||
fullHaftSalary: Extension.ToThaiNumber(fullHaftSalary.toString()),
|
||||
total: Extension.ToThaiNumber((haftSalary + fullSalary + fullHaftSalary).toString()),
|
||||
haftSalary: Extension.ToThaiNumber(haftSalary.toLocaleString()),
|
||||
fullSalary: Extension.ToThaiNumber(fullSalary.toLocaleString()),
|
||||
fullHaftSalary: Extension.ToThaiNumber(fullHaftSalary.toLocaleString()),
|
||||
total: Extension.ToThaiNumber((haftSalary + fullSalary + fullHaftSalary).toLocaleString()),
|
||||
summary: Extension.ToThaiNumber(
|
||||
(
|
||||
data3.sixPercentAmount -
|
||||
|
|
@ -808,7 +808,7 @@ export class ReportController extends Controller {
|
|||
haftSalary -
|
||||
fullSalary -
|
||||
fullHaftSalary
|
||||
).toString(),
|
||||
).toLocaleString(),
|
||||
),
|
||||
reason: null,
|
||||
};
|
||||
|
|
@ -845,35 +845,35 @@ export class ReportController extends Controller {
|
|||
);
|
||||
}, 0);
|
||||
formattedData4 = {
|
||||
totalSalary: Extension.ToThaiNumber(data4.currentAmount.toString()),
|
||||
totalUser: Extension.ToThaiNumber(data4.total.toString()),
|
||||
sixPercentAmount: Extension.ToThaiNumber(data4.sixPercentAmount.toString()),
|
||||
spentAmount: Extension.ToThaiNumber(data4.spentAmount.toString()),
|
||||
totalSalary: Extension.ToThaiNumber(data4.currentAmount.toLocaleString()),
|
||||
totalUser: Extension.ToThaiNumber(data4.total.toLocaleString()),
|
||||
sixPercentAmount: Extension.ToThaiNumber(data4.sixPercentAmount.toLocaleString()),
|
||||
spentAmount: Extension.ToThaiNumber(data4.spentAmount.toLocaleString()),
|
||||
remainingAmount: Extension.ToThaiNumber(
|
||||
(data4.sixPercentAmount - data4.spentAmount).toString(),
|
||||
(data4.sixPercentAmount - data4.spentAmount).toLocaleString(),
|
||||
),
|
||||
fifteenPercentOld: Extension.ToThaiNumber(
|
||||
(_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent).toString(),
|
||||
(_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent).toLocaleString(),
|
||||
),
|
||||
totalOld: Extension.ToThaiNumber(
|
||||
(_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.total).toString(),
|
||||
(_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.total).toLocaleString(),
|
||||
),
|
||||
haft: Extension.ToThaiNumber(
|
||||
data4.salaryProfiles.filter((x) => x.type == "HAFT").length.toString(),
|
||||
data4.salaryProfiles.filter((x) => x.type == "HAFT").length.toLocaleString(),
|
||||
),
|
||||
full: Extension.ToThaiNumber(
|
||||
data4.salaryProfiles.filter((x) => x.type == "FULL").length.toString(),
|
||||
data4.salaryProfiles.filter((x) => x.type == "FULL").length.toLocaleString(),
|
||||
),
|
||||
fullHaft: Extension.ToThaiNumber(
|
||||
data4.salaryProfiles.filter((x) => x.type == "FULLHAFT").length.toString(),
|
||||
data4.salaryProfiles.filter((x) => x.type == "FULLHAFT").length.toLocaleString(),
|
||||
),
|
||||
notPromoted: Extension.ToThaiNumber(
|
||||
data4.salaryProfiles.filter((x) => x.type == "NONE").length.toString(),
|
||||
data4.salaryProfiles.filter((x) => x.type == "NONE").length.toLocaleString(),
|
||||
),
|
||||
haftSalary: Extension.ToThaiNumber(haftSalary.toString()),
|
||||
fullSalary: Extension.ToThaiNumber(fullSalary.toString()),
|
||||
fullHaftSalary: Extension.ToThaiNumber(fullHaftSalary.toString()),
|
||||
total: Extension.ToThaiNumber((haftSalary + fullSalary + fullHaftSalary).toString()),
|
||||
haftSalary: Extension.ToThaiNumber(haftSalary.toLocaleString()),
|
||||
fullSalary: Extension.ToThaiNumber(fullSalary.toLocaleString()),
|
||||
fullHaftSalary: Extension.ToThaiNumber(fullHaftSalary.toLocaleString()),
|
||||
total: Extension.ToThaiNumber((haftSalary + fullSalary + fullHaftSalary).toLocaleString()),
|
||||
summary: Extension.ToThaiNumber(
|
||||
(
|
||||
data4.sixPercentAmount -
|
||||
|
|
@ -881,7 +881,7 @@ export class ReportController extends Controller {
|
|||
haftSalary -
|
||||
fullSalary -
|
||||
fullHaftSalary
|
||||
).toString(),
|
||||
).toLocaleString(),
|
||||
),
|
||||
reason: null,
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue