From 69b0b48bc4370c7dd875e48e7e3c3cbc97449ac6 Mon Sep 17 00:00:00 2001
From: Nakorn Rientrakrunchai <nakorn@tonproject.com>
Date: Sun, 26 Apr 2020 23:21:31 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9A=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=81=E0=B9=82=E0=B8=9B=E0=B8=A3=E0=B9=81=E0=B8=81=E0=B8=A3?=
 =?UTF-8?q?=E0=B8=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eva_adjust_postponement_normal.cshtml       |  2 +-
 .../eva_adjust_postponement_quota.cshtml        |  2 +-
 .../eva_create_evaluation.cshtml                |  2 +-
 .../eva_create_evaluation_d.cshtml              |  2 +-
 ..._create_evaluation_detail_agreement_d.cshtml |  4 ++--
 ...a_create_evaluation_detail_process_d2.cshtml |  2 +-
 .../eva_evaluation_group.cshtml                 |  2 +-
 .../eva_evaluation_group_detail.cshtml          |  2 +-
 .../eva_level_scoreView/eva_level_score.cshtml  |  2 +-
 .../eva_level_score_d.cshtml                    |  2 +-
 .../eva_level_score_basic.cshtml                |  2 +-
 .../eva_performance_plan.cshtml                 |  2 +-
 .../eva_performance_plan_d.cshtml               |  2 +-
 .../eva_performance_plan_detail.cshtml          |  2 +-
 .../eva_salary_cylinder.cshtml                  |  2 +-
 .../assets/bootstrap-switch/examples/index.html |  2 +-
 wwwroot/BackendScript/css/style-custom.css      |  5 +++--
 wwwroot/js/coregen.js                           |  7 ++++++-
 ...just_postponement_detail_normal_02_inline.js | 10 +++++-----
 ...djust_postponement_detail_quota_02_inline.js | 17 +++++++++--------
 20 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal.cshtml b/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal.cshtml
index 2673610..528036e 100644
--- a/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal.cshtml
+++ b/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "eva_adjust_postponement_normal";
 }
 
-<div class="modal fade" id="eva_adjust_postponement_normalModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_adjust_postponement_normalModelLabel" aria-hidden="true">
+<div class="modal fade" id="eva_adjust_postponement_normalModel" style="z-index:1500" role="dialog" aria-labelledby="eva_adjust_postponement_normalModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota.cshtml b/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota.cshtml
index 6a1322a..ebf3a25 100644
--- a/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota.cshtml
+++ b/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "eva_adjust_postponement_quota";
 }
 
-<div class="modal fade" id="eva_adjust_postponement_quotaModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_adjust_postponement_quotaModelLabel" aria-hidden="true">
+<div class="modal fade" id="eva_adjust_postponement_quotaModel" style="z-index:1500" role="dialog" aria-labelledby="eva_adjust_postponement_quotaModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/Views/eva_create_evaluationView/eva_create_evaluation.cshtml b/Views/eva_create_evaluationView/eva_create_evaluation.cshtml
index 9dbf8fa..ad6c661 100644
--- a/Views/eva_create_evaluationView/eva_create_evaluation.cshtml
+++ b/Views/eva_create_evaluationView/eva_create_evaluation.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "eva_create_evaluation";
 }
 
-<div class="modal fade" id="eva_create_evaluationModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_create_evaluationModelLabel" aria-hidden="true">
+<div class="modal fade" id="eva_create_evaluationModel" style="z-index:1500" role="dialog" aria-labelledby="eva_create_evaluationModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml b/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml
index 8ec6ae5..0117415 100644
--- a/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml
+++ b/Views/eva_create_evaluationView/eva_create_evaluation_d.cshtml
@@ -5,7 +5,7 @@
     Layout = "_LayoutDirect";
 }
 
-<div class="modal fade" id="eva_create_evaluation_detailModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_create_evaluation_detailModelLabel" aria-hidden="true">
+<div class="modal fade" id="eva_create_evaluation_detailModel" style="z-index:1500" role="dialog" aria-labelledby="eva_create_evaluation_detailModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml
index a8a725c..aaaaec7 100644
--- a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml
+++ b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml
@@ -5,7 +5,7 @@
     Layout = "_LayoutDirect";
 }
 
-<div class="modal fade" id="eva_evaluation_behaviorModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_evaluation_behaviorModelLabel" aria-hidden="true">
+<div class="modal fade" id="eva_evaluation_behaviorModel" style="z-index:1500" role="dialog" aria-labelledby="eva_evaluation_behaviorModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
@@ -66,7 +66,7 @@
     </div>
 </div>
 
