From ea289111644d1cef3add93d826214e5c2c101bb8 Mon Sep 17 00:00:00 2001
From: LouisGac <louis.gac@limesurvey.org>
Date: Tue, 22 Mar 2016 18:38:54 +0100
Subject: [PATCH] Dev: array Yes/No/Uncertain views

---
 application/helpers/qanda_helper.php          | 139 ++++++------------
 .../arrays/yesnouncertain/close_table.php     |   3 +
 .../questions/arrays/yesnouncertain/col.php   |  10 ++
 .../arrays/yesnouncertain/header.php          |  12 ++
 .../questions/arrays/yesnouncertain/thead.php |  26 ++++
 .../questions/arrays/yesnouncertain/tr.php    |  90 ++++++++++++
 6 files changed, 182 insertions(+), 98 deletions(-)
 create mode 100644 application/views/survey/questions/arrays/yesnouncertain/close_table.php
 create mode 100644 application/views/survey/questions/arrays/yesnouncertain/col.php
 create mode 100644 application/views/survey/questions/arrays/yesnouncertain/header.php
 create mode 100644 application/views/survey/questions/arrays/yesnouncertain/thead.php
 create mode 100644 application/views/survey/questions/arrays/yesnouncertain/tr.php

diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
index 74a412cb743..40e527bafa9 100644
--- a/application/helpers/qanda_helper.php
+++ b/application/helpers/qanda_helper.php
@@ -4073,7 +4073,7 @@ function do_array_10point($ia)
     $anscount = count($aSubquestions);
 
     $fn = 1;
-    $answer = $answer = Yii::app()->getController()->renderPartial('/survey/questions/arrays/10point/header', $headerDatas, true);
+    $answer = Yii::app()->getController()->renderPartial('/survey/questions/arrays/10point/header', $headerDatas, true);
 
     $odd_even = '';
     for ($xc=1; $xc<=10; $xc++)
@@ -4206,7 +4206,8 @@ function do_array_yesnouncertain($ia)
     }
     $cellwidth = round((( 100 - $answerwidth ) / $cellwidth) , 1); // convert number of columns to percentage of table width
 
-    if ($aQuestionAttributes['random_order']==1) {
+    if ($aQuestionAttributes['random_order']==1)
+    {
         $ansquery = "SELECT * FROM {{questions}} WHERE parent_qid=$ia[0] AND language='".$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang']."' ORDER BY ".dbRandom();
     }
     else
@@ -4217,41 +4218,30 @@ function do_array_yesnouncertain($ia)
     $aSubquestions = $ansresult->readAll();
     $anscount = count($aSubquestions);
     $fn = 1;
-    /*$answer = "\n<table class=\"table  table-condensed table-in-qanda-3 question subquestions-list questions-list {$extraclass}\" summary=\"{$caption}\">\n"
-    . "\t<colgroup class=\"col-responses\">\n"
-    . "\n\t<col class=\"col-answers\" width=\"$answerwidth%\" />\n";*/
-    $answer = "\n<table class=\"no-more-tables table table-condensed table-in-qanda-3 question subquestion-list questions-list {$extraclass}\">\n"
-    . "\t<colgroup class=\"col-responses\">\n"
-    . "\n\t<col class=\"col-answers\" style='width: $answerwidth%;'/>\n";
+
+    $answer = Yii::app()->getController()->renderPartial(
+                '/survey/questions/arrays/yesnouncertain/header',
+                array('answerwidth'=>$answerwidth, 'extraclass'=>$extraclass), true);
+
     $odd_even = '';
     for ($xc=1; $xc<=3; $xc++)
     {
         $odd_even = alternation($odd_even);
-        //$answer .= "<col class=\"$odd_even\" width=\"$cellwidth%\" />\n";
-        $answer .= "<col class=\"$odd_even\"  style='width: $cellwidth%;' />\n";
+        $answer .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/yesnouncertain/col', array('odd_even'=>$odd_even,'cellwidth'=>$cellwidth), true);
     }
     if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory
     {
         $odd_even = alternation($odd_even);
-        //$answer .= "<col class=\"col-no-answer $odd_even\" width=\"$cellwidth%\" />\n";
-        $answer .= "<col class=\"col-no-answer $odd_even\" style='width: $cellwidth%;'/>\n";
-    }
-    $answer .= "\t</colgroup>\n\n"
-    . "\t<thead>\n<tr class=\"array1\">\n"
-    . "\t<th>&nbsp;</th>\n"
-    . "\t<th class=\"dontread\">".gT('Yes')."</th>\n"
-    . "\t<th class=\"dontread\">".gT('Uncertain')."</th>\n"
-    . "\t<th class=\"dontread\">".gT('No')."</th>\n";
-    if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1) //Question is not mandatory
-    {
-        $answer .= "\t<th class=\"dontread\">".gT('No answer')."</th>\n";
+        $answer .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/yesnouncertain/col', array('odd_even'=>$odd_even,'cellwidth'=>$cellwidth, 'no_answer'=>true ), true);
     }
