Changeset 2596179

Timestamp:

09/09/2021 12:07:46 PM (4 years ago)

Author:

sergmoro1

Message:

Fixed answers that are not set

File:

• lisette-cost-calculator/trunk/LisetteCCApplication.php (modified) (1 diff)

lisette-cost-calculator/trunk/LisetteCCApplication.php

@@ -119 +119 @@
         if(!isset($level['items']))
             return '';
-        $key = $this->keys[$i];
-        $value = $this->values[$i];
         $out = '<ul>';
         $j = $i;
         while($j < count($this->keys)) {
-            $choice = $level['items'][$this->keys[$j]];
-            // question: answer
-            if($choice['question'])
-                $out .= '<li>'. 
-                    $choice['question'] . ': ' .
-                    $choice['answers'][$this->values[$j]]['caption'] .
-                '</li>';
-            // calculate sum and keep coefficient
-            $v = $choice['answers'][$this->values[$j]]['value'];
-            if(substr($v, 0, 1) == '*')
-                $this->coeff *= substr($v, 1);
-            else
-                $this->sum += $v;
-            // if next level of questionnaire exists then keep make output
-            if(isset($level['items'])) {
-                $out .= $this->answer($j, $level['items'][$this->keys[$j]]['answers'][$this->values[$j]]);
+            $key = $this->keys[$j];
+            $value = $this->values[$j];
+
+            if (isset($level['items'][$key])) {
+                $choice = $level['items'][$key];
+                // question: answer
+                if (isset($choice['question']) && $choice['question']) {
+                    $out .= '<li>' .
+                        $choice['question'] . ': ' .
+                        $choice['answers'][$value]['caption'] .
+                        '</li>';
+                }
+                // calculate sum and keep coefficient
+                $v = isset($choice['answers'][$value]['value'])
+                    ? $choice['answers'][$value]['value'] : '';
+                if (substr($v, 0, 1) === '*')
+                    $this->coeff *= (int)substr($v, 1);
+                else
+                    $this->sum += (int)$v;
+                // if next level of questionnaire exists then keep make output
+                if (isset($level['items']) && isset($level['items'][$key]['answers'][$value])) {
+                    $out .= $this->answer($j, $level['items'][$key]['answers'][$value]);
+                }
             }
             $j++;