From 959a0f7068a778eeedb8f5212664f0ca947b5396 Mon Sep 17 00:00:00 2001
From: Martin Foster <martin.foster2@hee.nhs.uk>
Date: Wed, 28 Sep 2022 10:56:27 +0100
Subject: [PATCH 1/5] Fix for incorrect page index reset on new search term.

---
 .../Frameworks/Developer/AddCompetencyLearningResources.cshtml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml
index 4001b9ed2d..be66cde8cd 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml
@@ -68,7 +68,7 @@
         @Html.LabelFor(m => m.SearchText, "Search", new { @class = "nhsuk-u-visually-hidden", @for = "search-field" })
         @Html.TextBoxFor(m => m.SearchText, new { @class = "search-box nhsuk-input", id = "search-field", name = "searchString", type = "search", placeholder = "Search", autocomplete = "off" })
         <button class="nhsuk-button sort-submit" type="submit"
-                asp-route-page="@Model.Page"
+                asp-route-page="@Model.SearchText == SearchText ? @Model.Page | 1"
                 asp-route-frameworkId="@Model.FrameworkId"
                 asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId"
                 asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId"

From 29887e4063ed1c1adb8407ff870136ea07300ce4 Mon Sep 17 00:00:00 2001
From: Martin Foster <martin.foster2@hee.nhs.uk>
Date: Wed, 28 Sep 2022 11:08:11 +0100
Subject: [PATCH 2/5] Added pagination toolbar to top of search results.

---
 .../Developer/AddCompetencyLearningResources.cshtml         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml
index be66cde8cd..d2bd707ad8 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml
@@ -88,6 +88,12 @@
     </div>
   </div>
 </form>
+
+<form method="get">
+  <partial name="PaginatedPage/_TopPaginationNav" model="Model" />
+  @Html.Hidden("SearchText", Model.SearchText)
+</form>
+
 @if (Model.LearningHubApiError) {
   <span class="nhsuk-u-margin-1 nhsuk-u-clear">This service is unavailable. Please try again later.</span>
 } else if (Model.SearchResult?.Results != null) {

From d99eceaa3209428e1ffc1f337b7b20c855dd70e8 Mon Sep 17 00:00:00 2001
From: Martin Foster <martin.foster2@hee.nhs.uk>
Date: Wed, 28 Sep 2022 11:11:30 +0100
Subject: [PATCH 3/5] Formatter tweaks.

---
 .../AddCompetencyLearningResources.cshtml     | 123 +++++++++---------
 1 file changed, 62 insertions(+), 61 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml
index d2bd707ad8..427212001f 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml
@@ -1,15 +1,15 @@
 @using DigitalLearningSolutions.Web.ViewModels.Frameworks;
 @model CompetencyResourceSignpostingViewModel
 @{
-    ViewData["Title"] = "Add Competency Learning Resource";
-    ViewData["Application"] = "Framework Service";
-    var dropdownItems = Model.Catalogues
-          .Select(c => new SelectListItem(
-            text: c.Name + (c.IsRestricted ? " (Restricted)" : ""),
-            value: c.Id.ToString(),
-            selected: c.Id == Model.CatalogueId)
-          ).ToList();
-    dropdownItems.Insert(0, new SelectListItem("Any catalogue", "0", !Model.CatalogueId.HasValue));
+  ViewData["Title"] = "Add Competency Learning Resource";
+  ViewData["Application"] = "Framework Service";
+  var dropdownItems = Model.Catalogues
+        .Select(c => new SelectListItem(
+          text: c.Name + (c.IsRestricted ? " (Restricted)" : ""),
+          value: c.Id.ToString(),
+          selected: c.Id == Model.CatalogueId)
+        ).ToList();
+  dropdownItems.Insert(0, new SelectListItem("Any catalogue", "0", !Model.CatalogueId.HasValue));
 }
 
 <link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
@@ -18,91 +18,92 @@
   <partial name="Shared/_NavMenuItems" />
 }
 
-@section NavBreadcrumbs {
+  @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>
+           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>
+           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>
+           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">Add Resource</li>
       </ol>
       <p class="nhsuk-breadcrumb__back">
         <a class="nhsuk-breadcrumb__backlink"
-           asp-action="EditCompetencyLearningResources"
-           asp-route-frameworkId="@Model.FrameworkId"
-           asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId"
-           asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId">Back to Signposting</a>
+         asp-action="EditCompetencyLearningResources"
+         asp-route-frameworkId="@Model.FrameworkId"
+         asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId"
+         asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId">Back to Signposting</a>
       </p>
     </div>
   </nav>
 }
 
