SAK-45458: SAMIGO: Error when republish and regrade on Calculated Que…

…stion (sakaiproject#9965)
jorgecanovas · Oct 22, 2021 · b4cfd62 · b4cfd62
1 parent 6b8997f
commit b4cfd62
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...go/samigo-services/src/java/org/sakaiproject/tool/assessment/services/GradingService.java b/...go/samigo-services/src/java/org/sakaiproject/tool/assessment/services/GradingService.java
@@ -1470,7 +1470,7 @@ private double getScoreByQuestionType(ItemGradingData itemGrading, ItemDataIfc i
       case 11: // FIN
     	  try {
     	      if (type == 15) {  // CALCULATED_QUESTION
-    	          Map<Integer, String> calculatedAnswersMap = getCalculatedAnswersMap(itemGrading, item);
+	              Map<Integer, String> calculatedAnswersMap = getCalculatedAnswersMap(itemGrading, item, calcQuestionAnswerSequence);
 	              int numAnswers = calculatedAnswersMap.size();
 	              autoScore = getCalcQScore(itemGrading, item, calculatedAnswersMap, calcQuestionAnswerSequence ) / (double) numAnswers;
 	          } else {
@@ -2768,9 +2768,9 @@ public boolean getHasGradingData(Long publishedAssessmentId) {
    * @param item
    * @return map of calc answers
    */
-  private Map<Integer, String> getCalculatedAnswersMap(ItemGradingData itemGrading, ItemDataIfc item) {
+  private Map<Integer, String> getCalculatedAnswersMap(ItemGradingData itemGrading, ItemDataIfc item, int calcQuestionAnswerSequence ) {
       // return value from extractCalcQAnswersArray is not used, calculatedAnswersMap is populated by this call
-      if (answersMap.isEmpty()) {
+      if (calcQuestionAnswerSequence == 1) {
           extractCalcQAnswersArray(answersMap, item, itemGrading.getAssessmentGradingId(), itemGrading.getAgentId());
       }
       return answersMap;