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

Author: rshrirohit

DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs

@@ -2108,7 +2108,7 @@ public void SubmitFrameworkReview(int frameworkId, int reviewId, bool signedOff,
                         AU1.Email AS OwnerEmail,
                         FW.FrameworkName
                     FROM FrameworkReviews AS FR
-                    INNER JOIN FrameworkCollaborators AS FC ON FR.FrameworkCollaboratorID = FC.ID  AND FWC.IsDeleted = 0
+                    INNER JOIN FrameworkCollaborators AS FC ON FR.FrameworkCollaboratorID = FC.ID  AND FC.IsDeleted = 0
                     INNER JOIN AdminUsers AS AU ON FC.AdminID = AU.AdminID
                     INNER JOIN Frameworks AS FW ON FR.FrameworkID = FW.ID
                     INNER JOIN AdminUsers AS AU1 ON FW.OwnerAdminID = AU1.AdminID

DigitalLearningSolutions.Web/Scripts/trackingSystem/tableaureports.ts

@@ -0,0 +1,31 @@
+async function setTableauParams(): Promise<void> {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const viz = document.getElementById('tableau-viz') as any;
+  const adminIdElement = document.getElementById('hf-adminid') as HTMLInputElement | null;
+  const emailElement = document.getElementById('hf-email') as HTMLInputElement | null;
+
+  if (!viz) {
+    // console.error('Tableau Viz element not found.');
+    return;
+  }
+
+  if (!adminIdElement || !emailElement) {
+    // console.error('Hidden input fields for adminid or email not found.');
+    return;
+  }
+
+  const adminId = adminIdElement.value;
+  const email = emailElement.value;
+
+  // Listen for the `firstinteractive` event from the Web Component
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  viz.addEventListener('firstinteractive', async (event: Event) => {
+    await viz.workbook.changeParameterValueAsync('adminid', adminId);
+    await viz.workbook.changeParameterValueAsync('email', email);
+  });
+}
+
+// Run the function after the page loads
+document.addEventListener('DOMContentLoaded', () => {
+  setTableauParams();
+});

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

@@ -29,7 +29,7 @@
         <div class="nhsuk-u-reading-width">
             <h1 class="nhsuk-heading-xl">@Model.RequestType</h1>
             <form class="nhsuk-u-margin-bottom-3" method="post" asp-action="SetRequestSummary" asp-all-route-data="@cancelLinkData">
-                <vc:text-input asp-for="RequestSubject"
+              <vc:text-input asp-for="RequestSubject"
                                label="Enter a summary of your problem or request"
                                populate-with-current-value="true"
                                type="text"
@@ -38,15 +38,17 @@
                                autocomplete="given-name"
                                css-class=""
                                required="true" />
+                <nhs-form-group nhs-validation-for="RequestDescription">
                 <vc:text-area asp-for="RequestDescription"
                               label="Describe your problem or request"
                               populate-with-current-value="true"
                               rows="5"
                               spell-check="false"
                               hint-text="If you are reporting a problem, please tell us exactly where it occurs and steps to recreate it. If you need to add screenshots, you will be able to do this in the next step."
-                              css-class="html-editor"
-                              character-count="null" />
-
+                              css-class=""
+                              character-count="null">
+                            </vc:text-area>
+                </nhs-form-group>
                 <button class="nhsuk-button" type="submit">Next</button>
             </form>
 

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

@@ -29,6 +29,7 @@
     <div id="form-group">
         <form method="post" asp-route-ResponseTypes="@Model.RequestTypes" asp-action="setRequestType" asp-all-route-data="@cancelLinkData">
             <div>
+                <nhs-form-group nhs-validation-for="Id">
                 <fieldset class="nhsuk-fieldset">
                     <legend class="nhsuk-fieldset__legend nhsuk-fieldset__legend--l">
                         <h1 class="nhsuk-fieldset__heading">
@@ -54,7 +55,8 @@
                             seperator = seperator + 1;
                         }
                     </div>
-                </fieldset>
+                        </fieldset>
+                    </nhs-form-group>
                 <button class="nhsuk-button nhsuk-u-margin-top-6" id="save-button" type="submit">
                     Next
                 </button>

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

@@ -23,12 +23,13 @@
     <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>
+    <input type="hidden" id="hf-email" value="@email" />
+    <input type="hidden" id="hf-adminid" value="@aid" />
     @section scripts {
         @* We are not using Yarn/npm for the Tableau JS becaue of errors during installation relating to a missing dependency *@
         <script type="module" src="@tableauServerUrl/javascripts/api/tableau.embedding.3.latest.min.js"></script>
+        <script src="@Url.Content("~/js/trackingSystem/tableaureports.js")" asp-append-version="true"></script>
     }
 </feature>
 <feature name="@(FeatureFlags.TableauSelfAssessmentDashboards)" negate="true">