Fixed issue #14628: Array numbers question type doesn't include prope…

…r subquestion and answer details at "print answers" overview
LimeSurvey · Oct 9, 2019 · 95a4f84 · 95a4f84
1 parent c057b6d
commit 95a4f84
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/application/models/SurveyDynamic.php b/application/models/SurveyDynamic.php
@@ -953,6 +953,7 @@ public function getQuestionArray($oQuestion, $oResponses, $bHonorConditions, $su
             foreach (Question::model()->findAllByAttributes(array('parent_qid' => $aQuestionAttributes['parent_qid'], 'scale_id' => ($oQuestion->parents['type'] == '1' ? 2 : 1))) as $oScaleSubquestion) {
                 $tempFieldname = $fieldname.'_'.$oScaleSubquestion->title;
                 $aQuestionAttributes['answervalues'][$oScaleSubquestion->title] = isset($oResponses[$tempFieldname]) ? $oResponses[$tempFieldname] : null;
+                $aQuestionAttributes['answervalueslabels'][$oScaleSubquestion->title] = isset($oScaleSubquestion->question) ? $oScaleSubquestion->question : null;
             }
         }
 

diff --git a/...y/vanilla/views/subviews/printanswers/question_types/template_array-multi-flexi-text.twig b/...y/vanilla/views/subviews/printanswers/question_types/template_array-multi-flexi-text.twig
@@ -6,8 +6,8 @@
         {% if subquestion.question_order == 1 %}
             <tr>
                 <th></th>
-                {% for colname, value in subquestion.answervalues %}
-                    <th><b>{{colname}}</b></th>
+                {% for colname, value in subquestion.answervalueslabels %}
+                    <th class="text-center"><b>{{value}} - {{colname}}</b></th>
                 {% endfor %}                    
             </tr>
         {% endif %}

diff --git a/...survey/vanilla/views/subviews/printanswers/question_types/template_array-multi-flexi.twig b/...survey/vanilla/views/subviews/printanswers/question_types/template_array-multi-flexi.twig
@@ -6,8 +6,8 @@
         {% if subquestion.question_order == 1 %}
             <tr>
                 <th></th>
-                {% for colname, value in subquestion.answervalues %}
-                    <th class="text-center"><b>{{colname}}</b></th>
+                {% for colname, value in subquestion.answervalueslabels %}
+                    <th class="text-center"><b>{{value}} - {{colname}}</b></th>
                 {% endfor %}                    
             </tr>
         {% endif %}