hrms-bangkok/hrms-api-backend
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

fix issue : 1113

Browse source
This commit is contained in:
Suphonchai Phoonsawat 2024-11-12 09:56:58 +07:00
parent ddb541c819
commit 3cad108cef
8 changed files with 1328 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
BMA.EHR.Leave/Controllers/LeaveReportController.cs
View file

@ -518,10 +518,10 @@ namespace BMA.EHR.Leave.Service.Controllers
coupleDayPosition = data.CoupleDayPosition,
coupleDayOrganizationName = "-",
coupleDayLevelCountry = data.CoupleDayLevelCountry,
coupleDayCountryHistory = data.CoupleDayCountryHistory,
coupleDayTotalHistory = data.CoupleDayTotalHistory,
coupleDayStartDateHistory = data.CoupleDayStartDateHistory.Date.ToThaiShortDate(),
coupleDayEndDateHistory = data.CoupleDayEndDateHistory.Date.ToThaiShortDate(),
coupleDayCountryHistory = data.CoupleDayCountryHistory ?? "",
coupleDayTotalHistory = data.CoupleDayTotalHistory ?? "",
coupleDayStartDateHistory = data.CoupleDayStartDateHistory == null ? "" : data.CoupleDayStartDateHistory.Value.Date.ToThaiShortDate(),
coupleDayEndDateHistory = data.CoupleDayEndDateHistory == null ? "" : data.CoupleDayEndDateHistory.Value.Date.ToThaiShortDate(),
coupleDaySumTotalHistory = data.CoupleDaySumTotalHistory,

2
BMA.EHR.Leave/Controllers/LeaveRequestController.cs
View file

@ -1109,7 +1109,7 @@ namespace BMA.EHR.Leave.Service.Controllers
CoupleDayLevelCountry = rawData.CoupleDayLevelCountry,
CoupleDayCountryHistory = rawData.CoupleDayCountryHistory,
CoupleDayTotalHistory = rawData.CoupleDayTotalHistory,
CoupleDayStartDateHistory = rawData.CoupleDayStartDateHistory,
CoupleDayStartDateHistory = rawData.CoupleDayStartDateHistory,
CoupleDayEndDateHistory = rawData.CoupleDayEndDateHistory,
CoupleDaySumTotalHistory = rawData.CoupleDaySumTotalHistory,

10
BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestByIdDto.cs
View file

@ -105,15 +105,15 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
public string CoupleDayLevelCountry { get; set; } = string.Empty;
public string CoupleDayCountryHistory { get; set; } = string.Empty;
public string? CoupleDayCountryHistory { get; set; }
public string CoupleDayTotalHistory { get; set; } = string.Empty;
public string? CoupleDayTotalHistory { get; set; }
public DateTime CoupleDayStartDateHistory { get; set; } = DateTime.Now;
public DateTime? CoupleDayStartDateHistory { get; set; }
public DateTime CoupleDayEndDateHistory { get; set; } = DateTime.Now;
public DateTime? CoupleDayEndDateHistory { get; set; }
public string CoupleDaySumTotalHistory { get; set; } = string.Empty;
public string? CoupleDaySumTotalHistory { get; set; }
public string? Dear { get; set; } = string.Empty;

10
BMA.EHR.Leave/DTOs/LeaveRequest/GetLeaveRequestForAdminByIdDto.cs
View file

@ -112,15 +112,15 @@ namespace BMA.EHR.Leave.Service.DTOs.LeaveRequest
public string CoupleDayLevelCountry { get; set; } = string.Empty;
public string CoupleDayCountryHistory { get; set; } = string.Empty;
public string? CoupleDayCountryHistory { get; set; }
public string CoupleDayTotalHistory { get; set; } = string.Empty;
public string? CoupleDayTotalHistory { get; set; }
public DateTime CoupleDayStartDateHistory { get; set; } = DateTime.Now;
public DateTime? CoupleDayStartDateHistory { get; set; }
public DateTime CoupleDayEndDateHistory { get; set; } = DateTime.Now;
public DateTime? CoupleDayEndDateHistory { get; set; }
public string CoupleDaySumTotalHistory { get; set; } = string.Empty;
public string? CoupleDaySumTotalHistory { get; set; }
public string Dear { get; set; } = string.Empty;