Questionnaire: All branching shown in View your response (fixing code review)

Author: toanlamt

questionnaire.class.php

@@ -423,7 +423,8 @@ public function view_response($rid, $referer= '', $resps = '', $compare = false,
         }
         $pdf = ($outputtarget == 'pdf') ? true : false;
         foreach ($this->questions as $question) {
-            if (self::is_dependent_on_choices($question, $this->responses[$rid]->answers)) {
+            // Only show eligible questions in the response.
+            if (!$question->dependency_fulfilled($rid, $this->questions)) {
                 continue;
             }
             if ($question->type_id < QUESPAGEBREAK) {
@@ -4192,26 +4193,4 @@ public static function get_user_identity_fields($context, $userid) {
         $row = $DB->get_record_sql($sql, array_merge($params, [$userid]));
         return $row;
     }
-
-    /**
-     * Determines if a question is dependent on another question's choice.
-     *
-     * Checks if the provided question has dependencies on other questions
-     * and if any required answer choices have not been selected.
-     *
-     * @param object $question The question object containing dependencies
-     * @param array $answers   An associative array of answers with question IDs as keys
-     *
-     * @return bool True if the question has an unmet dependency; otherwise, false
-     */
-    public static function is_dependent_on_choices(object $question, array $answers): bool {
-        if (!empty($question->dependencies)) {
-            foreach ($question->dependencies as $dependency) {
-                if (empty($answers[$dependency->dependquestionid][$dependency->dependchoiceid])) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
 }