diff --git a/Models/external_linkage/external_linkageService.cs b/Models/external_linkage/external_linkageService.cs index b4c6aa3..7720db5 100644 --- a/Models/external_linkage/external_linkageService.cs +++ b/Models/external_linkage/external_linkageService.cs @@ -356,7 +356,7 @@ namespace TodoAPI2.Models public List GetEvaRound() { - var sql = string.Format("select distinct eva_performance_plan.{0}theTime{0} , eva_performance_plan.fiscal_year from eva_performance_plan order by eva_performance_plan.{0}theTime{0}", '"'.ToString()); + var sql = string.Format("select distinct eva_performance_plan.id,eva_performance_plan.{0}theTime{0} , eva_performance_plan.fiscal_year from eva_performance_plan order by eva_performance_plan.fiscal_year,eva_performance_plan.{0}theTime{0}", '"'.ToString()); var para = db.GetParameterListNpgsql(); DataTable dt = db.ExecuteDataTableNpgsql(sql, para); var result = new List(); @@ -364,6 +364,7 @@ namespace TodoAPI2.Models { var i = new external_linkageViewModel(); i.external_id = Convert.ToInt32(dr["theTime"]); + i.id_guid = Guid.Parse(dr["id"].ToString()); i.external_code = dr["theTime"].ToString(); i.external_name = dr["theTime"].ToString() + "/" + dr["fiscal_year"].ToString(); result.Add(i); diff --git a/Models/external_linkage/external_linkageViewModel.cs b/Models/external_linkage/external_linkageViewModel.cs index 425fe60..fbb0d6f 100644 --- a/Models/external_linkage/external_linkageViewModel.cs +++ b/Models/external_linkage/external_linkageViewModel.cs @@ -14,6 +14,7 @@ namespace TodoAPI2.Models public class external_linkageViewModel { + public Guid? id_guid { get; set; } public int? external_id { get; set; } public string external_code { get; set; } diff --git a/Models/rep_eva01/rep_eva01SearchModel.cs b/Models/rep_eva01/rep_eva01SearchModel.cs index a5c1156..1955b0a 100644 --- a/Models/rep_eva01/rep_eva01SearchModel.cs +++ b/Models/rep_eva01/rep_eva01SearchModel.cs @@ -16,8 +16,8 @@ namespace TodoAPI2.Models public string org_id { get; set; } - public int? round_id { get; set; } - + public Guid? round_id { get; set; } + public string round_text { get; set; } } } diff --git a/Models/rep_eva01/rep_eva01Service.cs b/Models/rep_eva01/rep_eva01Service.cs index 66b6930..a3e6979 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.GetDepartmentDataForReport() select x).ToList(); - i.item_round_id = (from x in ext.GetYesNo() select x).ToList(); + i.item_round_id = (from x in ext.GetEvaRound() select x).ToList(); return i; diff --git a/Models/rep_eva02/rep_eva02SearchModel.cs b/Models/rep_eva02/rep_eva02SearchModel.cs index 910dc30..e40687e 100644 --- a/Models/rep_eva02/rep_eva02SearchModel.cs +++ b/Models/rep_eva02/rep_eva02SearchModel.cs @@ -16,7 +16,8 @@ namespace TodoAPI2.Models public int? org_id { get; set; } - public int? round_id { get; set; } + public Guid? round_id { get; set; } + public string round_text { get; set; } } } diff --git a/appsettings.Development.json b/appsettings.Development.json index 360c0a1..19b10be 100644 --- a/appsettings.Development.json +++ b/appsettings.Development.json @@ -33,13 +33,13 @@ "LoginURL": "http://tb320.zd.co.th/jasperserver/rest_v2/login", "username": "tb@zd.co.th", "password": "Be$m@rt", - "reportsite": "/tb320hr" + "reportsite": "/tb320hr_site2" }, "SiteInformation": { "appsite": "/eva", "apisite": "/eva", - "mainsite": "http://tb320dev.zd.co.th", - "modulesite": "http://tb320dev.zd.co.th/menu/evaluation", + "mainsite": "http://tb320.zd.co.th", + "modulesite": "http://tb320.zd.co.th/menu/evaluation", "sitename": "เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์", "modulename": "ระบบประวัติเงินเดือนและการเลื่อนเงินเดือน", "hr_upload_api": "https://hrm.thethaibar.or.th/api/file/upload" diff --git a/wwwroot/js/rep_eva01/rep_eva01_report.js b/wwwroot/js/rep_eva01/rep_eva01_report.js index 27d9b68..dfa267e 100644 --- a/wwwroot/js/rep_eva01/rep_eva01_report.js +++ b/wwwroot/js/rep_eva01/rep_eva01_report.js @@ -15,6 +15,7 @@ function rep_eva01_GetSearchParameter(fileType) { var rep_eva01SearchObject = new Object(); rep_eva01SearchObject.org_id = array_to_string_comma($("#s_rep_eva01_org_id").val()); rep_eva01SearchObject.round_id = $("#s_rep_eva01_round_id").val(); + rep_eva01SearchObject.round_text = $("#s_rep_eva01_round_id option:selected").text(); rep_eva01SearchObject.fileType = fileType; @@ -24,9 +25,26 @@ function rep_eva01_GetSearchParameter(fileType) { } function rep_eva01_FeedDataToSearchForm(data) { - DropDownClearFormAndFeedWithData($("#s_rep_eva01_org_id"), data, "id", "external_name", "item_org_id", data.org_id); - DropDownClearFormAndFeedWithData($("#s_rep_eva01_round_id"), data, "id", "external_name", "item_round_id", data.round_id); + DropDownClearFormAndFeedWithDataOrg($("#s_rep_eva01_org_id"), data, "id", "external_name", "item_org_id", data.org_id); + DropDownClearFormAndFeedWithData($("#s_rep_eva01_round_id"), data, "id_guid", "external_name", "item_round_id", data.id_guid); +} +function DropDownClearFormAndFeedWithDataOrg(d, result, x, y, z, i) { + $(d).html(''); + if (z !== "") { + $.each(result[z], function (key, value) { + $(d).append($("") + .attr("value", value[x]) + .text(value[y])); + }); + } else { + $.each(result, function (key, value) { + $(d).append($("") + .attr("value", value[x]) + .text(value[y])); + }); + } + $(d).val(i); } //================= Form Data Customizaiton ========================================= diff --git a/wwwroot/js/rep_eva02/rep_eva02_report.js b/wwwroot/js/rep_eva02/rep_eva02_report.js index 0f0a83d..661590b 100644 --- a/wwwroot/js/rep_eva02/rep_eva02_report.js +++ b/wwwroot/js/rep_eva02/rep_eva02_report.js @@ -15,6 +15,7 @@ function rep_eva02_GetSearchParameter(fileType) { var rep_eva02SearchObject = new Object(); rep_eva02SearchObject.org_id = array_to_string_comma($("#s_rep_eva02_org_id").val()); rep_eva02SearchObject.round_id = $("#s_rep_eva02_round_id").val(); + rep_eva02SearchObject.round_text = $("#s_rep_eva02_round_id option:selected").text(); rep_eva02SearchObject.fileType = fileType; @@ -24,8 +25,26 @@ function rep_eva02_GetSearchParameter(fileType) { } function rep_eva02_FeedDataToSearchForm(data) { - DropDownClearFormAndFeedWithData($("#s_rep_eva02_org_id"), data, "id", "external_name", "item_org_id", data.org_id); - DropDownClearFormAndFeedWithData($("#s_rep_eva02_round_id"), data, "id", "external_name", "item_round_id", data.round_id); + DropDownClearFormAndFeedWithDataOrg($("#s_rep_eva02_org_id"), data, "id", "external_name", "item_org_id", data.org_id); + DropDownClearFormAndFeedWithData($("#s_rep_eva02_round_id"), data, "id_guid", "external_name", "item_round_id", data.round_id); +} + +function DropDownClearFormAndFeedWithDataOrg(d, result, x, y, z, i) { + $(d).html(''); + if (z !== "") { + $.each(result[z], function (key, value) { + $(d).append($("") + .attr("value", value[x]) + .text(value[y])); + }); + } else { + $.each(result, function (key, value) { + $(d).append($("") + .attr("value", value[x]) + .text(value[y])); + }); + } + $(d).val(i); } //================= Form Data Customizaiton =========================================