Skip to content

New attempt at restoring the radar chart_type to questionnaire feedback #490

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 9 commits into from
Closed

New attempt at restoring the radar chart_type to questionnaire feedback #490

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fbb842e
Resized the monologo.svg and png to 24x24 px (#477)
FelixDiLenarda May 16, 2023
458cedc
Fixing issues from plugins database checks (#483)
mchurchward May 16, 2023
81ad1e1
New attempt at restoring the radar chart_type to questionnaire feedback
rezeau Jun 23, 2023
5c480fb
Questionnaire: More meaningful error than nopermissions (#488)
emanoylov Jul 4, 2023
d02ed3e
Revision 01 of PR #490
rezeau Jul 6, 2023
6abfcff
Merge branch 'PoetOS:MOODLE_400_STABLE' into restore_radar_charttype_…
rezeau Aug 11, 2023
fdd4e40
fixed module.js (for MOODLE_STABLE_401)
rezeau Sep 25, 2023
e017ed1
Merge branch 'MOODLE_401_STABLE' into restore_radar_charttype_june_2023
rezeau Sep 25, 2023
2f49bee
rebased to to MOODLE_401_STABLE
rezeau Sep 25, 2023
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
31 changes: 13 additions & 18 deletions classes/feedback_form.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,13 @@ 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,30 +77,19 @@ public function definition() {

$charttypes = [null => get_string('none'),
'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);
'hbar' => get_string('chart:hbar', 'questionnaire')];
// The rose and radar charttypes are only available if there are at least 3 feedback sections.
if ($numfeedbacksections > 2) {
$charttypes['rose'] = get_string('chart:rose', 'questionnaire');
$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);
Expand Down
2 changes: 0 additions & 2 deletions feedback.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,6 @@
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;
}
}
Expand Down