-<div class="modal fade" id="eva_evaluation_achievementModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_evaluation_achievementModelLabel" aria-hidden="true">
+<div class="modal fade" id="eva_evaluation_achievementModel" style="z-index:1500" role="dialog" aria-labelledby="eva_evaluation_achievementModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml
index e0c1211..c4502e3 100644
--- a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml
+++ b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2.cshtml
@@ -5,7 +5,7 @@
     Layout = "_LayoutDirect";
 }
 
-<div class="modal fade" id="eva_idp_planModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_idp_planModelLabel" aria-hidden="true">
+<div class="modal fade" id="eva_idp_planModel" style="z-index:1500" role="dialog" aria-labelledby="eva_idp_planModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/Views/eva_evaluation_groupView/eva_evaluation_group.cshtml b/Views/eva_evaluation_groupView/eva_evaluation_group.cshtml
index 9a6ad14..0e30cfc 100644
--- a/Views/eva_evaluation_groupView/eva_evaluation_group.cshtml
+++ b/Views/eva_evaluation_groupView/eva_evaluation_group.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "eva_evaluation_group";
 }
 
-<div class="modal fade" id="eva_evaluation_groupModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_evaluation_groupModelLabel" aria-hidden="true">
+<div class="modal fade" id="eva_evaluation_groupModel" style="z-index:1500" role="dialog" aria-labelledby="eva_evaluation_groupModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/Views/eva_evaluation_group_detailView/eva_evaluation_group_detail.cshtml b/Views/eva_evaluation_group_detailView/eva_evaluation_group_detail.cshtml
index 2856a19..cb3eedb 100644
--- a/Views/eva_evaluation_group_detailView/eva_evaluation_group_detail.cshtml
+++ b/Views/eva_evaluation_group_detailView/eva_evaluation_group_detail.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "eva_evaluation_group_detail";
 }
 
-<div class="modal fade" id="eva_evaluation_group_detailModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_evaluation_group_detailModelLabel" aria-hidden="true">
+<div class="modal fade" id="eva_evaluation_group_detailModel" style="z-index:1500" role="dialog" aria-labelledby="eva_evaluation_group_detailModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/Views/eva_level_scoreView/eva_level_score.cshtml b/Views/eva_level_scoreView/eva_level_score.cshtml
index 8142d37..83fa3dd 100644
--- a/Views/eva_level_scoreView/eva_level_score.cshtml
+++ b/Views/eva_level_scoreView/eva_level_score.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "eva_level_score";
 }
 
-<div class="modal fade" id="eva_level_scoreModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_level_scoreModelLabel" aria-hidden="true">
+<div class="modal fade" id="eva_level_scoreModel" style="z-index:1500" role="dialog" aria-labelledby="eva_level_scoreModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/Views/eva_level_scoreView/eva_level_score_d.cshtml b/Views/eva_level_scoreView/eva_level_score_d.cshtml
index 36f39cf..f47171f 100644
--- a/Views/eva_level_scoreView/eva_level_score_d.cshtml
+++ b/Views/eva_level_scoreView/eva_level_score_d.cshtml
@@ -5,7 +5,7 @@
     Layout = "_LayoutDirect";
 }
 
-<div class="modal fade" id="eva_promoted_percentageModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_promoted_percentageModelLabel" aria-hidden="true">
+<div class="modal fade" id="eva_promoted_percentageModel" style="z-index:1500" role="dialog" aria-labelledby="eva_promoted_percentageModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/Views/eva_level_score_basicView/eva_level_score_basic.cshtml b/Views/eva_level_score_basicView/eva_level_score_basic.cshtml
index 3676004..b011c99 100644
--- a/Views/eva_level_score_basicView/eva_level_score_basic.cshtml
+++ b/Views/eva_level_score_basicView/eva_level_score_basic.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "eva_level_score_basic";
 }
 
-<div class="modal fade" id="eva_level_score_basicModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_level_score_basicModelLabel" aria-hidden="true">
+<div class="modal fade" id="eva_level_score_basicModel" style="z-index:1500" role="dialog" aria-labelledby="eva_level_score_basicModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/Views/eva_performance_planView/eva_performance_plan.cshtml b/Views/eva_performance_planView/eva_performance_plan.cshtml
index 17f16bd..5bf0242 100644
--- a/Views/eva_performance_planView/eva_performance_plan.cshtml
+++ b/Views/eva_performance_planView/eva_performance_plan.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "eva_performance_plan";
 }
 
