diff --git a/application/config/internal.php b/application/config/internal.php
index 3832c09c75b..7ca97038cad 100644
--- a/application/config/internal.php
+++ b/application/config/internal.php
@@ -266,7 +266,8 @@
'getLanguageNameFromCode' => 'getLanguageNameFromCode',
'checkconditionFunction' => 'checkconditionFunction',
'doRender' => 'doRender',
- 'flattenText' => 'flattenText'
+ 'flattenText' => 'flattenText',
+ 'getEditor' => 'getEditor'
),
'filters' => array(
'jencode' => 'CJSON::encode',
@@ -367,7 +368,8 @@
'checkconditionFunction',
'doRender',
'flattenText',
- 'range'
+ 'range',
+ 'getEditor'
),
),
),
diff --git a/application/controllers/admin/questiongroups.php b/application/controllers/admin/questiongroups.php
index dc85c20c710..9e3185d2030 100644
--- a/application/controllers/admin/questiongroups.php
+++ b/application/controllers/admin/questiongroups.php
@@ -415,8 +415,6 @@ public function updateOrder($surveyid)
$oQuestion->save(true);
}, $oQuestions);
}
-
- Question::updateSortOrder($aQuestiongroup['gid'], $surveyid);
}
return Yii::app()->getController()->renderPartial(
diff --git a/application/controllers/admin/questions.php b/application/controllers/admin/questions.php
index 030c58c2792..396d8452d8a 100644
--- a/application/controllers/admin/questions.php
+++ b/application/controllers/admin/questions.php
@@ -953,7 +953,7 @@ public function getSubquestionRow($surveyid, $gid, $qid, $codes, $language, $fir
}
$html = '';
- $html .= $this->getController()->renderPartial('/admin/survey/Question/subquestionsAndAnswers/'.$view, $aData, true, false);
+ $html .= App()->twigRenderer->renderAnswerOptions('/admin/survey/Question/subquestionsAndAnswers/'.$view, $aData);
$html .= '';
return $html;
}
diff --git a/application/core/LSETwigViewRenderer.php b/application/core/LSETwigViewRenderer.php
index 9b0d315904b..d01f593a8d2 100644
--- a/application/core/LSETwigViewRenderer.php
+++ b/application/core/LSETwigViewRenderer.php
@@ -179,6 +179,61 @@ public function renderQuestion($sView, $aData)
}
}
+ /**
+ * This method is used to render question's subquestions and answer options pages .
+ * It first checks if the question use a template (set in display attributes)
+ * If it is the case, it will use the views of that template, else, it will render the core view.
+ *
+ * @param string $sView the view (layout) to render
+ * @param array $aData the datas needed for the view rendering
+ *
+ * @return string the generated html
+ */
+ public function renderAnswerOptions($sView, $aData)
+ {
+ $this->_twig = parent::getTwig(); // Twig object
+ $loader = $this->_twig->getLoader(); // Twig Template loader
+ $requiredView = Yii::getPathOfAlias('application.views').$sView; // By default, the required view is the core view
+ $loader->setPaths(App()->getBasePath().'/views/'); // Core views path
+
+ $oQuestionTemplate = QuestionTemplate::getInstance(); // Question template instance has been created at top of qanda_helper::retrieveAnswers()
+
+ // currently, question's subquestions and answer options pages are rendered only from core
+ $sTemplateFolderName = null;
+
+ // Check if question use a custom template and that it provides its own twig view
+ if ($sTemplateFolderName) {
+ $bTemplateHasThisView = $oQuestionTemplate->checkIfTemplateHasView($sView); // A template can change only one of the view of the question type. So other views should be rendered by core.
+
+ if ($bTemplateHasThisView) {
+ $sQTemplatePath = $oQuestionTemplate->getTemplatePath(); // Question template views path
+ $loader->setPaths($sQTemplatePath); // Loader path
+ $requiredView = $sQTemplatePath.ltrim($sView, '/'); // Complete path of the view
+ }
+ }
+
+ // We check if the file is a twig file or a php file
+ // This allow us to twig the view one by one, from PHP to twig.
+ // The check will be removed when 100% of the views will have been twig
+ if (file_exists($requiredView.'.twig')) {
+ // We're not using the Yii Theming system, so we don't use parent::renderFile
+ // current controller properties will be accessible as {{ this.property }}
+
+ // aData and surveyInfo variables are accessible from question type twig files
+ $aData['aData'] = $aData;
+ $sBaseLanguage = Survey::model()->findByPk($_SESSION['LEMsid'])->language;
+ $aData['surveyInfo'] = getSurveyInfo($_SESSION['LEMsid'], $sBaseLanguage);
+ $aData['this'] = Yii::app()->getController();
+
+ $aData['question_template_attribute'] = null;
+
+ $template = $this->_twig->loadTemplate($sView.'.twig')->render($aData);
+ return $template;
+ } else {
+ return Yii::app()->getController()->renderPartial($sView, $aData, true);
+ }
+ }
+
/**
* This method is called from Template Editor.
* It returns the HTML string needed for the tmp file using the template twig file.
diff --git a/application/views/admin/responses/browsemenubar_view.php b/application/views/admin/responses/browsemenubar_view.php
index bff19058eab..173514694e9 100644
--- a/application/views/admin/responses/browsemenubar_view.php
+++ b/application/views/admin/responses/browsemenubar_view.php
@@ -57,7 +57,7 @@
-
+
diff --git a/application/views/admin/survey/Question/answerOptionsEdit_view.twig b/application/views/admin/survey/Question/answerOptionsEdit_view.twig
new file mode 100644
index 00000000000..9818c0b98c7
--- /dev/null
+++ b/application/views/admin/survey/Question/answerOptionsEdit_view.twig
@@ -0,0 +1,232 @@
+
+
+
+
+
+ {% if viewType=='subQuestions' %}
+
+ {% elseif viewType=='answerOptions' %}
+
+ {% endif %}
+
+
+
+
+ {% set first=true %}
+
+
+
+ {% set sortorderids='' %}
+ {% set codeids='' %}
+ {% set scale_id = 0 %}
+
+
+
+ {% for i, anslang in anslangs %}
+
+ {% for scale_id in range(0,scalecount-1) %}
+ {% set result = results[anslang][scale_id] %}
+ {% set anscount = result|length %}
+ {# TODO : check the rendering of XSCALES / Y SCALES #}
+
+ {# For subQuestions #}
+ {% if viewType=='subQuestions' %}
+ {% set position=0 %}
+ {% if scalecount>1 %}
+ {% if scale_id==0 %}
+
+ {{ gT("Y-Scale") }}
+
+ {% else %}
+
+ {{ gT("X-Scale") }}
+
+ {% endif %}
+ {% endif %}
+
+ {# For answers #}
+ {% elseif viewType=='answerOptions' %}
+ {% set position=1 %}
+ {% if scalecount>1 %}
+
-
+ echo App()->twigRenderer->renderAnswerOptions('/admin/survey/Question/answerOptionsEdit_view', $aData); ?>
+
diff --git a/application/views/admin/survey/Question/question_subviews/_modals.php b/application/views/admin/survey/Question/question_subviews/_modals.twig
similarity index 75%
rename from application/views/admin/survey/Question/question_subviews/_modals.php
rename to application/views/admin/survey/Question/question_subviews/_modals.twig
index 4fec66be43f..7c9f30501da 100644
--- a/application/views/admin/survey/Question/question_subviews/_modals.php
+++ b/application/views/admin/survey/Question/question_subviews/_modals.twig
@@ -1,8 +1,8 @@
-
+#}
@@ -10,19 +10,19 @@
-
+
{{ gT('Enter your answers:') }}
-
+ {{ gT('Enter one answer per line. You can provide a code by separating code and answer text with a semikolon or tab. For multilingual surveys you add the translation(s) on the same line separated with a semikolon or tab.') }}
diff --git a/application/views/admin/survey/Question/subquestionsAndAnswers/_answer_option.twig b/application/views/admin/survey/Question/subquestionsAndAnswers/_answer_option.twig
new file mode 100644
index 00000000000..975f042e11a
--- /dev/null
+++ b/application/views/admin/survey/Question/subquestionsAndAnswers/_answer_option.twig
@@ -0,0 +1,136 @@
+{#
+ * answer option row view
+ *
+ * @var $position
+ * @var $first
+ * @var $assessmentvisible
+ * @var $scale_id
+ * @var $title
+ * @var $surveyid
+ * @var $gid
+ * @var $qid
+ * @var $language
+ * @var $assessment_value
+ * @var $sortorder
+ * @var $answer
+ *
+ *
+ * NB : !!! If you edit this view, remember to check if subquestion row view need also to be updated !!!
+ */
+#}
+
+
+
+ {% if first %} {# If survey is not activated and first language #}
+
+ {% set sPattern = (title)?"^([a-zA-Z0-9]*|"~title~")$":"^[a-zA-Z0-9]*$" %}
+
+
+
+
+
+
+
+
+
+ {% if oldCode %}
+
+ {% endif %}
+
+
+
+ {# If survey is not active, and it's not the first language : no move button, code not editable #}
+ {% else %}
+
+
+
+
+
+
+
+
+ {{ title }}
+
+ {% endif %}
+
+
+
+ {% if assessmentvisible and first %}
+
diff --git a/application/views/admin/survey/Question/subquestionsAndAnswers/_subquestion.twig b/application/views/admin/survey/Question/subquestionsAndAnswers/_subquestion.twig
new file mode 100644
index 00000000000..52b535fc72c
--- /dev/null
+++ b/application/views/admin/survey/Question/subquestionsAndAnswers/_subquestion.twig
@@ -0,0 +1,140 @@
+{#
+/**
+ * subquestion row view
+ *
+ * @var $row
+ * @var $position
+ * @var $scale_id
+ * @var $activated
+ * @var $first
+ * @var $surveyid
+ * @var $gid
+ * @var $qid
+ * @var $language
+ * @var $title
+ * @var $question
+ * @var $relevance
+ * @var $oldCode
+ *
+ * NB : !!! If you edit this view, remember to check if answer option row view need also to be updated !!!
+ */
+#}
+
+
+
+ {# If survey is active : no move button, code not editable #}
+ {% if activated == 'Y' %}
+
+
+
+
+
+
+
+
+ {{ title }}
+
+
+ {# If survey is not activated and first language : move button, code editable #}
+ {% elseif first %}
+
+ {% set sPattern = (title)?"^([a-zA-Z0-9]*|"~title~")$":"^[a-zA-Z0-9]*$" %}
+
+
+
+
+
+
+
+
+ {% if oldCode %}
+
+ {% endif %}
+
+
+
+
+ {# If survey is not active, and it's not the first language : no move button, code not editable #}
+ {% else %}
+
+
+