TD-5286 Tweaks the competency assessments table

Author: kevwhitt-hee

DigitalLearningSolutions.Data/DataServices/CompetencyAssessmentDataService.cs

@@ -52,6 +52,14 @@ FROM  AdminUsers
                  WHERE (AdminID = sa.CreatedByAdminID)) AS Owner,
                  sa.Archived,
                  sa.LastEdit,
+                STUFF((
+                        SELECT 
+                            ', ' + f.FrameworkName
+                        FROM 
+                            Frameworks f
+                       WHERE 
+                            f.ID = saf.FrameworkId
+                        FOR XML PATH(''), TYPE).value('.', 'NVARCHAR(MAX)'), 1, 2, '') AS LinkedFrameworks,
                  (SELECT ProfessionalGroup
                  FROM    NRPProfessionalGroups
                  WHERE (ID = sa.NRPProfessionalGroupID)) AS NRPProfessionalGroup,
@@ -68,7 +76,8 @@ FROM    NRPRoles
 
         private const string SelfAssessmentTables =
             @" LEFT OUTER JOIN
-             SelfAssessmentReviews AS sar ON sac.ID = sar.SelfAssessmentCollaboratorID AND sar.Archived IS NULL AND sar.ReviewComplete IS NULL";
+             SelfAssessmentReviews AS sar ON sac.ID = sar.SelfAssessmentCollaboratorID AND sar.Archived IS NULL AND sar.ReviewComplete IS NULL
+                LEFT OUTER JOIN SelfAssessmentFrameworks AS saf ON sa.ID = saf.SelfAssessmentId";
 
         private readonly IDbConnection connection;
         private readonly ILogger<CompetencyAssessmentDataService> logger;

DigitalLearningSolutions.Data/Models/CompetencyAssessments/CompetencyAssessment.cs

@@ -14,6 +14,7 @@ public string? Brand
         public string? Owner { get; set; }
         public DateTime? Archived { get; set; }
         public DateTime LastEdit { get; set; }
+        public string? LinkedFrameworks { get; set; }
         public string? NRPProfessionalGroup { get; set; }
         public string? NRPSubGroup { get; set; }
         public string? NRPRole { get; set; }

DigitalLearningSolutions.Web/Views/CompetencyAssessments/Shared/_AssessmentsGrid.cshtml

@@ -10,7 +10,7 @@
         Competency Assessment
       </th>
       <th role="columnheader" class="" scope="col">
-        National Profile Link
+        Framework Links
       </th>
       <th role="columnheader" class="" scope="col">
         Created
@@ -41,11 +41,9 @@
           </span>
         </td>
         <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
-          <span class="nhsuk-table-responsive__heading">National Profile Link </span>
+          <span class="nhsuk-table-responsive__heading">Framework links </span>
           <span class="roleprofile-linkage">
-            @(competencyAssessment.NRPProfessionalGroup != null ? @competencyAssessment.NRPProfessionalGroup : "None/Generic")
-            @(competencyAssessment.NRPSubGroupID != null ? " / " + competencyAssessment.NRPSubGroup : "")
-            @(competencyAssessment.NRPRoleID != null ? " / " + competencyAssessment.NRPRole : "")
+            @competencyAssessment.LinkedFrameworks
           </span>
         </td>
         <td role="cell" class="nhsuk-table__cell nhsuk-u-font-size-16">
@@ -71,7 +69,7 @@
           @if (competencyAssessment.UserRole > 1)
           {
             <a asp-action="ViewCompetencyAssessment" asp-route-frameworkId="@competencyAssessment.ID" asp-route-tabname="Structure">
-              View/Edit
+              Manage
             </a>
           }
           else