fix comma

This commit is contained in:
2020-07-15 19:20:30 +07:00
parent 3f8e466e4e
commit c1b244c4ff
2 changed files with 109 additions and 104 deletions

View File

@@ -5,42 +5,44 @@ var eva_adjust_postponement_quota_API = "/api/eva_adjust_postponement_quota/";
function eva_adjust_postponement_quota_GetSearchParameter() {
var eva_adjust_postponement_quotaSearchObject = new Object();
eva_adjust_postponement_quotaSearchObject.fiscal_year = $("#s_eva_adjust_postponement_quota_fiscal_year").val();
eva_adjust_postponement_quotaSearchObject.theRound = $("#s_eva_adjust_postponement_quota_theRound").val();
eva_adjust_postponement_quotaSearchObject.fiscal_year = $("#s_eva_adjust_postponement_quota_fiscal_year").val();
eva_adjust_postponement_quotaSearchObject.theRound = $("#s_eva_adjust_postponement_quota_theRound").val();
return eva_adjust_postponement_quotaSearchObject;
}
function eva_adjust_postponement_quota_FeedDataToSearchForm(data) {
$("#s_eva_adjust_postponement_quota_fiscal_year").val(data.fiscal_year);
$("#s_eva_adjust_postponement_quota_theRound").val(data.theRound);
$("#s_eva_adjust_postponement_quota_fiscal_year").val(data.fiscal_year);
$("#s_eva_adjust_postponement_quota_theRound").val(data.theRound);
}
//================= Form Data Customizaiton =========================================
function eva_adjust_postponement_quota_FeedDataToForm(data) {
$("#eva_adjust_postponement_quota_id").val(data.id);
$("#eva_adjust_postponement_quota_fiscal_year").val(data.fiscal_year);
$("#eva_adjust_postponement_quota_theDate").val(formatDate(data.theDate));
$("#eva_adjust_postponement_quota_theRound").val(data.theRound);
$("#eva_adjust_postponement_quota_limit_quota").val(data.limit_quota);
$("#eva_adjust_postponement_quota_limit_frame_quota").val(data.limit_frame_quota);
$("#eva_adjust_postponement_quota_command_no").val(data.command_no);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_quota_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
$("#eva_adjust_postponement_quota_id").val(data.id);
$("#eva_adjust_postponement_quota_fiscal_year").val(data.fiscal_year);
$("#eva_adjust_postponement_quota_theDate").val(formatDate(data.theDate));
$("#eva_adjust_postponement_quota_theRound").val(data.theRound);
// $("#eva_adjust_postponement_quota_limit_quota").val(data.limit_quota);
$("#eva_adjust_postponement_quota_limit_quota").maskMoney('mask', data.limit_quota);
// $("#eva_adjust_postponement_quota_limit_frame_quota").val(data.limit_frame_quota);
$("#eva_adjust_postponement_quota_limit_frame_quota").maskMoney('mask', data.limit_frame_quota);
$("#eva_adjust_postponement_quota_command_no").val(data.command_no);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_quota_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
}
function eva_adjust_postponement_quota_GetFromForm() {
var eva_adjust_postponement_quotaObject = new Object();
eva_adjust_postponement_quotaObject.id = $("#eva_adjust_postponement_quota_id").val();
eva_adjust_postponement_quotaObject.fiscal_year = $("#eva_adjust_postponement_quota_fiscal_year").val();
eva_adjust_postponement_quotaObject.theDate = getDate($("#eva_adjust_postponement_quota_theDate").val());
eva_adjust_postponement_quotaObject.theRound = $("#eva_adjust_postponement_quota_theRound").val();
eva_adjust_postponement_quotaObject.limit_quota = $("#eva_adjust_postponement_quota_limit_quota").val();
eva_adjust_postponement_quotaObject.limit_frame_quota = $("#eva_adjust_postponement_quota_limit_frame_quota").val();
eva_adjust_postponement_quotaObject.command_no = $("#eva_adjust_postponement_quota_command_no").val();
eva_adjust_postponement_quotaObject.managed_by = $("#eva_adjust_postponement_quota_managed_by").val();
eva_adjust_postponement_quotaObject.id = $("#eva_adjust_postponement_quota_id").val();
eva_adjust_postponement_quotaObject.fiscal_year = $("#eva_adjust_postponement_quota_fiscal_year").val();
eva_adjust_postponement_quotaObject.theDate = getDate($("#eva_adjust_postponement_quota_theDate").val());
eva_adjust_postponement_quotaObject.theRound = $("#eva_adjust_postponement_quota_theRound").val();
eva_adjust_postponement_quotaObject.limit_quota = $("#eva_adjust_postponement_quota_limit_quota").val().replace(/[,-]/g,'');
eva_adjust_postponement_quotaObject.limit_frame_quota = $("#eva_adjust_postponement_quota_limit_frame_quota").val().replace(/[,-]/g,'');
eva_adjust_postponement_quotaObject.command_no = $("#eva_adjust_postponement_quota_command_no").val();
eva_adjust_postponement_quotaObject.managed_by = $("#eva_adjust_postponement_quota_managed_by").val();
return eva_adjust_postponement_quotaObject;
@@ -109,8 +111,7 @@ var eva_adjust_postponement_quota_customValidation = function (group) {
};
function eva_adjust_postponement_quota_PutUpdate() {
if (!ValidateForm('eva_adjust_postponement_quota', eva_adjust_postponement_quota_customValidation))
{
if (!ValidateForm('eva_adjust_postponement_quota', eva_adjust_postponement_quota_customValidation)) {
return;
}
@@ -120,7 +121,7 @@ function eva_adjust_postponement_quota_PutUpdate() {
if (eva_adjust_postponement_quota_editMode === "UPDATE") {
var successFunc1 = function (result) {
$("#eva_adjust_postponement_quotaModel").modal("hide");
AlertSuccess(result.code+" "+result.message);
AlertSuccess(result.code + " " + result.message);
eva_adjust_postponement_quota_RefreshTable();
endLoad();
};
@@ -131,7 +132,7 @@ function eva_adjust_postponement_quota_PutUpdate() {
else {
var successFunc2 = function (result) {
$("#eva_adjust_postponement_quotaModel").modal("hide");
AlertSuccess(result.code+" "+result.message);
AlertSuccess(result.code + " " + result.message);
eva_adjust_postponement_quota_RefreshTable();
endLoad();
};
@@ -144,7 +145,7 @@ function eva_adjust_postponement_quota_GoDelete(a) {
if (confirm('คุณต้องการลบข้อมูล ใช่หรือไม่?')) {
var successFunc = function (result) {
$("#eva_adjust_postponement_quotaModel").modal("hide");
AlertSuccess(result.code+" "+result.message);
AlertSuccess(result.code + " " + result.message);
eva_adjust_postponement_quota_RefreshTable();
endLoad();
};
@@ -191,7 +192,7 @@ var eva_adjust_postponement_quota_setupTable = function (result) {
function eva_adjust_postponement_quota_InitiateDataTable() {
startLoad();
var p = $.param(eva_adjust_postponement_quota_GetSearchParameter());
AjaxGetRequest(apisite + "/api/eva_adjust_postponement_quota/GetListBySearch?"+p, eva_adjust_postponement_quota_setupTable, AlertDanger);
AjaxGetRequest(apisite + "/api/eva_adjust_postponement_quota/GetListBySearch?" + p, eva_adjust_postponement_quota_setupTable, AlertDanger);
}
function eva_adjust_postponement_quota_DoSearch() {
@@ -202,7 +203,7 @@ function eva_adjust_postponement_quota_DoSearch() {
endLoad();
};
startLoad();
AjaxGetRequest(apisite + "/api/eva_adjust_postponement_quota/GetListBySearch?"+p, eva_adjust_postponement_quota_reload, AlertDanger);
AjaxGetRequest(apisite + "/api/eva_adjust_postponement_quota/GetListBySearch?" + p, eva_adjust_postponement_quota_reload, AlertDanger);
}
function eva_adjust_postponement_quota_GetSelect(f) {

View File

@@ -4,16 +4,19 @@ var eva_adjust_postponement_quota_API = "/api/eva_adjust_postponement_quota/";
//================= Form Data Customizaiton =========================================
function eva_adjust_postponement_quota_FeedDataToForm(data) {
$("#eva_adjust_postponement_quota_id").val(data.id);
$("#eva_adjust_postponement_quota_fiscal_year").val(data.fiscal_year);
$("#eva_adjust_postponement_quota_theDate").val(formatDate(data.theDate));
$("#eva_adjust_postponement_quota_theRound").val(data.theRound);
$("#eva_adjust_postponement_quota_limit_quota").val(data.limit_quota);
$("#eva_adjust_postponement_quota_limit_frame_quota").val(data.limit_frame_quota);
$("#eva_adjust_postponement_quota_command_no").val(data.command_no);
$("#eva_adjust_postponement_quota_limit").val(data.limit);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_quota_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
//console.log($("#eva_adjust_postponement_quota_limit").val());
$("#eva_adjust_postponement_quota_id").val(data.id);
$("#eva_adjust_postponement_quota_fiscal_year").val(data.fiscal_year);
$("#eva_adjust_postponement_quota_theDate").val(formatDate(data.theDate));
$("#eva_adjust_postponement_quota_theRound").val(data.theRound);
// $("#eva_adjust_postponement_quota_limit_quota").val(data.limit_quota);
$("#eva_adjust_postponement_quota_limit_quota").maskMoney('mask', data.limit_quota);
// $("#eva_adjust_postponement_quota_limit_frame_quota").val(data.limit_frame_quota);
$("#eva_adjust_postponement_quota_limit_frame_quota").maskMoney('mask', data.limit_frame_quota);
$("#eva_adjust_postponement_quota_command_no").val(data.command_no);
$("#eva_adjust_postponement_quota_limit").val(data.limit);
DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_quota_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id"));
//console.log($("#eva_adjust_postponement_quota_limit").val());
}
function eva_adjust_postponement_quota_GetFromForm() {
@@ -22,11 +25,11 @@ function eva_adjust_postponement_quota_GetFromForm() {
eva_adjust_postponement_quotaObject.fiscal_year = $("#eva_adjust_postponement_quota_fiscal_year").val();
eva_adjust_postponement_quotaObject.theDate = getDate($("#eva_adjust_postponement_quota_theDate").val());
eva_adjust_postponement_quotaObject.theRound = $("#eva_adjust_postponement_quota_theRound").val();
eva_adjust_postponement_quotaObject.limit_quota = $("#eva_adjust_postponement_quota_limit_quota").val();
eva_adjust_postponement_quotaObject.limit_frame_quota = $("#eva_adjust_postponement_quota_limit_frame_quota").val();
eva_adjust_postponement_quotaObject.limit_quota = $("#eva_adjust_postponement_quota_limit_quota").val().replace(/[,-]/g,'');
eva_adjust_postponement_quotaObject.limit_frame_quota = $("#eva_adjust_postponement_quota_limit_frame_quota").val().replace(/[,-]/g,'');
eva_adjust_postponement_quotaObject.command_no = $("#eva_adjust_postponement_quota_command_no").val();
eva_adjust_postponement_quotaObject.managed_by = $("#eva_adjust_postponement_quota_managed_by").val();
eva_adjust_postponement_quotaObject.limit = $("#eva_adjust_postponement_quota_limit").val();
eva_adjust_postponement_quotaObject.limit = $("#eva_adjust_postponement_quota_limit").val().replace(/[,-]/g,'');
var eva_adjust_postponement_detail_quota_02 = [];
$('#eva_adjust_postponement_detail_quota_02Body tr').each(function () {
@@ -74,8 +77,7 @@ var eva_adjust_postponement_quota_customValidation = function (group) {
};
function eva_adjust_postponement_quota_PutUpdate() {
if (!ValidateForm('eva_adjust_postponement_quota', eva_adjust_postponement_quota_customValidation))
{
if (!ValidateForm('eva_adjust_postponement_quota', eva_adjust_postponement_quota_customValidation)) {
return;
}
var data = eva_adjust_postponement_quota_GetFromForm();
@@ -83,7 +85,7 @@ function eva_adjust_postponement_quota_PutUpdate() {
//Update Mode
if (eva_adjust_postponement_quota_editMode === "UPDATE") {
var successFunc1 = function (result) {
AlertSuccess(result.code+" "+result.message);
AlertSuccess(result.code + " " + result.message);
endLoad();
};
startLoad();
@@ -92,7 +94,7 @@ function eva_adjust_postponement_quota_PutUpdate() {
// Create mode
else {
var successFunc2 = function (result) {
AlertSuccess(result.code+" "+result.message);
AlertSuccess(result.code + " " + result.message);
endLoad();
};
startLoad();
@@ -103,7 +105,7 @@ function eva_adjust_postponement_quota_PutUpdate() {
function eva_adjust_postponement_quota_GoDelete(a) {
if (confirm('คุณต้องการลบ ' + a + ' ใช่หรือไม่?')) {
var successFunc = function (result) {
AlertSuccess(result.code+" "+result.message);
AlertSuccess(result.code + " " + result.message);
eva_adjust_postponement_quota_RefreshTable();
endLoad();
};
@@ -118,43 +120,45 @@ function eva_adjust_postponement_quota_GoDelete(a) {
//================= Control Function =========================================
function Oneva_adjust_postponement_quota_limit_frame_quotaChange()
{
function Oneva_adjust_postponement_quota_limit_frame_quotaChange() {
var limit_frame_quota = parseFloat($("#eva_adjust_postponement_quota_limit_frame_quota").val());
limit_frame_quota = Math.round(limit_frame_quota * 100) / 100;
if(limit_frame_quota < 0) limit_frame_quota = 0;
$("#eva_adjust_postponement_quota_limit_frame_quota").val(limit_frame_quota);
if (limit_frame_quota < 0) limit_frame_quota = 0;
// $("#eva_adjust_postponement_quota_limit_frame_quota").val(limit_frame_quota);
$("#eva_adjust_postponement_quota_limit_frame_quota").maskMoney('mask', limit_frame_quota);
var limit = parseFloat($("#eva_adjust_postponement_quota_limit").val());
limit = Math.round(limit * 100)/100;
$("#eva_adjust_postponement_quota_limit").val(limit);
limit = Math.round(limit * 100) / 100;
// $("#eva_adjust_postponement_quota_limit").val(limit);
$("#eva_adjust_postponement_quota_limit").maskMoney('mask', limit);
limit_quota = limit_frame_quota * limit / 100;
$("#eva_adjust_postponement_quota_limit_quota").val(limit_quota);
// $("#eva_adjust_postponement_quota_limit_quota").val(limit_quota);
$("#eva_adjust_postponement_quota_limit_quota").maskMoney('mask', limit_quota);
CalculateRemainQuota();
}
function CalculateRemainQuota(){
function CalculateRemainQuota() {
var sum_receive_quota = 0;
var limit_quota = parseFloat($("#eva_adjust_postponement_quota_limit_quota").val());
var limit_quota = parseFloat($("#eva_adjust_postponement_quota_limit_quota").val().replace(/[,-]/g,''));
var eva_adjust_postponement_detail_quota_02 = [];
$('#eva_adjust_postponement_detail_quota_02Body tr').each(function () {
var i = $(this).find("#rowCount").text();
if(i){
if (i) {
var new_sarary = parseFloat($("#eva_adjust_postponement_detail_quota_02_new_sarary_" + i).text());
var receive_quota = parseFloat($("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val());
receive_quota = Math.round(receive_quota*100)/100;
if(receive_quota < 0) receive_quota = 0;
receive_quota = Math.round(receive_quota * 100) / 100;
if (receive_quota < 0) receive_quota = 0;
$("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val(receive_quota);
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(new_sarary_with_quota < 13285){
if (new_sarary_with_quota < 13285) {
$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(formatNumber(1000));
}else{
} else {
$("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(0);
}