diff --git a/ApiControllers/eva_adjust_postponement_detail_normalControllers.cs b/ApiControllers/eva_adjust_postponement_detail_normalControllers.cs index 4c0f470..45ac9b7 100644 --- a/ApiControllers/eva_adjust_postponement_detail_normalControllers.cs +++ b/ApiControllers/eva_adjust_postponement_detail_normalControllers.cs @@ -158,40 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_adjust_postponement_detail_normal_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_adjust_postponement_detail_normal_report(eva_adjust_postponement_detail_normalReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_adjust_postponement_detail_normal_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } /// /// Create new item diff --git a/ApiControllers/eva_adjust_postponement_detail_normal_02Controllers.cs b/ApiControllers/eva_adjust_postponement_detail_normal_02Controllers.cs index c434898..fb622c3 100644 --- a/ApiControllers/eva_adjust_postponement_detail_normal_02Controllers.cs +++ b/ApiControllers/eva_adjust_postponement_detail_normal_02Controllers.cs @@ -158,40 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_adjust_postponement_detail_normal_02_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_adjust_postponement_detail_normal_02_report(eva_adjust_postponement_detail_normal_02ReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_adjust_postponement_detail_normal_02_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } /// /// Create new item diff --git a/ApiControllers/eva_adjust_postponement_detail_quotaControllers.cs b/ApiControllers/eva_adjust_postponement_detail_quotaControllers.cs index 66e9025..413a8f9 100644 --- a/ApiControllers/eva_adjust_postponement_detail_quotaControllers.cs +++ b/ApiControllers/eva_adjust_postponement_detail_quotaControllers.cs @@ -158,40 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_adjust_postponement_detail_quota_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_adjust_postponement_detail_quota_report(eva_adjust_postponement_detail_quotaReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_adjust_postponement_detail_quota_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } /// /// Create new item diff --git a/ApiControllers/eva_adjust_postponement_detail_quota_02Controllers.cs b/ApiControllers/eva_adjust_postponement_detail_quota_02Controllers.cs index fc4662c..ba19e1e 100644 --- a/ApiControllers/eva_adjust_postponement_detail_quota_02Controllers.cs +++ b/ApiControllers/eva_adjust_postponement_detail_quota_02Controllers.cs @@ -158,40 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_adjust_postponement_detail_quota_02_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_adjust_postponement_detail_quota_02_report(eva_adjust_postponement_detail_quota_02ReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_adjust_postponement_detail_quota_02_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } /// /// Create new item diff --git a/ApiControllers/eva_adjust_postponement_normalControllers.cs b/ApiControllers/eva_adjust_postponement_normalControllers.cs index e413e77..b42258d 100644 --- a/ApiControllers/eva_adjust_postponement_normalControllers.cs +++ b/ApiControllers/eva_adjust_postponement_normalControllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_adjust_postponement_normal_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_adjust_postponement_normal_report(eva_adjust_postponement_normalReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_adjust_postponement_normal_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_adjust_postponement_quotaControllers.cs b/ApiControllers/eva_adjust_postponement_quotaControllers.cs index 7ee3702..0d161fd 100644 --- a/ApiControllers/eva_adjust_postponement_quotaControllers.cs +++ b/ApiControllers/eva_adjust_postponement_quotaControllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_adjust_postponement_quota_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_adjust_postponement_quota_report(eva_adjust_postponement_quotaReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_adjust_postponement_quota_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_create_evaluationControllers.cs b/ApiControllers/eva_create_evaluationControllers.cs index 0203ebb..07ff9ee 100644 --- a/ApiControllers/eva_create_evaluationControllers.cs +++ b/ApiControllers/eva_create_evaluationControllers.cs @@ -157,42 +157,7 @@ namespace TodoAPI2.Controllers return StatusCode(500, $"Exception in IActionResult GetListBySearch. {ex.Message}"); } } - - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_create_evaluation_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_create_evaluation_report(eva_create_evaluationReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_create_evaluation_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - + /// /// Create new item /// diff --git a/ApiControllers/eva_create_evaluation_detailControllers.cs b/ApiControllers/eva_create_evaluation_detailControllers.cs index f41833c..8ff88ff 100644 --- a/ApiControllers/eva_create_evaluation_detailControllers.cs +++ b/ApiControllers/eva_create_evaluation_detailControllers.cs @@ -157,42 +157,7 @@ namespace TodoAPI2.Controllers return StatusCode(500, $"Exception in IActionResult GetListBySearch. {ex.Message}"); } } - - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_create_evaluation_detail_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_create_evaluation_detail_report(eva_create_evaluation_detailReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_create_evaluation_detail_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - + /// /// Create new item /// diff --git a/ApiControllers/eva_create_evaluation_detail_agreementControllers.cs b/ApiControllers/eva_create_evaluation_detail_agreementControllers.cs index a090945..2140eec 100644 --- a/ApiControllers/eva_create_evaluation_detail_agreementControllers.cs +++ b/ApiControllers/eva_create_evaluation_detail_agreementControllers.cs @@ -184,40 +184,5 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_create_evaluation_detail_agreement_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_create_evaluation_detail_agreement_report(eva_create_evaluation_detail_agreementReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_create_evaluation_detail_agreement_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - } } diff --git a/ApiControllers/eva_create_evaluation_detail_review01Controllers.cs b/ApiControllers/eva_create_evaluation_detail_review01Controllers.cs index e9170f7..ef3c842 100644 --- a/ApiControllers/eva_create_evaluation_detail_review01Controllers.cs +++ b/ApiControllers/eva_create_evaluation_detail_review01Controllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_create_evaluation_detail_review01_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_create_evaluation_detail_review01_report(eva_create_evaluation_detail_review01ReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_create_evaluation_detail_review01_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_create_evaluation_detail_review02Controllers.cs b/ApiControllers/eva_create_evaluation_detail_review02Controllers.cs index 211da06..e36c8ef 100644 --- a/ApiControllers/eva_create_evaluation_detail_review02Controllers.cs +++ b/ApiControllers/eva_create_evaluation_detail_review02Controllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_create_evaluation_detail_review02_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_create_evaluation_detail_review02_report(eva_create_evaluation_detail_review02ReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_create_evaluation_detail_review02_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_create_evaluation_detail_review03Controllers.cs b/ApiControllers/eva_create_evaluation_detail_review03Controllers.cs index 3bb0404..b01fa43 100644 --- a/ApiControllers/eva_create_evaluation_detail_review03Controllers.cs +++ b/ApiControllers/eva_create_evaluation_detail_review03Controllers.cs @@ -157,42 +157,7 @@ namespace TodoAPI2.Controllers return StatusCode(500, $"Exception in IActionResult GetListBySearch. {ex.Message}"); } } - - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_create_evaluation_detail_review03_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_create_evaluation_detail_review03_report(eva_create_evaluation_detail_review03ReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_create_evaluation_detail_review03_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - + /// /// Create new item /// diff --git a/ApiControllers/eva_create_evaluation_detail_review04Controllers.cs b/ApiControllers/eva_create_evaluation_detail_review04Controllers.cs index e6425c1..e2e6ede 100644 --- a/ApiControllers/eva_create_evaluation_detail_review04Controllers.cs +++ b/ApiControllers/eva_create_evaluation_detail_review04Controllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_create_evaluation_detail_review04_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_create_evaluation_detail_review04_report(eva_create_evaluation_detail_review04ReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_create_evaluation_detail_review04_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_create_evaluation_detail_statusControllers.cs b/ApiControllers/eva_create_evaluation_detail_statusControllers.cs index 2cb7e31..c7ea76f 100644 --- a/ApiControllers/eva_create_evaluation_detail_statusControllers.cs +++ b/ApiControllers/eva_create_evaluation_detail_statusControllers.cs @@ -157,42 +157,7 @@ namespace TodoAPI2.Controllers return StatusCode(500, $"Exception in IActionResult GetListBySearch. {ex.Message}"); } } - - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_create_evaluation_detail_status_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_create_evaluation_detail_status_report(eva_create_evaluation_detail_statusReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_create_evaluation_detail_status_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - + /// /// Create new item /// diff --git a/ApiControllers/eva_create_evaluation_detail_summary1Controllers.cs b/ApiControllers/eva_create_evaluation_detail_summary1Controllers.cs index fa54f68..a1985ab 100644 --- a/ApiControllers/eva_create_evaluation_detail_summary1Controllers.cs +++ b/ApiControllers/eva_create_evaluation_detail_summary1Controllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_create_evaluation_detail_summary1_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_create_evaluation_detail_summary1_report(eva_create_evaluation_detail_summary1ReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_create_evaluation_detail_summary1_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_create_evaluation_detail_summary2Controllers.cs b/ApiControllers/eva_create_evaluation_detail_summary2Controllers.cs index 6139d64..c5b5af9 100644 --- a/ApiControllers/eva_create_evaluation_detail_summary2Controllers.cs +++ b/ApiControllers/eva_create_evaluation_detail_summary2Controllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_create_evaluation_detail_summary2_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_create_evaluation_detail_summary2_report(eva_create_evaluation_detail_summary2ReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_create_evaluation_detail_summary2_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_evaluation_achievementControllers.cs b/ApiControllers/eva_evaluation_achievementControllers.cs index 055ef5c..a003e3f 100644 --- a/ApiControllers/eva_evaluation_achievementControllers.cs +++ b/ApiControllers/eva_evaluation_achievementControllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_evaluation_achievement_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_evaluation_achievement_report(eva_evaluation_achievementReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_evaluation_achievement_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_evaluation_achievement_process2Controllers.cs b/ApiControllers/eva_evaluation_achievement_process2Controllers.cs index a5e1968..8fd8f86 100644 --- a/ApiControllers/eva_evaluation_achievement_process2Controllers.cs +++ b/ApiControllers/eva_evaluation_achievement_process2Controllers.cs @@ -158,40 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_evaluation_achievement_process2_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_evaluation_achievement_process2_report(eva_evaluation_achievement_process2ReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_evaluation_achievement_process2_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } /// /// Create new item diff --git a/ApiControllers/eva_evaluation_achievement_processControllers.cs b/ApiControllers/eva_evaluation_achievement_processControllers.cs index b42b558..d72817b 100644 --- a/ApiControllers/eva_evaluation_achievement_processControllers.cs +++ b/ApiControllers/eva_evaluation_achievement_processControllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_evaluation_achievement_process_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_evaluation_achievement_process_report(eva_evaluation_achievement_processReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_evaluation_achievement_process_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_evaluation_behaviorControllers.cs b/ApiControllers/eva_evaluation_behaviorControllers.cs index 5457ff7..fbeaf4e 100644 --- a/ApiControllers/eva_evaluation_behaviorControllers.cs +++ b/ApiControllers/eva_evaluation_behaviorControllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_evaluation_behavior_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_evaluation_behavior_report(eva_evaluation_behaviorReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_evaluation_behavior_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_evaluation_behavior_process2Controllers.cs b/ApiControllers/eva_evaluation_behavior_process2Controllers.cs index 3b555a9..008522b 100644 --- a/ApiControllers/eva_evaluation_behavior_process2Controllers.cs +++ b/ApiControllers/eva_evaluation_behavior_process2Controllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_evaluation_behavior_process2_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_evaluation_behavior_process2_report(eva_evaluation_behavior_process2ReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_evaluation_behavior_process2_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_evaluation_behavior_processControllers.cs b/ApiControllers/eva_evaluation_behavior_processControllers.cs index 7e15b65..1788d1e 100644 --- a/ApiControllers/eva_evaluation_behavior_processControllers.cs +++ b/ApiControllers/eva_evaluation_behavior_processControllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_evaluation_behavior_process_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_evaluation_behavior_process_report(eva_evaluation_behavior_processReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_evaluation_behavior_process_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_evaluation_groupControllers.cs b/ApiControllers/eva_evaluation_groupControllers.cs index 959ce38..75b13b2 100644 --- a/ApiControllers/eva_evaluation_groupControllers.cs +++ b/ApiControllers/eva_evaluation_groupControllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_evaluation_group_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_evaluation_group_report(eva_evaluation_groupReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_evaluation_group_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_evaluation_group_detailControllers.cs b/ApiControllers/eva_evaluation_group_detailControllers.cs index bb71407..2cf423d 100644 --- a/ApiControllers/eva_evaluation_group_detailControllers.cs +++ b/ApiControllers/eva_evaluation_group_detailControllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_evaluation_group_detail_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_evaluation_group_detail_report(eva_evaluation_group_detailReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_evaluation_group_detail_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_level_scoreControllers.cs b/ApiControllers/eva_level_scoreControllers.cs index 2ca61a8..a8777ac 100644 --- a/ApiControllers/eva_level_scoreControllers.cs +++ b/ApiControllers/eva_level_scoreControllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_level_score_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_level_score_report(eva_level_scoreReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_level_score_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_level_score_basicControllers.cs b/ApiControllers/eva_level_score_basicControllers.cs index fd58cf6..ae115f6 100644 --- a/ApiControllers/eva_level_score_basicControllers.cs +++ b/ApiControllers/eva_level_score_basicControllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_level_score_basic_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_level_score_basic_report(eva_level_score_basicReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_level_score_basic_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_performance_planControllers.cs b/ApiControllers/eva_performance_planControllers.cs index 1308c81..e1ef5b9 100644 --- a/ApiControllers/eva_performance_planControllers.cs +++ b/ApiControllers/eva_performance_planControllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_performance_plan_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_performance_plan_report(eva_performance_planReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_performance_plan_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_performance_plan_detailControllers.cs b/ApiControllers/eva_performance_plan_detailControllers.cs index aac6b44..7a8a845 100644 --- a/ApiControllers/eva_performance_plan_detailControllers.cs +++ b/ApiControllers/eva_performance_plan_detailControllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_performance_plan_detail_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_performance_plan_detail_report(eva_performance_plan_detailReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_performance_plan_detail_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_promoted_percentageControllers.cs b/ApiControllers/eva_promoted_percentageControllers.cs index 1a74b13..ebae984 100644 --- a/ApiControllers/eva_promoted_percentageControllers.cs +++ b/ApiControllers/eva_promoted_percentageControllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_promoted_percentage_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_promoted_percentage_report(eva_promoted_percentageReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_promoted_percentage_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/eva_salary_cylinderControllers.cs b/ApiControllers/eva_salary_cylinderControllers.cs index 8216f88..f5e999e 100644 --- a/ApiControllers/eva_salary_cylinderControllers.cs +++ b/ApiControllers/eva_salary_cylinderControllers.cs @@ -158,41 +158,6 @@ namespace TodoAPI2.Controllers } } - /// - /// Download Report - /// - /// - /// - /// Return list of items by specifced keyword - /// Returns the item - /// Error Occurred - [HttpGet("eva_salary_cylinder_report")] - [ProducesResponseType(typeof(FileStreamResult), 200)] - [ProducesResponseType(400)] - [ProducesResponseType(500)] - //[ValidateAntiForgeryToken] - public IActionResult eva_salary_cylinder_report(eva_salary_cylinderReportRequestModel model) - { - try - { - if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); - var httpclient = MyHelper.getHttpClient(Configuration); - string mainurl = Configuration["JasperReportServer:MainURL"]; - - string url = $"{mainurl}/ro519eva/eva_salary_cylinder_report.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}"; - - var data = httpclient.DownloadData(url); - var stream = new MemoryStream(data); - - return File(stream, model.contentType); - } - catch (Exception ex) - { - _logger.LogCritical($"Exception while GetReport.", ex); - return StatusCode(500, $"Exception while GetReport. {ex.Message}"); - } - } - /// /// Create new item /// diff --git a/ApiControllers/rep_eva01Controllers.cs b/ApiControllers/rep_eva01Controllers.cs index b14c096..54eef82 100644 --- a/ApiControllers/rep_eva01Controllers.cs +++ b/ApiControllers/rep_eva01Controllers.cs @@ -97,10 +97,11 @@ namespace TodoAPI2.Controllers if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); //var httpclient = MyHelper.getHttpClient(Configuration); var httpclient = new WebClient(); - string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); - string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_reportsite"); - string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); - string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); + + string mainurl = MyHelper.GetConfig(Configuration, "JasperReportServer:MainURL"); + string reportsite = MyHelper.GetConfig(Configuration, "JasperReportServer:reportsite"); + string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username"); + string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); string url = $"{mainurl}{reportsite}/rep_eva01.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; diff --git a/ApiControllers/rep_eva02Controllers.cs b/ApiControllers/rep_eva02Controllers.cs index 4c0b0f3..29f66e0 100644 --- a/ApiControllers/rep_eva02Controllers.cs +++ b/ApiControllers/rep_eva02Controllers.cs @@ -97,11 +97,10 @@ namespace TodoAPI2.Controllers if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); //var httpclient = MyHelper.getHttpClient(Configuration); var httpclient = new WebClient(); - string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); - string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_reportsite"); - string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); - string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); - + string mainurl = MyHelper.GetConfig(Configuration, "JasperReportServer:MainURL"); + string reportsite = MyHelper.GetConfig(Configuration, "JasperReportServer:reportsite"); + string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username"); + string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); string url = $"{mainurl}{reportsite}/rep_eva02.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; var data = httpclient.DownloadData(url); diff --git a/ApiControllers/rep_eva03Controllers.cs b/ApiControllers/rep_eva03Controllers.cs index 880187d..60594fd 100644 --- a/ApiControllers/rep_eva03Controllers.cs +++ b/ApiControllers/rep_eva03Controllers.cs @@ -96,10 +96,10 @@ namespace TodoAPI2.Controllers if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); //var httpclient = MyHelper.getHttpClient(Configuration); var httpclient = new WebClient(); - string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); - string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_reportsite"); - string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); - string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); + string mainurl = MyHelper.GetConfig(Configuration, "JasperReportServer:MainURL"); + string reportsite = MyHelper.GetConfig(Configuration, "JasperReportServer:reportsite"); + string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username"); + string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); string url = $"{mainurl}{reportsite}/rep_eva03.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; diff --git a/ApiControllers/rep_familyControllers.cs b/ApiControllers/rep_familyControllers.cs index be70d94..c79f61f 100644 --- a/ApiControllers/rep_familyControllers.cs +++ b/ApiControllers/rep_familyControllers.cs @@ -98,11 +98,10 @@ namespace TodoAPI2.Controllers if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); //var httpclient = MyHelper.getHttpClient(Configuration); var httpclient = new WebClient(); - string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); - string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_reportsite"); - string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); - string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); - + string mainurl = MyHelper.GetConfig(Configuration, "JasperReportServer:MainURL"); + string reportsite = MyHelper.GetConfig(Configuration, "JasperReportServer:reportsite"); + string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username"); + string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); string url = $"{mainurl}{reportsite}/rep_family.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; var data = httpclient.DownloadData(url); diff --git a/ApiControllers/rep_leave_summaryControllers.cs b/ApiControllers/rep_leave_summaryControllers.cs index 671c60b..00071d3 100644 --- a/ApiControllers/rep_leave_summaryControllers.cs +++ b/ApiControllers/rep_leave_summaryControllers.cs @@ -97,10 +97,10 @@ namespace TodoAPI2.Controllers if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); //var httpclient = MyHelper.getHttpClient(Configuration); var httpclient = new WebClient(); - string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); - string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_reportsite"); - string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); - string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); + string mainurl = MyHelper.GetConfig(Configuration, "JasperReportServer:MainURL"); + string reportsite = MyHelper.GetConfig(Configuration, "JasperReportServer:reportsite"); + string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username"); + string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); string url = $"{mainurl}{reportsite}/rep_leave_summary.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; diff --git a/ApiControllers/rep_leave_totalControllers.cs b/ApiControllers/rep_leave_totalControllers.cs index 4d3500a..f64c9ff 100644 --- a/ApiControllers/rep_leave_totalControllers.cs +++ b/ApiControllers/rep_leave_totalControllers.cs @@ -98,10 +98,11 @@ namespace TodoAPI2.Controllers if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); //var httpclient = MyHelper.getHttpClient(Configuration); var httpclient = new WebClient(); - string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); - string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_reportsite"); - string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); - string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); + + string mainurl = MyHelper.GetConfig(Configuration, "JasperReportServer:MainURL"); + string reportsite = MyHelper.GetConfig(Configuration, "JasperReportServer:reportsite"); + string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username"); + string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); string url = $"{mainurl}{reportsite}/rep_leave_total.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; diff --git a/ApiControllers/rep_leave_total_02Controllers.cs b/ApiControllers/rep_leave_total_02Controllers.cs index c9c1dcf..8f1ec3c 100644 --- a/ApiControllers/rep_leave_total_02Controllers.cs +++ b/ApiControllers/rep_leave_total_02Controllers.cs @@ -96,15 +96,11 @@ namespace TodoAPI2.Controllers { if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); var httpclient = new WebClient(); - var env_mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); - var env_reportsite = Environment.GetEnvironmentVariable("JasperReportServer_reportsite"); - var env_username = Environment.GetEnvironmentVariable("JasperReportServer_username"); - var env_password = Environment.GetEnvironmentVariable("JasperReportServer_password"); - string mainurl = !string.IsNullOrEmpty(env_mainurl) ? env_mainurl : Configuration["JasperReportServer:MainURL"]; - string reportsite = !string.IsNullOrEmpty(env_reportsite) ? env_reportsite : Configuration["JasperReportServer:reportsite"]; - string username = !string.IsNullOrEmpty(env_username) ? env_username : Configuration["JasperReportServer:username"]; - string password = !string.IsNullOrEmpty(env_password) ? env_password : Configuration["JasperReportServer:password"]; + string mainurl = MyHelper.GetConfig(Configuration, "JasperReportServer:MainURL"); + string reportsite = MyHelper.GetConfig(Configuration, "JasperReportServer:reportsite"); + string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username"); + string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); string url = $"{mainurl}{reportsite}/rep_leave_total_02.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; diff --git a/ApiControllers/rep_position_salaryControllers.cs b/ApiControllers/rep_position_salaryControllers.cs index ff0d6c8..e74ae05 100644 --- a/ApiControllers/rep_position_salaryControllers.cs +++ b/ApiControllers/rep_position_salaryControllers.cs @@ -98,10 +98,11 @@ namespace TodoAPI2.Controllers if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); //var httpclient = MyHelper.getHttpClient(Configuration); var httpclient = new WebClient(); - string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); - string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_reportsite"); - string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); - string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); + + string mainurl = MyHelper.GetConfig(Configuration, "JasperReportServer:MainURL"); + string reportsite = MyHelper.GetConfig(Configuration, "JasperReportServer:reportsite"); + string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username"); + string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); string url = $"{mainurl}{reportsite}/rep_position_salary.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; diff --git a/ApiControllers/rep_samanaControllers.cs b/ApiControllers/rep_samanaControllers.cs index aea229d..ca7fae3 100644 --- a/ApiControllers/rep_samanaControllers.cs +++ b/ApiControllers/rep_samanaControllers.cs @@ -97,10 +97,11 @@ namespace TodoAPI2.Controllers if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); //var httpclient = MyHelper.getHttpClient(Configuration); var httpclient = new WebClient(); - string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); - string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_reportsite"); - string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); - string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); + + string mainurl = MyHelper.GetConfig(Configuration, "JasperReportServer:MainURL"); + string reportsite = MyHelper.GetConfig(Configuration, "JasperReportServer:reportsite"); + string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username"); + string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); string url = $"{mainurl}{reportsite}/rep_samana.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; diff --git a/ApiControllers/rep_study_historyControllers.cs b/ApiControllers/rep_study_historyControllers.cs index 628c325..5a550c3 100644 --- a/ApiControllers/rep_study_historyControllers.cs +++ b/ApiControllers/rep_study_historyControllers.cs @@ -98,10 +98,11 @@ namespace TodoAPI2.Controllers if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); //var httpclient = MyHelper.getHttpClient(Configuration); var httpclient = new WebClient(); - string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); - string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_reportsite"); - string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); - string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); + + string mainurl = MyHelper.GetConfig(Configuration, "JasperReportServer:MainURL"); + string reportsite = MyHelper.GetConfig(Configuration, "JasperReportServer:reportsite"); + string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username"); + string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); string url = $"{mainurl}{reportsite}/rep_study_history.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; diff --git a/ApiControllers/rep_working_typeControllers.cs b/ApiControllers/rep_working_typeControllers.cs index dd6d9f4..a275a3b 100644 --- a/ApiControllers/rep_working_typeControllers.cs +++ b/ApiControllers/rep_working_typeControllers.cs @@ -98,10 +98,11 @@ namespace TodoAPI2.Controllers if (!MyHelper.checkAuth(Configuration, HttpContext)) return Unauthorized(); //var httpclient = MyHelper.getHttpClient(Configuration); var httpclient = new WebClient(); - string mainurl = Environment.GetEnvironmentVariable("JasperReportServer_MainURL"); - string reportsite = Environment.GetEnvironmentVariable("JasperReportServer_reportsite"); - string username = Environment.GetEnvironmentVariable("JasperReportServer_username"); - string password = Environment.GetEnvironmentVariable("JasperReportServer_password"); + + string mainurl = MyHelper.GetConfig(Configuration, "JasperReportServer:MainURL"); + string reportsite = MyHelper.GetConfig(Configuration, "JasperReportServer:reportsite"); + string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username"); + string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); string url = $"{mainurl}{reportsite}/rep_working_type.{model.filetype}?{MyHelper.GetParameterForJasperReport(model)}&j_username={username}&j_password={password}"; diff --git a/Models/eva_create_evaluation/eva_create_evaluationViewModel.cs b/Models/eva_create_evaluation/eva_create_evaluationViewModel.cs index 0dabdf5..5520c56 100644 --- a/Models/eva_create_evaluation/eva_create_evaluationViewModel.cs +++ b/Models/eva_create_evaluation/eva_create_evaluationViewModel.cs @@ -40,8 +40,6 @@ namespace TodoAPI2.Models { get { - string y = ""; - return evaluation_group_id_eva_evaluation_group_name + " " + performance_plan_id_eva_performance_plan_fiscal_year; } } diff --git a/Program.cs b/Program.cs index 2efaf62..4137403 100644 --- a/Program.cs +++ b/Program.cs @@ -23,20 +23,7 @@ namespace Test01 { logger.Debug("Init main"); - Console.Title = "BKK Application"; - - var DB_HOST = Environment.GetEnvironmentVariable("DB_HOST"); - var DB_PORT = Environment.GetEnvironmentVariable("DB_PORT"); - var DB_NAME = Environment.GetEnvironmentVariable("DB_NAME"); - var DB_USERNAME = Environment.GetEnvironmentVariable("DB_USERNAME"); - var DB_PASSWORD = Environment.GetEnvironmentVariable("DB_PASSWORD"); - string SiteInformation_appsite = Environment.GetEnvironmentVariable("SiteInformation_appsite"); - string SiteInformation_apisite = Environment.GetEnvironmentVariable("SiteInformation_apisite"); - string SiteInformation_mainsite = Environment.GetEnvironmentVariable("SiteInformation_mainsite"); - string SiteInformation_modulesite = Environment.GetEnvironmentVariable("SiteInformation_modulesite"); - string SiteInformation_sitename = Environment.GetEnvironmentVariable("SiteInformation_sitename"); - string SiteInformation_modulename = Environment.GetEnvironmentVariable("SiteInformation_modulename"); - string SiteInformation_chatsite = Environment.GetEnvironmentVariable("SiteInformation_chatsite"); + Console.Title = "TB320 EVA Application"; var host = BuildWebHost(args); diff --git a/Startup.cs b/Startup.cs index 5505fd7..db04e2b 100644 --- a/Startup.cs +++ b/Startup.cs @@ -62,15 +62,14 @@ namespace Test01 string connectionString = !string.IsNullOrEmpty(DB_HOST) ? envConnectionString : Configuration.GetConnectionString("mainDBConnectionString"); - string SiteInformation_appsite = Environment.GetEnvironmentVariable("SiteInformation_appsite"); - string SiteInformation_apisite = Environment.GetEnvironmentVariable("SiteInformation_apisite"); - string SiteInformation_mainsite = Environment.GetEnvironmentVariable("SiteInformation_mainsite"); + string SiteInformation_appsite = MyHelper.GetConfig(Configuration, "SiteInformation:appsite"); + string SiteInformation_apisite = MyHelper.GetConfig(Configuration, "SiteInformation:apisite"); + string SiteInformation_mainsite = MyHelper.GetConfig(Configuration, "SiteInformation:mainsite"); string SiteInformation_modulesite = Environment.GetEnvironmentVariable("SiteInformation_modulesite"); - string SiteInformation_sitename = Environment.GetEnvironmentVariable("SiteInformation_sitename"); + string SiteInformation_sitename = MyHelper.GetConfig(Configuration, "SiteInformation:sitename"); string SiteInformation_modulename = Environment.GetEnvironmentVariable("SiteInformation_modulename"); string SiteInformation_chatsite = Environment.GetEnvironmentVariable("SiteInformation_chatsite"); - string idUrl = Configuration["IdentityServer:url"]; string apiName = SiteInformation_apisite; string appsite = SiteInformation_appsite; @@ -311,7 +310,7 @@ namespace Test01 // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) { - string appsite = Environment.GetEnvironmentVariable("SiteInformation_appsite"); + string appsite = MyHelper.GetConfig(Configuration, "SiteInformation:appsite"); #region Error Page if (env.IsDevelopment()) diff --git a/Utils/FileUtil.cs b/Utils/FileUtil.cs index 74b9050..27454d6 100644 --- a/Utils/FileUtil.cs +++ b/Utils/FileUtil.cs @@ -45,12 +45,12 @@ namespace TTSW.Utils } public static StaticConfigModel GetStaticConfig() { - StaticConfigModel s = new StaticConfigModel(); + StaticConfigModel s = new StaticConfigModel(); - string logfile = Configuration["Files:LogFile"]; - string rootpath = Configuration["Directories:RootPath"]; - string logs = Configuration["Directories:Logs"]; - string files = Configuration["Directories:Files"]; + string logfile = MyHelper.GetConfig(Configuration, "Files:LogFile"); + string rootpath = MyHelper.GetConfig(Configuration, "Directories:RootPath"); + string logs = MyHelper.GetConfig(Configuration, "Directories:Logs"); + string files = MyHelper.GetConfig(Configuration, "Directories:Files"); if (!Directory.Exists(rootpath)) Directory.CreateDirectory(rootpath); if (!Directory.Exists(logs)) Directory.CreateDirectory(logs); diff --git a/Utils/MyHelper.cs b/Utils/MyHelper.cs index ee08381..1d35bda 100644 --- a/Utils/MyHelper.cs +++ b/Utils/MyHelper.cs @@ -250,10 +250,10 @@ public class MyHelper public static WebClient getHttpClient(IConfiguration Configuration) { - string mainurl = Configuration["JasperReportServer:MainURL"]; - string loginurl = Configuration["JasperReportServer:LoginURL"]; - string username = Configuration["JasperReportServer:username"]; - string password = Configuration["JasperReportServer:password"]; + string mainurl = MyHelper.GetConfig(Configuration, "JasperReportServer:MainURL"); + string loginurl = MyHelper.GetConfig(Configuration, "JasperReportServer:LoginURL"); + string username = MyHelper.GetConfig(Configuration, "JasperReportServer:username"); + string password = MyHelper.GetConfig(Configuration, "JasperReportServer:password"); WebClient httpclient = new WebClient(); string login_url = $"{loginurl}?j_username={username}&j_password={password}"; @@ -297,4 +297,15 @@ public class MyHelper return true; } + + public static string GetConfig(IConfiguration Configuration, string variable) + { + var env_var = Environment.GetEnvironmentVariable(variable); + if (string.IsNullOrEmpty(env_var)) + { + env_var = Environment.GetEnvironmentVariable(variable.Replace(":", "_")); + } + string var = !string.IsNullOrEmpty(env_var) ? env_var : Configuration[variable]; + return var; + } } diff --git a/ViewControllers/homeViewController.cs b/ViewControllers/homeViewController.cs index dd76e1d..6a4c27e 100644 --- a/ViewControllers/homeViewController.cs +++ b/ViewControllers/homeViewController.cs @@ -35,7 +35,7 @@ namespace TodoAPI2.Controllers Response.Cookies.Delete("user_id"); Response.Cookies.Delete("emp_id"); - string mainsite = Configuration["SiteInformation:mainsite"]; + string mainsite = MyHelper.GetConfig(Configuration, "SiteInformation:mainsite"); return Redirect(mainsite + "/logout"); } diff --git a/Views/Shared/_Layout.cshtml b/Views/Shared/_Layout.cshtml index d1e87ba..6ddbc2b 100644 --- a/Views/Shared/_Layout.cshtml +++ b/Views/Shared/_Layout.cshtml @@ -8,12 +8,8 @@ - - @Environment.GetEnvironmentVariable("SiteInformation_sitename") + + @MyHelper.GetConfig(Configuration, "SiteInformation:sitename") @@ -86,26 +82,26 @@