Merge pull request #351 from TechnologyEnhancedLearning/Develop/fixes/TD-3707-Assessments-you-jump-all-over-the-page-after-submitting-answers

TD-3707: fixed question focus issue in assessments

Author: ArunimaGeorge

LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/CaseOrAssessmentResource.vue

@@ -288,7 +288,7 @@
                 return questionBlockOrder - pageBreakOrder - 1;
             },
             setQuestionInFocus(pageIndex: number, value: number, remove: boolean) {
-                if ((remove && this.questionsInFocus[pageIndex] === value) || this.canContinue) {
+                if ((remove && this.questionsInFocus[pageIndex] === value)) {
                     this.questionsInFocus[pageIndex] = undefined;
                 } else {
                     this.questionsInFocus[pageIndex] = value;

LearningHub.Nhs.WebUI/Scripts/vuesrc/resource/blocks/BlocksView.vue

@@ -93,9 +93,9 @@
                 requestAnimationFrame(this.applyUpdates);
             },
             questionInFocus() {
-                const question = this.blocks[this.questionInFocus];
-                if (question && this.allQuestionsAnswered) {
-                    const element = document.getElementById(this.generateId(question.order - this.blocks[0].order));
+                const lastAnsweredIndex = this.blocks.findIndex(block => block.blockType === BlockTypeEnum.Question && this.pagesProgress[this.blocks.indexOf(block)]);
+                if (lastAnsweredIndex !== -1) {
+                    const element = document.getElementById(this.generateId(lastAnsweredIndex));
                     if (element) {
                         setTimeout(() => {
                             element.scrollIntoView({ behavior: "smooth" });