-<div class="modal fade" id="eva_performance_planModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_performance_planModelLabel" aria-hidden="true">
+<div class="modal fade" id="eva_performance_planModel" style="z-index:1500" role="dialog" aria-labelledby="eva_performance_planModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/Views/eva_performance_planView/eva_performance_plan_d.cshtml b/Views/eva_performance_planView/eva_performance_plan_d.cshtml
index 09c6e22..98adadf 100644
--- a/Views/eva_performance_planView/eva_performance_plan_d.cshtml
+++ b/Views/eva_performance_planView/eva_performance_plan_d.cshtml
@@ -5,7 +5,7 @@
     Layout = "_LayoutDirect";
 }
 
-<div class="modal fade" id="eva_performance_plan_detailModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_performance_plan_detailModelLabel" aria-hidden="true">
+<div class="modal fade" id="eva_performance_plan_detailModel" style="z-index:1500" role="dialog" aria-labelledby="eva_performance_plan_detailModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/Views/eva_performance_plan_detailView/eva_performance_plan_detail.cshtml b/Views/eva_performance_plan_detailView/eva_performance_plan_detail.cshtml
index b389478..67f7b89 100644
--- a/Views/eva_performance_plan_detailView/eva_performance_plan_detail.cshtml
+++ b/Views/eva_performance_plan_detailView/eva_performance_plan_detail.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "eva_performance_plan_detail";
 }
 
-<div class="modal fade" id="eva_performance_plan_detailModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_performance_plan_detailModelLabel" aria-hidden="true">
+<div class="modal fade" id="eva_performance_plan_detailModel" style="z-index:1500" role="dialog" aria-labelledby="eva_performance_plan_detailModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml b/Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml
index 9ae7737..70c7ffb 100644
--- a/Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml
+++ b/Views/eva_salary_cylinderView/eva_salary_cylinder.cshtml
@@ -4,7 +4,7 @@
     ViewData["Title"] = "eva_salary_cylinder";
 }
 
-<div class="modal fade" id="eva_salary_cylinderModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="eva_salary_cylinderModelLabel" aria-hidden="true">
+<div class="modal fade" id="eva_salary_cylinderModel" style="z-index:1500" role="dialog" aria-labelledby="eva_salary_cylinderModelLabel" aria-hidden="true">
     <div class="modal-dialog modal-lg" role="document">
         <div class="modal-content">
             <div class="modal-header">
diff --git a/wwwroot/BackendScript/assets/bootstrap-switch/examples/index.html b/wwwroot/BackendScript/assets/bootstrap-switch/examples/index.html
index 2e947f9..defca84 100644
--- a/wwwroot/BackendScript/assets/bootstrap-switch/examples/index.html
+++ b/wwwroot/BackendScript/assets/bootstrap-switch/examples/index.html
@@ -792,7 +792,7 @@ $('#disable-switch').bootstrapSwitch('setActive', false);  // true || false</pre
     </div>
 </div>
 
-<div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+<div id="myModal" class="modal hide fade" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
     <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
         <h3>Modal</h3>
