assessment: _canShowMarking & _canShowModelAnswer settings not applied on restore #2693

bower.json

@@ -1,11 +1,11 @@
 {
   "name": "adapt-contrib-assessment",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "framework": ">=5.4",
   "homepage": "https://github.com/adaptlearning/adapt-contrib-assessment",
   "issues": "https://github.com/adaptlearning/adapt_framework/issues/new",
-  "extension" : "assessment",
-  "displayName" : "Assessment",
+  "extension": "assessment",
+  "displayName": "Assessment",
   "description": "An extension which attaches to an article object to group various question components and provide a score with feedback",
   "main": "/js/adapt-assessmentArticleExtension.js",
   "keywords": [
@@ -14,4 +14,4 @@
   ],
   "license": "GPL-3.0",
   "targetAttribute": "_assessment"
-}
+}

js/adapt-assessmentArticleModel.js

@@ -77,12 +77,25 @@ define([
       // save original children
       this._originalChildModels = this.getChildren().models;
 
+      this.setupCurrentQuestionComponents();
+
       this._setAssessmentOwnershipOnChildrenModels();
 
       // ensure the _questions attribute is set up (see https://github.com/adaptlearning/adapt_framework/issues/2971)
       this._updateQuestionsState();
     },
 
+    setupCurrentQuestionComponents: function() {
+      const assessmentQuestionsConfig = this.getConfig()._questions;
+      this._getAllQuestionComponents().forEach(component => {
+        component.set({
+          _canShowFeedback: assessmentQuestionsConfig._canShowFeedback,
+          _canShowMarking: assessmentQuestionsConfig._canShowMarking,
+          _canShowModelAnswer: assessmentQuestionsConfig._canShowModelAnswer
+        });
+      });
+    },
+
     _setAssessmentOwnershipOnChildrenModels: function() {
       // mark all children components as belonging to an assessment
       var assessmentConfig = this.get('_assessment');
@@ -123,12 +136,12 @@ define([
         });
         this.getChildren().models = this._originalChildModels;
         if (assessmentConfig._banks &&
-            assessmentConfig._banks._isEnabled &&
-            assessmentConfig._banks._split.length > 1) {
+          assessmentConfig._banks._isEnabled &&
+          assessmentConfig._banks._split.length > 1) {
 
           quizModels = this._setupBankedAssessment();
         } else if (assessmentConfig._randomisation &&
-                  assessmentConfig._randomisation._isEnabled) {
+          assessmentConfig._randomisation._isEnabled) {
 
           quizModels = this._setupRandomisedAssessment();
         }
@@ -144,6 +157,7 @@ define([
 
       this.getChildren().models = quizModels;
 
+      this.setupCurrentQuestionComponents();
       if (shouldResetAssessment || shouldResetQuestions) {
         this._resetQuestions(function() {
           this.set('_attemptInProgress', true);
@@ -573,9 +587,9 @@ define([
 
       // stop resetting if not complete or not allowed
       if (this.get('_assessmentCompleteInSession') &&
-          !assessmentConfig._isResetOnRevisit &&
-          !isPageReload &&
-          !force) {
+        !assessmentConfig._isResetOnRevisit &&
+        !isPageReload &&
+        !force) {
         if (typeof callback === 'function') {
           // eslint-disable-next-line standard/no-callback-literal
           callback(false);