Skip to content

Fix radar chart type missing #335

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Fix radar chart type missing #335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b782b33
New postgres minimum version in Travis.
Nov 18, 2020
2bf2f6b
Fix for student report print
rezeau Jan 19, 2021
faf4fdc
Revert commit wrongly committed to MOODLE_310_STABLE instead of new b…
rezeau Jan 19, 2021
c4437de
looks ok 01
rezeau Apr 11, 2021
19aa2d7
Suggested fix for missing radar chart type for feedback sections > 2
rezeau Apr 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: php

addons:
postgresql: "9.5"
postgresql: "9.6"

services:
- mysql
Expand Down
30 changes: 13 additions & 17 deletions classes/feedback_form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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');
Expand Down
4 changes: 1 addition & 3 deletions feedback.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down