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 5b0e90a..a050e3f 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
@@ -61,7 +61,7 @@
-
+
@@ -82,7 +82,7 @@
-
+
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 56cd0ae..f95a20c 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
@@ -1,139 +1,139 @@
function eva_adjust_postponement_detail_normal_02_ClearForm(i, blankItem) {
- var data = blankItem;
-$("#eva_adjust_postponement_detail_normal_02_id_" + i).val("");
-$("#eva_adjust_postponement_detail_normal_02_adjust_postponement_id_" + i).val("");
-$("#eva_adjust_postponement_detail_normal_02_employee_id_" + i).val("");
-$("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text("");
-$("#eva_adjust_postponement_detail_normal_02_cost_living_" + i).text("");
-$("#eva_adjust_postponement_detail_normal_02_middle_" + i).text("");
-$("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val("");
-$("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val("");
-$("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text("");
-$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text("");
-$("#eva_adjust_postponement_detail_normal_02_remark_" + i).text("");
-$("#eva_adjust_postponement_detail_normal_02_emp_code_" + i).text("");
-$("#eva_adjust_postponement_detail_normal_02_emp_fullname_" + i).text("");
-$("#eva_adjust_postponement_detail_normal_02_emp_position_" + i).text("");
-$("#eva_adjust_postponement_detail_normal_02_emp_level_" + i).text("");
-$("#eva_adjust_postponement_detail_normal_02_total_score_" + i).text("");
-$("#eva_adjust_postponement_detail_normal_02_eva_result_" + i).text("");
+ var data = blankItem;
+ $("#eva_adjust_postponement_detail_normal_02_id_" + i).val("");
+ $("#eva_adjust_postponement_detail_normal_02_adjust_postponement_id_" + i).val("");
+ $("#eva_adjust_postponement_detail_normal_02_employee_id_" + i).val("");
+ $("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text("");
+ $("#eva_adjust_postponement_detail_normal_02_cost_living_" + i).text("");
+ $("#eva_adjust_postponement_detail_normal_02_middle_" + i).text("");
+ $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val("");
+ $("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val("");
+ $("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text("");
+ $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text("");
+ $("#eva_adjust_postponement_detail_normal_02_remark_" + i).text("");
+ $("#eva_adjust_postponement_detail_normal_02_emp_code_" + i).text("");
+ $("#eva_adjust_postponement_detail_normal_02_emp_fullname_" + i).text("");
+ $("#eva_adjust_postponement_detail_normal_02_emp_position_" + i).text("");
+ $("#eva_adjust_postponement_detail_normal_02_emp_level_" + i).text("");
+ $("#eva_adjust_postponement_detail_normal_02_total_score_" + i).text("");
+ $("#eva_adjust_postponement_detail_normal_02_eva_result_" + i).text("");
}
function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankItem) {
-$("#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(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(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);
-$("#eva_adjust_postponement_detail_normal_02_emp_position_" + i).text(data.emp_position);
-$("#eva_adjust_postponement_detail_normal_02_emp_level_" + i).text(data.emp_level);
-$("#eva_adjust_postponement_detail_normal_02_total_score_" + i).text(data.total_score);
-$("#eva_adjust_postponement_detail_normal_02_eva_result_" + i).text(data.eva_result);
+ $("#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_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_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);
+ $("#eva_adjust_postponement_detail_normal_02_emp_position_" + i).text(data.emp_position);
+ $("#eva_adjust_postponement_detail_normal_02_emp_level_" + i).text(data.emp_level);
+ $("#eva_adjust_postponement_detail_normal_02_total_score_" + i).text(data.total_score);
+ $("#eva_adjust_postponement_detail_normal_02_eva_result_" + i).text(data.eva_result);
}
function eva_adjust_postponement_detail_normal_02_GetFromForm(obj, i) {
var eva_adjust_postponement_detail_normal_02Object = new Object();
-eva_adjust_postponement_detail_normal_02Object.id = obj.find("#eva_adjust_postponement_detail_normal_02_id_" + i).val();
-eva_adjust_postponement_detail_normal_02Object.adjust_postponement_id = obj.find("#eva_adjust_postponement_detail_normal_02_adjust_postponement_id_" + i).val();
-eva_adjust_postponement_detail_normal_02Object.employee_id = obj.find("#eva_adjust_postponement_detail_normal_02_employee_id_" + i).val();
-eva_adjust_postponement_detail_normal_02Object.sarary = obj.find("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text();
-eva_adjust_postponement_detail_normal_02Object.cost_living = obj.find("#eva_adjust_postponement_detail_normal_02_cost_living_" + i).text();
-eva_adjust_postponement_detail_normal_02Object.middle = obj.find("#eva_adjust_postponement_detail_normal_02_middle_" + i).text();
-eva_adjust_postponement_detail_normal_02Object.promoted_percentage = obj.find("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val();
-eva_adjust_postponement_detail_normal_02Object.total_promote = obj.find("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val();
-eva_adjust_postponement_detail_normal_02Object.new_sarary = obj.find("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text();
-eva_adjust_postponement_detail_normal_02Object.new_cost_living = obj.find("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text();
-eva_adjust_postponement_detail_normal_02Object.remark = obj.find("#eva_adjust_postponement_detail_normal_02_remark_" + i).text();
-eva_adjust_postponement_detail_normal_02Object.emp_code = obj.find("#eva_adjust_postponement_detail_normal_02_emp_code_" + i).text();
-eva_adjust_postponement_detail_normal_02Object.emp_fullname = obj.find("#eva_adjust_postponement_detail_normal_02_emp_fullname_" + i).text();
-eva_adjust_postponement_detail_normal_02Object.emp_position = obj.find("#eva_adjust_postponement_detail_normal_02_emp_position_" + i).text();
-eva_adjust_postponement_detail_normal_02Object.emp_level = obj.find("#eva_adjust_postponement_detail_normal_02_emp_level_" + i).text();
-eva_adjust_postponement_detail_normal_02Object.total_score = obj.find("#eva_adjust_postponement_detail_normal_02_total_score_" + i).text();
-eva_adjust_postponement_detail_normal_02Object.eva_result = obj.find("#eva_adjust_postponement_detail_normal_02_eva_result_" + i).text();
+ eva_adjust_postponement_detail_normal_02Object.id = obj.find("#eva_adjust_postponement_detail_normal_02_id_" + i).val();
+ eva_adjust_postponement_detail_normal_02Object.adjust_postponement_id = obj.find("#eva_adjust_postponement_detail_normal_02_adjust_postponement_id_" + i).val();
+ eva_adjust_postponement_detail_normal_02Object.employee_id = obj.find("#eva_adjust_postponement_detail_normal_02_employee_id_" + i).val();
+ eva_adjust_postponement_detail_normal_02Object.sarary = obj.find("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text().replace(/[,-]/g,'');
+ eva_adjust_postponement_detail_normal_02Object.cost_living = obj.find("#eva_adjust_postponement_detail_normal_02_cost_living_" + i).text().replace(/[,-]/g,'');
+ eva_adjust_postponement_detail_normal_02Object.middle = obj.find("#eva_adjust_postponement_detail_normal_02_middle_" + i).text().replace(/[,-]/g,'');
+ eva_adjust_postponement_detail_normal_02Object.promoted_percentage = obj.find("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val();
+ eva_adjust_postponement_detail_normal_02Object.total_promote = obj.find("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val();
+ eva_adjust_postponement_detail_normal_02Object.new_sarary = obj.find("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text().replace(/[,-]/g,'');
+ eva_adjust_postponement_detail_normal_02Object.new_cost_living = obj.find("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text();
+ eva_adjust_postponement_detail_normal_02Object.remark = obj.find("#eva_adjust_postponement_detail_normal_02_remark_" + i).text();
+ eva_adjust_postponement_detail_normal_02Object.emp_code = obj.find("#eva_adjust_postponement_detail_normal_02_emp_code_" + i).text();
+ eva_adjust_postponement_detail_normal_02Object.emp_fullname = obj.find("#eva_adjust_postponement_detail_normal_02_emp_fullname_" + i).text();
+ eva_adjust_postponement_detail_normal_02Object.emp_position = obj.find("#eva_adjust_postponement_detail_normal_02_emp_position_" + i).text();
+ eva_adjust_postponement_detail_normal_02Object.emp_level = obj.find("#eva_adjust_postponement_detail_normal_02_emp_level_" + i).text();
+ eva_adjust_postponement_detail_normal_02Object.total_score = obj.find("#eva_adjust_postponement_detail_normal_02_total_score_" + i).text();
+ eva_adjust_postponement_detail_normal_02Object.eva_result = obj.find("#eva_adjust_postponement_detail_normal_02_eva_result_" + i).text();
eva_adjust_postponement_detail_normal_02Object.active_mode = obj.find("#isActive_" + i + "_eva_adjust_postponement_detail_normal_02").val();
return eva_adjust_postponement_detail_normal_02Object;
}
function eva_adjust_postponement_detail_normal_02_Save(id) {
- //Insert eva_adjust_postponement_detail_normal_02 List
- var eva_adjust_postponement_detail_normal_02 = [];
+ //Insert eva_adjust_postponement_detail_normal_02 List
+ var eva_adjust_postponement_detail_normal_02 = [];
$('#eva_adjust_postponement_detail_normal_02Body tr').each(function () {
- var i = $(this).find("#rowCount").text();
- if(i){
+ var i = $(this).find("#rowCount").text();
+ if (i) {
//console.log(i);
var eacheva_adjust_postponement_detail_normal_02 = eva_adjust_postponement_detail_normal_02_GetFromForm($(this), i);
- eva_adjust_postponement_detail_normal_02.push(eacheva_adjust_postponement_detail_normal_02);
+ eva_adjust_postponement_detail_normal_02.push(eacheva_adjust_postponement_detail_normal_02);
}
- });
-//console.log(eva_adjust_postponement_detail_normal_02);
+ });
+ //console.log(eva_adjust_postponement_detail_normal_02);
var successFunc = function (result) {
AlertSuccess("ปรับปรุงข้อมูลเรียบร้อยแล้ว");
- endLoad();
+ endLoad();
};
- startLoad();
- AjaxPutRequest(apisite + '/api/eva_adjust_postponement_detail_normal_02/UpdateMultiple', eva_adjust_postponement_detail_normal_02, successFunc, AlertDanger);
+ startLoad();
+ AjaxPutRequest(apisite + '/api/eva_adjust_postponement_detail_normal_02/UpdateMultiple', eva_adjust_postponement_detail_normal_02, successFunc, AlertDanger);
}
function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
- $('#eva_adjust_postponement_detail_normal_02Body').empty();
+ $('#eva_adjust_postponement_detail_normal_02Body').empty();
- var successFunc = function (response) {
- //console.log(response);
-var cur_dep = "";
+ var successFunc = function (response) {
+ //console.log(response);
+ var cur_dep = "";
- $.each(response, function (i, data) {
+ $.each(response, function (i, data) {
-var tag = "";
-
- if(cur_dep !== data.emp_department_name){
+ var tag = "";
+
+ if (cur_dep !== data.emp_department_name) {
cur_dep = data.emp_department_name;
- tag = "| "+cur_dep+" |
";
+ tag = "| " + cur_dep + " |
";
}
- tag += '';
- tag += ' | ';
+ tag += '
';
+ tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
- tag += ' | ';
- tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
- tag += '
';
- $('#eva_adjust_postponement_detail_normal_02Body').append($(tag));
- eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, (i + 1), blankItem);
- });
+ tag += '';
+ $('#eva_adjust_postponement_detail_normal_02Body').append($(tag));
+ 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();
- endLoad();
- };
- startLoad();
- //AjaxGetRequest(apisite + "/api/eva_adjust_postponement_detail_normal_02", successFunc, AlertDanger);
- AjaxGetRequest(apisite + '/api/eva_adjust_postponement_detail_normal_02?adjust_postponement_id=' + a, successFunc, AlertDanger);
+ Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged();
+ endLoad();
+ };
+ startLoad();
+ //AjaxGetRequest(apisite + "/api/eva_adjust_postponement_detail_normal_02", successFunc, AlertDanger);
+ AjaxGetRequest(apisite + '/api/eva_adjust_postponement_detail_normal_02?adjust_postponement_id=' + a, successFunc, AlertDanger);
}
diff --git a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal.js b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal.js
index 97acf44..6d26f11 100644
--- a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal.js
+++ b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal.js
@@ -32,7 +32,9 @@ $("#eva_adjust_postponement_normal_theRound").val(data.theRound);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_create_evaluation_id"), data, "id", "description", "item_create_evaluation_id", data.create_evaluation_id);
$("#eva_adjust_postponement_normal_limit").val(data.limit);
$("#eva_adjust_postponement_normal_limit_frame").val(data.limit_frame);
-$("#eva_adjust_postponement_normal_limit_quota").val(data.limit_quota);
+// $("#eva_adjust_postponement_normal_limit_quota").val(data.limit_quota);
+$("#eva_adjust_postponement_normal_limit_quota").maskMoney('mask',data.limit_quota);
+
$("#eva_adjust_postponement_normal_percentage").val(data.percentage);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
//DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
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 96ea5c6..bdda2b6 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
@@ -4,19 +4,20 @@ var eva_adjust_postponement_normal_API = "/api/eva_adjust_postponement_normal/";
//================= Form Data Customizaiton =========================================
function eva_adjust_postponement_normal_FeedDataToForm(data) {
-$("#eva_adjust_postponement_normal_id").val(data.id);
-$("#eva_adjust_postponement_normal_fiscal_year").val(data.fiscal_year);
-$("#eva_adjust_postponement_normal_theDate").val(formatDate(data.theDate));
-$("#eva_adjust_postponement_normal_theRound").val(data.theRound);
-DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_create_evaluation_id"), data, "id", "description", "item_create_evaluation_id", data.create_evaluation_id);
-$("#eva_adjust_postponement_normal_limit").val(data.limit);
-$("#eva_adjust_postponement_normal_limit_frame").val(data.limit_frame);
-$("#eva_adjust_postponement_normal_limit_quota").val(data.limit_quota);
-$("#eva_adjust_postponement_normal_percentage").val(data.percentage);
-DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
-//DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
-Oneva_adjust_postponement_normal_limit_frameChange();
-Oneva_adjust_postponement_normal_percentageChange();
+ $("#eva_adjust_postponement_normal_id").val(data.id);
+ $("#eva_adjust_postponement_normal_fiscal_year").val(data.fiscal_year);
+ $("#eva_adjust_postponement_normal_theDate").val(formatDate(data.theDate));
+ $("#eva_adjust_postponement_normal_theRound").val(data.theRound);
+ DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_create_evaluation_id"), data, "id", "description", "item_create_evaluation_id", data.create_evaluation_id);
+ $("#eva_adjust_postponement_normal_limit").maskMoney('mask',data.limit);
+ $("#eva_adjust_postponement_normal_limit_quota").maskMoney('mask',data.limit_quota);
+
+ $("#eva_adjust_postponement_normal_limit_frame").val(data.limit_frame);
+ $("#eva_adjust_postponement_normal_percentage").val(data.percentage);
+ DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
+ //DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id);
+ Oneva_adjust_postponement_normal_limit_frameChange();
+ Oneva_adjust_postponement_normal_percentageChange();
}
@@ -27,9 +28,9 @@ function eva_adjust_postponement_normal_GetFromForm() {
eva_adjust_postponement_normalObject.theDate = getDate($("#eva_adjust_postponement_normal_theDate").val());
eva_adjust_postponement_normalObject.theRound = $("#eva_adjust_postponement_normal_theRound").val();
eva_adjust_postponement_normalObject.create_evaluation_id = $("#eva_adjust_postponement_normal_create_evaluation_id").val();
- eva_adjust_postponement_normalObject.limit = $("#eva_adjust_postponement_normal_limit").val();
+ eva_adjust_postponement_normalObject.limit = $("#eva_adjust_postponement_normal_limit").val().replace(/[,-]/g,'');
eva_adjust_postponement_normalObject.limit_frame = $("#eva_adjust_postponement_normal_limit_frame").val();
- eva_adjust_postponement_normalObject.limit_quota = $("#eva_adjust_postponement_normal_limit_quota").val();
+ eva_adjust_postponement_normalObject.limit_quota = $("#eva_adjust_postponement_normal_limit_quota").val().replace(/[,-]/g,'');
eva_adjust_postponement_normalObject.percentage = $("#eva_adjust_postponement_normal_percentage").val();
eva_adjust_postponement_normalObject.managed_by = $("#eva_adjust_postponement_normal_managed_by").val();
//eva_adjust_postponement_normalObject.org_id = $("#eva_adjust_postponement_normal_org_id").val();
@@ -124,11 +125,13 @@ function eva_adjust_postponement_normal_GoDelete(a) {
//================= Control Function =========================================
function Oneva_adjust_postponement_normal_limit_frameChange(){
- var limit = $("#eva_adjust_postponement_normal_limit").val();
+ var limit = $("#eva_adjust_postponement_normal_limit").val().replace(/[,-]/g,'');
var limit_frame = $("#eva_adjust_postponement_normal_limit_frame").val();
limit_frame = Math.round(limit_frame*100)/100;
$("#eva_adjust_postponement_normal_limit_frame").val(limit_frame);
- $("#eva_adjust_postponement_normal_limit_quota").val(Math.round( Math.ceil(limit*limit_frame)/1000)*10 );
+ // $("#eva_adjust_postponement_normal_limit_quota").val(Math.round( Math.ceil(limit*limit_frame)/1000)*10 );
+ $("#eva_adjust_postponement_normal_limit_quota").maskMoney('mask',Math.round( Math.ceil(limit*limit_frame)/1000)*10 );
+
}
function Oneva_adjust_postponement_normal_percentageChange(){
@@ -144,24 +147,24 @@ function Oneva_adjust_postponement_normal_percentageChange(){
}
function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(){
- var current_quota = $("#eva_adjust_postponement_normal_limit_quota").val();
+ var current_quota = $("#eva_adjust_postponement_normal_limit_quota").val().replace(/[,-]/g,'');
var sum_postpone = 0;
$('#eva_adjust_postponement_detail_normal_02Body tr').each(function () {
var i = $(this).find("#rowCount").text();
if(i){
- var percentage = $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val();
+ var percentage = $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val().replace(/[,-]/g,'');
percentage = Math.round(percentage*100)/100;
$("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(percentage);
- var middle = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_middle_" + i).text());
- var old_salary = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text());
+ var middle = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_middle_" + i).text().replace(/[,-]/g,''));
+ var old_salary = parseFloat($(this).find("#eva_adjust_postponement_detail_normal_02_sarary_" + i).text().replace(/[,-]/g,''));
var new_added = Math.ceil(((percentage * middle)/100)/10)*10;
var new_salary = parseFloat(old_salary + new_added);
$("#eva_adjust_postponement_detail_normal_02_total_promote_" + i).val(new_added);
- $("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(new_salary);
+ $("#eva_adjust_postponement_detail_normal_02_new_sarary_" + i).text(formatNumber(new_salary));
if(new_salary < 13285){
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(1000);
@@ -172,6 +175,7 @@ function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged()
}
});
- $("#remain_cost").val(Math.round((current_quota - sum_postpone)*100)/100);
+ // $("#remain_cost").val(Math.round((current_quota - sum_postpone)*100)/100);
+ $("#remain_cost").maskMoney('mask',Math.round((current_quota - sum_postpone)*100)/100);
}
diff --git a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_inline.js b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_inline.js
index f14f16c..c2edec0 100644
--- a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_inline.js
+++ b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal_inline.js
@@ -1,131 +1,132 @@
function eva_adjust_postponement_normal_ClearForm(i, blankItem) {
- var data = blankItem;
-$("#eva_adjust_postponement_normal_id_" + i).val("");
-$("#eva_adjust_postponement_normal_fiscal_year_" + i).val("");
-$("#eva_adjust_postponement_normal_theDate_" + i).val("");
-$("#eva_adjust_postponement_normal_theRound_" + i).val("");
-DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_create_evaluation_id_" + i), blankItem, "id", "performance_plan_id", "item_create_evaluation_id", data.create_evaluation_id);
-$("#eva_adjust_postponement_normal_limit_" + i).val("");
-$("#eva_adjust_postponement_normal_limit_frame_" + i).val("");
-$("#eva_adjust_postponement_normal_limit_quota_" + i).val("");
-$("#eva_adjust_postponement_normal_percentage_" + i).val("");
-DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by_" + i), blankItem, "id", "external_name", "item_managed_by", data.managed_by);
-DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_org_id_" + i), blankItem, "id", "external_name", "item_org_id", data.org_id);
+ var data = blankItem;
+ $("#eva_adjust_postponement_normal_id_" + i).val("");
+ $("#eva_adjust_postponement_normal_fiscal_year_" + i).val("");
+ $("#eva_adjust_postponement_normal_theDate_" + i).val("");
+ $("#eva_adjust_postponement_normal_theRound_" + i).val("");
+ DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_create_evaluation_id_" + i), blankItem, "id", "performance_plan_id", "item_create_evaluation_id", data.create_evaluation_id);
+ $("#eva_adjust_postponement_normal_limit_" + i).val("");
+ $("#eva_adjust_postponement_normal_limit_frame_" + i).val("");
+ $("#eva_adjust_postponement_normal_limit_quota_" + i).val("");
+ $("#eva_adjust_postponement_normal_percentage_" + i).val("");
+ DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by_" + i), blankItem, "id", "external_name", "item_managed_by", data.managed_by);
+ DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_org_id_" + i), blankItem, "id", "external_name", "item_org_id", data.org_id);
}
function eva_adjust_postponement_normal_FeedDataToForm(data, i, blankItem) {
-$("#eva_adjust_postponement_normal_id_" + i).val(data.id);
-$("#eva_adjust_postponement_normal_fiscal_year_" + i).val(data.fiscal_year);
-$("#eva_adjust_postponement_normal_theDate_" + i).val(formatDate(data.theDate));
-$("#eva_adjust_postponement_normal_theRound_" + i).val(data.theRound);
-DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_create_evaluation_id_" + i), blankItem, "id", "performance_plan_id", "item_create_evaluation_id", data.create_evaluation_id);
-$("#eva_adjust_postponement_normal_limit_" + i).val(data.limit);
-$("#eva_adjust_postponement_normal_limit_frame_" + i).val(data.limit_frame);
-$("#eva_adjust_postponement_normal_limit_quota_" + i).val(data.limit_quota);
-$("#eva_adjust_postponement_normal_percentage_" + i).val(data.percentage);
-DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by_" + i), blankItem, "id", "external_name", "item_managed_by", data.managed_by);
-DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_org_id_" + i), blankItem, "id", "external_name", "item_org_id", data.org_id);
+ $("#eva_adjust_postponement_normal_id_" + i).val(data.id);
+ $("#eva_adjust_postponement_normal_fiscal_year_" + i).val(data.fiscal_year);
+ $("#eva_adjust_postponement_normal_theDate_" + i).val(formatDate(data.theDate));
+ $("#eva_adjust_postponement_normal_theRound_" + i).val(data.theRound);
+ DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_create_evaluation_id_" + i), blankItem, "id", "performance_plan_id", "item_create_evaluation_id", data.create_evaluation_id);
+ $("#eva_adjust_postponement_normal_limit_" + i).val(data.limit);
+ $("#eva_adjust_postponement_normal_limit_frame_" + i).val(data.limit_frame);
+ // $("#eva_adjust_postponement_normal_limit_quota_" + i).val(data.limit_quota);
+ $("#eva_adjust_postponement_normal_limit_quota_" + i).val(data.limit_quota);
+ $("#eva_adjust_postponement_normal_percentage_" + i).val(data.percentage);
+ DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by_" + i), blankItem, "id", "external_name", "item_managed_by", data.managed_by);
+ DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_org_id_" + i), blankItem, "id", "external_name", "item_org_id", data.org_id);
}
function eva_adjust_postponement_normal_GetFromForm(obj, i) {
var eva_adjust_postponement_normalObject = new Object();
-eva_adjust_postponement_normalObject.id = obj.find("#eva_adjust_postponement_normal_id_" + i).val();
-eva_adjust_postponement_normalObject.fiscal_year = obj.find("#eva_adjust_postponement_normal_fiscal_year_" + i).val();
-eva_adjust_postponement_normalObject.theDate = getDate(obj.find("#eva_adjust_postponement_normal_theDate_" + i).val());
-eva_adjust_postponement_normalObject.theRound = obj.find("#eva_adjust_postponement_normal_theRound_" + i).val();
-eva_adjust_postponement_normalObject.create_evaluation_id = obj.find("#eva_adjust_postponement_normal_create_evaluation_id_" + i).val();
-eva_adjust_postponement_normalObject.limit = obj.find("#eva_adjust_postponement_normal_limit_" + i).val();
-eva_adjust_postponement_normalObject.limit_frame = obj.find("#eva_adjust_postponement_normal_limit_frame_" + i).val();
-eva_adjust_postponement_normalObject.limit_quota = obj.find("#eva_adjust_postponement_normal_limit_quota_" + i).val();
-eva_adjust_postponement_normalObject.percentage = obj.find("#eva_adjust_postponement_normal_percentage_" + i).val();
-eva_adjust_postponement_normalObject.managed_by = obj.find("#eva_adjust_postponement_normal_managed_by_" + i).val();
-eva_adjust_postponement_normalObject.org_id = obj.find("#eva_adjust_postponement_normal_org_id_" + i).val();
+ eva_adjust_postponement_normalObject.id = obj.find("#eva_adjust_postponement_normal_id_" + i).val();
+ eva_adjust_postponement_normalObject.fiscal_year = obj.find("#eva_adjust_postponement_normal_fiscal_year_" + i).val();
+ eva_adjust_postponement_normalObject.theDate = getDate(obj.find("#eva_adjust_postponement_normal_theDate_" + i).val());
+ eva_adjust_postponement_normalObject.theRound = obj.find("#eva_adjust_postponement_normal_theRound_" + i).val();
+ eva_adjust_postponement_normalObject.create_evaluation_id = obj.find("#eva_adjust_postponement_normal_create_evaluation_id_" + i).val();
+ eva_adjust_postponement_normalObject.limit = obj.find("#eva_adjust_postponement_normal_limit_" + i).val();
+ eva_adjust_postponement_normalObject.limit_frame = obj.find("#eva_adjust_postponement_normal_limit_frame_" + i).val();
+ eva_adjust_postponement_normalObject.limit_quota = obj.find("#eva_adjust_postponement_normal_limit_quota_" + i).val();
+ eva_adjust_postponement_normalObject.percentage = obj.find("#eva_adjust_postponement_normal_percentage_" + i).val();
+ eva_adjust_postponement_normalObject.managed_by = obj.find("#eva_adjust_postponement_normal_managed_by_" + i).val();
+ eva_adjust_postponement_normalObject.org_id = obj.find("#eva_adjust_postponement_normal_org_id_" + i).val();
eva_adjust_postponement_normalObject.active_mode = obj.find("#isActive_" + i + "_eva_adjust_postponement_normal").val();
return eva_adjust_postponement_normalObject;
}
function eva_adjust_postponement_normal_Save(id) {
- //Insert eva_adjust_postponement_normal List
- var eva_adjust_postponement_normal = [];
+ //Insert eva_adjust_postponement_normal List
+ var eva_adjust_postponement_normal = [];
$('#eva_adjust_postponement_normalBody tr').each(function () {
var i = $(this).find("#rowCount").text();
- var eacheva_adjust_postponement_normal = eva_adjust_postponement_normal_GetFromForm($(this), i);
- eva_adjust_postponement_normal.push(eacheva_adjust_postponement_normal);
- });
+ var eacheva_adjust_postponement_normal = eva_adjust_postponement_normal_GetFromForm($(this), i);
+ eva_adjust_postponement_normal.push(eacheva_adjust_postponement_normal);
+ });
var successFunc = function (result) {
AlertSuccess("ปรับปรุงข้อมูลเรียบร้อยแล้ว");
- endLoad();
+ endLoad();
};
- startLoad();
- AjaxPutRequest(apisite + '/api/eva_adjust_postponement_normal/UpdateMultiple', eva_adjust_postponement_normal, successFunc, AlertDanger);
+ startLoad();
+ AjaxPutRequest(apisite + '/api/eva_adjust_postponement_normal/UpdateMultiple', eva_adjust_postponement_normal, successFunc, AlertDanger);
}
function eva_adjust_postponement_normal_Get(a, blankItem) {
- $('#eva_adjust_postponement_normalBody').empty();
+ $('#eva_adjust_postponement_normalBody').empty();
- var successFunc = function (response) {
- //console.log(response);
- $.each(response, function (i, data) {
- var tag = '';
+ var successFunc = function (response) {
+ //console.log(response);
+ $.each(response, function (i, data) {
+ var tag = '
';
tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
- tag += ' | ';
- tag += '
';
- $('#eva_adjust_postponement_normalBody').append($(tag));
- eva_adjust_postponement_normal_FeedDataToForm(data, (i + 1), blankItem);
- });
+ tag += ' | ';
+ tag += '';
+ $('#eva_adjust_postponement_normalBody').append($(tag));
+ eva_adjust_postponement_normal_FeedDataToForm(data, (i + 1), blankItem);
+ });
eva_adjust_postponement_normal_Summary();
- endLoad();
- };
- startLoad();
- AjaxGetRequest(apisite + "/api/eva_adjust_postponement_normal", successFunc, AlertDanger);
- //AjaxGetRequest(apisite + '/api/eva_adjust_postponement_normal/GetListBycreate_evaluation_id/' + a, successFunc, AlertDanger);
- //AjaxGetRequest(apisite + '/api/eva_adjust_postponement_normal/GetListBymanaged_by/' + a, successFunc, AlertDanger);
- //AjaxGetRequest(apisite + '/api/eva_adjust_postponement_normal/GetListByorg_id/' + a, successFunc, AlertDanger);
+ endLoad();
+ };
+ startLoad();
+ AjaxGetRequest(apisite + "/api/eva_adjust_postponement_normal", successFunc, AlertDanger);
+ //AjaxGetRequest(apisite + '/api/eva_adjust_postponement_normal/GetListBycreate_evaluation_id/' + a, successFunc, AlertDanger);
+ //AjaxGetRequest(apisite + '/api/eva_adjust_postponement_normal/GetListBymanaged_by/' + a, successFunc, AlertDanger);
+ //AjaxGetRequest(apisite + '/api/eva_adjust_postponement_normal/GetListByorg_id/' + a, successFunc, AlertDanger);
}
function eva_adjust_postponement_normal_Add() {
- var successFunc = function (result) {
- var i = $("#eva_adjust_postponement_normalBody tr").length;
- var tag = '';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
- tag += ' | ';
+ var successFunc = function (result) {
+ var i = $("#eva_adjust_postponement_normalBody tr").length;
+ var tag = '
';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
+ tag += ' | ';
- tag += ' | ';
- tag += '
';
-
- $('#eva_adjust_postponement_normalBody').append($(tag));
- eva_adjust_postponement_normal_ClearForm(i + 1, result);
- endLoad();
- };
- startLoad();
+ tag += ' | ';
+ tag += '';
+
+ $('#eva_adjust_postponement_normalBody').append($(tag));
+ eva_adjust_postponement_normal_ClearForm(i + 1, result);
+ endLoad();
+ };
+ startLoad();
AjaxGetRequest(apisite + "/api/eva_adjust_postponement_normal/" + "GetBlankItem", successFunc, AlertDanger);
}
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 b96f8ba..1f7450c 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
@@ -165,7 +165,8 @@ function CalculateRemainQuota(){
var remain_quota = limit_quota - sum_receive_quota;
- $("#remain_quota").val(remain_quota);
+ //$("#remain_quota").val(remain_quota);
+ $("#remain_quota").maskMoney('mask', remain_quota);
}