From 56e8bb1446ea6bd17c0cba0ab7419b53e35a5336 Mon Sep 17 00:00:00 2001
From: "LAPTOP-KB8JC2K2\\acer" <nakorn@tonproject.com>
Date: Thu, 25 Mar 2021 17:21:06 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=9B=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B8=AB?=
 =?UTF-8?q?=E0=B8=99=E0=B9=89=E0=B8=B2=E0=B8=88=E0=B8=AD=20=E0=B9=80?=
 =?UTF-8?q?=E0=B8=9E=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B9=83=E0=B8=AB=E0=B9=89?=
 =?UTF-8?q?=20SA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eva_adjust_postponement_detail_migrationService.cs         | 2 +-
 .../eva_adjust_postponement_migration_d.cshtml                 | 1 +
 .../eva_adjust_postponement_detail_migration.js                | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationService.cs b/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationService.cs
index ede1669..5b03e72 100644
--- a/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationService.cs
+++ b/Models/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migrationService.cs
@@ -127,7 +127,7 @@ namespace TodoAPI2.Models
                 || (model.adjust_postponement_quota_id.HasValue && m_eva_adjust_postponement_detail_migration.adjust_postponement_quota_id == model.adjust_postponement_quota_id)
 
 
-                orderby m_eva_adjust_postponement_detail_migration.created descending
+                orderby m_eva_adjust_postponement_detail_migration.order_at_this_time 
                 select new eva_adjust_postponement_detail_migrationViewModel()
                 {
                     id = m_eva_adjust_postponement_detail_migration.id,
diff --git a/Views/eva_adjust_postponement_migrationView/eva_adjust_postponement_migration_d.cshtml b/Views/eva_adjust_postponement_migrationView/eva_adjust_postponement_migration_d.cshtml
index 7958c9f..f1c25e9 100644
--- a/Views/eva_adjust_postponement_migrationView/eva_adjust_postponement_migration_d.cshtml
+++ b/Views/eva_adjust_postponement_migrationView/eva_adjust_postponement_migration_d.cshtml
@@ -148,6 +148,7 @@
             <tr>
                 <!--<th>เลือก</th>-->
                 <th>เครื่องมือ</th>
+                <th><label id='h_eva_adjust_postponement_detail_migration_order_at_this_time'>ลำดับ</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_migration_employee_id'>ผู้รับการประเมิน</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_migration_sarary'>เงินเดือน ก่อนปรับเลื่อน</label></th>
                 <th><label id='h_eva_adjust_postponement_detail_migration_cost_living'>ค่าครองชีพ ก่อนปรับเลื่อน</label></th>
diff --git a/wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js b/wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js
index 1c9da8e..3cf8656 100644
--- a/wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js
+++ b/wwwroot/js/eva_adjust_postponement_detail_migration/eva_adjust_postponement_detail_migration.js
@@ -197,6 +197,7 @@ var eva_adjust_postponement_detail_migration_setupTable = function (result) {
         "columns": [
             //{ "data": "" },
             { "data": "id" },
+            { "data": "order_at_this_time" },
             { "data": "employee_id_external_linkage_external_name" },
             { "data": "sarary" },
             { "data": "cost_living" },
@@ -233,7 +234,7 @@ var eva_adjust_postponement_detail_migration_setupTable = function (result) {
         "language": {
             "url": appsite + "/DataTables-1.10.16/thai.json"
         },
-        "paging": true,
+        "paging": false,
         "searching": false
     });
     endLoad();