Skip to content

DLSV2-648 Replaces and removes html tag removal string in signposting helper #1379

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 3 commits into from
Sep 2, 2022
Merged

DLSV2-648 Replaces and removes html tag removal string in signposting helper #1379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c0aaf3
DLSV2-648 Replace calls to SignpostingHelper.DisplayText() with calls…
manishagarwalEviden Sep 1, 2022
0c7b1b9
DLSV2-648 Replace calls to SignpostingHelper.DisplayText() with calls…
manishagarwalEviden Sep 1, 2022
63d95b7
Merge branch 'master' into DLSV2-648
kevwhitt-hee Sep 2, 2022
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
4 changes: 2 additions & 2 deletions DigitalLearningSolutions.Web/Controllers/FrameworksController/Signposting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public IActionResult EditCompetencyLearningResources(int frameworkId, int framew

[Route("/Frameworks/{frameworkId}/Competency/{frameworkCompetencyId}/CompetencyGroup/{frameworkCompetencyGroupId}/Signposting/AddResource/{page=1:int}")]
public async Task<IActionResult> SearchLearningResourcesAsync(int frameworkId, int frameworkCompetencyId, int? frameworkCompetencyGroupId, int? catalogueId, string searchText, int page)
{
{

var model = new CompetencyResourceSignpostingViewModel(frameworkId, frameworkCompetencyId, frameworkCompetencyGroupId);
Catalogues = Catalogues ?? (await this.learningHubApiClient.GetCatalogues())?.Catalogues?.OrderBy(c => c.Name).ToList();
Expand Down Expand Up @@ -103,7 +103,7 @@ public IActionResult AddCompetencyLearningResourceSummary(CompetencyResourceSumm
public IActionResult ConfirmAddCompetencyLearningResourceSummary(CompetencyResourceSummaryViewModel model)
{
var frameworkCompetency = frameworkService.GetFrameworkCompetencyById(model.FrameworkCompetencyId.Value);
string plainTextDescription = SignpostingHelper.DisplayText(model.Description);
string plainTextDescription = DisplayStringHelper.RemoveMarkup(model.Description);
int competencyLearningResourceId = competencyLearningResourcesDataService.AddCompetencyLearningResource(model.ReferenceId, model.ResourceName, plainTextDescription, model.ResourceType, model.Link, model.SelectedCatalogue, model.Rating.Value, frameworkCompetency.CompetencyID, GetAdminId());
return RedirectToAction("StartSignpostingParametersSession", "Frameworks", new { model.FrameworkId, model.FrameworkCompetencyId, model.FrameworkCompetencyGroupId, competencyLearningResourceId });
}
Expand Down
6 changes: 0 additions & 6 deletions DigitalLearningSolutions.Web/Helpers/SignpostingHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@ namespace DigitalLearningSolutions.Web.Helpers
{
public class SignpostingHelper
{
public static string DisplayText(string input)
{
const string space = "&nbsp;";
return System.Text.RegularExpressions.Regex.Replace(input ?? String.Empty, $"<.*?>|{space}", String.Empty);
}

public static string DisplayTagColour(string resourceType)
{
var colours = new string[] { "white", "grey", "green", "aqua-green", "blue", "purple", "red", "orange", "yellow" };
Expand Down
180 changes: 89 additions & 91 deletions ...rningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResourceSummary.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,96 +1,94 @@
@using DigitalLearningSolutions.Web.ViewModels.Frameworks;
@using DigitalLearningSolutions.Web.Helpers;
@model CompetencyResourceSummaryViewModel
@{
ViewData["Title"] = "Add Competency Learning Resource Summary";
ViewData["Application"] = "Framework Service";
}
<link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">

@section NavMenuItems {
<partial name="Shared/_NavMenuItems" />
}
@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-fragment="fc-@Model.FrameworkCompetencyId" asp-route-frameworkId="@Model.FrameworkId" asp-route-tabname="Structure">Framework Structure</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="EditCompetencyLearningResources" asp-route-frameworkId="@Model.FrameworkId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId">Signposting</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="SearchLearningResources" asp-route-frameworkId="@Model.FrameworkId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId">Add Resource</a></li>
<li class="nhsuk-breadcrumb__item">Summary</li>
</ol>
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="AddCompetencyLearningResources" asp-route-frameworkId="@Model.FrameworkId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId">Back to Add Resource</a></p>
</div>
</nav>
}
<h1>Add Competency Learning Resource Summary</h1>
<form method="post" role="search" asp-controller="Frameworks">
<dl class="nhsuk-summary-list nhsuk-u-margin-bottom-3">
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">Competency</dt>
<dd class="nhsuk-summary-list__value">@Model.NameOfCompetency</dd>
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">Resource name</dt>
<dd class="nhsuk-summary-list__value">@Model.ResourceName</dd>
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">Resource type</dt>
<dd class="nhsuk-summary-list__value">@Model.ResourceType</dd>
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">Catalogue</dt>
<dd class="nhsuk-summary-list__value">@Model.SelectedCatalogue</dd>
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">Description</dt>
<dd class="nhsuk-summary-list__value">@SignpostingHelper.DisplayText(Model.Description)</dd>
</div>
<div class="nhsuk-summary-list__row">
<dd class="nhsuk-summary-list__key">
<div class="nhsuk-u-margin-top-3">
<button asp-action="ConfirmAddCompetencyLearningResourceSummary" class="nhsuk-button nhsuk-u-margin-right-2">
Confirm
</button>
<button class="nhsuk-button nhsuk-button--secondary"
asp-action="SearchLearningResources"
asp-route-frameworkId="@Model.FrameworkId"
asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId"
@using DigitalLearningSolutions.Web.ViewModels.Frameworks;
@using DigitalLearningSolutions.Web.Helpers;
@model CompetencyResourceSummaryViewModel
@{ ViewData["Title"] = "Add Competency Learning Resource Summary";
ViewData["Application"] = "Framework Service"; }
<link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">

@section NavMenuItems {
<partial name="Shared/_NavMenuItems" />
}
@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-fragment="fc-@Model.FrameworkCompetencyId" asp-route-frameworkId="@Model.FrameworkId" asp-route-tabname="Structure">Framework Structure</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="EditCompetencyLearningResources" asp-route-frameworkId="@Model.FrameworkId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId">Signposting</a></li>
<li class="nhsuk-breadcrumb__item"><a class="nhsuk-breadcrumb__link trigger-loader" asp-action="SearchLearningResources" asp-route-frameworkId="@Model.FrameworkId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId">Add Resource</a></li>
<li class="nhsuk-breadcrumb__item">Summary</li>
</ol>
<p class="nhsuk-breadcrumb__back"><a class="nhsuk-breadcrumb__backlink" asp-action="AddCompetencyLearningResources" asp-route-frameworkId="@Model.FrameworkId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId">Back to Add Resource</a></p>
</div>
</nav>
}
<h1>Add Competency Learning Resource Summary</h1>
<form method="post" role="search" asp-controller="Frameworks">
<dl class="nhsuk-summary-list nhsuk-u-margin-bottom-3">
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">Competency</dt>
<dd class="nhsuk-summary-list__value">@Model.NameOfCompetency</dd>
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">Resource name</dt>
<dd class="nhsuk-summary-list__value">@Model.ResourceName</dd>
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">Resource type</dt>
<dd class="nhsuk-summary-list__value">@Model.ResourceType</dd>
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">Catalogue</dt>
<dd class="nhsuk-summary-list__value">@Model.SelectedCatalogue</dd>
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">Description</dt>
<dd class="nhsuk-summary-list__value">@DisplayStringHelper.RemoveMarkup(Model.Description)</dd>
</div>
<div class="nhsuk-summary-list__row">
<dd class="nhsuk-summary-list__key">
<div class="nhsuk-u-margin-top-3">
<button asp-action="ConfirmAddCompetencyLearningResourceSummary" class="nhsuk-button nhsuk-u-margin-right-2">
Confirm
</button>
<button class="nhsuk-button nhsuk-button--secondary"
asp-action="SearchLearningResources"
asp-route-frameworkId="@Model.FrameworkId"
asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId"
asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId"
asp-route-searchText=""
asp-route-catalogueId="0"
asp-route-page="1">
Restart search
</button>
</div>
</dd>
<dd class="nhsuk-summary-list__value"></dd>
</div>
</dl>
@Html.HiddenFor(m => m.FrameworkId)
@Html.HiddenFor(m => m.FrameworkCompetencyGroupId)
@Html.HiddenFor(m => m.FrameworkCompetencyId)
@Html.HiddenFor(m => m.ReferenceId)
@Html.HiddenFor(m => m.Resource.Title)
@Html.HiddenFor(m => m.Resource.ResourceType)
@Html.HiddenFor(m => m.Resource.Description)
@Html.HiddenFor(m => m.Link)
@Html.HiddenFor(m => m.SelectedCatalogue)
@Html.HiddenFor(m => m.Rating)
</form>
<div class="nhsuk-back-link nhsuk-u-margin-left-1">
asp-route-page="1">
Restart search
</button>
</div>
</dd>
<dd class="nhsuk-summary-list__value"></dd>
</div>
</dl>
@Html.HiddenFor(m => m.FrameworkId)
@Html.HiddenFor(m => m.FrameworkCompetencyGroupId)
@Html.HiddenFor(m => m.FrameworkCompetencyId)
@Html.HiddenFor(m => m.ReferenceId)
@Html.HiddenFor(m => m.Resource.Title)
@Html.HiddenFor(m => m.Resource.ResourceType)
@Html.HiddenFor(m => m.Resource.Description)
@Html.HiddenFor(m => m.Link)
@Html.HiddenFor(m => m.SelectedCatalogue)
@Html.HiddenFor(m => m.Rating)
</form>
<div class="nhsuk-back-link nhsuk-u-margin-left-1">
<a class="nhsuk-back-link__link"
asp-action="SearchLearningResources"
asp-route-frameworkId="@Model.FrameworkId"
asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId"
asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId"
asp-action="SearchLearningResources"
asp-route-frameworkId="@Model.FrameworkId"
asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId"
asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId"
asp-route-searchText="@Model.SearchText"
asp-route-catalogueId="@Model.CatalogueId"
asp-route-page="@Model.Page">
<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">
<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>
</svg>
Cancel
</a>
</div>
asp-route-catalogueId="@Model.CatalogueId"
asp-route-page="@Model.Page">
<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">
<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>
</svg>
Cancel
</a>
</div>
65 changes: 31 additions & 34 deletions DigitalLearningSolutions.Web/Views/Frameworks/Developer/_SignpostingCard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
@using DigitalLearningSolutions.Web.Helpers;
@model SignpostingCardViewModel
@{
var parent = (CompetencyResourceSignpostingViewModel)ViewData["parent"];
bool displayLevelLabels = Model.AssessmentQuestionInputTypeId != 2;
var parent = (CompetencyResourceSignpostingViewModel)ViewData["parent"];
bool displayLevelLabels = Model.AssessmentQuestionInputTypeId != 2;
}
<details class="nhsuk-details nhsuk-expander nhsuk-u-margin-bottom-3">
<summary class="nhsuk-details__summary">
Expand Down Expand Up @@ -34,14 +34,11 @@
}
@if (!String.IsNullOrEmpty(Model.ResourceType))
{
<strong class="nhsuk-tag nhsuk-tag--@(SignpostingHelper.DisplayTagColour(Model.ResourceType))">@Model.ResourceType</strong>
<strong class="nhsuk-tag nhsuk-tag--@(SignpostingHelper.DisplayTagColour(Model.ResourceType))">@Model.ResourceType</strong>
}
@*<div class="nhsuk-tag nhsuk-tag--grey centre-role-tag nhsuk-u-margin-right-1">Digital Learn</div> <!--Hidden for now-->*@
</div>
@if (!String.IsNullOrEmpty(Model.Description))
{
<p>@SignpostingHelper.DisplayText(Model.Description)</p>
}
<p>@DisplayStringHelper.RemoveMarkup(Model.Description)</p>
<h5 class="mnhsuk-u-margin-bottom-2">Rated @Model.Rating/5</h5>
@if (Model.ParameterHasNotBeenSet)
{
Expand All @@ -58,39 +55,39 @@
<dd class="nhsuk-summary-list__value">
@Model.AssessmentQuestion
</dd>
</div>
</div>
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Trigger @(displayLevelLabels ? "responses" : "range")
</dt>
<dd class="nhsuk-summary-list__value">
@if (displayLevelLabels)
{
<label class="nhsuk-label">@Model.GetLevelLabel(Model.MinimumResultMatch)</label>
@if (Model.MinimumResultMatch != Model.MaximumResultMatch)
{
<label class="nhsuk-label">@Model.GetLevelLabel(Model.MaximumResultMatch)</label>
}
}
else
{
<label class="nhsuk-label">@Model.MinimumResultMatch to @Model.MaximumResultMatch</label>
}
</dd>
</div>
@if (!String.IsNullOrEmpty(Model.CompareResultTo))
{
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Trigger @(displayLevelLabels ? "responses" : "range")
Compare result to
</dt>
<dd class="nhsuk-summary-list__value">
@if (displayLevelLabels)
{
<label class="nhsuk-label">@Model.GetLevelLabel(Model.MinimumResultMatch)</label>
@if (Model.MinimumResultMatch != Model.MaximumResultMatch)
{
<label class="nhsuk-label">@Model.GetLevelLabel(Model.MaximumResultMatch)</label>
}
}
else
{
<label class="nhsuk-label">@Model.MinimumResultMatch to @Model.MaximumResultMatch</label>
}
@Model.CompareResultTo
</dd>
</div>
@if (!String.IsNullOrEmpty(Model.CompareResultTo))
{
<div class="nhsuk-summary-list__row">
<dt class="nhsuk-summary-list__key">
Compare result to
</dt>
<dd class="nhsuk-summary-list__value">
@Model.CompareResultTo
</dd>
</div>
}
</dl>
}
</dl>
}
<div class="nhsuk-grid-row">
<div class="nhsuk-grid-column-full">
<a class="nhsuk-button small-edit-button nhsuk-u-margin-right-1"
Expand All @@ -110,5 +107,5 @@
asp-route-frameworkCompetencyGroupId="@parent.FrameworkCompetencyGroupId"
asp-route-competencyLearningResourceId="@Model.CompetencyLearningResourceId">Remove resource link</a>
</div>
</div>
</div>
</details>
4 changes: 2 additions & 2 deletions DigitalLearningSolutions.Web/Views/Frameworks/Developer/_SignpostingResourceCard.cshtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<details class="nhsuk-details nhsuk-expander nhsuk-u-margin-bottom-3">
<summary class="nhsuk-details__summary">
<span class="nhsuk-details__summary-text">
@SignpostingHelper.DisplayText(Model.Resource.Title)
@DisplayStringHelper.RemoveMarkup(Model.Resource.Title)
</span>
</summary>
<div class="nhsuk-card__content nhsuk-u-padding-bottom-3 nhsuk-u-padding-top-0 nhsuk-u-margin-1">
Expand All @@ -19,7 +19,7 @@
</div>
}
<div class="nhsuk-u-margin-left-1 nhsuk-u-margin-top-3 nhsuk-u-margin-bottom-3">
@Html.Raw(SignpostingHelper.DisplayText(Model.Description))
@Html.Raw(DisplayStringHelper.RemoveMarkup(Model.Description))
</div>
@if (Model.Catalogues.Count() > 0)
{
Expand Down