-<h1>Add Competency Learning Resource</h1>
-<div class="nhsuk-inset-text">
-  <span class="nhsuk-u-visually-hidden">Information: </span>
-  <p>
-    @Model.NameOfCompetency
-  </p>
-</div>
-<form method="get" role="search" asp-action="SearchLearningResourcesAsync">
-  <h2>Search the Learning Hub</h2>
-  <div class="nhsuk-grid-row">
-    <div class="nhsuk-grid-column-three-quarters">
-      <div class="search-box-container" id="search">
-        @Html.LabelFor(m => m.SearchText, "Search", new { @class = "nhsuk-u-visually-hidden", @for = "search-field" })
-        @Html.TextBoxFor(m => m.SearchText, new { @class = "search-box nhsuk-input", id = "search-field", name = "searchString", type = "search", placeholder = "Search", autocomplete = "off" })
-        <button class="nhsuk-button sort-submit" type="submit"
+  <h1>Add Competency Learning Resource</h1>
+  <div class="nhsuk-inset-text">
+    <span class="nhsuk-u-visually-hidden">Information: </span>
+    <p>
+      @Model.NameOfCompetency
+    </p>
+  </div>
+  <form method="get" role="search" asp-action="SearchLearningResourcesAsync">
+    <h2>Search the Learning Hub</h2>
+    <div class="nhsuk-grid-row">
+      <div class="nhsuk-grid-column-three-quarters">
+        <div class="search-box-container" id="search">
+          @Html.LabelFor(m => m.SearchText, "Search", new { @class = "nhsuk-u-visually-hidden", @for = "search-field" })
+          @Html.TextBoxFor(m => m.SearchText, new { @class = "search-box nhsuk-input", id = "search-field", name = "searchString", type = "search", placeholder = "Search", autocomplete = "off" })
+          <button class="nhsuk-button sort-submit" type="submit"
                 asp-route-page="@Model.SearchText == SearchText ? @Model.Page | 1"
                 asp-route-frameworkId="@Model.FrameworkId"
                 asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId"
                 asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId"
                 asp-route-catalogueId="@Model.CatalogueId">
-          Search
-        </button>
-      </div>
-      <div class="filter-value-container">
-        @Html.DropDownListFor(c => c.CatalogueId, dropdownItems,
-          new
-          {
-            @class = "nhsuk-u-width-full nhsuk-select nhsuk-u-margin-bottom-4",
-            aria_label = "Catalogue filter",
-            style = "border-radius: 4px;"
-          })
+            Search
+          </button>
+        </div>
+        <div class="filter-value-container">
+          @Html.DropDownListFor(c => c.CatalogueId, dropdownItems,
+        new
+        {
+        @class = "nhsuk-u-width-full nhsuk-select nhsuk-u-margin-bottom-4",
+        aria_label = "Catalogue filter",
+        style = "border-radius: 4px;"
+        })
+        </div>
       </div>
     </div>
