Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -514,3 +514,4 @@ DigitalLearningSolutions.Web/Views/Shared/Components/TextArea/Default.cshtml
DigitalLearningSolutions.Web/Views/Shared/Components/TextInput/Default.cshtml
/DigitalLearningSolutions.Web/appsettings.Test.json
/DigitalLearningSolutions.Web/web.config
/DigitalLearningSolutions.Web/publish-local
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
Expand Down Expand Up @@ -70,7 +70,7 @@
<PackageReference Include="HtmlAgilityPack" Version="1.11.74" />
<PackageReference Include="HtmlSanitizer" Version="9.0.884" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.13" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="6.0.24" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.13" />
<PackageReference Include="Microsoft.Data.SqlClient" Version="6.0.1" />
<PackageReference Include="Microsoft.FeatureManagement" Version="3.1.0" />
<PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="2.5.1" />
Expand All @@ -80,7 +80,7 @@
</PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="2.2.0" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
<PackageReference Include="NHSUKViewComponents.Web" Version="1.0.29" />
<PackageReference Include="NHSETELViewComponents" Version="1.0.0" />
<PackageReference Include="NodaTime" Version="3.2.1" />
<PackageReference Include="Npm" Version="3.5.2" />
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents;
using DigitalLearningSolutions.Web.ViewModels.TrackingSystem.Centre.Administrator;
using Microsoft.AspNetCore.Mvc.Rendering;
using NHSUKViewComponents.Web.ViewModels;
using NHSETELViewComponents.ViewModels;


