Skip to content

TD-1106 Allow supervisor self enrolment #1621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 9, 2023
Merged

TD-1106 Allow supervisor self enrolment #1621

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,14 +100,15 @@ public IActionResult AddSuperviseDelegate(MyStaffListViewModel model)
var supervisorEmail = GetUserEmail();

ModelState.Remove("Page");
if (ModelState.IsValid && supervisorEmail != model.DelegateEmail)
//if (ModelState.IsValid && supervisorEmail != model.DelegateEmail)
if (ModelState.IsValid)
{
AddSupervisorDelegateAndReturnId(adminId, model.DelegateEmail ?? String.Empty, supervisorEmail, centreId);
return RedirectToAction("MyStaffList", model.Page);
}
else
{
if (supervisorEmail == model.DelegateEmail) { ModelState.AddModelError("DelegateEmail", "The email address must not match the email address you are logged in with."); }
// if (supervisorEmail == model.DelegateEmail) { ModelState.AddModelError("DelegateEmail", "The email address must not match the email address you are logged in with."); }
ModelState.ClearErrorsForAllFieldsExcept("DelegateEmail");
return MyStaffList(model.SearchString, model.SortBy, model.SortDirection, model.Page);
}
Expand All @@ -133,7 +134,8 @@ public IActionResult AddMultipleSuperviseDelegates(AddMultipleSupervisorDelegate
var delegateEmailsList = NewlineSeparatedStringListHelper.SplitNewlineSeparatedList(model.DelegateEmails);
foreach (var delegateEmail in delegateEmailsList)
{
if (delegateEmail.Length > 0 && supervisorEmail != delegateEmail)
//if (delegateEmail.Length > 0 && supervisorEmail != delegateEmail)
if (delegateEmail.Length > 0)
{
if (RegexStringValidationHelper.IsValidEmail(delegateEmail))
{
Expand Down Expand Up @@ -867,11 +869,11 @@ public IActionResult QuickAddSupervisor(EnrolDelegateSupervisorRoleViewModel sup
SupervisorDelegateDetail = supervisorDelegate,
SupervisorRoleName = supervisorRole.SelfAssessmentSupervisorRoleId == null
? "Supervisor" : supervisorService.GetSupervisorRoleById((int)supervisorRole.SelfAssessmentSupervisorRoleId).RoleName,
SupervisorRoleCount = supervisorRole.SelfAssessmentSupervisorRoleId == null
SupervisorRoleCount = supervisorRole.SelfAssessmentSupervisorRoleId == null
? 0 : supervisorService.GetSupervisorRolesForSelfAssessment((int)supervisorRole.SelfAssessmentSupervisorRoleId).Count()

};
return View("SelectDelegateSupervisorRoleSummary",new Tuple<EnrolDelegateSummaryViewModel,int?>(model, supervisorRole.SelfAssessmentSupervisorRoleId));
return View("SelectDelegateSupervisorRoleSummary", new Tuple<EnrolDelegateSummaryViewModel, int?>(model, supervisorRole.SelfAssessmentSupervisorRoleId));
}
}

Expand Down