From 9fc98fc288e8adf2bb87318ae42f07f0cea6bf76 Mon Sep 17 00:00:00 2001 From: james Date: Mon, 18 Dec 2006 20:55:30 +0000 Subject: [PATCH] Add a TCPDF version of the signature page, TCPDF does not require any extra PDF libraries (eg pdflib) to be installed Create PNG versions of the uploaded logo image file Detect which version of the signature page to use Bump version to development series 2.0.5 --- admin/student_editor.php | 1 + config/images.php | 21 +++ register_participants_main.php | 15 +- register_participants_signature_tcpdf.php | 177 ++++++++++++++++++++++ version.txt | 2 +- 5 files changed, 214 insertions(+), 2 deletions(-) create mode 100644 register_participants_signature_tcpdf.php diff --git a/admin/student_editor.php b/admin/student_editor.php index 9e61eb54..346f05f5 100644 --- a/admin/student_editor.php +++ b/admin/student_editor.php @@ -361,6 +361,7 @@ if($config['participant_student_personal']=="yes") } echo "
"; echo i18n("WARNING! If you make a change to the grade that would affect the project number, you must update the project number manually, it will NOT be automatically updated"); +echo "
"; echo "\n"; echo ""; echo "
"; diff --git a/config/images.php b/config/images.php index dfb92c86..c6bd0cbc 100644 --- a/config/images.php +++ b/config/images.php @@ -36,10 +36,18 @@ if($_POST['action']=="addimage") if($imagesize[2]==1 || $imagesize[2]==2 || $imagesize[2]==3) // GIF or JPG or PNG { echo notice(i18n("Creating sized logo files:
 logo-100.gif
 logo-200.gif
 logo-500.gif
 logo.gif")); + //Make the gif's system("convert -sample 100 \"".$_FILES['image']['tmp_name']."\" ../data/logo-100.gif"); system("convert -sample 200 \"".$_FILES['image']['tmp_name']."\" ../data/logo-200.gif"); system("convert -sample 500 \"".$_FILES['image']['tmp_name']."\" ../data/logo-500.gif"); system("convert \"".$_FILES['image']['tmp_name']."\" ../data/logo.gif"); + + echo notice(i18n("Creating sized logo files:
 logo-100.png
 logo-200.png
 logo-500.png
 logo.png")); + //make some PNG's as well + system("convert -sample 100 \"".$_FILES['image']['tmp_name']."\" ../data/logo-100.png"); + system("convert -sample 200 \"".$_FILES['image']['tmp_name']."\" ../data/logo-200.png"); + system("convert -sample 500 \"".$_FILES['image']['tmp_name']."\" ../data/logo-500.png"); + system("convert \"".$_FILES['image']['tmp_name']."\" ../data/logo.png"); echo happy(i18n("Logo Image successfully uploaded")); } else @@ -58,6 +66,7 @@ if($_POST['action']=="addimage") echo ""; if(file_exists("../data/logo.gif")) { + echo ""; echo ""; } + if(file_exists("../data/logo.png")) + { + echo ""; + echo ""; + } echo "
".i18n("GIF Images")."
"; echo ""; echo ""; @@ -67,6 +76,18 @@ if($_POST['action']=="addimage") echo "500 Pixel width
"; echo "
".i18n("PNG Images")."
"; + echo ""; + echo ""; + echo "",i18n("Original size")."
"; + echo "".i18n("100 Pixel width")."
"; + echo "".i18n("200 Pixel width")."
"; + echo "500 Pixel width
"; + echo "
"; echo ""; echo "\n"; diff --git a/register_participants_main.php b/register_participants_main.php index b6c76282..3835b347 100644 --- a/register_participants_main.php +++ b/register_participants_main.php @@ -165,10 +165,23 @@ echo ""; + //FIXME: this should be a global detection so we can use the results elsewhere, especially for all the reports! + if(function_exists("pdf_new")) + $sigfile="register_participants_signature.php"; + else if(file_exists("tcpdf/tcpdf.php")) + $sigfile="register_participants_signature_tcpdf.php"; + else + $sigfile=""; + //signature page echo "
"; echo outputStatus($statussafety); echo "
"; if($statusstudent=="complete" && $statusproject=="complete" && $statusmentor=="complete" && $statussafety=="complete") - echo ""; + { + if($sigfile) + echo ""; + else + echo error(i18n("No PDF generation library detected"),true); + } echo i18n("Signature Page"); if($statusstudent=="complete" && $statusproject=="complete" && $statusmentor=="complete" && $statussafety=="complete") echo ""; diff --git a/register_participants_signature_tcpdf.php b/register_participants_signature_tcpdf.php new file mode 100644 index 00000000..bc77f3f1 --- /dev/null +++ b/register_participants_signature_tcpdf.php @@ -0,0 +1,177 @@ + + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public + License as published by the Free Software Foundation, version 2. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; see the file COPYING. If not, write to + the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. +*/ +?> +SetCreator(PDF_CREATOR); + $pdf->SetAuthor(PDF_AUTHOR); + $pdf->SetTitle(i18n("Participant Signature Page (".$_SESSION['registration_number'].")")); + $pdf->SetSubject(""); + $pdf->SetKeywords(""); + + $pdf->SetHeaderData("logo-200.png", 15, i18n($config['fairname']), i18n("Participant Signature Page (".$_SESSION['registration_number'].")")); + + $pdf->SetMargins(PDF_MARGIN_LEFT, PDF_MARGIN_TOP, PDF_MARGIN_RIGHT); + $pdf->SetAutoPageBreak(TRUE, PDF_MARGIN_BOTTOM); + $pdf->SetHeaderMargin(PDF_MARGIN_HEADER); + $pdf->SetFooterMargin(PDF_MARGIN_FOOTER); + $pdf->setImageScale(PDF_IMAGE_SCALE_RATIO); //set image scale factor + $pdf->setHeaderFont(Array(PDF_FONT_NAME_MAIN, '', PDF_FONT_SIZE_MAIN)); + $pdf->setFooterFont(Array(PDF_FONT_NAME_DATA, '', PDF_FONT_SIZE_DATA)); + $pdf->AliasNbPages(); + + $pdf->AddPage(); + + + //grab the project info + $q=mysql_query("SELECT * FROM projects WHERE registrations_id='".$_SESSION['registration_id']."' AND year='".$config['FAIRYEAR']."'"); + $projectinfo=mysql_fetch_object($q); + + $q=mysql_query("SELECT * FROM students WHERE registrations_id='".$_SESSION['registration_id']."' AND year='".$config['FAIRYEAR']."'"); + while($si=mysql_fetch_object($q)) + $studentinfoarray[]=$si; + + $pagetext="

