Skip to content

Commit

Permalink
Dev EM-based on-page dynamic Assessments now fully functional
Browse files Browse the repository at this point in the history 
Dev Javascript now has full array of answers for each question, so if change a response on a page and want to show {INSERTANS:xxx} or qcode.shown on the same page, it works


git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_ci@11114 b72ed6b6-b9f8-46b5-92b4-906544132732
  • Loading branch information
@TMSWhite
TMSWhite committed Oct 6, 2011
1 parent 9e9b9e4 commit d802508
Show file tree
Hide file tree
Showing 4 changed files with 134 additions and 80 deletions.
4 changes: 3 additions & 1 deletion application/helpers/expressions/em_core_helper.php
View file
Expand Up @@ -58,7 +58,7 @@ function __construct()
$regex_binary = '[+*/-]';
$regex_compare = '<=|<|>=|>|==|!=|\ble\b|\blt\b|\bge\b|\bgt\b|\beq\b|\bne\b';
$regex_assign = '=|\+=|-=|\*=|/=';
$regex_sgqa = '(?:INSERTANS:)?[0-9]+X[0-9]+X[0-9]+[A-Z0-9_]*\#?[12]?';
$regex_sgqa = '(?:INSERTANS:)?[0-9]+X[0-9]+X[0-9]+[A-Z0-9_]*\#?[01]?';
$regex_word = '(?:TOKEN:)?(?:[A-Z][A-Z0-9_]*)?(?:\.(?:' . ExpressionManager::$regex_var_attr . '))?';
$regex_number = '[0-9]+\.?[0-9]*|\.[0-9]+';
$regex_andor = '\band\b|\bor\b|&&|\|\|';
Expand Down Expand Up @@ -1181,9 +1181,11 @@ public function GetJavaScriptFunctionForReplacement($questionNum, $name,$eqn)
{
$jsParts = array();
$jsParts[] = "\n// Tailor Question " . $questionNum . " - " . $name . ": { " . $eqn . " }\n";
$jsParts[] = "try{\n";
$jsParts[] = "document.getElementById('" . $name . "').innerHTML=\n";
$jsParts[] = $this->GetJavaScriptEquivalentOfExpression();
$jsParts[] = ";\n";
$jsParts[] = "} catch (e) { }\n";
return implode('',$jsParts);
}

