Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 41s
All checks were successful
Build & Deploy on Dev / build (push) Successful in 41s
This commit is contained in:
commit
a3ce42bba7
1 changed files with 4 additions and 1 deletions
|
|
@ -665,7 +665,10 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
|
||||||
EditorCondition = exam.EditorCondition,
|
EditorCondition = exam.EditorCondition,
|
||||||
EditorConfirm = exam.EditorConfirm,
|
EditorConfirm = exam.EditorConfirm,
|
||||||
Position = candidatePosition == null ? false : true,
|
Position = candidatePosition == null ? false : true,
|
||||||
CanRegister = exam.RegisterStartDate == null || exam.RegisterEndDate == null ? true : DateOnly.FromDateTime(exam.RegisterStartDate.Value) <= DateOnly.FromDateTime(DateTime.Now) && DateOnly.FromDateTime(exam.RegisterEndDate.Value) >= DateOnly.FromDateTime(DateTime.Now),
|
//CanRegister = exam.RegisterStartDate == null || exam.RegisterEndDate == null ? true : DateOnly.FromDateTime(exam.RegisterStartDate.Value) <= DateOnly.FromDateTime(DateTime.Now) && DateOnly.FromDateTime(exam.RegisterEndDate.Value) >= DateOnly.FromDateTime(DateTime.Now),
|
||||||
|
CanRegister = exam.RegisterStartDate == null || exam.RegisterEndDate == null
|
||||||
|
? true
|
||||||
|
: exam.RegisterStartDate.Value <= DateTime.Now && exam.RegisterEndDate.Value >= DateTime.Now,
|
||||||
RegisterEndDate = exam.RegisterEndDate,
|
RegisterEndDate = exam.RegisterEndDate,
|
||||||
RegisterStartDate = exam.RegisterStartDate,
|
RegisterStartDate = exam.RegisterStartDate,
|
||||||
graduationYearLock = exam.GraduationYearLock,
|
graduationYearLock = exam.GraduationYearLock,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue