Merge pull request #2079 from TechnologyEnhancedLearning/Develop/Fixes/TD-2115-AddressTestFailsForSAReports

TD-2115 Address test fails for super admin self assessment reports

Author: rshrirohit

DigitalLearningSolutions.Web/Controllers/SuperAdmin/PlatformReports/PlatformReportsController.cs

@@ -115,7 +115,7 @@ public IActionResult SupervisedSelfAssessmentsEditFilters(SelfAssessmentsEditFil
             {
                 var filterOptions = GetDropdownValues(true);
                 model.DataStart = platformReportsService.GetSelfAssessmentActivityStartDate(true);
-                return View("NursingReportEditFilters", model);
+                return View("SelfAssessmentsEditFilters", model);
             }
 
             var filterData = new ActivityFilterData(
@@ -194,7 +194,7 @@ public IActionResult IndependentSelfAssessmentsEditFilters(SelfAssessmentsEditFi
             {
                 var filterOptions = GetDropdownValues(false);
                 model.DataStart = platformReportsService.GetSelfAssessmentActivityStartDate(false);
-                return View("NursingReportEditFilters", model);
+                return View("SelfAssessmentsEditFilters", model);
             }
 
             var filterData = new ActivityFilterData(

DigitalLearningSolutions.Web/ViewModels/SuperAdmin/PlatformReports/SelfAssessmentsEditFiltersViewModel.cs

@@ -10,7 +10,7 @@
     using System.ComponentModel.DataAnnotations;
     using System.Linq;
 
-    public class SelfAssessmentsEditFiltersViewModel
+    public class SelfAssessmentsEditFiltersViewModel : IValidatableObject
     {
         public SelfAssessmentsEditFiltersViewModel() { }
 

DigitalLearningSolutions.Web/Views/SuperAdmin/PlatformReports/Index.cshtml

@@ -174,6 +174,10 @@
                     </ul>
                 </div>
             </div>
+            <nav class="side-nav-menu-bottom" aria-label="Bottom navigation bar">
+                <hr />
+                <partial name="~/Views/SuperAdmin/Shared/_PlatformReportsSideNavMenu.cshtml" model="Model.CurrentPage" />
+            </nav>
         </div>
     </div>
 </div>

DigitalLearningSolutions.Web/Views/SuperAdmin/PlatformReports/SelfAssessmentsEditFilters.cshtml

@@ -7,9 +7,7 @@
     ViewData["Title"] = errorHasOccurred ? "Error: Edit report filters" : "Edit report filters";
     var reportIntervalValue = (int)Model.ReportInterval;
 }
-
-<link rel="stylesheet" href="@Url.Content("~/css/trackingSystem/reports.css")">
-
+<link rel="stylesheet" href="@Url.Content("~/css/superAdmin/platformreports.css")" asp-append-version="true">
 <div class="nhsuk-grid-row">
     <div class="nhsuk-grid-column-full">
         @if (errorHasOccurred)
@@ -85,7 +83,7 @@
                             default-option="All"
                             select-list-options="@Model.CategoryOptions" />
             <vc:select-list asp-for="@nameof(Model.SelfAssessmentId)"
-                            label="Choose Self Assessment filter"
+                            label="Choose self assessment filter"
                             value="@Model.SelfAssessmentId.ToString()"
                             hint-text=""
                             required="false"

DigitalLearningSolutions.Web/Views/SuperAdmin/PlatformReports/SelfAssessmentsReport.cshtml

@@ -32,6 +32,10 @@
                     <partial name="_ActivityTable.cshtml" model="@Model.SelfAssessmentActivityTableViewModel" />
                 </div>
             </div>
+            <nav class="side-nav-menu-bottom" aria-label="Bottom navigation bar">
+              <hr />
+                <partial name="~/Views/SuperAdmin/Shared/_PlatformReportsSideNavMenu.cshtml" model="Model.CurrentPage" />
+            </nav>
         </div>
     </div>
 </div>

DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/Reports/EditFilters.cshtml

@@ -8,7 +8,7 @@
   var reportIntervalValue = (int)Model.ReportInterval;
 }
 
-<link rel="stylesheet" href="@Url.Content("~/css/trackingSystem/reports.css")">
+<link rel="stylesheet" href="@Url.Content("~/css/shared/reports.css")" asp-append-version="true">
 
 <div class="nhsuk-grid-row">
   <div class="nhsuk-grid-column-full">