From b782b33cf090239080aa5397222222c232a7bf5b Mon Sep 17 00:00:00 2001 From: Mike Churchward Date: Wed, 18 Nov 2020 14:44:12 -0500 Subject: [PATCH 1/5] New postgres minimum version in Travis. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index bd649c2f..921a81b7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: php addons: - postgresql: "9.5" + postgresql: "9.6" services: - mysql From 2bf2f6bc6656092bfbd92767043226aa11d2b91f Mon Sep 17 00:00:00 2001 From: rezeau Date: Tue, 19 Jan 2021 15:00:41 +0100 Subject: [PATCH 2/5] Fix for student report print Signed-off-by: rezeau --- report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report.php b/report.php index cb413ca0..57cdf00c 100755 --- a/report.php +++ b/report.php @@ -78,7 +78,7 @@ // If you can't view the questionnaire, or can't view a specified response, error out. $context = context_module::instance($cm->id); -if (!$questionnaire->can_view_all_responses()) { +if (!$questionnaire->can_view_all_responses() && !$individualresponse) { // Should never happen, unless called directly by a snoop... print_error('nopermissions', 'moodle', $CFG->wwwroot.'/mod/questionnaire/view.php?id='.$cm->id, get_string('viewallresponses', 'mod_questionnaire')); From faf4fdcdddb436240dc959af685ce4698ff650b7 Mon Sep 17 00:00:00 2001 From: rezeau Date: Tue, 19 Jan 2021 15:21:24 +0100 Subject: [PATCH 3/5] Revert commit wrongly committed to MOODLE_310_STABLE instead of new branch! Signed-off-by: rezeau --- report.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/report.php b/report.php index 57cdf00c..cb413ca0 100755 --- a/report.php +++ b/report.php @@ -78,7 +78,7 @@ // If you can't view the questionnaire, or can't view a specified response, error out. $context = context_module::instance($cm->id); -if (!$questionnaire->can_view_all_responses() && !$individualresponse) { +if (!$questionnaire->can_view_all_responses()) { // Should never happen, unless called directly by a snoop... print_error('nopermissions', 'moodle', $CFG->wwwroot.'/mod/questionnaire/view.php?id='.$cm->id, get_string('viewallresponses', 'mod_questionnaire')); From c4437de3d222a57ba65535a8126f503f28da8135 Mon Sep 17 00:00:00 2001 From: rezeau Date: Sun, 11 Apr 2021 16:24:44 +0200 Subject: [PATCH 4/5] looks ok 01 Signed-off-by: rezeau --- classes/feedback_form.php | 30 +++++++++++++----------------- feedback.php | 4 +--- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/classes/feedback_form.php b/classes/feedback_form.php index 4ce52137..3e6b1d06 100644 --- a/classes/feedback_form.php +++ b/classes/feedback_form.php @@ -34,7 +34,14 @@ class feedback_form extends \moodleform { public function definition() { global $questionnaire; - + // We need to get the number of current feedbacksections to allow the radar chart type or not. + global $DB; + $sid = $questionnaire->survey->id; + $sql = 'SELECT COUNT(*) ' . + 'FROM {questionnaire_fb_sections} ' . + 'WHERE surveyid = '.$sid; + $numfeedbacksections = $DB->count_records_sql($sql, [$sid]); + $mform =& $this->_form; // Questionnaire Feedback Sections and Messages. @@ -71,29 +78,18 @@ public function definition() { 'bipolar' => get_string('chart:bipolar', 'questionnaire'), 'hbar' => get_string('chart:hbar', 'questionnaire'), 'rose' => get_string('chart:rose', 'questionnaire')]; - $chartgroup[] = $mform->createElement('select', 'chart_type_two_sections', - get_string('chart:type', 'questionnaire') . ' (' . - get_string('feedbackbysection', 'questionnaire') . ')', $charttypes); - if ($questionnaire->survey->feedbacksections > 1) { - $mform->setDefault('chart_type_two_sections', $questionnaire->survey->chart_type); + // The radar charttype is only available if there are at least 3 feedback sections. + if ($numfeedbacksections > 2) { + $charttypes['radar'] = get_string('chart:radar', 'questionnaire'); } - $mform->disabledIf('chart_type_two_sections', 'feedbacksections', 'neq', 2); - - $charttypes = [null => get_string('none'), - 'bipolar' => get_string('chart:bipolar', 'questionnaire'), - 'hbar' => get_string('chart:hbar', 'questionnaire'), - 'radar' => get_string('chart:radar', 'questionnaire'), - 'rose' => get_string('chart:rose', 'questionnaire')]; $chartgroup[] = $mform->createElement('select', 'chart_type_sections', get_string('chart:type', 'questionnaire') . ' (' . get_string('feedbackbysection', 'questionnaire') . ')', $charttypes); if ($questionnaire->survey->feedbacksections > 1) { $mform->setDefault('chart_type_sections', $questionnaire->survey->chart_type); } - $mform->disabledIf('chart_type_sections', 'feedbacksections', 'eq', 0); - $mform->disabledIf('chart_type_sections', 'feedbacksections', 'eq', 1); - $mform->disabledIf('chart_type_sections', 'feedbacksections', 'eq', 2); - + $mform->disabledIf('chart_type_sections', 'feedbacksections', 'neq', 2); + $mform->addGroup($chartgroup, 'chartgroup', get_string('chart:type', 'questionnaire'), null, false); $mform->addHelpButton('chartgroup', 'chart:type', 'questionnaire'); diff --git a/feedback.php b/feedback.php index dccc0ef5..0fc0ab93 100644 --- a/feedback.php +++ b/feedback.php @@ -115,9 +115,7 @@ if ($settings->feedbacksections == 1) { $sdata->chart_type = $settings->chart_type_global; } else if ($settings->feedbacksections == 2) { - $sdata->chart_type = $settings->chart_type_two_sections; - } else if ($settings->feedbacksections > 2) { - $sdata->chart_type = $settings->chart_type_sections; + $sdata->chart_type = $settings->chart_type_sections; } } } else { From 19aa2d78b10d99c1fec1172cf05a27bc2564bfda Mon Sep 17 00:00:00 2001 From: rezeau Date: Sun, 11 Apr 2021 16:37:50 +0200 Subject: [PATCH 5/5] Suggested fix for missing radar chart type for feedback sections > 2 Signed-off-by: rezeau