|
|
|
@ -7905,6 +7905,9 @@ class Exercise |
|
|
|
/** |
|
|
|
/** |
|
|
|
* @param int $exeId |
|
|
|
* @param int $exeId |
|
|
|
* @param array $exercise_stat_info |
|
|
|
* @param array $exercise_stat_info |
|
|
|
|
|
|
|
* @param array $remindList |
|
|
|
|
|
|
|
* @param int $currentQuestion |
|
|
|
|
|
|
|
* @return int |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public static function getNextQuestionId($exeId, $exercise_stat_info, $remindList, $currentQuestion) |
|
|
|
public static function getNextQuestionId($exeId, $exercise_stat_info, $remindList, $currentQuestion) |
|
|
|
{ |
|
|
|
{ |
|
|
|
@ -7935,6 +7938,7 @@ class Exercise |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Only use this feature if all questions were answered and there are contents in the $remindList |
|
|
|
// Only use this feature if all questions were answered and there are contents in the $remindList |
|
|
|
/*if (count($answeredQuestions) == count($result['question_list']) && empty($remindList)) { |
|
|
|
/*if (count($answeredQuestions) == count($result['question_list']) && empty($remindList)) { |
|
|
|
return null; |
|
|
|
return null; |
|
|
|
@ -8008,6 +8012,10 @@ class Exercise |
|
|
|
return $counterRemindListQuestions; |
|
|
|
return $counterRemindListQuestions; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
if ($currentQuestion > $counterAnsweredQuestions) { |
|
|
|
|
|
|
|
$counterAnsweredQuestions = $currentQuestion + 1; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
return $counterAnsweredQuestions; |
|
|
|
return $counterAnsweredQuestions; |
|
|
|
} |
|
|
|
} |
|
|
|
|