Add groupSec property.

LimeSurvey · Jun 4, 2012 · f038cbf · f038cbf
1 parent eb12ae0
commit f038cbf
Show file tree

Hide file tree

Showing 13 changed files with 97 additions and 18 deletions.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -2070,22 +2070,16 @@ function createFieldMap($surveyid, $style='short', $force_refresh=false, $questi
         $fieldname="{$arow['sid']}X{$arow['gid']}X{$arow['qid']}";
         $pq = createQuestion($arow->question_types['class'], $surveyid, $arow['qid'], $fieldname,
         $arow['title'], $arow['question'], $arow['gid'], $arow['mandatory'], $conditions,
-        $usedinconditions, $questionSeq, $groupSeq, $sLanguage);
+        $usedinconditions, $questionSeq, null, $sLanguage);
         $pq->aid = '';
         if(isset($defaults[$arow['qid']])) $pq->default = $defaults[$arow['qid']];
 
         $pq->preg = $arow['preg'];
         $pq->other = $arow['other'];
         $pq->groupname = $arow->groups['group_name'];
+        $pq->groupcount = $groupSeq;
         $add = $pq->createFieldmap($arow['type']);
 
-        foreach($add as $key=>$value)
-        {
-            unset($add[$key]['q']);
-            unset($add[$key]['pq']);            
-        }
-
-
         if (count($add))
         {
             $tmp=array_values($add);

diff --git a/application/modules/ArrayQuestion.php b/application/modules/ArrayQuestion.php
@@ -39,7 +39,7 @@ public function createFieldmap($type=null)
             $field['hasconditions']=$this->conditionsexist;
             $field['usedinconditions']=$this->usedinconditions;
             $field['questionSeq']=$this->questioncount;
-            $field['groupSeq']=$this->randomgid;
+            $field['groupSeq']=$this->groupcount;
             $field['preg']=$this->preg;
             if(isset($this->default[$abrow['qid']])) $field['defaultvalue']=$this->default[$abrow['qid']];
             $field['pq']=$this;

diff --git a/application/modules/CheckQuestion.php b/application/modules/CheckQuestion.php
@@ -370,7 +370,7 @@ public function createFieldmap($type=null)
             $field['hasconditions']=$this->conditionsexist;
             $field['usedinconditions']=$this->usedinconditions;
             $field['questionSeq']=$this->questioncount;
-            $field['groupSeq']=$this->randomgid;
+            $field['groupSeq']=$this->groupcount;
             $field['preg']=$this->preg;
             if(isset($this->default[$abrow['qid']])) $field['defaultvalue']=$this->default[$abrow['qid']];
             $field['pq']=$this;

diff --git a/application/modules/DateQuestion.php b/application/modules/DateQuestion.php
@@ -209,6 +209,29 @@ public function getAnswerHTML()
 
         return $answer;
     }
+
+    public function filterGET($value)
+    {
+        global $thissurvey;
+        if (trim($value)=="")
+        {
+            return NULL;
+        }
+        else
+        {
+            $dateformatdatat=getDateFormatData($thissurvey['surveyls_dateformat']);
+            $datetimeobj = new Date_Time_Converter($value, $dateformatdatat['phpdate']);
+            return $datetimeobj->convert("Y-m-d");
+        }
+    }
+
+    public function prepareValue($value)
+    {
+        if (trim($val)=='') {
+            return NULL;
+        }
+        return $value;
+    }
 
     public function availableAttributes($attr = false)
     {

diff --git a/application/modules/DualRadioArrayQuestion.php b/application/modules/DualRadioArrayQuestion.php
@@ -638,7 +638,7 @@ public function createFieldmap($type=null)
             $field['hasconditions']=$this->conditionsexist;
             $field['usedinconditions']=$this->usedinconditions;
             $field['questionSeq']=$this->questioncount;
-            $field['groupSeq']=$this->randomgid;
+            $field['groupSeq']=$this->groupcount;
             $field['pq']=$this;
             $q = clone $this;
             $q->fieldname = $fieldname;

diff --git a/application/modules/FileQuestion.php b/application/modules/FileQuestion.php
@@ -192,7 +192,7 @@ public function createFieldmap($type=null)
             $field['hasconditions']=$this->conditionsexist;
             $field['usedinconditions']=$this->usedinconditions;
             $field['questionSeq']=$this->questioncount;
-            $field['groupSeq']=$this->randomgid;
+            $field['groupSeq']=$this->groupcount;
             $field['pq']=$this;
             $field['q']=$this;
             $field2=$field;
@@ -212,6 +212,16 @@ public function createFieldmap($type=null)
         return $map;
     }
 
