Merge remote-tracking branch 'obojobo-document-engine/master'

Pulls in updats for fix-calc-highest-attempt-and-highest-assessment-score from doc-engine v 1.0.3
ucfopen · Sep 30, 2018 · 59c53a2 · 59c53a2
2 parents 6938803 + 7bc42ec
commit 59c53a2
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 5 deletions.
diff --git a/packages/obojobo-document-engine/__tests__/viewer/stores/assessment-store.test.js b/packages/obojobo-document-engine/__tests__/viewer/stores/assessment-store.test.js
@@ -298,4 +298,93 @@ describe('AssessmentStore', () => {
 				expect(AssessmentStore.getState().assessments.assessmentId.currentResponses).toEqual(['q1'])
 			})
 	})
+
+	test('updateAttempts sets highestAttemptScoreAttempts and highestAssessmentScoreAttempts correctly', () => {
+		AssessmentStore.updateAttempts([
+			{
+				assessmentId: 'assessmentId',
+				attempts: [
+					{
+						attemptId: 'attempt-1',
+						attemptScore: 0,
+						assessmentScore: null,
+						state: {
+							questions: []
+						}
+					},
+					{
+						attemptID: 'attempt-2',
+						attemptScore: 50,
+						assessmentScore: 25,
+						state: {
+							questions: []
+						}
+					},
+					{
+						attemptId: 'attempt-3',
+						attemptScore: 100,
+						assessmentScore: 50,
+						state: {
+							questions: []
+						}
+					},
+					{
+						attemptId: 'attempt-4',
+						attemptScore: 100,
+						assessmentScore: null,
+						state: {
+							questions: []
+						}
+					},
+					{
+						attemptId: 'attempt-5',
+						attemptScore: null,
+						assessmentScore: 50,
+						state: {
+							questions: []
+						}
+					}
+				]
+			}
+		])
+
+		let state = AssessmentStore.getState()
+		let assessState = state.assessments.assessmentId
+		expect(assessState.highestAttemptScoreAttempts).toEqual([
+			{
+				attemptId: 'attempt-3',
+				attemptScore: 100,
+				assessmentScore: 50,
+				state: {
+					questions: []
+				}
+			},
+			{
+				attemptId: 'attempt-4',
+				attemptScore: 100,
+				assessmentScore: null,
+				state: {
+					questions: []
+				}
+			}
+		])
+		expect(assessState.highestAssessmentScoreAttempts).toEqual([
+			{
+				attemptId: 'attempt-3',
+				attemptScore: 100,
+				assessmentScore: 50,
+				state: {
+					questions: []
+				}
+			},
+			{
+				attemptId: 'attempt-5',
+				attemptScore: null,
+				assessmentScore: 50,
+				state: {
+					questions: []
+				}
+			}
+		])
+	})
 })
diff --git a/packages/obojobo-document-engine/build/viewer.js b/packages/obojobo-document-engine/build/viewer.js
@@ -18944,8 +18944,8 @@ var AssessmentStore = function (_Store) {
 				}
 
 				assessments[assessId].lti = assessmentItem.ltiState;
-				assessments[assessId].highestAttemptScoreAttempts = _assessmentUtil2.default.findHighestAttempts(attempts, 'assessmentScore');
-				assessments[assessId].highestAssessmentScoreAttempts = _assessmentUtil2.default.findHighestAttempts(attempts, 'attemptScore');
+				assessments[assessId].highestAttemptScoreAttempts = _assessmentUtil2.default.findHighestAttempts(attempts, 'attemptScore');
+				assessments[assessId].highestAssessmentScoreAttempts = _assessmentUtil2.default.findHighestAttempts(attempts, 'assessmentScore');
 
 				attempts.forEach(function (attempt) {
 					assessment = assessments[attempt.assessmentId];

diff --git a/packages/obojobo-document-engine/package.json b/packages/obojobo-document-engine/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "obojobo-document-engine",
-	"version": "1.0.2",
+	"version": "1.0.3",
 	"description": "",
 	"engines": {
 		"yarn": "^1.0"

diff --git a/packages/obojobo-document-engine/src/scripts/viewer/stores/assessment-store.js b/packages/obojobo-document-engine/src/scripts/viewer/stores/assessment-store.js
@@ -87,11 +87,11 @@ class AssessmentStore extends Store {
 			assessments[assessId].lti = assessmentItem.ltiState
 			assessments[assessId].highestAttemptScoreAttempts = AssessmentUtil.findHighestAttempts(
 				attempts,
-				'assessmentScore'
+				'attemptScore'
 			)
 			assessments[assessId].highestAssessmentScoreAttempts = AssessmentUtil.findHighestAttempts(
 				attempts,
-				'attemptScore'
+				'assessmentScore'
 			)
 
 			attempts.forEach(attempt => {