Dev: Factor out getQuestionNavOptions()

LimeSurvey · Oct 7, 2016 · 1af8dbd · 1af8dbd
1 parent c4e18fd
commit 1af8dbd
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 36 deletions.
diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php
@@ -263,40 +263,10 @@ public function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
         } //if questionscount > 0
         //END Gather Information for this question
 
-
-        $questionNavOptions = CHtml::openTag('optgroup', array('class'=>'activesurveyselect', 'label'=>gT("Before","js")));
-        foreach ($theserows as $row)
-        {
-            $question=$row['question'];
-            $question=strip_tags($question);
-            $questionselecter = viewHelper::flatEllipsizeText($question,true,'40');
-            $questionNavOptions .= CHtml::tag('option', array(
-            'value' => $this->getController()->createUrl("/admin/conditions/sa/index/subaction/editconditionsform/surveyid/$iSurveyID/gid/{$row['gid']}/qid/{$row['qid']}")),
-            strip_tags($row['title']).':'.$questionselecter
-            );
-        }
-        $questionNavOptions .= CHtml::closeTag('optgroup');
-        $questionNavOptions .= CHtml::openTag('optgroup', array('class'=>'activesurveyselect', 'label'=>gT("Current","js")));
-        $question = strip_tags($sCurrentFullQuestionText);
-        $questiontextshort=viewHelper::flatEllipsizeText($question,true,'40');
-        $questionNavOptions .= CHtml::tag('option', array(
-        'value'=>$this->getController()->createUrl("/admin/conditions/sa/index/subaction/editconditionsform/surveyid/$iSurveyID/gid/$gid/qid/$qid"),
-        'selected'=>'selected'),
-        $questiontitle .': '. $questiontextshort);
-        $questionNavOptions .= CHtml::closeTag('optgroup');
-        $questionNavOptions .= CHtml::openTag('optgroup', array('class'=> 'activesurveyselect', 'label'=>gT("After","js")));
-
-        foreach ($postrows as $row)
-        {
-            $question=$row['question'];
-            $question=strip_tags($question);
-            $questionselecter=viewHelper::flatEllipsizeText($question,true,'40');
-            $questionNavOptions .=  CHtml::tag('option', array(
-            'value' => $this->getController()->createUrl("/admin/conditions/sa/index/subaction/editconditionsform/surveyid/$iSurveyID/gid/{$row['gid']}/qid/{$row['qid']}")),
-            strip_tags($row['title']).':'.$questionselecter
-            );
-        }
-        $questionNavOptions .= CHtml::closeTag('optgroup');
+        $args['sCurrentFullQuestionText'] = $sCurrentFullQuestionText;
+        $args['questiontitle'] = $questiontitle;
+        $args['gid'] = $gid;
+        $questionNavOptions = $this->getQuestionNavOptions($theserows, $postrows, $args);
 
         //Now display the information and forms
         //BEGIN: PREPARE JAVASCRIPT TO SHOW MATCHING ANSWERS TO SELECTED QUESTION
@@ -2082,4 +2052,50 @@ protected function getEditFormJavascript($subaction)
         }
         return $aViewUrls['output'];
     }
+
+    /**
+     * The navigator that lets user quickly move to another question within the survey.
+     * @param array $theserows
+     * @param array $postrows
+     * @param array $args
+     * @return string html
+     */
+    protected function getQuestionNavOptions($theserows, $postrows, $args)
+    {
+        extract($args);
+
+        $iSurveyID = $this->iSurveyID;
+
+        $questionNavOptions = CHtml::openTag('optgroup', array('class'=>'activesurveyselect', 'label'=>gT("Before","js")));
+        foreach ($theserows as $row) {
+            $question=$row['question'];
+            $question=strip_tags($question);
+            $questionselecter = viewHelper::flatEllipsizeText($question,true,'40');
+            $questionNavOptions .= CHtml::tag('option', array(
+                'value' => $this->getController()->createUrl("/admin/conditions/sa/index/subaction/editconditionsform/surveyid/$iSurveyID/gid/{$row['gid']}/qid/{$row['qid']}")),
+            strip_tags($row['title']).':'.$questionselecter);
+        }
+        $questionNavOptions .= CHtml::closeTag('optgroup');
+        $questionNavOptions .= CHtml::openTag('optgroup', array('class'=>'activesurveyselect', 'label'=>gT("Current","js")));
+        $question = strip_tags($sCurrentFullQuestionText);
+        $questiontextshort=viewHelper::flatEllipsizeText($question,true,'40');
+        $questionNavOptions .= CHtml::tag('option', array(
+            'value'=>$this->getController()->createUrl("/admin/conditions/sa/index/subaction/editconditionsform/surveyid/$iSurveyID/gid/$gid/qid/$qid"),
+            'selected'=>'selected'),
+        $questiontitle .': '. $questiontextshort);
+        $questionNavOptions .= CHtml::closeTag('optgroup');
+        $questionNavOptions .= CHtml::openTag('optgroup', array('class'=> 'activesurveyselect', 'label'=>gT("After","js")));
+
+        foreach ($postrows as $row) {
+            $question=$row['question'];
+            $question=strip_tags($question);
+            $questionselecter=viewHelper::flatEllipsizeText($question,true,'40');
+            $questionNavOptions .=  CHtml::tag('option', array(
+                'value' => $this->getController()->createUrl("/admin/conditions/sa/index/subaction/editconditionsform/surveyid/$iSurveyID/gid/{$row['gid']}/qid/{$row['qid']}")),
+            strip_tags($row['title']).':'.$questionselecter);
+        }
+        $questionNavOptions .= CHtml::closeTag('optgroup');
+
+        return $questionNavOptions;
+    }
 }
diff --git a/application/views/admin/conditions/includes/form_editconditions_header.php b/application/views/admin/conditions/includes/form_editconditions_header.php
@@ -37,9 +37,9 @@
                     <?php endif;?>
                     <?php if($showScenario):?>
                         &nbsp;
-                        <a class='btn btn-default' id='scenarioaddbtn' href='#' onclick="scenarioaddbtnOnClickAction();" >
+                        <button class='btn btn-default' id='scenarioaddbtn' onclick="scenarioaddbtnOnClickAction(); return false;" >
                             <span class='icon-add'></span>&nbsp;<?php eT('Add scenario'); ?>
-                        </a>
+                        </button>
                     <?php endif;?>
                 </div>
             </div>