Merge pull request #574 from TechnologyEnhancedLearning/Develop/Features/CompetencyFrameworks

Develop/features/competency frameworks

Author: kevwhitt-hee

DigitalLearningSolutions.Data.Tests/TestHelpers/SelfAssessmentHelper.cs

@@ -70,7 +70,8 @@ public static AssessmentQuestion CreateDefaultAssessmentQuestion(
             int? result = null,
             int minValue = 0,
             int maxValue = 10,
-            int assessmentQuestionInputTypeID = 1)
+            int assessmentQuestionInputTypeID = 1,
+            bool includeComments = true)
         {
             return new AssessmentQuestion()
             {
@@ -81,7 +82,8 @@ public static AssessmentQuestion CreateDefaultAssessmentQuestion(
                 Result = result,
                 MinValue = minValue,
                 MaxValue = maxValue,
-                AssessmentQuestionInputTypeID = assessmentQuestionInputTypeID
+                AssessmentQuestionInputTypeID = assessmentQuestionInputTypeID,
+                IncludeComments = true
             };
         }
 

DigitalLearningSolutions.Data/Services/FrameworkService.cs

@@ -1069,8 +1069,7 @@ public AssessmentQuestionDetail GetAssessmentQuestionDetailById(int assessmentQu
             return connection.QueryFirstOrDefault<AssessmentQuestionDetail>(
                  $@"{AssessmentQuestionFields}{AssessmentQuestionDetailFields}
                     {AssessmentQuestionTables}
-                    WHERE AQ.ID = @assessmentQuestionId
-                     ORDER BY AQ.Ordering", new { adminId, assessmentQuestionId }
+                    WHERE AQ.ID = @assessmentQuestionId", new { adminId, assessmentQuestionId }
                 );
         }
         public LevelDescriptor GetLevelDescriptorForAssessmentQuestionId(int assessmentQuestionId, int adminId, int level)

DigitalLearningSolutions.Data/Services/SelfAssessmentService.cs

@@ -16,7 +16,7 @@ public interface ISelfAssessmentService
         CurrentSelfAssessment? GetSelfAssessmentForCandidateById(int candidateId, int selfAssessmentId);
         Competency? GetNthCompetency(int n, int selfAssessmentId, int candidateId); // 1 indexed
         IEnumerable<LevelDescriptor> GetLevelDescriptorsForAssessmentQuestion(int assessmentQuestionId, int minValue, int maxValue, bool zeroBased);
-        void SetResultForCompetency(int competencyId, int selfAssessmentId, int candidateId, int assessmentQuestionId, int result, string? supportingComments);
+        void SetResultForCompetency(int competencyId, int selfAssessmentId, int candidateId, int assessmentQuestionId, int? result, string? supportingComments);
         IEnumerable<Competency> GetMostRecentResults(int selfAssessmentId, int candidateId);
         IEnumerable<Competency> GetCandidateAssessmentResultsById(int candidateAssessmentId, int adminId);
         IEnumerable<Competency> GetCandidateAssessmentResultsForReviewById(int candidateAssessmentId, int adminId);
@@ -46,6 +46,7 @@ public class SelfAssessmentService : ISelfAssessmentService
                                  s.AssessmentQuestionID,
                                  s.ID AS ResultID,
                                  s.Result,
+                                 s.SupportingComments,
 								 sv.ID AS SelfAssessmentResultSupervisorVerificationId,
 								 sv.Requested,
 								 sv.Verified,
@@ -77,6 +78,7 @@ LEFT OUTER JOIN CompetencyAssessmentQuestionRoleRequirements rr
                                  s.AssessmentQuestionID,
                                  s.ID AS ResultID,
                                  s.Result,
+                                 s.SupportingComments,
 								 sv.ID AS SelfAssessmentResultSupervisorVerificationId,
 								 sv.Requested,
 								 sv.Verified,
@@ -118,8 +120,10 @@ LEFT OUTER JOIN CompetencyAssessmentQuestionRoleRequirements rr
                                                   AQ.MinValue,
                                                   AQ.MaxValue,
                                                   AQ.AssessmentQuestionInputTypeID,
+                                                  AQ.IncludeComments,
                                                   LAR.ResultId,
                                                   LAR.Result,
+                                                  LAR.SupportingComments,
 												  LAR.SelfAssessmentResultSupervisorVerificationId,
 												  LAR.Requested,
 												  LAR.Verified,
@@ -244,7 +248,7 @@ INNER JOIN CompetencyRowNumber AS CRN
             ).FirstOrDefault();
         }
 
