From 40d91d2ad236b9b0f490d3a5b294608f726b1f4f Mon Sep 17 00:00:00 2001 From: nakorn Date: Tue, 26 Oct 2021 16:38:42 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=20=E0=B9=83=E0=B8=AB=E0=B9=89=E0=B8=9A=E0=B8=B1=E0=B8=99?= =?UTF-8?q?=E0=B8=97=E0=B8=B6=E0=B8=81=20=E0=B9=80=E0=B8=9E=E0=B8=B7?= =?UTF-8?q?=E0=B9=88=E0=B8=AD=E0=B8=9E=E0=B8=B4=E0=B8=A1=E0=B8=9E=E0=B9=8C?= =?UTF-8?q?=E0=B9=84=E0=B8=94=E0=B9=89=E0=B8=81=E0=B9=88=E0=B8=AD=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Iexternal_linkageService.cs | 2 + .../external_linkageService.cs | 24 +++++++++ ...create_evaluation_detail_process_d2.cshtml | 10 ++-- build_command.txt | 2 +- ...eva_create_evaluation_detail_review02_d.js | 51 +++++++++---------- 5 files changed, 57 insertions(+), 32 deletions(-) diff --git a/Models/external_linkage/Iexternal_linkageService.cs b/Models/external_linkage/Iexternal_linkageService.cs index e4b10f8..becb24d 100644 --- a/Models/external_linkage/Iexternal_linkageService.cs +++ b/Models/external_linkage/Iexternal_linkageService.cs @@ -24,6 +24,8 @@ namespace TodoAPI2.Models List Getevaluation_accept(); List GetAgreeDisagree(); List GetAgreeDisagree2(); + + List GetAgreeDisagree3(); List GetDepartmentData(); List GetDepartmentDataForReport(); List GetPositionForReport(); diff --git a/Models/external_linkage/external_linkageService.cs b/Models/external_linkage/external_linkageService.cs index 1b44c11..911e9a5 100644 --- a/Models/external_linkage/external_linkageService.cs +++ b/Models/external_linkage/external_linkageService.cs @@ -248,6 +248,30 @@ namespace TodoAPI2.Models return result; } + public List GetAgreeDisagree3() + { + var result = new List(); + var i = new external_linkageViewModel(); + i.external_id = 1; + i.external_code = "Y"; + i.external_name = "เห็นด้วยกับผลการประเมิน"; + result.Add(i); + + var j = new external_linkageViewModel(); + j.external_id = 2; + j.external_code = "N"; + j.external_name = "ไม่เห็นด้วยและมีความเห็นต่าง"; + result.Add(j); + + var k = new external_linkageViewModel(); + k.external_id = 3; + k.external_code = "R"; + k.external_name = "อยู่ระหว่างพิจารณา แต่ให้พิมพ์ออกได้ก่อน"; + result.Add(k); + + return result; + } + public List GetAgreeDisagree() { var result = new List(); 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 4f1d553..c99e51d 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 @@ -648,13 +648,13 @@ } function Oneva_create_evaluation_detail_review02_supervisor2_resultChanged(a) { - if ($(a).val() == "Y") { + if ($(a).val() === "N") { + $("#eva_create_evaluation_detail_review02_supervisor2_remark").attr("iRequire", "true"); + $("#review02x").show(); + } else { $("#eva_create_evaluation_detail_review02_supervisor2_remark").attr("iRequire", "false"); $("#eva_create_evaluation_detail_review02_supervisor2_remark").css('border-color', ''); - $("#review02x").hide(); - } else { - $("#eva_create_evaluation_detail_review02_supervisor2_remark").attr("iRequire", "true"); - $("#review02x").show(); + $("#review02x").hide(); } } diff --git a/build_command.txt b/build_command.txt index 059663c..625f6a9 100644 --- a/build_command.txt +++ b/build_command.txt @@ -1,5 +1,5 @@ docker build -t registry.gitlab.com/zd-team/tb/tb320eva_zd . -docker login registry.gitlab.com -u -p +docker login registry.gitlab.com -u nakorn2526 -p docker push registry.gitlab.com/zd-team/tb/tb320eva_zd \ No newline at end of file diff --git a/wwwroot/js/eva_create_evaluation_detail_review02/eva_create_evaluation_detail_review02_d.js b/wwwroot/js/eva_create_evaluation_detail_review02/eva_create_evaluation_detail_review02_d.js index 1984593..17b70ac 100644 --- a/wwwroot/js/eva_create_evaluation_detail_review02/eva_create_evaluation_detail_review02_d.js +++ b/wwwroot/js/eva_create_evaluation_detail_review02/eva_create_evaluation_detail_review02_d.js @@ -4,23 +4,23 @@ var eva_create_evaluation_detail_review02_API = "/api/eva_create_evaluation_deta //================= Form Data Customizaiton ========================================= function eva_create_evaluation_detail_review02_FeedDataToForm(data) { -$("#eva_create_evaluation_detail_review02_id").val(data.id); -$("#eva_create_evaluation_detail_review02_create_evaluation_id").val(data.create_evaluation_id); -$("#eva_create_evaluation_detail_review02_supervisor2").val(data.supervisor2); -DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_review02_supervisor2_result"), data, "external_code", "external_name", "item_supervisor2_result", data.supervisor2_result); -$("#eva_create_evaluation_detail_review02_supervisor2_remark").val(data.supervisor2_remark); -$("#eva_create_evaluation_detail_review02_supervisor2_date").val(formatDate(data.supervisor2_date)); + $("#eva_create_evaluation_detail_review02_id").val(data.id); + $("#eva_create_evaluation_detail_review02_create_evaluation_id").val(data.create_evaluation_id); + $("#eva_create_evaluation_detail_review02_supervisor2").val(data.supervisor2); + DropDownClearFormAndFeedWithData($("#eva_create_evaluation_detail_review02_supervisor2_result"), data, "external_code", "external_name", "item_supervisor2_result", data.supervisor2_result); + $("#eva_create_evaluation_detail_review02_supervisor2_remark").val(data.supervisor2_remark); + $("#eva_create_evaluation_detail_review02_supervisor2_date").val(formatDate(data.supervisor2_date)); } function eva_create_evaluation_detail_review02_GetFromForm() { var eva_create_evaluation_detail_review02Object = new Object(); -eva_create_evaluation_detail_review02Object.id = $("#eva_create_evaluation_detail_review02_id").val(); -eva_create_evaluation_detail_review02Object.create_evaluation_id = $("#eva_create_evaluation_detail_review02_create_evaluation_id").val(); -eva_create_evaluation_detail_review02Object.supervisor2 = $("#eva_create_evaluation_detail_review02_supervisor2").val(); -eva_create_evaluation_detail_review02Object.supervisor2_result = $("#eva_create_evaluation_detail_review02_supervisor2_result").val(); -eva_create_evaluation_detail_review02Object.supervisor2_remark = $("#eva_create_evaluation_detail_review02_supervisor2_remark").val(); -eva_create_evaluation_detail_review02Object.supervisor2_date = getDate($("#eva_create_evaluation_detail_review02_supervisor2_date").val()); + eva_create_evaluation_detail_review02Object.id = $("#eva_create_evaluation_detail_review02_id").val(); + eva_create_evaluation_detail_review02Object.create_evaluation_id = $("#eva_create_evaluation_detail_review02_create_evaluation_id").val(); + eva_create_evaluation_detail_review02Object.supervisor2 = $("#eva_create_evaluation_detail_review02_supervisor2").val(); + eva_create_evaluation_detail_review02Object.supervisor2_result = $("#eva_create_evaluation_detail_review02_supervisor2_result").val(); + eva_create_evaluation_detail_review02Object.supervisor2_remark = $("#eva_create_evaluation_detail_review02_supervisor2_remark").val(); + eva_create_evaluation_detail_review02Object.supervisor2_date = getDate($("#eva_create_evaluation_detail_review02_supervisor2_date").val()); return eva_create_evaluation_detail_review02Object; @@ -29,9 +29,9 @@ eva_create_evaluation_detail_review02Object.supervisor2_date = getDate($("#eva_c function eva_create_evaluation_detail_review02_InitialForm() { var successFunc = function (result) { eva_create_evaluation_detail_review02_FeedDataToForm(result); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxGetRequest(apisite + eva_create_evaluation_detail_review02_API + "GetBlankItem", successFunc, AlertDanger); } @@ -41,15 +41,15 @@ function eva_create_evaluation_detail_review02_SetEditForm(a) { var successFunc = function (result) { eva_create_evaluation_detail_review02_editMode = "UPDATE"; eva_create_evaluation_detail_review02_FeedDataToForm(result); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxGetRequest(apisite + eva_create_evaluation_detail_review02_API + a, successFunc, AlertDanger); } function eva_create_evaluation_detail_review02_SetCreateForm() { eva_create_evaluation_detail_review02_editMode = "CREATE"; - eva_create_evaluation_detail_review02_InitialForm(); + eva_create_evaluation_detail_review02_InitialForm(); } //================= Update and Delete ========================================= @@ -59,8 +59,7 @@ var eva_create_evaluation_detail_review02_customValidation = function (group) { }; function eva_create_evaluation_detail_review02_PutUpdate(xx) { - if (!ValidateForm('eva_create_evaluation_detail_review02', eva_create_evaluation_detail_review02_customValidation)) - { + if (!ValidateForm('eva_create_evaluation_detail_review02', eva_create_evaluation_detail_review02_customValidation)) { return; } var data = eva_create_evaluation_detail_review02_GetFromForm(); @@ -69,19 +68,19 @@ function eva_create_evaluation_detail_review02_PutUpdate(xx) { if (eva_create_evaluation_detail_review02_editMode === "UPDATE") { var successFunc1 = function (result) { AlertSuccess(result.message); - if(xx) window.location.reload(); - endLoad(); + if (xx) window.location.reload(); + endLoad(); }; - startLoad(); + startLoad(); AjaxPutRequest(apisite + eva_create_evaluation_detail_review02_API + data.id, data, successFunc1, AlertDanger); } // Create mode else { var successFunc2 = function (result) { AlertSuccess(result.message); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxPostRequest(apisite + eva_create_evaluation_detail_review02_API, data, successFunc2, AlertDanger); } } @@ -91,9 +90,9 @@ function eva_create_evaluation_detail_review02_GoDelete(a) { var successFunc = function (result) { AlertSuccess(result.message); eva_create_evaluation_detail_review02_RefreshTable(); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxDeleteRequest(apisite + eva_create_evaluation_detail_review02_API + a, null, successFunc, AlertDanger); } }