".i18n("Registration Summary")."

"; + $pagetext.="Registration Number: ".$_SESSION['registration_number']."
". + "Project Title: $projectinfo->title
"; + if(count($studentinfoarray)>1) + $plural="s"; + else + $plural=""; + + $pagetext.="Exhibitor$plural: "; + foreach($studentinfoarray AS $studentinfo) + { + $pagetext.="$studentinfo->firstname $studentinfo->lastname, "; + } + $pagetext=substr($pagetext,0,-2); + $pagetext.="
"; + $pdf->WriteHTML($pagetext); + $pagetext=""; + + $q=mysql_query("SELECT * FROM signaturepage WHERE name='exhibitordeclaration'"); + $r=mysql_fetch_object($q); + if($r->use) + { + $pagetext="

".i18n("Exhibitor Declaration")."

"; + $pagetext.=nl2br($r->text); + $pdf->WriteHTML($pagetext); + + foreach($studentinfoarray AS $studentinfo) + { + $pdf->Ln(10); + //signature line + $pdf->Line(20,$pdf->GetY(),120,$pdf->GetY()); + $pdf->Line(140,$pdf->GetY(),180,$pdf->GetY()); + //show their name + $pdf->Ln(5); + $pdf->Text(30,$pdf->GetY(),i18n("%1 %2 (signature)",array($studentinfo->firstname,$studentinfo->lastname))); + $pdf->Text(150,$pdf->GetY(),i18n("Date")); + } + $pdf->WriteHTML("
"); + + } + + $q=mysql_query("SELECT * FROM signaturepage WHERE name='parentdeclaration'"); + $r=mysql_fetch_object($q); + if($r->use) + { + $pagetext="

".i18n("Parent/Guardian Declaration")."

"; + $pagetext.=nl2br($r->text); + $pdf->WriteHTML($pagetext); + + foreach($studentinfoarray AS $studentinfo) + { + + $pdf->Ln(10); + //signature line + $pdf->Line(20,$pdf->GetY(),120,$pdf->GetY()); + $pdf->Line(140,$pdf->GetY(),180,$pdf->GetY()); + //show their name + $pdf->Ln(5); + $pdf->Text(30,$pdf->GetY(),i18n("Parent/Guardian of %1 %2 (signature)",array($studentinfo->firstname,$studentinfo->lastname))); + $pdf->Text(150,$pdf->GetY(),i18n("Date")); + } + $pdf->WriteHTML("
"); + } + + + $q=mysql_query("SELECT * FROM signaturepage WHERE name='teacherdeclaration'"); + $r=mysql_fetch_object($q); + if($r->use) + { + //now for the teacher signature + $pagetext="

".i18n("Teacher Declaration")."

"; + $pagetext.=nl2br($r->text); + $pdf->WriteHTML($pagetext); + + //we only need 1 teacher signature line, we can assume (maybe incorrectly) that both students + //have the same teacher.. if they are not the same, then they can get the best teacher to sign + //it doesnt matter. + + $pdf->Ln(10); + //signature line + $pdf->Line(20,$pdf->GetY(),120,$pdf->GetY()); + $pdf->Line(140,$pdf->GetY(),180,$pdf->GetY()); + //show their name + $pdf->Ln(5); + $pdf->Text(30,$pdf->GetY(),i18n("Teacher Signature",array($studentinfo->firstname,$studentinfo->lastname))); + $pdf->Text(150,$pdf->GetY(),i18n("Date")); + + } + + $pdf->Output(); + exit; +?> diff --git a/version.txt b/version.txt index 2165f8f9..e0102586 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.0.4 +2.0.5