Refactoring questionnaire class.

Author: mchurchward

classes/output/mobile.php

@@ -16,6 +16,7 @@
 
 namespace mod_questionnaire\output;
 
+use mod_questionnaire\questionnaire;
 use mod_questionnaire\responsetype\response\response;
 
 /**
@@ -35,7 +36,6 @@ class mobile {
      */
     public static function mobile_view_activity($args) {
         global $OUTPUT, $USER, $CFG, $DB;
-        require_once($CFG->dirroot . '/mod/questionnaire/questionnaire.class.php');
 
         $args = (object) $args;
 

classes/privacy/provider.php

@@ -16,6 +16,7 @@
 
 namespace mod_questionnaire\privacy;
 
+use mod_questionnaire\questionnaire;
 use core_privacy\local\metadata\collection;
 use core_privacy\local\request\contextlist;
 use core_privacy\local\request\userlist;
@@ -159,7 +160,6 @@ public static function get_users_in_context(userlist $userlist) {
      */
     public static function export_user_data(approved_contextlist $contextlist) {
         global $DB, $CFG;
-        require_once($CFG->dirroot . '/mod/questionnaire/questionnaire.class.php');
 
         if (empty($contextlist->count())) {
             return;
@@ -202,7 +202,7 @@ public static function export_user_data(approved_contextlist $contextlist) {
                 $lastcmid = $response->cmid;
                 $course = $DB->get_record("course", ["id" => $response->qcourse]);
                 $cm = get_coursemodule_from_instance("questionnaire", $response->qid, $course->id);
-                $questionnaire = new \questionnaire($course, $cm, $response->qid, null);
+                $questionnaire = new questionnaire($course, $cm, $response->qid, null);
             }
             $responsedata['responses'][] = [
                 'complete' => (($response->complete == 'y') ? get_string('yes') : get_string('no')),

classes/question/sectiontext.php

@@ -16,6 +16,7 @@
 
 namespace mod_questionnaire\question;
 
+use mod_questionnaire\questionnaire;
 use mod_questionnaire\feedback\section;
 
 /**
@@ -146,7 +147,6 @@ public function is_numbered() {
      */
     protected function question_survey_display($response, $descendantsdata, $blankquestionnaire = false) {
         global $DB, $CFG, $PAGE;
-        require_once($CFG->dirroot . '/mod/questionnaire/questionnaire.class.php');
 
         // If !isset then normal behavior as sectiontext question.
         if (!isset($response->questionnaireid)) {

questionnaire.class.php classes/questionnaire.phpquestionnaire.class.php renamed to classes/questionnaire.php

@@ -14,11 +14,16 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+namespace mod_questionnaire;
+
 use mod_questionnaire\feedback\section;
+use stdClass;
+use context_module;
+use html_writer;
 
 defined('MOODLE_INTERNAL') || die();
 
-require_once($CFG->dirroot.'/mod/questionnaire/locallib.php');
+require_once($CFG->dirroot . '/mod/questionnaire/locallib.php');
 
 #[\AllowDynamicProperties]
 /**
@@ -225,14 +230,14 @@ public function build_response_from_appdata(stdClass $appdata, $sec=0) {
                 $questions[$questionid] = $this->questions[$questionid];
             }
         }
-        return mod_questionnaire\responsetype\response\response::response_from_appdata($this->id, 0, $appdata, $questions);
+        return responsetype\response\response::response_from_appdata($this->id, 0, $appdata, $questions);
     }
 
     /**
      * Add the renderer to the questionnaire object.
      * @param plugin_renderer_base $renderer The module renderer, extended from core renderer.
      */
-    public function add_renderer(plugin_renderer_base $renderer) {
+    public function add_renderer(\plugin_renderer_base $renderer) {
         $this->renderer = $renderer;
     }
 
@@ -297,7 +302,7 @@ public function view() {
                 $this->update_grades($quser);
 
                 // Update completion state.
-                $completion = new completion_info($this->course);
+                $completion = new \completion_info($this->course);
                 if ($completion->is_enabled($this->cm) && $this->completionsubmit) {
                     $completion->update_state($this->cm, COMPLETION_COMPLETE);
                 }
@@ -1431,7 +1436,7 @@ private function print_survey_start($message, $section, $numsections, $hasrequir
                 // Disable the pdf function for now, until it looks a lot better.
                 if (false) {
                     $linkname = get_string('downloadpdf', 'mod_questionnaire');
-                    $link = new moodle_url('/mod/questionnaire/report.php',
+                    $link = new \moodle_url('/mod/questionnaire/report.php',
                         [
                             'action' => 'vresp',
                             'instance' => $this->id,
@@ -1440,18 +1445,18 @@ private function print_survey_start($message, $section, $numsections, $hasrequir
                             'rid' => $rid
                         ]
                     );
-                    $downpdficon = new pix_icon('b/pdfdown', $linkname, 'mod_questionnaire');
+                    $downpdficon = new \pix_icon('b/pdfdown', $linkname, 'mod_questionnaire');
                     $respinfo .= $this->renderer->action_link($link, null, null, null, $downpdficon);
                 }
 
                 $linkname = get_string('print', 'mod_questionnaire');
                 $link = new \moodle_url('/mod/questionnaire/report.php',
                     ['action' => 'vresp', 'instance' => $this->id, 'target' => 'print', 'individualresponse' => 1, 'rid' => $rid]);
-                $htmlicon = new pix_icon('t/print', $linkname);
+                $htmlicon = new \pix_icon('t/print', $linkname);
                 $options = ['menubar' => true, 'location' => false, 'scrollbars' => true, 'resizable' => true,
                     'height' => 600, 'width' => 800, 'title' => $linkname];
                 $name = 'popup';
-                $action = new popup_action('click', $link, $name, $options);
+                $action = new \popup_action('click', $link, $name, $options);
                 $respinfo .= $this->renderer->action_link($link, null, $action, ['title' => $linkname], $htmlicon) . '&nbsp;';
             }
             $respinfo .= get_string('respondent', 'questionnaire').': <strong>'.$ruser.'</strong>';
@@ -1482,12 +1487,12 @@ private function print_survey_start($message, $section, $numsections, $hasrequir
             $options = array('menubar' => true, 'location' => false, 'scrollbars' => true, 'resizable' => true,
                 'height' => 600, 'width' => 800, 'title' => $title);
             $name = 'popup';
-            $link = new moodle_url($url);
-            $action = new popup_action('click', $link, $name, $options);
+            $link = new \moodle_url($url);
+            $action = new \popup_action('click', $link, $name, $options);
             $class = "floatprinticon";
             $this->page->add_to_page('printblank',
                 $this->renderer->action_link($link, $linkname, $action, array('class' => $class, 'title' => $title),
-                    new pix_icon('t/print', $title)));
+                    new \pix_icon('t/print', $title)));
         }
         if ($section == 1) {
             if (!empty($this->survey->title)) {
@@ -2536,11 +2541,11 @@ private function response_goto_thankyou() {
             $currentgroupid = 0;
         }
         if ($this->capabilities->readownresponses) {
-            $url = new moodle_url('myreport.php', ['id' => $this->cm->id, 'instance' => $this->cm->instance, 'user' => $USER->id,
+            $url = new \moodle_url('myreport.php', ['id' => $this->cm->id, 'instance' => $this->cm->instance, 'user' => $USER->id,
                 'byresponse' => 0, 'action' => 'vresp']);
             $this->page->add_to_page('continue', $this->renderer->single_button($url, get_string('continue')));
         } else {
-            $url = new moodle_url('/course/view.php', ['id' => $this->course->id]);
+            $url = new \moodle_url('/course/view.php', ['id' => $this->course->id]);
             $this->page->add_to_page('continue', $this->renderer->single_button($url, get_string('continue')));
         }
         return;
@@ -2684,10 +2689,10 @@ public function survey_results_navbar_alpha($currrid, $currentgroupid, $cm, $byr
             $options = array('menubar' => true, 'location' => false, 'scrollbars' => true,
                 'resizable' => true, 'height' => 600, 'width' => 800);
             $name = 'popup';
-            $link = new moodle_url($url);
-            $action = new popup_action('click', $link, $name, $options);
+            $link = new \moodle_url($url);
+            $action = new \popup_action('click', $link, $name, $options);
             $actionlink = $this->renderer->action_link($link, $linkname, $action, ['title' => $title],
-                new pix_icon('t/print', $title));
+                new \pix_icon('t/print', $title));
             $navbar->printaction = $actionlink;
             $this->page->add_to_page('navigationbar', $this->renderer->navigationbar($navbar));
 
@@ -3350,7 +3355,7 @@ public function generate_csv($currentgroupid, $rid='', $userid='', $choicecodes=
             if (in_array($type, $choicetypes)) {
                 /* single or multiple or rate */
                 if (!isset($choicesbyqid[$qid])) {
-                    throw new coding_exception('Choice question has no choices!', 'question id '.$qid.' of type '.$type);
+                    throw new \coding_exception('Choice question has no choices!', 'question id '.$qid.' of type '.$type);
                 }
                 $choices = $choicesbyqid[$qid];
 
@@ -3768,7 +3773,7 @@ public function response_analysis($rid, $resps, $compare, $isgroupmember, $allre
             }
         }
         if ($this->survey->feedbackscores) {
-            $table = new html_table();
+            $table = new \html_table();
             $table->size = [null, null];
             $table->align = ['left', 'right', 'right'];
             $table->head = [];
@@ -3906,7 +3911,7 @@ public function response_analysis($rid, $resps, $compare, $isgroupmember, $allre
                 $oppositeallscore = ' | '.$allscore[1].'%';
             }
             if ($this->survey->feedbackscores) {
-                $table = $table ?? new html_table();
+                $table = $table ?? new \html_table();
                 if ($compare) {
                     $table->data[] = array($sectionlabel, $score[0].'%'.$oppositescore, $allscore[0].'%'.$oppositeallscore);
                 } else {
@@ -4050,11 +4055,11 @@ public function response_analysis($rid, $resps, $compare, $isgroupmember, $allre
                     }
                     // 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 = $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 = $table ?? new \html_table();
                         $table->data[] = array($sectionlabel, $allscorepercent[$key] . '%' . $oppositeallscore);
                     }
                 }

complete.php

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+use mod_questionnaire\questionnaire;
+
 /**
  * This page prints a particular instance of questionnaire.
  *
@@ -25,7 +27,6 @@
  */
 require_once("../../config.php");
 require_once($CFG->libdir . '/completionlib.php');
-require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php');
 
 if (!isset($SESSION->questionnaire)) {
     $SESSION->questionnaire = new stdClass();

externallib.php

@@ -38,7 +38,6 @@
 use external_warnings;
 
 require_once($CFG->dirroot . '/mod/questionnaire/lib.php');
-require_once($CFG->dirroot . '/mod/questionnaire/questionnaire.class.php');
 
 /**
  * Questionnaire module external functions

fbsections.php

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+ use mod_questionnaire\questionnaire;
+
 /**
  * Manage feedback sections.
  *
@@ -24,7 +26,6 @@
  */
 
 require_once("../../config.php");
-require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php');
 
 $id = required_param('id', PARAM_INT);    // Course module ID.
 $section = optional_param('section', 1, PARAM_INT);

feedback.php

@@ -16,6 +16,8 @@
 
 // This page prints a particular instance of questionnaire.
 
+use mod_questionnaire\questionnaire;
+
 /**
  * Manage feedback settings.
  *
@@ -26,7 +28,6 @@
  */
 
 require_once("../../config.php");
-require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php');
 
 $id = required_param('id', PARAM_INT);    // Course module ID.
 $currentgroupid = optional_param('group', 0, PARAM_INT); // Groupid.

grade.php

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+use mod_questionnaire\questionnaire;
+
 /**
  * Redirects the user to either a questionnaire or to the questionnaire report
  *
@@ -26,7 +28,6 @@
  * Require config.php
  */
 require_once("../../config.php");
-require_once($CFG->dirroot . '/mod/questionnaire/questionnaire.class.php');
 
 $id = required_param('id', PARAM_INT);
 $cm = get_coursemodule_from_id('questionnaire', $id, 0, false, MUST_EXIST);

lib.php

@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+use mod_questionnaire\questionnaire;
+
 /**
  * Library of functions and constants for module questionnaire.
  * @package mod_questionnaire
@@ -89,7 +91,6 @@ function questionnaire_add_instance($questionnaire) {
     // will create a new instance and return the id number
     // of the new instance.
     global $DB, $CFG;
-    require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php');
     require_once($CFG->dirroot.'/mod/questionnaire/locallib.php');
 
     $copyfiles = false;
@@ -588,8 +589,6 @@ function questionnaire_extend_settings_navigation(settings_navigation $settings,
     $rid = optional_param('rid', false, PARAM_INT); // Response id.
     $currentgroupid = optional_param('group', 0, PARAM_INT); // Group id.
 
-    require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php');
-
     $cm = $settings->get_page()->cm;
     $context = $cm->context;
     $cmid = $cm->id;
@@ -823,7 +822,6 @@ function questionnaire_get_recent_mod_activity(&$activities, &$index, $timestart
 
     global $CFG, $COURSE, $USER, $DB;
     require_once($CFG->dirroot . '/mod/questionnaire/locallib.php');
-    require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php');
 
     if ($COURSE->id == $courseid) {
         $course = $COURSE;