Expand Down
154 changes: 79 additions & 75 deletions application/helpers/expressions/em_manager_helper.php
View file
Expand Up @@ -279,6 +279,26 @@ public function setVariableAndTokenMappingsForExpressionManager($surveyid,$force
$CI =& get_instance();
$clang = $CI->limesurvey_lang;

$presets = array();
$presets['G'] = array( //GENDER drop-down list
'M' => $clang->gT("Male"),
'F' => $clang->gT("Female"),
);
$presets['Y'] = array( //YES/NO radio-buttons
'Y' => $clang->gT("Yes"),
'N' => $clang->gT("No"),
);
$presets['C'] = array( //ARRAY (YES/UNCERTAIN/NO) radio-buttons
'Y' => $clang->gT("Yes"),
'N' => $clang->gT("No"),
'U' => $clang->gT("Uncertain"),
);
$presets['E'] = array( //ARRAY (Increase/Same/Decrease) radio-buttons
'I' => $clang->gT("Increase"),
'S' => $clang->gT("Same"),
'D' => $clang->gT("Decrease"),
);

$CI->load->model('question_attributes_model');
$qattr = $CI->question_attributes_model->getEMRelatedRecordsForSurvey($surveyid); // what happens if $surveyid is null?
Expand Down Expand Up @@ -325,81 +345,55 @@ public function setVariableAndTokenMappingsForExpressionManager($surveyid,$force
}

$readWrite = 'N';
if (isset($_SESSION[$code]))
{
$codeValue = $_SESSION[$code];

// don't call retrieve_Answer()
$displayValue = ''; // default to blank?
switch($fielddata['type'])
{
case '!': //List - dropdown
case 'L': //LIST drop-down/radio-button list
case 'O': //LIST WITH COMMENT drop-down/radio-button list + textarea
case '1': //Array (Flexible Labels) dual scale // need scale
case 'H': //ARRAY (Flexible) - Column Format
case 'F': //ARRAY (Flexible) - Row Format
case 'R': //RANKING STYLE
$which_ans = $scale_id . ':' . $codeValue;
$displayValue = (isset($qans[$questionNum][$which_ans])) ? $qans[$questionNum][$which_ans] : ''; // what should default be?
break;
case 'A': //ARRAY (5 POINT CHOICE) radio-buttons
case 'B': //ARRAY (10 POINT CHOICE) radio-buttons
case ':': //ARRAY (Multi Flexi) 1 to 10
case '5': //5 POINT CHOICE radio-buttons
$displayValue = $codeValue; // what about "no answer"?
break;
case 'N': //NUMERICAL QUESTION TYPE
case 'K': //MULTIPLE NUMERICAL QUESTION
case 'Q': //MULTIPLE SHORT TEXT
case ';': //ARRAY (Multi Flexi) Text
case 'S': //SHORT FREE TEXT
case 'T': //LONG FREE TEXT
case 'U': //HUGE FREE TEXT
case 'M': //Multiple choice checkbox
case 'P': //Multiple choice with comments checkbox + text
case 'D': //DATE
case '*': //Equation
case 'I': //Language Question
case '|': //File Upload
case 'X': //BOILERPLATE QUESTION
$displayValue = $codeValue; // TODO - is this correct?
break;
case 'G': //GENDER drop-down list
switch ($codeValue) {
case 'M': $displayValue = $clang->gT("Male"); break;
case 'F': $displayValue = $clang->gT("Female"); break;
}
break;
case 'Y': //YES/NO radio-buttons
switch ($codeValue) {
case 'Y': $displayValue = $clang->gT("Yes"); break;
case 'N': $displayValue = $clang->gT("No"); break;
}
break;
case 'C': //ARRAY (YES/UNCERTAIN/NO) radio-buttons
switch ($codeValue) {
case 'Y': $displayValue = $clang->gT("Yes"); break;
case 'N': $displayValue = $clang->gT("No"); break;
case 'U': $displayValue = $clang->gT("Uncertain"); break;
}
break;
case 'E': //ARRAY (Increase/Same/Decrease) radio-buttons
switch ($codeValue) {
case 'I': $displayValue = $clang->gT("Increase"); break;
case 'S': $displayValue = $clang->gT("Same"); break;
case 'D': $displayValue = $clang->gT("Decrease"); break;
}
break;
}
}
else

$codeValue = (isset($_SESSION[$code])) ? $_SESSION[$code] : '';
$displayValue = ''; // default to blank or $clang->gT("No Answer")?
switch($type)
{
$codeValue = '';
$displayValue = '';
case '!': //List - dropdown
case 'L': //LIST drop-down/radio-button list
case 'O': //LIST WITH COMMENT drop-down/radio-button list + textarea
case '1': //Array (Flexible Labels) dual scale // need scale
case 'H': //ARRAY (Flexible) - Column Format
case 'F': //ARRAY (Flexible) - Row Format
case 'R': //RANKING STYLE
$which_ans = $scale_id . '~' . $codeValue;
$displayValue = (isset($qans[$questionNum][$which_ans])) ? $qans[$questionNum][$which_ans] : ''; // what should default be?
$ansArray = $qans[$questionNum];
break;
case 'A': //ARRAY (5 POINT CHOICE) radio-buttons
case 'B': //ARRAY (10 POINT CHOICE) radio-buttons
case ':': //ARRAY (Multi Flexi) 1 to 10
case '5': //5 POINT CHOICE radio-buttons
$displayValue = $codeValue; // what about "no answer"?
break;
case 'N': //NUMERICAL QUESTION TYPE
case 'K': //MULTIPLE NUMERICAL QUESTION
case 'Q': //MULTIPLE SHORT TEXT
case ';': //ARRAY (Multi Flexi) Text
case 'S': //SHORT FREE TEXT
case 'T': //LONG FREE TEXT
case 'U': //HUGE FREE TEXT
case 'M': //Multiple choice checkbox
case 'P': //Multiple choice with comments checkbox + text
case 'D': //DATE
case '*': //Equation
case 'I': //Language Question
case '|': //File Upload
case 'X': //BOILERPLATE QUESTION
$displayValue = $codeValue; // TODO - is this correct?
$ansArray = NULL;
break;
case 'G': //GENDER drop-down list
case 'Y': //YES/NO radio-buttons
case 'C': //ARRAY (YES/UNCERTAIN/NO) radio-buttons
case 'E': //ARRAY (Increase/Same/Decrease) radio-buttons
$displayValue = (isset($presets[$type][$codeValue])) ? $presets[$type][$codeValue] : '';
$ansArray = $presets[$type];
break;
}

switch($fielddata['type'])
switch($type)
{
case '!': //List - dropdown
case '5': //5 POINT CHOICE radio-buttons
Expand Down Expand Up @@ -443,7 +437,7 @@ public function setVariableAndTokenMappingsForExpressionManager($surveyid,$force
$question = $fielddata['question'] . ': ' . $fielddata['subquestion1'] . '[' . $fielddata['subquestion2'] . ']';
break;
}
switch($fielddata['type'])
switch($type)
{
case 'R': //RANKING STYLE
if ($isOnCurrentPage=='Y')
Expand Down Expand Up @@ -544,7 +538,17 @@ public function setVariableAndTokenMappingsForExpressionManager($surveyid,$force
$this->alias2varName[$code] = array('jsName'=>$jsVarName, 'jsPart' => "'" . $code . "':'" . $jsVarName . "'");
$this->alias2varName['INSERTANS:' . $code] = array('jsName'=>$jsVarName, 'jsPart' => "'INSERTANS:" . $code . "':'" . $jsVarName . "'");

$this->varNameAttr[$jsVarName] = "'" . $jsVarName . "':{"
// TODO - should these arrays only be built for questions that require substitution at run-time?
$ansList = '';
if (!is_null($ansArray)) {
$answers = array();
foreach ($ansArray as $key => $value) {
$answers[] = "'" . $key . "':'" . htmlspecialchars(preg_replace('/[[:space:]]/',' ',$value),ENT_QUOTES) . "'";
}
$ansList = ",'answers':{ " . implode(",",$answers) . "}";
}

$this->varNameAttr[$jsVarName] = "'" . $jsVarName . "':{ "
. "'jsName':'" . $jsVarName
// . "','code':'" . htmlspecialchars(preg_replace('/[[:space:]]/',' ',$codeValue),ENT_QUOTES)
. "','qid':" . $questionNum
Expand All @@ -553,7 +557,7 @@ public function setVariableAndTokenMappingsForExpressionManager($surveyid,$force
. "','type':'" . $type
. "','relevance':'" . htmlspecialchars(preg_replace('/[[:space:]]/',' ',$relevance),ENT_QUOTES)
. "','shown':'" . htmlspecialchars(preg_replace('/[[:space:]]/',' ',$displayValue),ENT_QUOTES)
. "'}";
. "'".$ansList."}";

if ($this->debugLEM)
{
Expand Down
4 changes: 2 additions & 2 deletions application/models/answers_model.php
View file
Expand Up @@ -120,7 +120,7 @@ function getAllAnswersForEM($surveyid=NULL,$qid=NULL,$lang=NULL)
." FROM ".$this->db->dbprefix('answers')
." WHERE ".$where
.$lang
." ORDER BY qid, sortorder";
." ORDER BY qid, scale_id, sortorder";

$data = $this->db->query($query);

Expand All @@ -130,7 +130,7 @@ function getAllAnswersForEM($surveyid=NULL,$qid=NULL,$lang=NULL)
if (!isset($qans[$row['qid']])) {
$qans[$row['qid']] = array();
}
$qans[$row['qid']][$row['scale_id'].':'.$row['code']] = $row['answer'];
$qans[$row['qid']][$row['scale_id'].'~'.$row['code']] = $row['answer'];
}

return $qans;
Expand Down
52 changes: 50 additions & 2 deletions scripts/admin/expressions/em_javascript.js
View file
Expand Up @@ -198,11 +198,59 @@ function LEMval(alias)
return '';
}
}
if (str.match(/^INSERTANS:/)) {
suffix = 'shown';
}
// values should always be stored encoded with htmlspecialchars()
switch (suffix) {
case 'displayValue':
case 'shown':
return htmlspecialchars_decode(attr.shown);
case 'shown': {
value = htmlspecialchars_decode(document.getElementById(attr.jsName).value);
switch(attr.type)
{
case 'G': //GENDER drop-down list
case 'Y': //YES/NO radio-buttons
case 'C': //ARRAY (YES/UNCERTAIN/NO) radio-buttons
case 'E': //ARRAY (Increase/Same/Decrease) radio-buttons
displayValue = (typeof attr.answers[value] === 'undefined') ? '' : attr.answers[value];
break;
case '!': //List - dropdown
case 'L': //LIST drop-down/radio-button list
case 'O': //LIST WITH COMMENT drop-down/radio-button list + textarea
case 'H': //ARRAY (Flexible) - Column Format
case 'F': //ARRAY (Flexible) - Row Format
case 'R': //RANKING STYLE
which_ans = '0~' + value;
displayValue = (typeof attr.answers[which_ans] === 'undefined') ? '' : attr.answers[which_ans];
break;
case '1': //Array (Flexible Labels) dual scale // need scale
prefix = (attr.jsName.match(/#1$/)) ? '1' : '0';
which_ans = prefix + '~' + value;
displayValue = (typeof attr.answers[which_ans] === 'undefined') ? '' : attr.answers[which_ans];
break;
case 'A': //ARRAY (5 POINT CHOICE) radio-buttons
case 'B': //ARRAY (10 POINT CHOICE) radio-buttons
case ':': //ARRAY (Multi Flexi) 1 to 10
case '5': //5 POINT CHOICE radio-buttons
case 'N': //NUMERICAL QUESTION TYPE
case 'K': //MULTIPLE NUMERICAL QUESTION
case 'Q': //MULTIPLE SHORT TEXT
case ';': //ARRAY (Multi Flexi) Text
case 'S': //SHORT FREE TEXT
case 'T': //LONG FREE TEXT
case 'U': //HUGE FREE TEXT
case 'M': //Multiple choice checkbox
case 'P': //Multiple choice with comments checkbox + text
case 'D': //DATE
case '*': //Equation
case 'I': //Language Question
case '|': //File Upload
case 'X': //BOILERPLATE QUESTION
displayValue = value; // what about "no answer"?
break;
}
}
return htmlspecialchars_decode(displayValue);
case 'qid':
return attr.qid;
case 'mandatory':
Expand Down

0 comments on commit d802508

Please sign in to comment.