diff --git a/wwwroot/BackendScript/css/style-custom.css b/wwwroot/BackendScript/css/style-custom.css
index c2008f9..0c28928 100644
--- a/wwwroot/BackendScript/css/style-custom.css
+++ b/wwwroot/BackendScript/css/style-custom.css
@@ -991,7 +991,8 @@ input.is-invalid:focus {
 }
 
 .select2-container--default .select2-search--dropdown .select2-search__field {
-    font-size: 19px
+    font-size: 19px;
+    
 }
 
 .select2-container--default .select2-selection--multiple {
@@ -1037,7 +1038,7 @@ input.is-invalid:focus {
 
 .select2-container--default .select2-search--inline .select2-search__field {
     font-size: 19px;
-    line-height: 1
+    line-height: 1;
 }
 
 li.select2-results__option {
diff --git a/wwwroot/js/coregen.js b/wwwroot/js/coregen.js
index 3305f64..1374c31 100644
--- a/wwwroot/js/coregen.js
+++ b/wwwroot/js/coregen.js
@@ -1,7 +1,12 @@
 
 function formatNumber(num) {
     if(num === "" || num === null) return "";
-  return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,')
+    return num.toString().replace(/(\d)(?=(\d{3})+(?!\d))/g, '$1,');
+}
+
+function formatNumberTemp(num) {
+    if(num === "" || num === null) return "";
+    return num.toString();
 }
 
 function getUrlParameter(sParam) {
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 230be55..8d13579 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
@@ -24,13 +24,13 @@ function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankI
 $("#eva_adjust_postponement_detail_normal_02_id_" + i).val(data.id);
 $("#eva_adjust_postponement_detail_normal_02_adjust_postponement_id_" + i).val(data.adjust_postponement_id);
 $("#eva_adjust_postponement_detail_normal_02_employee_id_" + i).val(data.employee_id);
-$("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text(formatNumber(data.sarary));
-$("#eva_adjust_postponement_detail_normal_02_cost_living_" + i).text(formatNumber(data.cost_living));
-$("#eva_adjust_postponement_detail_normal_02_middle_" + i).text(formatNumber(data.middle));
+$("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text(formatNumberTemp(data.sarary));
+$("#eva_adjust_postponement_detail_normal_02_cost_living_" + i).text(formatNumberTemp(data.cost_living));
+$("#eva_adjust_postponement_detail_normal_02_middle_" + i).text(formatNumberTemp(data.middle));
 $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(data.promoted_percentage);
 $("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(data.total_promote);
-$("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(data.new_sarary));
-$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(formatNumber(data.new_cost_living));
+$("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumberTemp(data.new_sarary));
+$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(formatNumberTemp(data.new_cost_living));
 $("#eva_adjust_postponement_detail_normal_02_remark_" + i).text(data.remark);
 $("#eva_adjust_postponement_detail_normal_02_emp_code_" + i).text(data.emp_code);
 $("#eva_adjust_postponement_detail_normal_02_emp_fullname_" + i).text(data.emp_fullname);
diff --git a/wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js b/wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js
index 99b48ea..9617897 100644
--- a/wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js
+++ b/wwwroot/js/eva_adjust_postponement_detail_quota_02/eva_adjust_postponement_detail_quota_02_inline.js
@@ -26,16 +26,16 @@ function eva_adjust_postponement_detail_quota_02_FeedDataToForm(data, i, blankIt
 $("#eva_adjust_postponement_detail_quota_02_id_" + i).val(data.id);
 $("#eva_adjust_postponement_detail_quota_02_adjust_postponement_quota_id_" + i).val(data.adjust_postponement_quota_id);
 $("#eva_adjust_postponement_detail_quota_02_employee_id_" + i).val(data.employee_id);
-$("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text(formatNumber(data.sarary));
-$("#eva_adjust_postponement_detail_quota_02_cost_living_" + i).text(formatNumber(data.cost_living));
-$("#eva_adjust_postponement_detail_quota_02_middle_" + i).text(formatNumber(data.middle));
-$("#eva_adjust_postponement_detail_quota_02_promoted_percentage_" + i).text(formatNumber(data.promoted_percentage));
-$("#eva_adjust_postponement_detail_quota_02_total_promote_" + i).text(formatNumber(data.total_promote));
-$("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text(formatNumber(data.new_sarary));
-$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(formatNumber(data.new_cost_living));
+$("#eva_adjust_postponement_detail_quota_02_sarary_" + i).text(formatNumberTemp(data.sarary));
+$("#eva_adjust_postponement_detail_quota_02_cost_living_" + i).text(formatNumberTemp(data.cost_living));
+$("#eva_adjust_postponement_detail_quota_02_middle_" + i).text(formatNumberTemp(data.middle));
+$("#eva_adjust_postponement_detail_quota_02_promoted_percentage_" + i).text(formatNumberTemp(data.promoted_percentage));
+$("#eva_adjust_postponement_detail_quota_02_total_promote_" + i).text(formatNumberTemp(data.total_promote));
+$("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text(formatNumberTemp(data.new_sarary));
+$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(formatNumberTemp(data.new_cost_living));
 $("#eva_adjust_postponement_detail_quota_02_remark_" + i).text(data.remark);
 $("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val(data.receive_quota);
-$("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text(formatNumber(data.new_sarary_with_quota));
+$("#eva_adjust_postponement_detail_quota_02_new_sarary_with_quota_" + i).text(formatNumberTemp(data.new_sarary_with_quota));
 $("#eva_adjust_postponement_detail_quota_02_emp_code_" + i).text(data.emp_code);
 $("#eva_adjust_postponement_detail_quota_02_emp_fullname_" + i).text(data.emp_fullname);
 $("#eva_adjust_postponement_detail_quota_02_emp_position_" + i).text(data.emp_position);
@@ -102,6 +102,7 @@ var cur_dep = "";
 var tag = "";
 if(cur_dep !== data.emp_department_name){
     tag += '<tr><td colspan="16">'+data.emp_department_name+'</td></tr>';
+    cur_dep = data.emp_department_name;
 }
 
 			tag += '<tr>';