-  </div>
-</form>
-
-<form method="get">
-  <partial name="PaginatedPage/_TopPaginationNav" model="Model" />
-  @Html.Hidden("SearchText", Model.SearchText)
-</form>
-
-@if (Model.LearningHubApiError) {
+  </form>
+  <form method="get">
+    <partial name="PaginatedPage/_TopPaginationNav" model="Model" />
+    @Html.Hidden("SearchText", Model.SearchText)
+  </form>
+  @if (Model.LearningHubApiError)
+{
   <span class="nhsuk-u-margin-1 nhsuk-u-clear">This service is unavailable. Please try again later.</span>
-} else if (Model.SearchResult?.Results != null) {
+}
+else if (Model.SearchResult?.Results != null)
+{
   <span class="nhsuk-u-margin-1 nhsuk-u-clear">@Model.TotalNumResources matches for "@Model.SearchText"</span>
-  @foreach (var result in Model.SearchResult.Results) {
+  @foreach (var result in Model.SearchResult.Results)
+  {
     <partial name="Developer/_SignpostingResourceCard" model="new CompetencyResourceSummaryViewModel(result)" view-data="@(new ViewDataDictionary(ViewData) { { "parent", Model } })" />
   }
 }
-
 <form method="get">
   <partial name="PaginatedPage/_BottomPaginationNavWithAlert" model="Model" />
   @Html.Hidden("SearchText", Model.SearchText)

From ef1dfc201eff6c8e0b666d4e1988f7736886210e Mon Sep 17 00:00:00 2001
From: Martin Foster <martin.foster2@hee.nhs.uk>
Date: Wed, 28 Sep 2022 11:36:03 +0100
Subject: [PATCH 4/5] Fixed spurious merge issue.

---
 .../AddCompetencyLearningResources.cshtml     | 180 ++++++++----------
 1 file changed, 84 insertions(+), 96 deletions(-)

diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml
index 860ec6f293..2a16e16846 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml
@@ -3,132 +3,120 @@
 @{
   ViewData["Title"] = "Add Competency Learning Resource";
   ViewData["Application"] = "Framework Service";
-  <
+  ViewData["HeaderPathName"] = "Framework Service";
+  var dropdownItems = Model.Catalogues
+        .Select(c => new SelectListItem(
+          text: c.Name + (c.IsRestricted ? " (Restricted)" : ""),
+          value: c.Id.ToString(),
+          selected: c.Id == Model.CatalogueId)
+        ).ToList();
+  dropdownItems.Insert(0, new SelectListItem("Any catalogue", "0", !Model.CatalogueId.HasValue));
+}
 
-  <
+<link rel="stylesheet" href="@Url.Content("~/css/frameworks/frameworksShared.css")" asp-append-version="true">
 
-  <
+@section NavMenuItems {
+  <partial name="Shared/_NavMenuItems" />
+}
 
-  <
-
-  <
-
-  <
-
-  < HEAD
-  =======
-    ViewData["HeaderPathName"] = "Framework Service";
-  >>>>>>> master
-    var dropdownItems = Model.Catalogues
-          .Select(c => new SelectListItem(
-            text: c.Name + (c.IsRestricted ? " (Restricted)" : ""),
-            value: c.Id.ToString(),
-            selected: c.Id == Model.CatalogueId)
-          ).ToList();
-    dropdownItems.Insert(0, new SelectListItem("Any catalogue", "0", !Model.CatalogueId.HasValue));
-  }
-
-  <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"
+  @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"
+        </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"
+        </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">Add Resource</li>
-        </ol>
-        <p class="nhsuk-breadcrumb__back">
-          <a class="nhsuk-breadcrumb__backlink"
+        </li>
+        <li class="nhsuk-breadcrumb__item">Add Resource</li>
+      </ol>
+      <p class="nhsuk-breadcrumb__back">
+        <a class="nhsuk-breadcrumb__backlink"
          asp-action="EditCompetencyLearningResources"
          asp-route-frameworkId="@Model.FrameworkId"
          asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId"
          asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId">Back to Signposting</a>
-        </p>
-      </div>
-    </nav>
-  }
-
-    <h1>Add Competency Learning Resource</h1>
-    <div class="nhsuk-inset-text">
-      <span class="nhsuk-u-visually-hidden">Information: </span>
-      <p>
-          @Model.NameOfCompetency
       </p>
     </div>
-    <form method="get" role="search" asp-action="SearchLearningResourcesAsync">
-      <h2>Search the Learning Hub</h2>
-      <div class="nhsuk-grid-row">
-        <div class="nhsuk-grid-column-three-quarters">
-          <div class="search-box-container" id="search">
-              @Html.LabelFor(m => m.SearchText, "Search", new { @class = "nhsuk-u-visually-hidden", @for = "search-field" })
-              @Html.TextBoxFor(m => m.SearchText, new { @class = "search-box nhsuk-input", id = "search-field", name = "searchString", type = "search", placeholder = "Search", autocomplete = "off" })
-            <button class="nhsuk-button sort-submit" type="submit"
+  </nav>
+}
+
+  <h1>Add Competency Learning Resource</h1>
+  <div class="nhsuk-inset-text">
+    <span class="nhsuk-u-visually-hidden">Information: </span>
+    <p>
+      @Model.NameOfCompetency
+    </p>
+  </div>
+  <form method="get" role="search" asp-action="SearchLearningResourcesAsync">
+    <h2>Search the Learning Hub</h2>
+    <div class="nhsuk-grid-row">
+      <div class="nhsuk-grid-column-three-quarters">
+        <div class="search-box-container" id="search">
+          @Html.LabelFor(m => m.SearchText, "Search", new { @class = "nhsuk-u-visually-hidden", @for = "search-field" })
+          @Html.TextBoxFor(m => m.SearchText, new { @class = "search-box nhsuk-input", id = "search-field", name = "searchString", type = "search", placeholder = "Search", autocomplete = "off" })
+          <button class="nhsuk-button sort-submit" type="submit"
                 asp-route-page="@Model.SearchText == SearchText ? @Model.Page | 1"
                 asp-route-frameworkId="@Model.FrameworkId"
                 asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId"
                 asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId"
                 asp-route-catalogueId="@Model.CatalogueId">
