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

- Add a config option to disable printing the cash/scholarship amount on the

Browse Source 
public winners page.  (defaults to ON, which is the current behaviour)
- Fix pluralization of "Students" for one student. :)
- Change the effort option for judges and tours to a pulldown menu Low=100,
  Med=1000, High=10000
This commit is contained in:
dave 2007-12-22 05:11:42 +00:00
parent e7a5ad183d
commit 3c9253dd9d
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/db.code.version.txt
View File

@ -1 +1 @@
87 88

10
db/db.update.88.sql Normal file
View File

@ -0,0 +1,10 @@
INSERT INTO `config` ( `var` , `val` , `category` , `type` , `type_values` , `ord` , `description` , `year`) VALUES (
'winners_show_prize_amounts', 'yes', 'Global', 'yesno', '', '700', 'Show the dollar amounts of the cash/scholarship prizes on the publicly viewable winners page.', '-1');
UPDATE `config` SET `type` = 'enum', `type_values` = '100=Low|1000=Medium|10000=High',
`description` = 'This controls how long and hard the judge scheduler will look for a scheduling solution. Low effort will finish almost instantly but give a very poor result. High effort can take several tens of minutes to run, but it gives a very good solution.' WHERE `var` = 'effort' ;
UPDATE `config` SET `type` = 'enum', `type_values` = '100=Low|1000=Medium|10000=High',
`description` = 'This controls how long and hard the tour assigner will look for a quality solution. Low effort will finish almost instantly but give a very poor result. High effort can take several minutes to run, but it gives a very good solution. ' WHERE `var` = 'tours_assigner_effort' ;

6
winners.php
View File

@ -109,7 +109,7 @@ if($_GET['year'] && $_GET['type'])
echo " "; echo " ";
echo "<b>"; echo "<b>";
echo "$pr->prize"; echo "$pr->prize";
if($pr->cash || $pr->scholarship) if(($pr->cash || $pr->scholarship) && $config['winners_show_prize_amounts'] == 'yes')
{ {
echo " ("; echo " (";
if($pr->cash && $pr->scholarship) if($pr->cash && $pr->scholarship)
@ -171,7 +171,11 @@ if($_GET['year'] && $_GET['type'])
echo "<br />"; echo "<br />";
echo "&nbsp&nbsp;&nbsp;&nbsp;"; echo "&nbsp&nbsp;&nbsp;&nbsp;";
echo "&nbsp&nbsp;&nbsp;&nbsp;"; echo "&nbsp&nbsp;&nbsp;&nbsp;";
if($studnum > 1)
echo "Students: $students"; echo "Students: $students";
else
echo "Student: $students";
echo "<br />"; echo "<br />";
echo "&nbsp&nbsp;&nbsp;&nbsp;"; echo "&nbsp&nbsp;&nbsp;&nbsp;";
echo "&nbsp&nbsp;&nbsp;&nbsp;"; echo "&nbsp&nbsp;&nbsp;&nbsp;";