Menu
▾
▴
[tcdb-devel] SF.net SVN: tcdb: [13] WebPrototype
|
From: <m_h...@us...> - 2006-05-31 05:29:06
|
Revision: 13 Author: m_hildebrand Date: 2006-05-30 22:28:53 -0700 (Tue, 30 May 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=13&view=rev Log Message: ----------- Continuing work on making working pages in the web prototype Modified Paths: -------------- WebPrototype/ActionItem.aspx WebPrototype/ActionItem.aspx.cs WebPrototype/App_Themes/Python/python.css WebPrototype/Assignments.aspx WebPrototype/MasterPage.master Added Paths: ----------- WebPrototype/Details.aspx WebPrototype/Details.aspx.cs Property Changed: ---------------- Graphics/Python/ Property changes on: Graphics/Python ___________________________________________________________________ Name: svn:ignore + Thumbs.db Modified: WebPrototype/ActionItem.aspx =================================================================== --- WebPrototype/ActionItem.aspx 2006-05-31 00:58:57 UTC (rev 12) +++ WebPrototype/ActionItem.aspx 2006-05-31 05:28:53 UTC (rev 13) @@ -1,8 +1,28 @@ <%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" - CodeFile="ActionItem.aspx.cs" Inherits="ActionItem" Title="Untitled Page" %> + CodeFile="ActionItem.aspx.cs" Inherits="ActionItem" Title="Action Item" %> <%@ Register Assembly="AtlasControlToolkit" Namespace="AtlasControlToolkit" TagPrefix="atlas" %> <asp:Content ID="Content1" ContentPlaceHolderID="PageContent" runat="Server"> + <% + if (!IsPostBack) + { + lblID.Text = Request.Params["id"]; + } + %> + + <asp:ObjectDataSource ID="DummyObjectDataSource1" runat="server" OldValuesParameterFormatString="original_{0}" + SelectMethod="GetDummyActionItemData" TypeName="DummyDataSetTableAdapters.ActionItemsTableAdapter"> + <SelectParameters> + <asp:ControlParameter ControlID="lblID" Name="id" + PropertyName="Text" Type="Boolean" /> + </SelectParameters> + </asp:ObjectDataSource> + + + <asp:DetailsView ID="DetailsView1" runat="server" Height="50px" Width="125px" DataSourceID="DummyObjectDataSource1"> + </asp:DetailsView> + + <asp:Label id="lblID" runat="server" Text="" Visible="false"></asp:Label> <table border="0" cellpadding="0" cellspacing="0" width="100%"> <tr> <td width="*" valign="top"> @@ -11,7 +31,7 @@ <tr> <td align="left" valign="bottom"> <h2> - Action Item</h2> + Action Item </h2> </td> <td align="right" valign="bottom" style="padding-right: 20px;"> <div class="radiolist"> @@ -70,10 +90,9 @@ </tr> </table> </div> + </td> <td width="300px" align="right" valign="top"> - <atlas:ScriptManager ID="ScriptManager1" runat="server" EnablePartialRendering="true" /> - <table width="100%" cellpadding="0" cellspacing="0" border="0" style="padding: 10px;"> <tr> <td width="100%"> Modified: WebPrototype/ActionItem.aspx.cs =================================================================== --- WebPrototype/ActionItem.aspx.cs 2006-05-31 00:58:57 UTC (rev 12) +++ WebPrototype/ActionItem.aspx.cs 2006-05-31 05:28:53 UTC (rev 13) @@ -11,8 +11,25 @@ public partial class ActionItem : System.Web.UI.Page { + + private int id; + protected void Page_Load(object sender, EventArgs e) { + //Repeater1.DataBind(); + /* + Dim conCust As SqlConnection + Dim cmdSelectRows As SqlCommand + Dim dtrCust As SqlDataReader + conCust = New SqlConnection( "Server=server;UID=userID; + PWD=password; + Database=database" ) + cmdSelectRows = New SqlCommand( "query", conCust) + conCust.Open() + dtrCust = cmdSelectRows.ExecuteReader() + RepeaterControlID.DataSource = dtrCust + RepeaterControlID.DataBind() + dtrCust.Close()*/ } } Modified: WebPrototype/App_Themes/Python/python.css =================================================================== --- WebPrototype/App_Themes/Python/python.css 2006-05-31 00:58:57 UTC (rev 12) +++ WebPrototype/App_Themes/Python/python.css 2006-05-31 05:28:53 UTC (rev 13) @@ -84,6 +84,20 @@ color: White; } +.gridleft +{ + text-align: left; + padding-left: 8px; + padding-right: 8px; +} + +.gridcenter +{ + text-align: center; + padding-left: 8px; + padding-right: 8px; +} + .radiolist { display: inline; @@ -167,11 +181,6 @@ margin: -1.8em auto 0 auto; } -#MyAssignmentsData TD -{ - text-align: center; -} - /* A CSS hack that only applies to IE -- specifies a different height for the footer */ * html #footer Modified: WebPrototype/Assignments.aspx =================================================================== --- WebPrototype/Assignments.aspx 2006-05-31 00:58:57 UTC (rev 12) +++ WebPrototype/Assignments.aspx 2006-05-31 05:28:53 UTC (rev 13) @@ -11,7 +11,8 @@ 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" /></td> + <asp:CheckBox ID="cboShowCompleted" runat="server" Text="Show Completed" TextAlign="Left" + AutoPostBack="true" /></td> </tr> <tr> <td colspan="2"> @@ -19,108 +20,46 @@ <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"> - <asp:GridView ID="GridView1" runat="server" GridLines="None" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" DataSourceID="DummyObjectDataSource1"> - <Columns> - <asp:CommandField ShowSelectButton="True" /> - <asp:BoundField DataField="Date" HeaderText="Date" SortExpression="Date" /> - <asp:BoundField DataField="Type" HeaderText="Type" SortExpression="Type" /> - <asp:BoundField DataField="Assignment" HeaderText="Assignment" SortExpression="Assignment" /> - <asp:BoundField DataField="Status" HeaderText="Status" SortExpression="Status" /> - <asp:BoundField DataField="% Complete" HeaderText="% Complete" SortExpression="% Complete" /> - <asp:BoundField DataField="Total" HeaderText="Total" SortExpression="Total" /> - <asp:BoundField DataField="Pass Rate" HeaderText="Pass Rate" SortExpression="Pass Rate" /> - <asp:BoundField DataField="Pass" HeaderText="Pass" SortExpression="Pass" /> - <asp:BoundField DataField="Fail" HeaderText="Fail" SortExpression="Fail" /> - <asp:BoundField DataField="Error" HeaderText="Error" SortExpression="Error" /> - <asp:BoundField DataField="id" HeaderText="id" InsertVisible="False" ReadOnly="True" - SortExpression="id" /> - <asp:CheckBoxField DataField="completed" HeaderText="completed" SortExpression="completed" - Visible="False" /> - </Columns> - </asp:GridView> - <asp:ObjectDataSource ID="DummyObjectDataSource1" runat="server" OldValuesParameterFormatString="original_{0}" - SelectMethod="DummyGetAssignmentData" TypeName="DummyDataSetTableAdapters.AssignmentsTableAdapter"> - <SelectParameters> - <asp:ControlParameter ControlID="cboShowCompleted" DefaultValue="false" Name="IsCompleted" - PropertyName="Checked" Type="Boolean" /> - </SelectParameters> - </asp:ObjectDataSource> - <!--<table> - <tr> - <td style="text-align: left; width: 60px;"> - <a href="#">Date</a></td> - <td style="text-align: left; width: 50px;"> - <a href="#">Type</a></td> - <td style="text-align: left; width: 200px;"> - <a href="#">Assignment</a></td> - <td style="text-align: left; width: 85px;"> - <a href="#">Status</a></td> - <td> - <a href="#">% Complete</a></td> - <td> - <a href="#">Total</a></td> - <td> - <a href="#">Run</a></td> - <td> - <a href="#">Pass Rate</a></td> - <td> - <a href="#">Pass</a></td> - <td> - <a href="#">Fail</a></td> - <td> - <a href="#">Error</a></td> - </tr> - <tr> - <td style="text-align: left;"> - 23 Dec</td> - <td style="text-align: left;"> - AI</td> - <td style="text-align: left;"> - <a href="ActionItem.aspx">Setup Personal Environment</a></td> - <td style="text-align: left;"> - Started</td> - <td> - 25%</td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> - <td> - </td> - </tr> - <tr> - <td style="text-align: left;"> - 18 Jan</td> - <td style="text-align: left;"> - WO</td> - <td style="text-align: left;"> - <a href="WorkOrder.aspx">1847 on REAS 3.0</a></td> - <td style="text-align: left;"> - Not Started</td> - <td> - 50%</td> - <td> - 8</td> - <td> - 4</td> - <td> - 25%</td> - <td> - 1</td> - <td> - 2</td> - <td> - 1</td> - </tr> - </table>--> - </div> + <div id="MyAssignmentsData"> + <atlas:UpdatePanel ID="p1" runat="server"> + <ContentTemplate> + <asp:GridView ID="GridView1" runat="server" GridLines="None" AllowPaging="True" AllowSorting="True" + AutoGenerateColumns="False" DataSourceID="DummyObjectDataSource1"> + <Columns> + <asp:BoundField DataField="Date" HeaderText="Date" SortExpression="Date" ControlStyle-CssClass="gridleft" + HeaderStyle-CssClass="gridleft" ItemStyle-CssClass="gridleft" /> + <asp:BoundField DataField="Type" HeaderText="Type" SortExpression="Type" ControlStyle-CssClass="gridleft" + HeaderStyle-CssClass="gridcenter" ItemStyle-CssClass="gridcenter"></asp:BoundField> + <asp:HyperLinkField DataTextField="Assignment" HeaderText="Assignment" SortExpression="Assignment" + NavigateUrl="~/ActionItem.aspx" DataNavigateUrlFields="type,id" DataNavigateUrlFormatString="~\Details.aspx?type={0}&id={1}" + DataTextFormatString="{0:c}" HeaderStyle-CssClass="gridleft" ItemStyle-CssClass="gridleft" /> + <asp:BoundField DataField="Status" HeaderText="Status" SortExpression="Status" ControlStyle-CssClass="gridleft" + HeaderStyle-CssClass="gridleft" ItemStyle-CssClass="gridleft" /> + <asp:BoundField DataField="% Complete" HeaderText="% Done" SortExpression="% Complete" HeaderStyle-CssClass="gridcenter" ItemStyle-CssClass="gridcenter" /> + <asp:BoundField DataField="Total" HeaderText="Total" SortExpression="Total" HeaderStyle-CssClass="gridcenter" ItemStyle-CssClass="gridcenter" /> + <asp:BoundField DataField="Pass Rate" HeaderText="Pass Rate" SortExpression="Pass Rate" HeaderStyle-CssClass="gridcenter" ItemStyle-CssClass="gridcenter" /> + <asp:BoundField DataField="Pass" HeaderText="Pass" SortExpression="Pass" HeaderStyle-CssClass="gridcenter" ItemStyle-CssClass="gridcenter" /> + <asp:BoundField DataField="Fail" HeaderText="Fail" SortExpression="Fail" HeaderStyle-CssClass="gridcenter" ItemStyle-CssClass="gridcenter" /> + <asp:BoundField DataField="Error" HeaderText="Error" SortExpression="Error" HeaderStyle-CssClass="gridcenter" ItemStyle-CssClass="gridcenter" /> + <asp:BoundField DataField="id" HeaderText="id" InsertVisible="False" ReadOnly="True" + SortExpression="id" HeaderStyle-CssClass="gridcenter" ItemStyle-CssClass="gridcenter" /> + <asp:CheckBoxField DataField="completed" HeaderText="completed" SortExpression="completed" + Visible="False" HeaderStyle-CssClass="gridcenter" ItemStyle-CssClass="gridcenter" /> + </Columns> + </asp:GridView> + </ContentTemplate> + <Triggers> + <atlas:ControlValueTrigger ControlID="cboShowCompleted" PropertyName="Checked" /> + </Triggers> + </atlas:UpdatePanel> + <asp:ObjectDataSource ID="DummyObjectDataSource1" runat="server" OldValuesParameterFormatString="original_{0}" + SelectMethod="DummyGetAssignmentData" TypeName="DummyDataSetTableAdapters.AssignmentsTableAdapter"> + <SelectParameters> + <asp:ControlParameter ControlID="cboShowCompleted" DefaultValue="false" Name="IsCompleted" + PropertyName="Checked" 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> @@ -159,24 +98,33 @@ </td> </tr> <tr> - <td>From:</td><td><asp:DropDownList ID="startMonth" runat="server"> - <asp:ListItem Selected="True" Text="Jan">Jan</asp:ListItem> - </asp:DropDownList> - <asp:DropDownList ID="startDay" runat="server"> - <asp:ListItem Selected="True" Text="1">01</asp:ListItem> - </asp:DropDownList> - <asp:DropDownList ID="startYear" runat="server"> - <asp:ListItem Selected="True" Text="2006">2006</asp:ListItem> - </asp:DropDownList></td></tr> - <tr><td>To:</td><td><asp:DropDownList ID="stopMonth" runat="server"> - <asp:ListItem Selected="True" Text="Jan">Jan</asp:ListItem> - </asp:DropDownList> - <asp:DropDownList ID="stopDay" runat="server"> - <asp:ListItem Selected="True" Text="1">01</asp:ListItem> - </asp:DropDownList> - <asp:DropDownList ID="stopYear" runat="server"> - <asp:ListItem Selected="True" Text="2007">2007</asp:ListItem> - </asp:DropDownList></td></tr> + <td> + From:</td> + <td> + <asp:DropDownList ID="startMonth" runat="server"> + <asp:ListItem Selected="True" Text="Jan">Jan</asp:ListItem> + </asp:DropDownList> + <asp:DropDownList ID="startDay" runat="server"> + <asp:ListItem Selected="True" Text="1">01</asp:ListItem> + </asp:DropDownList> + <asp:DropDownList ID="startYear" runat="server"> + <asp:ListItem Selected="True" Text="2006">2006</asp:ListItem> + </asp:DropDownList></td> + </tr> + <tr> + <td> + To:</td> + <td> + <asp:DropDownList ID="stopMonth" runat="server"> + <asp:ListItem Selected="True" Text="Jan">Jan</asp:ListItem> + </asp:DropDownList> + <asp:DropDownList ID="stopDay" runat="server"> + <asp:ListItem Selected="True" Text="1">01</asp:ListItem> + </asp:DropDownList> + <asp:DropDownList ID="stopYear" runat="server"> + <asp:ListItem Selected="True" Text="2007">2007</asp:ListItem> + </asp:DropDownList></td> + </tr> </table> </div> <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> Added: WebPrototype/Details.aspx =================================================================== --- WebPrototype/Details.aspx (rev 0) +++ WebPrototype/Details.aspx 2006-05-31 05:28:53 UTC (rev 13) @@ -0,0 +1,13 @@ +<%@ Page Language="C#" MasterPageFile="~/MasterPage.master" AutoEventWireup="true" CodeFile="Details.aspx.cs" Inherits="Details" Title="Untitled Page" %> +<asp:Content ID="Content1" ContentPlaceHolderID="PageContent" Runat="Server"> +<h3>Loading details...</h3> +<% + if (!IsPostBack) + { + if (Request.Params["type"] == "WO") + Response.Redirect("~/WorkOrder.aspx?id=" + Request.Params["id"]); + else if (Request.Params["type"] == "AI") + Response.Redirect("~/ActionItem.aspx?id=" + Request.Params["id"]); + } %> + <br /><br />Unable to locate information. Please press the back button on your browser and try again. +</asp:Content> \ No newline at end of file Added: WebPrototype/Details.aspx.cs =================================================================== --- WebPrototype/Details.aspx.cs (rev 0) +++ WebPrototype/Details.aspx.cs 2006-05-31 05:28:53 UTC (rev 13) @@ -0,0 +1,18 @@ +using System; +using System.Data; +using System.Configuration; +using System.Collections; +using System.Web; +using System.Web.Security; +using System.Web.UI; +using System.Web.UI.WebControls; +using System.Web.UI.WebControls.WebParts; +using System.Web.UI.HtmlControls; + +public partial class Details : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Modified: WebPrototype/MasterPage.master =================================================================== --- WebPrototype/MasterPage.master 2006-05-31 00:58:57 UTC (rev 12) +++ WebPrototype/MasterPage.master 2006-05-31 05:28:53 UTC (rev 13) @@ -5,6 +5,7 @@ <title>TCDB</title> </head> <body class="master"> +<atlas:ScriptManager ID="scriptManager" EnablePartialRendering="true" runat="server"></atlas:ScriptManager> <div id="nonFooter"> <div id="header"> <div id="logo"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
