From 0a18265f10987868a3bc1f3c2a8d13dc9e9e674c Mon Sep 17 00:00:00 2001
From: "LAPTOP-KB8JC2K2\\acer" <nakorn@tonproject.com>
Date: Thu, 8 Jul 2021 15:26:37 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?=
 =?UTF-8?q?=20=E0=B8=81=E0=B8=B2=E0=B8=A3=E0=B9=81=E0=B8=AA=E0=B8=94?=
 =?UTF-8?q?=E0=B8=87=E0=B8=9C=E0=B8=A5=20=E0=B8=84=E0=B9=88=E0=B8=B2?=
 =?UTF-8?q?=E0=B8=84=E0=B8=A3=E0=B8=AD=E0=B8=87=E0=B8=8A=E0=B8=B5=E0=B8=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eva_salary_cylinderService.cs               |  1 +
 .../external_linkage/external_linkageService.cs |  4 ++--
 .../eva_salary_cylinder.cshtml                  |  7 ++++++-
 .../eva_salary_cylinder/eva_salary_cylinder.js  | 17 ++++++++---------
 4 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/Models/eva_salary_cylinder/eva_salary_cylinderService.cs b/Models/eva_salary_cylinder/eva_salary_cylinderService.cs
index 5e0c213..68e8634 100644
--- a/Models/eva_salary_cylinder/eva_salary_cylinderService.cs
+++ b/Models/eva_salary_cylinder/eva_salary_cylinderService.cs
@@ -165,6 +165,7 @@ namespace TodoAPI2.Models
             return data;
         }
 
+
         #endregion
 
         #region Manipulation Functions
diff --git a/Models/external_linkage/external_linkageService.cs b/Models/external_linkage/external_linkageService.cs
index 7af4960..1b44c11 100644
--- a/Models/external_linkage/external_linkageService.cs
+++ b/Models/external_linkage/external_linkageService.cs
@@ -72,7 +72,7 @@ namespace TodoAPI2.Models
                 var i = new external_linkageViewModel();
                 i.external_id = Convert.ToInt32(dr["id"]);
                 i.external_code = dr["position_type_id"].ToString();
-                i.external_name = dr["position_type_id"].ToString() + " " + dr["position_type_name"].ToString();
+                i.external_name = dr["position_type_name"].ToString();
                 result.Add(i);
             }
             return result;
@@ -89,7 +89,7 @@ namespace TodoAPI2.Models
                 var i = new external_linkageViewModel();
                 i.external_id = Convert.ToInt32(dr["id"]);
                 i.external_code = dr["position_level_id"].ToString();
-                i.external_name = dr["position_level_id"].ToString() + " " + dr["position_level_name"].ToString();
+                i.external_name = dr["position_level_name"].ToString();
                 result.Add(i);
             }
             return result;
diff --git a/Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml b/Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml
index 78116a0..2ae3b25 100644
--- a/Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml
+++ b/Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml
@@ -121,13 +121,18 @@
                     <th><label id='h_eva_salary_cylinder_themin'>ขั้นต่ำ</label></th>
                     <th><label id='h_eva_salary_cylinder_themax'>ขั้นสูง</label></th>
                     <th><label id='h_eva_salary_cylinder_middle'>ค่ากลาง</label></th>
-                    <th><label id='h_eva_salary_cylinder_cost_living '>ค่าครองชีพ</label></th>
                     <th><label id='h_eva_salary_cylinder_position_allowance'>เงินประจำตำแหน่ง</label></th>
                     <th><label id='h_eva_salary_cylinder_monthly_compensation'>ค่าตอบแทนรายเดือน</label></th>
                 </tr>
             </thead>
             <tbody></tbody>
         </table>
+        <p>
+            หมายเหตุ : ค่าครองชีพ
+        </p>
+        <p>1.เงินเดือนไม่ถึงเดือนละ 13,285 บาท ได้ค่าครองชีพ 2,000 บาท แต่เมื่อรวมกับเงินเดือนแล้ว ต้องไม่เกินเดือนละ 13,285 บาท</p>
+        <p>2. กรณีได้รับค่าครองชีพ 2,000 บาท เมื่อรวมกับเงินเดือนแล้วไม่ถึง 10,000 บาท ให้ได้รับค่าครองชีพเพิ่มขึ้นอีกจนถึงเดือนละ 10,000 บาท</p>
+        
     </div>
 </section>
 
diff --git a/wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js b/wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js
index 90dde50..3886e56 100644
--- a/wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js
+++ b/wwwroot/js/eva_salary_cylinder/eva_salary_cylinder.js
@@ -173,7 +173,6 @@ var eva_salary_cylinder_setupTable = function (result) {
             { "data": "themin" },
             { "data": "themax" },
             { "data": "middle" },
-            { "data": "cost_living" },
             { "data": "position_allowance" },
             { "data": "monthly_compensation" },    
         ],
@@ -213,22 +212,22 @@ var eva_salary_cylinder_setupTable = function (result) {
                     return formatNumber(data);
                 }
             },
+            //{
+            //    "targets": 7,
+            //    "data": "cost_living",
+            //    "render": function (data, type, row, meta) {
+            //        return formatNumber(data);
+            //    }
+            //},
             {
                 "targets": 7,
-                "data": "cost_living",
-                "render": function (data, type, row, meta) {
-                    return formatNumber(data);
-                }
-            },
-            {
-                "targets": 8,
                 "data": "position_allowance",
                 "render": function (data, type, row, meta) {
                     return formatNumber(data);
                 }
             },
             {
-                "targets": 9,
+                "targets": 8,
                 "data": "monthly_compensation",
                 "render": function (data, type, row, meta) {
                     return formatNumber(data);