From 8d3d9ef776dbf904bcd5f5ce41dfc2741323d572 Mon Sep 17 00:00:00 2001
From: Aaron Schmitz <me@aaronschmitz.com>
Date: Mon, 13 Aug 2012 17:42:20 -0500
Subject: [PATCH] Remove the final traces of type from EM!

---
 .../helpers/expressions/em_manager_helper.php |   8 +-
 application/modules/CheckQuestion.php         |   8 +-
 application/modules/CommentCheckQuestion.php  |   7 +
 application/modules/CommentListQuestion.php   |  19 +++
 application/modules/DateQuestion.php          |   2 +-
 .../modules/DualRadioArrayQuestion.php        |  19 +++
 application/modules/FileQuestion.php          |  14 +-
 .../modules/FiveRadioArrayQuestion.php        |  10 ++
 application/modules/GenderQuestion.php        |   5 +
 application/modules/IDRadioArrayQuestion.php  |  10 ++
 application/modules/ListQuestion.php          |  19 +++
 application/modules/QuestionModule.php        |  10 ++
 application/modules/RadioArrayQuestion.php    |  17 +++
 application/modules/RankingQuestion.php       |  17 +++
 application/modules/TenRadioArrayQuestion.php |  10 ++
 application/modules/YNQuestion.php            |   5 +
 application/modules/YNRadioArrayQuestion.php  |  10 ++
 scripts/expressions/em_javascript.js          | 120 +-----------------
 18 files changed, 180 insertions(+), 130 deletions(-)

diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
index 8f4bdff89b1..e2c346acd71 100644
--- a/application/helpers/expressions/em_manager_helper.php
+++ b/application/helpers/expressions/em_manager_helper.php
@@ -2426,7 +2426,6 @@ private function setVariableAndTokenMappingsForExpressionManager($surveyid,$forc
                 {
                     continue;   // not an SGQA value
                 }
-                $type = $fielddata['type']; //AJS
                 $q->mandatory = $q->mandatory;
                 $fieldNameParts = explode('X',$q->fieldname);
                 $q->aid = (isset($q->aid) ? $q->aid : '');
@@ -2594,8 +2593,9 @@ private function setVariableAndTokenMappingsForExpressionManager($surveyid,$forc
                 . "','sgqa':'" . $q->fieldname
                 . "','qid':" . $q->id
                 . ",'gid':" . $q->gid
-                . ",'type':'" . $type //AJS Javascript!
-                . "','default':'" . (is_null($q->default) ? '' : $q->default)
+                . ",'shownscript': function(value, attr, varName) {" . $q->getShownJS()
+                . "},'valuescript': function(value, attr, varName) {" . $q->getValueJS()
+                . "},'default':'" . (is_null($q->default) ? '' : $q->default)
                 . "','rowdivid':'" . (is_null($rowdivid) ?  '' : $rowdivid)
                 . "','onlynum':'" . ($onlynum ? '1' : '')
                 . "','gseq':" . $q->groupcount
@@ -5608,7 +5608,7 @@ static function GetRelevanceAndTailoringJavaScript()
                 if (count($neededCanonicalAttr) > 0)
                 {
                     $jsParts[] = "var LEMvarNameAttr = {\n";
-                    $jsParts[] = implode(",\n",$neededCanonicalAttr); //AJS This outputs type to javascript!
+                    $jsParts[] = implode(",\n",$neededCanonicalAttr);
                     $jsParts[] = "};\n";
                 }
             }
diff --git a/application/modules/CheckQuestion.php b/application/modules/CheckQuestion.php
index 1dcfd1eb594..b6ad08e8548 100644
--- a/application/modules/CheckQuestion.php
+++ b/application/modules/CheckQuestion.php
@@ -205,7 +205,7 @@ public function getAnswerHTML()
                 $answer .= htmlspecialchars($dispVal,ENT_QUOTES);
             }
             $answer .= "\" onkeyup='if ($.trim(this.value)!=\"\") { \$(\"#answer{$myfname}cbox\").attr(\"checked\",\"checked\"); } else { \$(\"#answer{$myfname}cbox\").attr(\"checked\",\"\"); }; $(\"#java{$myfname}\").val(this.value);$oth_checkconditionFunction(this.value, this.name, this.type); LEMflagMandOther(\"$myfname\",\$(\"#answer{$myfname}cbox\").attr(\"checked\"));'/>";
