From e35449fe1a21b304c68b12714741ca0d7030f74d Mon Sep 17 00:00:00 2001
From: LouisGac <louis.gac@limesurvey.org>
Date: Mon, 11 Apr 2016 11:39:11 +0200
Subject: [PATCH] Fixed issue #10907: Display columns error

---
 application/helpers/qanda_helper.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
index ff6d816c267..d5bf85189fe 100644
--- a/application/helpers/qanda_helper.php
+++ b/application/helpers/qanda_helper.php
@@ -1651,7 +1651,7 @@ function do_list_radio($ia)
     // That can happen only when no 'other' option is set, and the maximum answer rows has not been reached in the last question
     if($iNbCols > 1 && $isOpen )
     {
-        $answer .= Yii::app()->getController()->renderPartial('/survey/questions/listradio/columns/column_footer', array('last'=>true), true);
+        $sRows .= Yii::app()->getController()->renderPartial('/survey/questions/listradio/columns/column_footer', array('last'=>true), true);
         $iRowCount = 0;
     }
 
@@ -5015,7 +5015,7 @@ function do_array_multitext($ia)
 
         $trbc = '';
         $sRows = '';
-        foreach ($aQuestions as $j => $ansrow)
+        foreach ($aQuestions as $ansrow)
         {
             if (isset($repeatheadings) && $repeatheadings > 0 && ($fn-1) > 0 && ($fn-1) % $repeatheadings == 0)
             {
@@ -5114,7 +5114,6 @@ function do_array_multitext($ia)
                                 'rightTdEmpty'      =>  $rightTdEmpty,
                                 'answerwidth'       =>  $answerwidth,
                                 'formatedRowTotal'  =>  $formatedRowTotal,
-                                'zebra'                  => 2 - ($j % 2)
                             ),  true);
 
             $fn++;
@@ -5384,7 +5383,7 @@ function do_array_multiflexi($ia)
         $fn=1;
 
         $sAnswerRows = '';
-        foreach ($ansresult as $j => $ansrow)
+        foreach ($ansresult as $ansrow)
         {
             if (isset($repeatheadings) && $repeatheadings > 0 && ($fn-1) > 0 && ($fn-1) % $repeatheadings == 0)
             {
@@ -5537,7 +5536,6 @@ function do_array_multiflexi($ia)
                                 'answertextright'   => $answertextright,
                                 'answer_tds'        => $answer_tds,
                                 'rightTd'           => $rightTd,
-                                'zebra'                  => 2 - ($j % 2)
                             ),  true);
             $fn++;
         }
@@ -5612,7 +5610,8 @@ function do_arraycolumns($ia)
             $fn=1;
             $cellwidth=$anscount;
             $cellwidth=round(( 50 / $cellwidth ) , 1);
-            $answer = "\n<table class=\"array-by-columns-table table-array-by-column table question subquestion-list questions-list\">\n"
+            //$answer = "\n<table class=\"table-in-qanda-8  question subquestions-list questions-list\" summary=\"{$caption}\">\n"
+            $answer = "\n<table class=\"array-by-columns-table table-in-qanda-8 table question subquestion-list questions-list\">\n"
             . "\t<colgroup class=\"col-responses\">\n"
             //. "\t<col class=\"col-answers\" width=\"50%\" />\n";
             . "\t<col class=\"col-answers\" style='width: 50%' />\n";
@@ -5625,7 +5624,7 @@ function do_arraycolumns($ia)
                 $answer .= "<col class=\"$odd_even_well question-item answers-list radio-list\" style='width: $cellwidth%;' />\n";
             }
             $answer .= "\t</colgroup>\n\n"
-            . "\t<thead class='thead-array-by-column'>\n"
+            . "\t<thead>\n"
             . "<tr>\n"
             . "\t<td>&nbsp;</td>\n";
 
@@ -5675,7 +5674,7 @@ function do_arraycolumns($ia)
                     //if (!isset($trbc) || $trbc == 'array1') {$trbc = 'array2';} else {$trbc = 'array1';}
                     $myfname=$ia[1].$ld;
 
-                    $answer .= "\t<td data-title='" . $ansrow['answer'] . "' class=\"answer-cell-7 answer_cell_$ld answer-item radio-item\">\n"
+                    $answer .= "\t<td data-title='" . $ansrow['answer'] . "' class=\"answer-cell-7 answer_cell_00$ld answer-item radio-item\">\n"
                     . "\t<label for=\"answer".$myfname.'-'.$ansrow['code']."\"><input class=\"radio\" type=\"radio\" name=\"".$myfname.'" value="'.$ansrow['code'].'" '
                     . 'id="answer'.$myfname.'-'.$ansrow['code'].'" ';
                     if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == $ansrow['code'])
@@ -6009,7 +6008,7 @@ function do_array_dual($ia)
                         $first = false;
                     }
 
-                    $answer .= "\t<td data-title='" . $labelans0[$thiskey] . "' class=\"answer_cell_1_$ld answer-item {$answertypeclass}-item\">\n"
+                    $answer .= "\t<td data-title='" . $labelans0[$thiskey] . "' class=\"answer_cell_1_00$ld answer-item {$answertypeclass}-item\">\n"
                     . "\t<label for=\"answer{$myfid0}-{$ld}\"><input class=\"radio\" type=\"radio\" name=\"$myfname0\" value=\"$ld\" id=\"answer$myfid0-$ld\" ";
                     if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname0]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname0] == $ld)
                     {
@@ -6045,7 +6044,7 @@ function do_array_dual($ia)
                             $first = false;
                         }
 
-                        $answer .= "\t<td data-title='{$labelans1[$thiskey]}' class=\"answer_cell_2_$ld  answer-item radio-item\">\n"
+                        $answer .= "\t<td data-title='{$labelans1[$thiskey]}' class=\"answer_cell_2_00$ld  answer-item radio-item\">\n"
                         . "\t<label for=\"answer{$myfid1}-{$ld}\"><input class=\"radio\" type=\"radio\" name=\"$myfname1\" value=\"$ld\" id=\"answer$myfid1-$ld\" ";
                         if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname1]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname1] == $ld)
                         {