ปรับปรุงสิทธิการมองเห็นต่างๆ

2020-03-01 17:17:43 +07:00
parent c65c179e85
commit f8f46bb346
29 changed files with 448 additions and 696 deletions
--- 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
@@ -86,12 +86,14 @@ function eva_create_evaluation_detail_process_GoCreate() {
    //window_open(appsite + "/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d");
 }

-function eva_create_evaluation_detail_process_GoEdit(a) {
-    window_open(appsite + "/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d?id=" + a);
-}
-
-function eva_create_evaluation_detail_process_GoEdit2(a) {
-    window_open(appsite + "/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2?id=" + a);
+function eva_create_evaluation_detail_process_GoEdit(a, role_code) {
+    if(role_code=="1"){
+        window_open(appsite + "/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d?id=" + a);
+    }
+    else
+    {
+        window_open(appsite + "/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d2?id=" + a);
+    }    
 }

 function eva_create_evaluation_detail_process_SetEditForm(a) {
@@ -174,6 +176,8 @@ function eva_create_evaluation_detail_process_GoDelete(a) {
 var eva_create_evaluation_detail_processTableV;

 var eva_create_evaluation_detail_process_setupTable = function (result) {
+    console.log(result);
+
 	tmp = '"';
    eva_create_evaluation_detail_processTableV = $('#eva_create_evaluation_detail_processTable').DataTable({
        "processing": true,
@@ -188,7 +192,9 @@ var eva_create_evaluation_detail_process_setupTable = function (result) {
 { "data": "employee_position" },
 { "data": "employee_position_level" },
 { "data": "org_id_external_linkage_external_name" },
+{ "data": "role_desc" },
                { "data": "id" },
+ { "data": "id" },
 { "data": "id" },      
        ],
        "columnDefs": [
@@ -196,22 +202,28 @@ var eva_create_evaluation_detail_process_setupTable = function (result) {
                "targets": 0,
                "data": "id",
                "render": function (data, type, row, meta) {
-                    return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_create_evaluation_detail_process_GoEdit(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button>  "
-+"<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_create_evaluation_detail_process_GoEdit2(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button>  ";
+                    return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_create_evaluation_detail_process_GoEdit(" + tmp + data + tmp + "," + tmp + row["role_code"] + tmp + ")'><i class='fa fa-pencil'></i></button>  ";
                }
            },
-{
+            {
                "targets": -1,
-                "data": "id",
+                "data": "status_supervisor",
                "render": function (data, type, row, meta) {
-                    return "";
+                    return row["status_supervisor"];
                }
            },
-{
+            {
                "targets": -2,
-                "data": "id",
+                "data": "status_chief",
                "render": function (data, type, row, meta) {
-                    return "";
+                    return row["status_chief"];
+                }
+            },
+            {
+                "targets": -3,
+                "data": "status_self",
+                "render": function (data, type, row, meta) {
+                    return row["status_self"];
                }
            }],
        "language": {
--- 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
@@ -75,6 +75,7 @@ eva_create_evaluation_detail_processObject.search_employee_fullname = $("#eva_cr
 function eva_create_evaluation_detail_process_InitialForm() {
    var successFunc = function (result) {
        eva_create_evaluation_detail_process_FeedDataToForm(result);
+
 		endLoad();
    };
 	startLoad();
@@ -86,7 +87,8 @@ function eva_create_evaluation_detail_process_InitialForm() {
 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);
+        eva_create_evaluation_detail_process_FeedDataToForm(result);        
+        setPageByRoleAndStatus(result.role_code, result.status_self, result.status_chief, result.status_supervisor);
 		endLoad();
    };
 	startLoad();
@@ -147,6 +149,19 @@ function eva_create_evaluation_detail_process_GoDelete(a) {



-//================= Multi-Selection Function =========================================
+//================= 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);
+    }
+}

--- 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,6 +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);
 		endLoad();
    };
 	startLoad();
@@ -146,6 +147,44 @@ function eva_create_evaluation_detail_process_GoDelete(a) {



-//================= Multi-Selection Function =========================================
+//================= 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);
+    }
+
+    $("#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();
+
+    $("#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();
+
+    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 === "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();
+    }
+}

--- 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
@@ -63,7 +63,10 @@ function eva_create_evaluation_detail_status_PutUpdate(a) {
    }
    var data = eva_create_evaluation_detail_status_GetFromForm();

-    if(a == "next1"){
+    if(a == "next0"){
+        data.status_self = "Y";
+    }
+    else if(a == "next1"){
        data.status_chief = "Y";
    }
    else if(a == "back1"){
--- a/wwwroot/js/eva_promoted_percentage/eva_promoted_percentage.js
+++ b/wwwroot/js/eva_promoted_percentage/eva_promoted_percentage.js
@@ -165,8 +165,8 @@ var eva_promoted_percentage_setupTable = function (result) {
                { "data": "code" },
                { "data": "detail" },
                { "data": "promoted_percentage" },
-                { "data": "max_score" },
-                { "data": "min_score" },            
+                { "data": "min_score" },     
+                { "data": "max_score" },                       
        ],
        "columnDefs": [
            {