Dev Added sample survey testing all of Expression Manager's capabilities

Dev It includes all question types and all types of relevance, validation, array_filter, question attributes parsed by EM, defaults, etc. Dev Also a couple of small bug-fixes git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev_tms@11650 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Dec 13, 2011 · 47fa03f · 47fa03f
1 parent 69eed50
commit 47fa03f
Show file tree

Hide file tree

Showing 4 changed files with 17,655 additions and 4 deletions.
diff --git a/classes/eval/ExpressionManager.php b/classes/eval/ExpressionManager.php
@@ -1549,7 +1549,7 @@ private function GetVarAttribute($name,$attr,$default)
                             $ansArray = $var['ansArray'];
                             if (is_null($ansArray))
                             {
-                                $shown=$default;
+                                $shown=$code;
                             }
                             else
                             {
@@ -1559,7 +1559,7 @@ private function GetVarAttribute($name,$attr,$default)
                                     $answer = join('|',$answerInfo);
                                 }
                                 else {
-                                    $answer = $default;
+                                    $answer = $code;
                                 }
                                 $shown = $answer;
                             }

diff --git a/classes/eval/LimeExpressionManager.php b/classes/eval/LimeExpressionManager.php
@@ -4948,7 +4948,7 @@ static public function ShowSurveyLogicFile($sid, $language=NULL, $gid=NULL, $qid
                 $ginfo = $LEM->gseq2info[$gseq];
 
                 $grelevance = '{' . (($ginfo['grelevance']=='') ? 1 : $ginfo['grelevance']) . '}';
-                $gtext = ((trim($ginfo['description']) != '') ? '&nbsp;' : $ginfo['description']);
+                $gtext = ((trim($ginfo['description']) == '') ? '&nbsp;' : $ginfo['description']);
 
                 $groupRow = "<tr class='LEMgroup'>"
                 . "<td>G-$gseq</td>"

diff --git a/classes/eval/em_javascript.js b/classes/eval/em_javascript.js
@@ -262,7 +262,7 @@ function LEMval(alias)
                 case 'R': //RANKING STYLE
                     which_ans = '0~' + value;
                     if (typeof attr.answers[which_ans] === 'undefined') {
-                        answer = '';
+                        answer = value;
                     }
                     else {
                         answerParts = attr.answers[which_ans].split('|');