-            $answer .="\" />";
+
             $answer .="<script type='text/javascript'>\n";
             $answer .="$('#answer{$myfname}').bind('keyup blur',function(){\n";
             $answer .= " if ($.trim($(this).val())!=\"\") { \$(\"#answer{$myfname}cbox\").attr(\"checked\",true); } else { \$(\"#answer{$myfname}cbox\").attr(\"checked\",false); }; $(\"#java{$myfname}\").val($(this).val());$oth_checkconditionFunction(this.value, this.name, this.type); LEMflagMandOther(\"$myfname\",\$(\"#answer{$myfname}cbox\").attr(\"checked\"));\n";
@@ -650,6 +650,12 @@ public function availableOptions()
         return array('other' => true, 'valid' => false, 'mandatory' => true);
     }
 
+    public function getShownJS()
+    {
+        return 'if (typeof attr.question === "undefined" || value == "") return "";'
+                . 'return htmlspecialchars_decode(attr.question);';
+    }
+
     public function availableAttributes($attr = false)
     {
         $attrs=array("array_filter","array_filter_exclude","array_filter_style","assessment_value","display_columns","em_validation_q","em_validation_q_tip","exclude_all_others","exclude_all_others_auto","statistics_showgraph","hide_tip","hidden","max_answers","min_answers","other_numbers_only","other_replace_text","page_break","public_statistics","random_order","parent_order","scale_export","random_group");
diff --git a/application/modules/CommentCheckQuestion.php b/application/modules/CommentCheckQuestion.php
index db6d366af53..52de4c1a598 100644
--- a/application/modules/CommentCheckQuestion.php
+++ b/application/modules/CommentCheckQuestion.php
@@ -317,6 +317,13 @@ public function getAdditionalValParts()
         return $valParts;
     }
 
+    public function getShownJS()
+    {
+        return 'if (typeof attr.question === "undefined" || value == "") return "";'
+                . 'if (varName.match(/comment$/)) return value;'
+                . 'return htmlspecialchars_decode(attr.question);';
+    }
+
     public function availableAttributes($attr = false)
     {
         $attrs=array("array_filter","array_filter_exclude","array_filter_style","assessment_value","em_validation_q","em_validation_q_tip","exclude_all_others","exclude_all_others_auto","statistics_showgraph","hide_tip","hidden","max_answers","min_answers","other_comment_mandatory","other_numbers_only","other_replace_text","page_break","public_statistics","random_order","parent_order","scale_export","random_group");
diff --git a/application/modules/CommentListQuestion.php b/application/modules/CommentListQuestion.php
index 92c8f367894..1b49dfc7ba8 100644
--- a/application/modules/CommentListQuestion.php
+++ b/application/modules/CommentListQuestion.php
@@ -339,6 +339,25 @@ public function availableOptions()
         return array('other' => false, 'valid' => false, 'mandatory' => true);
     }
 
