arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

- Fix the trophy printing

Browse Source 
- Fix the table updates on creating a new prize
This commit is contained in:
dave 2009-09-26 08:11:34 +00:00
parent d77616a438
commit 51eaad76a5
1 changed files with 56 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
admin/award_awards.php
View File

@ -439,8 +439,11 @@ function eligibility_save()
function prize_save() function prize_save()
{ {
$("#debug").load("<?$_SERVER['PHP_SELF']?>?action=prize_save", $("#prizeinfo").serializeArray()); $("#debug").load("<?$_SERVER['PHP_SELF']?>?action=prize_save", $("#prizeinfo").serializeArray(),
update_prizeinfo(); function(responseText, textStatus, XMLHttpRequest)
{
update_prizeinfo();
});
return false; return false;
} }
@ -448,10 +451,13 @@ function prize_delete(id)
{ {
var confirm = confirmClick('Are you sure you want to delete this prize?'); var confirm = confirmClick('Are you sure you want to delete this prize?');
if(confirm == true) { if(confirm == true) {
$("#prizeinfo_info").load("<?$_SERVER['PHP_SELF']?>?action=prize_delete&id="+id); $("#prizeinfo_info").load("<?$_SERVER['PHP_SELF']?>?action=prize_delete&id="+id,null,
$(".prizelist_tr#"+id).fadeTo('slow', 0); function(responseText, textStatus, XMLHttpRequest)
$(".prizelist_tr#"+id).remove(); {
prizelist_refresh(); $(".prizelist_tr#"+id).fadeTo('slow', 0);
$(".prizelist_tr#"+id).remove();
prizelist_refresh();
});
} }
return 0; return 0;
} }
@ -572,10 +578,10 @@ $(document).ready(function() {
<form id="awardinfo"> <form id="awardinfo">
<input type="hidden" name="id" id="awardinfo_id" value="0" /> <input type="hidden" name="id" id="awardinfo_id" value="0" />
<table class="tableedit"> <table class="tableedit">
<tr><td class="left"><?=i18n("Name")?>:</td> <tr><td><?=i18n("Name")?>:</td>
<td class="right"><input class="translatable" type="text" id="awardinfo_name" name="name" value="Loading..." size="50" maxlength="128"> <td><input class="translatable" type="text" id="awardinfo_name" name="name" value="Loading..." size="50" maxlength="128">
</td></tr> </td></tr>
<tr><td class="left"><?=i18n("Sponsor")?>:</td><td class="right"> <tr><td><?=i18n("Sponsor")?>:</td><td>
<? <?
$sq=mysql_query("SELECT id,organization FROM sponsors ORDER BY organization"); $sq=mysql_query("SELECT id,organization FROM sponsors ORDER BY organization");
echo "<select id=\"awardinfo_sponsors_id\" name=\"sponsors_id\">"; echo "<select id=\"awardinfo_sponsors_id\" name=\"sponsors_id\">";
@ -586,10 +592,10 @@ $(document).ready(function() {
} }
?> ?>
</select></td></tr> </select></td></tr>
<tr><td class="left"><?=i18n("Presenter")?>:</td> <tr><td><?=i18n("Presenter")?>:</td>
<td class="right"><input type="text" id="awardinfo_presenter" name="presenter" value="Loading..." size="50" maxlength="128" /> <td><input type="text" id="awardinfo_presenter" name="presenter" value="Loading..." size="50" maxlength="128" />
</td></tr> </td></tr>
<tr><td class="left"><?=i18n("Type")?>:</td><td class="right"> <tr><td><?=i18n("Type")?>:</td><td>
<? <?
$tq=mysql_query("SELECT id,type FROM award_types WHERE year='{$config['FAIRYEAR']}' ORDER BY type"); $tq=mysql_query("SELECT id,type FROM award_types WHERE year='{$config['FAIRYEAR']}' ORDER BY type");
echo "<select id=\"awardinfo_award_types_id\" name=\"award_types_id\">"; echo "<select id=\"awardinfo_award_types_id\" name=\"award_types_id\">";
@ -600,26 +606,26 @@ $(document).ready(function() {
} }
?> ?>
</select></td></tr> </select></td></tr>
<tr><td class="left"><?=i18n("Criteria")?>:</td> <tr><td><?=i18n("Criteria")?>:</td>
<td class="right"><textarea class="translatable" id="awardinfo_criteria" name="criteria" rows="3" cols="50">Loading...</textarea></td></tr> <td><textarea class="translatable" id="awardinfo_criteria" name="criteria" rows="3" cols="50">Loading...</textarea></td></tr>
<tr><td class="left"><?=i18n("Description")?>:</td> <tr><td><?=i18n("Description")?>:</td>
<td class="right"><textarea class="translatable" id="awardinfo_description" name="description" rows="3" cols="50">Loading...</textarea></td></tr> <td><textarea class="translatable" id="awardinfo_description" name="description" rows="3" cols="50">Loading...</textarea></td></tr>
</table> </table>
<h4>Options</h4> <h4>Options</h4>
<table class="tableedit"> <table class="tableedit">
<tr><td class="left"> <tr><td>
<input type="checkbox" id="awardinfo_excludefromac" name="excludefromac" value="1"></td> <input type="checkbox" id="awardinfo_excludefromac" name="excludefromac" value="1"></td>
<td class="right"><?=i18n("Exclude this award from the award ceremony script")?></td></tr> <td><?=i18n("Exclude this award from the award ceremony script")?></td></tr>
<tr><td class="left"> <tr><td>
<input type="checkbox" id="awardinfo_cwsfaward" name="cwsfaward" value="1"></td> <input type="checkbox" id="awardinfo_cwsfaward" name="cwsfaward" value="1"></td>
<td class="right"><?=i18n("This award identifies the students that will be attending the Canada-Wide Science Fair")?></td></tr> <td><?=i18n("This award identifies the students that will be attending the Canada-Wide Science Fair")?></td></tr>
<tr><td class="left"> <tr><td>
<input type="checkbox" id="awardinfo_selfnominate" name="self_nominate" value="yes"></td> <input type="checkbox" id="awardinfo_selfnominate" name="self_nominate" value="yes"></td>
<td class="right"><?=i18n("Students can self-nominate for this award (this is usually checked for special awards)")?></td></tr> <td><?=i18n("Students can self-nominate for this award (this is usually checked for special awards)")?></td></tr>
<tr><td class="left"> <tr><td>
<input type="checkbox" id="awardinfo_schedulejudges" name="schedule_judges" value="yes"></td> <input type="checkbox" id="awardinfo_schedulejudges" name="schedule_judges" value="yes"></td>
<td class="right"><?=i18n("Allow the Automatic Judge Scheduler to assign judges to this award (usually checked)")?></td></tr> <td><?=i18n("Allow the Automatic Judge Scheduler to assign judges to this award (usually checked)")?></td></tr>
</table> </table>
<input type="submit" onClick="awardinfo_save();return false;" value="Save" /> <input type="submit" onClick="awardinfo_save();return false;" value="Save" />
</form> </form>
@ -632,7 +638,7 @@ $(document).ready(function() {
<form id="eligibility"> <form id="eligibility">
<input type="hidden" id="eligibility_award_awards_id" name="award_awards_id" value="" /> <input type="hidden" id="eligibility_award_awards_id" name="award_awards_id" value="" />
<table class="tableedit"> <table class="tableedit">
<tr><td class="left"><?=i18n("Age Categories")?>:</td><td class="right"> <tr><td><?=i18n("Age Categories")?>:</td><td>
<? <?
// if(count($currentcategories)==0) $class="class=\"error\""; else $class=""; // if(count($currentcategories)==0) $class="class=\"error\""; else $class="";
@ -645,7 +651,7 @@ $(document).ready(function() {
?> ?>
</td></tr> </td></tr>
<tr><td class="left"><?=i18n("Divisions")?>:</td><td class="right"> <tr><td><?=i18n("Divisions")?>:</td><td>
<? <?
$dq=mysql_query("SELECT * FROM projectdivisions WHERE year='{$config['FAIRYEAR']}' ORDER BY division"); $dq=mysql_query("SELECT * FROM projectdivisions WHERE year='{$config['FAIRYEAR']}' ORDER BY division");
echo mysql_error(); echo mysql_error();
@ -687,37 +693,37 @@ $(document).ready(function() {
<input type="hidden" id="prizeinfo_award_awards_id" name="award_awards_id" value=""/> <input type="hidden" id="prizeinfo_award_awards_id" name="award_awards_id" value=""/>
<table class="tableedit"> <table class="tableedit">
<tr> <tr>
<td class="left"><?=i18n("Number available")?>:</td> <td><?=i18n("Number available")?>:</td>
<td class="right"><input type="text" id="prizeinfo_number" class="prizeinfo" name="number" value="" size="3" maxlength="5" disabled="disabled" /></td> <td><input type="text" id="prizeinfo_number" class="prizeinfo" name="number" value="" size="3" maxlength="5" disabled="disabled" /></td>
</tr><tr> </tr><tr>
<td class="left"><?=i18n("Prize Description")?>:</td> <td><?=i18n("Prize Description")?>:</td>
<td class="right"><input type="text" id="prizeinfo_prize" class="prizeinfo translatable" name="prize" value="" size="40" maxlength="128" disabled="disabled"/></td> <td><input type="text" id="prizeinfo_prize" class="prizeinfo translatable" name="prize" value="" size="40" maxlength="128" disabled="disabled"/></td>
</tr><tr> </tr><tr>
<td class="left"><?=i18n("Cash Amount")?> ($):</td> <td><?=i18n("Cash Amount")?> ($):</td>
<td class="right"><input type="text" id="prizeinfo_cash" class="prizeinfo" name="cash" value="" size="10" maxlength="10" disabled="disabled" /></td> <td><input type="text" id="prizeinfo_cash" class="prizeinfo" name="cash" value="" size="10" maxlength="10" disabled="disabled" /></td>
</tr><tr> </tr><tr>
<td class="left"><?=i18n("Scholarship Amount")?> ($):</td> <td><?=i18n("Scholarship Amount")?> ($):</td>
<td class="right"><input type="text" id="prizeinfo_scholarship" class="prizeinfo" name="scholarship" value="" size="10" maxlength="10" disabled="disabled" /></td> <td><input type="text" id="prizeinfo_scholarship" class="prizeinfo" name="scholarship" value="" size="10" maxlength="10" disabled="disabled" /></td>
</tr><tr> </tr><tr>
<td class="left"><?=i18n("Prize Value")?> ($):</td> <td><?=i18n("Prize Value")?> ($):</td>
<td class="right"><input type="text" id="prizeinfo_value" class="prizeinfo" name="value" value="" size="10" maxlength="10" disabled="disabled" /></td> <td><input type="text" id="prizeinfo_value" class="prizeinfo" name="value" value="" size="10" maxlength="10" disabled="disabled" /></td>
</tr><tr> </tr><tr>
<td class="left" valign="top"><?=i18n("Plaque/Trophy")?>:</td> <td valign="top"><?=i18n("Plaque/Trophy")?>:</td>
<td class="right"> <td>
<table class="tableedit" cols="4"> <table>
<tr> <td align="right"><input type="checkbox" id="prizeinfo_trophystudentkeeper" class="prizeinfo" name="trophystudentkeeper" value="1" disabled="disabled"></td> <tr> <td style="width:5%;"><input type="checkbox" id="prizeinfo_trophystudentkeeper" class="prizeinfo" name="trophystudentkeeper" value="1" disabled="disabled"></td>
<td ><?=i18n("Student(s) keeper trophy")?></td> <td style="width:45%"><?=i18n("Student(s) keeper trophy")?></td>
<td align="right"><input type="checkbox" id="prizeinfo_trophystudentreturn" class="prizeinfo" name="trophystudentreturn" value="1" disabled="disabled"></td> <td style="width:5%;"><input type="checkbox" id="prizeinfo_trophystudentreturn" class="prizeinfo" name="trophystudentreturn" value="1" disabled="disabled"></td>
<td ><?=i18n("Student(s) annual return/reuse trophy")?></td> <td style="width:45%"><?=i18n("Student(s) annual return/reuse trophy")?></td>
</tr><tr> </tr><tr>
<td align="right"><input type="checkbox" id="prizeinfo_trophyschoolkeeper" class="prizeinfo" name="trophyschoolkeeper" value="1" disabled="disabled"></td> <td style="width:5%;"><input type="checkbox" id="prizeinfo_trophyschoolkeeper" class="prizeinfo" name="trophyschoolkeeper" value="1" disabled="disabled"></td>
<td><?=i18n("School keeper trophy")?></td> <td style="width:45%;"><?=i18n("School keeper trophy")?></td>
<td align="right"><input type="checkbox" id="prizeinfo_trophyschoolreturn" class="prizeinfo" name="trophyschoolreturn" value="1" disabled="disabled"></td> <td style="width:5%;"><input type="checkbox" id="prizeinfo_trophyschoolreturn" class="prizeinfo" name="trophyschoolreturn" value="1" disabled="disabled"></td>
<td><?=i18n("School annual return/reuse trophy")?></td> <td style="width:45%;"><?=i18n("School annual return/reuse trophy")?></td>
</tr></table></td> </tr></table></td>
</tr><tr> </tr><tr>
<td class="left"><?=i18n("Awards Ceremony")?>:</td> <td><?=i18n("Awards Ceremony")?>:</td>
<td class="right"><input type="checkbox" id="prizeinfo_excludefromac" class="prizeinfo" name="excludefromac" value="1" disabled="disabled"><?=i18n("Exclude this prize from the award ceremony script")?></td> <td><input type="checkbox" id="prizeinfo_excludefromac" class="prizeinfo" name="excludefromac" value="1" disabled="disabled"><?=i18n("Exclude this prize from the award ceremony script")?></td>
</tr> </tr>
</table> </table>
</form> </form>
@ -992,6 +998,7 @@ echo mysql_error();
if(mysql_num_rows($q)) if(mysql_num_rows($q))
{ {
echo "* ".i18n("Click on the Script Order and drag to re-order the awards");
echo "<table id=\"awardlist\" class=\"tableview\" >"; echo "<table id=\"awardlist\" class=\"tableview\" >";
echo "<tr class=\"nodrop nodrag\">"; echo "<tr class=\"nodrop nodrag\">";
echo " <th>".i18n("Order")."</th>"; echo " <th>".i18n("Order")."</th>";