From 1c2857e9778e70450a12acacf67b024e64e512a9 Mon Sep 17 00:00:00 2001 From: Nakorn Rientrakrunchai Date: Fri, 13 Mar 2020 10:19:57 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=9B?= =?UTF-8?q?=E0=B8=A3=E0=B8=B8=E0=B8=87=20flow=20=E0=B8=81=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3=E0=B9=84=E0=B8=AB=E0=B8=A5=20=E0=B8=82=E0=B8=AD?= =?UTF-8?q?=E0=B8=87=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1=E0=B8=B9=E0=B8=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...l@eva_create_evaluation_detail_status.xlsx | Bin 10137 -> 10280 bytes ...create_evaluation_detail_processService.cs | 6 + ...eate_evaluation_detail_processViewModel.cs | 4 + ...eate_evaluation_detail_statusInputModel.cs | 4 + ..._create_evaluation_detail_statusService.cs | 7 +- ...reate_evaluation_detail_statusViewModel.cs | 5 +- ..._evaluation_achievement_process2Service.cs | 2 +- ...eva_evaluation_behavior_process2Service.cs | 2 +- ...va_create_evaluation_detail_process.cshtml | 5 +- ..._create_evaluation_detail_process_d.cshtml | 2 + ...create_evaluation_detail_process_d2.cshtml | 22 +++- appsettings.Development.json | 4 +- .../eva_create_evaluation_detail_process.js | 29 +---- .../eva_create_evaluation_detail_process_d.js | 47 +++++-- ...eva_create_evaluation_detail_process_d2.js | 115 ++++++++++++++---- .../eva_create_evaluation_detail_status_d.js | 18 +++ ...eva_evaluation_behavior_process2_inline.js | 6 +- 17 files changed, 203 insertions(+), 75 deletions(-) diff --git a/EXCEL/eva_create_evaluation_detail@eva_create_evaluation_detail_status.xlsx b/EXCEL/eva_create_evaluation_detail@eva_create_evaluation_detail_status.xlsx index df6f037dc8247c4df9e11898d195efa50f410b13..1d6659295f687976ae69409717f530ca4fcbd3eb 100644 GIT binary patch delta 2084 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 diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs index 919c5e8..6d94ed5 100644 --- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs +++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processService.cs @@ -104,6 +104,9 @@ namespace TodoAPI2.Models status_chief = m_eva_create_evaluation_detail_process.status_chief, status_supervisor = m_eva_create_evaluation_detail_process.status_supervisor, + status_supervisor1A = m_eva_create_evaluation_detail_process.status_supervisor1A, + status_supervisor2A = m_eva_create_evaluation_detail_process.status_supervisor2A, + role_code = getRoleCode(emp_id, m_eva_create_evaluation_detail_process.chief, m_eva_create_evaluation_detail_process.chief, fk_eva_create_evaluationResult10.employee_id, @@ -208,6 +211,9 @@ namespace TodoAPI2.Models status_chief = m_eva_create_evaluation_detail_process.status_chief, status_supervisor = m_eva_create_evaluation_detail_process.status_supervisor, + status_supervisor1A = m_eva_create_evaluation_detail_process.status_supervisor1A, + status_supervisor2A = m_eva_create_evaluation_detail_process.status_supervisor2A, + role_code = getRoleCode(emp_id, m_eva_create_evaluation_detail_process.chief, m_eva_create_evaluation_detail_process.chief, fk_eva_create_evaluationResult10.employee_id, diff --git a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs index 4b21c65..990f9fd 100644 --- a/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs +++ b/Models/eva_create_evaluation_detail_process/eva_create_evaluation_detail_processViewModel.cs @@ -49,6 +49,10 @@ namespace TodoAPI2.Models public string status_supervisor { get; set; } + public string status_supervisor1A { get; set; } + + public string status_supervisor2A { get; set; } + public string role_desc { get; set; } public string role_code { get; set; } diff --git a/Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusInputModel.cs b/Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusInputModel.cs index 7101776..ae4476c 100644 --- a/Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusInputModel.cs +++ b/Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusInputModel.cs @@ -24,6 +24,10 @@ namespace TodoAPI2.Models public string status_supervisor { get; set; } + public string status_supervisor1A { get; set; } + + public string status_supervisor2A { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusService.cs b/Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusService.cs index be975a0..885d238 100644 --- a/Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusService.cs +++ b/Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusService.cs @@ -102,6 +102,8 @@ namespace TodoAPI2.Models status_chief = m_eva_create_evaluation_detail_status.status_chief, status_supervisor = m_eva_create_evaluation_detail_status.status_supervisor, + status_supervisor1A = m_eva_create_evaluation_detail_status.status_supervisor1A, + status_supervisor2A = m_eva_create_evaluation_detail_status.status_supervisor2A, isActive = m_eva_create_evaluation_detail_status.isActive, Created = m_eva_create_evaluation_detail_status.created, @@ -153,7 +155,8 @@ namespace TodoAPI2.Models existingEntity.status_self = model.status_self; existingEntity.status_chief = model.status_chief; existingEntity.status_supervisor = model.status_supervisor; - + existingEntity.status_supervisor1A = model.status_supervisor1A; + existingEntity.status_supervisor2A = model.status_supervisor2A; var updated = _repository.Update(id, existingEntity); return Get(updated.id); @@ -175,6 +178,8 @@ namespace TodoAPI2.Models existingEntity.status_self = i.status_self; existingEntity.status_chief = i.status_chief; existingEntity.status_supervisor = i.status_supervisor; + existingEntity.status_supervisor1A = i.status_supervisor1A; + existingEntity.status_supervisor2A = i.status_supervisor2A; _repository.UpdateWithoutCommit(i.id.Value, existingEntity); diff --git a/Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusViewModel.cs b/Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusViewModel.cs index d6d8d57..53007f3 100644 --- a/Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusViewModel.cs +++ b/Models/eva_create_evaluation_detail_status/eva_create_evaluation_detail_statusViewModel.cs @@ -22,6 +22,9 @@ namespace TodoAPI2.Models public string status_supervisor { get; set; } + public string status_supervisor1A { get; set; } + public string status_supervisor2A { get; set; } } -} \ No newline at end of file +} + diff --git a/Models/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2Service.cs b/Models/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2Service.cs index 195e211..f80b4f9 100644 --- a/Models/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2Service.cs +++ b/Models/eva_evaluation_achievement_process2/eva_evaluation_achievement_process2Service.cs @@ -97,7 +97,7 @@ namespace TodoAPI2.Models && (m_eva_evaluation_achievement_process2.create_evaluation_detail_id == model.create_evaluation_detail_id || !model.create_evaluation_detail_id.HasValue) - orderby m_eva_evaluation_achievement_process2.created descending + orderby m_eva_evaluation_achievement_process2.achievement select new eva_evaluation_achievement_process2ViewModel() { id = m_eva_evaluation_achievement_process2.id, diff --git a/Models/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2Service.cs b/Models/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2Service.cs index a7565fd..864f1ad 100644 --- a/Models/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2Service.cs +++ b/Models/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2Service.cs @@ -97,7 +97,7 @@ namespace TodoAPI2.Models && (m_eva_evaluation_behavior_process2.create_evaluation_detail_id == model.create_evaluation_detail_id || !model.create_evaluation_detail_id.HasValue) - orderby m_eva_evaluation_behavior_process2.created descending + orderby m_eva_evaluation_behavior_process2.behavior select new eva_evaluation_behavior_process2ViewModel() { id = m_eva_evaluation_behavior_process2.id, diff --git a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process.cshtml b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process.cshtml index a25eb93..729b8ff 100644 --- a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process.cshtml +++ b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process.cshtml @@ -59,10 +59,11 @@ - + - + + diff --git a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml index 6b1a276..a25c898 100644 --- a/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml +++ b/Views/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d.cshtml @@ -293,6 +293,8 @@ + +
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 c388c89..f4b5c92 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 @@ -21,7 +21,7 @@
-
ประเมินผลเพื่อปรับเลื่อนเงินเดือน
+
ประเมินผลเพื่อปรับเลื่อนเงินเดือน
@@ -261,7 +261,7 @@
-
ความเห็นผู้ประเมิน
+
ความเห็นผู้ประเมิน
@@ -334,6 +334,8 @@ + +
@@ -350,7 +352,7 @@
-
ความเห็น ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง
+
ความเห็น ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง
@@ -388,7 +390,11 @@
- + + + + +
@@ -396,7 +402,7 @@
-
ความเห็น ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)
+
ความเห็น ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด)
@@ -432,7 +438,11 @@
- + + + + +
diff --git a/appsettings.Development.json b/appsettings.Development.json index 15a0255..52aa449 100644 --- a/appsettings.Development.json +++ b/appsettings.Development.json @@ -1,7 +1,7 @@ { "connectionStrings": { - "mainDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr;User ID=postgres;Password=project0*;", - "externalDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr;User ID=postgres;Password=project0*;" + "mainDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr2;User ID=postgres;Password=project0*;", + "externalDBConnectionString": "Server=192.168.2.233;Port=5432;Database=tb320_hr_site2;User ID=postgres;Password=project0*;" }, "IdentityServer": { "url": "", diff --git a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js index 6edd5de..c683e45 100644 --- a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js +++ b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process.js @@ -193,9 +193,11 @@ var eva_create_evaluation_detail_process_setupTable = function (result) { { "data": "employee_position_level" }, { "data": "org_id_external_linkage_external_name" }, { "data": "role_desc" }, - { "data": "id" }, - { "data": "id" }, -{ "data": "id" }, +{ "data": "status_self" }, +{ "data": "status_chief" }, +{ "data": "status_supervisor" }, +{ "data": "status_supervisor1A" }, +{ "data": "status_supervisor2A" } ], "columnDefs": [ { @@ -204,27 +206,6 @@ var eva_create_evaluation_detail_process_setupTable = function (result) { "render": function (data, type, row, meta) { return " "; } - }, - { - "targets": -1, - "data": "status_supervisor", - "render": function (data, type, row, meta) { - return row["status_supervisor"]; - } - }, - { - "targets": -2, - "data": "status_chief", - "render": function (data, type, row, meta) { - return row["status_chief"]; - } - }, - { - "targets": -3, - "data": "status_self", - "render": function (data, type, row, meta) { - return row["status_self"]; - } }], "language": { "url": appsite + "/DataTables-1.10.16/thai.json" diff --git a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js index 62f2591..27da124 100644 --- a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js +++ b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js @@ -152,16 +152,43 @@ function eva_create_evaluation_detail_process_GoDelete(a) { //================= Control Function ========================================= function setPageByRoleAndStatus(role_code, status_self, status_chief, status_supervisor){ - if(status_chief === "Y"){ - $("#btn01").hide(); - $("#btn02").hide(); - $("#btn03").hide(); - $("#btna01").hide(); - $("#btna02").hide(); - $("#btna03").hide(); - $("#thestatus").text("(ผู้ประเมิน ส่งแบบประเมินแล้ว)"); - $("#eva_create_evaluation_detail_review01_supervisor1_date").attr("disabled", true); - $("#eva_create_evaluation_detail_review01_supervisor1_remark").attr("disabled", true); + $("#btn01").hide(); + $("#btn02").hide(); + $("#btn03").hide(); + $("#btna01").hide(); + $("#btna02").hide(); + $("#btna03").hide(); + $("#eva_create_evaluation_detail_review01_supervisor1_date").attr("disabled", true); + $("#eva_create_evaluation_detail_review01_supervisor1_remark").attr("disabled", true); + + if(role_code === "1"){ // ผู้ประเมิน + if(status_self === "Y"){ + $("#btn01").show(); + $("#btn02").show(); + $("#btn03").show(); + $("#btna01").show(); + $("#btna02").show(); + $("#btna03").show(); + $("#eva_create_evaluation_detail_review01_supervisor1_date").attr("disabled", false); + $("#eva_create_evaluation_detail_review01_supervisor1_remark").attr("disabled", false); + }else{ + $("#thestatus").text("(ผู้รับการประเมิน ยังไม่ส่งแบบประเมิน คุณจึงไม่สามารถให้ความเห็นได้)"); + } + + if(status_chief === "Y"){ + $("#thestatus").text("(ผู้ประเมิน ส่งแบบประเมินแล้ว)"); + $("#btn01").hide(); + $("#btn02").hide(); + $("#btn03").hide(); + $("#btna01").hide(); + $("#btna02").hide(); + $("#btna03").hide(); + $("#eva_create_evaluation_detail_review01_supervisor1_date").attr("disabled", true); + $("#eva_create_evaluation_detail_review01_supervisor1_remark").attr("disabled", true); + } + }else{ + alert('คุณไม่มีสิทธิเข้าถึงหน้าจอนี้!'); + window_close(); } } diff --git a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d2.js b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d2.js index 79ba948..c0f7548 100644 --- a/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d2.js +++ b/wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d2.js @@ -86,7 +86,7 @@ function eva_create_evaluation_detail_process_SetEditForm(a) { var successFunc = function (result) { eva_create_evaluation_detail_process_editMode = "UPDATE"; eva_create_evaluation_detail_process_FeedDataToForm(result); - setPageByRoleAndStatus(result.role_code, result.status_self, result.status_chief, result.status_supervisor); + setPageByRoleAndStatus(result.role_code, result.status_self, result.status_chief, result.status_supervisor, result.status_supervisor1A, result.status_supervisor2A); endLoad(); }; startLoad(); @@ -149,42 +149,109 @@ function eva_create_evaluation_detail_process_GoDelete(a) { //================= Control Function ========================================= -function setPageByRoleAndStatus(role_code, status_self, status_chief, status_supervisor){ - if(status_supervisor === "Y"){ - $("#btn01").hide(); - $("#btn02").hide(); - $("#btn03").hide(); - $("#btnb01").hide(); - $("#btnb02").hide(); - $("#btnb03").hide(); - $("#thestatus").text("(ผู้ประเมินสูงสุด ส่งแบบประเมินแล้ว)"); - $("#eva_create_evaluation_detail_review02_supervisor2_result").attr("disabled", true); - $("#eva_create_evaluation_detail_review02_supervisor2_date").attr("disabled", true); - $("#eva_create_evaluation_detail_review02_supervisor2_remark").attr("disabled", true); - } +function setPageByRoleAndStatus(role_code, status_self, status_chief, status_supervisor, status_supervisor1A, status_supervisor2A){ + + $("#btn01").hide(); + $("#btn02").hide(); + $("#btn03").hide(); + $("#btnb01").hide(); + $("#btnb02").hide(); + $("#btnb03").hide(); + $("#eva_create_evaluation_detail_review02_supervisor2_result").attr("disabled", true); + $("#eva_create_evaluation_detail_review02_supervisor2_date").attr("disabled", true); + $("#eva_create_evaluation_detail_review02_supervisor2_remark").attr("disabled", true); $("#eva_create_evaluation_detail_review03_supervisor1A_result").attr("disabled", true); $("#eva_create_evaluation_detail_review03_supervisor1A_date").attr("disabled", true); $("#eva_create_evaluation_detail_review03_supervisor1A_remark").attr("disabled", true); $("#btnc01").hide(); + $("#btnc02").hide(); + $("#btnc03").hide(); $("#eva_create_evaluation_detail_review04_supervisor2A_result").attr("disabled", true); $("#eva_create_evaluation_detail_review04_supervisor2A_date").attr("disabled", true); $("#eva_create_evaluation_detail_review04_supervisor2A_remark").attr("disabled", true); $("#btnd01").hide(); + $("#btnd02").hide(); + $("#btnd03").hide(); - if(role_code === "3"){ - $("#eva_create_evaluation_detail_review03_supervisor1A_result").attr("disabled", false); - $("#eva_create_evaluation_detail_review03_supervisor1A_date").attr("disabled", false); - $("#eva_create_evaluation_detail_review03_supervisor1A_remark").attr("disabled", false); - $("#btnc01").show(); + if(role_code === "2"){ // ความเห็น ความเห็นผู้ประเมินสูงสุด + + if(status_chief === "Y" && status_self === "Y"){ + $("#btn01").show(); + $("#btn02").show(); + $("#btn03").show(); + $("#btnb01").show(); + $("#btnb02").show(); + $("#btnb03").show(); + $("#eva_create_evaluation_detail_review02_supervisor2_result").attr("disabled", false); + $("#eva_create_evaluation_detail_review02_supervisor2_date").attr("disabled", false); + $("#eva_create_evaluation_detail_review02_supervisor2_remark").attr("disabled", false); + }else{ + $("#thestatus").text("(ผู้รับการประเมิน หรือ ผู้ประเมิน ยังไม่ส่งแบบประเมิน คุณจึงไม่สามารถให้ความเห็นได้)"); + } + + if(status_supervisor === "Y"){ + $("#btn01").hide(); + $("#btn02").hide(); + $("#btn03").hide(); + $("#btnb01").hide(); + $("#btnb02").hide(); + $("#btnb03").hide(); + $("#thestatus").text("(ผู้ประเมินสูงสุด ส่งแบบประเมินแล้ว)"); + $("#eva_create_evaluation_detail_review02_supervisor2_result").attr("disabled", true); + $("#eva_create_evaluation_detail_review02_supervisor2_date").attr("disabled", true); + $("#eva_create_evaluation_detail_review02_supervisor2_remark").attr("disabled", true); + } } - if(role_code === "4"){ - $("#eva_create_evaluation_detail_review04_supervisor2A_result").attr("disabled", false); - $("#eva_create_evaluation_detail_review04_supervisor2A_date").attr("disabled", false); - $("#eva_create_evaluation_detail_review04_supervisor2A_remark").attr("disabled", false); - $("#btnd01").show(); + else if(role_code === "3"){ // ความเห็น ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง + if(status_supervisor === "Y" && status_chief === "Y" && status_self === "Y"){ + $("#eva_create_evaluation_detail_review03_supervisor1A_result").attr("disabled", false); + $("#eva_create_evaluation_detail_review03_supervisor1A_date").attr("disabled", false); + $("#eva_create_evaluation_detail_review03_supervisor1A_remark").attr("disabled", false); + $("#btnc01").show(); + $("#btnc02").show(); + $("#btnc03").show(); + }else{ + $("#thestatus1A").text("(ผู้รับการประเมิน หรือ ผู้ประเมิน หรือ ผู้ประเมินสูงสุด ยังไม่ส่งแบบประเมิน คุณจึงไม่สามารถให้ความเห็นได้)"); + } + + if(status_supervisor1A === "Y"){ + $("#eva_create_evaluation_detail_review03_supervisor1A_result").attr("disabled", true); + $("#eva_create_evaluation_detail_review03_supervisor1A_date").attr("disabled", true); + $("#eva_create_evaluation_detail_review03_supervisor1A_remark").attr("disabled", true); + $("#btnc01").hide(); + $("#btnc02").hide(); + $("#btnc03").hide(); + $("#thestatus1A").text("(ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง ส่งแบบประเมินแล้ว)"); + } + } + + else if(role_code === "4"){ // ความเห็น ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด) + if(status_supervisor1A === "Y" && status_supervisor === "Y" && status_chief === "Y" && status_self === "Y"){ + $("#eva_create_evaluation_detail_review04_supervisor2A_result").attr("disabled", false); + $("#eva_create_evaluation_detail_review04_supervisor2A_date").attr("disabled", false); + $("#eva_create_evaluation_detail_review04_supervisor2A_remark").attr("disabled", false); + $("#btnd01").show(); + $("#btnd02").show(); + $("#btnd03").show(); + }else{ + $("#thestatus2A").text("(ผู้รับการประเมิน หรือ ผู้ประเมิน หรือ ผู้ประเมินสูงสุด หรือ ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง ยังไม่ส่งแบบประเมิน คุณจึงไม่สามารถให้ความเห็นได้)"); + } + if(status_supervisor2A === "Y"){ + $("#eva_create_evaluation_detail_review03_supervisor2A_result").attr("disabled", true); + $("#eva_create_evaluation_detail_review03_supervisor2A_date").attr("disabled", true); + $("#eva_create_evaluation_detail_review03_supervisor2A_remark").attr("disabled", true); + $("#btnd01").hide(); + $("#btnd02").hide(); + $("#btnd03").hide(); + $("#thestatus2A").text("(ผู้บังคับบัญชาการเหนือขึ้นไปอีกชั้นหนึ่ง (สูงสุด) ส่งแบบประเมินแล้ว)"); + } + } + else { + alert('คุณไม่มีสิทธิเข้าถึงหน้าจอนี้!'); + window_close(); } } diff --git a/wwwroot/js/eva_create_evaluation_detail_status/eva_create_evaluation_detail_status_d.js b/wwwroot/js/eva_create_evaluation_detail_status/eva_create_evaluation_detail_status_d.js index 3330ec2..ce94100 100644 --- a/wwwroot/js/eva_create_evaluation_detail_status/eva_create_evaluation_detail_status_d.js +++ b/wwwroot/js/eva_create_evaluation_detail_status/eva_create_evaluation_detail_status_d.js @@ -9,6 +9,8 @@ $("#eva_create_evaluation_detail_status_create_evaluation_id").val(data.create_e $("#eva_create_evaluation_detail_status_status_self").val(data.status_self); $("#eva_create_evaluation_detail_status_status_chief").val(data.status_chief); $("#eva_create_evaluation_detail_status_status_supervisor").val(data.status_supervisor); +$("#eva_create_evaluation_detail_status_status_supervisor1A").val(data.status_supervisor1A); +$("#eva_create_evaluation_detail_status_status_supervisor2A").val(data.status_supervisor2A); } @@ -19,6 +21,8 @@ eva_create_evaluation_detail_statusObject.create_evaluation_id = $("#eva_create_ eva_create_evaluation_detail_statusObject.status_self = $("#eva_create_evaluation_detail_status_status_self").val(); eva_create_evaluation_detail_statusObject.status_chief = $("#eva_create_evaluation_detail_status_status_chief").val(); eva_create_evaluation_detail_statusObject.status_supervisor = $("#eva_create_evaluation_detail_status_status_supervisor").val(); +eva_create_evaluation_detail_statusObject.status_supervisor1A = $("#eva_create_evaluation_detail_status_status_supervisor1A").val(); +eva_create_evaluation_detail_statusObject.status_supervisor2A = $("#eva_create_evaluation_detail_status_status_supervisor2A").val(); return eva_create_evaluation_detail_statusObject; @@ -80,6 +84,20 @@ function eva_create_evaluation_detail_status_PutUpdate(a) { data.status_supervisor = "N"; data.status_chief = "N"; } + else if(a == "next3"){ + data.status_supervisor1A = "Y"; + } + else if(a == "back3"){ + data.status_supervisor = "N"; + data.status_supervisor1A = "N"; + } + else if(a == "next4"){ + data.status_supervisor2A = "Y"; + } + else if(a == "back4"){ + data.status_supervisor1A = "N"; + data.status_supervisor2A = "N"; + } var successFunc1 = function (result) { AlertSuccess(result.code+" "+result.message); diff --git a/wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js b/wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js index ccc7037..45e88e5 100644 --- a/wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js +++ b/wwwroot/js/eva_evaluation_behavior_process2/eva_evaluation_behavior_process2_inline.js @@ -97,8 +97,8 @@ Oneva_evaluation_behavior_process2_scoreChange(); endLoad(); }; startLoad(); - AjaxGetRequest(apisite + "/api/eva_evaluation_behavior_process2", successFunc, AlertDanger); - //AjaxGetRequest(apisite + '/api/eva_evaluation_behavior_process2/GetListBycreate_evaluation_detail_id/' + a, successFunc, AlertDanger); + //AjaxGetRequest(apisite + "/api/eva_evaluation_behavior_process2", successFunc, AlertDanger); + AjaxGetRequest(apisite + '/api/eva_evaluation_behavior_process2?create_evaluation_detail_id=' + a, successFunc, AlertDanger); } @@ -148,7 +148,7 @@ function eva_evaluation_behavior_process2_Summary() { function eva_evaluation_behavior_process2_InitialForm(id) { var successFunc = function (result) { - eva_evaluation_behavior_process2_Get('', result); + eva_evaluation_behavior_process2_Get(id, result); endLoad(); }; startLoad();