+    public function getShownJS()
+    {
+        return 'if (varName.match(/comment$/)) return value;'
+                . 'which_ans = "0~" + value;'
+                . 'if (typeof attr.answers[which_ans] === "undefined") return value;'
+                . 'answerParts = attr.answers[which_ans].split("|");'
+                . 'answerParts.shift();'
+                . 'return answerParts.join("|");';
+    }
+
+    public function getValueJS()
+    {
+        return 'if (varName.match(/comment$/)) return value;'
+                . 'which_ans = "0~" + value;'
+                . 'if (typeof attr.answers[which_ans] === "undefined") return "";'
+                . 'answerParts = attr.answers[which_ans].split("|");'
+                . 'return answerParts[0];';
+    }
+
     public function availableAttributes($attr = false)
     {
         $attrs=array("alphasort","statistics_showgraph","statistics_graphtype","hide_tip","hidden","page_break","public_statistics","random_order","parent_order","use_dropdown","scale_export","random_group");
diff --git a/application/modules/DateQuestion.php b/application/modules/DateQuestion.php
index 3478fc921c0..0913dc5df31 100644
--- a/application/modules/DateQuestion.php
+++ b/application/modules/DateQuestion.php
@@ -300,7 +300,7 @@ public function getHeaderIncludes()
         
         $includes = array(Yii::app()->getConfig("generalscripts").'date.js' => 'js');
         if (trim($aQuestionAttributes['dropdown_dates'])==0) {
-            $includes[Yii::app()->getConfig("generalscripts").'jquery/lime-calendar.js'] = 'js';
+            $includes[Yii::app()->getConfig("generalscripts").'date.js'] = 'js';
             if ($clang->langcode !== 'en')
             {
                 $includes[Yii::app()->getConfig("generalscripts").'jquery/locale/jquery.ui.datepicker-'.$clang->langcode.'.js'] = 'js';
diff --git a/application/modules/DualRadioArrayQuestion.php b/application/modules/DualRadioArrayQuestion.php
index c1a52496c2d..b495c7854a1 100644
--- a/application/modules/DualRadioArrayQuestion.php
+++ b/application/modules/DualRadioArrayQuestion.php
@@ -743,6 +743,25 @@ public function includeRelevanceStatus()
         return true;
     }
 
+    public function getShownJS()
+    {
+        return 'prefix = (attr.jsName.match(/#1$/)) ? "1" : "0";'
+                . 'which_ans = prefix + "~" + value;'
+                . 'if (typeof attr.answers[which_ans] === "undefined") return "";'
+                . 'answerParts = attr.answers[which_ans].split("|");'
+                . 'answerParts.shift();'
+                . 'return answerParts.join("|");';
+    }
+
+    public function getValueJS()
+    {
+        return 'prefix = (attr.jsName.match(/#1$/)) ? "1" : "0";'
+                . 'which_ans = prefix + "~" + value;'
+                . 'if (typeof attr.answers[which_ans] === "undefined") return "";'
+                . 'answerParts = attr.answers[which_ans].split("|");'
+                . 'return answerParts[0];';
+    }
+
     public function availableAttributes($attr = false)
     {
         $attrs=array("answer_width","repeat_headings","array_filter","array_filter_exclude","array_filter_style","dropdown_prepostfix","dropdown_separators","dualscale_headerA","dualscale_headerB","statistics_showgraph","statistics_graphtype","hide_tip","hidden","max_answers","min_answers","page_break","public_statistics","random_order","parent_order","use_dropdown","scale_export","random_group");
diff --git a/application/modules/FileQuestion.php b/application/modules/FileQuestion.php
index 5ab57712916..a43e969ff62 100644
--- a/application/modules/FileQuestion.php
+++ b/application/modules/FileQuestion.php
@@ -267,10 +267,10 @@ public function filter($value, $type)
             case 'dataentryinsert':
             if (!strpos($this->fieldname, "_filecount"))
             {
-                $this->dataentry = json_decode(stripslashes($value));
+                $dataentry = json_decode(stripslashes($value));
                 $filecount = 0;
 
-                for ($i = 0; $filecount < count($this->dataentry); $i++)
+                for ($i = 0; $filecount < count($dataentry); $i++)
                 {
                     if ($_FILES[$q->fieldname."_file_".$i]['error'] != 4)
                     {
@@ -280,20 +280,20 @@ public function filter($value, $type)
 
                         if (move_uploaded_file($_FILES[$this->fieldname."_file_".$i]['tmp_name'], $target))
                         {
-                            $this->dataentry[$filecount]->filename = basename($target);
-                            $this->dataentry[$filecount]->name = $name;
-                            $this->dataentry[$filecount]->size = $size;
+                            $dataentry[$filecount]->filename = basename($target);
+                            $dataentry[$filecount]->name = $name;
+                            $dataentry[$filecount]->size = $size;
                             $pathinfo = pathinfo($_FILES[$q->fieldname."_file_".$i]['name']);
                             $phparray[$filecount]->ext = $pathinfo['extension'];
                             $filecount++;
                         }
                     }
                 }
-                return ls_json_encode($this->dataentry);
+                return ls_json_encode($dataentry);
             }
             else
             {
-                return count($this->dataentry);
+                return count(json_decode(stripslashes($value)));
             }
         }
     }
diff --git a/application/modules/FiveRadioArrayQuestion.php b/application/modules/FiveRadioArrayQuestion.php
index 7e5cc266fe4..2c22e187516 100644
--- a/application/modules/FiveRadioArrayQuestion.php
+++ b/application/modules/FiveRadioArrayQuestion.php
@@ -197,6 +197,16 @@ public function getVarAttributeValueNAOK($name, $default, $gseq, $qseq, $ansArra
         return LimeExpressionManager::GetVarAttribute($name,'code',$default,$gseq,$qseq);
     }
 
+    public function getShownJS()
+    {
+        return 'return value;';
+    }
+
+    public function getValueJS()
+    {
+        return 'return value;';
+    }
+
     public function availableAttributes($attr = false)
     {
         $attrs=array("answer_width","array_filter","array_filter_exclude","array_filter_style","em_validation_q","em_validation_q_tip","exclude_all_others","statistics_showgraph","statistics_graphtype","hide_tip","hidden","max_answers","min_answers","page_break","public_statistics","random_order","parent_order","random_group");
diff --git a/application/modules/GenderQuestion.php b/application/modules/GenderQuestion.php
index 881227b0df2..393c824199b 100644
--- a/application/modules/GenderQuestion.php
+++ b/application/modules/GenderQuestion.php
@@ -138,6 +138,11 @@ public function getVarAttributeShown($name, $default, $gseq, $qseq, $ansArray)
         }
     }
 
