Post rebase fixes

Author: kevwhitt-hee

DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs

@@ -2175,15 +2175,15 @@ public void ArchiveReviewRequest(int reviewId)
                  FROM    FrameworkCollaborators
                  WHERE (FrameworkID = FW.ID) AND (IsDeleted=0)))) AS MyFrameworksCount,
 
-                 (SELECT COUNT(*) FROM SelfAssessments) AS RoleProfileCount,
+                 (SELECT COUNT(*) FROM SelfAssessments) AS CompetencyAssessmentCount,
 
                  (SELECT COUNT(*) FROM SelfAssessments AS RP LEFT OUTER JOIN
              SelfAssessmentCollaborators AS RPC ON RPC.SelfAssessmentID = RP.ID AND RPC.AdminID = @adminId
 WHERE (RP.CreatedByAdminID = @adminId) OR
              (@adminId IN
                  (SELECT AdminID
                  FROM    SelfAssessmentCollaborators
-                 WHERE (SelfAssessmentID = RP.ID)))) AS MyRoleProfileCount",
+                 WHERE (SelfAssessmentID = RP.ID)))) AS MyCompetencyAssessmentCount",
                 new { adminId }
             ).FirstOrDefault();
         }
@@ -2193,7 +2193,7 @@ public IEnumerable<DashboardToDoItem> GetDashboardToDoItems(int adminId)
             return connection.Query<DashboardToDoItem>(
                 @"SELECT
                         FW.ID AS FrameworkID,
-                        0 AS RoleProfileID,
+                        0 AS SelfAssessmentID,
                         FW.FrameworkName AS ItemName,
                         AU.Forename + ' ' + AU.Surname + (CASE WHEN AU.Active = 1 THEN '' ELSE ' (Inactive)' END) AS RequestorName,
                         FWR.SignOffRequired,
@@ -2205,8 +2205,8 @@ FROM FrameworkReviews AS FWR
                     WHERE (FWC.AdminID = @adminId) AND (FWR.ReviewComplete IS NULL) AND (FWR.Archived IS NULL)
                     UNION ALL
                     SELECT
-                        0 AS SelfAssessmentID,
-                        RP.ID AS SelfAssessmentID,
+                        0 AS FrameworkID,
+                        RP.ID AS CompetencyAssessmentID,
                         RP.Name AS ItemName,
                         AU.Forename + ' ' + AU.Surname + (CASE WHEN AU.Active = 1 THEN '' ELSE ' (Inactive)' END) AS RequestorName,
                         RPR.SignOffRequired,

DigitalLearningSolutions.Web/Views/Frameworks/Index.cshtml

@@ -31,7 +31,7 @@
     </feature>
     <div class="nhsuk-card">
       <div class="nhsuk-card__content">
-        <p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
+        <p class="nhsuk-heading-m nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
           @Model.DashboardData.FrameworksCount Frameworks
         </p>
         <ul class="nhsuk-contents-list__list">
@@ -48,7 +48,7 @@
     <li class="nhsuk-grid-column-one-half nhsuk-card-group__item">
       <div class="nhsuk-card">
         <div class="nhsuk-card__content">
-          <p class="nhsuk-heading-xl nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
+          <p class="nhsuk-heading-m nhsuk-u-font-size-32 nhsuk-u-margin-bottom-3">
             @Model.DashboardData.CompetencyAssessmentCount Competency Assessments
           </p>
           <ul class="nhsuk-contents-list__list">