#43

src/controllers/ReportController.ts

@@ -432,7 +432,7 @@ export class ReportController extends Controller {
       if (data1 != null) {
         formattedData1 = {
           total: Extension.ToThaiNumber(data1.total.toLocaleString()),
-          fifteenPercent: Extension.ToThaiNumber(data1.fifteenPercent.toLocaleString()),
+          fifteenPercent: Extension.ToThaiNumber(`${data1.fifteenPercent.toLocaleString()}.${data1.fifteenPoint.toLocaleString()}`),
           full: Extension.ToThaiNumber(
             data1.salaryProfiles.filter((x) => x.type == "FULL").length.toLocaleString(),
           ),
@@ -450,7 +450,7 @@ export class ReportController extends Controller {
       if (data2 != null) {
         formattedData2 = {
           total: Extension.ToThaiNumber(data2.total.toLocaleString()),
-          fifteenPercent: Extension.ToThaiNumber(data2.fifteenPercent.toLocaleString()),
+          fifteenPercent: Extension.ToThaiNumber(`${data2.fifteenPercent.toLocaleString()}.${data2.fifteenPoint.toLocaleString()}`),
           full: Extension.ToThaiNumber(
             data2.salaryProfiles
               .filter(
@@ -492,7 +492,7 @@ export class ReportController extends Controller {
       if (data3 != null) {
         formattedData3 = {
           total: Extension.ToThaiNumber(data3.total.toLocaleString()),
-          fifteenPercent: Extension.ToThaiNumber(data3.fifteenPercent.toLocaleString()),
+          fifteenPercent: Extension.ToThaiNumber(`${data3.fifteenPercent.toLocaleString()}.${data3.fifteenPoint.toLocaleString()}`),
           full: Extension.ToThaiNumber(
             data3.salaryProfiles
               .filter(
@@ -537,7 +537,7 @@ export class ReportController extends Controller {
       if (data4 != null) {
         formattedData4 = {
           total: Extension.ToThaiNumber(data4.total.toLocaleString()),
-          fifteenPercent: Extension.ToThaiNumber(data4.fifteenPercent.toLocaleString()),
+          fifteenPercent: Extension.ToThaiNumber(`${data4.fifteenPercent.toLocaleString()}.${data4.fifteenPoint.toLocaleString()}`),
           full: Extension.ToThaiNumber(
             data4.salaryProfiles.filter((x) => x.type == "FULL").length.toLocaleString(),
           ),
@@ -632,10 +632,8 @@ export class ReportController extends Controller {
           sixPercentAmount: Extension.ToThaiNumber(data1.sixPercentAmount.toLocaleString()),
           spentAmount: Extension.ToThaiNumber(data1.spentAmount.toLocaleString()),
           remainingAmount: Extension.ToThaiNumber(data1.remainingAmount.toLocaleString()),
-          fifteenPercentOld: Extension.ToThaiNumber(
+          fifteenPercentOld: Extension.ToThaiNumber(`${_salaryPeriodAPR2 == null ? 0 : _salaryPeriodAPR2.fifteenPercent.toLocaleString()}.${_salaryPeriodAPR2 == null ? 0: _salaryPeriodAPR2.fifteenPoint.toLocaleString()}`),
-            (_salaryPeriodAPR2 == null ? 0 : _salaryPeriodAPR2.fifteenPercent).toLocaleString(),
+           totalOld: Extension.ToThaiNumber(
-          ),
-          totalOld: Extension.ToThaiNumber(
             (_salaryPeriodAPR2 == null || _salaryPeriodAPR2.salaryProfiles.length == 0
               ? 0
               : _salaryPeriodAPR2.salaryProfiles.filter((x) => x.type == "FULL").length
@@ -727,9 +725,7 @@ export class ReportController extends Controller {
           sixPercentAmount: Extension.ToThaiNumber(data2.sixPercentAmount.toLocaleString()),
           spentAmount: Extension.ToThaiNumber(data2.spentAmount.toLocaleString()),
           remainingAmount: Extension.ToThaiNumber(data2.remainingAmount.toLocaleString()),
-          fifteenPercentOld: Extension.ToThaiNumber(
+          fifteenPercentOld: Extension.ToThaiNumber(`${_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent.toLocaleString()}.${_salaryPeriodAPR1 == null ? 0: _salaryPeriodAPR1.fifteenPoint.toLocaleString()}`),
-            (_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent).toLocaleString(),
-          ),
           totalOld: Extension.ToThaiNumber(
             (_salaryPeriodAPR1 == null || _salaryPeriodAPR1.salaryProfiles.length == 0
               ? 0
@@ -863,9 +859,7 @@ export class ReportController extends Controller {
           sixPercentAmount: Extension.ToThaiNumber(data3.sixPercentAmount.toLocaleString()),
           spentAmount: Extension.ToThaiNumber(data3.spentAmount.toLocaleString()),
           remainingAmount: Extension.ToThaiNumber(data3.remainingAmount.toLocaleString()),
-          fifteenPercentOld: Extension.ToThaiNumber(
+          fifteenPercentOld: Extension.ToThaiNumber(`${_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent.toLocaleString()}.${_salaryPeriodAPR1 == null ? 0: _salaryPeriodAPR1.fifteenPoint.toLocaleString()}`),
-            (_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent).toLocaleString(),
-          ),
           totalOld: Extension.ToThaiNumber(
             (_salaryPeriodAPR1 == null || _salaryPeriodAPR1.salaryProfiles.length == 0
               ? 0
@@ -983,9 +977,7 @@ export class ReportController extends Controller {
           sixPercentAmount: Extension.ToThaiNumber(data4.sixPercentAmount.toLocaleString()),
           spentAmount: Extension.ToThaiNumber(data4.spentAmount.toLocaleString()),
           remainingAmount: Extension.ToThaiNumber(data4.remainingAmount.toLocaleString()),
-          fifteenPercentOld: Extension.ToThaiNumber(
+          fifteenPercentOld: Extension.ToThaiNumber(`${_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent.toLocaleString()}.${_salaryPeriodAPR1 == null ? 0: _salaryPeriodAPR1.fifteenPoint.toLocaleString()}`),
-            (_salaryPeriodAPR1 == null ? 0 : _salaryPeriodAPR1.fifteenPercent).toLocaleString(),
-          ),
           totalOld: Extension.ToThaiNumber(
             (_salaryPeriodAPR1 == null || _salaryPeriodAPR1.salaryProfiles.length == 0
               ? 0
@@ -2674,7 +2666,7 @@ export class ReportController extends Controller {
         fifteenPercent:
           _salaryPeriod == null
             ? ""
-            : Extension.ToThaiNumber(_salaryPeriod.fifteenPercent.toString()),
+            : Extension.ToThaiNumber(`${_salaryPeriod.fifteenPercent.toLocaleString()}.${_salaryPeriod.fifteenPoint.toLocaleString()}`),
         full:
           _salaryPeriod == null
             ? ""
@@ -4208,7 +4200,7 @@ export class ReportController extends Controller {
               ),
         totalOld: aprSnap2 == null ? "" : Extension.ToThaiNumber(aprSnap2.total.toLocaleString()), //จำนวน(คน)(โควตาเลื่อนขั้นค่าจ้าง)
         fifteenPercentOld:
-          aprSnap2 == null ? "" : Extension.ToThaiNumber(aprSnap2.fifteenPercent.toLocaleString()),
+          Extension.ToThaiNumber(`${aprSnap2.fifteenPercent.toLocaleString()}.${aprSnap2.fifteenPoint.toLocaleString()}`),
         totalUseOld:
           aprSnap2 == null ? "" : Extension.ToThaiNumber(aprSnap2.quantityUsed.toLocaleString()), //พิจารณาให้(คน)(โควตาเลื่อนขั้นค่าจ้าง)
         full2: totalEmp2step == null ? "" : Extension.ToThaiNumber(totalEmp2step.toLocaleString()), //เลื่อนขั้นค่าจ้างรวมทั้งปีสองขั้นจำนวน(คน)

src/controllers/SalaryPeriodController.ts

@@ -263,7 +263,7 @@ export class SalaryPeriodController extends Controller {
     }, 0);
     const data = {
       total: salaryOrg.total,
-      fifteenPercent: salaryOrg.fifteenPercent,
+      fifteenPercent: salaryOrg.fifteenPercent + (salaryOrg.fifteenPoint / 100),
       chosen: salaryOrg.quantityUsed,
       remaining: salaryOrg.remainQuota,
       currentAmount: salaryOrg.currentAmount,

src/controllers/SalaryPeriodEmployeeController.ts

@@ -224,7 +224,7 @@ export class SalaryPeriodEmployeeController extends Controller {
     }, 0);
     const data = {
       total: salaryOrg.total,
-      fifteenPercent: salaryOrg.fifteenPercent,
+      fifteenPercent: salaryOrg.fifteenPercent + (salaryOrg.fifteenPoint / 100),
       chosen: salaryOrg.quantityUsed,
       remaining: salaryOrg.remainQuota,
       currentAmount: salaryOrg.currentAmount,