fix leave report เพิ่ม leavesubtype แก้ตัวเลขให้แสดงเลขไทย
This commit is contained in:
Suphonchai Phoonsawat
parent
28b573bfb8
commit
d408d875db
1 changed files with 152 additions and 142 deletions
|
|
@ -154,25 +154,26 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
reportName = $"leave_form",
|
reportName = $"leave_form",
|
||||||
data = new
|
data = new
|
||||||
{
|
{
|
||||||
leaveWrote = data.LeaveWrote ?? "",
|
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveTypeName = data.Type.Name,
|
leaveTypeName = data.Type.Name,
|
||||||
dear = data.Dear,
|
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||||
|
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||||
fullname = fullName,
|
fullname = fullName,
|
||||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||||
organizationName = profile.Oc,
|
organizationName = profile!.Oc!.ToThaiNumber(),
|
||||||
leaveDetail = data.LeaveDetail,
|
leaveDetail = data.LeaveDetail.ToThaiNumber(),
|
||||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate),
|
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
|
||||||
leaveAddress = data.LeaveAddress,
|
leaveAddress = data.LeaveAddress.ToThaiNumber(),
|
||||||
leaveNumber = data.LeaveNumber,
|
leaveNumber = data.LeaveNumber.ToThaiNumber(),
|
||||||
LeaveLastStart = lastLeaveRequest == null ? "" : lastLeaveRequest.LeaveStartDate.Date.ToThaiShortDate(),
|
LeaveLastStart = lastLeaveRequest == null ? "" : lastLeaveRequest.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
LeaveLastEnd = lastLeaveRequest == null ? "" : lastLeaveRequest.LeaveEndDate.Date.ToThaiShortDate(),
|
LeaveLastEnd = lastLeaveRequest == null ? "" : lastLeaveRequest.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
|
|
||||||
LeaveSummary = sumLeave,
|
LeaveSummary = sumLeave.ToString().ToThaiNumber(),
|
||||||
LeaveRemain = data.Type.Limit - sumLeave,
|
LeaveRemain = (data.Type.Limit - sumLeave).ToString().ToThaiNumber(),
|
||||||
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -205,21 +206,22 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
reportName = $"leave_form",
|
reportName = $"leave_form",
|
||||||
data = new
|
data = new
|
||||||
{
|
{
|
||||||
leaveWrote = data.LeaveWrote ?? "",
|
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveTypeName = data.Type.Name,
|
leaveTypeName = data.Type.Name,
|
||||||
dear = data.Dear,
|
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||||
|
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||||
fullname = fullName,
|
fullname = fullName,
|
||||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||||
organizationName = profile!.Oc ?? "",
|
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||||
wifeDayName = data.WifeDayName ?? "",
|
wifeDayName = data.WifeDayName ?? "",
|
||||||
wifeDayDateBorn = data.WifeDayDateBorn ?? "",
|
wifeDayDateBorn = data.WifeDayDateBorn.ToThaiNumber() ?? "",
|
||||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate),
|
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
|
||||||
leaveAddress = data.LeaveAddress,
|
leaveAddress = data.LeaveAddress.ToThaiNumber(),
|
||||||
leaveNumber = data.LeaveNumber,
|
leaveNumber = data.LeaveNumber.ToThaiNumber(),
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -251,26 +253,27 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
reportName = $"leave_form",
|
reportName = $"leave_form",
|
||||||
data = new
|
data = new
|
||||||
{
|
{
|
||||||
leaveWrote = data.LeaveWrote ?? "",
|
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveTypeName = data.Type.Name,
|
leaveTypeName = data.Type.Name,
|
||||||
dear = data.Dear,
|
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||||
|
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||||
fullname = fullName,
|
fullname = fullName,
|
||||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||||
organizationName = profile!.Oc ?? "",
|
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||||
|
|
||||||
restDayOldTotal = data.RestDayOldTotal,
|
restDayOldTotal = data.RestDayOldTotal.ToString().ToThaiNumber(),
|
||||||
restDayCurrentTotal = data.RestDayCurrentTotal,
|
restDayCurrentTotal = data.RestDayCurrentTotal.ToString().ToThaiNumber(),
|
||||||
|
|
||||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate),
|
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
|
||||||
leaveAddress = data.LeaveAddress,
|
leaveAddress = data.LeaveAddress.ToThaiNumber(),
|
||||||
leaveNumber = data.LeaveNumber,
|
leaveNumber = data.LeaveNumber.ToThaiNumber(),
|
||||||
|
|
||||||
LeaveSummary = sumLeave,
|
LeaveSummary = sumLeave.ToString().ToThaiNumber(),
|
||||||
LeaveRemain = data.Type.Limit - sumLeave,
|
LeaveRemain = (data.Type.Limit - sumLeave).ToString().ToThaiNumber(),
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -302,22 +305,23 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
reportName = $"leave_form",
|
reportName = $"leave_form",
|
||||||
data = new
|
data = new
|
||||||
{
|
{
|
||||||
leaveWrote = data.LeaveWrote ?? "",
|
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveTypeName = data.Type.Name,
|
leaveTypeName = data.Type.Name,
|
||||||
dear = data.Dear,
|
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||||
|
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||||
fullname = fullName,
|
fullname = fullName,
|
||||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||||
organizationName = profile!.Oc ?? "",
|
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||||
|
|
||||||
|
|
||||||
leavegovernmentDate = data.LeaveGovernmentDate == null ? "" : data.LeaveGovernmentDate.Value.Date.ToThaiShortDate(),
|
leavegovernmentDate = data.LeaveGovernmentDate == null ? "" : data.LeaveGovernmentDate.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
hajjDayStatus = data.HajjDayStatus,
|
hajjDayStatus = data.HajjDayStatus,
|
||||||
|
|
||||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate),
|
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
|
||||||
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -330,28 +334,29 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
reportName = $"leave_form",
|
reportName = $"leave_form",
|
||||||
data = new
|
data = new
|
||||||
{
|
{
|
||||||
leaveWrote = data.LeaveWrote ?? "",
|
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveTypeName = data.Type.Name,
|
leaveTypeName = data.Type.Name,
|
||||||
dear = data.Dear,
|
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||||
|
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||||
fullname = fullName,
|
fullname = fullName,
|
||||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||||
organizationName = profile!.Oc ?? "",
|
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||||
|
|
||||||
leavebirthDate = data.LeaveBirthDate == null ? "" : data.LeaveBirthDate.Value.Date.ToThaiShortDate(),
|
leavebirthDate = data.LeaveBirthDate == null ? "" : data.LeaveBirthDate.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leavegovernmentDate = data.LeaveGovernmentDate == null ? "" : data.LeaveGovernmentDate.Value.Date.ToThaiShortDate(),
|
leavegovernmentDate = data.LeaveGovernmentDate == null ? "" : data.LeaveGovernmentDate.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
ordainDayStatus = data.OrdainDayStatus,
|
ordainDayStatus = data.OrdainDayStatus,
|
||||||
ordainDayLocationName = data.OrdainDayLocationName,
|
ordainDayLocationName = data.OrdainDayLocationName.ToThaiNumber(),
|
||||||
ordainDayLocationAddress = data.OrdainDayLocationAddress,
|
ordainDayLocationAddress = data.OrdainDayLocationAddress.ToThaiNumber(),
|
||||||
ordainDayLocationNumber = data.OrdainDayLocationNumber,
|
ordainDayLocationNumber = data.OrdainDayLocationNumber.ToThaiNumber(),
|
||||||
ordainDayOrdination = data.OrdainDayOrdination,
|
ordainDayOrdination = data.OrdainDayOrdination.ToThaiShortDate().ToThaiNumber(),
|
||||||
ordainDayBuddhistLentName = data.OrdainDayBuddhistLentName,
|
ordainDayBuddhistLentName = data.OrdainDayBuddhistLentName.ToThaiNumber(),
|
||||||
ordainDayBuddhistLentAddress = data.OrdainDayBuddhistLentAddress,
|
ordainDayBuddhistLentAddress = data.OrdainDayBuddhistLentAddress.ToThaiNumber(),
|
||||||
|
|
||||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate),
|
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
|
||||||
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -383,24 +388,25 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
reportName = $"leave_form",
|
reportName = $"leave_form",
|
||||||
data = new
|
data = new
|
||||||
{
|
{
|
||||||
leaveWrote = data.LeaveWrote ?? "",
|
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveTypeName = data.Type.Name,
|
leaveTypeName = data.Type.Name,
|
||||||
dear = data.Dear,
|
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||||
|
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||||
fullname = fullName,
|
fullname = fullName,
|
||||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||||
organizationName = profile!.Oc ?? "",
|
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||||
|
|
||||||
absentDaySummon = data.AbsentDaySummon,
|
absentDaySummon = data.AbsentDaySummon.ToThaiNumber(),
|
||||||
absentDayLocation = data.AbsentDayLocation,
|
absentDayLocation = data.AbsentDayLocation.ToThaiNumber(),
|
||||||
absentDayRegistorDate = data.AbsentDayRegistorDate.Date.ToThaiShortDate(),
|
absentDayRegistorDate = data.AbsentDayRegistorDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
absentDayGetIn = data.AbsentDayGetIn,
|
absentDayGetIn = data.AbsentDayGetIn.ToThaiNumber(),
|
||||||
absentDayAt = data.AbsentDayAt,
|
absentDayAt = data.AbsentDayAt.ToThaiNumber(),
|
||||||
|
|
||||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate),
|
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
|
||||||
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -431,32 +437,33 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
reportName = $"leave_form",
|
reportName = $"leave_form",
|
||||||
data = new
|
data = new
|
||||||
{
|
{
|
||||||
leaveWrote = data.LeaveWrote ?? "",
|
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveTypeName = data.Type.Name,
|
leaveTypeName = data.Type.Name,
|
||||||
dear = data.Dear,
|
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||||
|
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||||
fullname = fullName,
|
fullname = fullName,
|
||||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||||
organizationName = profile!.Oc ?? "",
|
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||||
|
|
||||||
leavebirthDate = data.LeaveBirthDate == null ? "" : data.LeaveBirthDate.Value.Date.ToThaiShortDate(),
|
leavebirthDate = data.LeaveBirthDate == null ? "" : data.LeaveBirthDate.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leavegovernmentDate = data.LeaveGovernmentDate == null ? "" : data.LeaveGovernmentDate.Value.Date.ToThaiShortDate(),
|
leavegovernmentDate = data.LeaveGovernmentDate == null ? "" : data.LeaveGovernmentDate.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveSalary = data.LeaveSalary,
|
leaveSalary = data.LeaveSalary == null ? "" : data.LeaveSalary.Value.ToNumericText().ToThaiNumber(),
|
||||||
leaveSalaryText = data.LeaveSalaryText,
|
leaveSalaryText = data.LeaveSalaryText.ToThaiNumber(),
|
||||||
studyDaySubject = data.StudyDaySubject ?? "",
|
studyDaySubject = data.StudyDaySubject.ToThaiNumber() ?? "",
|
||||||
studyDayDegreeLevel = data.StudyDayDegreeLevel ?? "",
|
studyDayDegreeLevel = data.StudyDayDegreeLevel.ToThaiNumber() ?? "",
|
||||||
studyDayUniversityName = data.StudyDayUniversityName ?? "",
|
studyDayUniversityName = data.StudyDayUniversityName.ToThaiNumber() ?? "",
|
||||||
studyDayCountry = data.StudyDayCountry ?? "",
|
studyDayCountry = data.StudyDayCountry.ToThaiNumber() ?? "",
|
||||||
studyDayScholarship = data.StudyDayScholarship ?? "",
|
studyDayScholarship = data.StudyDayScholarship.ToThaiNumber() ?? "",
|
||||||
studyDayTrainingSubject = data.StudyDayTrainingSubject ?? "",
|
studyDayTrainingSubject = data.StudyDayTrainingSubject.ToThaiNumber() ?? "",
|
||||||
studyDayTrainingName = data.StudyDayTrainingName ?? "",
|
studyDayTrainingName = data.StudyDayTrainingName.ToThaiNumber() ?? "",
|
||||||
|
|
||||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate),
|
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
|
||||||
leaveAddress = data.LeaveAddress,
|
leaveAddress = data.LeaveAddress.ToThaiNumber(),
|
||||||
leaveNumber = data.LeaveNumber,
|
leaveNumber = data.LeaveNumber.ToThaiNumber(),
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -486,18 +493,19 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
reportName = $"leave_form",
|
reportName = $"leave_form",
|
||||||
data = new
|
data = new
|
||||||
{
|
{
|
||||||
leaveWrote = data.LeaveWrote ?? "",
|
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveTypeName = data.Type.Name,
|
leaveTypeName = data.Type.Name,
|
||||||
dear = data.Dear,
|
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||||
|
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||||
fullname = fullName,
|
fullname = fullName,
|
||||||
fullnameEng = "",
|
fullnameEng = "",
|
||||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||||
organizationName = profile!.Oc ?? "",
|
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||||
|
|
||||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
@ -528,32 +536,33 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
reportName = $"leave_form",
|
reportName = $"leave_form",
|
||||||
data = new
|
data = new
|
||||||
{
|
{
|
||||||
leaveWrote = data.LeaveWrote ?? "",
|
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveTypeName = data.Type.Name,
|
leaveTypeName = data.Type.Name,
|
||||||
dear = data.Dear,
|
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||||
|
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||||
fullname = fullName,
|
fullname = fullName,
|
||||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||||
organizationName = profile!.Oc ?? "",
|
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||||
|
|
||||||
leaveSalary = data.LeaveSalary,
|
leaveSalary = data.LeaveSalary == null ? "" : data.LeaveSalary.Value.ToNumericText().ToThaiNumber(),
|
||||||
leaveSalaryText = data.LeaveSalaryText,
|
leaveSalaryText = data.LeaveSalaryText.ToThaiNumber(),
|
||||||
coupleDayName = data.CoupleDayName,
|
coupleDayName = data.CoupleDayName.ToThaiNumber(),
|
||||||
coupleDayLevel = data.CoupleDayLevel,
|
coupleDayLevel = data.CoupleDayLevel.ToThaiNumber(),
|
||||||
coupleDayPosition = data.CoupleDayPosition,
|
coupleDayPosition = data.CoupleDayPosition.ToThaiNumber(),
|
||||||
coupleDayOrganizationName = "-",
|
coupleDayOrganizationName = "-",
|
||||||
coupleDayLevelCountry = data.CoupleDayLevelCountry,
|
coupleDayLevelCountry = data.CoupleDayLevelCountry.ToThaiNumber(),
|
||||||
coupleDayCountryHistory = data.CoupleDayCountryHistory ?? "",
|
coupleDayCountryHistory = data.CoupleDayCountryHistory!.ToThaiNumber() ?? "",
|
||||||
coupleDayTotalHistory = data.CoupleDayTotalHistory ?? "",
|
coupleDayTotalHistory = data.CoupleDayTotalHistory!.ToThaiNumber() ?? "",
|
||||||
coupleDayStartDateHistory = data.CoupleDayStartDateHistory == null ? "" : data.CoupleDayStartDateHistory.Value.Date.ToThaiShortDate(),
|
coupleDayStartDateHistory = data.CoupleDayStartDateHistory == null ? "" : data.CoupleDayStartDateHistory.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
coupleDayEndDateHistory = data.CoupleDayEndDateHistory == null ? "" : data.CoupleDayEndDateHistory.Value.Date.ToThaiShortDate(),
|
coupleDayEndDateHistory = data.CoupleDayEndDateHistory == null ? "" : data.CoupleDayEndDateHistory.Value.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
coupleDaySumTotalHistory = data.CoupleDaySumTotalHistory,
|
coupleDaySumTotalHistory = data.CoupleDaySumTotalHistory!.ToThaiNumber(),
|
||||||
|
|
||||||
|
|
||||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate),
|
LeaveTotal = data.LeaveStartDate.DiffDay(data.LeaveEndDate).ToString().ToThaiNumber(),
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
@ -583,20 +592,21 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
reportName = $"leave_form",
|
reportName = $"leave_form",
|
||||||
data = new
|
data = new
|
||||||
{
|
{
|
||||||
leaveWrote = data.LeaveWrote ?? "",
|
leaveWrote = data.LeaveWrote.ToThaiNumber() ?? "",
|
||||||
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate(),
|
dateSendLeave = data.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveTypeName = data.Type.Name,
|
leaveTypeName = data.Type.Name,
|
||||||
dear = data.Dear,
|
leaveSubTypeName = data.LeaveSubTypeName != null ? data.LeaveSubTypeName.ToThaiNumber() : "",
|
||||||
|
dear = data.CommanderPosition == null ? data.Dear : data.CommanderPosition.ToThaiNumber(),
|
||||||
fullname = fullName,
|
fullname = fullName,
|
||||||
positionName = profile!.Position == null ? "-" : profile!.Position,
|
positionName = profile!.Position == null ? "-" : profile!.Position.ToThaiNumber(),
|
||||||
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName,
|
positionLeaveName = profile!.PositionLeaveName == null ? "-" : profile!.PositionLeaveName.ToThaiNumber(),
|
||||||
organizationName = profile!.Oc ?? "",
|
organizationName = profile!.Oc!.ToThaiNumber() ?? "",
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate(),
|
leaveDateStart = data.LeaveStartDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate(),
|
leaveDateEnd = data.LeaveEndDate.Date.ToThaiShortDate().ToThaiNumber(),
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue