Menu
▾
▴
[tcdb-devel] SF.net SVN: tcdb: [115] WebPrototype
|
From: <ro...@us...> - 2006-07-12 21:10:25
|
Revision: 115 Author: rouquin Date: 2006-07-12 14:10:09 -0700 (Wed, 12 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=115&view=rev Log Message: ----------- Added GMDatePicker to WebProtoType Modified Paths: -------------- WebPrototype/ActionItemEdit.aspx WebPrototype/ActionItemEdit.aspx.cs WebPrototype/App_Data/ASPNETDB.MDF WebPrototype/App_Data/Database.mdf WebPrototype/App_Data/Database_log.LDF WebPrototype/App_Data/aspnetdb_log.ldf WebPrototype/Assignments.aspx WebPrototype/Assignments.aspx.cs Added Paths: ----------- WebPrototype/Bin/GMDatePicker.dll Modified: WebPrototype/ActionItemEdit.aspx =================================================================== --- WebPrototype/ActionItemEdit.aspx 2006-07-12 20:17:32 UTC (rev 114) +++ WebPrototype/ActionItemEdit.aspx 2006-07-12 21:10:09 UTC (rev 115) @@ -3,8 +3,7 @@ Title="Action Item" EnableViewState="true" %> <%@ MasterType VirtualPath="~/AssignmentMaster.master" %> -<%@ Register Assembly="EclipseWebSolutions.CustomControls" Namespace="EclipseWebSolutions.CustomControls" - TagPrefix="cc1" %> +<%@ Register Assembly="GMDatePicker" Namespace="GrayMatterSoft" TagPrefix="GMc1" %> <%@ Register Assembly="FreeTextBox" Namespace="FreeTextBoxControls" TagPrefix="FTB" %> <%@ Register Assembly="AtlasControlToolkit" Namespace="AtlasControlToolkit" TagPrefix="atlas" %> <asp:Content ID="Content1" ContentPlaceHolderID="PageContent" runat="Server"> @@ -121,7 +120,12 @@ <strong>Assigned: <asp:Label ID="dateAssignedLbl" runat="server" Font-Bold="False" Text='<%# Eval("dateAssigned") %>'></asp:Label></strong><br /> <strong>Due: </strong> - <cc1:DatePicker ID="dueDate" runat="server" DateFormatString="MM/dd/yyyy" DateValue='<%# Eval("dateDue") %>' /> + <GMc1:GMDatePicker ID="dueDate" runat="server" CalendarFont-Names="Arial" Date='<%# Bind("dateDue") %>'> + <CalendarDayStyle Font-Size="9pt" /> + <CalendarTodayDayStyle BorderWidth="1" BorderColor="darkred" Font-Bold="true" /> + <CalendarOtherMonthDayStyle BackColor="whitesmoke" /> + <CalendarTitleStyle BackColor="#E0E0E0" Font-Names="Arial" Font-Size="9pt" /> + </GMc1:GMDatePicker> <br /> <strong>Finished: <asp:Label ID="dateFinishedLbl" runat="server" Font-Bold="False" Text='<%# Eval("dateFinished") %>'></asp:Label> </strong> @@ -193,7 +197,12 @@ <strong>Assigned: </strong> <asp:Label ID="dateAssignedLbl" runat="server" Text="Label"></asp:Label><br /> <strong>Due: </strong> - <cc1:DatePicker ID="dueDate" runat="server" DateFormatString="MM/dd/yyyy" /><br /> + <GMc1:GMDatePicker ID="dueDate" runat="server" CalendarFont-Names="Arial" Date='<%# Bind("dateDue") %>'> + <CalendarDayStyle Font-Size="9pt" /> + <CalendarTodayDayStyle BorderWidth="1" BorderColor="darkred" Font-Bold="true" /> + <CalendarOtherMonthDayStyle BackColor="whitesmoke" /> + <CalendarTitleStyle BackColor="#E0E0E0" Font-Names="Arial" Font-Size="9pt" /> + </GMc1:GMDatePicker><br /> <strong>Finished: <asp:Label ID="dateFinishedLbl" runat="server" Font-Bold="False"></asp:Label></strong></td> </tr> <tr> Modified: WebPrototype/ActionItemEdit.aspx.cs =================================================================== --- WebPrototype/ActionItemEdit.aspx.cs 2006-07-12 20:17:32 UTC (rev 114) +++ WebPrototype/ActionItemEdit.aspx.cs 2006-07-12 21:10:09 UTC (rev 115) @@ -9,7 +9,7 @@ using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; using System.Data.SqlClient; -using EclipseWebSolutions.CustomControls; +using GrayMatterSoft; public partial class ActionItemEdit : System.Web.UI.Page { @@ -69,11 +69,11 @@ protected void FormView1_ItemUpdated(object sender, FormViewUpdatedEventArgs e) { - DatePicker dueDate = (DatePicker)FormView1.FindControl("dueDate"); + GMDatePicker dueDate = (GMDatePicker)FormView1.FindControl("dueDate"); DropDownList assignedTo = (DropDownList)FormView1.FindControl("assignedTo"); SqlCommand cmd = new SqlCommand("UPDATE Assignments SET " + - "dateDue='" + dueDate.DateValue + + "dateDue='" + dueDate.Date + "',assignedID='" + assignedTo.SelectedValue + "',highPriorityID='" + priority + "' WHERE actionItemID=" + id, Master.DBConnection); @@ -85,7 +85,7 @@ { Label createdBy = (Label)FormView1.FindControl("createdByLbl"); Label dateAssigned = (Label)FormView1.FindControl("dateAssignedLbl"); - DatePicker dueDate = (DatePicker)FormView1.FindControl("dueDate"); + GMDatePicker dueDate = (GMDatePicker)FormView1.FindControl("dueDate"); DropDownList assignedTo = (DropDownList)FormView1.FindControl("assignedTo"); DropDownList statusList = (DropDownList)FormView1.FindControl("statusList"); RadioButtonList percentList = (RadioButtonList)FormView1.FindControl("percentList"); @@ -98,8 +98,8 @@ String due = "null"; - if (dueDate.DateValue != DateTime.MinValue) - due = "'" + dueDate.DateValue + "'"; + if (dueDate.Date != DateTime.MinValue) + due = "'" + dueDate.Date + "'"; SqlCommand cmd = new SqlCommand("INSERT INTO Assignments (actionItemID,dateAssigned,dateDue,creatorID,assignedID,statusID,highPriorityID) VALUES ('" + id + "','" + @@ -126,7 +126,7 @@ protected void FormView1_DataBound(object sender, EventArgs e) { - DatePicker dueDate = (DatePicker)FormView1.FindControl("dueDate"); + GMDatePicker dueDate = (GMDatePicker)FormView1.FindControl("dueDate"); DropDownList statusList = (DropDownList) FormView1.FindControl("statusList"); RadioButtonList percentList = (RadioButtonList)FormView1.FindControl("percentList"); Image priorityImg = (Image)FormView1.FindControl("priorityImg"); @@ -158,7 +158,7 @@ String due = data["dateDue"].ToString(); if (due != "") - dueDate.DateValue = Convert.ToDateTime(due); + dueDate.Date = Convert.ToDateTime(due); } } else if (FormView1.CurrentMode == FormViewMode.Insert) @@ -170,7 +170,7 @@ createdBy.Text = Profile.FirstName + " " + Profile.LastName; createdBy.Attributes.Add("id", Profile.userID); dateAssigned.Text = DateTime.Today.ToShortDateString(); - dueDate.DateValue = DateTime.Today; + dueDate.Date = DateTime.Today; assignedTo.SelectedValue = Profile.userID; } Modified: WebPrototype/App_Data/ASPNETDB.MDF =================================================================== (Binary files differ) Modified: WebPrototype/App_Data/Database.mdf =================================================================== (Binary files differ) Modified: WebPrototype/App_Data/Database_log.LDF =================================================================== (Binary files differ) Modified: WebPrototype/App_Data/aspnetdb_log.ldf =================================================================== (Binary files differ) Modified: WebPrototype/Assignments.aspx =================================================================== --- WebPrototype/Assignments.aspx 2006-07-12 20:17:32 UTC (rev 114) +++ WebPrototype/Assignments.aspx 2006-07-12 21:10:09 UTC (rev 115) @@ -1,11 +1,13 @@ <%@ Page Language="C#" MasterPageFile="~/AssignmentMaster.master" AutoEventWireup="true" - CodeFile="Assignments.aspx.cs" Inherits="Assignment" Title="TCDB: Assignments" EnableViewState="true" %> + CodeFile="Assignments.aspx.cs" Inherits="Assignment" Title="TCDB: Assignments" + EnableViewState="true" %> <%@ MasterType VirtualPath="~/AssignmentMaster.master" %> <%@ Register Assembly="EclipseWebSolutions.CustomControls" Namespace="EclipseWebSolutions.CustomControls" TagPrefix="cc1" %> +<%@ Register Assembly="GMDatePicker" Namespace="GrayMatterSoft" TagPrefix="GMc1" %> <asp:Content ID="Content1" ContentPlaceHolderID="PageContent" runat="Server"> - <table width="100%"> + <table width="900"> <tr> <td align=center> <div id="MyAssignments"> @@ -15,18 +17,20 @@ <h2> My Assignments</h2> </td> + <td align=center> + <asp:LinkButton ID="newActionItem" runat="server" PostBackUrl="~/ActionItemEdit.aspx?mode=new">New Action Item</asp:LinkButton> + <asp:LinkButton ID="newWorkOrder" runat="server" PostBackUrl="~/WorkOrderEdit.aspx?mode=new">New Work Order</asp:LinkButton></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"> + <td colspan="3" 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" DataKeyNames="assignmentID" OnRowDataBound="GridView1_RowDataBound" Width="100%"> @@ -55,7 +59,7 @@ HtmlEncode="False" ReadOnly="True" SortExpression="dateFinished"> <ItemStyle HorizontalAlign="Center" /> </asp:BoundField> - <asp:BoundField DataField="statusName" HeaderText="Status" ReadOnly="True" SortExpression="stateName"> + <asp:BoundField DataField="statusName" HeaderText="Status" ReadOnly="True" SortExpression="statusName"> <ItemStyle HorizontalAlign="Center" /> </asp:BoundField> </Columns> @@ -77,9 +81,7 @@ </tr> </table> </div> - <asp:LinkButton ID="newActionItem" runat="server" PostBackUrl="~/ActionItemEdit.aspx?mode=new">New Action Item</asp:LinkButton> - - <asp:LinkButton ID="newWorkOrder" runat="server" PostBackUrl="~/WorkOrderEdit.aspx?mode=new">New Work Order</asp:LinkButton></td> + </td> </tr> <tr> <td> @@ -176,10 +178,10 @@ </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> + <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> @@ -203,25 +205,32 @@ </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> - - <cc1:DatePicker ID="fromDate" runat="server" DateFormatString="MM/dd/yyyy" OnPreRender="fromDate_PreRender" - Enabled="False" OnInit="fromDate_Init"></cc1:DatePicker> - </td> + <GMc1:GMDatePicker ID="fromDate" runat="server" CalendarFont-Names="Arial" InitialText="Select a Date" + Enabled=false> + <CalendarDayStyle Font-Size="9pt" /> + <CalendarTodayDayStyle BorderWidth="1" BorderColor="darkred" Font-Bold="true" /> + <CalendarOtherMonthDayStyle BackColor="whitesmoke" /> + <CalendarTitleStyle BackColor="#E0E0E0" Font-Names="Arial" Font-Size="9pt" /> + </GMc1:GMDatePicker> + </td> </tr> <tr> - <td style="height: 16px"> + <td> <strong>To:</strong></td> - <td style="height: 16px"> - - <cc1:DatePicker ID="toDate" runat="server" DateFormatString="MM/dd/yyyy" OnPreRender="toDate_PreRender" - Enabled="False" OnInit="toDate_Init"></cc1:DatePicker> + <td> + <GMc1:GMDatePicker ID="toDate" runat="server" CalendarFont-Names="Arial" InitialText="Select a Date" + Enabled=false> + <CalendarDayStyle Font-Size="9pt" /> + <CalendarTodayDayStyle BorderWidth="1" BorderColor="darkred" Font-Bold="true" /> + <CalendarOtherMonthDayStyle BackColor="whitesmoke" /> + <CalendarTitleStyle BackColor="#E0E0E0" Font-Names="Arial" Font-Size="9pt" /> + </GMc1:GMDatePicker> </td> </tr> </table> @@ -247,25 +256,32 @@ </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> - - <cc1:DatePicker ID="fromDueDate" runat="server" DateFormatString="MM/dd/yyyy" OnPreRender="fromDueDate_PreRender" - Enabled="False" OnInit="fromDate_Init"></cc1:DatePicker> + <GMc1:GMDatePicker ID="fromDueDate" runat="server" CalendarFont-Names="Arial" InitialText="Select a Date" + Enabled=false> + <CalendarDayStyle Font-Size="9pt" /> + <CalendarTodayDayStyle BorderWidth="1" BorderColor="darkred" Font-Bold="true" /> + <CalendarOtherMonthDayStyle BackColor="whitesmoke" /> + <CalendarTitleStyle BackColor="#E0E0E0" Font-Names="Arial" Font-Size="9pt" /> + </GMc1:GMDatePicker> </td> </tr> <tr> - <td style="height: 16px"> + <td> <strong>To:</strong></td> - <td style="height: 16px"> - - <cc1:DatePicker ID="toDueDate" runat="server" DateFormatString="MM/dd/yyyy" OnPreRender="toDueDate_PreRender" - Enabled="False" OnInit="toDate_Init"></cc1:DatePicker> + <td> + <GMc1:GMDatePicker ID="toDueDate" runat="server" CalendarFont-Names="Arial" InitialText="Select a Date" + Enabled=false> + <CalendarDayStyle Font-Size="9pt" /> + <CalendarTodayDayStyle BorderWidth="1" BorderColor="darkred" Font-Bold="true" /> + <CalendarOtherMonthDayStyle BackColor="whitesmoke" /> + <CalendarTitleStyle BackColor="#E0E0E0" Font-Names="Arial" Font-Size="9pt" /> + </GMc1:GMDatePicker> </td> </tr> </table> @@ -291,25 +307,32 @@ </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> - - <cc1:DatePicker ID="fromFinishedDate" runat="server" DateFormatString="MM/dd/yyyy" - OnPreRender="fromFinishedDate_PreRender" Enabled="False" OnInit="fromDate_Init"></cc1:DatePicker> + <GMc1:GMDatePicker ID="fromFinishedDate" runat="server" CalendarFont-Names="Arial" + InitialText="Select a Date" Enabled=false> + <CalendarDayStyle Font-Size="9pt" /> + <CalendarTodayDayStyle BorderWidth="1" BorderColor="darkred" Font-Bold="true" /> + <CalendarOtherMonthDayStyle BackColor="whitesmoke" /> + <CalendarTitleStyle BackColor="#E0E0E0" Font-Names="Arial" Font-Size="9pt" /> + </GMc1:GMDatePicker> </td> </tr> <tr> - <td style="height: 16px"> + <td> <strong>To:</strong></td> - <td style="height: 16px"> - - <cc1:DatePicker ID="toFinishedDate" runat="server" DateFormatString="MM/dd/yyyy" - OnPreRender="toFinishedDate_PreRender" Enabled="False" OnInit="toDate_Init"></cc1:DatePicker> + <td> + <GMc1:GMDatePicker ID="toFinishedDate" runat="server" CalendarFont-Names="Arial" + InitialText="Select a Date" Enabled=false> + <CalendarDayStyle Font-Size="9pt" /> + <CalendarTodayDayStyle BorderWidth="1" BorderColor="darkred" Font-Bold="true" /> + <CalendarOtherMonthDayStyle BackColor="whitesmoke" /> + <CalendarTitleStyle BackColor="#E0E0E0" Font-Names="Arial" Font-Size="9pt" /> + </GMc1:GMDatePicker> </td> </tr> </table> Modified: WebPrototype/Assignments.aspx.cs =================================================================== --- WebPrototype/Assignments.aspx.cs 2006-07-12 20:17:32 UTC (rev 114) +++ WebPrototype/Assignments.aspx.cs 2006-07-12 21:10:09 UTC (rev 115) @@ -8,9 +8,9 @@ using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -using EclipseWebSolutions.CustomControls; using System.Data.SqlClient; using Microsoft.Web.UI; +using GrayMatterSoft; public partial class Assignment : System.Web.UI.Page { @@ -129,8 +129,8 @@ if (gRow.Visible && cboDateFilter.Checked) { DateTime dateAssigned = Convert.ToDateTime(data["dateAssigned"]); - DateTime to = toDate.DateValue; - DateTime from = fromDate.DateValue; + DateTime to = toDate.Date; + DateTime from = fromDate.Date; if ((dateAssigned < from) || (dateAssigned > to)) gRow.Visible = false; @@ -138,8 +138,8 @@ if (gRow.Visible && cboDueFilter.Checked) { DateTime dateAssigned = Convert.ToDateTime(data["dateAssigned"]); - DateTime to = toDueDate.DateValue; - DateTime from = fromDueDate.DateValue; + DateTime to = toDueDate.Date; + DateTime from = fromDueDate.Date; if ((dateAssigned < from) || (dateAssigned > to)) gRow.Visible = false; @@ -147,8 +147,8 @@ if (gRow.Visible && cboFinishedFilter.Checked) { DateTime dateAssigned = Convert.ToDateTime(data["dateAssigned"]); - DateTime to = toFinishedDate.DateValue; - DateTime from = fromFinishedDate.DateValue; + DateTime to = toFinishedDate.Date; + DateTime from = fromFinishedDate.Date; if ((dateAssigned < from) || (dateAssigned > to)) gRow.Visible = false; @@ -237,17 +237,17 @@ } protected void fromDate_PreRender(object sender, EventArgs e) { - if (curFromDate != fromDate.DateValue) + if (curFromDate != fromDate.Date) { - curFromDate = fromDate.DateValue; + curFromDate = fromDate.Date; GridView1.DataBind(); } } protected void toDate_PreRender(object sender, EventArgs e) { - if (curToDate != toDate.DateValue) + if (curToDate != toDate.Date) { - curToDate = toDate.DateValue; + curToDate = toDate.Date; GridView1.DataBind(); } } @@ -267,33 +267,33 @@ } protected void fromDueDate_PreRender(object sender, EventArgs e) { - if (curFromDueDate != fromDueDate.DateValue) + if (curFromDueDate != fromDueDate.Date) { - curFromDueDate = fromDueDate.DateValue; + curFromDueDate = fromDueDate.Date; GridView1.DataBind(); } } protected void toDueDate_PreRender(object sender, EventArgs e) { - if (curToDueDate != toDueDate.DateValue) + if (curToDueDate != toDueDate.Date) { - curToDueDate = toDueDate.DateValue; + curToDueDate = toDueDate.Date; GridView1.DataBind(); } } protected void fromFinishedDate_PreRender(object sender, EventArgs e) { - if (curFromFinishedDate != fromFinishedDate.DateValue) + if (curFromFinishedDate != fromFinishedDate.Date) { - curFromFinishedDate = fromFinishedDate.DateValue; + curFromFinishedDate = fromFinishedDate.Date; GridView1.DataBind(); } } protected void toFinishedDate_PreRender(object sender, EventArgs e) { - if (curToFinishedDate != toFinishedDate.DateValue) + if (curToFinishedDate != toFinishedDate.Date) { - curToFinishedDate = toFinishedDate.DateValue; + curToFinishedDate = toFinishedDate.Date; GridView1.DataBind(); } } @@ -328,15 +328,15 @@ protected void fromDate_Init(object sender, EventArgs e) { - DatePicker dp = (DatePicker)sender; + GMDatePicker dp = (GMDatePicker)sender; - dp.DateValue = new DateTime(2000, 1, 1); + dp.Date = new DateTime(2000, 1, 1); } protected void toDate_Init(object sender, EventArgs e) { - DatePicker dp = (DatePicker)sender; + GMDatePicker dp = (GMDatePicker)sender; - dp.DateValue = new DateTime(3000, 12, 31); + dp.Date = new DateTime(3000, 12, 31); } protected void cboPriorityFilter_CheckedChanged(object sender, EventArgs e) { Added: WebPrototype/Bin/GMDatePicker.dll =================================================================== (Binary files differ) Property changes on: WebPrototype/Bin/GMDatePicker.dll ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
