From 7f279c71a75adb213fe8663649c77f4d110870ac Mon Sep 17 00:00:00 2001
From: Pairat Sangprasert <pondpby@gmail.com>
Date: Mon, 29 Mar 2021 01:26:37 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=AA=E0=B8=A3=E0=B8=B4=E0=B8=A1?=
 =?UTF-8?q?=20clickup=20#7a0d5z=20=E0=B8=97=E0=B8=B5=E0=B9=88=E0=B8=9E?=
 =?UTF-8?q?=E0=B8=B5=E0=B9=88=E0=B8=95=E0=B9=89=E0=B8=99=E0=B8=82=E0=B8=AD?=
 =?UTF-8?q?=20=E0=B8=97=E0=B8=B3=20core=20function=20js=20=E0=B9=81?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=A5=E0=B8=87=20=E0=B8=95=E0=B8=B1=E0=B8=A7?=
 =?UTF-8?q?=E0=B9=80=E0=B8=A5=E0=B8=82=E0=B9=80=E0=B8=9B=E0=B9=87=E0=B8=99?=
 =?UTF-8?q?=20format=20currency=20=E0=B9=84=E0=B8=A7=E0=B9=89=E0=B9=83?=
 =?UTF-8?q?=E0=B8=99=E0=B9=84=E0=B8=9F=E0=B8=A5=E0=B9=8C=20corejen.js?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 wwwroot/js/coregen.js                          |  9 +++++++++
 .../eva_limit_frame_employee.js                | 18 ++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/wwwroot/js/coregen.js b/wwwroot/js/coregen.js
index 9fb5bc1..0a4abf5 100644
--- a/wwwroot/js/coregen.js
+++ b/wwwroot/js/coregen.js
@@ -659,3 +659,12 @@ function GetMenu(module, mymenu, menu_url){
 	startLoad();
     AjaxGetRequest(menu_url, refresh_menu, menu_error);
 }
+
+
+function coreFormatPrice(value, digits) {
+    var currency = 0;
+    if (value) {
+        currency = (value / 1).toFixed(digits);
+    }
+    return currency.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+}
diff --git a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js b/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js
index 6809648..235f6d9 100644
--- a/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js
+++ b/wwwroot/js/eva_limit_frame_employee/eva_limit_frame_employee.js
@@ -165,6 +165,24 @@ function eva_limit_frame_employee_GoDelete(a) {
 var eva_limit_frame_employeeTableV;
 
 var eva_limit_frame_employee_setupTable = function (result) {
+    console.log("result", result);
+
+    $.each(result, function (index_result, obj_result) {
+        /*console.log("index_result", index_result);
+        console.log("obj_result", obj_result);*/
+        var digits = 2;
+        var currency_salary = coreFormatPrice(obj_result.salary, digits);
+        var currency_position_allowance = coreFormatPrice(obj_result.position_allowance, digits);
+        var currency_monthly_remuneration = coreFormatPrice(obj_result.monthly_remuneration, digits);
+        var currency_cost_of_living = coreFormatPrice(obj_result.cost_of_living, digits);
+
+        obj_result.salary = currency_salary;
+        obj_result.position_allowance = currency_position_allowance;
+        obj_result.monthly_remuneration = currency_monthly_remuneration;
+        obj_result.currency_cost_of_living = currency_cost_of_living
+        /*console.log(obj_result);*/
+    });
+
     tmp = '"';
     var groupColumn = 3;
     eva_limit_frame_employeeTableV = $('#eva_limit_frame_employeeTable').DataTable({