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

Minor changes in preparation for Evaluations Plug-in (in development)

Browse Source
This commit is contained in:
dennis 2011-04-13 15:35:35 +00:00
parent a6741d58ac
commit caeb9246ff
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/index.php
View File

@ -77,13 +77,13 @@
echo "<hr />"; echo "<hr />";
echo "<table class=\"adminconfigtable\">"; echo "<table class=\"adminconfigtable\">";
echo " <tr>"; echo " <tr>";
if($config['score_entry_enable'] == 'yes') {
echo "<td><a href=\"judging_score_entry.php\">".theme_icon("judging_score_entry")."<br />".i18n("Judging Score Entry")."</a></td>";
}
echo " <td><a href=\"winners.php\">".theme_icon("enter_winning_projects")."<br />".i18n("Enter Winning Projects")."</a></td>"; echo " <td><a href=\"winners.php\">".theme_icon("enter_winning_projects")."<br />".i18n("Enter Winning Projects")."</a></td>";
echo " <td><a href=\"cwsfregister.php\">".theme_icon("one-click_cwsf_registration")."<br />".i18n("One-Click CWSF Registration")."</a></td>"; echo " <td><a href=\"cwsfregister.php\">".theme_icon("one-click_cwsf_registration")."<br />".i18n("One-Click CWSF Registration")."</a></td>";
echo " <td><a href=\"fair_stats.php\">".theme_icon("fair_stats")."<br />".i18n("Upload Fair Statistics")."</a></td>"; echo " <td><a href=\"fair_stats.php\">".theme_icon("fair_stats")."<br />".i18n("Upload Fair Statistics")."</a></td>";
echo " <td><a href=\"user_list.php?show_types[]=fair\">".theme_icon("sciencefair_management")."<br />".i18n("Feeder/Upstream Fair Management")."</a></td>"; echo " <td><a href=\"user_list.php?show_types[]=fair\">".theme_icon("sciencefair_management")."<br />".i18n("Feeder/Upstream Fair Management")."</a></td>";
if($config['score_entry_enable'] == 'yes') {
echo "<td><a href=\"judging_score_entry.php\">".theme_icon("judging_score_entry")."<br />".i18n("Judging Score Entry")."</a></td>";
}
echo " </tr>\n"; echo " </tr>\n";
echo "</table>\n"; echo "</table>\n";
echo "<hr />"; echo "<hr />";
@ -93,7 +93,10 @@
echo " <td><a href=\"documents.php\">".theme_icon("internal_document_management")."<br />".i18n("Internal Document Management")."</a></td>"; echo " <td><a href=\"documents.php\">".theme_icon("internal_document_management")."<br />".i18n("Internal Document Management")."</a></td>";
echo " <td><a href=\"cms.php\">".theme_icon("website_content_management")."<br />".i18n("Website Content Management")."</a></td>"; echo " <td><a href=\"cms.php\">".theme_icon("website_content_management")."<br />".i18n("Website Content Management")."</a></td>";
echo " <td><a href=\"fundraising.php\">".theme_icon("fundraising")."<br />".i18n("Fundraising")."</a></td>"; echo " <td><a href=\"fundraising.php\">".theme_icon("fundraising")."<br />".i18n("Fundraising")."</a></td>";
echo " <td></td>"; if($config['score_entry_enable'] == 'yes') {
echo "<td><a href=\"../plugins/evaluations/index.php\">".theme_icon("judging_score_entry")."<br />".i18n("Evaluations Plugin")."</a></td>";
}
//echo " <td><a href=\"../plugins/evaluations/index.php\">Go To Evaluations</a></td>";
echo " </tr>\n"; echo " </tr>\n";
echo "</table>\n"; echo "</table>\n";

14
admin/judging_score_edit.php
View File

@ -47,6 +47,9 @@
} else { } else {
$score = mysql_real_escape_string($score); $score = mysql_real_escape_string($score);
} }
if($score >100.00) {
$score_error = "*** ERROR **** You entered a value greater than 100.00";
}
mysql_query("UPDATE judges_teams_timeslots_projects_link mysql_query("UPDATE judges_teams_timeslots_projects_link
SET score=" . $score . SET score=" . $score .
" WHERE judges_teams_id = " . mysql_real_escape_string($_POST["team_" . $curr_team . "_id"]) . " WHERE judges_teams_id = " . mysql_real_escape_string($_POST["team_" . $curr_team . "_id"]) .
@ -60,6 +63,10 @@
?> ?>
<? <?
if($project_id) { if($project_id) {
$q=mysql_query("SELECT * FROM projects WHERE projects.id = '".$project_id."'");
$r=mysql_fetch_object($q);
$project_number = $r->projectnumber;
$project_title = $r->title;
$q=mysql_query("SELECT * FROM projectcategories WHERE year='$year' ORDER BY id"); $q=mysql_query("SELECT * FROM projectcategories WHERE year='$year' ORDER BY id");
while($r=mysql_fetch_object($q)) while($r=mysql_fetch_object($q))
$cats[$r->id]=$r->category; $cats[$r->id]=$r->category;
@ -76,7 +83,10 @@ $q=mysql_query("SELECT * FROM projectdivisions WHERE year='$year' ORDER BY id");
AND projects_id = ".mysql_real_escape_string($project_id)." ORDER BY judges_teams_id" AND projects_id = ".mysql_real_escape_string($project_id)." ORDER BY judges_teams_id"
); );
echo mysql_error(); echo mysql_error();
echo "Project# ".$project_number." ".$project_title."<br />";
if ($score_error != "") {
echo $score_error."<br />";
}
echo "<form action=\"judging_score_edit.php\" method=\"post\">"; echo "<form action=\"judging_score_edit.php\" method=\"post\">";
echo "<input type=\"hidden\" name=\"score_count\" value=\"" . mysql_num_rows($q) . "\"/>"; echo "<input type=\"hidden\" name=\"score_count\" value=\"" . mysql_num_rows($q) . "\"/>";
echo "<input type=\"hidden\" name=\"projectid\" value=\"$project_id\"/>"; echo "<input type=\"hidden\" name=\"projectid\" value=\"$project_id\"/>";
@ -108,7 +118,7 @@ $q=mysql_query("SELECT * FROM projectdivisions WHERE year='$year' ORDER BY id");
} }
echo "\n</td>\n"; echo "\n</td>\n";
echo "<td style=\"vertical-align: middle; text-align: center\">\n"; echo "<td style=\"vertical-align: middle; text-align: center\">\n";
echo "<input type=\"text\" size=\"3\" maxlength=\"3\" name=\"team_" . $i . "_score\" value=\"$r->score\"/>\n"; echo "<input type=\"text\" size=\"5\" maxlength=\"5\" name=\"team_" . $i . "_score\" value=\"$r->score\"/>\n";
echo "</td>\n"; echo "</td>\n";
echo "</tr>\n"; echo "</tr>\n";
$i++; $i++;