From 5a80702f652aebd0dd89a213b59fc1a3a8c9cca7 Mon Sep 17 00:00:00 2001 From: Marcel Minke Date: Tue, 8 Feb 2011 13:21:05 +0000 Subject: [PATCH] Fix: Show SGQA codes for semantic differential question types (Array questions "A" and "F") if enabled at optional settings. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@9749 b72ed6b6-b9f8-46b5-92b4-906544132732 --- admin/printablesurvey.php | 47 +++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/admin/printablesurvey.php b/admin/printablesurvey.php index 44752e7a71b..4343ceab2ae 100644 --- a/admin/printablesurvey.php +++ b/admin/printablesurvey.php @@ -1166,8 +1166,16 @@ function star_replace($input) { $question['ANSWER'] .= "\t\t\n"; $rowclass = alternation($rowclass,'row'); - $answertext=$mearow['question'].addsgqacode(" (".$fieldname.$mearow['title'].")"); - if (strpos($answertext,'|')) {$answertext=substr($answertext,0, strpos($answertext,'|'));} + + //semantic differential question type? + if (strpos($mearow['question'],'|')) + { + $answertext = substr($mearow['question'],0, strpos($mearow['question'],'|')).addsgqacode(" (".$fieldname.$mearow['title'].")")." "; + } + else + { + $answertext=$mearow['question'].addsgqacode(" (".$fieldname.$mearow['title'].")"); + } $question['ANSWER'] .= "\t\t\t$answertext\n"; $pdfoutput[$j][0]=$answertext; @@ -1177,11 +1185,13 @@ function star_replace($input) $pdfoutput[$j][$i]=" o ".$i; } - $answertext=$mearow['question']; - if (strpos($answertext,'|')) + $answertext .= $mearow['question']; + + //semantic differential question type? + if (strpos($mearow['question'],'|')) { - $answertext=substr($answertext,strpos($answertext,'|')+1); - $question['ANSWER'] .= "\t\t\t$answertext\n"; + $answertext2 = substr($mearow['question'],strpos($mearow['question'],'|')+1); + $question['ANSWER'] .= "\t\t\t$answertext2\n"; } $question['ANSWER'] .= "\t\t\n"; $j++; @@ -1545,9 +1555,18 @@ function star_replace($input) { $question['ANSWER'] .= "\t\t\n"; $rowclass = alternation($rowclass,'row'); - $answertext=$mearow['question'].addsgqacode(" (".$fieldname.$mearow['title'].")"); if (trim($answertext)=='') $answertext=' '; - if (strpos($answertext,'|')) {$answertext=substr($answertext,0, strpos($answertext,'|'));} + + //semantic differential question type? + if (strpos($mearow['question'],'|')) + { + $answertext = substr($mearow['question'],0, strpos($mearow['question'],'|')).addsgqacode(" (".$fieldname.$mearow['title'].")")." "; + } + else + { + $answertext=$mearow['question'].addsgqacode(" (".$fieldname.$mearow['title'].")"); + } + if (trim($qidattributes['answer_width'])!='') { $sInsertStyle=' style="width:'.$qidattributes['answer_width'].'%" '; @@ -1557,11 +1576,10 @@ function star_replace($input) $sInsertStyle=''; } $question['ANSWER'] .= "\t\t\t$answertext\n"; - //$printablesurveyoutput .="\t\t\t\t\t"; + $pdfoutput[$counter][0]=$answertext; for ($i=1; $i<=$fcount; $i++) { - $question['ANSWER'] .= "\t\t\t".input_type_image('radio')."\n"; $pdfoutput[$counter][$i] = "o"; @@ -1569,11 +1587,12 @@ function star_replace($input) $counter++; $answertext=$mearow['question']; - if (strpos($answertext,'|')) + + //semantic differential question type? + if (strpos($mearow['question'],'|')) { - $answertext=substr($answertext,strpos($answertext,'|')+1); - $question['ANSWER'] .= "\t\t\t$answertext\n"; - + $answertext2=substr($mearow['question'],strpos($mearow['question'],'|')+1); + $question['ANSWER'] .= "\t\t\t$answertext2\n"; } $question['ANSWER'] .= "\t\t\n"; }