public abstract class AdminRolesViewModel : AdminRolesFormData
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents
{
using NHSUKViewComponents.Web.ViewModels;
using NHSETELViewComponents.ViewModels;
using System.Collections.Generic;

public class SecondaryNavMenuLinkViewModel : LinkViewModel
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
using DigitalLearningSolutions.Web.Models.Enums;
using DigitalLearningSolutions.Web.ViewModels.Common;
using DigitalLearningSolutions.Web.ViewModels.TrackingSystem.Centre.Administrator;
using NHSUKViewComponents.Web.ViewModels;
using NHSETELViewComponents.ViewModels;

public class ManageRoleViewModel : AdminRolesViewModel
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{
using DigitalLearningSolutions.Web.Models.Enums;
using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents;
using NHSUKViewComponents.Web.ViewModels;
using NHSETELViewComponents.ViewModels;

public class AdminRoleInputs
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace DigitalLearningSolutions.Web.ViewModels.TrackingSystem.CourseSetup.CourseDetails
{
using NHSUKViewComponents.Web.ViewModels;
using NHSETELViewComponents.ViewModels;

public static class CourseOptionsInputs
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Collections.Generic;
using System.Linq;
using DigitalLearningSolutions.Data.Models.MultiPageFormData.AddNewCentreCourse;
using NHSUKViewComponents.Web.ViewModels;
using NHSETELViewComponents.ViewModels;

public class EditCourseOptionsFormData
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using Microsoft.AspNetCore.Mvc.Rendering;
using NHSUKViewComponents.Web.ViewModels;
using NHSETELViewComponents.ViewModels;

public class GenerateGroupsViewModel
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using DigitalLearningSolutions.Data.Enums
@using NHSUKViewComponents.Web.ViewComponents
@using NHSETELViewComponents.ViewComponents
@using DigitalLearningSolutions.Web.ViewModels.Login
@model ChooseACentreViewModel
@{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using NHSUKViewComponents.Web.ViewComponents
@using NHSETELViewComponents.ViewComponents
@using DigitalLearningSolutions.Web.ViewModels.MyAccount
@using Microsoft.AspNetCore.Mvc.TagHelpers
@model MyAccountEditDetailsViewModel
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using NHSUKViewComponents.Web.ViewComponents
@using NHSETELViewComponents.ViewComponents
@using DigitalLearningSolutions.Web.ViewModels.Register
@model AdminConfirmationViewModel

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using NHSUKViewComponents.Web.ViewModels
@using NHSETELViewComponents.ViewModels
@model LinkViewModel

<div class="nhsuk-action-link">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using NHSUKViewComponents.Web.ViewModels
@using NHSETELViewComponents.ViewModels
@model LinkViewModel

<div class="nhsuk-back-link">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using NHSUKViewComponents.Web.ViewModels
@using NHSETELViewComponents.ViewModels
@model LinkViewModel

<link rel="stylesheet" href="@Url.Content("~/css/shared/components/cancelLink.css")" asp-append-version="true">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using NHSUKViewComponents.Web.Extensions
@using NHSUKViewComponents.Web.ViewModels
@using NHSETELViewComponents.Extensions
@using NHSETELViewComponents.ViewModels
@model CheckboxesViewModel

<div class="nhsuk-form-group">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using NHSUKViewComponents.Web.ViewModels
@using NHSETELViewComponents.ViewModels
@model DateInputViewModel

@{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using NHSUKViewComponents.Web.ViewModels
@using NHSETELViewComponents.ViewModels
@model DateRangeInputViewModel
@{
var hintText = string.Empty;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents
@using NHSUKViewComponents.Web.ViewModels
@using NHSETELViewComponents.ViewModels
@model DictionaryTextInputViewModel

@if (Model.HintText != null)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using NHSUKViewComponents.Web.ViewModels
@using NHSETELViewComponents.ViewModels
@model ErrorSummaryViewModel

@if (Model.Errors.Any())
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using NHSUKViewComponents.Web.ViewModels
@using NHSUKViewComponents.Web.Helpers
@using NHSETELViewComponents.ViewModels
@using NHSETELViewComponents.Helpers
@model FileInputViewModel
<div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
<label class="nhsuk-label" for="@Model.Name">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using NHSUKViewComponents.Web.ViewModels
@using NHSUKViewComponents.Web.Helpers
@using NHSETELViewComponents.ViewModels
@using NHSETELViewComponents.Helpers
@model NumericInputViewModel
<div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
<label class="nhsuk-label" for="@Model.Id">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using NHSUKViewComponents.Web.Extensions
@using NHSUKViewComponents.Web.ViewModels
@using NHSETELViewComponents.Extensions
@using NHSETELViewComponents.ViewModels

@model RadiosViewModel
@{
Expand Down Expand Up @@ -133,4 +133,4 @@

</div>
</fieldset>
</div>
</div>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using NHSUKViewComponents.Web.ViewModels
@using NHSUKViewComponents.Web.Helpers
@using NHSETELViewComponents.ViewModels
@using NHSETELViewComponents.Helpers
@model SelectListViewModel

<div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using NHSUKViewComponents.Web.ViewModels
@using NHSETELViewComponents.ViewModels
@model CheckboxItemViewModel

<div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using NHSUKViewComponents.Web.ViewModels
@using NHSUKViewComponents.Web.Helpers
@using NHSETELViewComponents.ViewModels
@using NHSETELViewComponents.Helpers
@model TextAreaViewModel
@{
string? describedBy = ViewComponentDynamicAttributeHelper.GetAriaDescribedByAttribute(Model.Name, Model.HasError, Model.HintText);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using NHSUKViewComponents.Web.ViewModels
@using NHSUKViewComponents.Web.Helpers
@using NHSETELViewComponents.ViewModels
@using NHSETELViewComponents.Helpers
@model TextInputViewModel
<div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
<label class="nhsuk-label @(string.IsNullOrWhiteSpace(Model.Label) ? "nhsuk-u-visually-hidden" : "")" for="@Model.Name">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using NHSUKViewComponents.Web.ViewModels
@using NHSETELViewComponents.ViewModels
@model CheckboxItemViewModel
@{
var describedBy = "";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@using DigitalLearningSolutions.Web.ViewModels.Common.ViewComponents
@using DigitalLearningSolutions.Web.Helpers
@using NHSUKViewComponents.Web.ViewModels
@using NHSETELViewComponents.ViewModels
@model TextInputViewModel
<div class="nhsuk-form-group @(Model.HasError ? "nhsuk-form-group--error" : "")">
<label class="nhsuk-label" for="@Model.Id">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@using DigitalLearningSolutions.Web.Extensions
@using DigitalLearningSolutions.Web.ViewModels.SuperAdmin.Centres
@using Microsoft.AspNetCore.Mvc.TagHelpers
@using NHSUKViewComponents.Web.ViewComponents
@using NHSETELViewComponents.ViewComponents
@model CentreRoleLimitsViewModel;
@{
ViewData["Title"] = "Centre Role Limits";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using DigitalLearningSolutions.Web.ViewModels.UserCentreAccounts
@using NHSUKViewComponents.Web.ViewComponents
@using NHSETELViewComponents.ViewComponents
@model UserCentreAccountRoleViewModel
@{
ViewData["Title"] = "User Centre Accounts";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
@using DigitalLearningSolutions.Web.Models.Enums
@using DigitalLearningSolutions.Web.Extensions
@using DigitalLearningSolutions.Web.ViewModels.Support.RequestSupportTicket
@using NHSUKViewComponents.Web.ViewComponents
@using NHSETELViewComponents.ViewComponents
@using Microsoft.AspNetCore.Mvc.TagHelpers
@model RequestAttachmentViewModel
@{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@using NHSUKViewComponents.Web.ViewModels
@using NHSETELViewComponents.ViewModels
@model List<CheckboxListItemViewModel>

<vc:checkboxes label=""
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
@using DigitalLearningSolutions.Data.Utilities
@using NHSUKViewComponents.Web.ViewComponents
@using NHSETELViewComponents.ViewComponents
@using DigitalLearningSolutions.Web.ViewModels.TrackingSystem.Delegates.Enrol
@using Microsoft.AspNetCore.Mvc.TagHelpers
@model CompletedByDateViewModel
Expand Down
2 changes: 1 addition & 1 deletion DigitalLearningSolutions.Web/Views/_ViewImports.cshtml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
@addTagHelper *, DigitalLearningSolutions.Web
@addTagHelper *, Microsoft.FeatureManagement.AspNetCore
@addTagHelper *, NHSUKViewComponents.Web
@addTagHelper *, NHSETELViewComponents
Loading