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 f19d41c..392e764 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
@@ -29,7 +29,7 @@ function eva_adjust_postponement_detail_normal_02_FeedDataToForm(data, i, blankI
data.achievement = Number(data.achievement).toFixed(digits_position);
data.competency = Number(data.competency).toFixed(digits_position);
data.total_score = Number(data.total_score).toFixed(digits_position);
-
+
$("#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);
@@ -111,7 +111,7 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
if (cur_dep !== data.emp_department_name) {
cur_dep = data.emp_department_name;
- tag = "
| " + cur_dep + " |
";
+ tag = "| " + cur_dep + " |
";
}
tag += '';
@@ -130,7 +130,7 @@ function eva_adjust_postponement_detail_normal_02_Get(a, blankItem) {
tag += ' | ';
tag += ' | ';
tag += ' | ';
- tag += ' | ';
+ tag += ' | ';
tag += ' | ';
tag += ' | ';
tag += ' | ';
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 0916634..a9ab6d4 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
@@ -9,8 +9,8 @@ function eva_adjust_postponement_normal_FeedDataToForm(data) {
$("#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").val(coreFormatPrice(data.limit, 3));
+ $("#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);
@@ -28,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().replace(/[,-]/g,'');
+ 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().replace(/[,-]/g,'');
+ 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();
@@ -38,9 +38,9 @@ function eva_adjust_postponement_normal_GetFromForm() {
var eva_adjust_postponement_detail_normal_02 = [];
$('#eva_adjust_postponement_detail_normal_02Body tr').each(function () {
var i = $(this).find("#rowCount").text();
- 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);
- });
+ 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_normalObject.eva_adjust_postponement_detail_normal_02_model = eva_adjust_postponement_detail_normal_02;
@@ -50,9 +50,9 @@ function eva_adjust_postponement_normal_GetFromForm() {
function eva_adjust_postponement_normal_InitialForm() {
var successFunc = function (result) {
eva_adjust_postponement_normal_FeedDataToForm(result);
- endLoad();
+ endLoad();
};
- startLoad();
+ startLoad();
AjaxGetRequest(apisite + eva_adjust_postponement_normal_API + "GetBlankItem", successFunc, AlertDanger);
}
@@ -65,15 +65,15 @@ function eva_adjust_postponement_normal_SetEditForm(a) {
//Oneva_adjust_postponement_normal_limit_frameChange();
//Oneva_adjust_postponement_normal_percentageChange();
Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged();
- endLoad();
+ endLoad();
};
- startLoad();
+ startLoad();
AjaxGetRequest(apisite + eva_adjust_postponement_normal_API + a, successFunc, AlertDanger);
}
function eva_adjust_postponement_normal_SetCreateForm() {
eva_adjust_postponement_normal_editMode = "CREATE";
- eva_adjust_postponement_normal_InitialForm();
+ eva_adjust_postponement_normal_InitialForm();
}
//================= Update and Delete =========================================
@@ -83,8 +83,7 @@ var eva_adjust_postponement_normal_customValidation = function (group) {
};
function eva_adjust_postponement_normal_PutUpdate() {
- if (!ValidateForm('eva_adjust_postponement_normal', eva_adjust_postponement_normal_customValidation))
- {
+ if (!ValidateForm('eva_adjust_postponement_normal', eva_adjust_postponement_normal_customValidation)) {
return;
}
var data = eva_adjust_postponement_normal_GetFromForm();
@@ -95,18 +94,18 @@ function eva_adjust_postponement_normal_PutUpdate() {
eva_adjust_postponement_detail_normal_02_Save(getUrlParameter("id"));
//AlertSuccess(result.message);
//setTimeout(window.location.reload(), 3000);
- endLoad();
+ endLoad();
};
- startLoad();
+ startLoad();
AjaxPutRequest(apisite + eva_adjust_postponement_normal_API + data.id, data, successFunc1, AlertDanger);
}
// Create mode
else {
var successFunc2 = function (result) {
AlertSuccess(result.message);
- endLoad();
+ endLoad();
};
- startLoad();
+ startLoad();
AjaxPostRequest(apisite + eva_adjust_postponement_normal_API, data, successFunc2, AlertDanger);
}
}
@@ -116,72 +115,73 @@ function eva_adjust_postponement_normal_GoDelete(a) {
var successFunc = function (result) {
AlertSuccess(result.message);
eva_adjust_postponement_normal_RefreshTable();
- endLoad();
+ endLoad();
};
- startLoad();
+ startLoad();
AjaxDeleteRequest(apisite + eva_adjust_postponement_normal_API + a, null, successFunc, AlertDanger);
}
}
//================= Control Function =========================================
-function Oneva_adjust_postponement_normal_limit_frameChange(){
- var limit = $("#eva_adjust_postponement_normal_limit").val().replace(/[,-]/g,'');
+function Oneva_adjust_postponement_normal_limit_frameChange() {
+ 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;
+ limit_frame = (Math.round(limit_frame * 1000) / 1000).toFixed(3);
$("#eva_adjust_postponement_normal_limit_frame").val(limit_frame);
//$("#eva_adjust_postponement_normal_limit_quota").val(Math.ceil((limit*limit_frame/1000))*10);
- $("#eva_adjust_postponement_normal_limit_quota").maskMoney('mask',Math.ceil((limit*limit_frame/1000))*10);
+ $("#eva_adjust_postponement_normal_limit_quota").maskMoney('mask', Math.ceil((limit * limit_frame / 1000)) * 10);
}
-function Oneva_adjust_postponement_normal_percentageChange(){
+function Oneva_adjust_postponement_normal_percentageChange() {
var percentage = $("#eva_adjust_postponement_normal_percentage").val();
- percentage = Math.round(percentage*100)/100;
+ percentage = Math.round(percentage * 100) / 100;
$("#eva_adjust_postponement_normal_percentage").val(percentage)
$('#eva_adjust_postponement_detail_normal_02Body tr').each(function () {
var i = $(this).find("#rowCount").text();
$("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(percentage);
- });
+ });
Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged();
}
-function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged(){
- var current_quota = $("#eva_adjust_postponement_normal_limit_quota").val().replace(/[,-]/g,'');
+function Oneva_adjust_postponement_detail_normal_02_promoted_percentageChanged() {
+ var current_quota = $("#eva_adjust_postponement_normal_limit_quota").val().replace(/[,-]/g, '');
var sum_postpone = 0;
var sum_before = 0;
var sum_after = 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().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().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;
+ if (i) {
+ var percentage = $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val().replace(/[,-]/g, '');
+ percentage = Math.round(percentage * 1000) / 1000;
+ $("#eva_adjust_postponement_detail_normal_02_promoted_percentage_" + i).val(percentage.toFixed(3));
+
+ 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);
+ var format_new_added = coreFormatPrice(new_added, 3);
+
+ $("#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(new_salary < 13285){
- $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(13285-new_salary);
- }else{
+ if (new_salary < 13285) {
+ $("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(13285 - new_salary);
+ } else {
$("#eva_adjust_postponement_detail_normal_02_new_cost_living_" + i).text(0);
}
sum_postpone += new_added;
sum_before += old_salary;
sum_after += new_salary;
}
- });
+ });
// $("#remain_cost").val(Math.round((current_quota - sum_postpone)*100)/100);
$("#remain_cost").maskMoney('mask', Math.round((current_quota - sum_postpone) * 100) / 100);
$("#sum_before").text(formatNumber(sum_before));
$("#sum_after").text(formatNumber(sum_after));
-}
-
+}
\ No newline at end of file