From dacfe151cfff3ec7de5f0789053c1afea869099f Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Thu, 16 Sep 2021 11:52:23 +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=E0=B8=97?= =?UTF-8?q?=E0=B8=B5=E0=B9=88=E0=B9=84=E0=B8=94=E0=B9=89=E0=B8=A3=E0=B8=B1?= =?UTF-8?q?=E0=B8=9A=E0=B9=81=E0=B8=88=E0=B9=89=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...onement@eva_adjust_postponement_quota.xlsx | Bin 10589 -> 10915 bytes ...va_create_evaluation_detail_agreement.xlsx | Bin 11037 -> 11047 bytes ...eva_adjust_postponement_quotaInputModel.cs | 4 ++ ...va_adjust_postponement_quotaSearchModel.cs | 3 ++ .../eva_adjust_postponement_quotaService.cs | 17 ++++++++ ...ostponement_quotaWithSelectionViewModel.cs | 3 +- ...e_evaluation_detail_agreementInputModel.cs | 2 + ..._evaluation_detail_agreementSearchModel.cs | 2 + ...eate_evaluation_detail_agreementService.cs | 39 ++++++++++++++++++ ...te_evaluation_detail_agreementViewModel.cs | 2 + ..._detail_agreementWithSelectionViewModel.cs | 2 +- .../eva_adjust_postponement_normal.cshtml | 2 +- .../eva_adjust_postponement_quota.cshtml | 14 ++++++- ..._create_evaluation_detail_agreement.cshtml | 11 +++-- .../eva_adjust_postponement_quota.js | 5 +++ .../eva_create_evaluation_detail_agreement.js | 3 ++ 16 files changed, 100 insertions(+), 9 deletions(-) diff --git a/EXCEL/eva_adjust_postponement@eva_adjust_postponement_quota.xlsx b/EXCEL/eva_adjust_postponement@eva_adjust_postponement_quota.xlsx index d4412c0834ce3942064c95063c7d16b295d23002..36a6d5d5afec354ff40567c210b7187bbbae5b38 100644 GIT binary patch delta 4899 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 OXh}W}umkTu-v0uy^WkRz delta 4524 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 Hzfb=Iw!U6+ diff --git a/EXCEL/eva_create_evaluation_detail@eva_create_evaluation_detail_agreement.xlsx b/EXCEL/eva_create_evaluation_detail@eva_create_evaluation_detail_agreement.xlsx index 304c55fb28190080b6e433ba8f8d35221f092727..e41a31e9b308cb904a80055f86339db5dc6531aa 100644 GIT binary patch delta 5147 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 delta 5145 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 adjust_postponement_detail_quota_02_model; diff --git a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaSearchModel.cs b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaSearchModel.cs index 6e148cc..0ec17d2 100644 --- a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaSearchModel.cs +++ b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaSearchModel.cs @@ -20,6 +20,9 @@ namespace TodoAPI2.Models public int? theRound { get; set; } + public int? fiscal_year_search { get; set; } + + public int? theRound_search { get; set; } } } diff --git a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs index 148f28e..3a64728 100644 --- a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs +++ b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaService.cs @@ -77,6 +77,13 @@ namespace TodoAPI2.Models var all_emp = emp.GetListByemployee_type(null, null); i.item_managed_by = all_emp.ToList(); + i.item_fiscal_year_search = (from x in _repository.Context.eva_adjust_postponement + select new external_linkageViewModel { external_id = x.fiscal_year, external_name = x.fiscal_year.ToString() } + ).Distinct().OrderByDescending(x => x.external_id).ToList(); + i.item_theRound_search = (from x in _repository.Context.eva_adjust_postponement + select new external_linkageViewModel { external_id = x.theRound, external_name = x.theRound.ToString() } + ).Distinct().OrderByDescending(x => x.external_id).ToList(); + return i; } public eva_adjust_postponement_quotaWithSelectionViewModel GetBlankItem() @@ -85,6 +92,13 @@ namespace TodoAPI2.Models var all_emp = emp.GetListByemployee_type(null, null); i.item_managed_by = all_emp.ToList(); + i.item_fiscal_year_search = (from x in _repository.Context.eva_adjust_postponement + select new external_linkageViewModel { external_id = x.fiscal_year, external_name = x.fiscal_year.ToString() } + ).Distinct().OrderByDescending(x => x.external_id).ToList(); + i.item_theRound_search = (from x in _repository.Context.eva_adjust_postponement + select new external_linkageViewModel { external_id = x.theRound, external_name = x.theRound.ToString() } + ).Distinct().OrderByDescending(x => x.external_id).ToList(); + return i; } @@ -112,6 +126,9 @@ namespace TodoAPI2.Models && (m_eva_adjust_postponement_quota.theRound == model.theRound || !model.theRound.HasValue) && !m_eva_adjust_postponement_quota.create_evaluation_id.HasValue + && (!model.fiscal_year_search.HasValue || m_eva_adjust_postponement_quota.fiscal_year == model.fiscal_year_search) + && (!model.theRound_search.HasValue || m_eva_adjust_postponement_quota.theRound == model.theRound_search) + orderby m_eva_adjust_postponement_quota.created descending select new eva_adjust_postponement_quotaViewModel() { diff --git a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaWithSelectionViewModel.cs b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaWithSelectionViewModel.cs index 877e400..97c4e84 100644 --- a/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaWithSelectionViewModel.cs +++ b/Models/eva_adjust_postponement_quota/eva_adjust_postponement_quotaWithSelectionViewModel.cs @@ -8,6 +8,7 @@ namespace TodoAPI2.Models public class eva_adjust_postponement_quotaWithSelectionViewModel: eva_adjust_postponement_quotaViewModel { public List item_managed_by { get; set; } - + public List item_fiscal_year_search { get; set; } + public List item_theRound_search { get; set; } } } \ No newline at end of file diff --git a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementInputModel.cs b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementInputModel.cs index 8e3f88b..088134f 100644 --- a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementInputModel.cs +++ b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementInputModel.cs @@ -42,6 +42,8 @@ namespace TodoAPI2.Models public string search_employee_fullname { get; set; } + public string evaluation_round_search { get; set; } + public string active_mode { get; set; } } } diff --git a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementSearchModel.cs b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementSearchModel.cs index 1817ca5..223722d 100644 --- a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementSearchModel.cs +++ b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementSearchModel.cs @@ -22,6 +22,8 @@ namespace TodoAPI2.Models public string search_employee_fullname { get; set; } + public string evaluation_round_search { get; set; } + } } diff --git a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementService.cs b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementService.cs index b74ad13..17d488b 100644 --- a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementService.cs +++ b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementService.cs @@ -145,8 +145,22 @@ namespace TodoAPI2.Models { var item = Get(id); var i = item; + + var option_1 = new external_linkageViewModel(); + option_1.id_guid = Guid.Empty; + option_1.external_name = "ทั้งหมด"; + var option_all = new List(); + option_all.Add(option_1); + i.item_org_id = ext.GetDepartmentData(); + var allround = (from y in _repository.Context.eva_create_evaluation + select y.performance_plan_id).ToList(); + i.item_evaluation_round_search = option_all.Union((from x in _repository.Context.eva_performance_plan + where allround.Contains(x.id) + orderby x.fiscal_year descending, x.theTime descending + select new external_linkageViewModel { id_guid = x.id, external_name = checkNull(x.theTime) + "/" + checkNull(x.fiscal_year) } + )).ToList(); return i; } @@ -155,6 +169,19 @@ namespace TodoAPI2.Models var i = new eva_create_evaluation_detail_agreementWithSelectionViewModel(); i.item_org_id = ext.GetDepartmentData(); + var option_1 = new external_linkageViewModel(); + option_1.id_guid = Guid.Empty; + option_1.external_name = "ทั้งหมด"; + var option_all = new List(); + option_all.Add(option_1); + + var allround = (from y in _repository.Context.eva_create_evaluation + select y.performance_plan_id).ToList(); + i.item_evaluation_round_search = option_all.Union((from x in _repository.Context.eva_performance_plan + where allround.Contains(x.id) + orderby x.fiscal_year descending, x.theTime descending + select new external_linkageViewModel { id_guid = x.id, external_name = checkNull(x.theTime) + "/" + checkNull(x.fiscal_year) } + )).ToList(); return i; } @@ -168,6 +195,17 @@ namespace TodoAPI2.Models public List GetListBySearch(eva_create_evaluation_detail_agreementSearchModel model, int? emp_id) { + if (string.IsNullOrEmpty(model.evaluation_round_search)) + { + model.evaluation_round_search = (from x in _repository.Context.eva_performance_plan + orderby x.fiscal_year descending, x.theTime descending + select new external_linkageViewModel { id_guid = x.id, external_name = checkNull(x.theTime) + "/" + checkNull(x.fiscal_year) } + ).FirstOrDefault().id_guid.ToString(); + } + else if (Guid.Parse(model.evaluation_round_search) == Guid.Empty) + { + model.evaluation_round_search = null; + } var allemp = emp.GetListByemployee_type(null, null); @@ -196,6 +234,7 @@ namespace TodoAPI2.Models && (fk_external_employee.employee_no == model.search_employee_code || string.IsNullOrEmpty(model.search_employee_code)) && (fk_external_employee.fullname.Contains(model.search_employee_fullname) || string.IsNullOrEmpty(model.search_employee_fullname)) && m_eva_create_evaluation_detail_agreement.employee_id == emp_id + && (string.IsNullOrEmpty(model.evaluation_round_search) || fk_planResult.id == Guid.Parse(model.evaluation_round_search)) orderby m_eva_create_evaluation_detail_agreement.created descending select new eva_create_evaluation_detail_agreementViewModel() diff --git a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementViewModel.cs b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementViewModel.cs index b53171c..81a8400 100644 --- a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementViewModel.cs +++ b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementViewModel.cs @@ -89,6 +89,8 @@ namespace TodoAPI2.Models return ""; } + public string evaluation_round_search { get; set; } + } } diff --git a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementWithSelectionViewModel.cs b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementWithSelectionViewModel.cs index 769d172..1e2c790 100644 --- a/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementWithSelectionViewModel.cs +++ b/Models/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreementWithSelectionViewModel.cs @@ -8,6 +8,6 @@ namespace TodoAPI2.Models public class eva_create_evaluation_detail_agreementWithSelectionViewModel: eva_create_evaluation_detail_agreementViewModel { public List item_org_id { get; set; } - + public List item_evaluation_round_search { get; set; } } } \ No newline at end of file diff --git a/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal.cshtml b/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal.cshtml index 2cd05d9..86d2bea 100644 --- a/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal.cshtml +++ b/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal.cshtml @@ -94,7 +94,7 @@ -
+ diff --git a/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota.cshtml b/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota.cshtml index 5d68f09..9e4adc6 100644 --- a/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota.cshtml +++ b/Views/eva_adjust_postponement_quotaView/eva_adjust_postponement_quota.cshtml @@ -82,16 +82,26 @@
-
+ -
+ +
+ + +
+ +
+ + +
+

