More type -> object porting in EM

LimeSurvey · Aug 13, 2012 · ea436e2 · ea436e2
1 parent 4a3b3db
commit ea436e2
Show file tree

Hide file tree

Showing 7 changed files with 66 additions and 118 deletions.
diff --git a/application/controllers/admin/dataentry.php b/application/controllers/admin/dataentry.php
@@ -1247,7 +1247,6 @@ public function view($surveyid, $lang=NULL)
                     $cdata['qidattributes'] = $qidattributes;
                     $hidden = (isset($qidattributes['hidden']) ? $qidattributes['hidden'] : 0);
                     // TODO - can questions be hidden?  Are JavaScript variables names used?  Consistently with everywhere else?
-                    //                    LimeExpressionManager::ProcessRelevance($qidattributes['relevance'],$deqrow['qid'],NULL,$deqrow['type'],$hidden);
 
                     // TMSW Conditions->Relevance:  Show relevance equation instead of conditions here - better yet, have data entry use survey-at-a-time but with different view
 

diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
diff --git a/application/modules/CommentCheckQuestion.php b/application/modules/CommentCheckQuestion.php
@@ -296,7 +296,7 @@ public function getCommentMandatorySQ()
 
     public function getAdditionalValParts()
     {
-        $othervar = 'amswer' . $this->fieldname;
+        $othervar = 'answer' . $this->fieldname;
         $valParts[] = "\n  if(isValidOtherComment" . $this->id . "){\n";
         $valParts[] = "    $('#" . $othervar . "').addClass('em_sq_validation').removeClass('error').addClass('good');\n";
         $valParts[] = "  }\n  else {\n";

diff --git a/application/modules/DateQuestion.php b/application/modules/DateQuestion.php
@@ -264,6 +264,7 @@ public function filter($value, $type)
         switch ($type)
         {
             case 'get':
+            case 'post':
             global $thissurvey;
             $dateformatdatat=getDateFormatData($thissurvey['surveyls_dateformat']);
             $datetimeobj = new Date_Time_Converter($value, $dateformatdatat['phpdate']);

diff --git a/application/modules/FileQuestion.php b/application/modules/FileQuestion.php
@@ -263,6 +263,7 @@ public function filter($value, $type)
             }
             case 'db':
             return $value;
+            case 'post':
             case 'dataentryinsert':
             if (!strpos($this->fieldname, "_filecount"))
             {

diff --git a/application/modules/NumericalQuestion.php b/application/modules/NumericalQuestion.php
@@ -173,6 +173,16 @@ public function getPregSQ($sgqaNaming, $sq)
         }
     }
 
+    public function getAdditionalValParts()
+    {
+        $valParts[] = "\n  if(isValidOther" . $this->id . "){\n";
+        $valParts[] = "    $('#question" . $this->id . " :input').addClass('em_sq_validation').removeClass('error').addClass('good');\n";
+        $valParts[] = "  }\n  else {\n";
+        $valParts[] = "    $('#question" . $this->id . " :input').addClass('em_sq_validation').removeClass('good').addClass('error');\n";
+        $valParts[] = "  }\n";
+        return $valParts;
+    }
+
     public function availableAttributes($attr = false)
     {
         $attrs=array("em_validation_q","em_validation_q_tip","em_validation_sq","em_validation_sq_tip","statistics_showgraph","statistics_graphtype","hide_tip","hidden","max_num_value_n","maximum_chars","min_num_value_n","num_value_int_only","page_break","prefix","public_statistics","suffix","text_input_width","random_group");

diff --git a/application/modules/TextQuestion.php b/application/modules/TextQuestion.php
@@ -70,10 +70,10 @@ public function generateSQInfo($ansArray)
 
     public function getAdditionalValParts()
     {
-        $valParts[] = "\n  if(isValidSum" . $this->id . "){\n";
-        $valParts[] = "    $('#totalvalue_" . $this->id . "').removeClass('error').addClass('good');\n";
+        $valParts[] = "\n  if(isValidOther" . $this->id . "){\n";
+        $valParts[] = "    $('#question" . $this->id . " :input').addClass('em_sq_validation').removeClass('error').addClass('good');\n";
         $valParts[] = "  }\n  else {\n";
-        $valParts[] = "    $('#totalvalue_" . $this->id . "').removeClass('good').addClass('error');\n";
+        $valParts[] = "    $('#question" . $this->id . " :input').addClass('em_sq_validation').removeClass('good').addClass('error');\n";
         $valParts[] = "  }\n";
         return $valParts;
     }