Menu
▾
▴
[tcdb-devel] SF.net SVN: tcdb: [98] Website
|
From: <ro...@us...> - 2006-07-11 19:44:13
|
Revision: 98 Author: rouquin Date: 2006-07-11 12:44:06 -0700 (Tue, 11 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=98&view=rev Log Message: ----------- It's not beautiful, but the assignments chart is there. It needs some css work done on it. Also needs a datePicker control added for the date filters. Otherwise things seem to be working alright. Modified Paths: -------------- Website/App_Code/TCDB_Assignments.cs Website/App_Code/TCDB_Users.cs Website/App_Code/dadDataSet.xsd Website/App_Code/dadDataSet.xss Website/Assignments.aspx Website/Includes/Assignments.ascx Website/Includes/AssignmentsTree.ascx Website/Includes/Header.ascx Modified: Website/App_Code/TCDB_Assignments.cs =================================================================== --- Website/App_Code/TCDB_Assignments.cs 2006-07-11 19:32:56 UTC (rev 97) +++ Website/App_Code/TCDB_Assignments.cs 2006-07-11 19:44:06 UTC (rev 98) @@ -55,12 +55,12 @@ assignment.WOFAIL = TCDB_Help.TCDB_DB_IntParse(dr["WOFail"], 0); assignment.WOERROR = TCDB_Help.TCDB_DB_IntParse(dr["WOError"], 0); } - assignment.NAME = TCDB_Help.TCDB_DB_StringParse(dr["aName"], ""); + assignment.NAME = TCDB_Help.TCDB_DB_StringParse(dr["aName"], ""); assignment.CREATOR = TCDB_Help.TCDB_DB_StringParse(dr["creator"], ""); assignment.ASSIGNED = TCDB_Help.TCDB_DB_StringParse(dr["assigned"], ""); assignment.DATEASSIGNED = TCDB_Help.TCDB_DB_DateTimeParse(dr["dateAssigned"], TCDB_Constant.ASSIGNMENT_DEFAULTDATEASSIGNED); - assignment.DUEDATE = TCDB_Help.TCDB_DB_DateTimeParse(dr["dueDate"], TCDB_Constant.ASSIGNMENT_DEFAULTDUEDATE); + assignment.DATEDUE = TCDB_Help.TCDB_DB_DateTimeParse(dr["dateDue"], TCDB_Constant.ASSIGNMENT_DEFAULTDUEDATE); assignment.DATEFINISHED = TCDB_Help.TCDB_DB_DateTimeParse(dr["dateFinished"], TCDB_Constant.ASSIGNMENT_DEFAULTDATEFINISHED); assignment.HIGHPRIORITY = TCDB_Help.TCDB_DB_BoolParse(dr["highPriority"], TCDB_Constant.ASSIGNMENT_DEFAULTHIGHPRIORITY); assignment.STATUSNAME = TCDB_Help.TCDB_DB_StringParse(dr["statusName"], ""); @@ -142,7 +142,10 @@ return ai; * */ - return new TCDB_WorkOrder(); + TCDB_WorkOrder wo = new TCDB_WorkOrder(); + wo.ID = id; + + return wo; } } @@ -154,7 +157,7 @@ private string p_assigned; private DateTime p_dateAssigned; private DateTime p_dateFinished; - private DateTime p_dueDate; + private DateTime p_dateDue; private TCDB_WorkOrder p_workOrder; private TCDB_ActionItem p_actionItem; private bool p_highPriority; @@ -173,7 +176,7 @@ p_assigned = ""; p_dateAssigned = TCDB_Constant.ASSIGNMENT_DEFAULTDATEASSIGNED; p_dateFinished = TCDB_Constant.ASSIGNMENT_DEFAULTDATEFINISHED; - p_dueDate = TCDB_Constant.ASSIGNMENT_DEFAULTDUEDATE; + p_dateDue = TCDB_Constant.ASSIGNMENT_DEFAULTDUEDATE; p_workOrder = null; p_actionItem = null; p_highPriority = false; @@ -221,10 +224,10 @@ set { p_dateFinished = value; } } - public DateTime DUEDATE + public DateTime DATEDUE { - get { return p_dueDate; } - set { p_dueDate = value; } + get { return p_dateDue; } + set { p_dateDue = value; } } public TCDB_WorkOrder WORKORDER @@ -377,8 +380,45 @@ public class TCDB_WorkOrder { + private int p_id; + private string p_name; + private int p_creatorID; + public TCDB_WorkOrder() { + p_id = 0; + p_name = ""; + p_creatorID = 0; } + + public TCDB_WorkOrder(int id, string name, string description, int creatorID) + { + p_id = id; + p_name = name; + p_creatorID = creatorID; + } + + public int ID + { + get { return p_id; } + set { p_id = value; } + } + + public string NAME + { + get { return p_name; } + set { p_name = value; } + } + + public int CREATORID + { + get { return p_creatorID; } + set { p_creatorID = value; } + } + + public override string ToString() + { + return NAME; + } } } \ No newline at end of file Modified: Website/App_Code/TCDB_Users.cs =================================================================== --- Website/App_Code/TCDB_Users.cs 2006-07-11 19:32:56 UTC (rev 97) +++ Website/App_Code/TCDB_Users.cs 2006-07-11 19:44:06 UTC (rev 98) @@ -225,6 +225,20 @@ private List<TCDB_TestCase> p_testCasesEdited; */ + public List<TCDB_Assignment> ASSIGNMENTS + { + // TODO: This list needs to be able to reflect filters! + get + { + if (assignments == null) + { + assignments = TCDB_AssignmentDB.TCDB_GetAssignmentList(TCDB_Constant.ASSIGNMENT_TYPE_BOTH, + TCDB_Constant.ASSIGNMENT_FINISHEDANDUNFINISHED, ID, null); + } + return assignments; + } + } + public TCDB_User() { p_id = TCDB_Constant.USER_ANONYMOUSUSERID; @@ -423,4 +437,4 @@ get { return m_value; } } } -} \ No newline at end of file +} Modified: Website/App_Code/dadDataSet.xsd =================================================================== --- Website/App_Code/dadDataSet.xsd 2006-07-11 19:32:56 UTC (rev 97) +++ Website/App_Code/dadDataSet.xsd 2006-07-11 19:44:06 UTC (rev 98) @@ -317,6 +317,7 @@ <Mappings> <Mapping SourceColumn="aType" DataSetColumn="aType" /> <Mapping SourceColumn="childID" DataSetColumn="childID" /> + <Mapping SourceColumn="aName" DataSetColumn="aName" /> <Mapping SourceColumn="creator" DataSetColumn="creator" /> <Mapping SourceColumn="assigned" DataSetColumn="assigned" /> <Mapping SourceColumn="assignedID" DataSetColumn="assignedID" /> @@ -512,7 +513,7 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="db_assignments" msprop:Generator_UserTableName="db_assignments" msprop:Generator_RowDeletedName="db_assignmentsRowDeleted" msprop:Generator_RowChangedName="db_assignmentsRowChanged" msprop:Generator_RowClassName="db_assignmentsRow" msprop:Generator_RowChangingName="db_assignmentsRowChanging" msprop:Generator_RowEvArgName="db_assignmentsRowChangeEvent" msprop:Generator_RowEvHandlerName="db_assignmentsRowChangeEventHandler" msprop:Generator_TableClassName="db_assignmentsDataTable" msprop:Generator_TableVarName="tabledb_assignments" msprop:Generator_RowDeletingName="db_assignmentsRowDeleting" msprop:Generator_TablePropName="db_assignments"> + <xs:element name="db_assignments" msprop:Generator_UserTableName="db_assignments" msprop:Generator_RowDeletedName="db_assignmentsRowDeleted" msprop:Generator_TableClassName="db_assignmentsDataTable" msprop:Generator_RowChangedName="db_assignmentsRowChanged" msprop:Generator_RowClassName="db_assignmentsRow" msprop:Generator_RowChangingName="db_assignmentsRowChanging" msprop:Generator_RowEvArgName="db_assignmentsRowChangeEvent" msprop:Generator_RowEvHandlerName="db_assignmentsRowChangeEventHandler" msprop:Generator_TablePropName="db_assignments" msprop:Generator_TableVarName="tabledb_assignments" msprop:Generator_RowDeletingName="db_assignmentsRowDeleting"> <xs:complexType> <xs:sequence> <xs:element name="aType" msdata:ReadOnly="true" msprop:Generator_UserColumnName="aType" msprop:Generator_ColumnPropNameInRow="aType" msprop:Generator_ColumnVarNameInTable="columnaType" msprop:Generator_ColumnPropNameInTable="aTypeColumn" minOccurs="0"> @@ -523,9 +524,17 @@ </xs:simpleType> </xs:element> <xs:element name="childID" msdata:ReadOnly="true" msprop:Generator_UserColumnName="childID" msprop:Generator_ColumnPropNameInRow="childID" msprop:Generator_ColumnVarNameInTable="columnchildID" msprop:Generator_ColumnPropNameInTable="childIDColumn" type="xs:int" minOccurs="0" /> + <xs:element name="childID" msdata:ReadOnly="true" msprop:Generator_UserColumnName="childID" msprop:Generator_ColumnPropNameInRow="childID" msprop:Generator_ColumnVarNameInTable="columnchildID" msprop:Generator_ColumnPropNameInTable="childIDColumn" type="xs:int" minOccurs="0" /> <xs:element name="creator" msdata:ReadOnly="true" msprop:Generator_UserColumnName="creator" msprop:Generator_ColumnPropNameInRow="creator" msprop:Generator_ColumnVarNameInTable="columncreator" msprop:Generator_ColumnPropNameInTable="creatorColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> + <xs:maxLength value="255" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="creator" msdata:ReadOnly="true" msprop:Generator_UserColumnName="creator" msprop:Generator_ColumnPropNameInRow="creator" msprop:Generator_ColumnVarNameInTable="columncreator" msprop:Generator_ColumnPropNameInTable="creatorColumn" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> <xs:maxLength value="49" /> </xs:restriction> </xs:simpleType> @@ -595,4 +604,4 @@ <xs:field xpath="mstns:noteID" /> </xs:unique> </xs:element> -</xs:schema> \ No newline at end of file +</xs:schema> Modified: Website/App_Code/dadDataSet.xss =================================================================== --- Website/App_Code/dadDataSet.xss 2006-07-11 19:32:56 UTC (rev 97) +++ Website/App_Code/dadDataSet.xss 2006-07-11 19:44:06 UTC (rev 98) @@ -11,7 +11,7 @@ <Shape ID="DesignTable:db_actionItems" ZOrder="4" X="634" Y="68" Height="241" Width="232" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="194" /> <Shape ID="DesignTable:db_status" ZOrder="3" X="85" Y="307" Height="105" Width="272" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="58" /> <Shape ID="DesignTable:db_notes" ZOrder="2" X="380" Y="319" Height="139" Width="208" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" /> - <Shape ID="DesignTable:db_assignments" ZOrder="1" X="631" Y="318" Height="275" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="228" /> + <Shape ID="DesignTable:db_assignments" ZOrder="1" X="623" Y="324" Height="275" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="228" /> </Shapes> <Connectors /> </DiagramLayout> \ No newline at end of file Modified: Website/Assignments.aspx =================================================================== --- Website/Assignments.aspx 2006-07-11 19:32:56 UTC (rev 97) +++ Website/Assignments.aspx 2006-07-11 19:44:06 UTC (rev 98) @@ -1,10 +1,12 @@ <%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" Title="Untitled Page" %> <%@ Register Src="~/Includes/AssignmentsTree.ascx" TagPrefix="assignment" TagName="Tree" %> +<%@ Register Src="~/Includes/Assignments.ascx" TagPrefix="assignment" TagName="Form" %> <asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" runat="Server"> <assignment:Tree runat="Server" id="Tree" /> </asp:Content> <asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" runat="Server"> + <assignment:Form ID="List" runat=server /> </asp:Content> <asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" runat="Server"> </asp:Content> Modified: Website/Includes/Assignments.ascx =================================================================== --- Website/Includes/Assignments.ascx 2006-07-11 19:32:56 UTC (rev 97) +++ Website/Includes/Assignments.ascx 2006-07-11 19:44:06 UTC (rev 98) @@ -1,3 +1,644 @@ <%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Import Namespace="TCDB_Users" %> -<script runat="server">TCDB_User g_user = TCDB_UserDB.TCDB_GetUserInstance();</script> +<%@ Import Namespace="System.Data" %> +<%@ Import Namespace="System.Data.SqlClient" %> + +<script runat=server> + //DateTime curToDate, curFromDueDate, curToDueDate, curFromDate, curToFinishedDate, curFromFinishedDate; + String id = HttpContext.Current.Request.QueryString["id"]; + + protected void Page_Load(object sender, EventArgs e) + { + /* + if (!User.Identity.IsAuthenticated || Profile.userID == "") + Response.Redirect("default.aspx"); + + UpdatePanel notes = (UpdatePanel)Master.FindControl("noteViewUpdatePanel"); + notes.Visible = false; + */ + if (id == null) + { + /* + if (User.IsInRole("Admin")) + { + AssignmentDataSource.SelectMethod = "GetAllAssignmentNames"; + AssignmentDataSource.SelectParameters.Clear(); + } + else + id = Profile.userID; + */ + } + else + Session.Add("id", id); + + } + + private void filter(GridViewRow gRow) + { + if (gRow.RowType == DataControlRowType.DataRow) + { + DataRowView data = (DataRowView)gRow.DataItem; + if (data != null) + { + GridView1.Visible = true; + gRow.Visible = true; + + // Set priority image + bool priority = Convert.ToBoolean(data["highPriority"].ToString()); + if (priority) + gRow.Cells[0].Text = "<img src=\"Images/exclamation.jpg\" style=\"width: 23px; height: 19px\" />"; + else + gRow.Cells[0].Text = "<img src=\"Images/no-exclamation.jpg\" style=\"width: 23px; height: 19px\" />"; + + // Set Hyperlink URL + String id = data["childID"].ToString(); + String type = data["aType"].ToString(); + String name = data["aName"].ToString(); + if (type == TCDB_Common.TCDB_Constant.ASSIGNMENT_TYPE_ACTIONITEM) + gRow.Cells[1].Text = "<a href=\"ActionItem.aspx?id=" + id + "\">" + name + "</a>"; + else if (type == TCDB_Common.TCDB_Constant.ASSIGNMENT_TYPE_WORKORDER) + gRow.Cells[1].Text = "<a href=\"WorkOrder.aspx?id=" + id + "\">" + name + "</a>"; + + if (cboPriorityFilter.Checked) + { + switch (priority) + { + case true: + if (!cboHighPriority.Checked) + gRow.Visible = false; + break; + case false: + if (!cboLowPriority.Checked) + gRow.Visible = false; + break; + } + } + + String status = data["statusName"].ToString(); + if (gRow.Visible && cboStatusFilter.Checked) + { + if (!cboFilterNotStarted.Checked && status == "Not Started") + gRow.Visible = false; + else if (!cboFilterStarted.Checked && status == "Started") + gRow.Visible = false; + else if (!cboShowCompleted.Checked && status == "Completed") + gRow.Visible = false; + else if (!cboFilterInactive.Checked && status == "Inactive") + gRow.Visible = false; + } + if (gRow.Visible && cboTypeFilter.Checked) + { + if (cboShowActionItems.Checked) + GridView1.Visible = true; + else + GridView1.Visible = false; + }/* + if (gRow.Visible && cboDateFilter.Checked) + { + DateTime dateAssigned = Convert.ToDateTime(data["dateAssigned"]); + DateTime to = toDate.DateValue; + DateTime from = fromDate.DateValue; + + if ((dateAssigned < from) || (dateAssigned > to)) + gRow.Visible = false; + } + if (gRow.Visible && cboDueFilter.Checked) + { + DateTime dateAssigned = Convert.ToDateTime(data["dateAssigned"]); + DateTime to = toDueDate.DateValue; + DateTime from = fromDueDate.DateValue; + + if ((dateAssigned < from) || (dateAssigned > to)) + gRow.Visible = false; + } + if (gRow.Visible && cboFinishedFilter.Checked) + { + DateTime dateAssigned = Convert.ToDateTime(data["dateAssigned"]); + DateTime to = toFinishedDate.DateValue; + DateTime from = fromFinishedDate.DateValue; + + if ((dateAssigned < from) || (dateAssigned > to)) + gRow.Visible = false; + }*/ + } + } + } + protected void GridView1_RowDataBound(object sender, GridViewRowEventArgs e) + { + filter(e.Row); + } + + protected void cboShowCompleted_CheckedChanged(object sender, EventArgs e) + { + if (cboShowCompleted.Checked) + { + cboStatusFilter.Checked = true; + cboFilterCompleted.Checked = true; + cboStatusFilter_CheckedChanged(cboStatusFilter, null); + } + else + { + cboFilterCompleted.Checked = false; + } + GridView1.DataBind(); + } + protected void cboStatusFilter_CheckedChanged(object sender, EventArgs e) + { + if (cboStatusFilter.Checked) + { + cboFilterCompleted.Enabled = true; + cboFilterNotStarted.Enabled = true; + cboFilterStarted.Enabled = true; + cboFilterInactive.Enabled = true; + } + else + { + cboFilterCompleted.Enabled = false; + cboFilterNotStarted.Enabled = false; + cboFilterStarted.Enabled = false; + cboFilterInactive.Enabled = false; + } + GridView1.DataBind(); + } + protected void cboFilterStarted_CheckedChanged(object sender, EventArgs e) + { + GridView1.DataBind(); + } + protected void cboFilterNotStarted_CheckedChanged(object sender, EventArgs e) + { + GridView1.DataBind(); + } + protected void cboFilterCompleted_CheckedChanged(object sender, EventArgs e) + { + if (cboFilterCompleted.Checked) + cboShowCompleted.Checked = true; + else + cboShowCompleted.Checked = false; + GridView1.DataBind(); + } + protected void cboFilterInactive_CheckedChanged(object sender, EventArgs e) + { + GridView1.DataBind(); + } + protected void cboTypeFilter_CheckedChanged(object sender, EventArgs e) + { + if (cboTypeFilter.Checked) + { + cboShowActionItems.Enabled = true; + cboShowWorkOrders.Enabled = true; + } + else + { + cboShowActionItems.Enabled = false; + cboShowWorkOrders.Enabled = false; + } + GridView1.DataBind(); + } + protected void cboShowActionItems_CheckedChanged(object sender, EventArgs e) + { + GridView1.DataBind(); + } + protected void cboShowWorkOrders_CheckedChanged(object sender, EventArgs e) + { + GridView1.DataBind(); + }/* + protected void fromDate_PreRender(object sender, EventArgs e) + { + if (curFromDate != fromDate.DateValue) + { + curFromDate = fromDate.DateValue; + GridView1.DataBind(); + } + } + protected void toDate_PreRender(object sender, EventArgs e) + { + if (curToDate != toDate.DateValue) + { + curToDate = toDate.DateValue; + GridView1.DataBind(); + } + } + protected void cboDateFilter_CheckedChanged(object sender, EventArgs e) + { + if (cboDateFilter.Checked) + { + toDate.Enabled = true; + fromDate.Enabled = true; + } + else + { + toDate.Enabled = false; + fromDate.Enabled = false; + } + GridView1.DataBind(); + } + protected void fromDueDate_PreRender(object sender, EventArgs e) + { + if (curFromDueDate != fromDueDate.DateValue) + { + curFromDueDate = fromDueDate.DateValue; + GridView1.DataBind(); + } + } + protected void toDueDate_PreRender(object sender, EventArgs e) + { + if (curToDueDate != toDueDate.DateValue) + { + curToDueDate = toDueDate.DateValue; + GridView1.DataBind(); + } + } + protected void fromFinishedDate_PreRender(object sender, EventArgs e) + { + if (curFromFinishedDate != fromFinishedDate.DateValue) + { + curFromFinishedDate = fromFinishedDate.DateValue; + GridView1.DataBind(); + } + } + protected void toFinishedDate_PreRender(object sender, EventArgs e) + { + if (curToFinishedDate != toFinishedDate.DateValue) + { + curToFinishedDate = toFinishedDate.DateValue; + GridView1.DataBind(); + } + } + protected void cboDueFilter_CheckedChanged(object sender, EventArgs e) + { + if (cboDueFilter.Checked) + { + toDueDate.Enabled = true; + fromDueDate.Enabled = true; + } + else + { + toDueDate.Enabled = false; + fromDueDate.Enabled = false; + } + GridView1.DataBind(); + } + protected void cboFinishedFilter_CheckedChanged(object sender, EventArgs e) + { + if (cboFinishedFilter.Checked) + { + toFinishedDate.Enabled = true; + fromFinishedDate.Enabled = true; + } + else + { + toFinishedDate.Enabled = false; + fromFinishedDate.Enabled = false; + } + GridView1.DataBind(); + } + + protected void fromDate_Init(object sender, EventArgs e) + { + DatePicker dp = (DatePicker)sender; + + dp.DateValue = new DateTime(2000, 1, 1); + } + protected void toDate_Init(object sender, EventArgs e) + { + DatePicker dp = (DatePicker)sender; + + dp.DateValue = new DateTime(3000, 12, 31); + }*/ + protected void cboPriorityFilter_CheckedChanged(object sender, EventArgs e) + { + if (cboPriorityFilter.Checked) + { + cboHighPriority.Enabled = true; + cboLowPriority.Enabled = true; + } + else + { + cboHighPriority.Enabled = false; + cboLowPriority.Enabled = false; + } + GridView1.DataBind(); + } + protected void cboHighPriority_CheckedChanged(object sender, EventArgs e) + { + GridView1.DataBind(); + } + protected void cboLowPriority_CheckedChanged(object sender, EventArgs e) + { + GridView1.DataBind(); + } + +</script> + +<table width="100%"> + <tr> + <td align=center> + <div id="MyAssignments"> + <table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> + <td align="left" valign="bottom"> + <h2> + My Assignments</h2> + </td> + <td align="right" valign="bottom" style="padding-right: 20px;"> + <asp:CheckBox ID="cboShowCompleted" runat="server" Text="Show Completed" TextAlign="Left" + AutoPostBack="true" OnCheckedChanged="cboShowCompleted_CheckedChanged" /></td> + </tr> + <tr> + <td colspan="2" width="700px"> + <div class="xsnazzy"> + <b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"> + </b></b> + <div class="xboxcontent"> + <div id="MyAssignmentsData"> + <h3>My Assignments</h3> + <asp:GridView ID="GridView1" runat="server" GridLines="None" AllowPaging="True" AllowSorting="True" + AutoGenerateColumns="False" DataSourceID="AssignmentDataSource" RowStyle-CssClass="gridhover" OnRowDataBound="GridView1_RowDataBound" Width="100%" > + <Columns> + <asp:ImageField DataImageUrlField="highPriority" ShowHeader="False"> + </asp:ImageField> + <asp:HyperLinkField DataNavigateUrlFields="childID" DataNavigateUrlFormatString="default.aspx?id={0}" + DataTextField="aName" HeaderText="Assignment" SortExpression="Assignment"> + <ItemStyle HorizontalAlign="Left" /> + </asp:HyperLinkField> + <asp:BoundField DataField="assigned" HeaderText="Assignee" SortExpression="assignee"> + <ItemStyle HorizontalAlign="Center" /> + </asp:BoundField> + <asp:BoundField DataField="creator" HeaderText="Creator" ReadOnly="True" SortExpression="creator"> + <ItemStyle HorizontalAlign="Center" /> + </asp:BoundField> + <asp:BoundField DataField="dateAssigned" DataFormatString="{0:M-dd-yyyy}" HeaderText="dateAssigned" + HtmlEncode="False" ReadOnly="True" SortExpression="dateAssigned"> + <ItemStyle HorizontalAlign="Center" /> + </asp:BoundField> + <asp:BoundField DataField="dateDue" DataFormatString="{0:M-dd-yyyy}" HeaderText="dateDue" + HtmlEncode="False" ReadOnly="True" SortExpression="dateDue"> + <ItemStyle HorizontalAlign="Center" /> + </asp:BoundField> + <asp:BoundField DataField="dateFinished" DataFormatString="{0:M-dd-yyyy}" HeaderText="dateFinished" + HtmlEncode="False" ReadOnly="True" SortExpression="dateFinished"> + <ItemStyle HorizontalAlign="Center" /> + </asp:BoundField> + <asp:BoundField DataField="statusName" HeaderText="Status" ReadOnly="True" SortExpression="stateName"> + <ItemStyle HorizontalAlign="Center" /> + </asp:BoundField> + </Columns> + <RowStyle CssClass="gridhover" /> + </asp:GridView> + <asp:ObjectDataSource ID="AssignmentDataSource" runat="server" OldValuesParameterFormatString="original_{0}" + SelectMethod="GetData" TypeName="dadDataSetTableAdapters.db_assignmentsTableAdapter"> + <SelectParameters> + <asp:Parameter Name="aType" Type="String" /> + <asp:Parameter Name="finished" Type="Int32" /> + <asp:SessionParameter Name="assignedID" SessionField="id" Type="Int32" /> + <asp:Parameter Name="highPriority" Type="Boolean" /> + </SelectParameters> + </asp:ObjectDataSource> + + + </div> + </div> + <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> + </b></b> + </div> + </td> + </tr> + </table> + </div> + <asp:LinkButton ID="newActionItem" runat="server" PostBackUrl="~/ActionItem.aspx?mode=new">New Action Item</asp:LinkButton> + + <asp:LinkButton ID="newWorkOrder" runat="server" PostBackUrl="~/WorkOrder.aspx?mode=new">New Work Order</asp:LinkButton></td> + </tr> + <tr> + <td> + <div id="Filters"> + <table cellpadding="0" cellspacing="0" border="0"> + <tr> + <td align="left" valign="bottom" colspan="3"> + <h3> + Filters</h3> + </td> + </tr> + <tr> + <td valign="top"> + <div class="xsnazzy"> + <b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"> + </b></b> + <div class="xboxcontent"> + <table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> + <td align="left" valign="bottom" style="height: 20px"> + <h4> + Type:</h4> + </td> + <td align="right" valign="bottom" style="height: 20px"> + <asp:CheckBox ID="cboTypeFilter" runat="server" TextAlign="Left" Checked="True" AutoPostBack="True" + OnCheckedChanged="cboTypeFilter_CheckedChanged" /></td> + </tr> + <tr> + <td colspan="2" class="hr"> + <img alt="" src="images/spacer.gif" height="5" /><br /> + </td> + </tr> + </table> + <asp:CheckBox ID="cboShowActionItems" runat="server" Text="Action Items" Checked="true" + AutoPostBack="True" OnCheckedChanged="cboShowActionItems_CheckedChanged" /><br /> + <asp:CheckBox ID="cboShowWorkOrders" runat="server" Text="Work Orders" Checked="true" + AutoPostBack="True" OnCheckedChanged="cboShowWorkOrders_CheckedChanged" /> + </div> + <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> + </b></b> + </div> + </td> + <td valign="top"> + <div class="xsnazzy"> + <b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"> + </b></b> + <div class="xboxcontent"> + <table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> + <td align="left" valign="bottom" style="height: 20px"> + <h4> + Status:</h4> + </td> + <td align="right" valign="bottom" style="height: 20px"> + <asp:CheckBox ID="cboStatusFilter" runat="server" TextAlign="Left" OnCheckedChanged="cboStatusFilter_CheckedChanged" + Checked="True" AutoPostBack="True" /></td> + </tr> + <tr> + <td colspan="2" class="hr"> + <img alt="" src="images/spacer.gif" height="5" /><br /> + </td> + </tr> + </table> + <asp:CheckBox ID="cboFilterStarted" runat="server" Text="Started" Checked="True" + OnCheckedChanged="cboFilterStarted_CheckedChanged" AutoPostBack="True" /><br /> + <asp:CheckBox ID="cboFilterNotStarted" runat="server" Text="Not Started" Checked="true" + OnCheckedChanged="cboFilterNotStarted_CheckedChanged" AutoPostBack="True" /><br /> + <asp:CheckBox ID="cboFilterCompleted" runat="server" Text="Completed" Checked="false" + OnCheckedChanged="cboFilterCompleted_CheckedChanged" AutoPostBack="True" /><br /> + <asp:CheckBox ID="cboFilterInactive" runat="server" Text="Inactive" Checked="true" + OnCheckedChanged="cboFilterInactive_CheckedChanged" AutoPostBack="True" /></div> + <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> + </b></b> + </div> + </td> + <td valign="top"> + <div class="xsnazzy"> + <b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"> + </b></b> + <div class="xboxcontent"> + <table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> + <td align="left" valign="bottom" style="height: 20px"> + <h4> + Priority:</h4> + </td> + <td align="right" valign="bottom" style="height: 20px"> + <asp:CheckBox ID="cboPriorityFilter" runat="server" TextAlign="Left" OnCheckedChanged="cboPriorityFilter_CheckedChanged" + Checked="True" AutoPostBack="True" /></td> + </tr> + <tr> + <td colspan="2" class="hr"> + <img alt="" src="images/spacer.gif" height="5" /><br /> + </td> + </tr> + </table> + <asp:CheckBox ID="cboHighPriority" runat="server" Text="High" Checked="True" + OnCheckedChanged="cboHighPriority_CheckedChanged" AutoPostBack="True" /><br /> + <asp:CheckBox ID="cboLowPriority" runat="server" Text="Low" Checked="true" + OnCheckedChanged="cboLowPriority_CheckedChanged" AutoPostBack="True" /></div> + <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> + </b></b> + </div> + </td> + </tr> + <tr> + <td valign="top"> + <div class="xsnazzy"> + <b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"> + </b></b> + <div class="xboxcontent"> + <table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> + <td align="left" valign="bottom"> + <h4> + Assigned Date:</h4> + </td> + <td align="right" valign="bottom"> + <asp:CheckBox ID="cboDateFilter" runat="server" TextAlign="Left" AutoPostBack="True" + /></td> + </tr> + <tr> + <td colspan="2" class="hr"> + <img alt="" src="images/spacer.gif" height="5" /><br /> + </td> + </tr> + <tr> + <td> + <strong>From:</strong></td> + <td> + + </td> + </tr> + <tr> + <td style="height: 16px"> + <strong>To:</strong></td> + <td style="height: 16px"> + + </td> + </tr> + </table> + </div> + <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> + </b></b> + </div> + </td> + <td valign="top"> + <div class="xsnazzy"> + <b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"> + </b></b> + <div class="xboxcontent"> + <table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> + <td align="left" valign="bottom"> + <h4> + Date Due:</h4> + </td> + <td align="right" valign="bottom"> + <asp:CheckBox ID="cboDueFilter" runat="server" TextAlign="Left" AutoPostBack="True" + /></td> + </tr> + <tr> + <td colspan="2" class="hr"> + <img alt="" src="images/spacer.gif" height="5" /><br /> + </td> + </tr> + <tr> + <td> + <strong>From:</strong></td> + <td> + + </td> + </tr> + <tr> + <td style="height: 16px"> + <strong>To:</strong></td> + <td style="height: 16px"> + + </td> + </tr> + </table> + </div> + <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> + </b></b> + </div> + </td> + <td valign="top"> + <div class="xsnazzy"> + <b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"> + </b></b> + <div class="xboxcontent"> + <table width="100%" cellpadding="0" cellspacing="0" border="0"> + <tr> + <td align="left" valign="bottom"> + <h4> + Finished Date:</h4> + </td> + <td align="right" valign="bottom"> + <asp:CheckBox ID="cboFinishedFilter" runat="server" TextAlign="Left" AutoPostBack="True" + /></td> + </tr> + <tr> + <td colspan="2" class="hr"> + </td> + </tr> + <tr> + <td> + <strong>From:</strong></td> + <td> + + </td> + </tr> + <tr> + <td style="height: 16px"> + <strong>To:</strong></td> + <td style="height: 16px"> + + </td> + </tr> + </table> + </div> + <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> + </b></b> + </div> + </td> + </tr> + <tr> + <td style="height: 22px"> + <asp:Button ID="Update" runat="server" Text="Refresh" /></td> + </tr> + </table> + </div> + </td> + </tr> + </table> Modified: Website/Includes/AssignmentsTree.ascx =================================================================== --- Website/Includes/AssignmentsTree.ascx 2006-07-11 19:32:56 UTC (rev 97) +++ Website/Includes/AssignmentsTree.ascx 2006-07-11 19:44:06 UTC (rev 98) @@ -24,6 +24,9 @@ protected void AssignmentsTree_TreeNodePopulate(object sender, TreeNodeEventArgs e) { + TreeView tv = (TreeView)sender; + DataSet ResultsDataSet = new DataSet(); + // Call the appropriate method to populate a node at a particular level. switch (e.Node.Depth) { @@ -53,13 +56,13 @@ if (a.ISACTIONITEM) { child.Value = a.ACTIONITEM.ID.ToString(); - child.NavigateUrl = "~/ActionItems.aspx"; + child.NavigateUrl = "~/ActionItem.aspx?id="+child.Value; } else { // TODO: Enable this! - // child.Value = a.WORKORDER.ID.ToString(); - child.NavigateUrl = "~/WorkOrders.aspx"; + child.Value = a.WORKORDER.ID.ToString(); + child.NavigateUrl = "~/WorkOrder.aspx?id="+child.Value; } // Set the PopulateOnDemand property to true so that the child nodes can be @@ -84,23 +87,26 @@ { foreach (TCDB_User u in userList) { - // Create the new child node. - TreeNode child = new TreeNode(); - child.Text = u.FULLNAME; - child.Value = u.ID.ToString(); - - // Set the PopulateOnDemand property to true so that the child nodes can be - // dynamically populated. - child.PopulateOnDemand = true; + if (u.USERNAME == "jjohnson") + { + // Create the new child node. + TreeNode child = new TreeNode(); + child.Text = u.FULLNAME; + child.Value = u.ID.ToString(); - // Set additional properties for the node. - child.SelectAction = TreeNodeSelectAction.Expand; - // TODO: Make sure that when the node is clicked on, it brings up a list of assignments - // for the specified user as the user would see them - child.NavigateUrl = "~/Assignments.aspx"; + // Set the PopulateOnDemand property to true so that the child nodes can be + // dynamically populated. + child.PopulateOnDemand = true; - // Add the new child node to the ChildNodes collection of the parent node. - parent.ChildNodes.Add(child); + // Set additional properties for the node. + child.SelectAction = TreeNodeSelectAction.Expand; + // TODO: Make sure that when the node is clicked on, it brings up a list of assignments + // for the specified user as the user would see them + child.NavigateUrl = "~/Assignments.aspx?id="+child.Value; + + // Add the new child node to the ChildNodes collection of the parent node. + parent.ChildNodes.Add(child); + } } } } Modified: Website/Includes/Header.ascx =================================================================== --- Website/Includes/Header.ascx 2006-07-11 19:32:56 UTC (rev 97) +++ Website/Includes/Header.ascx 2006-07-11 19:44:06 UTC (rev 98) @@ -14,6 +14,12 @@ <% if (g_user.ID > TCDB_Constant.USER_ANONYMOUSUSERID) { + userID = (int)(Session["userID"]); + } + catch { } + if (userID > TCDB_Constant.USER_ANONYMOUSUSERID) + { + user = new TCDB_User((int)(Session["userID"])); %> <div id="MainMenu"> <div id="User"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