+    public function getShownJS()
+    {
+        return 'return (typeof attr.answers[value] === "undefined") ? "" : attr.answers[value];';
+    }
+
     public function availableAttributes($attr = false)
     {
         $attrs=array("display_columns","statistics_showgraph","statistics_graphtype","hide_tip","hidden","page_break","public_statistics","scale_export","random_group");
diff --git a/application/modules/IDRadioArrayQuestion.php b/application/modules/IDRadioArrayQuestion.php
index 7fec094b92e..bc80358a156 100644
--- a/application/modules/IDRadioArrayQuestion.php
+++ b/application/modules/IDRadioArrayQuestion.php
@@ -266,6 +266,16 @@ public function getVarAttributeShown($name, $default, $gseq, $qseq, $ansArray)
         }
     }
 
+    public function getShownJS()
+    {
+        return 'return (typeof attr.answers[value] === "undefined") ? "" : attr.answers[value];';
+    }
+
+    public function getValueJS()
+    {
+        return 'return value;';
+    }
+
     public function availableAttributes($attr = false)
     {
         $attrs=array("answer_width","array_filter","array_filter_exclude","array_filter_style","em_validation_q","em_validation_q_tip","exclude_all_others","statistics_showgraph","statistics_graphtype","hide_tip","hidden","max_answers","min_answers","page_break","public_statistics","random_order","parent_order","scale_export","random_group");
diff --git a/application/modules/ListQuestion.php b/application/modules/ListQuestion.php
index 6cc5912689b..04b22d7b8f4 100644
--- a/application/modules/ListQuestion.php
+++ b/application/modules/ListQuestion.php
@@ -662,6 +662,25 @@ public function availableOptions()
         return array('other' => true, 'valid' => false, 'mandatory' => true);
     }
 
+    public function getShownJS()
+    {
+        return 'if (varName.match(/_other$/)) return value;'
+                . 'which_ans = "0~" + value;'
+                . 'if (typeof attr.answers[which_ans] === "undefined") return value;'
+                . 'answerParts = attr.answers[which_ans].split("|");'
+                . 'answerParts.shift();'
+                . 'return answerParts.join("|");';
+    }
+
+    public function getValueJS()
+    {
+        return 'if (varName.match(/_other$/)) return value;'
+                . 'which_ans = "0~" + value;'
+                . 'if (typeof attr.answers[which_ans] === "undefined") return "";'
+                . 'answerParts = attr.answers[which_ans].split("|");'
+                . 'return answerParts[0];';
+    }
+
     public function availableAttributes($attr = false)
     {
         $attrs=array("alphasort","array_filter","array_filter_exclude","array_filter_style","display_columns","statistics_showgraph","statistics_graphtype","hide_tip","hidden","other_comment_mandatory","other_numbers_only","other_replace_text","page_break","public_statistics","random_order","parent_order","scale_export","random_group","time_limit","time_limit_action","time_limit_disable_next","time_limit_disable_prev","time_limit_countdown_message","time_limit_timer_style","time_limit_message_delay","time_limit_message","time_limit_message_style","time_limit_warning","time_limit_warning_display_time","time_limit_warning_message","time_limit_warning_style","time_limit_warning_2","time_limit_warning_2_display_time","time_limit_warning_2_message","time_limit_warning_2_style");
diff --git a/application/modules/QuestionModule.php b/application/modules/QuestionModule.php
index 1693425684e..318b5ae2b43 100644
--- a/application/modules/QuestionModule.php
+++ b/application/modules/QuestionModule.php
@@ -485,6 +485,16 @@ public function screenshotCount()
         return 1;
     }
 
+    public function getShownJS()
+    {
+        return 'return value;';
+    }
+
+    public function getValueJS()
+    {
+        return 'return value;';
+    }
+
     public function availableOptions()
     {
         return array('other' => false, 'valid' => false, 'mandatory' => true);
diff --git a/application/modules/RadioArrayQuestion.php b/application/modules/RadioArrayQuestion.php
index 51c3cad0611..445151b250f 100644
--- a/application/modules/RadioArrayQuestion.php
+++ b/application/modules/RadioArrayQuestion.php
@@ -435,6 +435,23 @@ public function getVarAttributeValueNAOK($name, $default, $gseq, $qseq, $ansArra
         }
     }
 
