From d8d671dd512a1d8cea06e5f112d7b6fc028c4552 Mon Sep 17 00:00:00 2001 From: Prathan B Date: Thu, 9 Jul 2020 19:39:15 +0700 Subject: [PATCH] fix op2672 --- .../rep_position_salaryService.cs | 3 ++- ...p_position_salaryWithSelectionViewModel.cs | 2 ++ .../rep_position_salary_report.cshtml | 5 +++++ .../rep_position_salary_report.js | 19 +++++++++++-------- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/Models/rep_position_salary/rep_position_salaryService.cs b/Models/rep_position_salary/rep_position_salaryService.cs index 79d84d4..59764fa 100644 --- a/Models/rep_position_salary/rep_position_salaryService.cs +++ b/Models/rep_position_salary/rep_position_salaryService.cs @@ -37,7 +37,8 @@ namespace TodoAPI2.Models i.item_employee_id = (from x in emp.GetListByemployee_type(null,null) orderby x.fullname select x).ToList(); i.item_position_id = (from x in ext.GetPositionForReport() orderby x.external_name select x).ToList(); i.item_org_id = (from x in ext.GetDepartmentDataForReport() orderby x.external_name select x).ToList(); - + //position level op2672 + i.item_position_level_id = (from x in ext.Gethrm_position_levels() orderby x.external_name select x).ToList(); return i; } diff --git a/Models/rep_position_salary/rep_position_salaryWithSelectionViewModel.cs b/Models/rep_position_salary/rep_position_salaryWithSelectionViewModel.cs index 4905a8b..c7d3a4e 100644 --- a/Models/rep_position_salary/rep_position_salaryWithSelectionViewModel.cs +++ b/Models/rep_position_salary/rep_position_salaryWithSelectionViewModel.cs @@ -10,6 +10,8 @@ namespace TodoAPI2.Models public List item_employee_id { get; set; } public List item_position_id { get; set; } public List item_org_id { get; set; } + public List item_position_level_id { get; set; } + //position level op2672 } } \ No newline at end of file diff --git a/Views/rep_position_salaryView/rep_position_salary_report.cshtml b/Views/rep_position_salaryView/rep_position_salary_report.cshtml index 438993c..dbe810d 100644 --- a/Views/rep_position_salaryView/rep_position_salary_report.cshtml +++ b/Views/rep_position_salaryView/rep_position_salary_report.cshtml @@ -40,6 +40,10 @@ +
+ + +
@@ -62,6 +66,7 @@ $("#s_rep_position_salary_employee_id").select2(); $("#s_rep_position_salary_position_id").select2(); $("#s_rep_position_salary_org_id").select2(); + $("#s_rep_position_salary_position_level_id").select2(); }); } diff --git a/wwwroot/js/rep_position_salary/rep_position_salary_report.js b/wwwroot/js/rep_position_salary/rep_position_salary_report.js index 99451f4..31e9219 100644 --- a/wwwroot/js/rep_position_salary/rep_position_salary_report.js +++ b/wwwroot/js/rep_position_salary/rep_position_salary_report.js @@ -4,10 +4,11 @@ function rep_position_salary_GetSearchParameter(fileType) { var rep_position_salarySearchObject = new Object(); -rep_position_salarySearchObject.employee_id = $("#s_rep_position_salary_employee_id").val(); -rep_position_salarySearchObject.position_id = $("#s_rep_position_salary_position_id").val(); -rep_position_salarySearchObject.org_id = $("#s_rep_position_salary_org_id").val(); - + rep_position_salarySearchObject.employee_id = $("#s_rep_position_salary_employee_id").val(); + rep_position_salarySearchObject.position_id = $("#s_rep_position_salary_position_id").val(); + rep_position_salarySearchObject.org_id = $("#s_rep_position_salary_org_id").val(); + //position level op2672 + rep_position_salarySearchObject.position_level_id = $("#s_rep_position_salary_position_level_id").val(); rep_position_salarySearchObject.fileType = fileType; @@ -17,9 +18,11 @@ rep_position_salarySearchObject.org_id = $("#s_rep_position_salary_org_id").val( } function rep_position_salary_FeedDataToSearchForm(data) { -DropDownClearFormAndFeedWithData($("#s_rep_position_salary_employee_id"), data, "id", "fullname", "item_employee_id", data.employee_id); -DropDownClearFormAndFeedWithData($("#s_rep_position_salary_position_id"), data, "id", "external_name", "item_position_id", data.position_id); -DropDownClearFormAndFeedWithData($("#s_rep_position_salary_org_id"), data, "id", "external_name", "item_org_id", data.org_id); + DropDownClearFormAndFeedWithData($("#s_rep_position_salary_employee_id"), data, "id", "fullname", "item_employee_id", data.employee_id); + DropDownClearFormAndFeedWithData($("#s_rep_position_salary_position_id"), data, "id", "external_name", "item_position_id", data.position_id); + DropDownClearFormAndFeedWithData($("#s_rep_position_salary_org_id"), data, "id", "external_name", "item_org_id", data.org_id); + //position level op2672 + DropDownClearFormAndFeedWithData($("#s_rep_position_salary_position_level_id"), data, "id", "external_name", "item_position_level_id", data.position_level_id); } @@ -50,7 +53,7 @@ function rep_position_salary_DoSearch(fileType) { var report_url = apisite + "/api/rep_position_salary/rep_position_salary_report?" + p; - if (fileType === "pdf") { + if (fileType === "pdf") { $("#report_result").attr("src", report_url); $("#report_result").show(); //window.open(report_url);