Talenttic_survey/CATI_Tool
2
0
Fork 0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00
Code Issues Releases Activity

Updated Limesurvey to revision 11354

Browse Source
This commit is contained in:
azammitdcarf
2011-11-11 01:59:29 +00:00
parent 82a45813b4
commit a4935b7f08
27 changed files with 23399 additions and 20008 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
include/limesurvey/admin/classes/quexml/quexmlpdf.php
View File

@@ -79,8 +79,19 @@ class queXMLPDF extends TCPDF {
*
* @var bool Defaults to 138.
* @since 2010-09-20
* @deprecated
* @see $barcodeMarginX
*/
protected $barcodeX = 138;
//protected $barcodeX = 138;
/**
* The distance between the right hand page border and
* the end of the barcode in MM
*
* @var bool Defaults to 23.
* @since 2011-10-25
*/
protected $barcodeMarginX = 23;
/**
* Y position of barcode in mm
@@ -173,7 +184,7 @@ class queXMLPDF extends TCPDF {
protected $style = "<style>
td.questionTitle {font-weight:bold; font-size:12pt;}
td.questionText {font-weight:bold; font-size:12pt;}
td.vasLabel {font-weright:bold; font-size:10pt; text-align:center;}
td.vasLabel {font-weight:bold; font-size:10pt; text-align:center;}
td.questionHelp {font-weight:normal; text-align:right; font-style:italic; font-size:8pt;}
td.questionHelpAfter {text-align:center; font-weight:bold; font-size:10pt;}
td.responseAboveText {font-weight:normal; font-style:normal; text-align:left; font-size:12pt;}
@@ -300,16 +311,38 @@ class queXMLPDF extends TCPDF {
*
* @var mixed Defaults to 24.
* @since 2010-09-20
* @deprecated
* @see $textResponseMarginX
*/
protected $textResponsesPerLine = 24;
//protected $textResponsesPerLine = 24;
/**
* The left hand margin of text responses to auto calculate responses
* per line (mm)
*
* @var mixed Defaults to 13.
* @since 2011-10-25
*/
protected $textResponseMarginX = 13;
/**
* Maximum number of text responses boxes where the label should appear on the same line
*
* @var mixed Defaults to 16.
* @since 2010-09-20
* @deprecated
* @see $labelTextResponsesSameLineMarginX
*/
protected $labelTextResponsesSameLine = 16;
//protected $labelTextResponsesSameLine = 16;
/**
* The left hand margin of text responses to auto calculated responses
* per line where the label should appear on the same line (mm)
*
* @var mixed Defaults to 62.
* @since 2011-10-25
*/
protected $labelTextResponsesSameLineMarginX = 62;
/**
* The gap between multi line text responses
@@ -1551,11 +1584,15 @@ class queXMLPDF extends TCPDF {
{
$this->SetDrawColor($this->lineColour[0],$this->lineColour[1],$this->lineColour[2]);
//calculate text responses per line
$textResponsesPerLine = round(($this->getMainPageWidth() - $this->skipColumnWidth - $this->textResponseMarginX) / ($this->textResponseWidth + $this->textResponseBorder));
$labelTextResponsesSameLine = round(($this->getMainPageWidth() - $this->skipColumnWidth - $this->labelTextResponsesSameLineMarginX) / ($this->textResponseWidth + $this->textResponseBorder));
//draw boxes - can draw up to $textResponsesPerLine for each line
$lines = ceil($width / $this->textResponsesPerLine);
$lines = ceil($width / $textResponsesPerLine);
//draw the text label on the top of this box
if ($width > $this->labelTextResponsesSameLine && !empty($text))
if ($width > $labelTextResponsesSameLine && !empty($text))
{
$this->setBackground('question');
$html = "<table><tr><td width=\"{$this->questionTitleWidth}mm\"></td><td width=\"" . ($this->getMainPageWidth() - $this->skipColumnWidth - $this->questionTitleWidth) . "mm\" class=\"responseAboveText\">$text</td><td></td></tr></table>";
@@ -1567,8 +1604,8 @@ class queXMLPDF extends TCPDF {
for ($i = 0; $i < $lines; $i++)
{
if ($lines == 1) $cells = $width; //one line only
else if (($i + 1 == $lines)) $cells = ($width - ($this->textResponsesPerLine * $i)); //last line
else $cells = $this->textResponsesPerLine; //middle line
else if (($i + 1 == $lines)) $cells = ($width - ($textResponsesPerLine * $i)); //last line
else $cells = $textResponsesPerLine; //middle line
$textwidth = ($this->getMainPageWidth() - $this->skipColumnWidth) - (($this->textResponseWidth + $this->textResponseBorder ) * $cells);
@@ -1579,7 +1616,7 @@ class queXMLPDF extends TCPDF {
$this->setBackground('question');
$this->writeHTMLCell($this->getMainPageWidth(), $this->textResponseHeight, $this->getMainPageX(), $this->GetY() , $this->style . $html,0,1,true,false);
if ($lines == 1 && $cells <= $this->labelTextResponsesSameLine && !empty($text))
if ($lines == 1 && $cells <= $labelTextResponsesSameLine && !empty($text))
{
$this->setDefaultFont($this->responseTextFontSize);
@@ -1652,8 +1689,10 @@ class queXMLPDF extends TCPDF {
//Add the box to the layout scheme
$this->addBox($this->GetX(),$this->GetY(),$this->GetX() + $this->textResponseWidth,$this->GetY() + $this->textResponseHeight);
//Draw the box
$this->Cell($this->textResponseWidth,$this->textResponseHeight,'',$border,0,'',true,'',0,false,'T','C');
}
//add some spacing for the bottom border
@@ -2074,8 +2113,11 @@ class queXMLPDF extends TCPDF {
$barcodeValue = str_pad($this->questionnaireId,$this->idLength,"0",STR_PAD_LEFT) . str_pad($this->getPage(),$this->pageLength,"0",STR_PAD_LEFT);
$this->write1DBarcode($barcodeValue, $this->barcodeType, $this->barcodeX, $this->barcodeY, $this->barcodeW, $this->barcodeH,'', $barcodeStyle, 'N');
//Calc X position of barcode from page width
$barcodeX = $width - ($this->barcodeMarginX + $this->barcodeW);
$this->write1DBarcode($barcodeValue, $this->barcodeType, $barcodeX, $this->barcodeY, $this->barcodeW, $this->barcodeH,'', $barcodeStyle, 'N');
//Add this page to the layout system
$b = $this->cornerBorder + ($this->cornerWidth / 2.0); //temp calc for middle of line
$this->layout[$barcodeValue] = array( 'id' => $barcodeValue,

13
include/limesurvey/admin/classes/tcpdf/mypdf.php
View File

@@ -183,6 +183,12 @@ class MyPDF extends TCPDF
else{$fill=0;}
for($b=0;$b<sizeof($array[$a]);$b++)
{
$bEndOfCell=0;
if ($b==sizeof($array[$a])-1)
{
$bEndOfCell=1;
}
if($a==0)
{
$oldStyle = $this->FontStyle;
@@ -190,7 +196,7 @@ class MyPDF extends TCPDF
if ($maxwidth[$b] > 140) $maxwidth[$b]=130;
if ($maxwidth[$b] < 20) $maxwidth[$b]=20;
$this->MultiCell($maxwidth[$b],6,$this->delete_html($array[$a][$b]),0,'L',1,0);
$this->MultiCell($maxwidth[$b],6,$this->delete_html($array[$a][$b]),0,'L',1,$bEndOfCell);
$this->SetFont($this->FontFamily, $oldStyle, $this->FontSizePt);
}
@@ -205,16 +211,15 @@ class MyPDF extends TCPDF
if ($maxwidth[$b] > 140) $maxwidth[$b]=130;
if ($b==0)
{
$iLines=$this->MultiCell($maxwidth[$b],6,$this->delete_html($array[$a][$b]),0,'L',$fill,0);
$iLines=$this->MultiCell($maxwidth[$b],6,$this->delete_html($array[$a][$b]),0,'L',$fill,$bEndOfCell);
}
else
{
$this->MultiCell($maxwidth[$b],$iLines,$this->delete_html($array[$a][$b]),0,'L',$fill,0);
$this->MultiCell($maxwidth[$b],$iLines,$this->delete_html($array[$a][$b]),0,'L',$fill,$bEndOfCell);
}
}
}
$this->ln();
}
$this->ln(5);
}