';
+
+ echo '
'.strip_tags($question->getSurveyQuestion()).'
';
+
if ('score' === $type) {
- /** @todo This function should return the options as this is needed further in the code */
- $options = self::display_question_report_score($survey, $question, $offset);
+ // Score-type
+ self::display_question_report_score($survey, $question, $offset);
} elseif ('open' === $type || 'comment' === $type) {
- echo '
';
- /** @todo Also get the user who has answered this */
+ // Open/comment as list
+ echo '
';
$sql = "SELECT * FROM $table_survey_answer
- WHERE
- survey_id= $surveyId AND
- question_id = $questionId ";
+ WHERE survey_id= $surveyId AND question_id = $questionId ";
$result = Database::query($sql);
while ($row = Database::fetch_assoc($result)) {
- echo $row['option_id'].'
';
+ echo '- '.api_htmlentities($row['option_id'], ENT_QUOTES).'
';
}
- echo '
';
+ echo '
';
} else {
- // Getting the options ORDER BY sort ASC
+ // Choice-based questions
$sql = "SELECT * FROM $table_survey_question_option
- WHERE
- survey_id = $surveyId AND
- question_id = $questionId
- ORDER BY sort ASC";
+ WHERE survey_id = $surveyId AND question_id = $questionId
+ ORDER BY sort ASC";
$result = Database::query($sql);
while ($row = Database::fetch_assoc($result)) {
$options[$row['iid']] = $row;
}
- // Getting the answers
+
$sql = "SELECT *, count(iid) as total
- FROM $table_survey_answer
- WHERE
- survey_id = $surveyId AND
- question_id = $questionId
- GROUP BY option_id, value";
+ FROM $table_survey_answer
+ WHERE survey_id = $surveyId AND question_id = $questionId
+ GROUP BY option_id, value";
$result = Database::query($sql);
$number_of_answers = [];
$data = [];
@@ -727,133 +760,111 @@ public static function display_question_report(CSurvey $survey)
$data[$row['option_id']] = $row;
}
- foreach ($options as $option) {
- $optionText = strip_tags($option['option_text']);
+ foreach ($options as $opt) {
+ $optionText = strip_tags($opt['option_text']);
$optionText = html_entity_decode($optionText);
- $votes = 0;
- if (isset($data[$option['iid']]['total'])) {
- $votes = $data[$option['iid']]['total'];
- }
- array_push($chartData, ['option' => $optionText, 'votes' => $votes]);
+ $votes = isset($data[$opt['iid']]['total']) ? $data[$opt['iid']]['total'] : 0;
+ $chartData[] = ['option' => $optionText, 'votes' => $votes];
}
+
$chartContainerId = 'chartContainer'.$questionId;
- echo '
';
+ echo '
';
echo self::drawChart($chartData, false, $chartContainerId, false);
echo '
';
- // displaying the table: headers
- echo '
';
- echo '';
- echo ' ';
- echo ' | | ';
- echo ' '.get_lang('Absolute total').' | ';
- echo ' '.get_lang('Percentage').' | ';
- echo ' '.get_lang('Graphic').' | ';
- echo '
';
-
- // Displaying the table: the content
+ // Table (bordered/striped/compact)
+ echo '';
+ echo '
+ | |
+ '.get_lang('Absolute total').' |
+ '.get_lang('Percentage').' |
+ '.get_lang('Graphic').' |
+
';
+
if (is_array($options)) {
- foreach ($options as $key => &$value) {
+ foreach ($options as $key => $value) {
if ('multiplechoiceother' === $type && 'other' === $value['option_text']) {
$value['option_text'] = get_lang('Please specify:');
}
-
- $absolute_number = null;
- if (isset($data[$value['iid']])) {
- $absolute_number = $data[$value['iid']]['total'];
- }
+ $absolute_number = isset($data[$value['iid']]) ? $data[$value['iid']]['total'] : 0;
if ('percentage' === $type && empty($absolute_number)) {
continue;
}
- $number_of_answers[$option['question_id']] = isset($number_of_answers[$option['question_id']])
- ? $number_of_answers[$option['question_id']]
- : 0;
- if (0 == $number_of_answers[$option['question_id']]) {
- $answers_number = 0;
- } else {
- $answers_number = $absolute_number / $number_of_answers[$option['question_id']] * 100;
- }
- echo ' ';
+ $qid = $value['question_id'] ?? null;
+ $totalAnswers = $qid && isset($number_of_answers[$qid]) ? $number_of_answers[$qid] : 0;
+ $percentage = $totalAnswers ? ($absolute_number / $totalAnswers * 100) : 0;
+
+ echo '
';
echo '| '.$value['option_text'].' | ';
echo '';
if (0 != $absolute_number) {
echo ''.$absolute_number.'';
+ .'&survey_id='.$surveyId.'&question='.$offset.'&viewoption='.$value['iid'].'">'.$absolute_number.'';
} else {
echo '0';
}
-
- echo ' | ';
- echo ''.round($answers_number, 2).' % | ';
+ echo '';
+ echo ''.round($percentage, 2).' % | ';
echo '';
- $size = $answers_number * 2;
- if ($size > 0) {
- echo '
-
- ';
- } else {
- echo ''.get_lang("No data available").' ';
- }
- echo ' | ';
- echo '
';
+ // Simple progress bar (no external JS/CSS needed)
+ $w = max(0, min(100, round($percentage, 2)));
+ echo '';
+ echo '';
+ echo '';
}
}
- $optionResult = '';
+ $optionResult = '0';
if (isset($option['question_id']) && isset($number_of_answers[$option['question_id']])) {
- if (0 == $number_of_answers[$option['question_id']]) {
- $optionResult = '0';
- } else {
- $optionResult = $number_of_answers[$option['question_id']];
- }
+ $optionResult = $number_of_answers[$option['question_id']] ?: '0';
}
- // displaying the table: footer (totals)
- echo '
- | '.get_lang('Total').' |
- '.$optionResult.' |
- |
- |
-
-
';
+ echo '
+ | '.get_lang('Total').' |
+ '.$optionResult.' |
+ |
+ |
+
';
+ echo '
';
}
- echo '
';
- }
- echo '
';
- // Survey information, needed for the PDF export.
- echo Display::page_subheader(get_lang('Survey')).'