api report probation ดิงจากenv

This commit is contained in:
Kittapath 2023-09-12 11:59:29 +07:00
parent bf1c2fe925
commit 5f45985531
2 changed files with 14 additions and 9 deletions

View file

@ -8,6 +8,7 @@ using Microsoft.EntityFrameworkCore;
using System.Net.Http.Headers;
using Newtonsoft.Json;
using System.Globalization;
using Microsoft.Extensions.Configuration;
namespace BMA.EHR.Application.Repositories.Reports
{
@ -18,6 +19,7 @@ namespace BMA.EHR.Application.Repositories.Reports
private readonly IApplicationDBContext _dbContext;
private readonly IWebHostEnvironment _hostingEnvironment;
private readonly NotificationRepository _repositoryNoti;
private readonly IConfiguration _configuration;
#endregion
@ -25,11 +27,13 @@ namespace BMA.EHR.Application.Repositories.Reports
public ProbationReportRepository(IApplicationDBContext dbContext,
NotificationRepository repositoryNoti,
IWebHostEnvironment hostEnvironment)
IWebHostEnvironment hostEnvironment,
IConfiguration configuration)
{
_dbContext = dbContext;
_hostingEnvironment = hostEnvironment;
_repositoryNoti = repositoryNoti;
_configuration = configuration;
}
#endregion
@ -39,7 +43,7 @@ namespace BMA.EHR.Application.Repositories.Reports
#region
public async Task<object> GetProbationAssignAsync(Guid assign_id, string token)
{
var api_url = $"https://bma-ehr.frappet.synology.me/api/v1/probation/assign/probation-assign?assign_id={assign_id}";
var api_url = $"{_configuration["APIPROBATION"]}assign/probation-assign?assign_id={assign_id}";
ProbationAssignResponse probation_assign;
using (var client = new HttpClient())
{
@ -90,7 +94,7 @@ namespace BMA.EHR.Application.Repositories.Reports
#region (, )
public async Task<object> GetEvaluateRecordAsync(Guid assign_id, string token)
{
var api_url = $"https://bma-ehr.frappet.synology.me/api/v1/probation/report/form-record?id={assign_id}";
var api_url = $"{_configuration["APIPROBATION"]}report/form-record?id={assign_id}";
EvaluateRecordAssignResponse evaluate_record;
using (var client = new HttpClient())
{
@ -138,7 +142,7 @@ namespace BMA.EHR.Application.Repositories.Reports
#region ()
public async Task<object> GetEvaluateAssignAsync(Guid id, string token)
{
var api_url = $"https://bma-ehr.frappet.synology.me/api/v1/probation/report/evaluate-commander?id={id}";
var api_url = $"{_configuration["APIPROBATION"]}report/evaluate-commander?id={id}";
EvaluateAssignResponse evaluate_assign;
using (var client = new HttpClient())
{
@ -186,7 +190,7 @@ namespace BMA.EHR.Application.Repositories.Reports
#region ()
public async Task<object> GetEvaluateChairmanAssignAsync(Guid id, string token)
{
var api_url = $"https://bma-ehr.frappet.synology.me/api/v1/probation/report/evaluate-chairman?id={id}";
var api_url = $"{_configuration["APIPROBATION"]}report/evaluate-chairman?id={id}";
EvaluateChairmanAssignResponse evaluate_assign;
using (var client = new HttpClient())
{
@ -234,7 +238,7 @@ namespace BMA.EHR.Application.Repositories.Reports
#region
public async Task<object> GetEvaluateResultAssignAsync(Guid id, string token)
{
var api_url = $"https://bma-ehr.frappet.synology.me/api/v1/probation/evaluate-result?assign_id={id}";
var api_url = $"{_configuration["APIPROBATION"]}evaluate-result?assign_id={id}";
EvaluateResultAssignResponse evaluate_assign;
using (var client = new HttpClient())
{
@ -260,7 +264,7 @@ namespace BMA.EHR.Application.Repositories.Reports
PassResult = evaluate_assign.data.evaluate.pass_result.ToString() == "1" ? "/" : " ",
NotPassResult = evaluate_assign.data.evaluate.pass_result.ToString() == "0" ? "/" : " ",
ExpandMonth = string.IsNullOrEmpty(evaluate_assign.data.evaluate.expand_month.ToString()) ? string.Empty : evaluate_assign.data.evaluate.expand_month.ToString().ToThaiNumber(),
ChairmanName = string.IsNullOrEmpty(evaluate_assign.data.chairman.name) ? string.Empty : evaluate_assign.data.chairman.name,
ChairmanName = string.IsNullOrEmpty(evaluate_assign.data.chairman.name) ? string.Empty : evaluate_assign.data.chairman.name,
ChairmanPosition = string.IsNullOrEmpty(evaluate_assign.data.chairman.Position) ? string.Empty : evaluate_assign.data.chairman.Position,
ChairmanDate = string.IsNullOrEmpty(evaluate_assign.data.evaluate.chairman_dated.ToString()) ? "วันที่ เดือน พ.ศ." : evaluate_assign.data.evaluate.chairman_dated.ToThaiFullDate().ToString().ToThaiNumber(),
};

View file

@ -45,7 +45,7 @@
},
{
"fontFamily": "TH SarabunPSK",
"path": "Fonts/THSarabunNew.ttf",
"path": "Fonts/THSarabunNew.ttf"
},
{
@ -54,5 +54,6 @@
"fontStyle": "Bold"
}
]
}
},
"APIPROBATION": "https://bma-ehr.frappet.synology.me/api/v1/probation/"
}