+    public function getShownJS()
+    {
+        return 'which_ans = "0~" + value;'
+                . 'if (typeof attr.answers[which_ans] === "undefined") return value;'
+                . 'answerParts = attr.answers[which_ans].split("|");'
+                . 'answerParts.shift();'
+                . 'return answerParts.join("|");';
+    }
+
+    public function getValueJS()
+    {
+        return 'which_ans = "0~" + value;'
+                . 'if (typeof attr.answers[which_ans] === "undefined") return "";'
+                . 'answerParts = attr.answers[which_ans].split("|");'
+                . 'return answerParts[0];';
+    }
+
     public function availableAttributes($attr = false)
     {
         $attrs=array("answer_width","repeat_headings","array_filter","array_filter_exclude","array_filter_style","em_validation_q","em_validation_q_tip","exclude_all_others","statistics_showgraph","statistics_graphtype","hide_tip","hidden","max_answers","min_answers","page_break","public_statistics","random_order","parent_order","use_dropdown","scale_export","random_group");
diff --git a/application/modules/RankingQuestion.php b/application/modules/RankingQuestion.php
index abc4f6238ca..54bb2d2c69b 100644
--- a/application/modules/RankingQuestion.php
+++ b/application/modules/RankingQuestion.php
@@ -444,6 +444,23 @@ public function getMandatoryTip()
         return $clang->gT('Please rank all items').'.';
     }
 
+    public function getShownJS()
+    {
+        return 'which_ans = "0~" + value;'
+                . 'if (typeof attr.answers[which_ans] === "undefined") return value;'
+                . 'answerParts = attr.answers[which_ans].split("|");'
+                . 'answerParts.shift();'
+                . 'return answerParts.join("|");';
+    }
+
+    public function getValueJS()
+    {
+        return 'which_ans = "0~" + value;'
+                . 'if (typeof attr.answers[which_ans] === "undefined") return "";'
+                . 'answerParts = attr.answers[which_ans].split("|");'
+                . 'return answerParts[0];';
+    }
+
     public function availableAttributes($attr = false)
     {
         $attrs=array("statistics_showgraph","statistics_graphtype","hide_tip","hidden","max_answers","min_answers","page_break","public_statistics","random_order","showpopups","samechoiceheight","samelistheight", "parent_order","rank_title","choice_title","random_group");
diff --git a/application/modules/TenRadioArrayQuestion.php b/application/modules/TenRadioArrayQuestion.php
index 58a84f83df1..c550ed5575e 100644
--- a/application/modules/TenRadioArrayQuestion.php
+++ b/application/modules/TenRadioArrayQuestion.php
@@ -184,6 +184,16 @@ public function availableAttributes($attr = false)
         return $attr?in_array($attr,$attrs):$attrs;
     }
 
+    public function getShownJS()
+    {
+        return 'return value;';
+    }
+
+    public function getValueJS()
+    {
+        return 'return value;';
+    }
+
     public function availableOptions()
     {
         return array('other' => false, 'valid' => false, 'mandatory' => true);
diff --git a/application/modules/YNQuestion.php b/application/modules/YNQuestion.php
index aea2e1532ec..4c43e48a1b6 100644
--- a/application/modules/YNQuestion.php
+++ b/application/modules/YNQuestion.php
@@ -158,6 +158,11 @@ public function getVarAttributeShown($name, $default, $gseq, $qseq, $ansArray)
         }
     }
 
+    public function getShownJS()
+    {
+        return 'return (typeof attr.answers[value] === "undefined") ? "" : attr.answers[value];';
+    }
+
     public function availableAttributes($attr = false)
     {
         $attrs=array("statistics_showgraph","statistics_graphtype","hide_tip","hidden","page_break","public_statistics","scale_export","random_group");
diff --git a/application/modules/YNRadioArrayQuestion.php b/application/modules/YNRadioArrayQuestion.php
index b916a7a1206..d701ecc6222 100644
--- a/application/modules/YNRadioArrayQuestion.php
+++ b/application/modules/YNRadioArrayQuestion.php
@@ -247,6 +247,16 @@ public function getVarAttributeShown($name, $default, $gseq, $qseq, $ansArray)
         }
     }
 
