From f1cd9bcb5b843d75fb21d2188bbe364e10032c85 Mon Sep 17 00:00:00 2001 From: idziak Date: Thu, 27 Feb 2014 21:38:16 +0000 Subject: [PATCH] Select Project Type field added to the project editor. A flag in the configuration variables under Particpant Registration must be set to enable this. Project types are Experiment, Innovation, and Study Comment text box has been added to the project editor. This is only seen by fair administrators and not by the student. Information related to project safety can be flagged here. If text is present in this box, a flag appears in the Registration Management list. Project summaries longer than one page now print out properly. Blank pages are still sometimes printed after long sumaries. Choose Email Recipients query has been modified so that the most recent email address for judges is now used. Reports Editor has been changed so that cheques can be written for individual students as well as one cheque per project. New report data (split) has been added to make this work. --- admin/communication.inc.php | 17 ++- admin/communication.php | 1 + admin/project_editor.php | 52 ++++++- admin/registration_list.php | 26 +++- admin/reports.inc.php | 72 +++++++--- admin/reports_editor.php | 8 +- admin/reports_students.inc.php | 54 ++++++- db/db.code.version.txt | 2 +- db/db.update.176.sql | 32 +++++ images/16/flagged.png | Bin 0 -> 890 bytes lpdf.php | 227 ++++++++++++++++-------------- register_participants_project.php | 31 +++- user.inc.php | 9 +- 13 files changed, 379 insertions(+), 152 deletions(-) create mode 100644 db/db.update.176.sql create mode 100644 images/16/flagged.png diff --git a/admin/communication.inc.php b/admin/communication.inc.php index f02bdfce..7a54c460 100644 --- a/admin/communication.inc.php +++ b/admin/communication.inc.php @@ -1,7 +1,10 @@ array("name"=>"Committee members (all)","query"=> - "SELECT firstname, lastname, organization, email FROM users WHERE types LIKE '%committee%' AND deleted='no' GROUP BY uid"), + "SELECT u.firstname, u.lastname, u.organization, u.email, u.deleted, q.year FROM users AS u INNER JOIN (SELECT uid, max(year) AS year FROM users GROUP BY uid) AS q ON u.uid = q.uid AND u.year = q.year WHERE u.types LIKE '%committee%' AND u.deleted='no' GROUP BY `u`.`id` ASC"), /* The WHERE clause evaluates which rows to add to the GROUP BY, the HAVING clase evaluates which grouped rows show up. We @@ -11,8 +14,7 @@ end up picking up a user active in, say 2007 and 2008, but deleted in 2009. */ "judges_all"=>array("name"=>"Judges from all years (except deleted judges)","query"=> - "SELECT firstname, lastname, email, deleted, MAX(year) - FROM users WHERE types LIKE '%judge%' GROUP BY uid HAVING deleted='no' ORDER BY email"), + "SELECT u.firstname, u.lastname, u.email, u.deleted, q.year FROM users AS u INNER JOIN (SELECT uid, max(year) AS year FROM users GROUP BY uid ) AS q ON u.uid = q.uid AND u.year = q.year WHERE u.types LIKE '%judge%' AND u.deleted='no' ORDER BY `u`.`email` ASC"), "judges_active_lastyear"=>array("name"=>"Judges (all) active from last year", "query"=> "SELECT firstname, lastname, email FROM users LEFT JOIN users_judge ON users_judge.users_id=users.id WHERE types LIKE '%judge%' AND year='".($config['FAIRYEAR']-1)."' AND deleted='no' AND users_judge.judge_active='yes' ORDER BY email"), @@ -181,15 +183,16 @@ "SELECT schools.sciencehead_uid AS uid, schools.school, users.firstname AS firstname, users.lastname AS lastname, users.email AS email FROM schools JOIN users ON schools.sciencehead_uid=users.uid AND users.id=(SELECT id FROM users WHERE users.uid=schools.sciencehead_uid ORDER BY `year` DESC LIMIT 1) WHERE schools.year='".$config['FAIRYEAR']."' AND users.email!=''"), - + "school_thisyear"=>array("name"=>"School this year","query"=> + "SELECT board, schoolemail FROM `schools` WHERE `year` ='".$config['FAIRYEAR']."' GROUP BY schoolemail"), "school_teachers_thisyear"=>array("name"=>"Teachers (as entered by students) this year","query"=> - "SELECT DISTINCT(teacheremail) AS email, teachername AS firstname FROM students WHERE year='".$config['FAIRYEAR']."' AND teacheremail!=''"), + "SELECT teachername AS firstname, teacheremail AS email FROM students WHERE year = '".$config['FAIRYEAR']."' GROUP BY teacheremail"), "school_teachers_lastyear"=>array("name"=>"Teachers (as entered by students) last year","query"=> - "SELECT DISTINCT(teacheremail) AS email, teachername AS firstname FROM students WHERE year='".($config['FAIRYEAR']-1)."' AND teacheremail!=''"), + "SELECT teachername AS firstname, teacheremail AS email FROM students WHERE year = '".($config['FAIRYEAR']-1)."' GROUP BY teacheremail"), "school_teachers_allyears"=>array("name"=>"Teachers (as entered by students) all years","query"=> - "SELECT DISTINCT(teacheremail) AS email, teachername AS firstname FROM students WHERE teacheremail!=''"), + "SELECT teachername AS firstname, teacheremail AS email FROM students GROUP BY teacheremail"), /* Volunteers */ "volunteers_active_complete_thisyear"=>array("name"=>"Volunteers active for this year and complete", "query"=> "SELECT id, firstname, lastname, email FROM users LEFT JOIN users_volunteer ON users_volunteer.users_id=users.id WHERE users.year='{$config['FAIRYEAR']}' AND users_volunteer.volunteer_complete='yes' AND users_volunteer.volunteer_active='yes' AND users.deleted='no' AND types LIKE '%volunteer%' ORDER BY email"), diff --git a/admin/communication.php b/admin/communication.php index 06506b7c..21c7fc3b 100644 --- a/admin/communication.php +++ b/admin/communication.php @@ -25,6 +25,7 @@ require_once("../common.inc.php"); require_once("../user.inc.php"); include "communication.inc.php"; + user_auth_required('committee', 'admin'); function launchQueue() { diff --git a/admin/project_editor.php b/admin/project_editor.php index 5cfd40d1..3d6d66ea 100644 --- a/admin/project_editor.php +++ b/admin/project_editor.php @@ -20,6 +20,11 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +// This file was modified Jan of 2014 by Richard Sin +// Project type has been added and can be toggled by configuration. +// Feedback box also has been added for flagging purposes + ?> $config['participant_project_title_charmax']) { //0 for no limit, eg 255 database field limit $title=substr(stripslashes($_POST['title']),0,$config['participant_project_title_charmax']); error_("Project title truncated to %1 characters",array($config['participant_project_title_charmax'])); @@ -115,12 +134,14 @@ function project_save() mysql_query("UPDATE projects SET ". "title='".mysql_escape_string(iconv("UTF-8","ISO-8859-1//TRANSLIT",$title))."', ". "projectdivisions_id='".intval($_POST['projectdivisions_id'])."', ". + "projecttype='".mysql_escape_string(stripslashes($_POST['projecttype']))."', ". "language='".mysql_escape_string(stripslashes($_POST['language']))."', ". "req_table='".mysql_escape_string(stripslashes($_POST['req_table']))."', ". "req_electricity='".mysql_escape_string(stripslashes($_POST['req_electricity']))."', ". "req_special='".mysql_escape_string(iconv("UTF-8","ISO-8859-1//TRANSLIT",stripslashes($_POST['req_special'])))."', ". "summary='".mysql_escape_string(iconv("UTF-8","ISO-8859-1//TRANSLIT",stripslashes($_POST['summary'])))."', ". "summarycountok='$summarycountok',". + "feedback='".mysql_escape_string(iconv("UTF-8","ISO-8859-1//TRANSLIT",stripslashes($_POST['feedback'])))."', ". "projectsort='".mysql_escape_string(stripslashes($_POST['projectsort']))."'". "WHERE id='".intval($_POST['id'])."'"); echo mysql_error(); @@ -145,7 +166,6 @@ function project_save() function project_load() { global $registrations_id, $config; - //now lets find out their MAX grade, so we can pre-set the Age Category $q=mysql_query("SELECT MAX(grade) AS maxgrade FROM students WHERE registrations_id='".$registrations_id."'"); $gradeinfo=mysql_fetch_object($q); @@ -226,8 +246,32 @@ function countwords() : - - + + +".i18n("Select Project Type").": "; + echo "".REQUIREDFIELD.""; +} +?> + : () @@ -340,6 +384,8 @@ function countwords() echo i18n("%1 words maximum",array($config['participant_project_summary_wordmax'])); echo ""; + echo"".i18n("Feedback").":
"; + ?> diff --git a/admin/registration_list.php b/admin/registration_list.php index 9857c4db..d2ce653b 100644 --- a/admin/registration_list.php +++ b/admin/registration_list.php @@ -20,6 +20,10 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +// This file was modified Jan of 2014 by Richard Sin +// Flagging has been added to monitor projects with concern. + ?> 'committee_main.php', + array('Committee Main' => 'committee_main.php', 'Administration' => 'admin/index.php', 'Participant Registration' => 'admin/registration.php') ); @@ -361,6 +365,7 @@ echo "".i18n("Age Category").""; echo "".i18n("Division").""; echo "".i18n("School(s)").""; echo "".i18n("Student(s)").""; +echo "".i18n("Flagged").""; echo "".i18n("Action").""; echo ""; @@ -376,7 +381,7 @@ echo "

The statistics have moved here: $schools"; echo "$students"; + + echo ""; + if($r->flagged == false) { + echo "reg_id}','project');\" >"; + echo ""; + echo ""; + } + else { + echo "reg_id}','project');\" >"; + echo ""; + echo ""; + } + echo ""; if($year==$config['FAIRYEAR']) { echo "reg_id});return false\" >"; diff --git a/admin/reports.inc.php b/admin/reports.inc.php index 553ea00e..4e0665ef 100644 --- a/admin/reports.inc.php +++ b/admin/reports.inc.php @@ -21,11 +21,14 @@ Boston, MA 02111-1307, USA. */ - require_once("reports_students.inc.php"); /* $report_students_fields */ - require_once("reports_judges.inc.php"); /* $report_students_fields */ - require_once("reports_awards.inc.php"); /* $report_students_fields */ - require_once("reports_committees.inc.php"); /* $report_students_fields */ - require_once("reports_volunteers.inc.php"); /* $report_volunteers_fields */ +// This file was modified Jan of 2014 by Richard Sin +// A glitch that prints out both english and french columns has been modified. + + require_once("reports_students.inc.php"); /* $report_students_fields */ + require_once("reports_judges.inc.php"); /* $report_students_fields */ + require_once("reports_awards.inc.php"); /* $report_students_fields */ + require_once("reports_committees.inc.php"); /* $report_students_fields */ + require_once("reports_volunteers.inc.php"); /* $report_volunteers_fields */ require_once("reports_schools.inc.php"); require_once("reports_tours.inc.php"); require_once("reports_fairs.inc.php"); @@ -549,13 +552,19 @@ foreach($report_stock as $n=>$v) { function report_gen($report) { - global $config, $report_students_fields, $report_judges_fields, $report_awards_fields, $report_schools_fields; +foreach($report['col'] as $v) + + global $config, $report_students_fields, $report_judges_fields, $report_awards_fields, $report_schools_fields; global $report_stock, $report_committees_fields, $report_volunteers_fields; global $report_tours_fields, $report_fairs_fields; global $report_fundraisings_fields; global $filter_ops; - //print_r($report); +//foreach($report as $k=>$v){ +//print_r($k.' ~ >'); +//print_r($v); +//print_r('

'); +//} $fieldvar = "report_{$report['type']}s_fields"; $fields = $$fieldvar; @@ -643,25 +652,42 @@ foreach($report_stock as $n=>$v) { $total_width = 0; $scale_width = 0; + $temp=array(); + $count=0; + foreach($report['col'] as $o=>$d) { + if($config['default_language']!='fr'){ + if(strpos($d['field'],'fr_')!='fr_'){ + $temp[$count]=$d; + $count++; + } + } + } + $report['col']=$temp; /* Add up the column widths, and figure out which * ones are scalable, just in case */ foreach($report['col'] as $o=>$d) { $f = $d['field']; $total_width += $fields[$f]['width']; - if($fields[$f]['scalable'] == true) + if($fields[$f]['scalable'] == true) $scale_width += $fields[$f]['width']; } /* Determine the scale factor (use the label width so * we can enforce margins) */ + if($report['option']['fit_columns'] == 'yes') { // && $total_width > $label_stock['label_width']) { $static_width = $total_width - $scale_width; - if($scale_width) - $scale_factor = ($label_stock['label_width'] - $static_width) / $scale_width; - else - $scale_factor = 1.0; + if($scale_width){ + if ($label_stock['label_width'] - $static_width > 0) { + $scale_factor = ($label_stock['label_width'] - $static_width) / $scale_width; + } else { + $scale_factor = $label_stock['label_width']/$total_width; + } + } else { + $scale_factor = 1.0; + } } else { - $scale_factor = 1.0; + $scale_factor = 1.0; } /* Select columns to display */ @@ -703,6 +729,7 @@ foreach($report_stock as $n=>$v) { } } + /* If no sort order is specified, make the first field the order */ if(count($report['sort']) == 0) $report['sort'] = array(0 => array('field' => $report['col'][0]['field'])); @@ -766,10 +793,11 @@ foreach($report_stock as $n=>$v) { $q = "SELECT $sel $q $filter_query $group_query ORDER BY $order"; $r = mysql_query($q); - + // print_r($report); // print_r($report['filter']); // echo "$q"; + if($r == false) { echo "The report database query has failed. This is @@ -790,9 +818,8 @@ foreach($report_stock as $n=>$v) { $last_group_data = array(); // echo "
";print_r($rep);
-
 	while($i = mysql_fetch_assoc($r)) {
-
+		
 		if($n_groups > 0) {
 			$group_change = false;
 			/* See if any of the "group" fields have changed */
@@ -812,9 +839,10 @@ foreach($report_stock as $n=>$v) {
 
 			if($group_change) {
 				/* Dump the last table */
+
 				if(count($table['data'])) {
 				//	print_r($table);
-					$rep->addTable($table);
+					$rep->addTable($table);  //table is the content
 					$rep->nextLine();
 					$table['data'] = array();
 					$table['total'] = 0;
@@ -847,18 +875,17 @@ foreach($report_stock as $n=>$v) {
 			$rep->label_new();
 		}
 
-		foreach($report['col'] as $o=>$d) {
+		foreach($report['col'] as $o=>$d) {			//fill in one page
 			$f = $d['field'];
+
 			if(is_array($fields[$f]['value_map'])) {
 				$v = $fields[$f]['value_map'][$i["C$o"]];
 			} else if(is_callable($fields[$f]['exec_function'])) {
 				$v = call_user_func_array($fields[$f]['exec_function'], array($report, $f, $i["C$o"]));
-//			} else if(isset($fields[$f]['exec_code'])) {
-//				Somethign like this, how do we pass $i["C$o"] in?
-//				$v = exec($fields[$f]['exec_code']);
 			} else {
 				$v =  $i["C$o"];
 			}
+
 			if($gen_mode == 'table') {
 				$data[] = $v;
 			} else if($gen_mode == 'label') {
@@ -869,7 +896,7 @@ foreach($report_stock as $n=>$v) {
 				if($report['option']['field_box'] == 'yes') 
 					$opt[] = 'field_box';
 
-
+//the page content is filled
 				/* Special column, draw a box */
 				if($f == 'static_box') {
 					$rep->addLabelBox($d['x'], $d['y'], $d['w'],
@@ -955,6 +982,7 @@ foreach($report_stock as $n=>$v) {
 				*/
 
 			}
+//}
 
 			if($fields[$f]['total'] == true)
 				$table['total'] += $v;
diff --git a/admin/reports_editor.php b/admin/reports_editor.php
index 712d60c1..2160742b 100644
--- a/admin/reports_editor.php
+++ b/admin/reports_editor.php
@@ -22,6 +22,7 @@
 */
 ?>
  'x', 'Y' => 'y', 'W' => 'w', 'H' => 'h', 'Lines' => 'lines');
 
@@ -53,6 +55,10 @@
 			if($in_optgroup) echo '';
 			echo '';
 		}
+		if($f['name']=='Project -- Type'){										//filter out if the configuration setting does not allow for the project type
+			global $config;
+			if($config['project_type']=='no') continue;
+		}
 		$sel = ($selected == $k) ? 'selected=\"selected\"': '' ;
         	echo "";
 	}	
@@ -64,7 +70,7 @@
  {
 	echo "';
diff --git a/admin/reports_students.inc.php b/admin/reports_students.inc.php
index 1f4417b1..30bf0ead 100644
--- a/admin/reports_students.inc.php
+++ b/admin/reports_students.inc.php
@@ -13,7 +13,7 @@
    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.
+   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
@@ -21,6 +21,10 @@
    Boston, MA 02111-1307, USA.
 */
 
+// This file was modified Jan of 2014 by Richard Sin
+// Project Type has been added to the list.
+// Cheque Splitting algorithm is added.
+
 function report_students_i18n_fr($report, $field, $text)
 {
 	return i18n($text, array(), array(), 'fr');
@@ -164,7 +168,7 @@ $report_students_fields = array(
 	'pn' => array(
 		'name' => 'Project Number',
 		'header' => '#',
-		'width' => 0.6,
+		'width' => 0.7,
 		'table' => 'projects.projectnumber',
 		'table_sort' => 'projects.projectsort, projects.projectnumber'),
 
@@ -238,6 +242,13 @@ $report_students_fields = array(
 		'table' => "GROUP_CONCAT(students.firstname, ' ', students.lastname ORDER BY students.lastname SEPARATOR ', ')",
 		'group_by' => array('students.registrations_id')),
 
+	'allnames_split' =>  array(
+		'name' => "Student -- All Student Names (REQUIRES MYSQL 5.0) (Split) ",
+		'header' => 'Student(s)',
+		'width' => 3.0,
+		'scalable' => true,
+		'table' => "CONCAT(students.firstname, ' ', students.lastname)",),
+
 	'pronunciation'  =>  array(
 		'name' => 'Student -- Name Pronunciation',
 		'header' => 'Pronunciation',
@@ -377,9 +388,15 @@ $report_students_fields = array(
 	'division' =>  array(
 		'name' => 'Project -- Division',
 		'header' => 'Division',
-		'width' => 3.0,
+		'width' => 1.0,
 		'table' => 'projectdivisions.division' ),
 
+	'projecttype' =>  array(
+		'name' => 'Project -- Type',
+		'header' => 'Type',
+		'width' => 1.0,
+		'table' => 'projects.projecttype' ),
+
 	'div' => array(
 		'name' => 'Project -- Division Short Form' ,
 		'header' => 'Div',
@@ -601,7 +618,7 @@ $report_students_fields = array(
 	'school_city' =>  array(
 		'name' => 'School -- City',
 		'header' => 'City',
-		'width' => 1.5,
+		'width' => 1.0,
 		'table' => 'schools.city' ),
 
 	'school_province' =>  array(
@@ -703,6 +720,13 @@ $report_students_fields = array(
 		'table' => 'award_prizes.cash',
 		'components' => array('awards')),
 
+	'award_prize_cash_split' => array(
+		'name' => 'Award -- Prize Cash Amount (Split)',
+		'header' => 'Cash',
+		'width' => 0.5,
+		'table' => 'award_prizes.cash/a.count',
+		'components' => array('awards')),
+
 	'award_prize_cash_cheque' => array(
 		'name' => 'Award -- Prize Cash Amount for Cheques',
 		'header' => 'Cash',
@@ -711,6 +735,14 @@ $report_students_fields = array(
 		'components' => array('awards'),
 		'exec_function' => 'report_student_cash_cheque'),
 
+	'award_prize_cash_cheque_split' => array(
+		'name' => 'Award -- Prize Cash Amount for Cheques (Split)',
+		'header' => 'Cash',
+		'width' => 0.5,
+		'table' => 'award_prizes.cash/a.count',
+		'components' => array('awards'),
+		'exec_function' => 'report_student_cash_cheque'),
+
 	'award_prize_cash_words' => array(
 		'name' => 'Award -- Prize Cash Amount In Words',
 		'header' => 'Cash',
@@ -719,6 +751,14 @@ $report_students_fields = array(
 		'components' => array('awards'),
 		'exec_function' => 'report_student_cash_words'),
 
+	'award_prize_cash_words_split' => array(
+		'name' => 'Award -- Prize Cash Amount In Words (Split)',
+		'header' => 'Cash',
+		'width' => 0.5,
+		'table' => 'award_prizes.cash/a.count',
+		'components' => array('awards'),
+		'exec_function' => 'report_student_cash_words'),
+
 	'award_prize_scholarship' => array(
 		'name' => 'Award -- Prize Scholarship Amount',
 		'header' => 'Scholarship',
@@ -1072,7 +1112,11 @@ $report_students_fields = array_merge($report_students_fields,$regfeeitems);
 		$awards_join = "LEFT JOIN winners ON winners.projects_id = projects.id
 				LEFT JOIN award_prizes ON award_prizes.id = winners.awards_prizes_id
 				LEFT JOIN award_awards ON award_awards.id = award_prizes.award_awards_id
-				LEFT JOIN award_types ON award_types.id=award_awards.award_types_id";
+				LEFT JOIN award_types ON award_types.id=award_awards.award_types_id
+				LEFT JOIN (SELECT registrations_id AS id, COUNT( * ) AS count
+					FROM students
+					GROUP BY registrations_id) a
+				ON a.id=students.registrations_id";
 		$awards_where = " AND winners.year='$year'
 				AND award_awards.year='$year'
 				AND award_prizes.year='$year'
diff --git a/db/db.code.version.txt b/db/db.code.version.txt
index f07e2860..1057e9a2 100644
--- a/db/db.code.version.txt
+++ b/db/db.code.version.txt
@@ -1 +1 @@
-175
+176
diff --git a/db/db.update.176.sql b/db/db.update.176.sql
new file mode 100644
index 00000000..53413ba4
--- /dev/null
+++ b/db/db.update.176.sql
@@ -0,0 +1,32 @@
+/* This file was modified Jan of 2014 by Richard Sin     */
+/* below are the updated tables, alterations, and inserts*/
+
+CREATE TABLE `projecttypes` 
+	(id int(10),
+	type varchar(64) COLLATE latin1_swedish_ci);
+
+INSERT INTO `projecttypes` (`id`,`type`) VALUES
+(1,'Experiment'),
+(2,'Innovation'),
+(3,'Study');
+
+INSERT INTO `config` (`var`,`val`,`category`, `type`, `type_values`, `ord`, `description`, `year`) VALUES
+('project_type','no','Participant Registration', 'yesno','','3100','Allows the ability to categorize projects into Experiments, Studies, or Innovations.','-1');
+
+ALTER TABLE `projects` ADD
+	(projecttype varchar(64) COLLATE latin1_swedish_ci,
+	feedback text COLLATE latin1_swedish_ci,
+	flagged tinyint(1));
+
+UPDATE `reports_items` SET `field`= 'allnames'
+WHERE `id` = 9099;
+
+INSERT INTO `translations` (lang, strmd5, str, val, argsdesc) VALUES
+('fr','245fe794333c2b0d5c513129b346b93f','Project Type','',''),
+('fr','22413e12cc28e98272e112ec778b8807','Select a project','',''),
+('fr','05aeba473f4906b85c7627ba045e890a','Experiment','',''),
+('fr','0a3dac2314e66e15240f019afcbd6b0f','Study','',''),
+('fr','32f28a2c732e178e43a0ceeffa08ab08','Innovation','',''),
+('fr','bea4c2c8eb82d05891ddd71584881b56','Feedback','',''),
+('fr','72d68acd07c783e657e2d2a9c50f16df','Flagged','',''),
+('fr','d47429e01c5a1c8768a0e293fe9b9ce5','Not flagged','','');
diff --git a/images/16/flagged.png b/images/16/flagged.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b990a2f7793a1c3c5ea305f8b716ff98517213a
GIT binary patch
literal 890
zcmV-=1BLvFP)=
z9~4vsDJm9GRx7>;7JbkP+Mu+QmR`~(sVz2HY-G(+bJ?($Y&Py>XU2zUv`s(w-p)C2
zzH>g|HgkDfzt3^qJ_ov7Tyc@>69B6HS
zJC;m7>VNSC^pJ_Cr3EXW$EnrU7o{)~akO|0?YHTG%+3Y1NA{1Xi@kk54?O4Hw->uw
zMUO_&fHMW54B&e65M`20E^##hxy5;v{#mJl`=ak)tx%fr6Lg;g#w~!pcIQozb5kd
zV|Y8-G4>_^SUUU>fuB#{U0MbKpQhmv>CyqwEDJ3+gBS*482AbcFgFixzOi<_@d<)Q
zzxgjWR{??}qLhnVcgkg=Q&}QcuF`yIj6f)a_kU!zrs0D_{|E@^8g-|^ib!5nbZxY3
z+hq|!G=-#l(B6G#4SetwcjjO>6XKOX#$gC179UVB&
zKC|Ze(EAkYb&B_NQ~Wr?>QolFuZP;6L1vY(;L(re;;|b7Fw#HJ9I+dtEjxB}8ZFVa
z2y?j&MKV$;s+Y!CICn1pQ(Nnk(}~#VdX>K)*xi}5tdVd!eYe@&jmXVp*M;ijB&CUo
z{OM%kz^}>p=}ab5xe4~=?gv{_wUyTcfxwV)SIYD@H3LvD6|sKLEf?#59Xp?hAD&Lc
zu4FQq%7$+Q7#>U@?=)SpVYx2KHYj68q7Z
QjQ{`u07*qoM6N<$g2bwzdjJ3c

literal 0
HcmV?d00001

diff --git a/lpdf.php b/lpdf.php
index 77c0d375..7632508f 100644
--- a/lpdf.php
+++ b/lpdf.php
@@ -20,6 +20,10 @@
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
+
+// This file was modified Jan of 2014 by Richard Sin
+// It properly formats pdf files and prevents overflows.
+
 ?>
 defaultFontSize)/64,2);
 
+		$line_height=round(round($this->defaultFontSize)/64,2);
 		$table_width=array_sum($table['widths']);
 		$table_padding=0.03;
-	
 		$allow_multiline = false;
-		if(is_array($table['option'])) {
+
+		if(is_array($table['option'])) 
+		{
 			$allow_multiline = ($table['option']['allow_multiline'] == true) ? true : false;
 		}
 
@@ -691,113 +697,124 @@ class lpdf
 		//now do the data in the table
 		if($table['data'])
 		{
+
 			pdf_setfont($this->pdf,$this->normalfont,$this->defaultFontSize);
 			foreach($table['data'] AS $dataline)
 			{
-//				$this->yloc-=$line_height;
-				$xpos=$xpos_of_table;
-
-				/* Fit first */
-				$col_width = array();
-				$col_height = 1;
-				for($c=0;$c<$table_cols;$c++)
+				do
 				{
-					$width=$table['widths'][$c];
-					$textstr=trim($dataline[$c]);
-					$try=0;
-					$h = $col_height;
-					$last_notfit = 0;
-
-					while(1) {
-//						echo "h=$h, width=$width, text=[$textstr]\n";
-						$notfit=pdf_show_boxed($this->pdf,$textstr,
-							$this->loc($xpos+$table_padding),$this->loc($this->yloc-($h)*$line_height),
-							$this->loc($width-2*$table_padding),$this->loc($line_height*$h),
-							$table['dataalign'][$c],'blind');
-//					 	echo "  nofit=$notfit\n";
-
-						/* It fits, break and do it for real */
-						if($notfit == 0) break;
-
-						/* If we're not allowed to use multiple lines, we're done. */ 
-						if($allow_multiline == false) break; 
-
-						if($last_notfit == $notfit) {
-							/* Height was increased, but it didn't help the fit at all
-							 * Try again up to 5 times. */
-							if($try == 5) {
-								/* Text in is the same as text out for 5 line increments,
-								 * we're probably in an infinite loop.  So, instead
-								 * of trying to just add vspace, fudge the hspace and
-								 * restart */
-								$h = 1;
-								$width += 0.1;
-								$try=0;
-								continue;
-							}
-							$try++;
-						} else {
-							/* We found a line height that helped the fit */
-							$try=0;
-						}
-						$last_notfit = $notfit;
-
-						/* Increase the height and try again */
-						$h++;
-					}
-					$col_width[$c] = $width;
-					if($h > $col_height) $col_height = $h;
-				}
-
-				/* If this entry goes off the bottom of the
-				 * page, start a new page, and then blindly
-				 * dump this entry on it (but try to squeeze on
-				 * as much as possible) */
-				if($this->yloc - ($line_height * $col_height) < 0.75)
-				{
-					$this->addTableEnd($table, $xpos_of_table, $top_of_table);
-					$this->newPage($this->page_width,$this->page_height);
-					$top_of_table = $this->addTableStart($table, $xpos_of_table, $table_width);
-				}
-
-				/* Do it for real */
-				for($c=0;$c<$table_cols;$c++)
-				{
-					$width = $col_width[$c];
-					$h = $col_height * $line_height;
-					$textstr=trim($dataline[$c]);
-
-					$notfit = pdf_show_boxed($this->pdf,$textstr,
-						$this->loc($xpos+$table_padding),$this->loc($this->yloc-$h),
-						$this->loc($width-2*$table_padding),$this->loc($h),
-						$table['dataalign'][$c],null);
-
-					//put a little "..." at the end of the field
-					if($notfit)
+					$xpos=$xpos_of_table;
+	
+					/* Fit first */
+					$col_width = array();
+					$col_height = 1;
+					for($c=0;$c<$table_cols;$c++)
 					{
-						pdf_setfont($this->pdf,$this->normalfont,8);
-						pdf_show_boxed($this->pdf,"...",
-							$this->loc($xpos+$width-0.10),$this->loc($this->yloc-$line_height-0.05),
-							$this->loc(0.10),$this->loc($line_height),
-							$table['dataalign'][$c],null);
-						pdf_setfont($this->pdf,$this->normalfont,$this->defaultFontSize);
+						$width=$table['widths'][$c];
+						$textstr=trim($dataline[$c]);
+						$try=0;
+						$h = $col_height;
+						$last_notfit = 0;
+						while(1) 
+						{
+							$notfit=pdf_show_boxed($this->pdf,$textstr,
+								$this->loc($xpos+$table_padding),$this->loc($this->yloc-($h)*$line_height),
+								$this->loc($width-2*$table_padding),$this->loc($line_height*$h),
+								$table['dataalign'][$c],'blind');
+	
+							/* It fits, break and do it for real */
+							if($notfit == 0) break;
+	
+							/* If we're not allowed to use multiple lines, we're done. */ 
+							if($allow_multiline == false) break; 
+	
+							if($last_notfit == $notfit) 
+							{
+								/* Height was increased, but it didn't help the fit at all
+								 * Try again up to 5 times. */
+								if($try == 5) 
+								{
+									/* Text in is the same as text out for 5 line increments,
+									 * we're probably in an infinite loop.  So, instead
+									 * of trying to just add vspace, fudge the hspace and
+									 * restart */
+									$h = 1;
+									$width += 0.1;
+									$try=0;
+									continue;
+								}
+								$try++;
+							} else {
+								/* We found a line height that helped the fit */
+								$try=0;
+							}
+	
+							$last_notfit = $notfit;
+							if($this->yloc - ($line_height * $h) < 0.75)
+							{
+								$h--;
+								break;
+							} else {
+								/* Increase the height and try again */
+								$h++;
+							}
+						}
+						$col_width[$c] = $width;
+						
+						if($h > $col_height) $col_height = $h;
 					}
-
-					$xpos+=$width;
-				}
-				$this->yloc -= $line_height*$col_height;
-
-				//draw the line below the table data)
-				pdf_moveto($this->pdf,$this->loc($xpos_of_table),$this->loc($this->yloc));
-				pdf_lineto($this->pdf,$this->loc($xpos_of_table+$table_width),$this->loc($this->yloc));
-				pdf_stroke($this->pdf);
-
-				if($this->yloc<1.1)
-				{
-					$this->addTableEnd($table, $xpos_of_table, $top_of_table);
-					$this->newPage($this->page_width,$this->page_height);
-					$top_of_table = $this->addTableStart($table, $xpos_of_table, $table_width);
-				}
+	
+					/* If this entry goes off the bottom of the
+					 * page, start a new page, and then blindly
+					 * dump this entry on it (but try to squeeze on
+					 * as much as possible) */
+					//if($this->yloc - ($line_height * $col_height) < 0.75)
+					//{
+					//	$this->addTableEnd($table, $xpos_of_table, $top_of_table);
+					//	$this->newPage($this->page_width,$this->page_height);
+					//	$top_of_table = $this->addTableStart($table, $xpos_of_table, $table_width);
+					//}
+	
+					/* Do it for real */
+					for($c=0;$c<$table_cols;$c++)
+					{
+						$width = $col_width[$c];
+						$h = $col_height * $line_height;
+						$textstr=trim($dataline[$c]);
+	
+						$notfit = pdf_show_boxed($this->pdf,$textstr,
+							$this->loc($xpos+$table_padding),$this->loc($this->yloc-$h),
+							$this->loc($width-2*$table_padding),$this->loc($h),
+							$table['dataalign'][$c],null);
+	
+						//put a little "..." at the end of the field
+						if($notfit)
+						{	
+							$dataline[$c]=substr($textstr,-$notfit);
+							pdf_setfont($this->pdf,$this->normalfont,8);
+							if($allow_multiline)pdf_show_boxed($this->pdf,"(continued..)",
+								$this->loc($xpos+$width-0.55),$this->loc($this->yloc-$h-0.15),
+								$this->loc(0.6),$this->loc($line_height),
+								$table['dataalign'][$c],null);
+							pdf_setfont($this->pdf,$this->normalfont,$this->defaultFontSize);
+						}
+	
+						$xpos+=$width;
+					}
+					$this->yloc -= $line_height*$col_height;
+	
+					//draw the line below the table data)
+					pdf_moveto($this->pdf,$this->loc($xpos_of_table),$this->loc($this->yloc));
+					pdf_lineto($this->pdf,$this->loc($xpos_of_table+$table_width),$this->loc($this->yloc));
+					pdf_stroke($this->pdf);
+	
+					if($this->yloc<1.1)
+					{
+						$this->addTableEnd($table, $xpos_of_table, $top_of_table);
+						$this->newPage($this->page_width,$this->page_height);
+						$top_of_table = $this->addTableStart($table, $xpos_of_table, $table_width);
+					}
+				}while($notfit>0);
 			}
 		}
 
diff --git a/register_participants_project.php b/register_participants_project.php
index af4a3f84..05a75e14 100644
--- a/register_participants_project.php
+++ b/register_participants_project.php
@@ -20,6 +20,10 @@
    the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.
 */
+
+// This file was modified Jan of 2014 by Richard Sin
+// Added project type.
+
 ?>
 ";
@@ -260,6 +265,28 @@ function countwords()
  }
  echo "";
 
+if($config['project_type'] == 'yes'){
+ $q=mysql_query("SELECT * FROM projecttypes ORDER BY type");
+ echo "".i18n("Project Type").": ";
+ echo "".REQUIREDFIELD."";
+}
+ 
  echo "".i18n("Language").": ";
  echo "