Skip to content

TD-5657-Issue when submitting the review on frameworks section #3295

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
Jul 8, 2025
Merged

TD-5657-Issue when submitting the review on frameworks section #3295

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
19 changes: 18 additions & 1 deletion DigitalLearningSolutions.Web/Controllers/FrameworksController/Review.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,24 @@ public IActionResult SubmitFrameworkReview(int frameworkId, int reviewId, string
var framework = frameworkService.GetBaseFrameworkByFrameworkId(frameworkId, adminId);
if (framework.FrameworkReviewID == 0 || framework.FrameworkReviewID == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 410 });
int? commentId = null;
if (!string.IsNullOrWhiteSpace(comment)) commentId = frameworkService.InsertComment(frameworkId, adminId, comment, null);
if (string.IsNullOrWhiteSpace(comment))
{
ModelState.AddModelError("comment", "Please enter comment");
var frameworkReview = frameworkService.GetFrameworkReview(frameworkId, adminId, reviewId);
frameworkReview.SignedOff = signedOff;
var model = new SubmitReviewViewModel()
{
FrameworkId = frameworkId,
FrameworkName = framework.FrameworkName,
FrameworkReview = frameworkReview
};
return View("Developer/SubmitReview", model);
}
else
{
commentId = frameworkService.InsertComment(frameworkId, adminId, comment, null);
}

frameworkService.SubmitFrameworkReview(frameworkId, reviewId, signedOff, commentId);
frameworkNotificationService.SendReviewOutcomeNotification(reviewId, User.GetCentreIdKnownNotNull());
return RedirectToAction("ViewFramework", "Frameworks", new { frameworkId, tabname = "Structure" });
Expand Down
93 changes: 49 additions & 44 deletions DigitalLearningSolutions.Web/Views/Frameworks/Developer/SubmitReview.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,55 +1,60 @@
@using DigitalLearningSolutions.Web.ViewModels.Frameworks;
@model SubmitReviewViewModel;
@{
ViewData["Title"] = Model.FrameworkName;
ViewData["Application"] = "Framework Service";
ViewData["HeaderPathName"] = "Framework Service";
ViewData["Title"] = Model.FrameworkName;
ViewData["Application"] = "Framework Service";
ViewData["HeaderPathName"] = "Framework Service";
var errorHasOccurred = !ViewData.ModelState.IsValid;
}
@section NavBreadcrumbs {
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
<div class="nhsuk-width-container">
<ol class="nhsuk-breadcrumb__list">
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFrameworks" asp-route-tabname="Mine">Frameworks</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFramework" asp-route-frameworkId="@Model.FrameworkId" asp-route-tabname="Structure">Framework Structure</a></li>
<li class="nhsuk-breadcrumb__item">Send for Review</li>
</ol>
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ViewFramework" asp-route-frameworkId="@Model.FrameworkId" asp-route-tabname="Structure">Back to framework structure</a></p>
</div>
</nav>
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
<div class="nhsuk-width-container">
<ol class="nhsuk-breadcrumb__list">
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFrameworks" asp-route-tabname="Mine">Frameworks</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFramework" asp-route-frameworkId="@Model.FrameworkId" asp-route-tabname="Structure">Framework Structure</a></li>
<li class="nhsuk-breadcrumb__item">Send for Review</li>
</ol>
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ViewFramework" asp-route-frameworkId="@Model.FrameworkId" asp-route-tabname="Structure">Back to framework structure</a></p>
</div>
</nav>
}
<h1>Submit review</h1>
@if (Model.FrameworkReview.SignOffRequired)
<h1>Submit review</h1>
@if (Model.FrameworkReview.SignOffRequired)
{
<div class="nhsuk-warning-callout">
<h2 class="nhsuk-warning-callout__label">
<span role="text">
<span class="nhsuk-u-visually-hidden">Important: </span>
Approval required
</span>
</h2>
<p>Your approval is required before this framework can be published.</p>
</div>
<div class="nhsuk-warning-callout">
<h2 class="nhsuk-warning-callout__label">
<span role="text">
<span class="nhsuk-u-visually-hidden">Important: </span>
Approval required
</span>
</h2>
<p>Your approval is required before this framework can be published.</p>
</div>
}
<form method="post">
<div class="nhsuk-form-group">
<label class="nhsuk-label" for="new-comment">
Review comments
</label>
<input type="hidden" value="@Model.FrameworkReview.Comment" name="parentComment" />
<textarea class="nhsuk-textarea" id="new-comment" asp-for="FrameworkReview.Comment" name="Comment" rows="3"></textarea>
</div>
<div class="nhsuk-form-group">
<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="signOff" name="SignedOff" asp-for="FrameworkReview.SignedOff" type="checkbox" aria-describedby="sign-off-hint">
<label class="nhsuk-label nhsuk-checkboxes__label" for="signOff">
Approve for publishing?
</label>
<div class="nhsuk-hint nhsuk-checkboxes__hint" id="sign-off-hint">
I give my approval to publish this framework for use in its current state
</div>
@if (errorHasOccurred)
{
<vc:error-summary order-of-property-names="@(new[] { nameof(Model.FrameworkReview.Comment)})" />
}
<div class="nhsuk-form-group">
<label class="nhsuk-label" for="comment">
Review comments
</label>
<input type="hidden" value="@Model.FrameworkReview.Comment" name="parentComment" />
<textarea class="nhsuk-textarea" id="comment" asp-for="FrameworkReview.Comment" name="Comment" rows="3"></textarea>
</div>
<div class="nhsuk-form-group">
<div class="nhsuk-checkboxes__item">
<input class="nhsuk-checkboxes__input" id="signOff" name="SignedOff" asp-for="FrameworkReview.SignedOff" type="checkbox" aria-describedby="sign-off-hint">
<label class="nhsuk-label nhsuk-checkboxes__label" for="signOff">
Approve for publishing?
</label>
<div class="nhsuk-hint nhsuk-checkboxes__hint" id="sign-off-hint">
I give my approval to publish this framework for use in its current state
</div>
</div>
</div>
</div>
<button class="nhsuk-button" type="submit">
Submit
</button>
<button class="nhsuk-button" type="submit">
Submit
</button>
</form>
Loading