forked from science-ation/science-ation
Allow filtering the awards management interface by award sponsor status: any, confirmed only, unconfirmed only
This commit is contained in:
parent
ec66217a2b
commit
560d799b4b
@ -45,13 +45,19 @@
|
|||||||
if($_GET['award_types_id'] && $_GET['award_types_id']!="all")
|
if($_GET['award_types_id'] && $_GET['award_types_id']!="all")
|
||||||
$_SESSION['award_types_id']=$_GET['award_types_id'];
|
$_SESSION['award_types_id']=$_GET['award_types_id'];
|
||||||
|
|
||||||
|
if($_GET['award_sponsors_confirmed'] && $_GET['award_sponsors_confirmed']!="all")
|
||||||
|
$_SESSION['award_sponsors_confirmed']=$_GET['award_sponsors_confirmed'];
|
||||||
|
|
||||||
if($_GET['award_sponsors_id']=="all")
|
if($_GET['award_sponsors_id']=="all")
|
||||||
unset($_SESSION['award_sponsors_id']);
|
unset($_SESSION['award_sponsors_id']);
|
||||||
if($_GET['award_types_id']=="all")
|
if($_GET['award_types_id']=="all")
|
||||||
unset($_SESSION['award_types_id']);
|
unset($_SESSION['award_types_id']);
|
||||||
|
if($_GET['award_sponsors_confirmed']=="all")
|
||||||
|
unset($_SESSION['award_sponsors_confirmed']);
|
||||||
|
|
||||||
$award_types_id=$_SESSION['award_types_id'];
|
$award_types_id=$_SESSION['award_types_id'];
|
||||||
$award_sponsors_id=$_SESSION['award_sponsors_id'];
|
$award_sponsors_id=$_SESSION['award_sponsors_id'];
|
||||||
|
$award_sponsors_confirmed=$_SESSION['award_sponsors_confirmed'];
|
||||||
|
|
||||||
if($_POST['save']=="edit" || $_POST['save']=="add")
|
if($_POST['save']=="edit" || $_POST['save']=="add")
|
||||||
{
|
{
|
||||||
@ -349,7 +355,7 @@ echo mysql_error();
|
|||||||
echo "<br />";
|
echo "<br />";
|
||||||
echo i18n("Filter By:");
|
echo i18n("Filter By:");
|
||||||
echo "<form method=\"get\" action=\"award_awards.php\" name=\"filterchange\">";
|
echo "<form method=\"get\" action=\"award_awards.php\" name=\"filterchange\">";
|
||||||
echo "<table><tr><td>";
|
echo "<table><tr><td colspan=\"2\">";
|
||||||
|
|
||||||
$q=mysql_query("SELECT id,organization FROM award_sponsors ORDER BY organization");
|
$q=mysql_query("SELECT id,organization FROM award_sponsors ORDER BY organization");
|
||||||
echo "<select name=\"award_sponsors_id\" onchange=\"document.forms.filterchange.submit()\">";
|
echo "<select name=\"award_sponsors_id\" onchange=\"document.forms.filterchange.submit()\">";
|
||||||
@ -366,7 +372,8 @@ echo mysql_error();
|
|||||||
echo "<option $sel value=\"$r->id\">".i18n($r->organization)."</option>";
|
echo "<option $sel value=\"$r->id\">".i18n($r->organization)."</option>";
|
||||||
}
|
}
|
||||||
echo "</select>";
|
echo "</select>";
|
||||||
echo "</td><td>";
|
echo "</td></tr>";
|
||||||
|
echo "<tr><td>";
|
||||||
|
|
||||||
$q=mysql_query("SELECT id,type FROM award_types WHERE year='{$config['FAIRYEAR']}' ORDER BY type");
|
$q=mysql_query("SELECT id,type FROM award_types WHERE year='{$config['FAIRYEAR']}' ORDER BY type");
|
||||||
echo "<select name=\"award_types_id\" onchange=\"document.forms.filterchange.submit()\">";
|
echo "<select name=\"award_types_id\" onchange=\"document.forms.filterchange.submit()\">";
|
||||||
@ -383,6 +390,16 @@ echo mysql_error();
|
|||||||
echo "<option $sel value=\"$r->id\">".i18n($r->type)."</option>";
|
echo "<option $sel value=\"$r->id\">".i18n($r->type)."</option>";
|
||||||
}
|
}
|
||||||
echo "</select>";
|
echo "</select>";
|
||||||
|
echo "</td><td>";
|
||||||
|
|
||||||
|
echo "<select name=\"award_sponsors_confirmed\" onchange=\"document.forms.filterchange.submit()\">";
|
||||||
|
if($award_sponsors_confirmed=="all") $sel="selected=\"selected\""; else $sel="";
|
||||||
|
echo "<option value=\"all\">".i18n("Any Status")."</option>";
|
||||||
|
if($award_sponsors_confirmed=="yes") $sel="selected=\"selected\""; else $sel="";
|
||||||
|
echo "<option $sel value=\"yes\">".i18n("Confirmed Only")."</option>";
|
||||||
|
if($award_sponsors_confirmed=="no") $sel="selected=\"selected\""; else $sel="";
|
||||||
|
echo "<option $sel value=\"no\">".i18n("Unconfirmed Only")."</option>";
|
||||||
|
echo "</select>";
|
||||||
echo "</form>";
|
echo "</form>";
|
||||||
echo "</td></tr>";
|
echo "</td></tr>";
|
||||||
echo "</table>";
|
echo "</table>";
|
||||||
@ -395,6 +412,7 @@ echo mysql_error();
|
|||||||
|
|
||||||
if($award_sponsors_id) $where_asi="AND award_sponsors_id='$award_sponsors_id'";
|
if($award_sponsors_id) $where_asi="AND award_sponsors_id='$award_sponsors_id'";
|
||||||
if($award_types_id) $where_ati="AND award_types_id='$award_types_id'";
|
if($award_types_id) $where_ati="AND award_types_id='$award_types_id'";
|
||||||
|
if($award_sponsors_confirmed) $where_asc="AND award_sponsors.confirmed='$award_sponsors_confirmed'";
|
||||||
|
|
||||||
if(!$orderby) $orderby="order";
|
if(!$orderby) $orderby="order";
|
||||||
|
|
||||||
@ -404,7 +422,8 @@ echo mysql_error();
|
|||||||
award_awards.order,
|
award_awards.order,
|
||||||
award_awards.award_sources_id,
|
award_awards.award_sources_id,
|
||||||
award_types.type,
|
award_types.type,
|
||||||
award_sponsors.organization
|
award_sponsors.organization,
|
||||||
|
award_sponsors.confirmed
|
||||||
|
|
||||||
FROM
|
FROM
|
||||||
award_awards,
|
award_awards,
|
||||||
@ -414,6 +433,7 @@ echo mysql_error();
|
|||||||
award_awards.year='".$config['FAIRYEAR']."'
|
award_awards.year='".$config['FAIRYEAR']."'
|
||||||
$where_asi
|
$where_asi
|
||||||
$where_ati
|
$where_ati
|
||||||
|
$where_asc
|
||||||
AND award_awards.award_sponsors_id=award_sponsors.id
|
AND award_awards.award_sponsors_id=award_sponsors.id
|
||||||
AND award_awards.award_types_id=award_types.id
|
AND award_awards.award_types_id=award_types.id
|
||||||
AND award_types.year='".$config['FAIRYEAR']."'
|
AND award_types.year='".$config['FAIRYEAR']."'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user