+    public function fileUpload()
+    {
+        return true;
+    }
+
+    public function filterGET($value)
+    {
+        return NULL;
+    }
+
     public function availableAttributes($attr = false)
     {
         $attrs=array("statistics_showgraph","statistics_graphtype","hide_tip","hidden","page_break","show_title","show_comment","max_filesize","max_num_of_files","min_num_of_files","allowed_filetypes","random_group");

diff --git a/application/modules/MultinumericalQuestion.php b/application/modules/MultinumericalQuestion.php
@@ -362,7 +362,7 @@ public function createFieldmap($type=null)
             $field['hasconditions']=$this->conditionsexist;
             $field['usedinconditions']=$this->usedinconditions;
             $field['questionSeq']=$this->questioncount;
-            $field['groupSeq']=$this->randomgid;
+            $field['groupSeq']=$this->groupcount;
             $field['preg']=$this->preg;
             if(isset($this->default[$abrow['qid']])) $field['defaultvalue']=$this->default[$abrow['qid']];
             $field['pq']=$this;
@@ -375,6 +375,24 @@ public function createFieldmap($type=null)
         }
         return $map;
     }
+
+    public function filterGET($value)
+    {
+        if (trim($value)=="") {
+            return NULL;
+        }
+        else {
+            return sanitize_float($value);
+        }
+    }
+
+    public function prepareValue($value)
+    {
+        if (trim($val)=='') {
+            return NULL;
+        }
+        return $value;
+    }
 
     public function availableAttributes($attr = false)
     {

diff --git a/application/modules/MultitextQuestion.php b/application/modules/MultitextQuestion.php
@@ -212,7 +212,7 @@ public function createFieldmap($type=null)
             $field['hasconditions']=$this->conditionsexist;
             $field['usedinconditions']=$this->usedinconditions;
             $field['questionSeq']=$this->questioncount;
-            $field['groupSeq']=$this->randomgid;
+            $field['groupSeq']=$this->groupcount;
             $field['preg']=$this->preg;
             if(isset($this->default[$abrow['qid']])) $field['defaultvalue']=$this->default[$abrow['qid']];
             $field['pq']=$this;

diff --git a/application/modules/NumberArrayQuestion.php b/application/modules/NumberArrayQuestion.php
@@ -386,7 +386,7 @@ public function createFieldmap($type=null)
                 $field['hasconditions']=$this->conditionsexist;
                 $field['usedinconditions']=$this->usedinconditions;
                 $field['questionSeq']=$this->questioncount;
-                $field['groupSeq']=$this->randomgid;
+                $field['groupSeq']=$this->groupcount;
                 $field['preg']=$this->preg;
                 $field['answerList']=$answerList;
                 $q = clone $this;

diff --git a/application/modules/NumericalQuestion.php b/application/modules/NumericalQuestion.php
@@ -88,6 +88,24 @@ public function getAnswerHTML()
 
         return $answer;
     }
+
+    public function filterGET($value)
+    {
+        if (trim($value)=="") {
+            return NULL;
+        }
+        else {
+            return sanitize_float($value);
+        }
+    }
+
+    public function prepareValue($value)
+    {
+        if (trim($val)=='') {
+            return NULL;
+        }
+        return $value;
+    }
 
     public function availableAttributes($attr = false)
     {

diff --git a/application/modules/QuestionModule.php b/application/modules/QuestionModule.php
@@ -11,6 +11,7 @@ abstract class QuestionModule
     public $conditionsexist; //boolean
     public $usedinconditions;
     public $questioncount;
+    public $groupcount;
     public $randomgid;
     public $language;
     public $groupname;
@@ -160,13 +161,28 @@ public function createFieldmap($type=null)
         $map['hasconditions']=$this->conditionsexist;
         $map['usedinconditions']=$this->usedinconditions;
         $map['questionSeq']=$this->questioncount;
-        $map['groupSeq']=$this->randomgid;
+        $map['groupSeq']=$this->groupcount;
         if(isset($this->default[0])) $map['defaultvalue']=$this->default[0];
         $map['q']=$this;
         $map['pq']=$this;
         return array($this->fieldname=>$map);
     }
 
+    public function fileUpload()
+    {
+        return false;
+    }
+
+    public function filterGET($value)
+    {
+        return $value;
+    }
+
+    public function prepareValue($value)
+    {
+        return $value;
+    }
+
     abstract public function availableAttributes($attr = false);    
     abstract public function questionProperties($prop = false);
 }

diff --git a/application/modules/RankingQuestion.php b/application/modules/RankingQuestion.php
@@ -291,7 +291,7 @@ public function createFieldmap($type=null)
             $field['hasconditions']=$this->conditionsexist;
             $field['usedinconditions']=$this->usedinconditions;
             $field['questionSeq']=$this->questioncount;
-            $field['groupSeq']=$this->randomgid;
+            $field['groupSeq']=$this->groupcount;
             $field['pq']=$this;
             $q = clone $this;
             $q->fieldname = $fieldname;

diff --git a/application/modules/TextArrayQuestion.php b/application/modules/TextArrayQuestion.php
@@ -407,7 +407,7 @@ public function createFieldmap($type=null)
                 $field['hasconditions']=$this->conditionsexist;
                 $field['usedinconditions']=$this->usedinconditions;
                 $field['questionSeq']=$this->questioncount;
-                $field['groupSeq']=$this->randomgid;
+                $field['groupSeq']=$this->groupcount;
                 $field['preg']=$this->preg;
                 $field['answerList']=$answerList;
                 $q = clone $this;