Skip to content

Commit a3ded34

Browse files
rshrirohitrshrirohit
committed
Merge branch 'DLS-Release-v1.2.1' into UAT
2 parents 7cb2ca2 + aa02953 commit a3ded34

File tree

6 files changed

+94
-94
lines changed

6 files changed

+94
-94
lines changed

‎.github/workflows/build-and-deploy-production.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
steps:
2020
- uses: actions/checkout@v4
2121

22-
- name: Setup .NET Core SDK 6.0
22+
- name: Setup .NET Core SDK 8.0
2323
uses: actions/setup-dotnet@v4
2424
with:
25-
dotnet-version: 6.0.x
25+
dotnet-version: 8.0.x
2626
- name: Setup node
2727
uses: actions/setup-node@v4
2828
with:

‎.github/workflows/build-and-deploy-uat.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
steps:
2323
- uses: actions/checkout@v4
2424

25-
- name: Setup .NET Core SDK 6.0
25+
- name: Setup .NET Core SDK 8.0
2626
uses: actions/setup-dotnet@v4
2727
with:
28-
dotnet-version: 6.0.x
28+
dotnet-version: 8.0.x
2929
- name: Setup node
3030
uses: actions/setup-node@v4
3131
with:

‎.github/workflows/continuous-integration-workflow.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
steps:
1313
- uses: actions/checkout@v4
1414

15-
- name: Setup .NET Core SDK 6.0
15+
- name: Setup .NET Core SDK 8.0
1616
uses: actions/setup-dotnet@v4
1717
with:
18-
dotnet-version: 6.0.x
18+
dotnet-version: 8.0.x
1919

2020
- name: Add TechnologyEnhancedLearning as nuget package source
2121
run: dotnet nuget add source https://pkgs.dev.azure.com/e-LfH/_packaging/LearningHubFeed/nuget/v3/index.json --name TechnologyEnhancedLearning --username 'kevin.whittaker' --password ${{ secrets.AZURE_DEVOPS_PAT }} --store-password-in-clear-text

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

Lines changed: 4 additions & 4 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.ToLower() == model.FlagName.ToLower()).ToList();
586+
.Where(fn => fn.FlagName?.Trim().ToLower() == model.FlagName?.Trim().ToLower()).ToList();
587587

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

591591
if (actionname == "Edit")
@@ -596,7 +596,7 @@ public IActionResult EditFrameworkFlag(CustomFlagViewModel model, int frameworkI
596596
return View("Developer/EditCustomFlag", model);
597597
}
598598
else
599-
frameworkService.UpdateFrameworkCustomFlag(frameworkId, model.Id, model.FlagName, model.FlagGroup, model.FlagTagClass);
599+
frameworkService.UpdateFrameworkCustomFlag(frameworkId, model.Id, model.FlagName?.Trim(), model.FlagGroup?.Trim(), model.FlagTagClass);
600600
}
601601
else
602602
{
@@ -606,7 +606,7 @@ public IActionResult EditFrameworkFlag(CustomFlagViewModel model, int frameworkI
606606
return View("Developer/EditCustomFlag", model);
607607
}
608608
else
609-
frameworkService.AddCustomFlagToFramework(frameworkId, model.FlagName, model.FlagGroup, model.FlagTagClass);
609+
frameworkService.AddCustomFlagToFramework(frameworkId, model.FlagName?.Trim(), model.FlagGroup?.Trim(), model.FlagTagClass);
610610
}
611611

612612
return RedirectToAction("EditFrameworkFlags", "Frameworks", new { frameworkId });

‎DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ CompetencyTableRow competencyRow
262262
{
263263
foreach (var frameworkFlag in frameworkFlags)
264264
{
265-
if (frameworkFlag.FlagName == flag)
265+
if (frameworkFlag.FlagName?.Trim().ToLower() == flag?.Trim().ToLower())
266266
{
267267
flagId = frameworkFlag.FlagId;
268268
break;
@@ -271,7 +271,7 @@ CompetencyTableRow competencyRow
271271
}
272272
if (flagId == 0)
273273
{
274-
flagId = frameworkService.AddCustomFlagToFramework(frameworkId, flag, "Flag", "nhsuk-tag--white");
274+
flagId = frameworkService.AddCustomFlagToFramework(frameworkId, flag?.Trim(), "Flag", "nhsuk-tag--white");
275275
}
276276
flagIds.Add(flagId);
277277
}

‎DigitalLearningSolutions.Web/Views/Frameworks/Shared/_CommentCard.cshtml‎

Lines changed: 82 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,92 +1,92 @@
11
@using DigitalLearningSolutions.Data.Models.Frameworks;
22
@model CommentReplies;
33
<div class="@(Model.UserIsCommenter ? "nhsuk-card comment comment-mine nhsuk-u-margin-bottom-2" : "nhsuk-card comment comment-other nhsuk-u-margin-bottom-3")">
4-
<div class="nhsuk-card__content nhsuk-u-padding-4">
5-
<div class="nhsuk-grid-row">
6-
<div class="nhsuk-grid-column-full">
4+
<div class="nhsuk-card__content nhsuk-u-padding-4">
75
<div class="nhsuk-grid-row">
8-
<div class="nhsuk-grid-column-full">
9-
<h3 class="nhsuk-card__heading nhsuk-heading-xs heading-xxs" id="@Model.ID-header">
10-
@Model.Commenter <span class="heading-light">@Model.AddedDate.ToString("dddd dd MMMM yyyy h:mm tt")</span>
11-
</h3>
12-
<p class="nhsuk-body-s">
13-
@Html.Raw(Model.Comments)
14-
</p>
15-
</div>
16-
</div>
17-
<div class="grid-column-ninety">
18-
@if (Model.Replies.Any())
19-
{
20-
if (@ViewContext.RouteData.Values["commentId"] == null)
21-
{
22-
<details class="nhsuk-details">
23-
<summary class="nhsuk-details__summary">
24-
<span class="nhsuk-details__summary-text">
25-
@Model.Replies.Count() @(Model.Replies.Count() > 1 ? "Replies" : "Reply")
26-
</span>
27-
</summary>
28-
<div class="nhsuk-details__text">
29-
@foreach (var item in Model.Replies.Select((value, i) => new { i, value }))
30-
{
31-
<partial name="_ReplyCard.cshtml" model="item.value" view-data="@(new ViewDataDictionary(ViewData) { { "isLast", (item.i == Model.Replies.Count-1 ? true :false)} })" />
32-
}
6+
<div class="nhsuk-grid-column-full">
7+
<div class="nhsuk-grid-row">
8+
<div class="nhsuk-grid-column-full">
9+
<h3 class="nhsuk-card__heading nhsuk-heading-xs heading-xxs" id="@Model.ID-header">
10+
@Model.Commenter <span class="heading-light">@Model.AddedDate.ToString("dddd dd MMMM yyyy h:mm tt")</span>
11+
</h3>
12+
<p class="nhsuk-body-s">
13+
@Html.Raw(Model.Comments)
14+
</p>
15+
</div>
3316
</div>
34-
</details>
35-
}
36-
else
37-
{
38-
@foreach (var item in Model.Replies.Select((value, i) => new { i, value }))
39-
{
40-
<partial name="_ReplyCard.cshtml" model="item.value" view-data="@(new ViewDataDictionary(ViewData) { { "isLast", (item.i == Model.Replies.Count-1 ? true :false)} })" />
41-
}
42-
}
43-
}
44-
</div>
45-
<div class="nhsuk-grid-column-full">
46-
@if (@ViewContext.RouteData.Values["commentId"] == null)
47-
{
17+
<div class="grid-column-ninety">
18+
@if (Model.Replies.Any())
19+
{
20+
if (@ViewContext.RouteData.Values["commentId"] == null)
21+
{
22+
<details class="nhsuk-details">
23+
<summary class="nhsuk-details__summary">
24+
<span class="nhsuk-details__summary-text">
25+
@Model.Replies.Count() @(Model.Replies.Count() > 1 ? "Replies" : "Reply")
26+
</span>
27+
</summary>
28+
<div class="nhsuk-details__text">
29+
@foreach (var item in Model.Replies.Select((value, i) => new { i, value }))
30+
{
31+
<partial name="_ReplyCard.cshtml" model="item.value" view-data="@(new ViewDataDictionary(ViewData) { { "isLast", (item.i == Model.Replies.Count - 1 ? true : false) } })" />
32+
}
33+
</div>
34+
</details>
35+
}
36+
else
37+
{
38+
@foreach (var item in Model.Replies.Select((value, i) => new { i, value }))
39+
{
40+
<partial name="_ReplyCard.cshtml" model="item.value" view-data="@(new ViewDataDictionary(ViewData) { { "isLast", (item.i == Model.Replies.Count - 1 ? true : false) } })" />
41+
}
42+
}
43+
}
44+
</div>
45+
<div class="nhsuk-grid-column-full">
46+
@if (@ViewContext.RouteData.Values["commentId"] == null)
47+
{
4848

49-
<a class="nhsuk-button button-small nhsuk-button--secondary nhsuk-u-margin-bottom-0 nhsuk-u-margin-top-0"
50-
role="button"
51-
aria-describedby="@Model.ID-header"
52-
asp-action="ViewThread"
53-
asp-controller="Frameworks"
54-
asp-route-frameworkId="@ViewContext.RouteData.Values["frameworkId"]"
55-
asp-route-commentId="@Model.ID">
56-
Reply
57-
</a>
58-
@if (!Model.Replies.Any() && Model.UserIsCommenter)
59-
{
60-
<a class="nhsuk-button button-small delete-button nhsuk-u-margin-bottom-0 nhsuk-u-margin-top-0"
61-
role="button"
62-
aria-describedby="@Model.ID-header"
63-
asp-action="ArchiveComment"
64-
asp-controller="Frameworks"
65-
asp-route-commentId="@Model.ID"
66-
asp-route-frameworkId="@ViewContext.RouteData.Values["frameworkId"]">
67-
Delete
68-
</a>
69-
}
70-
}
71-
else
72-
{
73-
<hr />
74-
<form method="post">
75-
<div class="nhsuk-form-group">
76-
<label class="nhsuk-label" for="new-comment">
77-
Post a reply
78-
</label>
79-
<input type="hidden" value="@Model.Comments" name="parentComment" />
80-
<textarea class="nhsuk-textarea" id="new-comment" name="Comment" rows="3"></textarea>
81-
</div>
82-
<button class="nhsuk-button" type="submit">
83-
Post
84-
</button>
85-
</form>
86-
}
49+
<a class="nhsuk-button button-small nhsuk-button--secondary nhsuk-u-margin-bottom-0 nhsuk-u-margin-top-0"
50+
role="button"
51+
aria-describedby="@Model.ID-header"
52+
asp-action="ViewThread"
53+
asp-controller="Frameworks"
54+
asp-route-frameworkId="@ViewContext.RouteData.Values["frameworkId"]"
55+
asp-route-commentId="@Model.ID">
56+
Reply
57+
</a>
58+
@if (!Model.Replies.Any() && Model.UserIsCommenter)
59+
{
60+
<a class="nhsuk-button button-small delete-button nhsuk-u-margin-bottom-0 nhsuk-u-margin-top-0"
61+
role="button"
62+
aria-describedby="@Model.ID-header"
63+
asp-action="ArchiveComment"
64+
asp-controller="Frameworks"
65+
asp-route-commentId="@Model.ID"
66+
asp-route-frameworkId="@ViewContext.RouteData.Values["frameworkId"]">
67+
Delete
68+
</a>
69+
}
70+
}
71+
else
72+
{
73+
<hr />
74+
<form method="post">
75+
<div class="nhsuk-form-group">
76+
<label class="nhsuk-label" for="new-comment">
77+
Post a reply
78+
</label>
79+
<input type="hidden" value="@Model.Comments" name="parentComment" />
80+
<textarea class="nhsuk-textarea" id="new-comment" name="Comment" autocomplete="off" rows="3"></textarea>
81+
</div>
82+
<button class="nhsuk-button" type="submit">
83+
Post
84+
</button>
85+
</form>
86+
}
8787

88+
</div>
89+
</div>
8890
</div>
89-
</div>
9091
</div>
91-
</div>
9292
</div>

0 commit comments

Comments
 (0)