+    public function getShownJS()
+    {
+        return 'return (typeof attr.answers[value] === "undefined") ? "" : attr.answers[value];';
+    }
+
+    public function getValueJS()
+    {
+        return 'return value;';
+    }
+
     public function availableAttributes($attr = false)
     {
         $attrs=array("answer_width","array_filter","array_filter_exclude","array_filter_style","em_validation_q","em_validation_q_tip","exclude_all_others","statistics_showgraph","statistics_graphtype","hide_tip","hidden","max_answers","min_answers","page_break","public_statistics","random_order","parent_order","scale_export","random_group");
diff --git a/scripts/expressions/em_javascript.js b/scripts/expressions/em_javascript.js
index 7a056c9e2f8..0c0e36339f2 100644
--- a/scripts/expressions/em_javascript.js
+++ b/scripts/expressions/em_javascript.js
@@ -364,87 +364,9 @@ function LEMval(alias)
         }
         case 'shown': {
             value = htmlspecialchars_decode(document.getElementById(whichJsName).value);
-            switch(attr.type) //AJS
-            {
-                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
-                    shown = (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
-                    if (attr.type == 'O' && varName.match(/comment$/)) {
-                        answer = value;
-                    }
-                    else if ((attr.type == 'L' || attr.type == '!') && varName.match(/_other$/)) {
-                        answer = value;
-                    }
-                    else {
-                        which_ans = '0~' + value;
-                        if (typeof attr.answers[which_ans] === 'undefined') {
-                            answer = value;
-                        }
-                        else {
-                            answerParts = attr.answers[which_ans].split('|');
-                            answerParts.shift();    // remove the first element
-                            answer = answerParts.join('|');
-                        }
-                    }
-                    shown = answer;
-                    break;
-                case '1': //Array (Flexible Labels) dual scale  // need scale
-                    prefix = (attr.jsName.match(/#1$/)) ? '1' : '0';
-                    which_ans = prefix + '~' + value;
-                    if (typeof attr.answers[which_ans] === 'undefined') {
-                        answer = '';
-                    }
-                    else {
-                        answerParts = attr.answers[which_ans].split('|');
-                        answerParts.shift();    // remove the first element
-                        answer = answerParts.join('|');
-                    }
-                    shown = answer;
-                    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 'D': //DATE
-                case '*': //Equation
-                case 'I': //Language Question
-                case '|': //File Upload
-                case 'X': //BOILERPLATE QUESTION
-                    shown = value; // what about "no answer"?
-                    break;
-                case 'M': //Multiple choice checkbox
-                case 'P': //Multiple choice with comments checkbox + text
-                    if (typeof attr.question === 'undefined' || value == '') {
-                        shown = '';
-                    }
-                    else {
-                        if (attr.type == 'P' && varName.match(/comment$/)) {
-                            shown = value;
-                        }
-                        else {
-                            shown = htmlspecialchars_decode(attr.question);
-                        }
-                    }
-                    break;
-            }
-        }
+            shown = attr.shownscript(value, attr, varName);
             return htmlspecialchars_decode(shown);
+        }
         case 'gid':
             return attr.gid;
         case 'grelevance':
@@ -480,43 +402,7 @@ function LEMval(alias)
             if (suffix == 'value' || suffix == 'valueNAOK') {
                 // if in assessment mode, this returns the assessment value
                 // in non-assessment mode, this is identical to .code
-                switch (attr.type) //AJS
-                {
-                    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
-                        if (attr.type == 'O' && varName.match(/comment$/)) {
-//                            value = value;
-                        }
-                        else if ((attr.type == 'L' || attr.type == '!') && varName.match(/_other$/)) {
-//                            value = value;
-                        }
-                        else {
-                            which_ans = '0~' + value;
-                            if (typeof attr.answers[which_ans] === 'undefined') {
-                                value = '';
-                            }
-                            else {
-                                answerParts = attr.answers[which_ans].split('|');
-                                value = answerParts[0];
-                            }
-                        }
-                        break;
-                    case '1': //Array (Flexible Labels) dual scale  // need scale
-                        prefix = (attr.jsName.match(/#1$/)) ? '1' : '0';
-                        which_ans = prefix + '~' + value;
-                        if (typeof attr.answers[which_ans] === 'undefined') {
-                            value = '';
-                        }
-                        else {
-                            answerParts = attr.answers[which_ans].split('|');
-                            value = answerParts[0];
-                        }
-                        break;
-                }
+                value = attr.valuescript(value, attr, varName);
             }
 
             if (typeof attr.onlynum !== 'undefined' && attr.onlynum==1) {