From a049fa6d8b764c367178c1e97705d4da4ffcf2ad Mon Sep 17 00:00:00 2001
From: Nakorn Rientrakrunchai <nakorn@tonproject.com>
Date: Sun, 30 Aug 2020 08:34:33 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9A=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=81=20deployment?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ApiControllers/rep_eva_xControllers.cs        |  6 ++---
 .../eva_create_evaluation_d_summary.cshtml    | 26 +++++++++++++++++--
 appsettings.Development.json                  |  2 +-
 appsettings.Production.json                   |  2 +-
 appsettings.Staging.json                      |  2 +-
 wwwroot/js/rep_eva_x/rep_eva_x_report.js      |  3 ++-
 6 files changed, 32 insertions(+), 9 deletions(-)

diff --git a/ApiControllers/rep_eva_xControllers.cs b/ApiControllers/rep_eva_xControllers.cs
index eb516ce..461cb3c 100644
--- a/ApiControllers/rep_eva_xControllers.cs
+++ b/ApiControllers/rep_eva_xControllers.cs
@@ -203,11 +203,11 @@ namespace TodoAPI2.Controllers
             {
                 i.image_url = MyHelper.GetConfig(Configuration, "SiteInformation:hr_svc") + "/api/image/" + p.employee_profile_picture;
 
-                // Check if i.image_url exist
-                HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(i.image_url);
-                request.Method = "HEAD";
+                // Check if i.image_url exist                
                 try
                 {
+                    HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(i.image_url);
+                    request.Method = "HEAD";
                     request.GetResponse();
                 }
                 catch
diff --git a/Views/eva_create_evaluationView/eva_create_evaluation_d_summary.cshtml b/Views/eva_create_evaluationView/eva_create_evaluation_d_summary.cshtml
index 934b260..28b0ff7 100644
--- a/Views/eva_create_evaluationView/eva_create_evaluation_d_summary.cshtml
+++ b/Views/eva_create_evaluationView/eva_create_evaluation_d_summary.cshtml
@@ -6,6 +6,29 @@
 }
 
 
+<div class="modal fade" id="report_xModel" style="z-index:1500" tabindex="-1" role="dialog" aria-labelledby="report_xModelLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <h5 class="modal-title" id="report_xModelLabel">พิมพ์แบบประเมิน</h5>
+                <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                    <span aria-hidden="true">&times;</span>
+                </button>
+            </div>
+            <div class="modal-body">
+                <div class="row">
+                    <div class="col-md-12">
+                        <iframe id="report_result" style="display:none; height:500px; width:100%;"></iframe>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">ปิด</button>
+            </div>
+        </div>
+    </div>
+</div>
+
 <div class="row page-title">
     <div class="col-md-5">
         <div class="page-title">
@@ -147,8 +170,7 @@
     </div>
 </section>
 
-<br />
-<iframe id="report_result" style="display:none; height:500px; width:100%;"></iframe>
+
 
 @section FooterPlaceHolder{
     <script src="~/js/eva_create_evaluation/eva_create_evaluation_d.js?version=@MyHelper.GetDummyText()"></script>
diff --git a/appsettings.Development.json b/appsettings.Development.json
index d48224b..69fb467 100644
--- a/appsettings.Development.json
+++ b/appsettings.Development.json
@@ -43,7 +43,7 @@
     "sitename": "เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์",
     "modulename": "ระบบประวัติเงินเดือนและการเลื่อนเงินเดือน",
     "hr_upload_api": "https://hrm.thethaibar.or.th/api/file/upload",
-    "hr_scv": "http://tb320.zd.co.th"
+    "hr_svc": "http://tb320.zd.co.th"
   }
 }
 
diff --git a/appsettings.Production.json b/appsettings.Production.json
index 05015b6..446cd87 100644
--- a/appsettings.Production.json
+++ b/appsettings.Production.json
@@ -41,7 +41,7 @@
     "sitename": "เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์",
     "modulename": "ระบบประวัติเงินเดือนและการเลื่อนเงินเดือน",
     "hr_upload_api": "http://tb-320.zd.co.th/api/file/upload",
-    "hr_scv": "http://tb320.zd.co.th"
+    "hr_svc": "http://tb320.zd.co.th"
   }
 }
 
diff --git a/appsettings.Staging.json b/appsettings.Staging.json
index 5462559..1d6eb6d 100644
--- a/appsettings.Staging.json
+++ b/appsettings.Staging.json
@@ -41,7 +41,7 @@
     "sitename": "เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์",
     "modulename": "ระบบประวัติเงินเดือนและการเลื่อนเงินเดือน",
     "hr_upload_api": "http://tb-320.zd.co.th/api/file/upload",
-    "hr_scv": "http://tb320.zd.co.th"
+    "hr_svc": "http://tb320.zd.co.th"
   }
 }
 
diff --git a/wwwroot/js/rep_eva_x/rep_eva_x_report.js b/wwwroot/js/rep_eva_x/rep_eva_x_report.js
index a43683c..5717180 100644
--- a/wwwroot/js/rep_eva_x/rep_eva_x_report.js
+++ b/wwwroot/js/rep_eva_x/rep_eva_x_report.js
@@ -40,7 +40,7 @@ var s_rep_eva_x_customValidation = function (group) {
 function rep_eva_x_DoSearch(fileType, data) {
 
     var p = $.param(rep_eva_x_GetSearchParameter(fileType, data)).replaceAll("%5B%5D", '');
-console.log(p);
+//console.log(p);
 
     var report_url = apisite + "/api/rep_eva_x/rep_eva_x_report?" + p;
 
@@ -48,6 +48,7 @@ console.log(p);
         $("#report_result").attr("src", report_url);
         $("#report_result").show();
         //window.open(report_url);
+        $("#report_xModel").modal("show");
     } else {
         $("#report_result").hide();
         window.open(report_url);