-    $answer .= "</tr>\n\t</thead>";
-    $answer_t_content = '<tbody>';
+
+    $no_answer = ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1)?true:false;
+    $answer .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/yesnouncertain/thead', array('no_answer'=>$no_answer, 'anscount'=>$anscount), true);
+
+    $answer_t_content = '';
     if ($anscount==0)
     {
         $inputnames=array();
-        $answer.="<tr>\t<th class=\"answertext\">".gT('Error: This question has no answers.')."</th>\n</tr>\n";
     }
     else
     {
@@ -4261,88 +4251,41 @@ function do_array_yesnouncertain($ia)
             $myfname = $ia[1].$ansrow['title'];
             $answertext = $ansrow['question'];
             /* Check the sub question mandatory violation */
-            if ($ia[6]=='Y' && in_array($myfname, $aMandatoryViolationSubQ))
-            {
-                //$answertext = "<span class='errormandatory'>{$answertext}</span>";
-                $answertext ='
-                            <div class="alert alert-danger" role="alert">'.
-                                    $answertext
-                                .'
-                            </div>';
-
-            }
+            $error = ($ia[6]=='Y' && in_array($myfname, $aMandatoryViolationSubQ))?true:false;
             $trbc = alternation($trbc , 'row');
 
             // Get array_filter stuff
-            list($htmltbody2, $hiddenfield)=return_array_filter_strings($ia, $aQuestionAttributes, $thissurvey, $ansrow, $myfname, $trbc, $myfname,"tr","$trbc answers-list radio-list");
-
-            $answer_t_content .= $htmltbody2;
+            //list($htmltbody2, $hiddenfield)=return_array_filter_strings($ia, $aQuestionAttributes, $thissurvey, $ansrow, $myfname, $trbc, $myfname,"tr","$trbc answers-list radio-list");
+            $sDisplayStyle = return_display_style($ia, $aQuestionAttributes, $thissurvey, $myfname);
 
-            $answer_t_content .= "\t<th class=\"answertext\">\n"
-            . $hiddenfield
-            . "\t\t\t\t$answertext</th>\n"
-            . "\t<td data-title='" . gT("Yes") . "' class=\"answer_cell_Y answer-item radio-item\">\n"
-            . "\t<label for=\"answer$myfname-Y\"><input class=\"radio\" type=\"radio\" name=\"$myfname\" id=\"answer$myfname-Y\" value=\"Y\" ";
-            if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == 'Y')
-            {
-                $answer_t_content .= CHECKED;
-            }
-            // --> START NEW FEATURE - SAVE
-            $answer_t_content .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />"
-            //. "<label class=\"hide read\" for=\"answer$myfname-Y\">".gT('Yes')."</label>\n"
-            . "\n\t</label></td>\n"
-            . "\t<td data-title='" . gT("Uncertain") . "' class=\"answer_cell_U answer-item radio-item\">\n"
-            . "<label for=\"answer$myfname-U\"><input class=\"radio\" type=\"radio\" name=\"$myfname\" id=\"answer$myfname-U\" value=\"U\" ";
-            // --> END NEW FEATURE - SAVE
-
-            if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == 'U')
-            {
-                $answer_t_content .= CHECKED;
-            }
-            // --> START NEW FEATURE - SAVE
-            $answer_t_content .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />\n"
-            //. "<label class=\"hide read\" for=\"answer$myfname-U\">".gT('Uncertain')."</label>\n"
-            . "\t</label></td>\n"
-            . "\t<td data-title='" . gT("No") . "' class=\"answer_cell_N answer-item radio-item\">\n"
-            . "<label for=\"answer$myfname-N\"><input class=\"radio\" type=\"radio\" name=\"$myfname\" id=\"answer$myfname-N\" value=\"N\" ";
-            // --> END NEW FEATURE - SAVE
-
-            if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == 'N')
-            {
-                $answer_t_content .= CHECKED;
-            }
-            // --> START NEW FEATURE - SAVE
-            $answer_t_content .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />"
-            //. "<label class=\"hide read\" for=\"answer$myfname-N\">".gT('No')."</label>\n"
-            . "\n"
-            . "<input type=\"hidden\" name=\"java$myfname\" id=\"java$myfname\" value=\"";
-            // --> END NEW FEATURE - SAVE
-            if (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]))
-            {
-                $answer_t_content .= $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname];
-            }
-            $answer_t_content .= "\" />\n\t</label></td>\n";
+            $no_answer = ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1)?true:false;
+            $value = (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname])) ? $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] : '';
+            $Ychecked = (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == 'Y')?'CHECKED':'';
+            $Uchecked = (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == 'U')?'CHECKED':'';
+            $Nchecked = (isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) && $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == 'N')?'CHECKED':'';
+            $NAchecked = (!isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) || $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == '')?'CHECKED':'';
+
+
+            $answer_t_content .= Yii::app()->getController()->renderPartial('/survey/questions/arrays/yesnouncertain/tr', array(
+                        'myfname'=> $myfname,
+                        'sDisplayStyle'=> $sDisplayStyle,
+                        'answertext'=> $answertext,
+                        'Ychecked'=> $Ychecked,
+                        'Uchecked'=> $Uchecked,
+                        'Nchecked'=>$Nchecked,
+                        'NAchecked'=>$NAchecked,
+                        'value'=>$value,
+                        'checkconditionFunction'=>$checkconditionFunction,
+                        'error'=>$error,
+                        'no_answer'=>$no_answer,
+                    ), true);
 
