Dev: language question type, human readable views

LimeSurvey · Apr 4, 2016 · bfea401 · bfea401
1 parent 420e152
commit bfea401
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -1150,18 +1150,16 @@ function do_date($ia)
 function do_language($ia)
 {
     $checkconditionFunction = "checkconditions";
-    $answerlangs = Survey::model()->findByPk(Yii::app()->getConfig('surveyID'))->additionalLanguages;
-    $answerlangs [] = Survey::model()->findByPk(Yii::app()->getConfig('surveyID'))->language;
+    $answerlangs            = Survey::model()->findByPk(Yii::app()->getConfig('surveyID'))->additionalLanguages;
+    $answerlangs[]          = Survey::model()->findByPk(Yii::app()->getConfig('surveyID'))->language;
+    $sLang                  = $_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang'];
 
-    // Get actual answer
-    $sLang=$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['s_lang'];
-
-    if(!in_array($sLang,$answerlangs))
+    if (!in_array($sLang,$answerlangs))
     {
-        $sLang=Survey::model()->findByPk(Yii::app()->getConfig('surveyID'))->language;
+        $sLang = Survey::model()->findByPk(Yii::app()->getConfig('surveyID'))->language;
     }
 
-    $inputnames[]=$ia[1];
+    $inputnames[] = $ia[1];
 
     $languageData = array(
         'name'=>$ia[1],
@@ -1170,14 +1168,7 @@ function do_language($ia)
         'sLang'=>$sLang,
     );
 
-    $answer = Yii::app()->getController()->renderPartial('/survey/questions/language/language', $languageData, true);
-    $answer .= "<script type='text/javascript'>\n"
-    . "/*<![CDATA[*/\n"
-    ."$('#answer{$ia[1]}').change(function(){ "
-    ."$('<input type=\"hidden\">').attr('name','lang').val($(this).val()).appendTo($('form#limesurvey'));"
-    ." })\n"
-    ." /*]]>*/\n"
-    ."</script>\n";
+    $answer  = Yii::app()->getController()->renderPartial('/survey/questions/language/answer', $languageData, true);
     return array($answer, $inputnames);
 }
 

diff --git a/...ws/survey/questions/language/language.php → ...iews/survey/questions/language/answer.php b/...ws/survey/questions/language/language.php → ...iews/survey/questions/language/answer.php
@@ -1,12 +1,15 @@
 <?php
 /**
- * Language Html
- * @var $name                        $ia[1]
- * @var $checkconditionFunction      $checkconditionFunction(this.value, this.name, this.type);
+ * Language HTML
+ * @var $name
+ * @var $checkconditionFunction
  * @var $answerlangs
  * @var $sLang
  */
 ?>
+<!-- Language -->
+
+<!-- answer -->
 <p class="question answer-item dropdown-item langage-item">
     <label for='answer<?php echo $name; ?>' class='hide label'>
         <?php eT('Choose your language'); ?>
@@ -22,3 +25,12 @@
     </select>
     <input type="hidden" name="java<?php echo $name; ?>" id="java<?php echo $name; ?>" value="<?php echo $sLang; ?>" />
 </p>
+
+<script type='text/javascript'>
+/*<![CDATA[*/
+    $('#answer<?php echo $name; ?>').change(function(){
+        $('<input type="hidden">').attr('name','lang').val($(this).val()).appendTo($('form#limesurvey'));
+    });
+/*]]>*/
+</script>
+<!-- end of answer -->