Comment out probation-related leave limit checks in LeaveRequestController and update appsettings.json to disable unused database connections
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m45s
All checks were successful
Build & Deploy Leave Service / build (push) Successful in 1m45s
This commit is contained in:
parent
252d8b5fa3
commit
6427cb4344
2 changed files with 11 additions and 11 deletions
|
|
@ -898,9 +898,9 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
|
||||
if (leaveType.Code.Trim().ToUpper() == "LV-005")
|
||||
{
|
||||
if (profile.IsProbation! == true)
|
||||
leaveLimit = 0;
|
||||
else
|
||||
// if (profile.IsProbation! == true)
|
||||
// leaveLimit = 0;
|
||||
// else
|
||||
{
|
||||
leaveLimit = leaveData == null ?
|
||||
10
|
||||
|
|
@ -912,11 +912,11 @@ namespace BMA.EHR.Leave.Service.Controllers
|
|||
|
||||
var restOldDay = leaveData == null ? 0 : leaveData.LeaveDays - 10;
|
||||
var restCurrentDay = 10.0;
|
||||
if (profile.IsProbation! == true)
|
||||
{
|
||||
restOldDay = 0;
|
||||
restCurrentDay = 0;
|
||||
}
|
||||
// if (profile.IsProbation! == true)
|
||||
// {
|
||||
// restOldDay = 0;
|
||||
// restCurrentDay = 0;
|
||||
// }
|
||||
if(restOldDay < 0)
|
||||
restOldDay = 0;
|
||||
var sumLeave = leaveData == null ? 0 : leaveData.LeaveDaysUsed;
|
||||
|
|
|
|||
|
|
@ -23,9 +23,9 @@
|
|||
"ExamConnection": "server=192.168.1.63;user=root;password=12345678;port=3306;database=hrms_exam;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
||||
"LeaveConnection": "server=192.168.1.63;user=root;password=12345678;port=3306;database=hrms_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
|
||||
|
||||
// "DefaultConnection": "server=172.27.17.68;user=user;password=cDldaqkwESWvuZ37Gr0n;port=3306;database=hrms;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
||||
// "ExamConnection": "server=172.27.17.68;user=user;password=cDldaqkwESWvuZ37Gr0n;port=3306;database=hrms_exam;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
||||
// "LeaveConnection": "server=172.27.17.68;user=user;password=cDldaqkwESWvuZ37Gr0n;port=3306;database=hrms_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
|
||||
//"DefaultConnection": "server=172.27.17.68;user=user;password=cDldaqkwESWvuZ37Gr0n;port=3306;database=hrms;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
||||
//"ExamConnection": "server=172.27.17.68;user=user;password=cDldaqkwESWvuZ37Gr0n;port=3306;database=hrms_exam;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;",
|
||||
//"LeaveConnection": "server=172.27.17.68;user=user;password=cDldaqkwESWvuZ37Gr0n;port=3306;database=hrms_leave;Convert Zero Datetime=True;Allow User Variables=true;Pooling=True;"
|
||||
},
|
||||
"Jwt": {
|
||||
//"Key": "HP-FnQMUj9msHMSD3T9HtdEnphAKoCJLEl85CIqROFI",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue