Skip to content

DLSV2-560 Remove Staff member from my staff list results in error #1308

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
Aug 3, 2022
Merged

DLSV2-560 Remove Staff member from my staff list results in error #1308

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions DigitalLearningSolutions.Web/Views/Supervisor/RemoveConfirm.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
@Html.HiddenFor(m => m.LastName)
@Html.HiddenFor(m => m.DelegateEmail)
@Html.HiddenFor(m => m.CandidateAssessmentCount)
@Html.HiddenFor(m => m.ReturnPageQuery)
</form>

<vc:cancel-link-with-return-page-query asp-controller="Supervisor" asp-action="MyStaffList" return-page-query="@Model.ReturnPageQuery" />
Expand Down
44 changes: 29 additions & 15 deletions DigitalLearningSolutions.Web/Views/Supervisor/Shared/_StaffMemberCard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,16 +71,30 @@
<partial name="Shared/_StaffDetails" model="Model.SupervisorDelegateDetail" view-data="@(new ViewDataDictionary(ViewData){{"isSupervisor", Model.IsUserSupervisor}})" />
}
</div>
<a class="nhsuk-button nhsuk-button--danger nhsuk-u-margin-top-4 button-small"
data-return-page-enabled="true"
asp-action="@(Model.SupervisorDelegateDetail.CandidateAssessmentCount == 0 ? "RemoveSupervisorDelegate" : "RemoveSupervisorDelegateConfirm")"
asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID"
asp-route-returnPageQuery="@Model.ReturnPageQuery">
Remove staff member
</a>

</div>

@if (Model.SupervisorDelegateDetail.CandidateAssessmentCount == 0)
{
<form method="post">
<button class="nhsuk-button nhsuk-button--danger nhsuk-u-margin-top-4 button-small" data-return-page-enabled="true"
asp-action="RemoveSupervisorDelegate"
asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID">
Remove staff member
</button>
@Html.Hidden("Id", Model.SupervisorDelegateDetail.ID)
@Html.Hidden("DelegateEmail", Model.SupervisorDelegateDetail.DelegateEmail)
@Html.Hidden("ConfirmedRemove", true)
@Html.HiddenFor(m => m.ReturnPageQuery)
</form>
}
else
{
<a class="nhsuk-button nhsuk-button--danger nhsuk-u-margin-top-4 button-small" data-return-page-enabled="true"
asp-action="RemoveSupervisorDelegateConfirm"
asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID"
asp-route-returnPageQuery="@Model.ReturnPageQuery">
Remove staff member
</a>
}
</div>
</details>
@if (Model.SupervisorDelegateDetail.CandidateID != null)
{
Expand All @@ -95,11 +109,11 @@
else if (Model.SupervisorDelegateDetail.AddedByDelegate)
{
<a class="nhsuk-button nhsuk-u-margin-left-4 nhsuk-u-margin-top-0"
aria-describedby="@Model.SupervisorDelegateDetail.ID-name"
asp-controller="Supervisor"
asp-action="ConfirmSupervise"
asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID">
aria-describedby="@Model.SupervisorDelegateDetail.ID-name"
asp-controller="Supervisor"
asp-action="ConfirmSupervise"
asp-route-supervisorDelegateId="@Model.SupervisorDelegateDetail.ID">
Confirm
</a>
}
</div>
</div>