From 717af2bf38da1ba2f3d9e7868c87238ed772c4fb Mon Sep 17 00:00:00 2001
From: Nakorn Rientrakrunchai <nakorn@tonproject.com>
Date: Sun, 6 Sep 2020 12:21:46 +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=E0=B8=95=E0=B8=B2=E0=B8=A1=20op?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eva_create_evaluation_detail_agreement_d.cshtml    |  8 ++++----
 .../eva_create_evaluation_detail_process_d.cshtml      |  6 ++----
 .../eva_create_evaluation_detail_process_d2.cshtml     | 10 ++++------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml
index d3c2669..57a7f46 100644
--- a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml
+++ b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement_d.cshtml
@@ -59,7 +59,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">ยกเลิก</button>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">ปิด</button>
                 <button type="button" class="btn btn-primary" onclick="javascript:eva_evaluation_behavior_PutUpdate()">บันทึก</button>
             </div>
         </div>
@@ -136,7 +136,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">ยกเลิก</button>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">ปิด</button>
                 <button type="button" class="btn btn-primary" onclick="javascript:eva_evaluation_achievement_PutUpdate()">บันทึก</button>
             </div>
         </div>
@@ -187,7 +187,7 @@
                 </div>
             </div>
             <div class="modal-footer">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">ยกเลิก</button>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">ปิด</button>
                 <button type="button" class="btn btn-primary" onclick="javascript:eva_idp_plan_owner_PutUpdate()">บันทึก</button>
             </div>
         </div>
@@ -376,7 +376,7 @@
         <div class="form-group col-md-12">
             <button type="button" class="btn btn-submit status_self" onclick="javascript:eva_create_evaluation_detail_status_PutUpdate('next0')">ส่งข้อตกลงการประเมิน</button>
             <button type="button" class="btn btn-submit status_self" onclick="javascript:alert('บันทึกเรียบร้อย')">บันทึก</button>
-            <button type="button" class="btn btn-danger" onclick="javascript:window_close()">ยกเลิก</button>
+            <button type="button" class="btn btn-danger" onclick="javascript:window_close()">กลับ</button>
         </div>
     </div>
 
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 6bc65f1..3460ffb 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
@@ -107,8 +107,8 @@
                             <td colspan="2">ลากิจ</td>
                             <td rowspan="2">ลาพักผ่อน</td>
                             <td rowspan="2">ขอกลับ<br/>ก่อนเวลา</td>
-                            <td>สาย</td>
-                            <td>ขาด</td>
+                            <td rowspan="2" width="10%">สาย</td>
+                            <td rowspan="2" width="10%">ขาด</td>
                             <td colspan="2">รวม (ป่วย/กิจ)</td>
                         </tr>
                         <tr>
@@ -116,8 +116,6 @@
                             <td width="10%">ครั้ง</td>
                             <td width="10%">วัน</td>
                             <td width="10%">ครั้ง</td>
-                            <td width="10%">สาย</td>
-                            <td width="10%">ขาด</td>
                             <td width="10%">วัน</td>
                             <td width="10%">ครั้ง</td>
                         </tr>
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 f9a8bd7..e27c449 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
@@ -48,7 +48,7 @@
                 </div>
             </div>
             <div class="modal-footer" style="display:none;">
-                <button type="button" class="btn btn-secondary" data-dismiss="modal">ยกเลิก</button>
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">กลับ</button>
                 <button type="button" class="btn btn-primary" onclick="javascript:eva_idp_plan_PutUpdate()">บันทึก</button>
             </div>
         </div>
@@ -156,9 +156,9 @@
                             <td colspan="2">ลาป่วย</td>
                             <td colspan="2">ลากิจ</td>
                             <td rowspan="2">ลาพักผ่อน</td>
-                            <td rowspan="2">ขอกลับ<br/>ก่อนเวลา</td>
-                            <td>สาย</td>
-                            <td>ขาด</td>
+                            <td rowspan="2">ขอกลับ<br />ก่อนเวลา</td>
+                            <td rowspan="2" width="10%">สาย</td>
+                            <td rowspan="2" width="10%">ขาด</td>
                             <td colspan="2">รวม (ป่วย/กิจ)</td>
                         </tr>
                         <tr>
@@ -166,8 +166,6 @@
                             <td width="10%">ครั้ง</td>
                             <td width="10%">วัน</td>
                             <td width="10%">ครั้ง</td>
-                            <td width="10%">สาย</td>
-                            <td width="10%">ขาด</td>
                             <td width="10%">วัน</td>
                             <td width="10%">ครั้ง</td>
                         </tr>