Skip to content

Commit

Permalink
Merge branch 'refs/heads/limesurvey_dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@Dragooon
Dragooon committed Jan 30, 2012
2 parents 9cc7725 + 154fdef commit e40f60e
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 18 deletions.
32 changes: 28 additions & 4 deletions classes/eval/LimeExpressionManager.php
View file
Expand Up @@ -6373,15 +6373,17 @@ function getGroupInfoForEM($surveyid,$lang=NULL)
$data = db_execute_assoc($query);

$qinfo = array();
$_order=0;
foreach ($data as $d)
{
$qinfo[$d['group_order']] = array(
'group_order' => $d['group_order'],
$qinfo[$_order] = array(
'group_order' => $_order,
'gid' => $d['gid'],
'group_name' => $d['group_name'],
'description' => $d['description'],
'grelevance' => $d['grelevance'],
);
++$_order;
}

return $qinfo;
Expand Down Expand Up @@ -6592,7 +6594,20 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL
$type = $q['info']['type'];
$typedesc = $qtypes[$type]['description'];
$default = (is_null($q['info']['default']) ? '' : '<p>(DEFAULT: ' . $q['info']['default'] . ')</p>');
$sgqas = explode('|',$q['sgqa']);
if (count($sgqas) == 1 && !is_null($q['info']['default']))
{
$LEM->ProcessString($q['info']['default'], $qid,NULL,false,1,1,false,false);
$_default = $LEM->GetLastPrettyPrintExpression();
if ($LEM->em->HasErrors()) {
++$errorCount;
}
$default = '<br/>(' . $LEM->gT('DEFAULT:') . ' ' . $_default . ')';
}
else
{
$default = '';
}
$qtext = (($q['info']['qtext'] != '') ? $q['info']['qtext'] : '&nbsp');
$help = (($q['info']['help'] != '') ? '<hr/>[HELP: ' . $q['info']['help'] . ']': '');
Expand Down Expand Up @@ -6770,7 +6785,6 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL
//////
// SHOW ALL SUB-QUESTIONS
//////
$sgqas = explode('|',$q['sgqa']);
$sqRows='';
$i=0;
$sawthis = array(); // array of rowdivids already seen so only show them once
Expand Down Expand Up @@ -6830,6 +6844,16 @@ static public function ShowSurveyLogicFile($sid, $gid=NULL, $qid=NULL,$LEMdebugL
$sgqaInfo = $LEM->knownVars[$sgqa];
$subqText = $sgqaInfo['subqtext'];

if (isset($sgqaInfo['default']) && $sgqaInfo['default'] !== '')
{
$LEM->ProcessString($sgqaInfo['default'], $qid,NULL,false,1,1,false,false);
$_default = $LEM->GetLastPrettyPrintExpression();
if ($LEM->em->HasErrors()) {
++$errorCount;
}
$subQeqn .= '<br/>(' . $LEM->gT('DEFAULT:') . ' ' . $_default . ')';
}

$sqRows .= "<tr class='LEMsubq'>"
. "<td>SQ-$i</td>"
. "<td><b>" . $varName . "</b></td>"
Expand Down
1 change: 1 addition & 0 deletions classes/eval/em_javascript.js
View file
Expand Up @@ -244,6 +244,7 @@ function LEMval(alias)
<<<<<<< HEAD
if (whichJsName === null || typeof document.getElementById(whichJsName) === 'undefined' || document.getElementById(whichJsName) === null) {
an_error = true; // this line is here to make debugging easier
return '';
}
=======
>>>>>>> refs/heads/dev_tms
Expand Down
36 changes: 22 additions & 14 deletions common_functions.php
View file
Expand Up @@ -2437,11 +2437,19 @@ function createFieldMap($surveyid, $style='full', $force_refresh=false, $questio
$aresult = db_execute_assoc($aquery) or safe_die ("Couldn't get list of questions in createFieldMap function.<br />$query<br />".$connect->ErrorMsg()); //Checked

$questionSeq=-1; // this is incremental question sequence across all groups
$groupSeq=-1;
$_groupOrder=-1;

while ($arow=$aresult->FetchRow()) //With each question, create the appropriate field(s)
{
++$questionSeq;

// fix fact taht group_order may have gaps
if ($_groupOrder != $arow['group_order']) {
$_groupOrder = $arow['group_order'];
++$groupSeq;
}

// Conditions indicators are obsolete with EM. However, they are so tightly coupled into LS code that easider to just set values to 'N' for now and refactor later.
$conditions = 'N';
$usedinconditions = 'N';
Expand All @@ -2468,7 +2476,7 @@ function createFieldMap($surveyid, $style='full', $force_refresh=false, $questio
$fieldmap[$fieldname]['hasconditions']=$conditions;
$fieldmap[$fieldname]['usedinconditions']=$usedinconditions;
$fieldmap[$fieldname]['questionSeq']=$questionSeq;
$fieldmap[$fieldname]['groupSeq']=$arow['group_order'];
$fieldmap[$fieldname]['groupSeq']=$groupSeq;
if (isset($defaultValues[$arow['qid'].'~0'])) {
$fieldmap[$fieldname]['defaultvalue'] = $defaultValues[$arow['qid'].'~0'];
}
Expand Down Expand Up @@ -2500,7 +2508,7 @@ function createFieldMap($surveyid, $style='full', $force_refresh=false, $questio
$fieldmap[$fieldname]['hasconditions']=$conditions;
$fieldmap[$fieldname]['usedinconditions']=$usedinconditions;
$fieldmap[$fieldname]['questionSeq']=$questionSeq;
$fieldmap[$fieldname]['groupSeq']=$arow['group_order'];
$fieldmap[$fieldname]['groupSeq']=$groupSeq;
$fieldmap[$fieldname]['other']=$arow['other'];
if (isset($defaultValues[$arow['qid'].'~other'])) {
$fieldmap[$fieldname]['defaultvalue'] = $defaultValues[$arow['qid'].'~other'];
Expand Down Expand Up @@ -2529,7 +2537,7 @@ function createFieldMap($surveyid, $style='full', $force_refresh=false, $questio
$fieldmap[$fieldname]['hasconditions']=$conditions;
$fieldmap[$fieldname]['usedinconditions']=$usedinconditions;
$fieldmap[$fieldname]['questionSeq']=$questionSeq;
$fieldmap[$fieldname]['groupSeq']=$arow['group_order'];
$fieldmap[$fieldname]['groupSeq']=$groupSeq;
}
break;
}
Expand Down Expand Up @@ -2579,7 +2587,7 @@ function createFieldMap($surveyid, $style='full', $force_refresh=false, $questio
$fieldmap[$fieldname]['hasconditions']=$conditions;
$fieldmap[$fieldname]['usedinconditions']=$usedinconditions;
$fieldmap[$fieldname]['questionSeq']=$questionSeq;
$fieldmap[$fieldname]['groupSeq']=$arow['group_order'];
$fieldmap[$fieldname]['groupSeq']=$groupSeq;
$fieldmap[$fieldname]['preg']=$arow['preg'];
$fieldmap[$fieldname]['answerList']=$answerList;
}
Expand All @@ -2606,7 +2614,7 @@ function createFieldMap($surveyid, $style='full', $force_refresh=false, $questio
$fieldmap[$fieldname]['hasconditions']=$conditions;
$fieldmap[$fieldname]['usedinconditions']=$usedinconditions;
$fieldmap[$fieldname]['questionSeq']=$questionSeq;
$fieldmap[$fieldname]['groupSeq']=$arow['group_order'];
$fieldmap[$fieldname]['groupSeq']=$groupSeq;
}

$fieldname="{$arow['sid']}X{$arow['gid']}X{$arow['qid']}{$abrow['title']}#1";
Expand All @@ -2623,7 +2631,7 @@ function createFieldMap($surveyid, $style='full', $force_refresh=false, $questio
$fieldmap[$fieldname]['hasconditions']=$conditions;
$fieldmap[$fieldname]['usedinconditions']=$usedinconditions;
$fieldmap[$fieldname]['questionSeq']=$questionSeq;
$fieldmap[$fieldname]['groupSeq']=$arow['group_order'];
$fieldmap[$fieldname]['groupSeq']=$groupSeq;
}
}
}
Expand All @@ -2647,7 +2655,7 @@ function createFieldMap($surveyid, $style='full', $force_refresh=false, $questio
$fieldmap[$fieldname]['hasconditions']=$conditions;
$fieldmap[$fieldname]['usedinconditions']=$usedinconditions;
$fieldmap[$fieldname]['questionSeq']=$questionSeq;
$fieldmap[$fieldname]['groupSeq']=$arow['group_order'];
$fieldmap[$fieldname]['groupSeq']=$groupSeq;
}
}
}
Expand Down Expand Up @@ -2679,7 +2687,7 @@ function createFieldMap($surveyid, $style='full', $force_refresh=false, $questio
$fieldmap[$fieldname]['hasconditions']=$conditions;
$fieldmap[$fieldname]['usedinconditions']=$usedinconditions;
$fieldmap[$fieldname]['questionSeq']=$questionSeq;
$fieldmap[$fieldname]['groupSeq']=$arow['group_order'];
$fieldmap[$fieldname]['groupSeq']=$groupSeq;
}
$fieldname="{$arow['sid']}X{$arow['gid']}X{$arow['qid']}"."_filecount";
$fieldmap[$fieldname]=array("fieldname"=>$fieldname,
Expand All @@ -2699,7 +2707,7 @@ function createFieldMap($surveyid, $style='full', $force_refresh=false, $questio
$fieldmap[$fieldname]['hasconditions']=$conditions;
$fieldmap[$fieldname]['usedinconditions']=$usedinconditions;
$fieldmap[$fieldname]['questionSeq']=$questionSeq;
$fieldmap[$fieldname]['groupSeq']=$arow['group_order'];
$fieldmap[$fieldname]['groupSeq']=$groupSeq;
}
}
}
Expand Down Expand Up @@ -2728,7 +2736,7 @@ function createFieldMap($surveyid, $style='full', $force_refresh=false, $questio
$fieldmap[$fieldname]['hasconditions']=$conditions;
$fieldmap[$fieldname]['usedinconditions']=$usedinconditions;
$fieldmap[$fieldname]['questionSeq']=$questionSeq;
$fieldmap[$fieldname]['groupSeq']=$arow['group_order'];
$fieldmap[$fieldname]['groupSeq']=$groupSeq;
$fieldmap[$fieldname]['preg']=$arow['preg'];
if (isset($defaultValues[$arow['qid'].'~'.$abrow['qid']])) {
$fieldmap[$fieldname]['defaultvalue'] = $defaultValues[$arow['qid'].'~'.$abrow['qid']];
Expand All @@ -2749,7 +2757,7 @@ function createFieldMap($surveyid, $style='full', $force_refresh=false, $questio
$fieldmap[$fieldname]['hasconditions']=$conditions;
$fieldmap[$fieldname]['usedinconditions']=$usedinconditions;
$fieldmap[$fieldname]['questionSeq']=$questionSeq;
$fieldmap[$fieldname]['groupSeq']=$arow['group_order'];
$fieldmap[$fieldname]['groupSeq']=$groupSeq;
}
}
}
Expand All @@ -2768,7 +2776,7 @@ function createFieldMap($surveyid, $style='full', $force_refresh=false, $questio
$fieldmap[$fieldname]['hasconditions']=$conditions;
$fieldmap[$fieldname]['usedinconditions']=$usedinconditions;
$fieldmap[$fieldname]['questionSeq']=$questionSeq;
$fieldmap[$fieldname]['groupSeq']=$arow['group_order'];
$fieldmap[$fieldname]['groupSeq']=$groupSeq;
$fieldmap[$fieldname]['other']=$arow['other'];
}
if ($arow['type']=="P")
Expand All @@ -2786,7 +2794,7 @@ function createFieldMap($surveyid, $style='full', $force_refresh=false, $questio
$fieldmap[$fieldname]['hasconditions']=$conditions;
$fieldmap[$fieldname]['usedinconditions']=$usedinconditions;
$fieldmap[$fieldname]['questionSeq']=$questionSeq;
$fieldmap[$fieldname]['groupSeq']=$arow['group_order'];
$fieldmap[$fieldname]['groupSeq']=$groupSeq;
$fieldmap[$fieldname]['other']=$arow['other'];
}
}
Expand All @@ -2795,7 +2803,7 @@ function createFieldMap($surveyid, $style='full', $force_refresh=false, $questio
$fieldmap[$fieldname]['relevance']=$arow['relevance'];
$fieldmap[$fieldname]['grelevance']=$arow['grelevance'];
$fieldmap[$fieldname]['questionSeq']=$questionSeq;
$fieldmap[$fieldname]['groupSeq']=$arow['group_order'];
$fieldmap[$fieldname]['groupSeq']=$groupSeq;
$fieldmap[$fieldname]['preg']=$arow['preg'];
$fieldmap[$fieldname]['other']=$arow['other'];
$fieldmap[$fieldname]['help']=$arow['help'];
Expand Down

0 comments on commit e40f60e

Please sign in to comment.