TechnologyEnhancedLearning
diff --git a/‎DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs‎
Lines changed: 14 additions & 3 deletions b/‎DigitalLearningSolutions.Data/DataServices/FrameworkDataService.cs‎
Lines changed: 14 additions & 3 deletions
diff --git a/‎DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAsssessmentReportDataService.cs‎
Lines changed: 139 additions & 135 deletions b/‎DigitalLearningSolutions.Data/DataServices/SelfAssessmentDataService/SelfAsssessmentReportDataService.cs‎
Lines changed: 139 additions & 135 deletions
diff --git a/‎DigitalLearningSolutions.Data/DataServices/UserDataService/DelegateUserCardDataService.cs‎
Lines changed: 2 additions & 0 deletions b/‎DigitalLearningSolutions.Data/DataServices/UserDataService/DelegateUserCardDataService.cs‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎DigitalLearningSolutions.Data/Helpers/GenericSortingHelper.cs‎
Lines changed: 3 additions & 0 deletions b/‎DigitalLearningSolutions.Data/Helpers/GenericSortingHelper.cs‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎DigitalLearningSolutions.Data/Models/SelfAssessments/Export/SelfAssessmentReportData.cs‎
Lines changed: 41 additions & 26 deletions b/‎DigitalLearningSolutions.Data/Models/SelfAssessments/Export/SelfAssessmentReportData.cs‎
Lines changed: 41 additions & 26 deletions
diff --git a/‎DigitalLearningSolutions.Web/Controllers/FrameworksController/AssessmentQuestions.cs‎
Lines changed: 1 addition & 0 deletions b/‎DigitalLearningSolutions.Web/Controllers/FrameworksController/AssessmentQuestions.cs‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎DigitalLearningSolutions.Web/Controllers/FrameworksController/Competencies.cs‎
Lines changed: 2 additions & 1 deletion b/‎DigitalLearningSolutions.Web/Controllers/FrameworksController/Competencies.cs‎
Lines changed: 2 additions & 1 deletion
diff --git a/‎DigitalLearningSolutions.Web/Services/DelegateDownloadFileService.cs‎
Lines changed: 1 addition & 1 deletion b/‎DigitalLearningSolutions.Web/Services/DelegateDownloadFileService.cs‎
Lines changed: 1 addition & 1 deletion
@@ -1882,9 +1882,20 @@ FROM   Competencies AS C INNER JOIN
         public int GetAdminUserRoleForFrameworkId(int adminId, int frameworkId)
         {
             return connection.QuerySingle<int>(
-                @"SELECT CASE WHEN FW.OwnerAdminID = @adminId THEN 3 WHEN COALESCE (fwc.CanModify, 0) = 1 THEN 2 WHEN COALESCE (fwc.CanModify, 0) = 0 THEN 1 ELSE 0 END AS UserRole
-                    FROM   Frameworks AS FW LEFT OUTER JOIN
-                                 FrameworkCollaborators AS fwc ON fwc.FrameworkID = FW.ID AND fwc.AdminID = @adminId AND fwc.IsDeleted = 0
+                @"SELECT CASE 
+		                    WHEN (aa.UserID = (SELECT UserID FROM AdminAccounts WHERE ID = @adminId)) THEN 3
+		                    WHEN (fwc.CanModify = 1) OR
+			                    (SELECT COUNT(*) 
+				                    FROM FrameworkCollaborators fc
+				                    JOIN AdminAccounts aa1 ON fc.AdminID = aa1.ID
+				                    WHERE fc.FrameworkID = fw.ID
+				                    AND fc.CanModify = 1 AND fc.IsDeleted = 0
+				                    AND aa1.UserID = (SELECT aa2.UserID FROM AdminAccounts aa2 WHERE aa2.ID = @adminId)) > 0 THEN 2
+		                    WHEN fwc.CanModify = 0 THEN 1 ELSE 0
+		                    END AS UserRole
+                    FROM   Frameworks AS FW INNER JOIN
+                            AdminAccounts AS aa ON aa.ID = fw.OwnerAdminID LEFT OUTER JOIN
+                            FrameworkCollaborators AS fwc ON fwc.FrameworkID = FW.ID AND fwc.AdminID = @adminId AND fwc.IsDeleted = 0
                     WHERE (FW.ID = @frameworkId)",
                 new { adminId, frameworkId }
             );
 
@@ -352,6 +352,8 @@ public List<DelegateUserCard> GetDelegateUserCardsForExportByCentreId(String sea
 
             if (sortBy == "SearchableName")
                 orderBy = " ORDER BY LTRIM(LastName) " + sortDirection + ", LTRIM(FirstName) ";
+            else if(sortBy == "LastAccessed")
+                orderBy = " ORDER BY LastAccessed " + sortDirection;
             else
                 orderBy = " ORDER BY DateRegistered " + sortDirection;
 
 
@@ -250,6 +250,9 @@ public static class DelegateSortByOptions
         public static readonly (string DisplayText, string PropertyName) Name =
             ("Name", nameof(DelegateUserCard.SearchableName));
 
+        public static readonly (string DisplayText, string PropertyName) LastAccessed =
+           ("Last accessed date", nameof(DelegateUserCard.LastAccessed));
+
         public static readonly (string DisplayText, string PropertyName) RegistrationDate =
             ("Registration Date", nameof(DelegateUserCard.DateRegistered));
     }
 
@@ -1,26 +1,41 @@
-namespace DigitalLearningSolutions.Data.Models.SelfAssessments.Export
-{
-    using System;
-    public class SelfAssessmentReportData
-    {
-        public string? SelfAssessment { get; set; }
-        public string? Learner { get; set; }
-        public bool LearnerActive { get; set; }
-        public string? PRN { get; set; }
-        public string? JobGroup { get; set; }
-        public string? ProgrammeCourse { get; set; }
-        public string? Organisation { get; set; }
-        public string? DepartmentTeam { get; set; }
-        public string? OtherCentres { get; set; }
-        public string? DLSRole { get; set; }
-        public DateTime? Registered { get; set; }
-        public DateTime? Started { get; set; }
-        public DateTime? LastAccessed { get; set; }
-        public int? OptionalProficienciesAssessed { get; set; }
-        public int? SelfAssessedAchieved { get; set; }
-        public int? ConfirmedResults { get; set; }
-        public DateTime? SignOffRequested { get; set; }
-        public bool SignOffAchieved { get; set; }
-        public DateTime? ReviewedDate { get; set; }
-    }
-}
+namespace DigitalLearningSolutions.Data.Models.SelfAssessments.Export
+{
+    using System;
+    public class SelfAssessmentReportData
+    {
+        public string? SelfAssessment { get; set; }
+        public string? Learner { get; set; }
+        public bool LearnerActive { get; set; }
+        public string? PRN { get; set; }
+        public string? JobGroup { get; set; }
+        public string? RegistrationAnswer1 { get; set; }
+        public string? RegistrationAnswer2 { get; set; }
+        public string? RegistrationAnswer3 { get; set; }
+        public string? RegistrationAnswer4 { get; set; }
+        public string? RegistrationAnswer5 { get; set; }
+        public string? RegistrationAnswer6 { get; set; }
+        public string? OtherCentres { get; set; }
+        public string? DLSRole { get; set; }
+        public DateTime? Registered { get; set; }
+        public DateTime? Started { get; set; }
+        public DateTime? LastAccessed { get; set; }
+        public int? OptionalProficienciesAssessed { get; set; }
+        public int? SelfAssessedAchieved { get; set; }
+        public int? ConfirmedResults { get; set; }
+        public DateTime? SignOffRequested { get; set; }
+        public bool SignOffAchieved { get; set; }
+        public DateTime? ReviewedDate { get; set; }
+
+        // we need this for iteration across the registration answers from Delegate Accounts which match the custom fields of Centres.
+        public string?[] CentreRegistrationPrompts =>
+            new[]
+            {
+                RegistrationAnswer1,
+                RegistrationAnswer2,
+                RegistrationAnswer3,
+                RegistrationAnswer4,
+                RegistrationAnswer5,
+                RegistrationAnswer6,
+            };
+    }
+}
@@ -456,6 +456,7 @@ public IActionResult EditAssessmentQuestionOptions(AssessmentQuestionDetail asse
                 return RedirectToAction("EditAssessmentQuestionOptions", "Frameworks", new { frameworkId, assessmentQuestionId, frameworkCompetencyId });
             }
             assessmentQuestionDetail.ScoringInstructions = SanitizerHelper.SanitizeHtmlData(assessmentQuestionDetail.ScoringInstructions);
+            if (string.IsNullOrWhiteSpace(StringHelper.StripHtmlTags(assessmentQuestionDetail?.ScoringInstructions))) { assessmentQuestionDetail.ScoringInstructions = null; }
             SessionAssessmentQuestion sessionAssessmentQuestion = multiPageFormService
             .GetMultiPageFormData<SessionAssessmentQuestion>(MultiPageFormDataFeature.EditAssessmentQuestion, TempData)
             .GetAwaiter()
 
@@ -65,6 +65,7 @@ public IActionResult AddEditFrameworkCompetencyGroup(int frameworkId, Competency
             var adminId = GetAdminId();
             var userRole = frameworkService.GetAdminUserRoleForFrameworkId(adminId, frameworkId);
             if (userRole < 2) return StatusCode(403);
+            if (string.IsNullOrWhiteSpace(StringHelper.StripHtmlTags(competencyGroupBase?.Description))) { competencyGroupBase.Description = null; }
             if (competencyGroupBase.ID > 0)
             {
                 frameworkService.UpdateFrameworkCompetencyGroup(frameworkCompetencyGroupId, competencyGroupBase.CompetencyGroupID, competencyGroupBase.Name, SanitizerHelper.SanitizeHtmlData
@@ -141,7 +142,7 @@ public IActionResult AddEditFrameworkCompetency(int frameworkId, FrameworkCompet
             frameworkCompetency.Description?.Trim();
             var description = HttpUtility.HtmlDecode(HttpUtility.HtmlDecode(frameworkCompetency.Description));
             var detailFramework = frameworkService.GetDetailFrameworkByFrameworkId(frameworkId, GetAdminId());
-            if (string.IsNullOrWhiteSpace(description)) { frameworkCompetency.Description = null; }
+            if (string.IsNullOrWhiteSpace(StringHelper.StripHtmlTags(description))) { frameworkCompetency.Description = null; }
             if (!ModelState.IsValid)
             {
                 ModelState.Remove(nameof(FrameworkCompetency.Name));
 
@@ -39,7 +39,7 @@ public class DelegateDownloadFileService : IDelegateDownloadFileService
         private const string ProfessionalRegistrationNumber = "Professional Registration Number";
         private const string JobGroup = "Job group";
         private const string RegisteredDate = "Registered";
-        private const string LastAccessed = "Last Accessed";
+        private const string LastAccessed = "Last Accessed Date";
         private const string RegistrationComplete = "Registration complete";
         private const string Active = "Active";
         private const string Approved = "Approved";
Original file line number	Diff line number	Diff line change
`@@ -250,6 +250,9 @@ public static class DelegateSortByOptions`
`250`	`250`	`public static readonly (string DisplayText, string PropertyName) Name =`
`251`	`251`	`("Name", nameof(DelegateUserCard.SearchableName));`
`252`	`252`
	`253`	`+ public static readonly (string DisplayText, string PropertyName) LastAccessed =`
	`254`	`+ ("Last accessed date", nameof(DelegateUserCard.LastAccessed));`
	`255`	`+`
`253`	`256`	`public static readonly (string DisplayText, string PropertyName) RegistrationDate =`
`254`	`257`	`("Registration Date", nameof(DelegateUserCard.DateRegistered));`
`255`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -456,6 +456,7 @@ public IActionResult EditAssessmentQuestionOptions(AssessmentQuestionDetail asse`
`456`	`456`	`return RedirectToAction("EditAssessmentQuestionOptions", "Frameworks", new { frameworkId, assessmentQuestionId, frameworkCompetencyId });`
`457`	`457`	`}`
`458`	`458`	`assessmentQuestionDetail.ScoringInstructions = SanitizerHelper.SanitizeHtmlData(assessmentQuestionDetail.ScoringInstructions);`
	`459`	`+ if (string.IsNullOrWhiteSpace(StringHelper.StripHtmlTags(assessmentQuestionDetail?.ScoringInstructions))) { assessmentQuestionDetail.ScoringInstructions = null; }`
`459`	`460`	`SessionAssessmentQuestion sessionAssessmentQuestion = multiPageFormService`
`460`	`461`	`.GetMultiPageFormData<SessionAssessmentQuestion>(MultiPageFormDataFeature.EditAssessmentQuestion, TempData)`
`461`	`462`	`.GetAwaiter()`