diff options
Diffstat (limited to 'lib/models/RangeScale.php')
| -rw-r--r-- | lib/models/RangeScale.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/lib/models/RangeScale.php b/lib/models/RangeScale.php index 78bc65b..20e134a 100644 --- a/lib/models/RangeScale.php +++ b/lib/models/RangeScale.php @@ -1,6 +1,4 @@ <?php -require_once 'lib/classes/QuestionType.interface.php'; - /** * @license GPL2 or any later version * @@ -20,7 +18,7 @@ class RangeScale extends QuestionnaireQuestion implements QuestionType { public static function getIcon(bool $active = false) : Icon { - return Icon::create(static::getIconShape(), $active ? 'clickable' : 'info'); + return Icon::create(static::getIconShape(), $active ? Icon::ROLE_CLICKABLE : Icon::ROLE_INFO); } /** @@ -53,7 +51,7 @@ class RangeScale 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/rangescale/rangescale_answer'); $template->set_attribute('vote', $this); return $template; @@ -64,7 +62,11 @@ class RangeScale extends QuestionnaireQuestion implements QuestionType $answer = $this->getMyAnswer(); $answers = Request::getArray('answers'); - $userAnswer = (array) $answers[$this->getId()]['answerdata']['answers']; + if (!empty($answers[$this->getId()])) { + $userAnswer = (array)$answers[$this->getId()]['answerdata']['answers']; + } else { + $userAnswer = []; + } $answer->setData(['answerdata' => ['answers' => $userAnswer ] ]); return $answer; } @@ -72,7 +74,7 @@ class RangeScale extends QuestionnaireQuestion implements QuestionType public function getUserIdsOfFilteredAnswer($answer_option) { $user_ids = []; - list($statement_key, $options_key) = explode('_', $answer_option); + [$statement_key, $options_key] = explode('_', $answer_option); foreach ($this->answers as $answer) { $answerData = $answer['answerdata']->getArrayCopy(); if ($answerData['answers'][$statement_key] == $options_key) { @@ -92,7 +94,7 @@ class RangeScale 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/rangescale/rangescale_evaluation'); $template->set_attribute('vote', $this); $template->set_attribute('answers', $answers); |