Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey

LimeSurvey · Apr 1, 2016 · 1011605 · 1011605
2 parents 8ea9ef8 + 4708895
commit 1011605
Show file tree

Hide file tree

Showing 6 changed files with 101 additions and 6 deletions.
diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -4106,11 +4106,11 @@ function do_array_10point($ia)
     $anscount = count($aSubquestions);
 
     $fn = 1;
-    $headerDatas = array(
-        'extraclass'=>$extraclass,
-        'answerwidth' => $answerwidth
-    );
-    $answer = Yii::app()->getController()->renderPartial('/survey/questions/arrays/10point/header', $headerDatas, true);
+    $answer = Yii::app()->getController()->renderPartial('/survey/questions/arrays/10point/header', array(
+                        'extraclass'=>$extraclass,
+                        'answerwidth' => $answerwidth
+                    ),
+                true);
 
     $odd_even = '';
     for ($xc=1; $xc<=10; $xc++)
@@ -4395,6 +4395,7 @@ function do_array_increasesamedecrease($ia)
     $answer .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/increasesamedecrease/open_table_head', array('show_no_answer'=>$show_no_answer), true);
 
     $trbc = '';
+    $answer_body = '';
     foreach($aSubquestions as $i => $ansrow)
     {
         $myfname        = $ia[1].$ansrow['title'];
@@ -4408,7 +4409,7 @@ function do_array_increasesamedecrease($ia)
         $NAchecked      = (!isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) || $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == '')?'CHECKED':'';
         $no_answer      = ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1)?true:false;
 
-        $answer_body = Yii::app()->getController()->renderPartial('/survey/questions/arrays/increasesamedecrease/tr', array(
+        $answer_body .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/increasesamedecrease/tr', array(
                     'myfname'=> $myfname,
                     'sDisplayStyle'=> $sDisplayStyle,
                     'answertext'=> $answertext,

diff --git a/application/views/survey/questions/arrays/10point/columns/col.php b/application/views/survey/questions/arrays/10point/columns/col.php
@@ -0,0 +1,11 @@
+<?php
+/**
+ * Array 5pointchoice, column
+ *
+ * @var $cellwidth
+ */
+?>
+
+<!-- col.php -->
+<col class="<?php //TODO: alternation ?>" style='width: <?php echo $cellwidth; ?>%;' />
+<!-- end of col.php -->
diff --git a/application/views/survey/questions/arrays/10point/rows/answer_row.php b/application/views/survey/questions/arrays/10point/rows/answer_row.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Generate a row for the table
+ *
+ * @var $answer_tds        : the cells of each row, generated with the view rows/cells/*.php
+ * @var $myfname
+ * @var $answerwidth
+ * @var $answertext
+ * @var $value
+ */
+?>
+
+<!-- answer_row -->
+<tr id="javatbd<?php echo $myfname;?>" class="well answers-list radio-list array<?php echo $zebra; ?>"  <?php echo $sDisplayStyle; ?>>
+    <th class="answertext" style="width: <?php echo $answerwidth;?>%;">
+        <?php if($error): ?>
+            <div class="alert alert-danger" role="alert">
+                <?php echo $answertext;?>
+            </div>
+        <?php else: ?>
+            <?php echo $answertext;?>
+        <?php endif;?>
+        <input name="java<?php echo $myfname;?>" id="java<?php echo $myfname;?>" value="<?php echo $value;?>" type="hidden">
+    </th>
+
+    <?php
+        // defined in rows/cells/*
+        echo $answer_tds;
+    ?>
+
+</tr>
+<!-- end of answer_row -->
diff --git a/application/views/survey/questions/arrays/10point/rows/cells/answer_td_answertext.php b/application/views/survey/questions/arrays/10point/rows/cells/answer_td_answertext.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * @var $answerwidth
+ * @var $answertext2
+ */
+?>
+
+<!-- td_answertext -->
+<td class="answertextright" style='text-align:left; width: <?php echo $answerwidth; ?>%;'>
+    <?php echo $answertext2;?>
+</td>
+<!-- endof td_answertext -->
diff --git a/application/views/survey/questions/arrays/10point/rows/cells/answer_td_input.php b/application/views/survey/questions/arrays/10point/rows/cells/answer_td_input.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * @var $i
+ * @var $myfname
+ * @var $CHECKED
+ * @var $checkconditionFunction
+ * @var $value
+ */
+?>
+
+<!-- td_input -->
+<td data-title='<?php echo $i;?>' class="answer-cell-2 answer_cell_00<?php echo $i;?> answer-item radio-item">
+    <label for="answer<?php echo $myfname;?>-<?php echo $i; ?>">
+        <input
+            class="radio"
+            type="radio"
+            name="<?php echo $myfname; ?>"
+            id="answer<?php echo $myfname; ?>-<?php echo $i;?>"
+            value="<?php echo $value; ?>"
+            <?php echo $CHECKED;?>
+            onclick="<?php echo $checkconditionFunction; ?>(this.value, this.name, this.type)"
+         />
+    </label>
+</td>
+<!-- end of td_input -->
diff --git a/application/views/survey/questions/arrays/10point/rows/cells/thead.php b/application/views/survey/questions/arrays/10point/rows/cells/thead.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ *
+ * @var $class
+ * @var $style
+ * @var $th_content
+ */
+?>
+
+<!-- thead -->
+<th class="<?php echo $class; ?>" style="<?php echo $style; ?>" >
+    <?php echo $th_content;?>
+</th>
+<!-- end of thead -->