diff --git a/Models/external_competency/external_competencyService.cs b/Models/external_competency/external_competencyService.cs index 2a443e6..25a7d32 100644 --- a/Models/external_competency/external_competencyService.cs +++ b/Models/external_competency/external_competencyService.cs @@ -58,7 +58,7 @@ select * from com_competency_levels where deleted_at is null order by competency { var i = new external_com_competency_levelsViewModel(); i.competency_level_id = Convert.ToInt16(dr["competency_level_id"]); - i.competency_level_detail = Convert.ToString(dr["level"])+" "+Convert.ToString(dr["competency_level_detail"]); + i.competency_level_detail = Convert.ToString(dr["competency_level_id"])+"."+Convert.ToString(dr["competency_level_detail"]); i.competency_id = Convert.ToInt16(dr["competency_id"]); i.level = Convert.ToInt16(dr["level"]); @@ -81,7 +81,7 @@ select * from com_competency_levels where competency_id={competency_id.ToString( { var i = new external_com_competency_levelsViewModel(); i.competency_level_id = Convert.ToInt16(dr["competency_level_id"]); - i.competency_level_detail = Convert.ToString(dr["level"]) + " " + Convert.ToString(dr["competency_level_detail"]); + i.competency_level_detail = Convert.ToString(dr["competency_level_id"]) + "." + Convert.ToString(dr["competency_level_detail"]); i.competency_id = Convert.ToInt16(dr["competency_id"]); i.level = Convert.ToInt16(dr["level"]); 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 ba73751..91a0649 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 @@ -740,6 +740,7 @@ function saveStatus(s){ saveAll(); + eva_create_evaluation_detail_status_PutUpdate(s); } function saveAll(){ 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 9617897..c69d2ae 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 @@ -143,18 +143,6 @@ if(cur_dep !== data.emp_department_name){ } -function eva_adjust_postponement_detail_quota_02_Restoreeva_adjust_postponement_detail_quota_02(e) { - if (confirm('กรุณากดตกลง เพื่อยืนยันการกู้คืน?')) { - $(e).closest('tr').find("input,select,textarea").attr('disabled', false); - $(e).closest('tr').find("input,select,textarea").css({ opacity: '1' }); - $(e).hide(); - $(e).closest('tr').find("#removeBtn").show(); - $(e).closest('tr').find("input").first().val("1"); - console.log($(e).closest('tr').find("input").first().val()); - eva_adjust_postponement_detail_quota_02_Summary(); - } -} - function eva_adjust_postponement_detail_quota_02_Summary() { var sum = 0; $(".input_score").each(function () { 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 ad179c4..b96f8ba 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 @@ -13,7 +13,7 @@ $("#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()); +//console.log($("#eva_adjust_postponement_quota_limit").val()); } function eva_adjust_postponement_quota_GetFromForm() { @@ -141,26 +141,30 @@ function CalculateRemainQuota(){ var eva_adjust_postponement_detail_quota_02 = []; $('#eva_adjust_postponement_detail_quota_02Body tr').each(function () { var i = $(this).find("#rowCount").text(); - 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()); + 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; - $("#eva_adjust_postponement_detail_quota_02_receive_quota_" + i).val(receive_quota); + 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)); + 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){ - $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(formatNumber(1000)); - }else{ - $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(0); - } + if(new_sarary_with_quota < 13285){ + $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(formatNumber(1000)); + }else{ + $("#eva_adjust_postponement_detail_quota_02_new_cost_living_" + i).text(0); + } + sum_receive_quota += receive_quota; + } }); var remain_quota = limit_quota - sum_receive_quota; + $("#remain_quota").val(remain_quota); }