New feature #8757: Individual subquestion relevance

Dev: Createfieldmap(): Put SQrel from DB into fieldmap
LimeSurvey · Apr 22, 2014 · 71f73ca · 71f73ca
1 parent 8076668
commit 71f73ca
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -2513,6 +2513,7 @@ function createFieldMap($surveyid, $style='short', $force_refresh=false, $questi
                         $fieldmap[$fieldname]['groupSeq']=$groupSeq;
                         $fieldmap[$fieldname]['preg']=$arow['preg'];
                         $fieldmap[$fieldname]['answerList']=$answerList;
+                        $fieldmap[$fieldname]['SQrelevance']=$abrow['relevance'];
                     }
                 }
             }
@@ -2538,6 +2539,7 @@ function createFieldMap($surveyid, $style='short', $force_refresh=false, $questi
                     $fieldmap[$fieldname]['usedinconditions']=$usedinconditions;
                     $fieldmap[$fieldname]['questionSeq']=$questionSeq;
                     $fieldmap[$fieldname]['groupSeq']=$groupSeq;
+                    $fieldmap[$fieldname]['SQrelevance']=$abrow['relevance'];
                 }
 
                 $fieldname="{$arow['sid']}X{$arow['gid']}X{$arow['qid']}{$abrow['title']}#1";
@@ -2555,6 +2557,7 @@ function createFieldMap($surveyid, $style='short', $force_refresh=false, $questi
                     $fieldmap[$fieldname]['usedinconditions']=$usedinconditions;
                     $fieldmap[$fieldname]['questionSeq']=$questionSeq;
                     $fieldmap[$fieldname]['groupSeq']=$groupSeq;
+                    // TODO SQrelevance for different scales? $fieldmap[$fieldname]['SQrelevance']=$abrow['relevance'];
                 }
             }
         }
@@ -2634,6 +2637,7 @@ function createFieldMap($surveyid, $style='short', $force_refresh=false, $questi
             foreach ($abrows as $abrow)
             {
                 $fieldname="{$arow['sid']}X{$arow['gid']}X{$arow['qid']}{$abrow['title']}";
+
                 if (isset($fieldmap[$fieldname])) $aDuplicateQIDs[$arow['qid']]=array('fieldname'=>$fieldname,'question'=>$arow['question'],'gid'=>$arow['gid']);
                 $fieldmap[$fieldname]=array("fieldname"=>$fieldname,
                 'type'=>$arow['type'],
@@ -2654,6 +2658,8 @@ function createFieldMap($surveyid, $style='short', $force_refresh=false, $questi
                     $fieldmap[$fieldname]['questionSeq']=$questionSeq;
                     $fieldmap[$fieldname]['groupSeq']=$groupSeq;
                     $fieldmap[$fieldname]['preg']=$arow['preg'];
+                    // get SQrelevance from DB
+                    $fieldmap[$fieldname]['SQrelevance']=$abrow['relevance'];
                     if (isset($defaultValues[$arow['qid'].'~'.$abrow['qid']])) {
                         $fieldmap[$fieldname]['defaultvalue'] = $defaultValues[$arow['qid'].'~'.$abrow['qid']];
                     }
@@ -2718,6 +2724,7 @@ function createFieldMap($surveyid, $style='short', $force_refresh=false, $questi
         }
         if (isset($fieldmap[$fieldname]))
         {
+            //set question relevance (uses last SQ's relevance field for question relevance)
             $fieldmap[$fieldname]['relevance']=$arow['relevance'];
             $fieldmap[$fieldname]['grelevance']=$arow['grelevance'];
             $fieldmap[$fieldname]['questionSeq']=$questionSeq;