From 9f106272c889990e93b70e4f3b9f97346e2c643c Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Wed, 28 Apr 2021 14:12:17 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=20op=20=E0=B8=AB=E0=B8=A5=E0=B8=B2=E0=B8=A2=E0=B8=82=E0=B9=89?= =?UTF-8?q?=E0=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Models/eva_self_review/eva_self_reviewService.cs | 16 +++++++++------- .../external_linkage/external_linkageService.cs | 2 +- Models/rep_eva01/rep_eva01Service.cs | 4 ++-- Models/rep_eva02/rep_eva02Service.cs | 4 ++-- Views/Shared/_Layout.cshtml | 6 +++--- wwwroot/js/coregen.js | 2 +- 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/Models/eva_self_review/eva_self_reviewService.cs b/Models/eva_self_review/eva_self_reviewService.cs index bda0fa8..24a744d 100644 --- a/Models/eva_self_review/eva_self_reviewService.cs +++ b/Models/eva_self_review/eva_self_reviewService.cs @@ -94,9 +94,9 @@ namespace TodoAPI2.Models select x.fiscal_year).Distinct().OrderBy(x => x.Value).ToList(); i.item_eva_year = fill_list_number((from x in _repository.Context.eva_adjust_postponement - select x.fiscal_year).Distinct().OrderBy(x => x.Value).ToList()); + select x.fiscal_year).Distinct().OrderByDescending(x => x.Value).ToList()); i.item_eva_no = fill_list_number((from x in _repository.Context.eva_adjust_postponement - select x.theRound).Distinct().OrderBy(x => x.Value).ToList()); + select x.theRound).Distinct().OrderByDescending(x => x.Value).ToList()); return i; } @@ -104,9 +104,9 @@ namespace TodoAPI2.Models { var i = new eva_self_reviewWithSelectionViewModel(); i.item_eva_year = fill_list_number((from x in _repository.Context.eva_adjust_postponement - select x.fiscal_year).Distinct().OrderBy(x => x.Value).ToList()); + select x.fiscal_year).Distinct().OrderByDescending(x => x.Value).ToList()); i.item_eva_no = fill_list_number((from x in _repository.Context.eva_adjust_postponement - select x.theRound).Distinct().OrderBy(x => x.Value).ToList()); + select x.theRound).Distinct().OrderByDescending(x => x.Value).ToList()); return i; @@ -147,14 +147,16 @@ namespace TodoAPI2.Models && (!model.eva_no.HasValue || fk_eva_adjust_postponementResult1.theRound == model.eva_no) && fk_eva_adjust_postponementResult1.fiscal_year.HasValue - orderby m_eva_self_review.created descending + orderby + (fk_eva_adjust_postponementResult1.fiscal_year.HasValue ? fk_eva_adjust_postponementResult1.fiscal_year : fk_eva_adjust_postponementResult2.fiscal_year) descending, + (fk_eva_adjust_postponementResult1.theRound.HasValue ? fk_eva_adjust_postponementResult1.theRound : fk_eva_adjust_postponementResult2.theRound) descending select new eva_self_reviewViewModel() { id = m_eva_self_review.id, adjust_postponement_id = m_eva_self_review.adjust_postponement_id, adjust_postponement_quota_id = m_eva_self_review.adjust_postponement_quota_id, employee_id = m_eva_self_review.employee_id, - eva_year = fk_eva_adjust_postponementResult1.fiscal_year.HasValue? fk_eva_adjust_postponementResult1.fiscal_year : fk_eva_adjust_postponementResult2.fiscal_year, + eva_year = (fk_eva_adjust_postponementResult1.fiscal_year.HasValue? fk_eva_adjust_postponementResult1.fiscal_year : fk_eva_adjust_postponementResult2.fiscal_year), eva_no = fk_eva_adjust_postponementResult1.theRound.HasValue? fk_eva_adjust_postponementResult1.theRound : fk_eva_adjust_postponementResult2.theRound, adjust_postponement_id_eva_adjust_postponement_fiscal_year = fk_eva_adjust_postponementResult1.fiscal_year.HasValue ? fk_eva_adjust_postponementResult1.fiscal_year : fk_eva_adjust_postponementResult2.fiscal_year, @@ -166,7 +168,7 @@ namespace TodoAPI2.Models Created = m_eva_self_review.created, Updated = m_eva_self_review.updated } - ).OrderBy(x => x.eva_year * 10 + x.eva_no).ToList(); + ).ToList(); return data; } diff --git a/Models/external_linkage/external_linkageService.cs b/Models/external_linkage/external_linkageService.cs index a9a2d94..8bf3020 100644 --- a/Models/external_linkage/external_linkageService.cs +++ b/Models/external_linkage/external_linkageService.cs @@ -440,7 +440,7 @@ namespace TodoAPI2.Models var i = new external_linkageViewModel(); i.external_id = Convert.ToInt32(dr["id"]); //i.id_guid = Guid.Parse(dr["id"].ToString()); - i.external_code = dr["theRound"].ToString(); + i.external_code = dr["fiscal_year"].ToString() + dr["theRound"].ToString(); i.external_name = dr["theRound"].ToString() + "/" + dr["fiscal_year"].ToString(); result.Add(i); } diff --git a/Models/rep_eva01/rep_eva01Service.cs b/Models/rep_eva01/rep_eva01Service.cs index 13588ee..898cd10 100644 --- a/Models/rep_eva01/rep_eva01Service.cs +++ b/Models/rep_eva01/rep_eva01Service.cs @@ -58,7 +58,7 @@ namespace TodoAPI2.Models var entity = _repository.Get(id); var i = Mapper.Map(entity); i.item_org_id = (from x in ext.GetSortingDep() select x).ToList(); - i.item_round_id = (from x in ext.GetEvaRound() select x).ToList(); + i.item_round_id = (from x in ext.GetEvaRound() orderby x.external_code descending select x).ToList(); return i; @@ -67,7 +67,7 @@ namespace TodoAPI2.Models { var i = new rep_eva01WithSelectionViewModel(); i.item_org_id = (from x in ext.GetSortingDep() select x).ToList(); - i.item_round_id = (from x in ext.GetEvaRound() select x).ToList(); + i.item_round_id = (from x in ext.GetEvaRound() orderby x.external_code descending select x).ToList(); return i; diff --git a/Models/rep_eva02/rep_eva02Service.cs b/Models/rep_eva02/rep_eva02Service.cs index c740a3e..544d7e6 100644 --- a/Models/rep_eva02/rep_eva02Service.cs +++ b/Models/rep_eva02/rep_eva02Service.cs @@ -58,7 +58,7 @@ namespace TodoAPI2.Models var entity = _repository.Get(id); var i = Mapper.Map(entity); i.item_org_id = (from x in ext.GetSortingDep() select x).ToList(); - i.item_round_id = (from x in ext.GetEvaRound() select x).ToList(); + i.item_round_id = (from x in ext.GetEvaRound() orderby x.external_code descending select x).ToList(); return i; @@ -67,7 +67,7 @@ namespace TodoAPI2.Models { var i = new rep_eva02WithSelectionViewModel(); i.item_org_id = (from x in ext.GetSortingDep() select x).ToList(); - i.item_round_id = (from x in ext.GetEvaRound() select x).ToList(); + i.item_round_id = (from x in ext.GetEvaRound() orderby x.external_code descending select x).ToList(); return i; diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml index 07806f3..43e2787 100644 --- a/Views/Shared/_Layout.cshtml +++ b/Views/Shared/_Layout.cshtml @@ -137,9 +137,9 @@ - ประวัติเงินเดือนและการเลื่อนเงินเดือน + ประวัติเงินเดือนและการเลื่อนเงินเดือน -
    +
      @@ -148,7 +148,7 @@
      - ออกจากระบบ + ออกจากระบบ diff --git a/wwwroot/js/coregen.js b/wwwroot/js/coregen.js index 4c8a420..01bb8c4 100644 --- a/wwwroot/js/coregen.js +++ b/wwwroot/js/coregen.js @@ -638,7 +638,7 @@ function GetMenu(module, mymenu, menu_url){ var tag = ''; if(typeof(data.submenu) === "undefined"){ tag = '
    • '; - tag += '
    • ·'+data.name+''; + tag += '
    • ·'+data.name+''; tag += '
      • '; }else{ tag = ''+data.name+'';