-        public void SetResultForCompetency(int competencyId, int selfAssessmentId, int candidateId, int assessmentQuestionId, int result, string? supportingComments)
+        public void SetResultForCompetency(int competencyId, int selfAssessmentId, int candidateId, int assessmentQuestionId, int? result, string? supportingComments)
         {
             var assessmentQuestion = connection.QueryFirstOrDefault<Models.SelfAssessments.AssessmentQuestion>(
                 @"SELECT ID, MinValue, MaxValue
@@ -262,16 +266,17 @@ FROM AssessmentQuestions
             }
             int minValue = assessmentQuestion.MinValue;
             int maxValue = assessmentQuestion.MaxValue;
-
-            if (result < minValue || result > maxValue)
+            if (result != null)
             {
-                logger.LogWarning(
-                    "Not saving self assessment result as result is invalid. " +
-                    $"{PrintResult(competencyId, selfAssessmentId, candidateId, assessmentQuestionId, result)}"
-                );
-                return;
+                if (result < minValue || result > maxValue)
+                {
+                    logger.LogWarning(
+                        "Not saving self assessment result as result is invalid. " +
+                        $"{PrintResult(competencyId, selfAssessmentId, candidateId, assessmentQuestionId, result)}"
+                    );
+                    return;
+                }
             }
-
             var numberOfAffectedRows = connection.Execute(
                 @"IF EXISTS (
                         SELECT * FROM CandidateAssessments AS CA
@@ -407,7 +412,7 @@ public void SetCompleteByDate(int selfAssessmentId, int candidateId, DateTime? c
             }
         }
 
-        private static string PrintResult(int competencyId, int selfAssessmentId, int candidateId, int assessmentQuestionId, int result)
+        private static string PrintResult(int competencyId, int selfAssessmentId, int candidateId, int assessmentQuestionId, int? result)
         {
             return $"Competency id: {competencyId}, self assessment id: {selfAssessmentId}, candidate id: {candidateId}, " +
                    $"assessment question id: {assessmentQuestionId}, result: {result}";

DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs

@@ -77,15 +77,15 @@ public IActionResult SelfAssessmentCompetency(int selfAssessmentId, ICollection<
 
             foreach (var assessmentQuestion in assessmentQuestions)
             {
-                if (assessmentQuestion.Result != null)
+                if (assessmentQuestion.Result != null || assessmentQuestion.SupportingComments != null)
                 {
                     selfAssessmentService.SetResultForCompetency(
                                         competencyId,
                                         assessment.Id,
                                         User.GetCandidateIdKnownNotNull(),
                                         assessmentQuestion.Id,
                                         assessmentQuestion.Result.Value,
-                                        null
+                                        assessmentQuestion.SupportingComments
                                     );
                 }
             }

DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss

@@ -368,9 +368,7 @@ h1.truncate-overflow::after {
   height: 56px;
   background: linear-gradient(to right, rgba(240, 244, 245, 0), rgba(240, 244, 245, 1) 50%);
 }
-.text-area-edit-90 {
-    height:90px
-}
+
 .nhsuk-warning-callout {
   &.callout-green {
     border-color: #cbe5a2;

DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss

@@ -232,3 +232,6 @@ details.nhsuk-details {
     background-color: rgba(255, 249, 146, 0);
   }
 }
+.text-area-edit-90 {
+  height: 90px
+}

DigitalLearningSolutions.Web/Views/Frameworks/Developer/CompetencyPreview.cshtml

@@ -58,12 +58,7 @@
   </div>
   @if (question.IncludeComments)
   {
-    <div class="nhsuk-form-group">
-      <label class="nhsuk-label" for="tb-supportingComments-@question.Id">
-        Supporting comments:
-      </label>
-      <textarea class="nhsuk-input text-area-edit-90" placeholder="Optional" id="tb-supportingComments-@question.Id" asp-for="@question.SupportingComments" name="SupportingComments" type="text"></textarea>
-    </div>
+    <partial name="~/Views/LearningPortal/SelfAssessments/_CommentsInput.cshtml" model="question" view-data="@(new ViewDataDictionary(ViewData) { { "index", question.MinValue } })" />
   }
 }
 

DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentCompetency.cshtml

@@ -45,6 +45,10 @@
     {
       <partial name="SelfAssessments/_RadioQuestion" model="question.value" view-data="@(new ViewDataDictionary(ViewData) { { "index", question.i } })" />
     }
+    @if (question.value.IncludeComments)
+    {
+      <partial name="SelfAssessments/_CommentsInput" model="question.value" view-data="@(new ViewDataDictionary(ViewData) { { "index", question.i } })" />
+    }
   }
   <div class="nhsuk-u-margin-top-4">
     Question @Model.CompetencyNumber of @Model.TotalNumberOfCompetencies

DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_CommentsInput.cshtml

@@ -0,0 +1,8 @@
+@using DigitalLearningSolutions.Data.Models.SelfAssessments
+@model AssessmentQuestion
+<div class="nhsuk-form-group">
+  <label class="nhsuk-label" for="tb-supportingComments-@Model.Id">
+    Supporting comments:
+  </label>
+  <textarea class="nhsuk-input text-area-edit-90" placeholder="Optional" id="tb-supportingComments-@Model.Id" asp-for="@Model.SupportingComments" name="[@ViewData["index"]].SupportingComments" type="text"></textarea>
+</div>