1 files changed, 34 insertions, 15 deletions
diff --git a/lib/models/Vote.php b/lib/models/Vote.php
index 0520401..b5cd142 100644
--- a/lib/models/Vote.php
+++ b/lib/models/Vote.php
@@ -1,6 +1,4 @@
 <?php
-require_once 'lib/classes/QuestionType.interface.php';
-
 /**
  * @license GPL2 or any later version
  *
@@ -53,7 +51,7 @@ class Vote extends QuestionnaireQuestion implements QuestionType
 
     public function getDisplayTemplate()
     {
-        $factory = new Flexi_TemplateFactory(realpath(__DIR__.'/../../app/views'));
+        $factory = new Flexi\Factory(realpath(__DIR__.'/../../app/views'));
         $template = $factory->open('questionnaire/question_types/vote/vote_answer');
         $template->set_attribute('vote', $this);
         return $template;
@@ -100,7 +98,7 @@ class Vote extends QuestionnaireQuestion implements QuestionType
                 }
             }
         }
-        $factory = new Flexi_TemplateFactory(realpath(__DIR__.'/../../app/views'));
+        $factory = new Flexi\Factory(realpath(__DIR__.'/../../app/views'));
         $template = $factory->open('questionnaire/question_types/vote/vote_evaluation');
         $template->set_attribute('vote', $this);
         $template->set_attribute('answers', $answers);
@@ -113,28 +111,49 @@ class Vote extends QuestionnaireQuestion implements QuestionType
         $output = [];
 
         $options = $this['questiondata']['options'] ? $this['questiondata']['options']->getArrayCopy() : [];
+        $multiplechoice = (bool) $this['questiondata']['multiplechoice'];
+
+        if ($multiplechoice) {
+            foreach ($options as $key => $option) {
+                $answerOption = [];
+                $countNobodys = 0;
+
+                foreach ($this->answers as $answer) {
+                    $answerData = $answer['answerdata']->getArrayCopy();
+
+                    if ($answer['user_id'] && $answer['user_id'] != 'nobody') {
+                        $userId = $answer['user_id'];
+                    } else {
+                        $countNobodys++;
+                        $userId = _('unbekannt') . ' ' . $countNobodys;
+                    }
+
+                    if (in_array($key, (array) $answerData['answers'])) {
+                        $answerOption[$userId] = 1;
+                    } else {
+                        $answerOption[$userId] = 0;
+                    }
+                }
+                $output[$option] = $answerOption;
+            }
+        } else {
 
-        foreach ($options as $key => $option) {
             $answerOption = [];
             $countNobodys = 0;
 
             foreach ($this->answers as $answer) {
                 $answerData = $answer['answerdata']->getArrayCopy();
 
-                if ($answer['user_id'] && $answer['user_id'] != 'nobody') {
+                if ($answer['user_id'] && $answer['user_id'] !== 'nobody') {
                     $userId = $answer['user_id'];
                 } else {
-                    $countNobodys++;
-                    $userId = _('unbekannt').' '.$countNobodys;
-                }
-
-                if (in_array($key, (array) $answerData['answers'])) {
-                    $answerOption[$userId] = 1;
-                } else {
-                    $answerOption[$userId] = 0;
+                    $userId = _('unbekannt') . ' ' . ++$countNobodys;
                 }
+                $answerOption[$userId] = $options[$answerData['answers']];
             }
-            $output[$option] = $answerOption;
+
+            $question = strip_tags($this['questiondata']['description']);
+            $output[$question] = $answerOption;
         }
         return $output;
     }