Merge pull request #2223 from somiaj/hotfix-2216-2222

Hotfix of #2216 and #2222
openwebwork · Oct 23, 2023 · 5af82c6 · 5af82c6
2 parents f35316f + 3ba523e
commit 5af82c6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/htdocs/js/ProblemGrader/problemgrader.js b/htdocs/js/ProblemGrader/problemgrader.js
@@ -120,15 +120,16 @@
 					} else {
 						// Update the hidden problem status fields and score table for gateway quizzes
 						if (saveData.versionId !== '0') {
-							document.gwquiz.elements['probstatus' + saveData.problemId].value =
-								parseInt(scoreInput.value) / 100;
+							const probStatus = document.gwquiz.elements[`probstatus${saveData.problemId}`];
+							if (probStatus) probStatus.value = parseInt(scoreInput.value) / 100;
 							let testValue = 0;
 							for (const scoreCell of document.querySelectorAll('table.gwNavigation td.score')) {
 								if (scoreCell.dataset.problemId == saveData.problemId) {
 									scoreCell.textContent = scoreInput.value == '100' ? '\u{1F4AF}' : scoreInput.value;
 								}
-								testValue += document.gwquiz.elements['probstatus'
-									+ scoreCell.dataset.problemId].value * scoreCell.dataset.problemValue;
+								testValue +=
+									(document.gwquiz.elements[`probstatus${scoreCell.dataset.problemId}`]?.value ?? 0) *
+									scoreCell.dataset.problemValue;
 							}
 							const recordedScore = document.getElementById('test-recorded-score');
 							if (recordedScore) {

diff --git a/templates/ContentGenerator/GatewayQuiz.html.ep b/templates/ContentGenerator/GatewayQuiz.html.ep
@@ -589,7 +589,8 @@
 					% }
 				</div>
 				% # Store the problem status for continued attempts recording.
-				<%= hidden_field 'probstatus' . ($probOrder->[$i] + 1) => $c->{probStatus}[ $probOrder->[$i] ] =%>
+				<%= hidden_field 'probstatus' . $problems->[ $probOrder->[$i] ]{problem_id}
+					=> $c->{probStatus}[ $probOrder->[$i] ] =%>
 				%
 				<div class="gwDivider"></div>
 			% } else {
@@ -605,7 +606,8 @@
 					% }
 				% }
 				% # Store the problem status for continued attempts recording.
-				<%= hidden_field 'probstatus' . ($probOrder->[$i] + 1) => $c->{probStatus}[ $probOrder->[$i] ] %>
+				<%= hidden_field 'probstatus' . $problems->[ $probOrder->[$i] ]{problem_id}
+					=> $c->{probStatus}[ $probOrder->[$i] ] %>
 			% }
 		% }
 		%