Merge branch 'v4-quiz' into v4-quiz-layout-single

Author: b-l-i-n-d

templates/learning-area/quiz/question.php

@@ -40,6 +40,9 @@
 $quiz_id            = $tutor_is_started_quiz->quiz_id ?? 0;
 $quiz_settings      = tutor_utils()->get_quiz_option( $quiz_id, 'quiz_settings', array() );
 $show_question_mark = $question_settings['show_question_mark'] ?? '0';
+$attempt_id         = (int) ( $tutor_is_started_quiz->attempt_id ?? 0 );
+$question_id        = (int) ( $question->question_id ?? 0 );
+$field_name_base    = sprintf( 'attempt[%d][quiz_question][%d]', $attempt_id, $question_id );
 
 $answer_is_required = isset( $question_settings['answer_required'] ) && '1' === $question_settings['answer_required'];
 $required_message   = __( 'The answer for this question is required', 'tutor' );
@@ -67,10 +70,11 @@ class="tutor-quiz-question"
 	tutor_load_template(
 		'learning-area.quiz.questions.' . $question_type,
 		array(
-			'question'           => wp_parse_args( (array) $question, $default_question ),
-			'quiz_settings'      => $quiz_settings,
-			'answer_is_required' => $answer_is_required,
-			'required_message'   => $required_message,
+			'question'                 => wp_parse_args( (array) $question, $default_question ),
+			'quiz_settings'            => $quiz_settings,
+			'answer_is_required'       => $answer_is_required,
+			'required_message'         => $required_message,
+			'question_field_name_base' => $field_name_base,
 		)
 	);
 

templates/learning-area/quiz/questions/fill-in-the-blank.php

@@ -10,11 +10,10 @@
 
 defined( 'ABSPATH' ) || exit;
 
-global $tutor_is_started_quiz;
-
-$field_name     = '';
-$field_names    = array();
-$register_rules = '';
+$base_field_name = ( $question_field_name_base ?? '' ) . '[]';
+$field_name      = '';
+$field_names     = array();
+$register_rules  = '';
 if ( $answer_is_required ) {
 	$register_rules = ", { required: '" . esc_js( $required_message ) . "' }";
 }
