Merge pull request #2497 from TechnologyEnhancedLearning/Develop/Fixes/TD-3621-AddressingTestFailsForDifferentLocationsMentioned

rshrirohit · web-flow · commit 5d967cd684d7 · 2024-01-26T16:34:41.000Z
TD-3621 Addressing test fails for different locations mentioned
diff --git a/DigitalLearningSolutions.Web/ViewModels/FindYourCentre/RefactoredFindYourCentreViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/FindYourCentre/RefactoredFindYourCentreViewModel.cs
@@ -13,7 +13,7 @@ public RefactoredFindYourCentreViewModel(
             SearchSortFilterPaginationResult<CentreSummaryForFindYourCentre> centreSummaries,
             IEnumerable<FilterModel> availableFilters
         ) :
-            base(centreSummaries, true, availableFilters, "Search Centres")
+            base(centreSummaries, true, availableFilters, "Search")
         {
             CentreSummaries = centreSummaries.ItemsToDisplay;
         }
diff --git a/DigitalLearningSolutions.Web/ViewModels/LearningPortal/Available/AvailablePageViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/LearningPortal/Available/AvailablePageViewModel.cs
@@ -15,7 +15,7 @@ public class AvailablePageViewModel : BaseSearchablePageViewModel<AvailableCours
         public AvailablePageViewModel(
             SearchSortFilterPaginationResult<AvailableCourse> result,
             string? bannerText
-        ) : base(result, false, searchLabel: "Search courses")
+        ) : base(result, false, searchLabel: "Search")
         {
             BannerText = bannerText;
             AvailableCourses = result.ItemsToDisplay.Select(c => new AvailableCourseViewModel(c));
diff --git a/DigitalLearningSolutions.Web/ViewModels/LearningPortal/Completed/CompletedPageViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/LearningPortal/Completed/CompletedPageViewModel.cs
@@ -19,7 +19,7 @@ public CompletedPageViewModel(
             bool apiIsAccessible,
             IConfiguration config,
             string? bannerText
-        ) : base(result, false, searchLabel: "Search your completed courses")
+        ) : base(result, false, searchLabel: "Search")
         {
             ApiIsAccessible = apiIsAccessible;
             BannerText = bannerText;
diff --git a/DigitalLearningSolutions.Web/ViewModels/LearningPortal/Current/CurrentPageViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/LearningPortal/Current/CurrentPageViewModel.cs
@@ -19,7 +19,7 @@ public CurrentPageViewModel(
             SearchSortFilterPaginationResult<CurrentLearningItem> result,
             bool apiIsAccessible,
             string? bannerText
-        ) : base(result, false, searchLabel: "Search your current courses")
+        ) : base(result, false, searchLabel: "Search")
         {
             ApiIsAccessible = apiIsAccessible;
             BannerText = bannerText;
diff --git a/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Administrators/AdminAccountsViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Administrators/AdminAccountsViewModel.cs
@@ -17,7 +17,7 @@ AdminAccount loggedInSuperAdminAccount
             result,
             true,
             null,
-            "Search admin account"
+            "Search"
         )
         {
             Admins = result.ItemsToDisplay.Select(
diff --git a/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Centres/CentresViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Centres/CentresViewModel.cs
@@ -13,7 +13,7 @@ public CentresViewModel(SearchSortFilterPaginationResult<CentreEntity> result) :
             result,
             true,
             null,
-            "Search centre"
+            "Search"
         )
         {
             Centres = result.ItemsToDisplay.Select(
diff --git a/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Delegates/DelegatesViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Delegates/DelegatesViewModel.cs
@@ -16,7 +16,7 @@ SearchSortFilterPaginationResult<SuperAdminDelegateAccount> result
             result,
             true,
             null,
-            "Search delegates account"
+            "Search"
         )
         {
             Delegates = result.ItemsToDisplay.Select(
diff --git a/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Users/UserAccountsViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/SuperAdmin/Users/UserAccountsViewModel.cs
@@ -17,7 +17,7 @@ SearchSortFilterPaginationResult<UserAccountEntity> result
             result,
             true,
             null,
-            "Search user account"
+            "Search"
         )
         {
             UserAccounts = result.ItemsToDisplay.Select(
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/CentreAdministratorsViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Administrator/CentreAdministratorsViewModel.cs
@@ -18,7 +18,7 @@ AdminAccount loggedInAdminAccount
             result,
             true,
             availableFilters,
-            "Search administrators"
+            "Search"
         )
         {
             CentreId = centreId;
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/CourseSetup/CourseSetupViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/CourseSetup/CourseSetupViewModel.cs
@@ -19,7 +19,7 @@ string courseCategoryName
             result,
             true,
             availableFilters,
-            "Search courses"
+            "Search"
         )
         {
             Courses = result.ItemsToDisplay.Select(c => new SearchableCourseStatisticsViewModel(c, config));
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/CourseDelegates/SelectedCourseDetailsViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/CourseDelegates/SelectedCourseDetailsViewModel.cs
@@ -22,7 +22,7 @@ Dictionary<string, string> routeData
             true,
             availableFilters,
             routeData: routeData,
-            searchLabel: "Search activity")
+            searchLabel: "Search")
         {
             var currentCourse =
                 courseDelegatesData.Courses.Single(c => c.CustomisationId == courseDelegatesData.CustomisationId);
diff --git a/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/CourseDelegates/SelectedDelegateDetailsViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Delegates/CourseDelegates/SelectedDelegateDetailsViewModel.cs
@@ -22,7 +22,7 @@ Dictionary<string, string> routeData
             true,
             availableFilters,
             routeData: routeData,
-            searchLabel: "Search activity")
+            searchLabel: "Search")
         {
 
             Delegates = result.ItemsToDisplay.Select(
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 by activity name"
+            "Search"
         )
         {
             UpdateCourseActiveFlags(result);
diff --git a/DigitalLearningSolutions.Web/Views/SuperAdmin/AdminAccounts/Index.cshtml b/DigitalLearningSolutions.Web/Views/SuperAdmin/AdminAccounts/Index.cshtml
@@ -56,7 +56,7 @@
                                                            autocomplete=""
                                                            css-class=""
                                                            required="true"
-                                                           placeholder-text="Search name, email, PRN" />
+                                                           placeholder-text="Search" />
                                         </div>
                                         <div class="nhsuk-grid-column-one-quarter">
                                             <button class="nhsuk-button nhsuk-u-width-full nhsuk-u-margin-top-4 nhsuk-u-float-right" type="submit">Search</button>
diff --git a/DigitalLearningSolutions.Web/Views/SuperAdmin/Centres/Index.cshtml b/DigitalLearningSolutions.Web/Views/SuperAdmin/Centres/Index.cshtml
@@ -44,7 +44,7 @@
                                        autocomplete=""
                                        css-class=""
                                        required="true"
-                                       placeholder-text="Search name" />
+                                       placeholder-text="Search" />
                     </div>
                     <div class="nhsuk-grid-column-one-quarter">
                         <button class="nhsuk-button nhsuk-u-width-full nhsuk-u-margin-top-4 nhsuk-u-float-right" type="submit">Search</button>
diff --git a/DigitalLearningSolutions.Web/Views/SuperAdmin/Delegates/Index.cshtml b/DigitalLearningSolutions.Web/Views/SuperAdmin/Delegates/Index.cshtml
@@ -47,7 +47,7 @@
                                                            autocomplete=""
                                                            css-class=""
                                                            required="true"
-                                                           placeholder-text="Search name, email,delegate number" />
+                                                           placeholder-text="Search" />
                                         </div>
                                         <div class="nhsuk-grid-column-one-quarter">
                                             <button class="nhsuk-button nhsuk-u-width-full nhsuk-u-margin-top-4 nhsuk-u-float-right" type="submit">Search</button>
diff --git a/DigitalLearningSolutions.Web/Views/SuperAdmin/Users/Index.cshtml b/DigitalLearningSolutions.Web/Views/SuperAdmin/Users/Index.cshtml
@@ -42,7 +42,7 @@
                                                            autocomplete=""
                                                            css-class=""
                                                            required="true"
-                                                           placeholder-text="Search name, email, PRN" />
+                                                           placeholder-text="Search" />
                                         </div>
                                         <div class="nhsuk-grid-column-one-quarter">
                                             <button class="nhsuk-button nhsuk-u-width-full  nhsuk-u-margin-top-4 nhsuk-u-float-right" type="submit">Search</button>

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public RefactoredFindYourCentreViewModel(`
`13`	`13`	`SearchSortFilterPaginationResult<CentreSummaryForFindYourCentre> centreSummaries,`
`14`	`14`	`IEnumerable<FilterModel> availableFilters`
`15`	`15`	`) :`
`16`		`- base(centreSummaries, true, availableFilters, "Search Centres")`
	`16`	`+ base(centreSummaries, true, availableFilters, "Search")`
`17`	`17`	`{`
`18`	`18`	`CentreSummaries = centreSummaries.ItemsToDisplay;`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public class AvailablePageViewModel : BaseSearchablePageViewModel<AvailableCours`
`15`	`15`	`public AvailablePageViewModel(`
`16`	`16`	`SearchSortFilterPaginationResult<AvailableCourse> result,`
`17`	`17`	`string? bannerText`
`18`		`- ) : base(result, false, searchLabel: "Search courses")`
	`18`	`+ ) : base(result, false, searchLabel: "Search")`
`19`	`19`	`{`
`20`	`20`	`BannerText = bannerText;`
`21`	`21`	`AvailableCourses = result.ItemsToDisplay.Select(c => new AvailableCourseViewModel(c));`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public CompletedPageViewModel(`
`19`	`19`	`bool apiIsAccessible,`
`20`	`20`	`IConfiguration config,`
`21`	`21`	`string? bannerText`
`22`		`- ) : base(result, false, searchLabel: "Search your completed courses")`
	`22`	`+ ) : base(result, false, searchLabel: "Search")`
`23`	`23`	`{`
`24`	`24`	`ApiIsAccessible = apiIsAccessible;`
`25`	`25`	`BannerText = bannerText;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public CurrentPageViewModel(`
`19`	`19`	`SearchSortFilterPaginationResult<CurrentLearningItem> result,`
`20`	`20`	`bool apiIsAccessible,`
`21`	`21`	`string? bannerText`
`22`		`- ) : base(result, false, searchLabel: "Search your current courses")`
	`22`	`+ ) : base(result, false, searchLabel: "Search")`
`23`	`23`	`{`
`24`	`24`	`ApiIsAccessible = apiIsAccessible;`
`25`	`25`	`BannerText = bannerText;`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ AdminAccount loggedInSuperAdminAccount`
`17`	`17`	`result,`
`18`	`18`	`true,`
`19`	`19`	`null,`
`20`		`- "Search admin account"`
	`20`	`+ "Search"`
`21`	`21`	`)`
`22`	`22`	`{`
`23`	`23`	`Admins = result.ItemsToDisplay.Select(`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public CentresViewModel(SearchSortFilterPaginationResult<CentreEntity> result) :`
`13`	`13`	`result,`
`14`	`14`	`true,`
`15`	`15`	`null,`
`16`		`- "Search centre"`
	`16`	`+ "Search"`
`17`	`17`	`)`
`18`	`18`	`{`
`19`	`19`	`Centres = result.ItemsToDisplay.Select(`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ SearchSortFilterPaginationResult<SuperAdminDelegateAccount> result`
`16`	`16`	`result,`
`17`	`17`	`true,`
`18`	`18`	`null,`
`19`		`- "Search delegates account"`
	`19`	`+ "Search"`
`20`	`20`	`)`
`21`	`21`	`{`
`22`	`22`	`Delegates = result.ItemsToDisplay.Select(`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ SearchSortFilterPaginationResult<UserAccountEntity> result`
`17`	`17`	`result,`
`18`	`18`	`true,`
`19`	`19`	`null,`
`20`		`- "Search user account"`
	`20`	`+ "Search"`
`21`	`21`	`)`
`22`	`22`	`{`
`23`	`23`	`UserAccounts = result.ItemsToDisplay.Select(`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ AdminAccount loggedInAdminAccount`
`18`	`18`	`result,`
`19`	`19`	`true,`
`20`	`20`	`availableFilters,`
`21`		`- "Search administrators"`
	`21`	`+ "Search"`
`22`	`22`	`)`
`23`	`23`	`{`
`24`	`24`	`CentreId = centreId;`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ string courseCategoryName`
`19`	`19`	`result,`
`20`	`20`	`true,`
`21`	`21`	`availableFilters,`
`22`		`- "Search courses"`
	`22`	`+ "Search"`
`23`	`23`	`)`
`24`	`24`	`{`
`25`	`25`	`Courses = result.ItemsToDisplay.Select(c => new SearchableCourseStatisticsViewModel(c, config));`