Merge pull request #2897 from themeum/image-answering-result

Automatic result calculation for Image answering type quiz

Author: shewa12

classes/Quiz.php

@@ -561,7 +561,7 @@ public function start_the_quiz() {
 	 *
 	 * @return int inserted id|0
 	 */
-	public static function quiz_attempt( int $course_id, int $quiz_id, int $user_id, $attempt_status = 'attempt_started' ) {
+	public static function quiz_attempt( int $course_id, int $quiz_id, int $user_id, $attempt_status = QuizModel::ATTEMPT_STARTED ) {
 		global $wpdb;
 
 		if ( ! $course_id ) {
@@ -899,42 +899,32 @@ function ( $ans ) {
 							$is_answer_was_correct = true;
 						}
 					} elseif ( QuizModel::QUESTION_TYPE_IMAGE_ANSWERING === $question_type ) {
-						$image_inputs          = tutor_utils()->avalue_dot( 'answer_id', $answers );
-						$image_inputs          = (array) array_map( 'sanitize_text_field', $image_inputs );
-						$given_answer          = maybe_serialize( $image_inputs );
-						$is_answer_was_correct = false;
-						/**
-						 * For the image_answering question type result
-						 * remain pending in spite of correct answer & required
-						 * review of admin/instructor. Since it's
-						 * pending we need to mark it as incorrect. Otherwise if
-						 * mark it correct then earned mark will be updated. then
-						 * again when instructor/admin review & mark it as correct
-						 * extra mark is adding. In this case, student
-						 * getting double mark for the same question.
-						 *
-						 * For now code is commenting will be removed later on
-						 *
-						 * @since 2.1.5
-						 */
+						$image_inputs = tutor_utils()->avalue_dot( 'answer_id', $answers );
+						$image_inputs = (array) array_map( 'sanitize_text_field', $image_inputs );
+						$given_answer = maybe_serialize( $image_inputs );
+
+						$stored_answers = $wpdb->get_results(
+							$wpdb->prepare(
+								"SELECT answer_id, answer_title
+								FROM {$wpdb->prefix}tutor_quiz_question_answers
+								WHERE belongs_question_id = %d
+									AND belongs_question_type = %s
+								ORDER BY answer_order ASC",
+								$question_id,
+								QuizModel::QUESTION_TYPE_IMAGE_ANSWERING
+							)
+						);
 
-						//phpcs:disable
-
-						// $db_answer = $wpdb->get_col(
-						// 	$wpdb->prepare(
-						// 		"SELECT answer_title
-						// 			FROM {$wpdb->prefix}tutor_quiz_question_answers
-						// 			WHERE belongs_question_id = %d
-						// 				AND belongs_question_type = 'image_answering'
-						// 			ORDER BY answer_order asc ;",
-						// 		$question_id
-						// 	)
-						// );
-
-						// if ( is_array( $db_answer ) && count( $db_answer ) ) {
-						// 	$is_answer_was_correct = ( strtolower( maybe_serialize( array_values( $image_inputs ) ) ) == strtolower( maybe_serialize( $db_answer ) ) );
-						// }
-						//phpcs:enable
+						$is_answer_was_correct = true;
+						foreach ( $stored_answers as $stored_answer ) {
+							$user_answer    = isset( $image_inputs[ $stored_answer->answer_id ] ) ? trim( wp_unslash( $image_inputs[ $stored_answer->answer_id ] ) ) : '';
+							$correct_answer = trim( wp_unslash( $stored_answer->answer_title ) );
+
+							if ( 0 !== strcasecmp( $user_answer, $correct_answer ) ) {
+								$is_answer_was_correct = false;
+								break;
+							}
+						}
 					} else {
 						$custom_answer_data    = array(
 							'given_answer'          => $given_answer,
@@ -982,12 +972,12 @@ function ( $ans ) {
 			$attempt_info = array(
 				'total_answered_questions' => tutor_utils()->count( $quiz_answers ),
 				'earned_marks'             => $total_marks,
-				'attempt_status'           => 'attempt_ended',
+				'attempt_status'           => QuizModel::ATTEMPT_ENDED,
 				'attempt_ended_at'         => date( 'Y-m-d H:i:s', tutor_time() ), //phpcs:ignore
 			);
 
 			if ( $review_required ) {
-				$attempt_info['attempt_status'] = 'review_required';
+				$attempt_info['attempt_status'] = QuizModel::REVIEW_REQUIRED;
 			}
 
 			$wpdb->update( $wpdb->tutor_quiz_attempts, $attempt_info, array( 'attempt_id' => $attempt_id ) );
@@ -1028,7 +1018,7 @@ public function finishing_quiz_attempt() {
 		$attempt_info = array(
 			'total_answered_questions' => 0,
 			'earned_marks'             => 0,
-			'attempt_status'           => 'attempt_ended',
+			'attempt_status'           => QuizModel::ATTEMPT_ENDED,
 			'attempt_ended_at'         => date( 'Y-m-d H:i:s', tutor_time() ), //phpcs:ignore
 		);
 
@@ -1082,7 +1072,7 @@ public function tutor_quiz_timeout() {
 			$attempt_id = $attempt->attempt_id;
 
 			$data = array(
-				'attempt_status'   => 'attempt_timeout',
+				'attempt_status'   => QuizModel::ATTEMPT_TIMEOUT,
 				'total_marks'      => self::get_quiz_total_marks( $quiz_id ),
 				'earned_marks'     => 0,
 				'attempt_ended_at' => gmdate( 'Y-m-d H:i:s', tutor_time() ),
@@ -1398,7 +1388,7 @@ private function apply_quiz_answer_review( int $attempt_id, $attempt_answer, str
 			}
 
 			if ( 'open_ended' === $question->question_type || 'short_answer' === $question->question_type ) {
-				$attempt_update_data['attempt_status'] = 'attempt_ended';
+				$attempt_update_data['attempt_status'] = QuizModel::ATTEMPT_ENDED;
 			}
 
 			if ( ! empty( $attempt_update_data ) ) {
@@ -1422,7 +1412,7 @@ private function apply_quiz_answer_review( int $attempt_id, $attempt_answer, str
 			}
 
 			if ( 'open_ended' === $question->question_type || 'short_answer' === $question->question_type ) {
-				$attempt_update_data['attempt_status'] = 'attempt_ended';
+				$attempt_update_data['attempt_status'] = QuizModel::ATTEMPT_ENDED;
 			}
 
 			if ( ! empty( $attempt_update_data ) ) {

models/QuizModel.php

@@ -196,7 +196,6 @@ public static function get_manual_review_types() {
 		return array(
 			self::QUESTION_TYPE_OPEN_ENDED,
 			self::QUESTION_TYPE_SHORT_ANSWER,
-			self::QUESTION_TYPE_IMAGE_ANSWERING,
 		);
 	}