@@ -32,17 +31,9 @@
 
 				$answer_title = preg_replace_callback(
 					'/{dash}/',
-					function () use ( &$input_index, $tutor_is_started_quiz, $question, $register_rules, &$field_name, &$field_names ) {
-
-						$attempt_id  = (int) $tutor_is_started_quiz->attempt_id;
-						$question_id = (int) $question['question_id'];
+					function () use ( &$input_index, $base_field_name, $register_rules, &$field_name, &$field_names ) {
 
-						$input_name = sprintf(
-							'attempt[%d][quiz_question][%d][][%d]',
-							$attempt_id,
-							$question_id,
-							$input_index
-						);
+						$input_name = sprintf( '%s[%d]', $base_field_name, $input_index );
 
 						$register_attr = "register('{$input_name}'{$register_rules})";
 						$input_html    = sprintf(

templates/learning-area/quiz/questions/image-answering.php

@@ -12,8 +12,6 @@
 
 use Tutor\Components\InputField;
 
-global $tutor_is_started_quiz;
-
 $field_name     = '';
 $register_rules = '';
 if ( $answer_is_required ) {
@@ -27,7 +25,7 @@
 		<div class="tutor-quiz-question-option">
 			<img src="<?php echo esc_url( wp_get_attachment_image_url( $answer['image_id'], 'full' ) ); ?>" alt="<?php echo esc_attr( $answer['answer_title'] ); ?>">
 			<?php
-			$input_name    = 'attempt[' . $tutor_is_started_quiz->attempt_id . '][quiz_question][' . $question['question_id'] . '][answer_id][' . $answer['answer_id'] . ']';
+			$input_name    = sprintf( '%s[answer_id][%d]', $question_field_name_base ?? '', (int) $answer['answer_id'] );
 			$rules_suffix  = $register_rules;
 			$register_attr = "register('{$input_name}'{$rules_suffix})";
 

templates/learning-area/quiz/questions/matching.php

@@ -15,13 +15,7 @@
 use Tutor\Components\Constants\Size;
 use Tutor\Components\Constants\Variant;
 
-global $tutor_is_started_quiz;
-
-$answer_field_name = sprintf(
-	'attempt[%d][quiz_question][%d][answers][]',
-	$tutor_is_started_quiz->attempt_id,
-	$question['question_id']
-);
+$answer_field_name = ( $question_field_name_base ?? '' ) . '[answers][]';
 $register_rules    = '';
 if ( $answer_is_required ) {
 	$register_rules = ", { validate: (value) => Array.isArray(value) && value.every((item) => item) || '" . esc_js( $required_message ) . "' }";

templates/learning-area/quiz/questions/multiple-choice.php

@@ -57,7 +57,8 @@
 $has_multiple_correct_answer = isset( $question['question_settings']['has_multiple_correct_answer'] ) && '1' === $question['question_settings']['has_multiple_correct_answer'];
 $radio_required_message      = __( 'Please select an option to answer', 'tutor' );
 $checkbox_required_message   = __( 'Please select at least one option to answer.', 'tutor' );
-$field_name                  = 'attempt[' . $tutor_is_started_quiz->attempt_id . '][quiz_question][' . $question['question_id'] . ']' . ( $has_multiple_correct_answer ? '[]' : '' );
+$field_name_base             = $question_field_name_base ?? '';
+$field_name                  = $field_name_base . ( $has_multiple_correct_answer ? '[]' : '' );
 $register_rules              = '';
 if ( $answer_is_required ) {
 	if ( $has_multiple_correct_answer ) {

templates/learning-area/quiz/questions/open-ended.php

@@ -13,16 +13,12 @@
 use Tutor\Components\InputField;
 use Tutor\Components\Constants\InputType;
 
-global $tutor_is_started_quiz;
-
 $question_type = $question['question_settings']['question_type'] ?? 'open_ended';
-$quiz_id       = $tutor_is_started_quiz->quiz_id ?? 0;
-
 $quiz_settings = $quiz_settings ?? array();
 $limit_key     = 'short_answer' === $question_type ? 'short_answer_characters_limit' : 'open_ended_answer_characters_limit';
 
 $characters_limit    = (int) ( $quiz_settings[ $limit_key ] ?? 0 );
-$field_name          = 'attempt[' . $tutor_is_started_quiz->attempt_id . '][quiz_question][' . $question['question_id'] . ']';
+$field_name          = $question_field_name_base ?? '';
 $register_rule_parts = array();
 if ( $answer_is_required ) {
 	$register_rule_parts[] = "required: '" . esc_js( $required_message ) . "'";

templates/learning-area/quiz/questions/ordering.php

@@ -12,13 +12,7 @@
 
 use TUTOR\Icon;
 
-global $tutor_is_started_quiz;
-
-$answer_field_name = sprintf(
-	'attempt[%d][quiz_question][%d][answers][]',
-	$tutor_is_started_quiz->attempt_id,
-	$question['question_id']
-);
+$answer_field_name = ( $question_field_name_base ?? '' ) . '[answers][]';
 $register_rules    = '';
 if ( $answer_is_required ) {
 	$register_rules = ", { validate: (value) => Array.isArray(value) && value.length > 0 || '" . esc_js( $required_message ) . "' }";

templates/learning-area/quiz/questions/true-false.php

@@ -15,7 +15,7 @@
 
 global $tutor_is_started_quiz;
 
-$field_name     = 'attempt[' . $tutor_is_started_quiz->attempt_id . '][quiz_question][' . $question['question_id'] . ']';
+$field_name     = $question_field_name_base ?? '';
 $register_rules = '';
 if ( $answer_is_required ) {
 	$register_rules = ", { required: '" . esc_js( $required_message ) . "' }";