TD-5683 Issue showing self assessment reports on Tracking system which are not published at the centre

Author: sherif-olaboye

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

@@ -1,20 +1,20 @@
 namespace DigitalLearningSolutions.Web.Controllers.TrackingSystem.Centre.SelfAssessmentReports
 {
+    using DigitalLearningSolutions.Data.Enums;
+    using DigitalLearningSolutions.Data.Extensions;
     using DigitalLearningSolutions.Data.Services;
-    using DigitalLearningSolutions.Web.Helpers;
-    using Microsoft.AspNetCore.Authorization;
-    using Microsoft.AspNetCore.Mvc;
-    using Microsoft.FeatureManagement.Mvc;
+    using DigitalLearningSolutions.Data.Utilities;
     using DigitalLearningSolutions.Web.Attributes;
+    using DigitalLearningSolutions.Web.Helpers;
+    using DigitalLearningSolutions.Web.Helpers.ExternalApis;
     using DigitalLearningSolutions.Web.Models.Enums;
-    using DigitalLearningSolutions.Data.Enums;
-    using DigitalLearningSolutions.Data.Utilities;
+    using DigitalLearningSolutions.Web.Services;
     using DigitalLearningSolutions.Web.ViewModels.TrackingSystem.Centre.Reports;
-    using DigitalLearningSolutions.Web.Helpers.ExternalApis;
+    using Microsoft.AspNetCore.Authorization;
+    using Microsoft.AspNetCore.Mvc;
     using Microsoft.Extensions.Configuration;
-    using DigitalLearningSolutions.Data.Extensions;
-    using DigitalLearningSolutions.Web.Services;
-
+    using Microsoft.FeatureManagement.Mvc;
+    using System.Linq;
     [FeatureGate(FeatureFlags.RefactoredTrackingSystem)]
     [Authorize(Policy = CustomPolicies.UserCentreAdmin)]
     [SetDlsSubApplication(nameof(DlsSubApplication.TrackingSystem))]
@@ -30,12 +30,14 @@ public class SelfAssessmentReportsController : Controller
         private readonly string workbookName;
         private readonly string viewName;
         private readonly ISelfAssessmentService selfAssessmentService;
+        private readonly ICentreSelfAssessmentsService centreSelfAssessmentsService;
         public SelfAssessmentReportsController(
             ISelfAssessmentReportService selfAssessmentReportService,
             ITableauConnectionHelperService tableauConnectionHelper,
             IClockUtility clockUtility,
             IConfiguration config,
-            ISelfAssessmentService selfAssessmentService
+            ISelfAssessmentService selfAssessmentService,
+            ICentreSelfAssessmentsService centreSelfAssessmentsService
         )
         {
             this.selfAssessmentReportService = selfAssessmentReportService;
@@ -46,14 +48,16 @@ ISelfAssessmentService selfAssessmentService
             workbookName = config.GetTableauWorkbookName();
             viewName = config.GetTableauViewName();
             this.selfAssessmentService = selfAssessmentService;
+            this.centreSelfAssessmentsService = centreSelfAssessmentsService;
         }
         public IActionResult Index()
         {
             var centreId = User.GetCentreId();
             var adminCategoryId = User.GetAdminCategoryId();
             var categoryId = this.selfAssessmentService.GetSelfAssessmentCategoryId(1);
-            var model = new SelfAssessmentReportsViewModel(selfAssessmentReportService.GetSelfAssessmentsForReportList((int)centreId, adminCategoryId), adminCategoryId, categoryId);
-            return View(model);
+            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);
         }
         [HttpGet]
         [Route("DownloadDcsa")]

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

@@ -6,15 +6,17 @@
     public class SelfAssessmentReportsViewModel
     {
         public SelfAssessmentReportsViewModel(
-            IEnumerable<SelfAssessmentSelect> selfAssessmentSelects, int? adminCategoryId, int categoryId
+            IEnumerable<SelfAssessmentSelect> selfAssessmentSelects, int? adminCategoryId, int categoryId, bool dSATreportIsPublish
             )
         {
             SelfAssessmentSelects = selfAssessmentSelects;
             AdminCategoryId = adminCategoryId;
             CategoryId = categoryId;
+            DSATreportIsPublish = dSATreportIsPublish;
         }
         public IEnumerable<SelfAssessmentSelect> SelfAssessmentSelects { get; set; }
         public int? AdminCategoryId { get; set; }
         public int CategoryId { get; set; }
+        public bool DSATreportIsPublish { get; set; }
     }
 }