Skip to content

Commit 752e4c3

Browse files
rshrirohitrshrirohit
committed
Merge branch 'DLS-Release-v1.2.1' into UAT
2 parents 1483510 + 0d3242c commit 752e4c3

File tree

6 files changed

+61
-60
lines changed

6 files changed

+61
-60
lines changed

‎DigitalLearningSolutions.Web/Controllers/FrameworksController/Frameworks.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,9 +583,9 @@ public IActionResult EditFrameworkFlag(CustomFlagViewModel model, int frameworkI
583583
if (ModelState.IsValid)
584584
{
585585
var flags = frameworkService.GetCustomFlagsByFrameworkId(frameworkId, null)
586-
.Where(fn => fn.FlagName == model.FlagName).ToList();
586+
.Where(fn => fn.FlagName.ToLower() == model.FlagName.ToLower()).ToList();
587587

588-
bool nameExists = flags.Any(x => x.FlagName == model.FlagName);
588+
bool nameExists = flags.Any(x => x.FlagName.ToLower() == model.FlagName.ToLower());
589589
bool idExists = flags.Any(x => x.FlagId == flagId);
590590

591591
if (actionname == "Edit")

‎DigitalLearningSolutions.Web/Controllers/FrameworksController/Review.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ public IActionResult LoadReview(int frameworkId, int reviewId)
6363
{
6464
var adminId = GetAdminId();
6565
var framework = frameworkService.GetBaseFrameworkByFrameworkId(frameworkId, adminId);
66+
if (framework.FrameworkReviewID == 0 || framework.FrameworkReviewID == null) return RedirectToAction("StatusCode", "LearningSolutions", new { code = 410 });
6667
if (framework == null) return StatusCode(404);
6768
if (framework.UserRole < 1) return StatusCode(403);
6869
var frameworkName = framework.FrameworkName;

‎DigitalLearningSolutions.Web/Views/Frameworks/Developer/EditCustomFlag.cshtml‎

Lines changed: 54 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
11
@using DigitalLearningSolutions.Web.ViewModels.Frameworks
22
@model CustomFlagViewModel
33
@{
4-
var addOrEdit = Model.Id == 0 ? "Add" : "Edit";
5-
var frameworkId = ViewContext.RouteData.Values["frameworkId"];
6-
ViewData["Title"] = "Framework Custom Flags";
7-
ViewData["Application"] = "Framework Service";
8-
ViewData["HeaderPathName"] = "Framework Service";
4+
var addOrEdit = Model.Id == 0 ? "Add" : "Edit";
5+
var frameworkId = ViewContext.RouteData.Values["frameworkId"];
6+
ViewData["Title"] = "Framework Custom Flags";
7+
ViewData["Application"] = "Framework Service";
8+
ViewData["HeaderPathName"] = "Framework Service";
99
}
1010
<link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
1111
@section NavMenuItems {
12-
<partial name="Shared/_NavMenuItems" />
12+
<partial name="Shared/_NavMenuItems" />
1313
}
14-
@section NavBreadcrumbs {
15-
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
16-
<div class="nhsuk-width-container">
17-
<ol class="nhsuk-breadcrumb__list">
18-
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFrameworks" asp-route-tabname="Mine">Frameworks</a></li>
19-
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFramework" asp-route-frameworkId="@frameworkId" asp-route-tabname="Details">Framework Details</a></li>
20-
<li class="nhsuk-breadcrumb__item">@addOrEdit Custom Flags</li>
21-
</ol>
22-
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ViewFramework" asp-route-frameworkId="@frameworkId" asp-route-tabname="Details">Back to framework detail</a></p>
23-
</div>
24-
</nav>
14+
@section NavBreadcrumbs {
15+
<nav class="nhsuk-breadcrumb" aria-label="Breadcrumb">
16+
<div class="nhsuk-width-container">
17+
<ol class="nhsuk-breadcrumb__list">
18+
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFrameworks" asp-route-tabname="Mine">Frameworks</a></li>
19+
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="ViewFramework" asp-route-frameworkId="@frameworkId" asp-route-tabname="Details">Framework Details</a></li>
20+
<li class="nhsuk-breadcrumb__item">@addOrEdit Custom Flags</li>
21+
</ol>
22+
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="ViewFramework" asp-route-frameworkId="@frameworkId" asp-route-tabname="Details">Back to framework detail</a></p>
23+
</div>
24+
</nav>
2525
}
26-
<h1>@addOrEdit custom flag</h1>
27-
<form method="post">
26+
<h1>@addOrEdit custom flag</h1>
27+
<form method="post">
2828
@if (!ViewData.ModelState.IsValid)
29-
{
30-
<partial name="_ErrorSummary" />
31-
}
32-
<nhs-form-group nhs-validation-for="FlagName">
33-
<label class="nhsuk-label" id="flag-name-label" for="flag-name">Name</label>
34-
<span nhs-validation-for="FlagName"></span>
35-
<input class="nhsuk-input nhsuk-input--width-30" asp-for="FlagName" id="flag-name" name="FlagName" type="text" error-class-toggle="nhsuk-input--error" aria-describedby="flag-name-label">
36-
</nhs-form-group>
37-
<nhs-form-group nhs-validation-for="FlagGroup">
38-
<label class="nhsuk-label" id="flag-group-label" for="flag-group">Group</label>
39-
<span nhs-validation-for="FlagGroup"></span>
40-
<input class="nhsuk-input nhsuk-input--width-30" asp-for="FlagGroup" id="flag-group" name="FlagGroup" type="text" error-class-toggle="nhsuk-input--error" aria-describedby="flag-group-label">
41-
</nhs-form-group>
42-
<nhs-form-group nhs-validation-for="FlagTagClass">
43-
<div class="nhsuk-hint" id="framework-name-hint">
44-
Tag colour
29+
{
30+
<partial name="_ErrorSummary" />
31+
}
32+
<nhs-form-group nhs-validation-for="FlagName">
33+
<label class="nhsuk-label" id="flag-name-label" for="FlagName">Name</label>
34+
<span nhs-validation-for="FlagName"></span>
35+
<input class="nhsuk-input nhsuk-input--width-30" asp-for="FlagName" id="FlagName" name="FlagName" type="text" error-class-toggle="nhsuk-input--error" aria-describedby="flag-name-label">
36+
</nhs-form-group>
37+
<nhs-form-group nhs-validation-for="FlagGroup">
38+
<label class="nhsuk-label" id="flag-group-label" for="FlagGroup">Group</label>
39+
<span nhs-validation-for="FlagGroup"></span>
40+
<input class="nhsuk-input nhsuk-input--width-30" asp-for="FlagGroup" id="FlagGroup" name="FlagGroup" type="text" error-class-toggle="nhsuk-input--error" aria-describedby="flag-group-label">
41+
</nhs-form-group>
42+
<nhs-form-group nhs-validation-for="FlagTagClass">
43+
<div class="nhsuk-hint" id="framework-name-hint">
44+
Tag colour
45+
</div>
46+
<select class="nhsuk-select" asp-for="FlagTagClass" name="FlagTagClass">
47+
@foreach (var tagColor in Model.TagColors)
48+
{
49+
var selected = tagColor.Key == Model.FlagTagClass ? @"selected=""selected""" : "";
50+
<!option value="@tagColor.Key" @selected>@tagColor.Value</!option>
51+
}
52+
</select>
53+
<span nhs-validation-for="FlagTagClass"></span>
54+
</nhs-form-group>
55+
<button class="nhsuk-button nhsuk-u-margin-top-3" type="submit">Submit</button>
56+
<div class="nhsuk-back-link nhsuk-u-margin-left-1">
57+
<a class="nhsuk-back-link__link" asp-action="EditFrameworkFlags" asp-route-frameworkId="@frameworkId">
58+
<svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
59+
<path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
60+
</svg>
61+
Cancel
62+
</a>
4563
</div>
46-
<select class="nhsuk-select" asp-for="FlagTagClass" name="FlagTagClass">
47-
@foreach (var tagColor in Model.TagColors)
48-
{
49-
var selected = tagColor.Key == Model.FlagTagClass ? @"selected=""selected""" : "";
50-
<!option value="@tagColor.Key" @selected>@tagColor.Value</!option>
51-
}
52-
</select>
53-
<span nhs-validation-for="FlagTagClass"></span>
54-
</nhs-form-group>
55-
<button class="nhsuk-button nhsuk-u-margin-top-3" type="submit">Submit</button>
56-
<div class="nhsuk-back-link nhsuk-u-margin-left-1">
57-
<a class="nhsuk-back-link__link" asp-action="EditFrameworkFlags" asp-route-frameworkId="@frameworkId">
58-
<svg class="nhsuk-icon nhsuk-icon__chevron-left" focusable='false' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
59-
<path d="M13.41 12l5.3-5.29a1 1 0 1 0-1.42-1.42L12 10.59l-5.29-5.3a1 1 0 0 0-1.42 1.42l5.3 5.29-5.3 5.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l5.29-5.3 5.29 5.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z"></path>
60-
</svg>
61-
Cancel
62-
</a>
63-
</div>
64-
<input type="hidden" asp-for="@Model.Id" />
64+
<input type="hidden" asp-for="@Model.Id" />
6565
</form>

‎DigitalLearningSolutions.Web/Views/Supervisor/ReviewSelfAssessment.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
</div>
175175
<div class="nhsuk-grid-column-full">
176176

177-
@if (competency.Description != null && !competency.AlwaysShowDescription)
177+
@if (!string.IsNullOrWhiteSpace(competency.Description) && !competency.AlwaysShowDescription)
178178
{
179179
<details class="nhsuk-details">
180180
<summary class="nhsuk-details__summary">
@@ -194,7 +194,7 @@
194194
<h2 class="nhsuk-u-margin-bottom-0 nhsuk-u-font-size-24">
195195
@competency.Name
196196
</h2>
197-
@if (competency.Description != null)
197+
@if (!string.IsNullOrWhiteSpace(competency.Description))
198198
{
199199
<p class="nhsuk-body-l">
200200
@(Html.Raw(competency.Description))

‎DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Administrator/_SearchableAdminCard.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</div>
3838
<div class="nhsuk-summary-list__row">
3939
<dt class="nhsuk-summary-list__key">
40-
Last accessed
40+
Last accessed date
4141
</dt>
4242
<dd class="nhsuk-summary-list__value">
4343
@(Model.LastAccessed != null ? Model.LastAccessed : "-")

‎DigitalLearningSolutions.Web/Views/TrackingSystem/Delegates/AllDelegates/_SearchableDelegateCard.cshtml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252

5353
<div class="nhsuk-summary-list__row details-list-with-button__row">
5454
<dt class="nhsuk-summary-list__key">
55-
Last Accessed date
55+
Last accessed date
5656
</dt>
5757
<partial name="_SummaryFieldValue" model="@Model.DelegateInfo.LastAccessed" />
5858
</div>

0 commit comments

Comments
 (0)