From 3a00d8c0f4af69b19aa07dd242982b3d6ee5b11e Mon Sep 17 00:00:00 2001 From: "LAPTOP-KB8JC2K2\\acer" Date: Thu, 8 Jul 2021 14:29:02 +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=20=E0=B8=9B=E0=B8=A3=E0=B8=B1?= =?UTF-8?q?=E0=B8=9A=E0=B9=80=E0=B8=A5=E0=B8=B7=E0=B9=88=E0=B8=AD=E0=B8=99?= =?UTF-8?q?=20=E0=B8=84=E0=B9=88=E0=B8=B2=E0=B8=95=E0=B8=AD=E0=B8=9A?= =?UTF-8?q?=E0=B9=81=E0=B8=97=E0=B8=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nement@eva_adjust_postponement_normal.xlsx | Bin 10951 -> 10901 bytes .../eva_adjust_postponement_normalService.cs | 30 +++++ ...stponement_normalWithSelectionViewModel.cs | 1 + .../eva_adjust_postponement_normal.cshtml | 2 +- .../eva_adjust_postponement_normal.js | 117 +++++++++--------- 5 files changed, 90 insertions(+), 60 deletions(-) diff --git a/EXCEL/eva_adjust_postponement@eva_adjust_postponement_normal.xlsx b/EXCEL/eva_adjust_postponement@eva_adjust_postponement_normal.xlsx index 305e1cf8f6ffe39c047271df489fb171db07193b..104412c8a60f4fb31ece6dfa9c4f8ab33c9f68ef 100644 GIT binary patch delta 4965 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 TDDD3P6r-O&_=s(U{s#XGG~6Dh delta 4992 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 KLxSM{`|uxh`%HrX diff --git a/Models/eva_adjust_postponement_normal/eva_adjust_postponement_normalService.cs b/Models/eva_adjust_postponement_normal/eva_adjust_postponement_normalService.cs index eb783b5..41391f7 100644 --- a/Models/eva_adjust_postponement_normal/eva_adjust_postponement_normalService.cs +++ b/Models/eva_adjust_postponement_normal/eva_adjust_postponement_normalService.cs @@ -87,6 +87,26 @@ namespace TodoAPI2.Models i.item_managed_by = all_emp.ToList(); i.item_org_id = (from x in ext.GetDepartmentData() select x).ToList(); + var data_fiscal_year = (from f_y in _repository.Context.eva_adjust_postponement + group f_y by f_y.fiscal_year into new_group + orderby new_group.Key descending + select new + { + fiscal_year = new_group.Key + } + ).ToList(); + var result = new List(); + foreach (var x in data_fiscal_year) + { + result.Add(new external_linkageViewModel + { + external_id = x.fiscal_year, + external_code = x.fiscal_year.ToString(), + external_name = x.fiscal_year.ToString() + }); + } + + i.item_fiscal_year = result; return i; } @@ -104,6 +124,15 @@ namespace TodoAPI2.Models fiscal_year = new_group.Key } ).ToList(); + var result = new List(); + foreach(var x in data_fiscal_year) + { + result.Add(new external_linkageViewModel { + external_id = x.fiscal_year, + external_code = x.fiscal_year.ToString(), + external_name = x.fiscal_year.ToString() + }); + } var i = new eva_adjust_postponement_normalWithSelectionViewModel(); var temp = create.GetListBySearch(new eva_create_evaluationSearchModel()); @@ -112,6 +141,7 @@ namespace TodoAPI2.Models i.item_managed_by = all_emp.ToList(); i.item_org_id = (from x in ext.GetDepartmentData() select x).ToList(); + i.item_fiscal_year = result; return i; } diff --git a/Models/eva_adjust_postponement_normal/eva_adjust_postponement_normalWithSelectionViewModel.cs b/Models/eva_adjust_postponement_normal/eva_adjust_postponement_normalWithSelectionViewModel.cs index 5162a19..791b2f5 100644 --- a/Models/eva_adjust_postponement_normal/eva_adjust_postponement_normalWithSelectionViewModel.cs +++ b/Models/eva_adjust_postponement_normal/eva_adjust_postponement_normalWithSelectionViewModel.cs @@ -7,6 +7,7 @@ namespace TodoAPI2.Models { public class eva_adjust_postponement_normalWithSelectionViewModel: eva_adjust_postponement_normalViewModel { + public List item_fiscal_year { get; set; } public List item_create_evaluation_id { get; set; } public List item_managed_by { get; set; } public List item_org_id { get; set; } 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 6b6b529..2cd05d9 100644 --- a/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal.cshtml +++ b/Views/eva_adjust_postponement_normalView/eva_adjust_postponement_normal.cshtml @@ -86,7 +86,7 @@
- +
diff --git a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal.js b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal.js index b120e2d..90d1e45 100644 --- a/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal.js +++ b/wwwroot/js/eva_adjust_postponement_normal/eva_adjust_postponement_normal.js @@ -5,17 +5,17 @@ var eva_adjust_postponement_normal_API = "/api/eva_adjust_postponement_normal/"; function eva_adjust_postponement_normal_GetSearchParameter() { var eva_adjust_postponement_normalSearchObject = new Object(); -eva_adjust_postponement_normalSearchObject.fiscal_year = $("#s_eva_adjust_postponement_normal_fiscal_year").val(); -eva_adjust_postponement_normalSearchObject.theRound = $("#s_eva_adjust_postponement_normal_theRound").val(); -eva_adjust_postponement_normalSearchObject.org_id = $("#s_eva_adjust_postponement_normal_org_id").val(); + eva_adjust_postponement_normalSearchObject.fiscal_year = $("#s_eva_adjust_postponement_normal_fiscal_year").val(); + eva_adjust_postponement_normalSearchObject.theRound = $("#s_eva_adjust_postponement_normal_theRound").val(); + eva_adjust_postponement_normalSearchObject.org_id = $("#s_eva_adjust_postponement_normal_org_id").val(); return eva_adjust_postponement_normalSearchObject; } function eva_adjust_postponement_normal_FeedDataToSearchForm(data) { -$("#s_eva_adjust_postponement_normal_fiscal_year").val(data.fiscal_year); -$("#s_eva_adjust_postponement_normal_theRound").val(data.theRound); -DropDownClearFormAndFeedWithData($("#s_eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id); + DropDownClearFormAndFeedWithData($("#s_eva_adjust_postponement_normal_fiscal_year"), data, "id", "external_name", "item_fiscal_year", data.fiscal_year); + $("#s_eva_adjust_postponement_normal_theRound").val(data.theRound); + DropDownClearFormAndFeedWithData($("#s_eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id); } @@ -23,37 +23,37 @@ DropDownClearFormAndFeedWithData($("#s_eva_adjust_postponement_normal_org_id"), function eva_adjust_postponement_normal_FeedDataToForm(data) { -//console.log(data); + //console.log(data); -$("#eva_adjust_postponement_normal_id").val(data.id); -$("#eva_adjust_postponement_normal_fiscal_year").val(data.fiscal_year); -$("#eva_adjust_postponement_normal_theDate").val(formatDate(data.theDate)); -$("#eva_adjust_postponement_normal_theRound").val(data.theRound); -DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_create_evaluation_id"), data, "id", "description", "item_create_evaluation_id", data.create_evaluation_id); -$("#eva_adjust_postponement_normal_limit").val(data.limit); -$("#eva_adjust_postponement_normal_limit_frame").val(data.limit_frame); -// $("#eva_adjust_postponement_normal_limit_quota").val(data.limit_quota); -$("#eva_adjust_postponement_normal_limit_quota").maskMoney('mask',data.limit_quota); + $("#eva_adjust_postponement_normal_id").val(data.id); + $("#eva_adjust_postponement_normal_fiscal_year").val(data.fiscal_year); + $("#eva_adjust_postponement_normal_theDate").val(formatDate(data.theDate)); + $("#eva_adjust_postponement_normal_theRound").val(data.theRound); + DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_create_evaluation_id"), data, "id", "description", "item_create_evaluation_id", data.create_evaluation_id); + $("#eva_adjust_postponement_normal_limit").val(data.limit); + $("#eva_adjust_postponement_normal_limit_frame").val(data.limit_frame); + // $("#eva_adjust_postponement_normal_limit_quota").val(data.limit_quota); + $("#eva_adjust_postponement_normal_limit_quota").maskMoney('mask', data.limit_quota); -$("#eva_adjust_postponement_normal_percentage").val(data.percentage); -DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id")); -//DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id); + $("#eva_adjust_postponement_normal_percentage").val(data.percentage); + DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_managed_by"), data, "id", "fullname", "item_managed_by", getCookie("emp_id")); + //DropDownClearFormAndFeedWithData($("#eva_adjust_postponement_normal_org_id"), data, "id", "external_name", "item_org_id", data.org_id); } function eva_adjust_postponement_normal_GetFromForm() { var eva_adjust_postponement_normalObject = new Object(); -eva_adjust_postponement_normalObject.id = $("#eva_adjust_postponement_normal_id").val(); -eva_adjust_postponement_normalObject.fiscal_year = $("#eva_adjust_postponement_normal_fiscal_year").val(); -eva_adjust_postponement_normalObject.theDate = getDate($("#eva_adjust_postponement_normal_theDate").val()); -eva_adjust_postponement_normalObject.theRound = $("#eva_adjust_postponement_normal_theRound").val(); -eva_adjust_postponement_normalObject.create_evaluation_id = $("#eva_adjust_postponement_normal_create_evaluation_id").val(); -eva_adjust_postponement_normalObject.limit = $("#eva_adjust_postponement_normal_limit").val(); -eva_adjust_postponement_normalObject.limit_frame = $("#eva_adjust_postponement_normal_limit_frame").val(); -eva_adjust_postponement_normalObject.limit_quota = $("#eva_adjust_postponement_normal_limit_quota").val(); -eva_adjust_postponement_normalObject.percentage = $("#eva_adjust_postponement_normal_percentage").val(); -eva_adjust_postponement_normalObject.managed_by = $("#eva_adjust_postponement_normal_managed_by").val(); -//eva_adjust_postponement_normalObject.org_id = $("#eva_adjust_postponement_normal_org_id").val(); + eva_adjust_postponement_normalObject.id = $("#eva_adjust_postponement_normal_id").val(); + eva_adjust_postponement_normalObject.fiscal_year = $("#eva_adjust_postponement_normal_fiscal_year").val(); + eva_adjust_postponement_normalObject.theDate = getDate($("#eva_adjust_postponement_normal_theDate").val()); + eva_adjust_postponement_normalObject.theRound = $("#eva_adjust_postponement_normal_theRound").val(); + eva_adjust_postponement_normalObject.create_evaluation_id = $("#eva_adjust_postponement_normal_create_evaluation_id").val(); + eva_adjust_postponement_normalObject.limit = $("#eva_adjust_postponement_normal_limit").val(); + eva_adjust_postponement_normalObject.limit_frame = $("#eva_adjust_postponement_normal_limit_frame").val(); + eva_adjust_postponement_normalObject.limit_quota = $("#eva_adjust_postponement_normal_limit_quota").val(); + eva_adjust_postponement_normalObject.percentage = $("#eva_adjust_postponement_normal_percentage").val(); + eva_adjust_postponement_normalObject.managed_by = $("#eva_adjust_postponement_normal_managed_by").val(); + //eva_adjust_postponement_normalObject.org_id = $("#eva_adjust_postponement_normal_org_id").val(); return eva_adjust_postponement_normalObject; @@ -62,14 +62,14 @@ eva_adjust_postponement_normalObject.managed_by = $("#eva_adjust_postponement_no function eva_adjust_postponement_normal_InitialForm(s) { var successFunc = function (result) { eva_adjust_postponement_normal_FeedDataToForm(result); - eva_adjust_postponement_normal_FeedDataToSearchForm(result); + eva_adjust_postponement_normal_FeedDataToSearchForm(result); if (s) { // Incase model popup $("#eva_adjust_postponement_normalModel").modal("show"); } - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxGetRequest(apisite + eva_adjust_postponement_normal_API + "GetBlankItem", successFunc, AlertDanger); } @@ -96,15 +96,15 @@ function eva_adjust_postponement_normal_SetEditForm(a) { eva_adjust_postponement_normal_editMode = "UPDATE"; eva_adjust_postponement_normal_FeedDataToForm(result); $("#eva_adjust_postponement_normalModel").modal("show"); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxGetRequest(apisite + eva_adjust_postponement_normal_API + a, successFunc, AlertDanger); } function eva_adjust_postponement_normal_SetCreateForm(s) { eva_adjust_postponement_normal_editMode = "CREATE"; - eva_adjust_postponement_normal_InitialForm(s); + eva_adjust_postponement_normal_InitialForm(s); } function eva_adjust_postponement_normal_RefreshTable() { @@ -122,8 +122,7 @@ var eva_adjust_postponement_normal_customValidation = function (group) { }; function eva_adjust_postponement_normal_PutUpdate() { - if (!ValidateForm('eva_adjust_postponement_normal', eva_adjust_postponement_normal_customValidation)) - { + if (!ValidateForm('eva_adjust_postponement_normal', eva_adjust_postponement_normal_customValidation)) { return; } @@ -135,9 +134,9 @@ function eva_adjust_postponement_normal_PutUpdate() { $("#eva_adjust_postponement_normalModel").modal("hide"); AlertSuccess(result.message); eva_adjust_postponement_normal_RefreshTable(); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxPutRequest(apisite + eva_adjust_postponement_normal_API + data.id, data, successFunc1, AlertDanger); } // Create mode @@ -146,9 +145,9 @@ function eva_adjust_postponement_normal_PutUpdate() { $("#eva_adjust_postponement_normalModel").modal("hide"); AlertSuccess(result.message); eva_adjust_postponement_normal_RefreshTable(); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxPostRequest(apisite + eva_adjust_postponement_normal_API, data, successFunc2, AlertDanger); } } @@ -159,9 +158,9 @@ function eva_adjust_postponement_normal_GoDelete(a) { $("#eva_adjust_postponement_normalModel").modal("hide"); AlertSuccess(result.message); eva_adjust_postponement_normal_RefreshTable(); - endLoad(); + endLoad(); }; - startLoad(); + startLoad(); AjaxDeleteRequest(apisite + eva_adjust_postponement_normal_API + a, null, successFunc, AlertDanger); } } @@ -171,18 +170,18 @@ function eva_adjust_postponement_normal_GoDelete(a) { var eva_adjust_postponement_normalTableV; var eva_adjust_postponement_normal_setupTable = function (result) { - tmp = '"'; + tmp = '"'; eva_adjust_postponement_normalTableV = $('#eva_adjust_postponement_normalTable').DataTable({ "processing": true, "serverSide": false, "data": result, - "select": false, + "select": false, "columns": [ - { "data": "id" }, - { "data": "fiscal_year" }, - { "data": "txt_theDate" }, - { "data": "theRound" }, - { "data": "create_evaluation_id_description" }, + { "data": "id" }, + { "data": "fiscal_year" }, + { "data": "txt_theDate" }, + { "data": "theRound" }, + { "data": "create_evaluation_id_description" }, ], "columnDefs": [ { @@ -196,15 +195,15 @@ var eva_adjust_postponement_normal_setupTable = function (result) { "url": appsite + "/DataTables-1.10.16/thai.json" }, "paging": true, - "searching": false + "searching": false }); - endLoad(); + endLoad(); }; function eva_adjust_postponement_normal_InitiateDataTable() { - startLoad(); - var p = $.param(eva_adjust_postponement_normal_GetSearchParameter()); - AjaxGetRequest(apisite + "/api/eva_adjust_postponement_normal/GetListBySearch?"+p, eva_adjust_postponement_normal_setupTable, AlertDanger); + startLoad(); + var p = $.param(eva_adjust_postponement_normal_GetSearchParameter()); + AjaxGetRequest(apisite + "/api/eva_adjust_postponement_normal/GetListBySearch?" + p, eva_adjust_postponement_normal_setupTable, AlertDanger); } function eva_adjust_postponement_normal_DoSearch() { @@ -212,10 +211,10 @@ function eva_adjust_postponement_normal_DoSearch() { var eva_adjust_postponement_normal_reload = function (result) { eva_adjust_postponement_normalTableV.destroy(); eva_adjust_postponement_normal_setupTable(result); - endLoad(); + endLoad(); }; - startLoad(); - AjaxGetRequest(apisite + "/api/eva_adjust_postponement_normal/GetListBySearch?"+p, eva_adjust_postponement_normal_reload, AlertDanger); + startLoad(); + AjaxGetRequest(apisite + "/api/eva_adjust_postponement_normal/GetListBySearch?" + p, eva_adjust_postponement_normal_reload, AlertDanger); } function eva_adjust_postponement_normal_GetSelect(f) {