WIP10

Author: mchurchward

preview.php

@@ -24,7 +24,7 @@
  */
 
 require_once("../../config.php");
-require_once($CFG->dirroot.'/mod/questionnaire/questionnaire.class.php');
+require_once($CFG->dirroot . '/mod/questionnaire/questionnaire.class.php');
 
 $id = optional_param('id', 0, PARAM_INT);
 $sid = optional_param('sid', 0, PARAM_INT);
@@ -37,15 +37,15 @@
         throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire');
     }
 
-    if (! $course = $DB->get_record("course", array("id" => $cm->course))) {
+    if (! $course = $DB->get_record("course", ["id" => $cm->course])) {
         throw new \moodle_exception('coursemisconf', 'mod_questionnaire');
     }
 
-    if (! $questionnaire = $DB->get_record("questionnaire", array("id" => $cm->instance))) {
+    if (!$questionnaire = $DB->get_record("questionnaire", ["id" => $cm->instance])) {
         throw new \moodle_exception('invalidcoursemodule', 'mod_questionnaire');
     }
 } else {
-    if (! $survey = $DB->get_record("questionnaire_survey", array("id" => $sid))) {
+    if (!$survey = $DB->get_record("questionnaire_survey", ["id" => $sid])) {
         throw new \moodle_exception('surveynotexists', 'mod_questionnaire');
     }
     if (! $course = $DB->get_record("course", ["id" => $survey->courseid])) {
@@ -134,19 +134,33 @@
 if ($questionnaire->capabilities->printblank) {
     // Open print friendly as popup window.
 
-    $linkname = ' '.get_string('printblank', 'questionnaire');
+    $linkname = ' ' . get_string('printblank', 'questionnaire');
     $title = get_string('printblanktooltip', 'questionnaire');
-    $url = '/mod/questionnaire/print.php?qid='.$questionnaire->id.'&rid=0&'.'courseid='.
-            $questionnaire->course->id.'&sec=1';
-    $options = array('menubar' => true, 'location' => false, 'scrollbars' => true, 'resizable' => true,
-                    'height' => 600, 'width' => 800, 'title' => $title);
+    $url = '/mod/questionnaire/print.php?qid=' . $questionnaire->id . '&rid=0&' . 'courseid=' .
+            $questionnaire->course->id . '&sec=1';
+    $options = [
+        '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);
     $class = "floatprinticon";
-    $questionnaire->page->add_to_page('printblank',
-        $questionnaire->renderer->action_link($link, $linkname, $action, array('class' => $class, 'title' => $title),
-            new pix_icon('t/print', $title)));
+    $questionnaire->page->add_to_page(
+        'printblank',
+        $questionnaire->renderer->action_link(
+            $link,
+            $linkname,
+            $action,
+            ['class' => $class, 'title' => $title],
+            new pix_icon('t/print', $title)
+        )
+    );
 }
 $questionnaire->survey_print_render($course->id, '', 'preview', $rid = 0, $popup);
 if ($popup) {
@@ -159,9 +173,9 @@
 $context = context_module::instance($questionnaire->cm->id);
 $anonymous = $questionnaire->respondenttype == 'anonymous';
 
-$event = \mod_questionnaire\event\questionnaire_previewed::create(array(
-                'objectid' => $questionnaire->id,
-                'anonymous' => $anonymous,
-                'context' => $context
-));
+$event = \mod_questionnaire\event\questionnaire_previewed::create([
+    'objectid' => $questionnaire->id,
+    'anonymous' => $anonymous,
+    'context' => $context,
+]);
 $event->trigger();

styles.css

@@ -645,7 +645,7 @@ td.selected {
     #page-mod-questionnaire-print input[type="range"] {
         appearance: none;
         width: 100%;
-        border: 1px solid #000000;
+        border: 1px solid #000;
         border-radius: 5px;
     }
 }

tabs.php

@@ -148,7 +148,8 @@
         $CFG->wwwroot . htmlspecialchars('/mod/questionnaire/report.php?' . $argstr . '&action=vall'),
         get_string('viewallresponses', 'questionnaire')
     );
-    if (in_array(
+    if (
+        in_array(
             $currenttab,
             [
                 'vall',
@@ -161,7 +162,7 @@
                 'vrespsummary',
                 'individualresp',
                 'printresp',
-                'deleteresp'
+                'deleteresp',
             ]
         )
     ) {

tests/behat/behat_mod_questionnaire.php

@@ -163,7 +163,7 @@ public function i_add_a_question_and_i_fill_the_form_with($questiontype, TableNo
             $fielddata = new TableNode($rows);
         }
 
-        $this->execute('behat_forms::i_set_the_field_to', array('id_type_id', $questiontype));
+        $this->execute('behat_forms::i_set_the_field_to', ['id_type_id', $questiontype]);
         $this->execute('behat_forms::press_button', 'Add selected question type');
         if (isset($hashrows['id_dependquestions_and_1'])) {
             $this->execute('behat_forms::press_button', 'id_adddependencies_and');
@@ -465,7 +465,7 @@ private function add_response_data($qid, $sid) {
         $this->add_data(
             $respmultiple,
             'questionnaire_resp_multiple',
-             '',
+            '',
             ['responsemap' => 'response_id', 'questionmap' => 'question_id', 'choicemap' => 'choice_id']
         );