-            if ($ia[6] != 'Y' && SHOW_NO_ANSWER == 1)
-            {
-                $answer_t_content .= "\t<td data-title='" . gT("No answer") . "' class=\"answer-item radio-item noanswer-item\">\n"
-                . "\t<label for=\"answer$myfname-\"><input class=\"radio\" type=\"radio\" name=\"$myfname\" id=\"answer$myfname-\" value=\"\" ";
-                if (!isset($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname]) || $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$myfname] == '')
-                {
-                    $answer_t_content .= CHECKED;
-                }
-                // --> START NEW FEATURE - SAVE
-                $answer_t_content .= " onclick=\"$checkconditionFunction(this.value, this.name, this.type)\" />\n"
-                //. "\t<label class=\"hide read\" for=\"answer$myfname-\">".gT('No answer')."</label>\n"
-                ."\n\t</label></td>\n";
-                // --> END NEW FEATURE - SAVE
-            }
-            $answer_t_content .= "</tr>";
             $inputnames[]=$myfname;
             $fn++;
         }
     }
-    $answer .=  $answer_t_content . "\t\n</tbody>\n</table>\n";
+    //$answer .=  $answer_t_content . "\t\n</tbody>\n</table>\n";
+    $answer .= $answer_t_content . Yii::app()->getController()->renderPartial('/survey/questions/arrays/yesnouncertain/close_table', array(), true);
     return array($answer, $inputnames);
 }
 
