แก้ไข Change OP 2558

Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement.cshtml

@@ -66,6 +66,8 @@
                 <th><label>สถานะทำแบบประเมิน<br />(ผู้ประเมิน)</label></th>
                 <th><label>สถานะทำแบบประเมิน<br />(ผู้ประเมินสูงสุด)</label></th>
 
+                <th><label>Action</label></th>
+
             </tr>
         </thead>
         <tbody></tbody>

wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement.js

@@ -94,6 +94,10 @@ function eva_create_evaluation_detail_agreement_GoEdit(a) {
     window_open(appsite + "/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d?id=" + a);
 }
 
+function eva_create_evaluation_detail_agreement_GoSelfReview(a) {
+    window_open(appsite + "/eva_create_evaluation_detail_processView/eva_create_evaluation_detail_process_d?id=" + a);
+}
+
 function eva_create_evaluation_detail_agreement_SetEditForm(a) {
     var successFunc = function (result) {
         eva_create_evaluation_detail_agreement_editMode = "UPDATE";
@@ -193,6 +197,8 @@ console.log(result);
                 { "data": "status_chief" },
 { "data": "status_supervisor" },
 
+{ "data": "id" }
+                    
         ],
         "columnDefs": [
             {
@@ -201,6 +207,16 @@ console.log(result);
                 "render": function (data, type, row, meta) {
                     return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_create_evaluation_detail_agreement_GoEdit(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> ";
                 }
+            },
+            {
+                "targets": -1,
+                "data": "id",
+                "render": function (data, type, row, meta) {
+if(row.status_chief === "Y"){
+    return "<button type='button' class='btn btn-warning btn-sm' onclick='javascript:eva_create_evaluation_detail_agreement_GoSelfReview(" + tmp + data + tmp + ")'><i class='fa fa-pencil'></i></button> ";
+}
+                    
+                }
             }],
         "language": {
             "url": appsite + "/DataTables-1.10.16/thai.json"

wwwroot/js/eva_create_evaluation_detail_process/eva_create_evaluation_detail_process_d.js

@@ -190,8 +190,9 @@ function setPageByRoleAndStatus(role_code, status_self, status_chief, status_sup
             $("#eva_create_evaluation_detail_review01_supervisor1_remark").attr("disabled", true);
         }   
     }else{
-        alert('คุณไม่มีสิทธิเข้าถึงหน้าจอนี้!');
+        console.log(role_code);
-        window_close();
+        //alert('คุณไม่มีสิทธิเข้าถึงหน้าจอนี้!');
+        //window_close();
     }
 }