diff --git a/admin/award_awards.php b/admin/award_awards.php index 497d8de..b6f0f7a 100644 --- a/admin/award_awards.php +++ b/admin/award_awards.php @@ -82,7 +82,8 @@ "presenter='".mysql_escape_string(stripslashes($_POST['presenter']))."', ". "excludefromac='".mysql_escape_string(stripslashes($_POST['excludefromac']))."', ". "cwsfaward='".mysql_escape_string(stripslashes($_POST['cwsfaward']))."', ". - "criteria='".mysql_escape_string(stripslashes($_POST['criteria']))."' ". + "criteria='".mysql_escape_string(stripslashes($_POST['criteria']))."', ". + "description='".mysql_escape_string(stripslashes($_POST['description']))."' ". "WHERE id='$id'"; mysql_query($exec); @@ -151,6 +152,7 @@ award_awards.id, award_awards.name, award_awards.criteria, + award_awards.description, award_awards.order, award_awards.presenter, award_awards.excludefromac, @@ -178,6 +180,7 @@ echo mysql_error(); $award_awards_name=$r->name; $award_awards_order=$r->order; $award_awards_criteria=$r->criteria; + $award_awards_description=$r->description; $award_types_id=$r->award_types_id; $award_type=$r->type; $award_sponsors_id=$r->award_sponsors_id; @@ -212,6 +215,7 @@ echo mysql_error(); if($_POST['name']) $award_awards_name=$_POST['name']; if($_POST['order']) $award_awards_order=$_POST['order']; if($_POST['criteria']) $award_awards_criteria=$_POST['criteria']; + if($_POST['description']) $award_awards_criteria=$_POST['description']; if($_POST['award_types_id']) $award_types_id=$_POST['award_types_id']; if($_POST['award_sponsors_id']) $award_sponsors_id=$_POST['award_sponsors_id']; if($_POST['eligiblecategories']) $currentcategories=$_POST['eligiblecategories']; @@ -263,9 +267,9 @@ echo mysql_error(); echo ""; echo ""; - echo "".i18n("Criteria")."\n"; + echo "".i18n("Criteria")."\n"; + echo "".i18n("Description")."\n"; echo "".i18n("Eligibility").""; - echo ""; echo ""; echo ""; diff --git a/admin/award_prizes.php b/admin/award_prizes.php index 64f8a80..76825ec 100644 --- a/admin/award_prizes.php +++ b/admin/award_prizes.php @@ -74,6 +74,10 @@ "value='".mysql_escape_string(stripslashes($_POST['value']))."', ". "number='".mysql_escape_string(stripslashes($_POST['number']))."', ". "excludefromac='".mysql_escape_string(stripslashes($_POST['excludefromac']))."', ". + "trophystudentkeeper='".mysql_escape_string(stripslashes($_POST['trophystudentkeeper']))."', ". + "trophystudentreturn='".mysql_escape_string(stripslashes($_POST['trophystudentreturn']))."', ". + "trophyschoolkeeper='".mysql_escape_string(stripslashes($_POST['trophyschoolkeeper']))."', ". + "trophyschoolreturn='".mysql_escape_string(stripslashes($_POST['trophyschoolreturn']))."', ". "`order`='".mysql_escape_string(stripslashes($_POST['order']))."' ". "WHERE id='$id'"; mysql_query($exec); @@ -137,11 +141,23 @@ echo "\n"; echo "\n"; echo "\n"; + echo ""; echo ""; + echo ""; + echo ""; + + echo ""; - echo "\n"; echo "
".i18n("Age Categories")."
".i18n("Prize Value")."\$value)."\" size=\"10\" maxlength=\"10\" />
".i18n("Number available")."number)."\" size=\"3\" maxlength=\"5\" />
".i18n("Order")."order)."\" size=\"3\" maxlength=\"5\" />
".i18n("Plaque/Trophy").""; + if($r->trophystudentkeeper==1) $ch="checked=\"checked\""; else $ch=""; + echo "".i18n("Student(s) keeper trophy")."
"; + if($r->trophystudentreturn==1) $ch="checked=\"checked\""; else $ch=""; + echo "".i18n("Student(s) annual return/reuse trophy")."
"; + if($r->trophyschoolkeeper==1) $ch="checked=\"checked\""; else $ch=""; + echo "".i18n("School keeper trophy")."
"; + if($r->trophyschoolreturn==1) $ch="checked=\"checked\""; else $ch=""; + echo "".i18n("School annual return/reuse trophy")."
".i18n("Awards Ceremony").""; if($r->excludefromac==1) $ch="checked=\"checked\""; else $ch=""; echo "".i18n("Exclude this prize from the award ceremony script")."
\n"; diff --git a/admin/reports_acscript.php b/admin/reports_acscript.php index acd91ac..c7c7694 100644 --- a/admin/reports_acscript.php +++ b/admin/reports_acscript.php @@ -33,6 +33,7 @@ award_awards.id, award_awards.name, award_awards.presenter, + award_awards.description, award_awards.order AS awards_order, award_types.type, award_sponsors.organization @@ -60,6 +61,8 @@ $rep->addText(i18n("Sponsored by: %1",array($r->organization))); if($r->presenter) $rep->addText(i18n("Presented by: %1",array($r->presenter))); + if($r->description) + $rep->addText(i18n("Description: %1",array($r->description))); $pq=mysql_query("SELECT award_prizes.prize, diff --git a/db/db.update.65.sql b/db/db.update.65.sql new file mode 100644 index 0000000..25a783a --- /dev/null +++ b/db/db.update.65.sql @@ -0,0 +1,6 @@ +ALTER TABLE `award_prizes` + ADD `trophystudentkeeper` BOOL DEFAULT '0' NOT NULL , + ADD `trophystudentreturn` BOOL DEFAULT '0' NOT NULL , + ADD `trophyschoolkeeper` BOOL DEFAULT '0' NOT NULL , + ADD `trophyschoolreturn` BOOL DEFAULT '0' NOT NULL ; +ALTER TABLE `award_awards` ADD `description` TEXT NOT NULL AFTER `criteria` ;