diff --git a/BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs b/BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs index 06f1d00d..9a57f68c 100644 --- a/BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs +++ b/BMA.EHR.Application/Repositories/RetirementEmployeeRepository.cs @@ -282,10 +282,10 @@ namespace BMA.EHR.Application.Repositories { rawData.Status = "PENDING"; // rawData.LeaveComment = reason; - if (rawData.Group != "1.1") - { - rawData.ApproveStep = "st3"; - } + // if (rawData.Group != "1.1") + // { + rawData.ApproveStep = "st3"; + // } // TODO: Send notification to 1st Approver @@ -373,10 +373,10 @@ namespace BMA.EHR.Application.Repositories { rawData.Status = "PENDING"; // rawData.LeaveComment = reason; - if (rawData.Group != "1.1") - { - rawData.ApproveStep = "st3"; - } + // if (rawData.Group != "1.1") + // { + rawData.ApproveStep = "st3"; + // } // TODO: Send notification to 1st Approver @@ -465,7 +465,7 @@ namespace BMA.EHR.Application.Repositories } else { - rawData.ApproveStep = "st3"; + rawData.ApproveStep = "st4"; } // Send Noti @@ -549,7 +549,7 @@ namespace BMA.EHR.Application.Repositories } else { - rawData.ApproveStep = "st3"; + rawData.ApproveStep = "st4"; } // Send Noti diff --git a/BMA.EHR.Application/Repositories/RetirementRepository.cs b/BMA.EHR.Application/Repositories/RetirementRepository.cs index 46cb75d5..7267b0c7 100644 --- a/BMA.EHR.Application/Repositories/RetirementRepository.cs +++ b/BMA.EHR.Application/Repositories/RetirementRepository.cs @@ -206,10 +206,10 @@ namespace BMA.EHR.Application.Repositories else { rawData.Status = "PENDING"; - if (rawData.Group != "1.1") - { - rawData.ApproveStep = "st3"; - } + // if (rawData.Group != "1.1") + // { + rawData.ApproveStep = "st3"; + // } // TODO: Send notification to 1st Approver var firstCommander = rawData.Approvers @@ -296,10 +296,10 @@ namespace BMA.EHR.Application.Repositories { rawData.Status = "PENDING"; // rawData.LeaveComment = reason; - if (rawData.Group != "1.1") - { - rawData.ApproveStep = "st3"; - } + // if (rawData.Group != "1.1") + // { + rawData.ApproveStep = "st3"; + // } // TODO: Send notification to 1st Approver var firstCommander = rawData.Approvers @@ -387,7 +387,7 @@ namespace BMA.EHR.Application.Repositories } else { - rawData.ApproveStep = "st3"; + rawData.ApproveStep = "st4"; } if (rawData.profileId != null) @@ -473,7 +473,7 @@ namespace BMA.EHR.Application.Repositories } else { - rawData.ApproveStep = "st3"; + rawData.ApproveStep = "st4"; } // Send Noti