-              Search
-            </button>
-          </div>
-          <div class="filter-value-container">
-              @Html.DropDownListFor(c => c.CatalogueId, dropdownItems,
+            Search
+          </button>
+        </div>
+        <div class="filter-value-container">
+          @Html.DropDownListFor(c => c.CatalogueId, dropdownItems,
         new
         {
         @class = "nhsuk-u-width-full nhsuk-select nhsuk-u-margin-bottom-4",
         aria_label = "Catalogue filter",
         style = "border-radius: 4px;"
         })
-          </div>
         </div>
       </div>
-    </form>
-    <form method="get">
-      <partial name="PaginatedPage/_TopPaginationNav" model="Model" />
-        @Html.Hidden("SearchText", Model.SearchText)
-    </form>
-      @if (Model.LearningHubApiError)
-    {
-    <span class="nhsuk-u-margin-1 nhsuk-u-clear">This service is unavailable. Please try again later.</span>
-    }
-    else if (Model.SearchResult?.Results != null)
-    {
-    <span class="nhsuk-u-margin-1 nhsuk-u-clear">@Model.TotalNumResources matches for "@Model.SearchText"</span>
-      @foreach (var result in Model.SearchResult.Results)
-      {
-      <partial name="Developer/_SignpostingResourceCard" model="new CompetencyResourceSummaryViewModel(result)" view-data="@(new ViewDataDictionary(ViewData) { { "parent", Model } })" />
-      }
-    }
+    </div>
+  </form>
+
   <form method="get">
-    <partial name="PaginatedPage/_BottomPaginationNavWithAlert" model="Model" />
-      @Html.Hidden("SearchText", Model.SearchText)
+    <partial name="PaginatedPage/_TopPaginationNav" model="Model" />
+    @Html.Hidden("SearchText", Model.SearchText)
   </form>
-  <div class="nhsuk-back-link nhsuk-u-margin-left-1 nhsuk-u-margin-top-6">
-    <a class="nhsuk-back-link__link" asp-action="EditCompetencyLearningResources" asp-route-frameworkId="@Model.FrameworkId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId">
-      <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>
+
+  @if (Model.LearningHubApiError)
+{
+  <span class="nhsuk-u-margin-1 nhsuk-u-clear">This service is unavailable. Please try again later.</span>
+}
+else if (Model.SearchResult?.Results != null)
+{
+  <span class="nhsuk-u-margin-1 nhsuk-u-clear">@Model.TotalNumResources matches for "@Model.SearchText"</span>
+  @foreach (var result in Model.SearchResult.Results)
+  {
+    <partial name="Developer/_SignpostingResourceCard" model="new CompetencyResourceSummaryViewModel(result)" view-data="@(new ViewDataDictionary(ViewData) { { "parent", Model } })" />
+  }
+}
+
+<form method="get">
+  <partial name="PaginatedPage/_BottomPaginationNavWithAlert" model="Model" />
+  @Html.Hidden("SearchText", Model.SearchText)
+</form>
+<div class="nhsuk-back-link nhsuk-u-margin-left-1 nhsuk-u-margin-top-6">
+  <a class="nhsuk-back-link__link" asp-action="EditCompetencyLearningResources" asp-route-frameworkId="@Model.FrameworkId" asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId" asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId">
+    <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>

From 7ea0d284958e536768451a7e08e81ad47468710c Mon Sep 17 00:00:00 2001
From: Martin Foster <martin.foster2@hee.nhs.uk>
Date: Wed, 28 Sep 2022 12:21:54 +0100
Subject: [PATCH 5/5] Fixed iif syntax issue.

---
 .../Frameworks/Developer/AddCompetencyLearningResources.cshtml  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml
index 2a16e16846..54386f9c98 100644
--- a/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml
+++ b/DigitalLearningSolutions.Web/Views/Frameworks/Developer/AddCompetencyLearningResources.cshtml
@@ -69,7 +69,7 @@
           @Html.LabelFor(m => m.SearchText, "Search", new { @class = "nhsuk-u-visually-hidden", @for = "search-field" })
           @Html.TextBoxFor(m => m.SearchText, new { @class = "search-box nhsuk-input", id = "search-field", name = "searchString", type = "search", placeholder = "Search", autocomplete = "off" })
           <button class="nhsuk-button sort-submit" type="submit"
-                asp-route-page="@Model.SearchText == SearchText ? @Model.Page | 1"
+                asp-route-page="@Model.SearchText == SearchText ? @Model.Page : 1"
                 asp-route-frameworkId="@Model.FrameworkId"
                 asp-route-frameworkCompetencyId="@Model.FrameworkCompetencyId"
                 asp-route-frameworkCompetencyGroupId="@Model.FrameworkCompetencyGroupId"