Ghi456 311 (PoetOS#464) fix for PH8 feedback issue

* GHI456 Allow saving back to no feedback. * GHI456 Don't try and display missing feedback. * GHI456 Ensuring $table is always set.
jcorel · Feb 28, 2023 · 857f482 · 857f482
1 parent ffb0046
commit 857f482
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/classes/feedback_form.php b/classes/feedback_form.php
@@ -40,9 +40,9 @@ public function definition() {
         $mform =& $this->_form;
 
         // Questionnaire Feedback Sections and Messages.
+        $mform->addElement('header', 'submithdr', get_string('feedbackoptions', 'questionnaire'));
         $feedbackoptions = [];
         $feedbackoptions[0] = get_string('feedbacknone', 'questionnaire');
-        $mform->addElement('header', 'submithdr', get_string('feedbackoptions', 'questionnaire'));
         $feedbackoptions[1] = get_string('feedbackglobal', 'questionnaire');
         $feedbackoptions[2] = get_string('feedbacksections', 'questionnaire');
 

diff --git a/feedback.php b/feedback.php
@@ -91,7 +91,7 @@
 }
 
 if ($settings = $feedbackform->get_data()) {
-    if (isset($settings->feedbacksettingsbutton1) || isset($settings->buttongroup)) {
+    if (isset($settings->feedbacksettingsbutton1) || isset($settings->feedbacksettingsbutton2) || isset($settings->buttongroup)) {
         if (isset ($settings->feedbackscores)) {
             $sdata->feedbackscores = $settings->feedbackscores;
         } else {

diff --git a/questionnaire.class.php b/questionnaire.class.php
@@ -3848,6 +3848,7 @@ public function response_analysis($rid, $resps, $compare, $isgroupmember, $allre
                 $oppositeallscore = ' | '.$allscore[1].'%';
             }
             if ($this->survey->feedbackscores) {
+                $table = $table ?? new html_table();
                 if ($compare) {
                     $table->data[] = array($sectionlabel, $score[0].'%'.$oppositescore, $allscore[0].'%'.$oppositeallscore);
                 } else {
@@ -3976,24 +3977,28 @@ public function response_analysis($rid, $resps, $compare, $isgroupmember, $allre
             default:
         }
 
-        foreach ($allscore as $key => $sc) {
-            if (isset($chartlabels[$key])) {
-                $lb = explode("|", $chartlabels[$key]);
-                $oppositescore = '';
-                $oppositeallscore = '';
-                if (count($lb) > 1) {
-                    $sectionlabel = $lb[0] . ' | ' . $lb[1];
-                    $oppositescore = ' | ' . $oppositescorepercent[$key] . '%';
-                    $oppositeallscore = ' | ' . $alloppositescorepercent[$key] . '%';
-                } else {
-                    $sectionlabel = $chartlabels[$key];
-                }
-                // If all questions of $section are unseen then don't show feedbackscores for this section.
-                if ($compare && !is_nan($scorepercent[$key])) {
-                    $table->data[] = array($sectionlabel, $scorepercent[$key] . '%' . $oppositescore,
-                        $allscorepercent[$key] . '%' . $oppositeallscore);
-                } else if (isset($allscorepercent[$key]) && !is_nan($allscorepercent[$key])) {
-                    $table->data[] = array($sectionlabel, $allscorepercent[$key] . '%' . $oppositeallscore);
+        if ($this->survey->feedbackscores) {
+            foreach ($allscore as $key => $sc) {
+                if (isset($chartlabels[$key])) {
+                    $lb = explode("|", $chartlabels[$key]);
+                    $oppositescore = '';
+                    $oppositeallscore = '';
+                    if (count($lb) > 1) {
+                        $sectionlabel = $lb[0] . ' | ' . $lb[1];
+                        $oppositescore = ' | ' . $oppositescorepercent[$key] . '%';
+                        $oppositeallscore = ' | ' . $alloppositescorepercent[$key] . '%';
+                    } else {
+                        $sectionlabel = $chartlabels[$key];
+                    }
+                    // If all questions of $section are unseen then don't show feedbackscores for this section.
+                    if ($compare && !is_nan($scorepercent[$key])) {
+                        $table = $table ?? new html_table();
+                        $table->data[] = array($sectionlabel, $scorepercent[$key] . '%' . $oppositescore,
+                            $allscorepercent[$key] . '%' . $oppositeallscore);
+                    } else if (isset($allscorepercent[$key]) && !is_nan($allscorepercent[$key])) {
+                        $table = $table ?? new html_table();
+                        $table->data[] = array($sectionlabel, $allscorepercent[$key] . '%' . $oppositeallscore);
+                    }
                 }
             }
         }