thamming_dev01/hrm_eva
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix op 2603

Browse Source
This commit is contained in:
Prathan B
2020-07-12 13:01:31 +07:00
parent 24c8462932
commit 0df9551a02
4 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Views/rep_eva02View/rep_eva02_report.cshtml
View File

@@ -28,7 +28,7 @@
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label id='lab_s_rep_eva02_org_id' for='s_rep_eva02_org_id'>หน่วยงาน</label> <label id='lab_s_rep_eva02_org_id' for='s_rep_eva02_org_id'>หน่วยงาน</label>
<select class="form-control" id="s_rep_eva02_org_id" iLabel="หน่วยงาน" iRequire="true" iGroup="s_rep_eva02" title='หน่วยงาน' placeholder='หน่วยงาน'></select> <select multiple="multiple" class="form-control" id="s_rep_eva02_org_id" iLabel="หน่วยงาน" iRequire="true" iGroup="s_rep_eva02" title='หน่วยงาน' placeholder='หน่วยงาน'></select>
</div> </div>
<div class="form-group col-md-3"> <div class="form-group col-md-3">

19
wwwroot/js/rep_eva01/rep_eva01_report.js
View File

@@ -1,10 +1,10 @@
var rep_eva01_API = "/api/rep_eva01/"; var rep_eva01_API = "/api/rep_eva01/";
function array_to_string_comma(a){ function array_to_string_comma(a) {
var x = ""; var x = "";
$.each(a, function( index, value ) { $.each(a, function (index, value) {
if(x !== "") x+=","; if (x !== "") x += ",";
x+=value; x += value;
}); });
return x; return x;
} }
@@ -13,9 +13,8 @@ function array_to_string_comma(a){
function rep_eva01_GetSearchParameter(fileType) { function rep_eva01_GetSearchParameter(fileType) {
var rep_eva01SearchObject = new Object(); var rep_eva01SearchObject = new Object();
rep_eva01SearchObject.org_id = array_to_string_comma($("#s_rep_eva01_org_id").val()); 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_id = $("#s_rep_eva01_round_id").val();
rep_eva01SearchObject.fileType = fileType; rep_eva01SearchObject.fileType = fileType;
@@ -25,8 +24,8 @@ rep_eva01SearchObject.round_id = $("#s_rep_eva01_round_id").val();
} }
function rep_eva01_FeedDataToSearchForm(data) { 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_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); DropDownClearFormAndFeedWithData($("#s_rep_eva01_round_id"), data, "id", "external_name", "item_round_id", data.round_id);
} }
@@ -57,7 +56,7 @@ function rep_eva01_DoSearch(fileType) {
var report_url = apisite + "/api/rep_eva01/rep_eva01_report?" + p; var report_url = apisite + "/api/rep_eva01/rep_eva01_report?" + p;
console.log(report_url); console.log(report_url);
if (fileType === "pdf") { if (fileType === "pdf") {
$("#report_result").attr("src", report_url); $("#report_result").attr("src", report_url);

10
wwwroot/js/rep_eva02/rep_eva02_report.js
View File

@@ -4,9 +4,8 @@
function rep_eva02_GetSearchParameter(fileType) { function rep_eva02_GetSearchParameter(fileType) {
var rep_eva02SearchObject = new Object(); var rep_eva02SearchObject = new Object();
rep_eva02SearchObject.org_id = $("#s_rep_eva02_org_id").val(); 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_id = $("#s_rep_eva02_round_id").val();
rep_eva02SearchObject.fileType = fileType; rep_eva02SearchObject.fileType = fileType;
@@ -16,9 +15,8 @@ rep_eva02SearchObject.round_id = $("#s_rep_eva02_round_id").val();
} }
function rep_eva02_FeedDataToSearchForm(data) { 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_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); DropDownClearFormAndFeedWithData($("#s_rep_eva02_round_id"), data, "id", "external_name", "item_round_id", data.round_id);
} }
//================= Form Data Customizaiton ========================================= //================= Form Data Customizaiton =========================================