From ed4f434aa948a71f39f87eb07e5a5ff0e22160c9 Mon Sep 17 00:00:00 2001
From: Rasmus Fuhse <fuhse@data-quest.de>
Date: Wed, 19 Jul 2023 13:48:03 +0000
Subject: [PATCH] Resolve "Tortendiagramme fehlen in Auswertung"
Closes #2939
Merge request studip/studip!1980
---
.../question_types/vote/vote_evaluation.php | 24 ++++++++++---------
.../assets/javascripts/lib/questionnaire.js | 7 +-----
2 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/app/views/questionnaire/question_types/vote/vote_evaluation.php b/app/views/questionnaire/question_types/vote/vote_evaluation.php
index e618e6a2c50..5521b165e51 100644
--- a/app/views/questionnaire/question_types/vote/vote_evaluation.php
+++ b/app/views/questionnaire/question_types/vote/vote_evaluation.php
@@ -65,17 +65,19 @@ rsort($ordered_results);
class="ct-chart"></div>
<script>
- STUDIP.Questionnaire.initVoteEvaluation(
- '#questionnaire_<?= $vote->getId() ?>_chart',
- <?= json_encode(
- [
- "labels" => $ordered_answer_options,
- "series" => [$ordered_results],
- ]
- ) ?>,
- <?= json_encode(Request::isAjax()) ?>,
- <?= json_encode($vote->questiondata['type'] === 'multiple') ?>
- );
+ $(function () {
+ STUDIP.Questionnaire.initVoteEvaluation(
+ '#questionnaire_<?= $vote->getId() ?>_chart',
+ <?= json_encode(
+ [
+ "labels" => $ordered_answer_options,
+ "series" => [$ordered_results],
+ ]
+ ) ?>,
+ <?= json_encode(Request::isAjax()) ?>,
+ <?= $vote->questiondata['multiplechoice'] ? 'true' : 'false' ?>
+ );
+ });
</script>
<? endif ?>
diff --git a/resources/assets/javascripts/lib/questionnaire.js b/resources/assets/javascripts/lib/questionnaire.js
index a439219a92e..95263784c91 100644
--- a/resources/assets/javascripts/lib/questionnaire.js
+++ b/resources/assets/javascripts/lib/questionnaire.js
@@ -324,7 +324,6 @@ const Questionnaire = {
if (jQuery('.questionnaire_' + questionnaire_id).is('.ui-dialog .questionnaire_results')) {
jQuery('.questionnaire_' + questionnaire_id + ' [data-dialog-button]').hide();
}
- jQuery(document).trigger('dialog-open');
},
beforeAnswer: function() {
var form = jQuery(this).closest('form')[0];
@@ -534,11 +533,7 @@ const Questionnaire = {
const Chartist = await STUDIP.loadChunk('chartist');
- if (isAjax) {
- jQuery(document).add(".questionnaire_results").one("dialog-open", enhance);
- } else {
- jQuery(enhance);
- }
+ jQuery(enhance);
function enhance() {
if (isMultiple) {
--
GitLab