From ccacb814a334f1c577ebde977b801b49680dfee0 Mon Sep 17 00:00:00 2001
From: "LAPTOP-KB8JC2K2\\acer" <nakorn@tonproject.com>
Date: Thu, 2 Sep 2021 18:50:32 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9B?=
 =?UTF-8?q?=E0=B8=A3=E0=B8=B8=E0=B8=87=E0=B8=AA=E0=B8=B9=E0=B8=95=E0=B8=A3?=
 =?UTF-8?q?=E0=B9=81=E0=B8=A5=E0=B8=B0=E0=B8=8B=E0=B9=88=E0=B8=AD=E0=B8=99?=
 =?UTF-8?q?=E0=B8=9B=E0=B8=B8=E0=B9=88=E0=B8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eva_adjust_postponement_normal_d.cshtml        |  2 +-
 ..._adjust_postponement_detail_normal_02_inline.js |  6 +++---
 .../eva_adjust_postponement_normal_d.js            | 14 ++++++++++++--
 .../eva_adjust_postponement_quota_d.js             | 14 ++++++++++++--
 4 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml b/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml
index 7575b02..fb83d78 100644
--- a/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml
+++ b/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal_d.cshtml
@@ -103,7 +103,7 @@
     <div class="tools">
         <div class="row">
             <div class="col-md-12">
-                <button class="btn btn-info" type="button" onclick="javascript:Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(true)">คำนวณค่าครองชีพใหม่ ตามเกณฑ์เงินเดือน 13,285</button>
+                <button style="display:none;" class="btn btn-info" type="button" onclick="javascript:Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(true)">คำนวณค่าครองชีพใหม่ ตามเกณฑ์เงินเดือน 13,285</button>
             </div>
         </div>
     </div>
diff --git a/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js b/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js
index bd8c9a2..bb01973 100644
--- a/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js
+++ b/wwwroot/js/eva_adjust_postponement_detail_normal_02/eva_adjust_postponement_detail_normal_02_inline.js
@@ -133,10 +133,10 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
             tag += '<td><p  id="eva_adjust_postponement_detail_normal_02_sarary_' + (i + 1) + '" /></td>';
             tag += '<td><p  id="eva_adjust_postponement_detail_normal_02_cost_living_' + (i + 1) + '" /></td>';
             tag += '<td><p  id="eva_adjust_postponement_detail_normal_02_middle_' + (i + 1) + '" /></td>';
-            tag += '<td><input class="form-control" onchange="Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(false)" type="number" id="eva_adjust_postponement_detail_normal_02_promoted_percentage_' + (i + 1) + '" /></td>';
+            tag += '<td><input class="form-control" onchange="Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(true)" type="number" id="eva_adjust_postponement_detail_normal_02_promoted_percentage_' + (i + 1) + '" /></td>';
             tag += '<td><input disabled class="form-control" id="eva_adjust_postponement_detail_normal_02_total_promote_' + (i + 1) + '" /></td>';
             tag += '<td><p  id="eva_adjust_postponement_detail_normal_02_new_sarary_' + (i + 1) + '" /></td>';
-            tag += '<td><input class="form-control" id="eva_adjust_postponement_detail_normal_02_new_cost_living_' + (i + 1) + '" /></td>';
+            tag += '<td><input disabled class="form-control" id="eva_adjust_postponement_detail_normal_02_new_cost_living_' + (i + 1) + '" /></td>';
             tag += '<td><p id="eva_adjust_postponement_detail_normal_02_remark_' + (i + 1) + '" /><p style="display:none;" id="eva_adjust_postponement_detail_normal_02_salary_max_' + (i + 1) + '" /><p style="display:none;" id="eva_adjust_postponement_detail_normal_02_themax_' + (i + 1) + '" /></td>';
             tag += '</tr>';
 
@@ -188,7 +188,7 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
             eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, (i + 1), blankItem);
         });
         //eva_adjust_postponement_detail_normal_02_Summary();
-        Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(false);
+        Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(true);
         endLoad();
     };
     startLoad();
diff --git a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js
index 60a06bb..5090d10 100644
--- a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js
+++ b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_d.js
@@ -176,13 +176,23 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(m
             $("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(format_new_added);
             $("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(new_salary));
 
+            //if (m) {
+            //    if (new_salary < 13285) {
+            //        $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val(13285 - new_salary);
+            //    } else {
+            //        $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val(0);
+            //    }
+            //}     
+
             if (m) {
-                if (new_salary < 13285) {
+                if (new_salary <= 11285) {
+                    $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val(2000);
+                } else if (new_salary <= 13285) {
                     $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val(13285 - new_salary);
                 } else {
                     $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).val(0);
                 }
-            }            
+            }  
 
             sum_postpone += new_added;
             sum_before += old_salary;
diff --git a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js
index 8889e83..9e049bd 100644
--- a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js
+++ b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota_d.js
@@ -160,9 +160,19 @@ function CalculateRemainQuota(m) {
             var new_sarary_with_quota = new_sarary + receive_quota;
             $("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text(formatNumber(new_sarary_with_quota));
 
+            //if (m) {
+            //    if (new_sarary_with_quota < 13285) {
+            //        $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).val(formatNumber(13285 - new_sarary_with_quota));
+            //    } else {
+            //        $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).val(0);
+            //    }
+            //}
+
             if (m) {
-                if (new_sarary_with_quota < 13285) {
-                    $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).val(formatNumber(13285 - new_sarary_with_quota));
+                if (new_salary <= 11285) {
+                    $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).val(2000);
+                } else if (new_salary <= 13285) {
+                    $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).val(13285 - new_sarary_with_quota);
                 } else {
                     $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).val(0);
                 }