diff --git a/application/models/ApplicantPDF.php b/application/models/ApplicantPDF.php index 96d68501..be1073f5 100644 --- a/application/models/ApplicantPDF.php +++ b/application/models/ApplicantPDF.php @@ -25,7 +25,7 @@ class ApplicantPDF extends FPDI $this->addPage(); $this->useTemplate($tplidx); $this->SetFont('ugb','',$this->fontsize); - $this->setXY(74,43); + $this->setXY(86,41.5); $this->Write($this->fontsize,$this->data['realname']); $this->SetXY(34,55); $this->MultiCell (166, 4, str_replace(";","\n",$this->data['westdclist'])); @@ -33,18 +33,18 @@ class ApplicantPDF extends FPDI $this->MultiCell(166,4,trim($this->data['project'])); //$this->setXY(34,239); //$this->Write($this->fontsize,$this->data['realname']); - $this->setXY(32,223); + $this->setXY(32,222); $this->Write($this->fontsize,$this->data['unit']); - $this->setXY(112,223); + $this->setXY(112,222); $this->Write($this->fontsize,$this->data['email']); - $this->setXY(174,223); + $this->setXY(174,222); $this->Write($this->fontsize,$this->data['postcode']); - $this->setXY(32,230); + $this->setXY(32,228); $this->Write($this->fontsize,$this->data['address']); - $this->setXY(112,230); + $this->setXY(112,228); $this->Write($this->fontsize,$this->data['phone']); $t=date("Y-m-d"); - $this->setXY(174,230); + $this->setXY(174,228); $this->Write($this->fontsize,$t); } function drawHeihe() diff --git a/application/module/Order/Order.php b/application/module/Order/Order.php index cf9ba966..c55a7be5 100644 --- a/application/module/Order/Order.php +++ b/application/module/Order/Order.php @@ -312,17 +312,7 @@ class Order public function pdfPrint($formData,$userid = 0,$save = false,$returnpdf = false) { $sql="SELECT m.title||'('||m.filesize::text||'MB)' as title FROM dataorder d - RIGHT JOIN heihemetadata m ON d.uuid=m.uuid - WHERE d.status=2 AND d.userid=?"; - - $list = $this->db->fetchAll($sql,array($userid)); - - foreach($list as $i=>$row){ - @$formData['heihelist'].=($i+1).". ".$row['title'].";"; - } - - $sql="SELECT m.title||'('||m.filesize::text||'MB)' as title FROM dataorder d - RIGHT JOIN normalmetadata m ON d.uuid=m.uuid WHERE d.uuid not in (select uuid from heihemetadata) AND d.status=2 AND d.userid=?"; + RIGHT JOIN normalmetadata m ON d.uuid=m.uuid WHERE d.status=2 AND d.userid=?"; $list = $this->db->fetchAll($sql,array($userid)); foreach($list as $i=>$row){ diff --git a/data/offline.pdf b/data/offline.pdf index 251175a3..a090c5bd 100644 Binary files a/data/offline.pdf and b/data/offline.pdf differ diff --git a/data/security.pdf b/data/security.pdf index 09e31253..882867dc 100644 Binary files a/data/security.pdf and b/data/security.pdf differ