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 @@ เครื่องมือ + 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();