diff --git a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement.cshtml b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement.cshtml index ad6b317..5e839c1 100644 --- a/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement.cshtml +++ b/Views/eva_create_evaluation_detail_agreementView/eva_create_evaluation_detail_agreement.cshtml @@ -28,19 +28,22 @@
- -
+ + +
+ + -
+ -
+ diff --git a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota.js b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota.js index fa31195..e8fb8a4 100644 --- a/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota.js +++ b/wwwroot/js/eva_adjust_postponement_quota/eva_adjust_postponement_quota.js @@ -7,6 +7,8 @@ function eva_adjust_postponement_quota_GetSearchParameter() { var eva_adjust_postponement_quotaSearchObject = new Object(); eva_adjust_postponement_quotaSearchObject.fiscal_year = $("#s_eva_adjust_postponement_quota_fiscal_year").val(); eva_adjust_postponement_quotaSearchObject.theRound = $("#s_eva_adjust_postponement_quota_theRound").val(); + eva_adjust_postponement_quotaSearchObject.fiscal_year_search = $("#s_eva_adjust_postponement_quota_fiscal_year_search").val(); + eva_adjust_postponement_quotaSearchObject.theRound_search = $("#s_eva_adjust_postponement_quota_theRound_search").val(); return eva_adjust_postponement_quotaSearchObject; } @@ -15,6 +17,9 @@ function eva_adjust_postponement_quota_FeedDataToSearchForm(data) { $("#s_eva_adjust_postponement_quota_fiscal_year").val(data.fiscal_year); $("#s_eva_adjust_postponement_quota_theRound").val(data.theRound); + DropDownClearFormAndFeedWithData($("#s_eva_adjust_postponement_quota_fiscal_year_search"), data, "external_id", "external_name", "item_fiscal_year_search", data.fiscal_year_search); + DropDownClearFormAndFeedWithData($("#s_eva_adjust_postponement_quota_theRound_search"), data, "external_id", "external_name", "item_theRound_search", data.theRound_search); + } //================= Form Data Customizaiton ========================================= diff --git a/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement.js b/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement.js index 7c7e298..7fb877d 100644 --- a/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement.js +++ b/wwwroot/js/eva_create_evaluation_detail_agreement/eva_create_evaluation_detail_agreement.js @@ -9,6 +9,8 @@ function eva_create_evaluation_detail_agreement_GetSearchParameter() { eva_create_evaluation_detail_agreementSearchObject.org_id = $("#s_eva_create_evaluation_detail_agreement_org_id").val(); eva_create_evaluation_detail_agreementSearchObject.search_employee_code = $("#s_eva_create_evaluation_detail_agreement_search_employee_code").val(); eva_create_evaluation_detail_agreementSearchObject.search_employee_fullname = $("#s_eva_create_evaluation_detail_agreement_search_employee_fullname").val(); + eva_create_evaluation_detail_agreementSearchObject.evaluation_round_search = $("#s_eva_create_evaluation_detail_agreement_evaluation_round_search").val(); + return eva_create_evaluation_detail_agreementSearchObject; } @@ -18,6 +20,7 @@ function eva_create_evaluation_detail_agreement_FeedDataToSearchForm(data) { DropDownClearFormAndFeedWithData($("#s_eva_create_evaluation_detail_agreement_org_id"), data, "id", "external_name", "item_org_id", data.org_id); $("#s_eva_create_evaluation_detail_agreement_search_employee_code").val(data.search_employee_code); $("#s_eva_create_evaluation_detail_agreement_search_employee_fullname").val(data.search_employee_fullname); + DropDownClearFormAndFeedWithData($("#s_eva_create_evaluation_detail_agreement_evaluation_round_search"), data, "id_guid", "external_name", "item_evaluation_round_search", data.evaluation_round_search); }