Merge branch 'DLS-Release-v1.2.0' into UAT

Author: rshrirohit

DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs

@@ -1566,7 +1566,13 @@ ManageOptionalCompetenciesViewModel model
 
             }
 
-            if (!selfAssessmentService.HasMinimumOptionalCompetencies(selfAssessmentId, delegateUserId))
+            var recentResults = selfAssessmentService.GetMostRecentResults(selfAssessmentId, User.GetCandidateIdKnownNotNull()).ToList();
+
+            bool isVerificationPending = recentResults?.SelectMany(comp => comp.AssessmentQuestions).Where(quest => quest.Required)
+                    .Where(quest => quest.Required)
+                    .All(quest => !((quest.Result == null || quest.Verified == null || quest.SignedOff != true) && quest.Required)) != true;
+
+            if (!selfAssessmentService.HasMinimumOptionalCompetencies(selfAssessmentId, delegateUserId) || isVerificationPending)
             {
                 var supervisorsSignOffs = selfAssessmentService.GetSupervisorSignOffsForCandidateAssessment(selfAssessmentId, delegateUserId);
 

DigitalLearningSolutions.Web/Controllers/Support/RequestSupportTicketController.cs

@@ -117,31 +117,36 @@ public IActionResult RequestSummary(DlsSubApplication dlsSubApplication, Request
             ).GetAwaiter().GetResult(); ;
             var model = new RequestSummaryViewModel(data);
             data.setRequestSubjectDetails(model);
+            if (!ModelState.IsValid)
+            {
+                ModelState.Clear();
+            }
             return View("RequestSummary", model);
         }
 
         [HttpPost]
         [Route("/{dlsSubApplication}/RequestSupport/SetRequestSummary")]
         public IActionResult SetRequestSummary(DlsSubApplication dlsSubApplication, RequestSummaryViewModel requestDetailsmodel)
         {
-            if (requestDetailsmodel.RequestSubject == null)
-            {
-                ModelState.AddModelError("RequestSubject", "Please enter request summary");
-                return View("RequestSummary", requestDetailsmodel);
-            }
-            if (requestDetailsmodel.RequestDescription == null)
+            var data = multiPageFormService.GetMultiPageFormData<RequestSupportTicketData>(
+                MultiPageFormDataFeature.AddCustomWebForm("RequestSupportTicketCWF"),
+                TempData
+                ).GetAwaiter().GetResult();
+            requestDetailsmodel.RequestType = data.RequestType;
+
+            // Check if RequestDescription is null or contains any default empty tags ("<p><br></p>").  
+            // This ensures that when a user navigates to the submit page and returns to SetRequestSummary,  
+            // removing the description completely results in an actual empty value rather than leftover HTML tags.
+            if (requestDetailsmodel.RequestDescription == "<p><br></p>")
             {
                 ModelState.AddModelError("RequestDescription", "Please enter request description");
-                return View("RequestSummary", requestDetailsmodel);
             }
+
             if (!ModelState.IsValid)
             {
                 return View("RequestSummary", requestDetailsmodel);
             }
-            var data = multiPageFormService.GetMultiPageFormData<RequestSupportTicketData>(
-                MultiPageFormDataFeature.AddCustomWebForm("RequestSupportTicketCWF"),
-                TempData
-            ).GetAwaiter().GetResult(); ;
+
             data.setRequestSubjectDetails(requestDetailsmodel);
             setRequestSupportTicketData(data);
             return RedirectToAction("RequestAttachment", new { dlsSubApplication });

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

@@ -87,7 +87,10 @@ public IActionResult DownloadSelfAssessmentReport(int selfAssessmentId)
         public IActionResult TableauCompetencyDashboard()
         {
             var userEmail = User.GetUserPrimaryEmail();
-            var jwt = tableauConnectionHelper.GetTableauJwt(userEmail);
+            var adminId = User.GetAdminId();
+            var jwt = tableauConnectionHelper.GetTableauJwt();
+            ViewBag.Email = userEmail;
+            ViewBag.AdminId = adminId;
             ViewBag.SiteName = tableauSiteName;
             ViewBag.TableauServerUrl = tableauUrl;
             ViewBag.WorkbookName = workbookName;

DigitalLearningSolutions.Web/Helpers/ExternalApis/TableauConnectionHelper.cs

@@ -9,7 +9,7 @@
 
     public interface ITableauConnectionHelperService
     {
-        string GetTableauJwt(string email);
+        string GetTableauJwt();
     }
     public class TableauConnectionHelper : ITableauConnectionHelperService
     {
@@ -24,7 +24,7 @@ public TableauConnectionHelper(IConfiguration config)
             connectedAppSecretKey = config.GetTableauClientSecret();
             user = config.GetTableauUser();
         }
-        public string GetTableauJwt(string email)
+        public string GetTableauJwt()
         {
             var key = Encoding.UTF8.GetBytes(connectedAppSecretKey);
             var signingCredentials = new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256);
@@ -41,8 +41,7 @@ public string GetTableauJwt(string email)
                 { "aud", "tableau" },
                 { "exp", new DateTimeOffset(DateTime.UtcNow.AddMinutes(5)).ToUnixTimeSeconds() },
                 { "sub", user },
-                { "scp", new[] { "tableau:views:embed" } },
-                { "ExernalUserEmail", new [] { email } }
+                { "scp", new[] { "tableau:views:embed" } }
         };
             var token = new JwtSecurityToken(header, payload);
             var tokenHandler = new JwtSecurityTokenHandler();

DigitalLearningSolutions.Web/ViewModels/Support/RequestSupportTicket/RequestSummaryViewModel.cs

@@ -18,9 +18,14 @@ public RequestSummaryViewModel(RequestSupportTicketData data)
             RequestDescription = data.RequestDescription;
         }
         [MaxLength(250, ErrorMessage = "Summary must be 250 characters or fewer")]
+        [Required(ErrorMessage = "Please enter request summary")]
         public string? RequestSubject { get; set; }
+
+        [Required(ErrorMessage = "Please enter request description")]
         public string? RequestDescription { get; set; }
+
         public int? RequestTypeId { get; set; }
+
         public string? RequestType { get; set; }
     }
 }

DigitalLearningSolutions.Web/Views/Frameworks/Developer/_Structure.cshtml

@@ -1,5 +1,18 @@
 @using DigitalLearningSolutions.Web.ViewModels.Frameworks;
 @model FrameworkViewModel;
+
+
+@if (Model.DetailFramework.UserRole > 1)
+{
+    <div class="nhsuk-grid-row nhsuk-u-margin-top-3">
+        <div class="nhsuk-grid-column-full">
+            <a class="nhsuk-button" asp-action="AddEditFrameworkCompetencyGroup" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">Add @Model.VocabSingular().ToLower() group</a>
+            <a class="nhsuk-button nhsuk-button--secondary" asp-action="AddEditFrameworkCompetency" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">Add ungrouped @Model.VocabSingular().ToLower()</a>
+            <a class="nhsuk-button nhsuk-button--secondary" asp-action="ImportCompetencies" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-isNotBlank="@(Model.FrameworkCompetencies.Any()|Model.FrameworkCompetencyGroups.Any())" asp-route-tabname="@(ViewContext.RouteData.Values["tabname"])">Bulk upload/update @Model.VocabPlural().ToLower()</a>
+            <a class="nhsuk-button nhsuk-button--secondary" asp-action="PrintLayout" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">View for print</a>
+        </div>
+    </div>
+}
 <h2>Framework structure</h2>
 @if (Model.FrameworkCompetencyGroups.Any())
 {
@@ -75,15 +88,3 @@ else
 
     }
 </div>
-@if (Model.DetailFramework.UserRole > 1)
-{
-    <div class="nhsuk-grid-row nhsuk-u-margin-top-3">
-        <div class="nhsuk-grid-column-full">
-            <a class="nhsuk-button" asp-action="AddEditFrameworkCompetencyGroup" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">Add @Model.VocabSingular().ToLower() group</a>
-            <a class="nhsuk-button nhsuk-button--secondary" asp-action="AddEditFrameworkCompetency" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">Add ungrouped @Model.VocabSingular().ToLower()</a>
-            <a class="nhsuk-button nhsuk-button--secondary" asp-action="ImportCompetencies" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])" asp-route-isNotBlank="@(Model.FrameworkCompetencies.Any()|Model.FrameworkCompetencyGroups.Any())" asp-route-tabname="@(ViewContext.RouteData.Values["tabname"])">Bulk upload/update @Model.VocabPlural().ToLower()</a>
-            <a class="nhsuk-button nhsuk-button--secondary" asp-action="PrintLayout" asp-route-frameworkId="@(ViewContext.RouteData.Values["frameworkId"])">View for print</a>
-        </div>
-    </div>
-}
-

DigitalLearningSolutions.Web/Views/Support/RequestSupportTicket/RequestSummary.cshtml

@@ -4,11 +4,7 @@
 @using DigitalLearningSolutions.Web.ViewModels.Support.RequestSupportTicket;
 @model RequestSummaryViewModel;
 @{
-    bool errorHasOccurred = false;
-    @if (Model.RequestSubject == null && !ViewData.ModelState.IsValid)
-    {
-        errorHasOccurred = true;
-    }
+    var errorHasOccurred = !ViewData.ModelState.IsValid;
     ViewData["Title"] = "Request details";
     var cancelLinkData = Html.GetRouteValues();
 }

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

@@ -5,6 +5,8 @@
     var viewName = ViewBag.ViewName;
     var jwtToken = ViewBag.JwtToken;
     var siteName = ViewBag.SiteName;
+    var aid = ViewBag.AdminId;
+    var email = ViewBag.Email;
     var srcUrl = $"{tableauServerUrl}/t/{siteName}/views/{workbookName}/{viewName}";
     ViewData["Title"] = "Supervised self assessments dashboard";
 }
@@ -21,6 +23,8 @@
     <tableau-viz id='tableau-viz'
                  src='@srcUrl' token='@jwtToken' toolbar='bottom'>
         If the dashboard doesn't appear after a few seconds, <a href="#">reload the page</a>
+        <viz-parameter name="aid" value="@aid"></viz-parameter>
+        <viz-parameter name="email" value="@email"></viz-parameter>
     </tableau-viz>
     @section scripts {
         @* We are not using Yarn/npm for the Tableau JS becaue of errors during installation relating to a missing dependency *@