Submissions.aspx, Submissions.aspx.cs: Filters should 'OR' inside groupings, and 'AND' between groupings. Make sure the gridview footer is always visible

svn path=/trunk/moma-tool/; revision=121585
This commit is contained in:
Dick Porter 2008-12-16 11:31:54 +00:00
Родитель ca7e113a05
Коммит 5cdbe1fa31
2 изменённых файлов: 43 добавлений и 30 удалений

Просмотреть файл

@ -65,7 +65,9 @@
<asp:Button ID="Novell_FilterButton" runat="server" Text="Update" OnClick="FilterButton_Click" />
</div>
<asp:GridView ID="Novell_ReportsGridView" runat="server" DataSourceID="SubmissionsSqlDataSource"
AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" OnRowDataBound="ReportsGridView_RowDataBound" PageSize="30">
AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
OnRowDataBound="ReportsGridView_RowDataBound" PageSize="30"
onprerender="ReportsGridView_PreRender">
<AlternatingRowStyle CssClass="gv_col_alternating" />
<HeaderStyle CssClass="gv_header" />
<PagerStyle CssClass="gv_pager" />
@ -186,7 +188,8 @@
</div>
<asp:GridView ID="LoggedIn_ReportsGridView" runat="server" DataSourceID="SubmissionsSqlDataSource"
AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False"
OnRowDataBound="ReportsGridView_RowDataBound" PageSize="20">
OnRowDataBound="ReportsGridView_RowDataBound" PageSize="20"
onprerender="ReportsGridView_PreRender">
<AlternatingRowStyle CssClass="gv_col_alternating" />
<HeaderStyle CssClass="gv_header" />
<PagerStyle CssClass="gv_pager" />

Просмотреть файл

@ -51,10 +51,9 @@ public partial class Submissions : System.Web.UI.Page
catch (FormatException) { }
}
string imp_filter = string.Empty;
foreach (ListItem item in Novell_ImportanceCheckBoxList.Items)
{
string imp_filter = string.Empty;
if (item.Selected)
{
if (imp_filter != string.Empty)
@ -63,16 +62,16 @@ public partial class Submissions : System.Web.UI.Page
}
imp_filter += "importance='" + item.Value + "'";
}
}
if (imp_filter != string.Empty)
if (imp_filter != string.Empty)
{
if (filter != string.Empty)
{
if (filter != string.Empty)
{
filter += " AND ";
}
filter += "(" + imp_filter + ")";
filter += " AND ";
}
filter += "(" + imp_filter + ")";
}
if (Novell_AppNameFilterTextBox.Text != string.Empty)
@ -85,10 +84,9 @@ public partial class Submissions : System.Web.UI.Page
filter += "application_name='" + Novell_AppNameFilterTextBox.Text + "'";
}
string type_filter = string.Empty;
foreach (ListItem item in Novell_AppTypeCheckBoxList.Items)
{
string type_filter = string.Empty;
if (item.Selected)
{
if (type_filter != string.Empty)
@ -97,15 +95,16 @@ public partial class Submissions : System.Web.UI.Page
}
type_filter += "application_type='" + item.Value + "'";
}
if (type_filter != string.Empty)
{
if (filter != string.Empty)
{
filter += " AND ";
}
}
filter += "(" + type_filter + ")";
if (type_filter != string.Empty)
{
if (filter != string.Empty)
{
filter += " AND ";
}
filter += "(" + type_filter + ")";
}
if (Novell_ProfileFilterDropDownList.SelectedItem != null &&
@ -152,10 +151,9 @@ public partial class Submissions : System.Web.UI.Page
catch (FormatException) { }
}
string type_filter = string.Empty;
foreach (ListItem item in LoggedIn_AppTypeCheckBoxList.Items)
{
string type_filter = string.Empty;
if (item.Selected)
{
if (type_filter != string.Empty)
@ -164,15 +162,16 @@ public partial class Submissions : System.Web.UI.Page
}
type_filter += "application_type='" + item.Value + "'";
}
if (type_filter != string.Empty)
{
if (filter != string.Empty)
{
filter += " AND ";
}
}
filter += "(" + type_filter + ")";
if (type_filter != string.Empty)
{
if (filter != string.Empty)
{
filter += " AND ";
}
filter += "(" + type_filter + ")";
}
if (LoggedIn_ProfileFilterDropDownList.SelectedItem != null &&
@ -304,7 +303,6 @@ public partial class Submissions : System.Web.UI.Page
pager_page_size_ddl.SelectedValue = gv.PageSize.ToString();
}
}
public string FormatIssueCount(string count)
{
/* count should be either blank (representing zero) or hold an integer */
@ -317,4 +315,16 @@ public partial class Submissions : System.Web.UI.Page
return count;
}
}
protected void ReportsGridView_PreRender(object sender, EventArgs e)
{
GridView grid = (GridView)sender;
if (grid != null)
{
GridViewRow pagerRow = (GridViewRow)grid.BottomPagerRow;
if (pagerRow != null)
{
pagerRow.Visible = true;
}
}
}
}