From a898de8ab2270a603b3a10472c195b6563a6c3bd Mon Sep 17 00:00:00 2001
From: "LAPTOP-KB8JC2K2\\acer" <nakorn@tonproject.com>
Date: Tue, 7 Sep 2021 13:36:29 +0700
Subject: [PATCH] =?UTF-8?q?-=20=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80?=
 =?UTF-8?q?=E0=B8=A1=E0=B8=B4=E0=B8=99=20:=20=E0=B9=80=E0=B8=A3=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=87=E0=B8=A5=E0=B8=B3=E0=B8=94=E0=B8=B1=E0=B8=9A?=
 =?UTF-8?q?=20-=20=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B9=80=E0=B8=A1=E0=B8=B4?=
 =?UTF-8?q?=E0=B8=99=20:=20=E0=B8=9A=E0=B8=B1=E0=B8=99=E0=B8=97=E0=B8=B6?=
 =?UTF-8?q?=E0=B8=81=E0=B9=81=E0=B8=A5=E0=B9=89=E0=B8=A7=E0=B9=80=E0=B8=A5?=
 =?UTF-8?q?=E0=B8=82=E0=B8=8B=E0=B9=89=E0=B8=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eva_create_evaluation_detail_processService.cs            | 4 +++-
 Models/eva_limit_frame_group/eva_limit_frame_groupService.cs  | 2 +-
 .../eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml  | 2 +-
 .../eva_create_evaluation_detail_process.js                   | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

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 18607d3..5712646 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
@@ -310,7 +310,9 @@ namespace TodoAPI2.Models
                 //fk_external_employee.department_code,
                 fk_external_employee.hpt_position_type_id,
                 fk_external_employee.hpl_position_level_id,
-                fk_external_employee.employee_no
+                fk_external_employee.employee_no,
+                fk_planResult.fiscal_year descending,
+                fk_planResult.theTime descending
                 select new eva_create_evaluation_detail_processViewModel()
                 {
                     id = m_eva_create_evaluation_detail_process.id,
diff --git a/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs b/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs
index 2476528..029ee07 100644
--- a/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs
+++ b/Models/eva_limit_frame_group/eva_limit_frame_groupService.cs
@@ -203,7 +203,7 @@ namespace TodoAPI2.Models
                 existingEntity.total_salary = model.total_salary;
                 existingEntity.total_salary_limit = model.total_salary_limit;
                 existingEntity.total_salary_limit_rounded = model.total_salary_limit_rounded;
-                existingEntity.remark = model.remark;
+                existingEntity.remark = "";
 
                 int j = 1;
                 foreach (var y in from z in _repository.Context.eva_limit_frame_employee where z.frame_group_guid == model.id orderby z.order_of_data select z)
diff --git a/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml b/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml
index 237b7b2..5362385 100644
--- a/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml
+++ b/Views/eva_limit_frame_groupView/eva_limit_frame_group_d.cshtml
@@ -152,7 +152,7 @@
                     <div class='row'>
                         <div class="form-group col-md-12">
                             <label id="lab_eva_limit_frame_group_remark" for="eva_limit_frame_group_remark">หมายเหตุ</label>
-                            <textarea class="form-control" rows="4" cols="50" id="eva_limit_frame_group_remark" iLabel="หมายเหตุ" iRequire="false" iGroup="eva_limit_frame_group"></textarea>
+                            <textarea disabled class="form-control" rows="4" cols="50" id="eva_limit_frame_group_remark" iLabel="หมายเหตุ" iRequire="false" iGroup="eva_limit_frame_group"></textarea>
                         </div>
                     </div>
 
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 794456c..5668881 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
@@ -179,6 +179,7 @@ var eva_create_evaluation_detail_processTableV;
 
 var eva_create_evaluation_detail_process_setupTable = function (result) {
     var groupColumn = 6;
+    console.log(result);
 
     tmp = '"';
     eva_create_evaluation_detail_processTableV = $('#eva_create_evaluation_detail_processTable').DataTable({