Merge branch 'DLS-Release-v1.3.0' of https://github.com/TechnologyEnhancedLearning/DLSV2 into DLS-Release-v1.3.0

Author: kevwhitt-hee

DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs

@@ -284,7 +284,7 @@ public class FrameworkDataService : IFrameworkDataService
             fwr.ID AS FrameworkReviewID";
 
         private const string BrandedFrameworkFields =
-            @",(SELECT BrandName
+            @", FW.Description, (SELECT BrandName
                                  FROM    Brands
                                  WHERE (BrandID = FW.BrandID)) AS Brand,
                                  (SELECT CategoryName
@@ -2174,15 +2174,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();
         }
@@ -2192,7 +2192,7 @@ public IEnumerable<DashboardToDoItem> GetDashboardToDoItems(int adminId)
             return connection.Query<DashboardToDoItem>(
                 @"SELECT
                         FW.ID AS FrameworkID,
-                        0 AS RoleProfileID,
+                        0 AS CompetencyAssessmentID,
                         FW.FrameworkName AS ItemName,
                         AU.Forename + ' ' + AU.Surname + (CASE WHEN AU.Active = 1 THEN '' ELSE ' (Inactive)' END) AS RequestorName,
                         FWR.SignOffRequired,

DigitalLearningSolutions.Web/Services/ImportCompetenciesFromFileService.cs

@@ -296,7 +296,6 @@ CompetencyTableRow competencyRow
             }
 
 
-
             return maxFrameworkCompetencyGroupId;
         }
 

DigitalLearningSolutions.Web/Views/Shared/_Layout.cshtml

@@ -159,7 +159,6 @@
                 <partial name="_UserFeedbackBarPartial" model=@(userResearchUrl) />
             </feature>
 
-
         </header>
         <div class="nhsuk-grid-row">
             @RenderSection("NavBreadcrumbs", false)