แก้บัก deployment
This commit is contained in:
@@ -204,10 +204,10 @@ namespace TodoAPI2.Controllers
|
|||||||
i.image_url = MyHelper.GetConfig(Configuration, "SiteInformation:hr_svc") + "/api/image/" + p.employee_profile_picture;
|
i.image_url = MyHelper.GetConfig(Configuration, "SiteInformation:hr_svc") + "/api/image/" + p.employee_profile_picture;
|
||||||
|
|
||||||
// Check if i.image_url exist
|
// Check if i.image_url exist
|
||||||
HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(i.image_url);
|
|
||||||
request.Method = "HEAD";
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(i.image_url);
|
||||||
|
request.Method = "HEAD";
|
||||||
request.GetResponse();
|
request.GetResponse();
|
||||||
}
|
}
|
||||||
catch
|
catch
|
||||||
|
|||||||
@@ -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">×</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="row page-title">
|
||||||
<div class="col-md-5">
|
<div class="col-md-5">
|
||||||
<div class="page-title">
|
<div class="page-title">
|
||||||
@@ -147,8 +170,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<br />
|
|
||||||
<iframe id="report_result" style="display:none; height:500px; width:100%;"></iframe>
|
|
||||||
|
|
||||||
@section FooterPlaceHolder{
|
@section FooterPlaceHolder{
|
||||||
<script src="~/js/eva_create_evaluation/eva_create_evaluation_d.js?version=@MyHelper.GetDummyText()"></script>
|
<script src="~/js/eva_create_evaluation/eva_create_evaluation_d.js?version=@MyHelper.GetDummyText()"></script>
|
||||||
|
|||||||
@@ -43,7 +43,7 @@
|
|||||||
"sitename": "เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์",
|
"sitename": "เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์",
|
||||||
"modulename": "ระบบประวัติเงินเดือนและการเลื่อนเงินเดือน",
|
"modulename": "ระบบประวัติเงินเดือนและการเลื่อนเงินเดือน",
|
||||||
"hr_upload_api": "https://hrm.thethaibar.or.th/api/file/upload",
|
"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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,7 @@
|
|||||||
"sitename": "เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์",
|
"sitename": "เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์",
|
||||||
"modulename": "ระบบประวัติเงินเดือนและการเลื่อนเงินเดือน",
|
"modulename": "ระบบประวัติเงินเดือนและการเลื่อนเงินเดือน",
|
||||||
"hr_upload_api": "http://tb-320.zd.co.th/api/file/upload",
|
"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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -41,7 +41,7 @@
|
|||||||
"sitename": "เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์",
|
"sitename": "เนติบัณฑิตยสภา ในพระบรมราชูปถัมภ์",
|
||||||
"modulename": "ระบบประวัติเงินเดือนและการเลื่อนเงินเดือน",
|
"modulename": "ระบบประวัติเงินเดือนและการเลื่อนเงินเดือน",
|
||||||
"hr_upload_api": "http://tb-320.zd.co.th/api/file/upload",
|
"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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ var s_rep_eva_x_customValidation = function (group) {
|
|||||||
function rep_eva_x_DoSearch(fileType, data) {
|
function rep_eva_x_DoSearch(fileType, data) {
|
||||||
|
|
||||||
var p = $.param(rep_eva_x_GetSearchParameter(fileType, data)).replaceAll("%5B%5D", '');
|
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;
|
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").attr("src", report_url);
|
||||||
$("#report_result").show();
|
$("#report_result").show();
|
||||||
//window.open(report_url);
|
//window.open(report_url);
|
||||||
|
$("#report_xModel").modal("show");
|
||||||
} else {
|
} else {
|
||||||
$("#report_result").hide();
|
$("#report_result").hide();
|
||||||
window.open(report_url);
|
window.open(report_url);
|
||||||
|
|||||||
Reference in New Issue
Block a user