Remove unnecessary whitespace and comment out unused code in LeaveReportController
This commit is contained in:
parent
e5e7c77880
commit
0a3f8ffe2b
1 changed files with 9 additions and 1 deletions
|
|
@ -168,7 +168,7 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
{
|
{
|
||||||
sumLeave += leaveData.BeginningLeaveDays;
|
sumLeave += leaveData.BeginningLeaveDays;
|
||||||
}
|
}
|
||||||
|
|
||||||
var Oc = profile.isCommission == false
|
var Oc = profile.isCommission == false
|
||||||
? profile.Oc.ToThaiNumber()
|
? profile.Oc.ToThaiNumber()
|
||||||
: profile.Oc.Replace("สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร", "สำนักงาน ก.ก.").ToThaiNumber();
|
: profile.Oc.Replace("สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร", "สำนักงาน ก.ก.").ToThaiNumber();
|
||||||
|
|
@ -2885,6 +2885,14 @@ namespace BMA.EHR.Leave.Service.Controllers
|
||||||
|
|
||||||
var leaveDays = await _leaveRequestRepository.GetSumApproveLeaveByRootAndRange(req.StartDate, req.EndDate, type, jsonData["result"]?.ToString(), nodeId, profileAdmin?.Node, req.nodeId, req.node);
|
var leaveDays = await _leaveRequestRepository.GetSumApproveLeaveByRootAndRange(req.StartDate, req.EndDate, type, jsonData["result"]?.ToString(), nodeId, profileAdmin?.Node, req.nodeId, req.node);
|
||||||
var enddate = req.EndDate.Date == req.StartDate.Date ? "" : $" - {req.EndDate.Date.ToThaiShortDate().ToThaiNumber()}";
|
var enddate = req.EndDate.Date == req.StartDate.Date ? "" : $" - {req.EndDate.Date.ToThaiShortDate().ToThaiNumber()}";
|
||||||
|
|
||||||
|
// var thisYear = req.StartDate.Year;
|
||||||
|
// var toDay = req.StartDate.Date;
|
||||||
|
// if (toDay >= new DateTime(toDay.Year, 10, 1) && toDay <= new DateTime(toDay.Year, 12, 31))
|
||||||
|
// thisYear = thisYear + 1;
|
||||||
|
|
||||||
|
// var leaveData = await _leaveBeginningRepository.GetByYearAndTypeIdForUser2Async(thisYear, type, data.KeycloakUserId);
|
||||||
|
|
||||||
var result = new
|
var result = new
|
||||||
{
|
{
|
||||||
template = "leave2",
|
template = "leave2",
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue