Skip to content
Snippets Groups Projects
Commit ed4f434a authored by Rasmus Fuhse's avatar Rasmus Fuhse
Browse files

Resolve "Tortendiagramme fehlen in Auswertung"

Closes #2939

Merge request studip/studip!1980
parent 773491a4
No related branches found
No related tags found
No related merge requests found
...@@ -65,6 +65,7 @@ rsort($ordered_results); ...@@ -65,6 +65,7 @@ rsort($ordered_results);
class="ct-chart"></div> class="ct-chart"></div>
<script> <script>
$(function () {
STUDIP.Questionnaire.initVoteEvaluation( STUDIP.Questionnaire.initVoteEvaluation(
'#questionnaire_<?= $vote->getId() ?>_chart', '#questionnaire_<?= $vote->getId() ?>_chart',
<?= json_encode( <?= json_encode(
...@@ -74,8 +75,9 @@ rsort($ordered_results); ...@@ -74,8 +75,9 @@ rsort($ordered_results);
] ]
) ?>, ) ?>,
<?= json_encode(Request::isAjax()) ?>, <?= json_encode(Request::isAjax()) ?>,
<?= json_encode($vote->questiondata['type'] === 'multiple') ?> <?= $vote->questiondata['multiplechoice'] ? 'true' : 'false' ?>
); );
});
</script> </script>
<? endif ?> <? endif ?>
......
...@@ -324,7 +324,6 @@ const Questionnaire = { ...@@ -324,7 +324,6 @@ const Questionnaire = {
if (jQuery('.questionnaire_' + questionnaire_id).is('.ui-dialog .questionnaire_results')) { if (jQuery('.questionnaire_' + questionnaire_id).is('.ui-dialog .questionnaire_results')) {
jQuery('.questionnaire_' + questionnaire_id + ' [data-dialog-button]').hide(); jQuery('.questionnaire_' + questionnaire_id + ' [data-dialog-button]').hide();
} }
jQuery(document).trigger('dialog-open');
}, },
beforeAnswer: function() { beforeAnswer: function() {
var form = jQuery(this).closest('form')[0]; var form = jQuery(this).closest('form')[0];
...@@ -534,11 +533,7 @@ const Questionnaire = { ...@@ -534,11 +533,7 @@ const Questionnaire = {
const Chartist = await STUDIP.loadChunk('chartist'); const Chartist = await STUDIP.loadChunk('chartist');
if (isAjax) {
jQuery(document).add(".questionnaire_results").one("dialog-open", enhance);
} else {
jQuery(enhance); jQuery(enhance);
}
function enhance() { function enhance() {
if (isMultiple) { if (isMultiple) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment