From 0df9551a024a18e927ba96d41e7f7d4edc60020f Mon Sep 17 00:00:00 2001
From: Prathan B <prathan03@gmail.com>
Date: Sun, 12 Jul 2020 13:01:31 +0700
Subject: [PATCH] fix op 2603

---
 ApiControllers/rep_eva02Controllers.cs      |  2 +-
 Views/rep_eva02View/rep_eva02_report.cshtml |  4 ++--
 wwwroot/js/rep_eva01/rep_eva01_report.js    | 21 ++++++++++-----------
 wwwroot/js/rep_eva02/rep_eva02_report.js    | 14 ++++++--------
 4 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/ApiControllers/rep_eva02Controllers.cs b/ApiControllers/rep_eva02Controllers.cs
index 29f66e0..e64a685 100644
--- a/ApiControllers/rep_eva02Controllers.cs
+++ b/ApiControllers/rep_eva02Controllers.cs
@@ -92,7 +92,7 @@ namespace TodoAPI2.Controllers
         //[ValidateAntiForgeryToken]
         public IActionResult rep_eva02_report(rep_eva02ReportRequestModel model)
         {
-            try
+            try 
             {
 				if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized();
                 //var httpclient = MyHelper.getHttpClient(Configuration);
diff --git a/Views/rep_eva02View/rep_eva02_report.cshtml b/Views/rep_eva02View/rep_eva02_report.cshtml
index c592732..74f3831 100644
--- a/Views/rep_eva02View/rep_eva02_report.cshtml
+++ b/Views/rep_eva02View/rep_eva02_report.cshtml
@@ -28,7 +28,7 @@
 
                         <div class="form-group col-md-3">
                             <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 class="form-group col-md-3">
@@ -50,7 +50,7 @@
 
 @section FooterPlaceHolder{
     <script src="~/js/rep_eva02/rep_eva02_report.js"></script>
-    <script>
+    <script> 
         $(document).ready(function () {
             rep_eva02_InitialForm();
             SetupValidationRemark("s_rep_eva02");
diff --git a/wwwroot/js/rep_eva01/rep_eva01_report.js b/wwwroot/js/rep_eva01/rep_eva01_report.js
index cd6a0aa..27d9b68 100644
--- a/wwwroot/js/rep_eva01/rep_eva01_report.js
+++ b/wwwroot/js/rep_eva01/rep_eva01_report.js
@@ -1,10 +1,10 @@
 var rep_eva01_API = "/api/rep_eva01/";
 
-function array_to_string_comma(a){
+function array_to_string_comma(a) {
     var x = "";
-    $.each(a, function( index, value ) {
-      if(x !== "") x+=",";
-        x+=value;
+    $.each(a, function (index, value) {
+        if (x !== "") x += ",";
+        x += value;
     });
     return x;
 }
@@ -13,9 +13,8 @@ function array_to_string_comma(a){
 
 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.org_id = array_to_string_comma($("#s_rep_eva01_org_id").val());
+    rep_eva01SearchObject.round_id = $("#s_rep_eva01_round_id").val();
 
     rep_eva01SearchObject.fileType = fileType;
 
@@ -25,8 +24,8 @@ rep_eva01SearchObject.round_id = $("#s_rep_eva01_round_id").val();
 }
 
 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);
+    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);
 
 }
 
@@ -57,9 +56,9 @@ function rep_eva01_DoSearch(fileType) {
 
     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").show();
         //window.open(report_url);
diff --git a/wwwroot/js/rep_eva02/rep_eva02_report.js b/wwwroot/js/rep_eva02/rep_eva02_report.js
index eaedff8..9504c6e 100644
--- a/wwwroot/js/rep_eva02/rep_eva02_report.js
+++ b/wwwroot/js/rep_eva02/rep_eva02_report.js
@@ -4,21 +4,19 @@
 
 function rep_eva02_GetSearchParameter(fileType) {
     var rep_eva02SearchObject = new Object();
-rep_eva02SearchObject.org_id = $("#s_rep_eva02_org_id").val();
-rep_eva02SearchObject.round_id = $("#s_rep_eva02_round_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.fileType = fileType;
 
-    console.log(rep_eva02SearchObject);
+    console.log(rep_eva02SearchObject); 
 
     return rep_eva02SearchObject;
 }
 
 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);
-
+    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);
 }
 
 //================= Form Data Customizaiton =========================================
@@ -48,7 +46,7 @@ function rep_eva02_DoSearch(fileType) {
 
     var report_url = apisite + "/api/rep_eva02/rep_eva02_report?" + p;
 
-    if (fileType === "pdf") {        
+    if (fileType === "pdf") {
         $("#report_result").attr("src", report_url);
         $("#report_result").show();
         //window.open(report_url);