diff --git a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs index a4fc6fde..dc581c20 100644 --- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs @@ -1827,15 +1827,18 @@ namespace BMA.EHR.Leave.Service.Controllers //var sumHoliday = await _holidayRepository.GetHolidayCountAsync(rawData.LeaveStartDate, rawData.LeaveEndDate, category); //var sumWeekend = _holidayRepository.GetWeekEndCount(rawData.LeaveStartDate, rawData.LeaveEndDate, category); + // fix issue : ระบบการลา>>สังกัด ฝ่าย (เอา / ออก เปลี่ยนเป็นว่าง) #1131 + + var orgName = rawData.Root ?? ""; if (rawData.Child1 != null && rawData.Child1 != "") - orgName += $"/{rawData.Child1}"; + orgName += $" {rawData.Child1}"; if (rawData.Child2 != null && rawData.Child2 != "") - orgName += $"/{rawData.Child2}"; + orgName += $" {rawData.Child2}"; if (rawData.Child3 != null && rawData.Child3 != "") - orgName += $"/{rawData.Child3}"; + orgName += $" {rawData.Child3}"; if (rawData.Child4 != null && rawData.Child4 != "") - orgName += $"/{rawData.Child4}"; + orgName += $" {rawData.Child4}"; var result = new GetLeaveRequestForAdminByIdDto { diff --git a/BMA.EHR.Retirement.Service/Program.cs b/BMA.EHR.Retirement.Service/Program.cs index 817b710a..31c7ad92 100644 --- a/BMA.EHR.Retirement.Service/Program.cs +++ b/BMA.EHR.Retirement.Service/Program.cs @@ -82,15 +82,14 @@ var builder = WebApplication.CreateBuilder(args); .SetIsOriginAllowedToAllowWildcardSubdomains(); })); - builder.Services.AddHttpClient(); - - // Add services to the container. builder.Services.AddApplication(); - builder.Services.AddPersistence(builder.Configuration); builder.Services.AddLeaveApplication(); + builder.Services.AddPersistence(builder.Configuration); builder.Services.AddLeavePersistence(builder.Configuration); + builder.Services.AddHttpClient(); + builder.Services.AddControllers(options => { options.SuppressAsyncSuffixInActionNames = false; @@ -110,6 +109,7 @@ var builder = WebApplication.CreateBuilder(args); options.UseMySql(disciplineConnection, ServerVersion.AutoDetect(disciplineConnection))); builder.Services.AddHealthChecks(); + // Add Hangfire services. builder.Services.AddHangfire(configuration => configuration .SetDataCompatibilityLevel(CompatibilityLevel.Version_170) @@ -161,10 +161,12 @@ var app = builder.Build(); app.UseStaticFiles(); app.MapControllers(); app.UseMiddleware(); + app.UseHangfireDashboard("/hangfire", new DashboardOptions() { Authorization = new[] { new CustomAuthorizeFilter() } }); + var manager = new RecurringJobManager(); if (manager != null) {