Merge pull request #2487 from TechnologyEnhancedLearning/Develop/Fixes/TD-3621-ChangingTextOfPlaceholderTextBasedOnCondition

rshrirohit · web-flow · commit bc6777447006 · 2024-01-25T09:26:18.000Z
TD-3621 Changing text of placeholder text based on condition
diff --git a/DigitalLearningSolutions.Web/ViewModels/LearningPortal/RecommendedLearning/RecommendedLearningViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/LearningPortal/RecommendedLearning/RecommendedLearningViewModel.cs
@@ -18,7 +18,7 @@ bool apiIsAccessible
         ) : base(
             result,
             false,
-            searchLabel: "Search resources"
+            searchLabel: "Search"
         )
         {
             ApiIsAccessible = apiIsAccessible;
diff --git a/DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/AddSupervisorViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/AddSupervisorViewModel.cs
@@ -15,7 +15,7 @@ public AddSupervisorViewModel(
             string? selfAssessmentName,
             int supervisorAdminID,
             SearchSortFilterPaginationResult<Administrator> result
-            ) : base(result, false, searchLabel: "Search supervisors")
+            ) : base(result, false, searchLabel: "Search")
         {
             SelfAssessmentID = selfAssessmentID;
             SelfAssessmentName = selfAssessmentName;
diff --git a/DigitalLearningSolutions.Web/ViewModels/Supervisor/MyStaffListViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Supervisor/MyStaffListViewModel.cs
@@ -19,7 +19,7 @@ public MyStaffListViewModel(
             AdminUser adminUser,
             SearchSortFilterPaginationResult<SupervisorDelegateDetailViewModel> result,
             CentreRegistrationPrompts centreRegistrationPrompts
-        ) : base(result, false, searchLabel: "Search administrators")
+        ) : base(result, false, searchLabel: "Search")
         {
             AdminUser = adminUser;
             CentreRegistrationPrompts = centreRegistrationPrompts;
diff --git a/DigitalLearningSolutions.Web/ViewModels/Support/Faqs/FaqsPageViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/Support/Faqs/FaqsPageViewModel.cs
@@ -15,7 +15,7 @@ public FaqsPageViewModel(
             SupportPage currentPage,
             string currentSystemBaseUrl,
             SearchSortFilterPaginationResult<SearchableFaq> result
-        ) : base(result, false, searchLabel: "Search faqs")
+        ) : base(result, false, searchLabel: "Search")
         {
             CurrentPage = currentPage;
             DlsSubApplication = dlsSubApplication;
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/AllDelegates/AllDelegatesViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/AllDelegates/AllDelegatesViewModel.cs
@@ -19,7 +19,7 @@ IEnumerable<FilterModel> availableFilters
             result,
             true,
             availableFilters,
-            "Search delegates"
+            "Search"
         )
         {
             var promptsWithOptions =
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/DelegateCourses/DelegateCoursesViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/DelegateCourses/DelegateCoursesViewModel.cs
@@ -17,7 +17,7 @@ string courseCategoryName
             result,
             true,
             availableFilters,
-            "Search courses"
+            "Search by activity name"
         )
         {
             UpdateCourseActiveFlags(result);
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/DelegateGroups/DelegateGroupsViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/DelegateGroups/DelegateGroupsViewModel.cs
@@ -16,7 +16,7 @@ IEnumerable<FilterModel> availableFilters
             result,
             true,
             availableFilters,
-            "Search groups"
+            "Search"
         )
         {
             DelegateGroups = result.ItemsToDisplay.Select(g =>
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/GroupCourses/AddCourseToGroupCoursesViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/GroupCourses/AddCourseToGroupCoursesViewModel.cs
@@ -19,7 +19,7 @@ string groupName
             result,
             true,
             availableFilters,
-            "Search courses"
+            "Search"
         )
         {
             GroupId = groupId;
diff --git a/DigitalLearningSolutions.Web/Views/Shared/SearchablePage/_Search.cshtml b/DigitalLearningSolutions.Web/Views/Shared/SearchablePage/_Search.cshtml
@@ -2,32 +2,32 @@
 @model IBaseSearchablePageViewModel
 
 <form method="get" role="search">
-  @if (Model.FilterEnabled)
-  {
-    <input type="hidden" name="existingFilterString" value="@Model.ExistingFilterString" />
-  }
-  @foreach (var (key, value) in Model.RouteData)
-  {
-    <input type="hidden" name="@key" value="@value" />
-  }
-  <input type="hidden" name="sortBy" value="@Model.SortBy" />
-  <input type="hidden" name="sortDirection" value="@Model.SortDirection" />
-  <input type="hidden" name="itemsPerPage" value="@Model.ItemsPerPage" />
-  <div class="search-box-container" id="search">
-    <label class="nhsuk-u-visually-hidden" for="search-field">
-      @Model.SearchLabel
-    </label>
+    @if (Model.FilterEnabled)
+    {
+        <input type="hidden" name="existingFilterString" value="@Model.ExistingFilterString" />
+    }
+    @foreach (var (key, value) in Model.RouteData)
+    {
+        <input type="hidden" name="@key" value="@value" />
+    }
+    <input type="hidden" name="sortBy" value="@Model.SortBy" />
+    <input type="hidden" name="sortDirection" value="@Model.SortDirection" />
+    <input type="hidden" name="itemsPerPage" value="@Model.ItemsPerPage" />
+    <div class="search-box-container" id="search">
+        <label class="nhsuk-u-visually-hidden" for="search-field">
+            @Model.SearchLabel
+        </label>
 
-        <input class="search-box nhsuk-input" id="search-field" name="searchString" type="search" placeholder="Search by activity name" autocomplete="off" value="@Model.SearchString" />
+        <input class="search-box nhsuk-input" id="search-field" name="searchString" type="search" placeholder="@Model.SearchLabel" autocomplete="off" value="@Model.SearchString" />
 
-    <button class="nhsuk-button search-submit"
-            type="submit"
-            asp-action="@ViewContext.RouteData.Values["action"].ToString()"
-            asp-route-page="1">
-      <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
-        <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
-      </svg>
-      <span class="nhsuk-u-visually-hidden">Search</span>
-    </button>
-  </div>
+        <button class="nhsuk-button search-submit"
+                type="submit"
+                asp-action="@ViewContext.RouteData.Values["action"].ToString()"
+                asp-route-page="1">
+            <svg class="nhsuk-icon nhsuk-icon__search" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false">
+                <path d="M19.71 18.29l-4.11-4.1a7 7 0 1 0-1.41 1.41l4.1 4.11a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 10a5 5 0 1 1 5 5 5 5 0 0 1-5-5z"></path>
+            </svg>
+            <span class="nhsuk-u-visually-hidden">Search</span>
+        </button>
+    </div>
 </form>

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ bool apiIsAccessible`
`18`	`18`	`) : base(`
`19`	`19`	`result,`
`20`	`20`	`false,`
`21`		`- searchLabel: "Search resources"`
	`21`	`+ searchLabel: "Search"`
`22`	`22`	`)`
`23`	`23`	`{`
`24`	`24`	`ApiIsAccessible = apiIsAccessible;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public AddSupervisorViewModel(`
`15`	`15`	`string? selfAssessmentName,`
`16`	`16`	`int supervisorAdminID,`
`17`	`17`	`SearchSortFilterPaginationResult<Administrator> result`
`18`		`- ) : base(result, false, searchLabel: "Search supervisors")`
	`18`	`+ ) : base(result, false, searchLabel: "Search")`
`19`	`19`	`{`
`20`	`20`	`SelfAssessmentID = selfAssessmentID;`
`21`	`21`	`SelfAssessmentName = selfAssessmentName;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public MyStaffListViewModel(`
`19`	`19`	`AdminUser adminUser,`
`20`	`20`	`SearchSortFilterPaginationResult<SupervisorDelegateDetailViewModel> result,`
`21`	`21`	`CentreRegistrationPrompts centreRegistrationPrompts`
`22`		`- ) : base(result, false, searchLabel: "Search administrators")`
	`22`	`+ ) : base(result, false, searchLabel: "Search")`
`23`	`23`	`{`
`24`	`24`	`AdminUser = adminUser;`
`25`	`25`	`CentreRegistrationPrompts = centreRegistrationPrompts;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public FaqsPageViewModel(`
`15`	`15`	`SupportPage currentPage,`
`16`	`16`	`string currentSystemBaseUrl,`
`17`	`17`	`SearchSortFilterPaginationResult<SearchableFaq> result`
`18`		`- ) : base(result, false, searchLabel: "Search faqs")`
	`18`	`+ ) : base(result, false, searchLabel: "Search")`
`19`	`19`	`{`
`20`	`20`	`CurrentPage = currentPage;`
`21`	`21`	`DlsSubApplication = dlsSubApplication;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ IEnumerable<FilterModel> availableFilters`
`19`	`19`	`result,`
`20`	`20`	`true,`
`21`	`21`	`availableFilters,`
`22`		`- "Search delegates"`
	`22`	`+ "Search"`
`23`	`23`	`)`
`24`	`24`	`{`
`25`	`25`	`var promptsWithOptions =`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ string courseCategoryName`
`17`	`17`	`result,`
`18`	`18`	`true,`
`19`	`19`	`availableFilters,`
`20`		`- "Search courses"`
	`20`	`+ "Search by activity name"`
`21`	`21`	`)`
`22`	`22`	`{`
`23`	`23`	`UpdateCourseActiveFlags(result);`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ IEnumerable<FilterModel> availableFilters`
`16`	`16`	`result,`
`17`	`17`	`true,`
`18`	`18`	`availableFilters,`
`19`		`- "Search groups"`
	`19`	`+ "Search"`
`20`	`20`	`)`
`21`	`21`	`{`
`22`	`22`	`DelegateGroups = result.ItemsToDisplay.Select(g =>`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ string groupName`
`19`	`19`	`result,`
`20`	`20`	`true,`
`21`	`21`	`availableFilters,`
`22`		`- "Search courses"`
	`22`	`+ "Search"`
`23`	`23`	`)`
`24`	`24`	`{`
`25`	`25`	`GroupId = groupId;`