Dev: Add ? question type to some EM switches

LimeSurvey · Sep 4, 2016 · 27973de · 27973de
1 parent ae1c226
commit 27973de
Showing 1 changed file with 29 additions and 0 deletions.
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -3775,6 +3775,13 @@ private function setVariableAndTokenMappingsForExpressionManager($surveyid,$forc
                     case 'E': //ARRAY (Increase/Same/Decrease) radio-buttons
                         $ansArray = $presets[$type];
                         break;
+                    case '?':
+                        // TODO: Replace with function call to queston object
+                        $ansArray = NULL;
+                        break;
+                    default:
+                        assert(false);
+                        break;
                 }
 
                 // set $subqtext text - for display of primary sub-question
@@ -3868,6 +3875,19 @@ private function setVariableAndTokenMappingsForExpressionManager($surveyid,$forc
                         //                    $question = $fielddata['question'] . ': ' . $fielddata['subquestion1'] . '[' . $fielddata['subquestion2'] . ']';
                         $rowdivid = substr($sgqa,0,strpos($sgqa,'_'));
                         break;
+                    case '?':
+                        // TODO: Replace with function call to queston object
+                        $csuffix = '';
+                        $sqsuffix = '';
+                        $varName = $fielddata['title'];
+                        if ($fielddata['aid'] != '') {
+                            $varName .= '_' . $fielddata['aid'];
+                        }
+                        $question = $fielddata['question'];
+                        break;
+                    default:
+                        assert(false);
+                        break;
                 }
 
                 // $onlynum
@@ -3990,6 +4010,15 @@ private function setVariableAndTokenMappingsForExpressionManager($surveyid,$forc
                             $jsVarName_on = $jsVarName;
                         }
                         break;
+                    case "?":
+                        // TODO: Replace with function call to queston object
+                        $jsVarName_on = 'answer' . $sgqa;
+                        $jsVarName = 'java' . $sgqa;
+                        break;
+                    default:
+                        // Impossible
+                        assert(false);
+                        break;
                 }
                 // Hidden question are never on same page (except for equation)
                 if($hidden && $type!="*"){