diff --git a/application/views/survey/questions/arrays/yesnouncertain/close_table.php b/application/views/survey/questions/arrays/yesnouncertain/close_table.php
new file mode 100644
index 00000000000..7932872fd7a
--- /dev/null
+++ b/application/views/survey/questions/arrays/yesnouncertain/close_table.php
@@ -0,0 +1,3 @@
+<!-- close_table -->
+        </tbody>
+    </table>
diff --git a/application/views/survey/questions/arrays/yesnouncertain/col.php b/application/views/survey/questions/arrays/yesnouncertain/col.php
new file mode 100644
index 00000000000..6788ada1551
--- /dev/null
+++ b/application/views/survey/questions/arrays/yesnouncertain/col.php
@@ -0,0 +1,10 @@
+<?php
+/**
+ * Array yesnouncertain, column
+ *
+ * @var $odd_even
+ * @var $cellwidth
+ */
+?>
+<!-- col -->
+<col class="<?php echo $odd_even; ?> <?php if(isset($no_answer)){echo "col-no-answer";}?>" style='width: <?php echo $cellwidth; ?>%;' />
diff --git a/application/views/survey/questions/arrays/yesnouncertain/header.php b/application/views/survey/questions/arrays/yesnouncertain/header.php
new file mode 100644
index 00000000000..019720ce8a2
--- /dev/null
+++ b/application/views/survey/questions/arrays/yesnouncertain/header.php
@@ -0,0 +1,12 @@
+<?php
+/**
+ * yesnouncertain Html : Header
+ * @var $extraclass
+ * @var $answerwidth
+ *
+ */
+?>
+    <!-- Array 5 point choice -->
+    <table class="no-more-tables table table-condensed question subquestion-list questions-list <?php echo $extraclass; ?>">
+        <colgroup class="col-responses">
+            <col class="col-answers"  style='width: <?php echo $answerwidth; ?>%;' />
diff --git a/application/views/survey/questions/arrays/yesnouncertain/thead.php b/application/views/survey/questions/arrays/yesnouncertain/thead.php
new file mode 100644
index 00000000000..5fb9cb0d768
--- /dev/null
+++ b/application/views/survey/questions/arrays/yesnouncertain/thead.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * @var $no_answer
+ */
+?>
+<!-- thead -->
+</colgroup>
+<thead>
+    <tr class="array1">
+        <th>&nbsp;</th>
+        <th class="dontread"><?php eT('Yes');?></th>
+        <th class="dontread"><?php eT('Uncertain');?></th>
+        <th class="dontread"><?php eT('No');?></th>
+        <?php if($no_answer):?>
+            <th class="dontread"><?php eT('No answer'); ?></th>
+        <?php endif;?>
+    </tr>
+</thead>
+<tbody>
+    <?php if($anscount==0):?>
+        <tr>
+            <th class="answertext">
+                <?php eT('Error: This question has no answers.');?>
+            </th>
+        </tr>
+    <?php endif; ?>
diff --git a/application/views/survey/questions/arrays/yesnouncertain/tr.php b/application/views/survey/questions/arrays/yesnouncertain/tr.php
new file mode 100644
index 00000000000..1bfbe812228
--- /dev/null
+++ b/application/views/survey/questions/arrays/yesnouncertain/tr.php
@@ -0,0 +1,90 @@
+<?php
+/**
+ * @var $myfname
+ * @var $sDisplayStyle
+ * @var $answertext
+ * @var $Ychecked
+ * @var $Uchecked
+ * @var $Nchecked
+ * @var $NAchecked
+ * @var $value
+ * @var $checkconditionFunction
+ * @var $no_answer
+ * @var $error
+ */
+?>
+<!-- tr -->
+<tr id="javatbd<?php echo $myfname;?>" class="well answers-list radio-list"  <?php echo $sDisplayStyle; ?>>
+    <!-- Answer text /  Errors -->
+    <th class="answertext">
+        <?php if($error): ?>
+            <div class="alert alert-danger" role="alert">
+                <?php echo $answertext;?>
+            </div>
+        <?php else: ?>
+            <?php echo $answertext;?>
+        <?php endif;?>
+    </th>
+
+    <!-- Yes -->
+    <td data-title='<?php eT("Yes"); ?>' class="answer_cell_Y answer-item radio-item">
+        <label for="answer<?php echo $myfname;?>-Y">
+            <input
+                class="radio"
+                type="radio"
+                name="<?php echo $myfname;?>"
+                id="answer<?php echo $myfname;?>-Y"
+                value="Y"
+                <?php echo $Ychecked;?>
+                onclick="<?php echo $checkconditionFunction;?>(this.value, this.name, this.type)"
+                />
+            </label>
+    </td>
+
+    <!-- Uncertain -->
+    <td data-title='<?php eT("Uncertain");?>' class="answer_cell_U answer-item radio-item">
+        <label for="answer<?php $myfname; ?>-U">
+            <input
+                class="radio"
+                type="radio"
+                name="<?php echo $myfname; ?>"
+                id="answer<?php echo $myfname;?>-U"
+                value="U"
+                <?php echo $Uchecked?>
+                onclick="<?php echo $checkconditionFunction;?>(this.value, this.name, this.type)"
+            />
+        </label>
+    </td>
+
+    <!-- No -->
+    <td data-title='<?php eT("No"); ?>' class="answer_cell_N answer-item radio-item">
+        <label for="answer<?php echo $myfname;?>-N">
+            <input
+                class="radio"
+                type="radio"
+                name="<?php echo $myfname;?>"
+                id="answer<?php echo $myfname;?>-N"
+                value="N"
+                <?php echo $Nchecked?>
+                onclick="<?php echo $checkconditionFunction;?>(this.value, this.name, this.type)"
+            />
+        </label>
+    </td>
+
+    <!-- No Answer -->
+    <?php if($no_answer):?>
+        <td data-title='<?php eT("No answer");?>' class="answer-item radio-item noanswer-item">
+            <label for="answer<?php echo $myfname;?>-">
+                <input
+                    class="radio"
+                    type="radio"
+                    name="<?php echo $myfname;?>"
+                    id="answer<?php echo $myfname;?>-"
+                    value=""
+                    <?php echo $NAchecked?>
+                    onclick="<?php echo $checkconditionFunction;?>(this.value, this.name, this.type)"
+                />
+        </td>
+    <?php endif;?>
+    <input type="hidden" name="java<?php echo $myfname;?>" id="java<?php echo $myfname;?>" value="<?php echo $value; ?>"
+</tr>