TD-5683 Resolving PR conflicts

Author: sherif-olaboye

DigitalLearningSolutions.Web/Controllers/TrackingSystem/Centre/SelfAssessmentReports/SelfAssessmentReportsController.cs

@@ -16,6 +16,7 @@
     using Microsoft.FeatureManagement;
     using Microsoft.FeatureManagement.Mvc;
     using System;
+    using System.Linq;
     using System.Threading.Tasks;
     [FeatureGate(FeatureFlags.RefactoredTrackingSystem)]
     [Authorize(Policy = CustomPolicies.UserCentreAdmin)]
@@ -40,7 +41,7 @@ public SelfAssessmentReportsController(
             IClockUtility clockUtility,
             IConfiguration config,
             ISelfAssessmentService selfAssessmentService,
-            ICentreSelfAssessmentsService centreSelfAssessmentsService
+            ICentreSelfAssessmentsService centreSelfAssessmentsService,
             IFeatureManager featureManager
         )
         {
@@ -63,11 +64,10 @@ public async Task<IActionResult> IndexAsync()
             var categoryId = this.selfAssessmentService.GetSelfAssessmentCategoryId(1);
             var selfAssessments = centreSelfAssessmentsService.GetCentreSelfAssessments(centreId.Value);
             var dSATreportIsPublish = selfAssessments.Any(x => x.SelfAssessmentId == 1);
-            var model = new SelfAssessmentReportsViewModel(selfAssessmentReportService.GetSelfAssessmentsForReportList((int)centreId, adminCategoryId), adminCategoryId, categoryId, dSATreportIsPublish); return View(model);
             var tableauFlag = await featureManager.IsEnabledAsync(FeatureFlags.TableauSelfAssessmentDashboards);
             var tableauQueryOverride = string.Equals(Request.Query["tableaulink"], "true", StringComparison.OrdinalIgnoreCase);
             var showTableauLink = tableauFlag || tableauQueryOverride;
-            var model = new SelfAssessmentReportsViewModel(selfAssessmentReportService.GetSelfAssessmentsForReportList((int)centreId, adminCategoryId), adminCategoryId, categoryId, showTableauLink);
+            var model = new SelfAssessmentReportsViewModel(selfAssessmentReportService.GetSelfAssessmentsForReportList((int)centreId, adminCategoryId), adminCategoryId, categoryId, dSATreportIsPublish, showTableauLink);
             return View(model);
         }
         [HttpGet]

DigitalLearningSolutions.Web/ViewModels/TrackingSystem/Centre/Reports/SelfAssessmentReportsViewModel.cs

@@ -6,8 +6,7 @@
     public class SelfAssessmentReportsViewModel
     {
         public SelfAssessmentReportsViewModel(
-            IEnumerable<SelfAssessmentSelect> selfAssessmentSelects, int? adminCategoryId, int categoryId, bool dSATreportIsPublish
-            IEnumerable<SelfAssessmentSelect> selfAssessmentSelects, int? adminCategoryId, int categoryId, bool showTableauLink
+            IEnumerable<SelfAssessmentSelect> selfAssessmentSelects, int? adminCategoryId, int categoryId, bool dSATreportIsPublish, bool showTableauLink
             )
         {
             SelfAssessmentSelects = selfAssessmentSelects;

DigitalLearningSolutions.Web/Views/TrackingSystem/Centre/SelfAssessmentReports/Index.cshtml

@@ -33,10 +33,10 @@
         <h2>Excel learner activity reports</h2>
         <p class="nhsuk-lede-text">Download Excel competency self assessments activity reports for your centre.</p>
         <ul>
-          @if((Model.DSATreportIsPublish)  && ((Model.AdminCategoryId == null) || (Model.AdminCategoryId == Model.CategoryId)))
-          {
-            <li>
-                <a asp-controller="SelfAssessmentReports" asp-action="DownloadDigitalCapabilityToExcel">Digital Skills Assessment Tool - Download report</a>
+            @if ((Model.DSATreportIsPublish) && ((Model.AdminCategoryId == null) || (Model.AdminCategoryId == Model.CategoryId)))
+            {
+                <li>
+                    <a asp-controller="SelfAssessmentReports" asp-action="DownloadDigitalCapabilityToExcel">Digital Skills Assessment Tool - Download report</a>
 
                 </li>
             }