diff --git a/DigitalLearningSolutions.Data.Migrations/202107290942_AddLinearNavigationBitFieldToSelfAssessments.cs b/DigitalLearningSolutions.Data.Migrations/202107290942_AddLinearNavigationBitFieldToSelfAssessments.cs new file mode 100644 index 0000000000..d747d2a866 --- /dev/null +++ b/DigitalLearningSolutions.Data.Migrations/202107290942_AddLinearNavigationBitFieldToSelfAssessments.cs @@ -0,0 +1,16 @@ +namespace DigitalLearningSolutions.Data.Migrations +{ + using FluentMigrator; + [Migration(202107290942)] + public class AddLinearNavigationBitFieldToSelfAssessments : Migration + { + public override void Up() + { + Alter.Table("SelfAssessments").AddColumn("LinearNavigation").AsBoolean().WithDefaultValue(false); + } + public override void Down() + { + Delete.Column("LinearNavigation").FromTable("SelfAssessments"); + } + } +} diff --git a/DigitalLearningSolutions.Data.Tests/TestHelpers/SelfAssessmentHelper.cs b/DigitalLearningSolutions.Data.Tests/TestHelpers/SelfAssessmentHelper.cs index dd111a0025..b8f9368f26 100644 --- a/DigitalLearningSolutions.Data.Tests/TestHelpers/SelfAssessmentHelper.cs +++ b/DigitalLearningSolutions.Data.Tests/TestHelpers/SelfAssessmentHelper.cs @@ -16,7 +16,8 @@ public static CurrentSelfAssessment CreateDefaultSelfAssessment( DateTime? lastAccessed = null, DateTime? completeByDate = null, bool useFilteredApi = false, - bool unprocessedUpdates = false + bool unprocessedUpdates = false, + bool linearNavigation = true ) { return new CurrentSelfAssessment() @@ -29,12 +30,14 @@ public static CurrentSelfAssessment CreateDefaultSelfAssessment( LastAccessed = lastAccessed, CompleteByDate = completeByDate, UseFilteredApi = useFilteredApi, - UnprocessedUpdates = unprocessedUpdates + UnprocessedUpdates = unprocessedUpdates, + LinearNavigation = linearNavigation }; } public static Competency CreateDefaultCompetency( int id = 1, + int rowNo = 1, string name = "name", string? description = "description", string competencyGroup = "competencyGroup", @@ -45,6 +48,7 @@ public static Competency CreateDefaultCompetency( return new Competency() { Id = id, + RowNo = rowNo, Name = name, Description = description, CompetencyGroup = competencyGroup, diff --git a/DigitalLearningSolutions.Data/Models/SelfAssessments/Competency.cs b/DigitalLearningSolutions.Data/Models/SelfAssessments/Competency.cs index f6e56267d7..73252e30e2 100644 --- a/DigitalLearningSolutions.Data/Models/SelfAssessments/Competency.cs +++ b/DigitalLearningSolutions.Data/Models/SelfAssessments/Competency.cs @@ -5,6 +5,7 @@ public class Competency { public int Id { get; set; } + public int RowNo { get; set; } public string Name { get; set; } public string? Description { get; set; } public string CompetencyGroup { get; set; } diff --git a/DigitalLearningSolutions.Data/Models/SelfAssessments/SelfAssessment.cs b/DigitalLearningSolutions.Data/Models/SelfAssessments/SelfAssessment.cs index aa40e67b6a..444840b163 100644 --- a/DigitalLearningSolutions.Data/Models/SelfAssessments/SelfAssessment.cs +++ b/DigitalLearningSolutions.Data/Models/SelfAssessments/SelfAssessment.cs @@ -4,5 +4,6 @@ public class SelfAssessment : CurrentLearningItem { public string Description { get; set; } public int NumberOfCompetencies { get; set; } + public bool LinearNavigation { get; set; } } } diff --git a/DigitalLearningSolutions.Data/Services/SelfAssessmentService.cs b/DigitalLearningSolutions.Data/Services/SelfAssessmentService.cs index c65613de4e..0cf68b63b0 100644 --- a/DigitalLearningSolutions.Data/Services/SelfAssessmentService.cs +++ b/DigitalLearningSolutions.Data/Services/SelfAssessmentService.cs @@ -102,6 +102,7 @@ LEFT OUTER JOIN CompetencyAssessmentQuestionRoleRequirements rr WHERE ca.ID = @candidateAssessmentId )"; private const string CompetencyFields = @"C.ID AS Id, + ROW_NUMBER() OVER (PARTITION BY CAQ.Ordering ORDER BY SAS.Ordering) as RowNo, C.Name AS Name, C.Description AS Description, CG.Name AS CompetencyGroup, @@ -195,7 +196,7 @@ INNER JOIN Competencies AS C CA.CompleteByDate, CA.UserBookmark, CA.UnprocessedUpdates, -CA.LaunchCount, CA.SubmittedDate +CA.LaunchCount, CA.SubmittedDate, SA.LinearNavigation FROM CandidateAssessments CA JOIN SelfAssessments SA ON CA.SelfAssessmentID = SA.ID @@ -204,7 +205,7 @@ INNER JOIN SelfAssessmentStructure AS SAS INNER JOIN Competencies AS C ON SAS.CompetencyID = C.ID WHERE CA.CandidateID = @candidateId AND CA.SelfAssessmentID = @selfAssessmentId AND CA.RemovedDate IS NULL AND CA.CompletedDate IS NULL - GROUP BY CA.SelfAssessmentID, SA.Name, SA.Description, SA.UseFilteredApi, CA.StartedDate, CA.LastAccessed, CA.CompleteByDate, CA.UserBookmark, CA.UnprocessedUpdates, CA.LaunchCount, CA.SubmittedDate", + GROUP BY CA.SelfAssessmentID, SA.Name, SA.Description, SA.UseFilteredApi, CA.StartedDate, CA.LastAccessed, CA.CompleteByDate, CA.UserBookmark, CA.UnprocessedUpdates, CA.LaunchCount, CA.SubmittedDate, SA.LinearNavigation", new { candidateId, selfAssessmentId } ); } diff --git a/DigitalLearningSolutions.Web.Tests/Controllers/LearningPortal/SelfAssessmentTests.cs b/DigitalLearningSolutions.Web.Tests/Controllers/LearningPortal/SelfAssessmentTests.cs index 2169d10c7c..1b67379d80 100644 --- a/DigitalLearningSolutions.Web.Tests/Controllers/LearningPortal/SelfAssessmentTests.cs +++ b/DigitalLearningSolutions.Web.Tests/Controllers/LearningPortal/SelfAssessmentTests.cs @@ -137,7 +137,7 @@ public void SelfAssessmentCompetency_Redirects_To_Review_After_Last_Question() var result = controller.SelfAssessmentCompetency(SelfAssessmentId, competencyNumber); // Then - result.Should().BeRedirectToActionResult().WithActionName("SelfAssessmentReview"); + result.Should().BeRedirectToActionResult().WithActionName("SelfAssessmentOverview"); } [Test] @@ -242,7 +242,7 @@ public void SelfAssessmentCompetency_Post_without_self_assessment_should_return_ } [Test] - public void SelfAssessmentReview_Should_Return_View() + public void SelfAssessmentOverview_Should_Return_View() { // Given var selfAssessment = SelfAssessmentHelper.CreateDefaultSelfAssessment(); @@ -251,7 +251,7 @@ public void SelfAssessmentReview_Should_Return_View() new Competency() { CompetencyGroup = "A" }, new Competency() { CompetencyGroup = "A" } }; - var expectedModel = new SelfAssessmentReviewViewModel() + var expectedModel = new SelfAssessmentOverviewViewModel() { SelfAssessment = selfAssessment, CompetencyGroups = competencies.GroupBy(competency => competency.CompetencyGroup), @@ -261,47 +261,47 @@ public void SelfAssessmentReview_Should_Return_View() A.CallTo(() => selfAssessmentService.GetMostRecentResults(selfAssessment.Id, CandidateId)).Returns(competencies); // When - var result = controller.SelfAssessmentReview(SelfAssessmentId); + var result = controller.SelfAssessmentOverview(SelfAssessmentId); // Then result.Should().BeViewResult() - .WithViewName("SelfAssessments/SelfAssessmentReview") + .WithViewName("SelfAssessments/SelfAssessmentOverview") .Model.Should().BeEquivalentTo(expectedModel); } [Test] - public void SelfAssessmentReview_action_should_update_last_accessed() + public void SelfAssessmentOverview_action_should_update_last_accessed() { // Given var selfAssessment = SelfAssessmentHelper.CreateDefaultSelfAssessment(); A.CallTo(() => selfAssessmentService.GetSelfAssessmentForCandidateById(CandidateId, SelfAssessmentId)).Returns(selfAssessment); // When - controller.SelfAssessmentReview(SelfAssessmentId); + controller.SelfAssessmentOverview(SelfAssessmentId); // Then A.CallTo(() => selfAssessmentService.UpdateLastAccessed(selfAssessment.Id, CandidateId)).MustHaveHappened(); } [Test] - public void SelfAssessmentReview_action_should_update_user_bookmark() + public void SelfAssessmentOverview_action_should_update_user_bookmark() { // Given var selfAssessment = SelfAssessmentHelper.CreateDefaultSelfAssessment(); A.CallTo(() => selfAssessmentService.GetSelfAssessmentForCandidateById(CandidateId, SelfAssessmentId)).Returns(selfAssessment); - string destUrl = "/LearningPortal/SelfAssessment/" + selfAssessment.Id.ToString() + "/Review"; + string destUrl = "/LearningPortal/SelfAssessment/" + selfAssessment.Id.ToString() + "/Overview"; // When - controller.SelfAssessmentReview(SelfAssessmentId); + controller.SelfAssessmentOverview(SelfAssessmentId); // Then A.CallTo(() => selfAssessmentService.SetBookmark(selfAssessment.Id, CandidateId, destUrl)).MustHaveHappened(); } [Test] - public void SelfAssessmentReview_Should_Have_Previous_Competency_Number_One_When_Empty() + public void SelfAssessmentOverview_Should_Have_Previous_Competency_Number_One_When_Empty() { // Given var selfAssessment = SelfAssessmentHelper.CreateDefaultSelfAssessment(); var competencies = new List(); - var expectedModel = new SelfAssessmentReviewViewModel() + var expectedModel = new SelfAssessmentOverviewViewModel() { SelfAssessment = selfAssessment, CompetencyGroups = competencies.GroupBy(competency => competency.CompetencyGroup), @@ -311,22 +311,22 @@ public void SelfAssessmentReview_Should_Have_Previous_Competency_Number_One_When A.CallTo(() => selfAssessmentService.GetMostRecentResults(selfAssessment.Id, CandidateId)).Returns(competencies); // When - var result = controller.SelfAssessmentReview(SelfAssessmentId); + var result = controller.SelfAssessmentOverview(SelfAssessmentId); // Then result.Should().BeViewResult() - .WithViewName("SelfAssessments/SelfAssessmentReview") + .WithViewName("SelfAssessments/SelfAssessmentOverview") .Model.Should().BeEquivalentTo(expectedModel); } [Test] - public void SelfAssessmentReview_action_without_self_assessment_should_return_403() + public void SelfAssessmentOverview_action_without_self_assessment_should_return_403() { // Given A.CallTo(() => selfAssessmentService.GetSelfAssessmentForCandidateById(CandidateId, SelfAssessmentId)).Returns(null); // When - var result = controller.SelfAssessmentReview(SelfAssessmentId); + var result = controller.SelfAssessmentOverview(SelfAssessmentId); // Then result.Should() diff --git a/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs b/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs index 4267fdefc4..74c4587113 100644 --- a/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs +++ b/DigitalLearningSolutions.Web/Controllers/LearningPortalController/SelfAssessment.cs @@ -43,7 +43,7 @@ public IActionResult SelfAssessmentCompetency(int selfAssessmentId, int competen var competency = selfAssessmentService.GetNthCompetency(competencyNumber, assessment.Id, User.GetCandidateIdKnownNotNull()); if (competency == null) { - return RedirectToAction("SelfAssessmentReview", new { selfAssessmentId = assessment.Id }); + return RedirectToAction("SelfAssessmentOverview", new { selfAssessmentId = assessment.Id }); } else { @@ -86,18 +86,25 @@ public IActionResult SelfAssessmentCompetency(int selfAssessmentId, ICollection< } } selfAssessmentService.SetUpdatedFlag(selfAssessmentId, candidateID, true); - return RedirectToAction("SelfAssessmentCompetency", new { competencyNumber = competencyNumber + 1 }); + if (assessment.LinearNavigation) + { + return RedirectToAction("SelfAssessmentCompetency", new { competencyNumber = competencyNumber + 1 }); + } + else + { + return new RedirectResult(Url.Action("SelfAssessmentOverview", new { selfAssessmentId = selfAssessmentId }) + "#comp-" + competencyNumber.ToString()); + } } - [Route("LearningPortal/SelfAssessment/{selfAssessmentId:int}/Review")] - public IActionResult SelfAssessmentReview(int selfAssessmentId) + [Route("LearningPortal/SelfAssessment/{selfAssessmentId:int}/Overview")] + public IActionResult SelfAssessmentOverview(int selfAssessmentId) { - string destUrl = "/LearningPortal/SelfAssessment/" + selfAssessmentId.ToString() + "/Review"; + string destUrl = "/LearningPortal/SelfAssessment/" + selfAssessmentId.ToString() + "/Overview"; selfAssessmentService.SetBookmark(selfAssessmentId, User.GetCandidateIdKnownNotNull(), destUrl); var assessment = selfAssessmentService.GetSelfAssessmentForCandidateById(User.GetCandidateIdKnownNotNull(), selfAssessmentId); if (assessment == null) { - logger.LogWarning($"Attempt to display self assessment review for candidate {User.GetCandidateIdKnownNotNull()} with no self assessment"); + logger.LogWarning($"Attempt to display self assessment overview for candidate {User.GetCandidateIdKnownNotNull()} with no self assessment"); return RedirectToAction("StatusCode", "LearningSolutions", new { code = 403 }); } @@ -114,13 +121,13 @@ public IActionResult SelfAssessmentReview(int selfAssessmentId) } } } - var model = new SelfAssessmentReviewViewModel() + var model = new SelfAssessmentOverviewViewModel() { SelfAssessment = assessment, CompetencyGroups = competencies.GroupBy(competency => competency.CompetencyGroup), PreviousCompetencyNumber = Math.Max(competencies.Count(), 1) }; - return View("SelfAssessments/SelfAssessmentReview", model); + return View("SelfAssessments/SelfAssessmentOverview", model); } [HttpPost] diff --git a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs index 2b90575add..a7a343ab05 100644 --- a/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs +++ b/DigitalLearningSolutions.Web/Controllers/SupervisorController/Supervisor.cs @@ -14,6 +14,7 @@ using System.Collections.Generic; using DigitalLearningSolutions.Web.ViewModels.Common.SearchablePage; using DigitalLearningSolutions.Data.Models.SessionData.Supervisor; + using DigitalLearningSolutions.Data.Models.SelfAssessments; public partial class SupervisorController { @@ -134,7 +135,19 @@ public IActionResult ReviewDelegateSelfAssessment(int supervisorDelegateId, int { var adminId = GetAdminID(); var superviseDelegate = supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId); - var reviewedCompetencies = selfAssessmentService.GetCandidateAssessmentResultsById(candidateAssessmentId, adminId).ToList(); + var reviewedCompetencies = PopulateCompetencyLevelDescriptors(selfAssessmentService.GetCandidateAssessmentResultsById(candidateAssessmentId, adminId).ToList()); + var delegateSelfAssessment = supervisorService.GetSelfAssessmentByCandidateAssessmentId(candidateAssessmentId, adminId); + var model = new ReviewSelfAssessmentViewModel() + { + SupervisorDelegateDetail = superviseDelegate, + DelegateSelfAssessment = delegateSelfAssessment, + CompetencyGroups = reviewedCompetencies.GroupBy(competency => competency.CompetencyGroup) + }; + return View("ReviewSelfAssessment", model); + } + + private List PopulateCompetencyLevelDescriptors(List reviewedCompetencies) + { foreach (var competency in reviewedCompetencies) { foreach (var assessmentQuestion in competency.AssessmentQuestions) @@ -145,14 +158,15 @@ public IActionResult ReviewDelegateSelfAssessment(int supervisorDelegateId, int } } } - var delegateSelfAssessment = supervisorService.GetSelfAssessmentByCandidateAssessmentId(candidateAssessmentId, adminId); - var model = new ReviewSelfAssessmentViewModel() + return reviewedCompetencies; + } + private AssessmentQuestion GetLevelDescriptorsForAssessmentQuestion (AssessmentQuestion assessmentQuestion) + { + if (assessmentQuestion.AssessmentQuestionInputTypeID != 2) { - SupervisorDelegateDetail = superviseDelegate, - DelegateSelfAssessment = delegateSelfAssessment, - CompetencyGroups = reviewedCompetencies.GroupBy(competency => competency.CompetencyGroup) - }; - return View("ReviewSelfAssessment", model); + assessmentQuestion.LevelDescriptors = selfAssessmentService.GetLevelDescriptorsForAssessmentQuestion(assessmentQuestion.Id, assessmentQuestion.MinValue, assessmentQuestion.MaxValue, assessmentQuestion.MinValue == 0).ToList(); + } + return assessmentQuestion; } [Route("/Supervisor/Staff/{supervisorDelegateId}/ProfileAssessment/{candidateAssessmentId}/{viewMode}/{resultId}/")] public IActionResult ReviewCompetencySelfAssessment(int supervisorDelegateId, int candidateAssessmentId, string viewMode, int resultId) @@ -161,11 +175,7 @@ public IActionResult ReviewCompetencySelfAssessment(int supervisorDelegateId, in var supervisorDelegate = supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId); var competency = selfAssessmentService.GetCompetencyByCandidateAssessmentResultId(resultId, candidateAssessmentId, adminId); var delegateSelfAssessment = supervisorService.GetSelfAssessmentBaseByCandidateAssessmentId(candidateAssessmentId); - var assessmentQuestion = competency.AssessmentQuestions.First(); - if (assessmentQuestion.AssessmentQuestionInputTypeID != 2) - { - assessmentQuestion.LevelDescriptors = selfAssessmentService.GetLevelDescriptorsForAssessmentQuestion(assessmentQuestion.Id, assessmentQuestion.MinValue, assessmentQuestion.MaxValue, assessmentQuestion.MinValue == 0).ToList(); - } + var assessmentQuestion = GetLevelDescriptorsForAssessmentQuestion(competency.AssessmentQuestions.First()); var model = new ReviewCompetencySelfAsessmentViewModel() { DelegateSelfAssessment = delegateSelfAssessment, @@ -194,7 +204,7 @@ public IActionResult VerifyMultipleResults(int supervisorDelegateId, int candida var adminId = GetAdminID(); var superviseDelegate = supervisorService.GetSupervisorDelegateDetailsById(supervisorDelegateId); var delegateSelfAssessment = supervisorService.GetSelfAssessmentBaseByCandidateAssessmentId(candidateAssessmentId); - var reviewedCompetencies = selfAssessmentService.GetCandidateAssessmentResultsForReviewById(candidateAssessmentId, adminId).ToList(); + var reviewedCompetencies = PopulateCompetencyLevelDescriptors(selfAssessmentService.GetCandidateAssessmentResultsForReviewById(candidateAssessmentId, adminId).ToList()); var model = new ReviewSelfAssessmentViewModel() { SupervisorDelegateDetail = superviseDelegate, diff --git a/DigitalLearningSolutions.Web/Properties/PublishProfiles/FTPPublishToUAT.pubxml b/DigitalLearningSolutions.Web/Properties/PublishProfiles/FTPPublishToUAT.pubxml index 6c3599c306..81ea730ffa 100644 --- a/DigitalLearningSolutions.Web/Properties/PublishProfiles/FTPPublishToUAT.pubxml +++ b/DigitalLearningSolutions.Web/Properties/PublishProfiles/FTPPublishToUAT.pubxml @@ -14,7 +14,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt de1be25a-b979-47be-9d88-203f02fe2001 ftp://10.0.1.82 False - False + True /dls-dev-my-learning-portal nhsd-itspdb-nsg <_SavePWD>False diff --git a/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss b/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss index ffb8732ce3..d27522f9cb 100644 --- a/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss +++ b/DigitalLearningSolutions.Web/Styles/frameworks/frameworksShared.scss @@ -22,10 +22,7 @@ $nhs-dark-grey: #425563; font-size: 12px; padding: 4px; } -.status-tag { - overflow: hidden; - white-space: nowrap; -} + .nhsuk-details__text { padding-bottom: 0 !important; } @@ -392,7 +389,4 @@ h1.truncate-overflow::after { .searchable-element .nhsuk-expander { border: none } -.first-row td { - border-top: 2px solid #d8dde0; -} diff --git a/DigitalLearningSolutions.Web/Styles/layout.scss b/DigitalLearningSolutions.Web/Styles/layout.scss index f4102df298..ca248d9b5a 100644 --- a/DigitalLearningSolutions.Web/Styles/layout.scss +++ b/DigitalLearningSolutions.Web/Styles/layout.scss @@ -278,3 +278,10 @@ nav, .nhsuk-header__navigation, #header-navigation { background-color: shade($color_nhsuk-red, 50%); } } +.first-row td { + border-top: 2px solid #d8dde0; +} +.status-tag { + overflow: hidden; + white-space: nowrap; +} diff --git a/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss b/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss index 0e03de0895..3a1591a964 100644 --- a/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss +++ b/DigitalLearningSolutions.Web/Styles/learningPortal/selfAssessment.scss @@ -215,3 +215,20 @@ details.nhsuk-details { .course-card .nhsuk-expander { border: none } + +.nhsuk-table__row:hover{ + background-color: inherit; +} +.row-outer:target { + background-color: rgba(255, 249, 146, 1); + animation: fade 4s forwards; +} +@keyframes fade { + from { + background-color: rgba(255, 249, 146, 1); + } + + to { + background-color: rgba(255, 249, 146, 0); + } +} diff --git a/DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/SelfAssessmentDescriptionViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/SelfAssessmentDescriptionViewModel.cs index 043702a2fa..b8cd468bab 100644 --- a/DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/SelfAssessmentDescriptionViewModel.cs +++ b/DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/SelfAssessmentDescriptionViewModel.cs @@ -11,6 +11,7 @@ public class SelfAssessmentDescriptionViewModel public readonly bool UseFilteredApi; public readonly string? UserBookmark; public readonly bool UnprocessedUpdates; + public readonly bool LinearNavigation; public SelfAssessmentDescriptionViewModel(CurrentSelfAssessment selfAssessment) { Id = selfAssessment.Id; @@ -19,6 +20,7 @@ public SelfAssessmentDescriptionViewModel(CurrentSelfAssessment selfAssessment) UseFilteredApi = selfAssessment.UseFilteredApi; UserBookmark = selfAssessment.UserBookmark; UnprocessedUpdates = selfAssessment.UnprocessedUpdates; + LinearNavigation = selfAssessment.LinearNavigation; } } } diff --git a/DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/SelfAssessmentReviewViewModel.cs b/DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/SelfAssessmentOverviewViewModel.cs similarity index 87% rename from DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/SelfAssessmentReviewViewModel.cs rename to DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/SelfAssessmentOverviewViewModel.cs index dfb6d51a43..d13a7f6026 100644 --- a/DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/SelfAssessmentReviewViewModel.cs +++ b/DigitalLearningSolutions.Web/ViewModels/LearningPortal/SelfAssessments/SelfAssessmentOverviewViewModel.cs @@ -1,13 +1,13 @@ -namespace DigitalLearningSolutions.Web.ViewModels.LearningPortal.SelfAssessments -{ - using System.Collections.Generic; - using System.Linq; - using DigitalLearningSolutions.Data.Models.SelfAssessments; - - public class SelfAssessmentReviewViewModel - { - public CurrentSelfAssessment SelfAssessment { get; set; } - public IEnumerable> CompetencyGroups { get; set; } - public int PreviousCompetencyNumber { get; set; } - } -} +namespace DigitalLearningSolutions.Web.ViewModels.LearningPortal.SelfAssessments +{ + using System.Collections.Generic; + using System.Linq; + using DigitalLearningSolutions.Data.Models.SelfAssessments; + + public class SelfAssessmentOverviewViewModel + { + public CurrentSelfAssessment SelfAssessment { get; set; } + public IEnumerable> CompetencyGroups { get; set; } + public int PreviousCompetencyNumber { get; set; } + } +} diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/FilteredMgp/FilteredResults.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/FilteredMgp/FilteredResults.cshtml index ba22c77b56..86c3e945c0 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/FilteredMgp/FilteredResults.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/FilteredMgp/FilteredResults.cshtml @@ -8,7 +8,7 @@ ViewData["SelfAssessmentTitle"] = "Recommended Learning Resources"; } @section breadcrumbs { -
  • Self Assessment
    • +
  • Self Assessment
  • Recommended Learning Resources
    • } @@ -18,7 +18,7 @@ }
    - + diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentCompetency.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentCompetency.cshtml index 5980f60771..4ecc2d8821 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentCompetency.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentCompetency.cshtml @@ -6,7 +6,8 @@ ViewData["SelfAssessmentTitle"] = @Model.Assessment.Name; } @section breadcrumbs { -
  • Self Assessment
    • +
  • Self Assessment
    • +
  • @Model.Competency.Vocabulary @Model.CompetencyNumber
    • }

    @Model.Competency.CompetencyGroup

    @@ -45,7 +46,6 @@ } } -
    Question @Model.CompetencyNumber of @Model.TotalNumberOfCompetencies
    @@ -54,26 +54,42 @@
    -
    - - - @(@Model.CompetencyNumber == 1 ? "Go back" : "Previous question") - - -
    + @if (Model.Assessment.LinearNavigation) + { +
    + + + @(@Model.CompetencyNumber == 1 ? "Go back" : "Previous question") + + +
    + } + else + { +
    + + + Return to Overview + +
    + }
    @section scripts { diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentDescription.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentDescription.cshtml index 6a5ed675d1..ee7acdddf2 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentDescription.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentDescription.cshtml @@ -14,13 +14,30 @@

    @Model.Name

    @(Html.Raw(Model.Description))
    -@if (Model.UserBookmark != null) + +@if (Model.LinearNavigation) { - - Continue + @if (Model.UserBookmark != null) + { + + Continue + + } + + Go to Question 1 + Go to Overview +} +else +{ + Go to Overview + @if (Model.UserBookmark != null) + { + + Continue + + } } - - Go to Question 1 - + + diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml new file mode 100644 index 0000000000..32bce9bc82 --- /dev/null +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentOverview.cshtml @@ -0,0 +1,62 @@ +@using DigitalLearningSolutions.Web.ViewModels.LearningPortal +@using DigitalLearningSolutions.Web.ViewModels.LearningPortal.SelfAssessments +@model SelfAssessmentOverviewViewModel + +@{ + Layout = "SelfAssessments/_Layout"; + ViewData["Title"] = "Self Assessment"; + ViewData["SelfAssessmentTitle"] = @Model.SelfAssessment.Name; +} +@section breadcrumbs { +
  • Self Assessment
    • +
  • Overview
    • +} + +

    @Model.SelfAssessment.Name - Overview

    + +@if (Model.CompetencyGroups.Any()) +{ + foreach (var competencyGroup in Model.CompetencyGroups) + { + @if (Model.SelfAssessment.LinearNavigation) + { +
    +
    + + + @competencyGroup.Key + + +
    + + + + +
    +
    +
    + +
    +
    + } + else + { +
    +
    + +
    +
    + + } + } +} + +@if (Model.SelfAssessment.UseFilteredApi) +{ +

    Once you are happy with your responses, submit your self-assessment to retrieve a list of recommended learning resources.

    + + Submit self assessment + +} diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentReview.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentReview.cshtml deleted file mode 100644 index c19e69af9a..0000000000 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/SelfAssessmentReview.cshtml +++ /dev/null @@ -1,109 +0,0 @@ -@using DigitalLearningSolutions.Web.ViewModels.LearningPortal -@using DigitalLearningSolutions.Web.ViewModels.LearningPortal.SelfAssessments -@model SelfAssessmentReviewViewModel - -@{ - Layout = "SelfAssessments/_Layout"; - ViewData["Title"] = "Self Assessment"; - ViewData["SelfAssessmentTitle"] = @Model.SelfAssessment.Name; -} -@section breadcrumbs { -
  • Self Assessment
    • -} - -

    @Model.SelfAssessment.Name - Review

    -

    Check through your answers

    - - -@foreach (var competencyGroup in @Model.CompetencyGroups) -{ -
    -
    - - - @competencyGroup.Key - - - -
    - - @foreach (var competency in competencyGroup) - { -
    -
    -
    -

    @competency.Name

    -
    - @foreach (var question in competency.AssessmentQuestions) - { -
    -
    @question.Question
    -

    - @if (question.Result == null) - { - No response - } - else - { - @if (question.LevelDescriptors != null) - - { - foreach (var levelDescriptor in question.LevelDescriptors) - { - if (levelDescriptor.LevelValue == question.Result) - { - - - @levelDescriptor.LevelLabel - - break; - } - } - } - else - { - - - @question.Result/@question.MaxValue - - } - } -

    -
    - } -
    -
    - } -
    -
    -
    - -
    -
    -} - -@if (Model.SelfAssessment.UseFilteredApi) -{ -

    Once you are happy with your responses, submit your self-assessment to retrieve a list of recommended learning resources.

    - - Submit self assessment - -} -else -{ - - Finish self assessment - -} - - -
    - - - Previous question - -
    diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_MeanScores.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_MeanScores.cshtml index c6de3a2e59..6343358ab8 100644 --- a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_MeanScores.cshtml +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_MeanScores.cshtml @@ -1,15 +1,19 @@ -@using DigitalLearningSolutions.Data.Models.SelfAssessments +@using DigitalLearningSolutions.Data.Models.SelfAssessments @foreach (var questionType in ((IGrouping)ViewData["competencyGroup"]) - .SelectMany(competency => competency.AssessmentQuestions) - .GroupBy(question => question.Question) - ) +.SelectMany(competency => competency.AssessmentQuestions) +.GroupBy(question => question.Question) +) { - var meanScore = questionType.Average(question => question.Result); - var scoreText = meanScore == null - ? "No answers submitted  -" - : meanScore.Value.ToString("F1") + " / " + questionType.First().MaxValue; - - @Html.Raw($@"{questionType.Key} (average score): {scoreText}") - -
    + if (questionType.ToList().First().AssessmentQuestionInputTypeID == 2) + { + var meanScore = questionType.Average(question => question.Result); + var scoreText = meanScore == null + ? "No answers submitted  -" + : meanScore.Value.ToString("F1") + " / " + questionType.First().MaxValue; + + @Html.Raw($@"{questionType.Key} (average score): {scoreText}") + +
    + } + } diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_OverviewTable.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_OverviewTable.cshtml new file mode 100644 index 0000000000..ade4fbd52a --- /dev/null +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/SelfAssessments/_OverviewTable.cshtml @@ -0,0 +1,56 @@ +@using DigitalLearningSolutions.Data.Models.SelfAssessments; +@model IGrouping; + + + + @if (!(bool)ViewData["linearNavigation"]) + { + + } + + + + + + + + + + + @foreach (var competency in Model) + { + + + + + + + @foreach (var question in competency.AssessmentQuestions.Skip(1)) + { + + + + + + } + + } + +

    @Model.Key

    + @Model.First().Vocabulary + + Question + + Response + + Status + + Actions +
    + @competency.Vocabulary @competency.Name + + Actions + + Review + +
    diff --git a/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_AssessmentQuestionOverviewCells.cshtml b/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_AssessmentQuestionOverviewCells.cshtml new file mode 100644 index 0000000000..d284b7659a --- /dev/null +++ b/DigitalLearningSolutions.Web/Views/LearningPortal/Shared/_AssessmentQuestionOverviewCells.cshtml @@ -0,0 +1,16 @@ +@using DigitalLearningSolutions.Data.Models.SelfAssessments; +@model AssessmentQuestion + + + + Questions + @Model.Question + + + Responses + + + + Questions + +