Menu
▾
▴
tcdb-devel
|
From: <m_h...@us...> - 2006-07-06 01:16:00
|
Revision: 70 Author: m_hildebrand Date: 2006-07-05 18:15:24 -0700 (Wed, 05 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=70&view=rev Log Message: ----------- Built the basic architecture, still needs some filling out before it is ready to roll Modified Paths: -------------- Website/Default.aspx Website/Default.aspx.cs Website/Web.config Added Paths: ----------- Website/ActionItem.aspx Website/ActionItem.aspx.cs Website/Administration.aspx Website/Administration.aspx.cs Website/App_Themes/ Website/App_Themes/Python/ Website/App_Themes/Python/Images/ Website/App_Themes/Python/python.css Website/Assignments.aspx Website/Assignments.aspx.cs Website/Execution.aspx Website/Execution.aspx.cs Website/Includes/ Website/Includes/TCDB_ActionItems.ascx Website/Includes/TCDB_ActionItems.ascx.cs Website/Includes/TCDB_Assignments.ascx Website/Includes/TCDB_Assignments.ascx.cs Website/Includes/TCDB_AssignmentsTree.ascx Website/Includes/TCDB_AssignmentsTree.ascx.cs Website/Includes/TCDB_Authentication.ascx Website/Includes/TCDB_Authentication.ascx.cs Website/Includes/TCDB_Builds.ascx Website/Includes/TCDB_Builds.ascx.cs Website/Includes/TCDB_Execution.ascx Website/Includes/TCDB_Execution.ascx.cs Website/Includes/TCDB_FeatureTree.ascx Website/Includes/TCDB_FeatureTree.ascx.cs Website/Includes/TCDB_Features.ascx Website/Includes/TCDB_Features.ascx.cs Website/Includes/TCDB_Footer.ascx Website/Includes/TCDB_Footer.ascx.cs Website/Includes/TCDB_Header.ascx Website/Includes/TCDB_Header.ascx.cs Website/Includes/TCDB_Notes.ascx Website/Includes/TCDB_Notes.ascx.cs Website/Includes/TCDB_Objectives.ascx Website/Includes/TCDB_Objectives.ascx.cs Website/Includes/TCDB_Platforms.ascx Website/Includes/TCDB_Platforms.ascx.cs Website/Includes/TCDB_Products.ascx Website/Includes/TCDB_Products.ascx.cs Website/Includes/TCDB_Reports.ascx Website/Includes/TCDB_Reports.ascx.cs Website/Includes/TCDB_Tags.ascx Website/Includes/TCDB_Tags.ascx.cs Website/Includes/TCDB_TestCases.ascx Website/Includes/TCDB_TestCases.ascx.cs Website/Includes/TCDB_Users.ascx Website/Includes/TCDB_Users.ascx.cs Website/Includes/TCDB_Versions.ascx Website/Includes/TCDB_Versions.ascx.cs Website/Includes/TCDB_WorkOrders.ascx Website/Includes/TCDB_WorkOrders.ascx.cs Website/Plugins/ Website/Plugins/VAS_Execution.ascx Website/Plugins/VAS_Execution.ascx.cs Website/PrivacyPolicy.aspx Website/PrivacyPolicy.aspx.cs Website/Reports.aspx Website/Reports.aspx.cs Website/SiteMap.aspx Website/SiteMap.aspx.cs Website/TCDB.master Website/TCDB.master.cs Website/TestManagement.aspx Website/TestManagement.aspx.cs Website/WorkOrder.aspx Website/WorkOrder.aspx.cs Added: Website/ActionItem.aspx =================================================================== --- Website/ActionItem.aspx (rev 0) +++ Website/ActionItem.aspx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1,7 @@ +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="ActionItem.aspx.cs" Inherits="ActionItem" Title="Untitled Page" %> +<asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" Runat="Server"> +</asp:Content> Added: Website/ActionItem.aspx.cs =================================================================== --- Website/ActionItem.aspx.cs (rev 0) +++ Website/ActionItem.aspx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 ActionItem : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Administration.aspx =================================================================== --- Website/Administration.aspx (rev 0) +++ Website/Administration.aspx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1,7 @@ +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="Administration.aspx.cs" Inherits="Administration" Title="Untitled Page" %> +<asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" Runat="Server"> +</asp:Content> Added: Website/Administration.aspx.cs =================================================================== --- Website/Administration.aspx.cs (rev 0) +++ Website/Administration.aspx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Administration : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/App_Themes/Python/python.css =================================================================== --- Website/App_Themes/Python/python.css (rev 0) +++ Website/App_Themes/Python/python.css 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1,54 @@ +html +{ + height: 100%; +} + +body +{ + height: 100%; + margin: 0; + padding: 0; + font-family: Verdana, Sans-Serif; + font-size: 10pt; +} + +#FooterContent A +{ + color: White; +} + +#FooterContent A:hover, #FooterContent A:active +{ + color: #FDB928; +} + +#NonFooter +{ + position: relative; + min-height: 100%; + padding: 0px; + margin: 0px; +} + +* html #NonFooter +{ + height: 100%; +} + +#FooterContent +{ + background-color: #022e66; + color: white; + padding-bottom: 4px; + vertical-align: middle; + padding-top: 4px; + text-align: center; + position: relative; + margin: -1.8em auto 0 auto; +} + +/* A CSS hack that only applies to IE -- specifies a different height for the footer */ +* html #FooterContent +{ + margin-top: -1.8em; +} \ No newline at end of file Added: Website/Assignments.aspx =================================================================== --- Website/Assignments.aspx (rev 0) +++ Website/Assignments.aspx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1,8 @@ +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="Assignments.aspx.cs" Inherits="Assignments" Title="Untitled Page" %> +<asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" Runat="Server"> +</asp:Content> + Added: Website/Assignments.aspx.cs =================================================================== --- Website/Assignments.aspx.cs (rev 0) +++ Website/Assignments.aspx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Assignments : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Modified: Website/Default.aspx =================================================================== --- Website/Default.aspx 2006-07-06 00:25:08 UTC (rev 69) +++ Website/Default.aspx 2006-07-06 01:15:24 UTC (rev 70) @@ -1,24 +1,8 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="_Default" %> +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="_Default" Title="Untitled Page" %> +<asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" Runat="Server"> +</asp:Content> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml"> -<head runat="server"> - <title>Untitled Page</title> -</head> -<body> - <form id="form1" runat="server"> - <atlas:ScriptManager ID="ScriptManager1" runat="server" /> - <div> - </div> - </form> - - <script type="text/xml-script"> - <page xmlns:script="http://schemas.microsoft.com/xml-script/2005"> - <references> - </references> - <components> - </components> - </page> - </script> -</body> -</html> Modified: Website/Default.aspx.cs =================================================================== --- Website/Default.aspx.cs 2006-07-06 00:25:08 UTC (rev 69) +++ Website/Default.aspx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -1,6 +1,7 @@ using System; using System.Data; using System.Configuration; +using System.Collections; using System.Web; using System.Web.Security; using System.Web.UI; @@ -8,10 +9,10 @@ using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; -public partial class _Default : System.Web.UI.Page +public partial class _Default : System.Web.UI.Page { protected void Page_Load(object sender, EventArgs e) { } -} \ No newline at end of file +} Added: Website/Execution.aspx =================================================================== --- Website/Execution.aspx (rev 0) +++ Website/Execution.aspx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1,8 @@ +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="Execution.aspx.cs" Inherits="Execution" Title="Untitled Page" %> +<asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" Runat="Server"> +</asp:Content> + Added: Website/Execution.aspx.cs =================================================================== --- Website/Execution.aspx.cs (rev 0) +++ Website/Execution.aspx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Execution : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_ActionItems.ascx =================================================================== --- Website/Includes/TCDB_ActionItems.ascx (rev 0) +++ Website/Includes/TCDB_ActionItems.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_ActionItems.ascx.cs" Inherits="Includes_TCDB_ActionItems" %> Added: Website/Includes/TCDB_ActionItems.ascx.cs =================================================================== --- Website/Includes/TCDB_ActionItems.ascx.cs (rev 0) +++ Website/Includes/TCDB_ActionItems.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_ActionItems : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_Assignments.ascx =================================================================== --- Website/Includes/TCDB_Assignments.ascx (rev 0) +++ Website/Includes/TCDB_Assignments.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Assignments.ascx.cs" Inherits="Includes_TCDB_Assignments" %> Added: Website/Includes/TCDB_Assignments.ascx.cs =================================================================== --- Website/Includes/TCDB_Assignments.ascx.cs (rev 0) +++ Website/Includes/TCDB_Assignments.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_Assignments : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_AssignmentsTree.ascx =================================================================== --- Website/Includes/TCDB_AssignmentsTree.ascx (rev 0) +++ Website/Includes/TCDB_AssignmentsTree.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_AssignmentsTree.ascx.cs" Inherits="Includes_TCDB_AssignmentsTree" %> Added: Website/Includes/TCDB_AssignmentsTree.ascx.cs =================================================================== --- Website/Includes/TCDB_AssignmentsTree.ascx.cs (rev 0) +++ Website/Includes/TCDB_AssignmentsTree.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_AssignmentsTree : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_Authentication.ascx =================================================================== --- Website/Includes/TCDB_Authentication.ascx (rev 0) +++ Website/Includes/TCDB_Authentication.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Authentication.ascx.cs" Inherits="Includes_TCDB_Authentication" %> Added: Website/Includes/TCDB_Authentication.ascx.cs =================================================================== --- Website/Includes/TCDB_Authentication.ascx.cs (rev 0) +++ Website/Includes/TCDB_Authentication.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_Authentication : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_Builds.ascx =================================================================== --- Website/Includes/TCDB_Builds.ascx (rev 0) +++ Website/Includes/TCDB_Builds.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Builds.ascx.cs" Inherits="Includes_TCDB_Builds" %> Added: Website/Includes/TCDB_Builds.ascx.cs =================================================================== --- Website/Includes/TCDB_Builds.ascx.cs (rev 0) +++ Website/Includes/TCDB_Builds.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_Builds : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_Execution.ascx =================================================================== --- Website/Includes/TCDB_Execution.ascx (rev 0) +++ Website/Includes/TCDB_Execution.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Execution.ascx.cs" Inherits="Includes_TCDB_Execution" %> Added: Website/Includes/TCDB_Execution.ascx.cs =================================================================== --- Website/Includes/TCDB_Execution.ascx.cs (rev 0) +++ Website/Includes/TCDB_Execution.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_Execution : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_FeatureTree.ascx =================================================================== --- Website/Includes/TCDB_FeatureTree.ascx (rev 0) +++ Website/Includes/TCDB_FeatureTree.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_FeatureTree.ascx.cs" Inherits="Includes_TCDB_FeatureTree" %> Added: Website/Includes/TCDB_FeatureTree.ascx.cs =================================================================== --- Website/Includes/TCDB_FeatureTree.ascx.cs (rev 0) +++ Website/Includes/TCDB_FeatureTree.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_FeatureTree : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_Features.ascx =================================================================== --- Website/Includes/TCDB_Features.ascx (rev 0) +++ Website/Includes/TCDB_Features.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Features.ascx.cs" Inherits="Includes_TCDB_Features" %> Added: Website/Includes/TCDB_Features.ascx.cs =================================================================== --- Website/Includes/TCDB_Features.ascx.cs (rev 0) +++ Website/Includes/TCDB_Features.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_Features : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_Footer.ascx =================================================================== --- Website/Includes/TCDB_Footer.ascx (rev 0) +++ Website/Includes/TCDB_Footer.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1,2 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Footer.ascx.cs" Inherits="Includes_TCDB_Footer" %> +\xA9 2006 <a href="http://www.quest.com">Quest Software, Inc.</a> | <a href="PrivacyPolicy.aspx">Privacy Policy</a> | <a href="SiteMap.aspx">Site Map</a> Added: Website/Includes/TCDB_Footer.ascx.cs =================================================================== --- Website/Includes/TCDB_Footer.ascx.cs (rev 0) +++ Website/Includes/TCDB_Footer.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_Footer : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_Header.ascx =================================================================== --- Website/Includes/TCDB_Header.ascx (rev 0) +++ Website/Includes/TCDB_Header.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1,2 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Header.ascx.cs" Inherits="Includes_TCDB_Header" %> +this is the header \ No newline at end of file Added: Website/Includes/TCDB_Header.ascx.cs =================================================================== --- Website/Includes/TCDB_Header.ascx.cs (rev 0) +++ Website/Includes/TCDB_Header.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_Header : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_Notes.ascx =================================================================== --- Website/Includes/TCDB_Notes.ascx (rev 0) +++ Website/Includes/TCDB_Notes.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Notes.ascx.cs" Inherits="Includes_TCDB_Notes" %> Added: Website/Includes/TCDB_Notes.ascx.cs =================================================================== --- Website/Includes/TCDB_Notes.ascx.cs (rev 0) +++ Website/Includes/TCDB_Notes.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_Notes : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_Objectives.ascx =================================================================== --- Website/Includes/TCDB_Objectives.ascx (rev 0) +++ Website/Includes/TCDB_Objectives.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Objectives.ascx.cs" Inherits="Includes_TCDB_Objectives" %> Added: Website/Includes/TCDB_Objectives.ascx.cs =================================================================== --- Website/Includes/TCDB_Objectives.ascx.cs (rev 0) +++ Website/Includes/TCDB_Objectives.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_Objectives : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_Platforms.ascx =================================================================== --- Website/Includes/TCDB_Platforms.ascx (rev 0) +++ Website/Includes/TCDB_Platforms.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Platforms.ascx.cs" Inherits="Includes_TCDB_Platforms" %> Added: Website/Includes/TCDB_Platforms.ascx.cs =================================================================== --- Website/Includes/TCDB_Platforms.ascx.cs (rev 0) +++ Website/Includes/TCDB_Platforms.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_Platforms : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_Products.ascx =================================================================== --- Website/Includes/TCDB_Products.ascx (rev 0) +++ Website/Includes/TCDB_Products.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Products.ascx.cs" Inherits="Includes_TCDB_Products" %> Added: Website/Includes/TCDB_Products.ascx.cs =================================================================== --- Website/Includes/TCDB_Products.ascx.cs (rev 0) +++ Website/Includes/TCDB_Products.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_Products : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_Reports.ascx =================================================================== --- Website/Includes/TCDB_Reports.ascx (rev 0) +++ Website/Includes/TCDB_Reports.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Reports.ascx.cs" Inherits="Includes_TCDB_Reports" %> Added: Website/Includes/TCDB_Reports.ascx.cs =================================================================== --- Website/Includes/TCDB_Reports.ascx.cs (rev 0) +++ Website/Includes/TCDB_Reports.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_Reports : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_Tags.ascx =================================================================== --- Website/Includes/TCDB_Tags.ascx (rev 0) +++ Website/Includes/TCDB_Tags.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Tags.ascx.cs" Inherits="Includes_TCDB_Tags" %> Added: Website/Includes/TCDB_Tags.ascx.cs =================================================================== --- Website/Includes/TCDB_Tags.ascx.cs (rev 0) +++ Website/Includes/TCDB_Tags.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_Tags : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_TestCases.ascx =================================================================== --- Website/Includes/TCDB_TestCases.ascx (rev 0) +++ Website/Includes/TCDB_TestCases.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_TestCases.ascx.cs" Inherits="Includes_TCDB_TestCases" %> Added: Website/Includes/TCDB_TestCases.ascx.cs =================================================================== --- Website/Includes/TCDB_TestCases.ascx.cs (rev 0) +++ Website/Includes/TCDB_TestCases.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_TestCases : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_Users.ascx =================================================================== --- Website/Includes/TCDB_Users.ascx (rev 0) +++ Website/Includes/TCDB_Users.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Users.ascx.cs" Inherits="Includes_TCDB_Users" %> Added: Website/Includes/TCDB_Users.ascx.cs =================================================================== --- Website/Includes/TCDB_Users.ascx.cs (rev 0) +++ Website/Includes/TCDB_Users.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_Users : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_Versions.ascx =================================================================== --- Website/Includes/TCDB_Versions.ascx (rev 0) +++ Website/Includes/TCDB_Versions.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Versions.ascx.cs" Inherits="Includes_TCDB_Versions" %> Added: Website/Includes/TCDB_Versions.ascx.cs =================================================================== --- Website/Includes/TCDB_Versions.ascx.cs (rev 0) +++ Website/Includes/TCDB_Versions.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_Versions : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Includes/TCDB_WorkOrders.ascx =================================================================== --- Website/Includes/TCDB_WorkOrders.ascx (rev 0) +++ Website/Includes/TCDB_WorkOrders.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_WorkOrders.ascx.cs" Inherits="Includes_TCDB_WorkOrders" %> Added: Website/Includes/TCDB_WorkOrders.ascx.cs =================================================================== --- Website/Includes/TCDB_WorkOrders.ascx.cs (rev 0) +++ Website/Includes/TCDB_WorkOrders.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Includes_TCDB_WorkOrders : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Plugins/VAS_Execution.ascx =================================================================== --- Website/Plugins/VAS_Execution.ascx (rev 0) +++ Website/Plugins/VAS_Execution.ascx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="VAS_Execution.ascx.cs" Inherits="Plugins_VAS_Execution" %> Added: Website/Plugins/VAS_Execution.ascx.cs =================================================================== --- Website/Plugins/VAS_Execution.ascx.cs (rev 0) +++ Website/Plugins/VAS_Execution.ascx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Plugins_VAS_Execution : System.Web.UI.UserControl +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/PrivacyPolicy.aspx =================================================================== --- Website/PrivacyPolicy.aspx (rev 0) +++ Website/PrivacyPolicy.aspx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1,8 @@ +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="PrivacyPolicy.aspx.cs" Inherits="PrivacyPolicy" Title="Untitled Page" %> +<asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" Runat="Server"> +</asp:Content> + Added: Website/PrivacyPolicy.aspx.cs =================================================================== --- Website/PrivacyPolicy.aspx.cs (rev 0) +++ Website/PrivacyPolicy.aspx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 PrivacyPolicy : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/Reports.aspx =================================================================== --- Website/Reports.aspx (rev 0) +++ Website/Reports.aspx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1,8 @@ +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="Reports.aspx.cs" Inherits="Reports" Title="Untitled Page" %> +<asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" Runat="Server"> +</asp:Content> + Added: Website/Reports.aspx.cs =================================================================== --- Website/Reports.aspx.cs (rev 0) +++ Website/Reports.aspx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 Reports : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/SiteMap.aspx =================================================================== --- Website/SiteMap.aspx (rev 0) +++ Website/SiteMap.aspx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1,8 @@ +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="SiteMap.aspx.cs" Inherits="SiteMap" Title="Untitled Page" %> +<asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" Runat="Server"> +</asp:Content> + Added: Website/SiteMap.aspx.cs =================================================================== --- Website/SiteMap.aspx.cs (rev 0) +++ Website/SiteMap.aspx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 SiteMap : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/TCDB.master =================================================================== --- Website/TCDB.master (rev 0) +++ Website/TCDB.master 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1,35 @@ +<%@ Master Language="C#" AutoEventWireup="true" CodeFile="TCDB.master.cs" Inherits="TCDB" %> +<%@ Register TagPrefix="TCDB" TagName="Header" src="~/Includes/TCDB_Header.ascx" %> +<%@ Register TagPrefix="TCDB" TagName="Footer" src="~/Includes/TCDB_Footer.ascx" %> + +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml" > +<head runat="server"> + <title>Master Page</title> +</head> +<body> + <div id="NonFooter"> + <form id="Form1" runat="server"> + <div id="HeaderContent"> + <TCDB:Header runat="server" /> + </div> + <div id="TreeContent"> + <asp:ContentPlaceHolder ID="TreeContentPlaceHolder" runat="server"> + </asp:ContentPlaceHolder> + </div> + <div id="MainContent"> + <asp:contentplaceholder id="MainContentPlaceHolder" runat="server"> + </asp:contentplaceholder> + </div> + <div id="NotesContent"> + <asp:contentplaceholder id="NotesContentPlaceHolder" runat="server"> + </asp:contentplaceholder> + </div> + </div> + </form> + <div id="FooterContent"> + <TCDB:Footer runat="server" /> + </div> +</body> +</html> Added: Website/TCDB.master.cs =================================================================== --- Website/TCDB.master.cs (rev 0) +++ Website/TCDB.master.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 TCDB : System.Web.UI.MasterPage +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Added: Website/TestManagement.aspx =================================================================== --- Website/TestManagement.aspx (rev 0) +++ Website/TestManagement.aspx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1,8 @@ +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="TestManagement.aspx.cs" Inherits="TestManagement" Title="Untitled Page" %> +<asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" Runat="Server"> +</asp:Content> + Added: Website/TestManagement.aspx.cs =================================================================== --- Website/TestManagement.aspx.cs (rev 0) +++ Website/TestManagement.aspx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 TestManagement : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} Modified: Website/Web.config =================================================================== --- Website/Web.config 2006-07-06 00:25:08 UTC (rev 69) +++ Website/Web.config 2006-07-06 01:15:24 UTC (rev 70) @@ -8,78 +8,75 @@ \Windows\Microsoft.Net\Framework\v2.x\Config --> <configuration> - <!-- + <!-- The configSections define a section for ASP.NET Atlas. --> - <configSections> - <sectionGroup name="microsoft.web" type="Microsoft.Web.Configuration.MicrosoftWebSectionGroup"> - <section name="converters" type="Microsoft.Web.Configuration.ConvertersSection" requirePermission="false" /> - <section name="webServices" type="Microsoft.Web.Configuration.WebServicesSection" requirePermission="false" /> - <section name="authenticationService" type="Microsoft.Web.Configuration.AuthenticationServiceSection" requirePermission="false" /> - <section name="profileService" type="Microsoft.Web.Configuration.ProfileServiceSection" requirePermission="false" /> - </sectionGroup> - </configSections> - - <!-- + <configSections> + <sectionGroup name="microsoft.web" type="Microsoft.Web.Configuration.MicrosoftWebSectionGroup"> + <section name="converters" type="Microsoft.Web.Configuration.ConvertersSection" requirePermission="false"/> + <section name="webServices" type="Microsoft.Web.Configuration.WebServicesSection" requirePermission="false"/> + <section name="authenticationService" type="Microsoft.Web.Configuration.AuthenticationServiceSection" requirePermission="false"/> + <section name="profileService" type="Microsoft.Web.Configuration.ProfileServiceSection" requirePermission="false"/> + </sectionGroup> + </configSections> + <!-- The microsoft.web section defines items required for the Atlas framework. --> - <microsoft.web> - <converters> - <add type="Microsoft.Web.Script.Serialization.Converters.DataSetConverter"/> - <add type="Microsoft.Web.Script.Serialization.Converters.DataRowConverter"/> - <add type="Microsoft.Web.Script.Serialization.Converters.DataTableConverter"/> - </converters> - <webServices enableBrowserAccess="true" /> - <!-- + <microsoft.web> + <converters> + <add type="Microsoft.Web.Script.Serialization.Converters.DataSetConverter"/> + <add type="Microsoft.Web.Script.Serialization.Converters.DataRowConverter"/> + <add type="Microsoft.Web.Script.Serialization.Converters.DataTableConverter"/> + </converters> + <webServices enableBrowserAccess="true"/> + <!-- Uncomment this line to enable the authentication service. <authenticationService enabled="true" /> --> - - <!-- Uncomment these lines to enable the profile service. To allow profile properties to be retrieved + <!-- Uncomment these lines to enable the profile service. To allow profile properties to be retrieved and modified in Atlas applications, you need to add each property name to the setProperties and getProperties attributes. If you intend for all properties to be available, you can use "*" as a shorthand rather than enumerating each property --> - <!-- + <!-- <profileService enabled="true" setProperties="propertyname1;propertyname2" getProperties="propertyname1;propertyname2" /> --> - - </microsoft.web> - <appSettings/> - <connectionStrings/> - <system.web> - <pages> - <controls> - <add namespace="Microsoft.Web.UI" assembly="Microsoft.Web.Atlas" tagPrefix="atlas"/> - <add namespace="Microsoft.Web.UI.Controls" assembly="Microsoft.Web.Atlas" tagPrefix="atlas"/> - </controls> - </pages> - <!-- + </microsoft.web> + <appSettings/> + <connectionStrings/> + <system.web> + <pages theme="Python" styleSheetTheme="Python"> + <!-- TODO: Make sure the theme is being pulled dynamically --> + <controls> + <add namespace="Microsoft.Web.UI" assembly="Microsoft.Web.Atlas" tagPrefix="atlas"/> + <add namespace="Microsoft.Web.UI.Controls" assembly="Microsoft.Web.Atlas" tagPrefix="atlas"/> + </controls> + </pages> + <!-- Set compilation debug="true" to insert debugging symbols into the compiled page. Because this affects performance, set this value to true only during development. --> - <compilation debug="false"> - <buildProviders> - <add extension=".asbx" type="Microsoft.Web.Services.BridgeBuildProvider" /> - </buildProviders> - </compilation> - - <!-- + <compilation debug="true"> + <buildProviders> + <add extension=".asbx" type="Microsoft.Web.Services.BridgeBuildProvider"/> + </buildProviders> + </compilation> + <!-- ASMX is mapped to a new handler so that proxy javascripts can also be served. --> - <httpHandlers> - <remove verb="*" path="*.asmx"/> - <add verb="*" path="*.asmx" type="Microsoft.Web.Services.ScriptHandlerFactory" validate="false"/> - <!-- + <httpHandlers> + <remove verb="*" path="*.asmx"/> + <add verb="*" path="*.asmx" type="Microsoft.Web.Services.ScriptHandlerFactory" validate="false"/> + <!-- The MultiRequestHandler enables multiple requests to be handled in one roundtrip to the server. Its use requires Full Trust. --> - <add verb="*" path="atlasbatchcall.axd" type="Microsoft.Web.Services.MultiRequestHandler" validate="false"/> - <add verb="*" path="atlasglob.axd" type="Microsoft.Web.Globalization.GlobalizationHandler" validate="false"/> - <!-- + <add verb="*" path="atlasbatchcall.axd" type="Microsoft.Web.Services.MultiRequestHandler" validate="false"/> + <add verb="*" path="atlasglob.axd" type="Microsoft.Web.Globalization.GlobalizationHandler" validate="false"/> + <!-- The IFrameHandler enables a limited form of cross-domain calls to 'Atlas' web services. This should only be enabled if you need this functionality and you're willing to expose the data publicly on the Internet. @@ -89,21 +86,21 @@ <add verb="*" path="iframecall.axd" type="Microsoft.Web.Services.IFrameHandler" validate="false"/> --> - <add verb="*" path="*.asbx" type="Microsoft.Web.Services.ScriptHandlerFactory" validate="false"/> - </httpHandlers> - <httpModules> - <add name="ScriptModule" type="Microsoft.Web.Services.ScriptModule"/> - <add name="BridgeModule" type="Microsoft.Web.Services.BridgeModule"/> - <add name="WebResourceCompression" type="Microsoft.Web.Services.WebResourceCompressionModule"/> - </httpModules> - <!-- + <add verb="*" path="*.asbx" type="Microsoft.Web.Services.ScriptHandlerFactory" validate="false"/> + </httpHandlers> + <httpModules> + <add name="ScriptModule" type="Microsoft.Web.Services.ScriptModule"/> + <add name="BridgeModule" type="Microsoft.Web.Services.BridgeModule"/> + <add name="WebResourceCompression" type="Microsoft.Web.Services.WebResourceCompressionModule"/> + </httpModules> + <!-- The <authentication> section enables configuration of the security authentication mode used by ASP.NET to identify an incoming user. <authentication mode="Windows"/> --> - <!-- + <!-- The <customErrors> section enables configuration of what to do if/when an unhandled error occurs during the execution of a request. Specifically, @@ -115,15 +112,14 @@ <error statusCode="404" redirect="FileNotFound.htm"/> </customErrors> --> - </system.web> - - <!-- Uncomment this if your site globally denies access to anonymous users. The + </system.web> + <!-- Uncomment this if your site globally denies access to anonymous users. The authentication service and profile service are located under the virtual "ScriptServices" directory. Since you normally call the authentication web service with an un-authenticated user, the following location tag can be used to grant access to anonymous users. If you use anonymous profile support you will also need to grant access to anonymous users. --> - <!-- + <!-- <location path="ScriptServices"> <system.web> <authorization> @@ -132,5 +128,4 @@ </system.web> </location> --> - </configuration> Added: Website/WorkOrder.aspx =================================================================== --- Website/WorkOrder.aspx (rev 0) +++ Website/WorkOrder.aspx 2006-07-06 01:15:24 UTC (rev 70) @@ -0,0 +1,7 @@ +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="WorkOrder.aspx.cs" Inherits="WorkOrder" Title="Untitled Page" %> +<asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> +</asp:Content> +<asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" Runat="Server"> +</asp:Content> Added: Website/WorkOrder.aspx.cs =================================================================== --- Website/WorkOrder.aspx.cs (rev 0) +++ Website/WorkOrder.aspx.cs 2006-07-06 01:15:24 UTC (rev 70) @@ -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 WorkOrder : System.Web.UI.Page +{ + protected void Page_Load(object sender, EventArgs e) + { + + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <m_h...@us...> - 2006-07-06 01:22:16
|
Revision: 72 Author: m_hildebrand Date: 2006-07-05 18:22:11 -0700 (Wed, 05 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=72&view=rev Log Message: ----------- Moved legalese files to Legal folder Added Paths: ----------- Website/Legal/ Website/Legal/eula.rtf Website/Legal/readme.txt Removed Paths: ------------- Website/eula.rtf Website/readme.txt Copied: Website/Legal/eula.rtf (from rev 71, Website/eula.rtf) =================================================================== --- Website/Legal/eula.rtf (rev 0) +++ Website/Legal/eula.rtf 2006-07-06 01:22:11 UTC (rev 72) @@ -0,0 +1,593 @@ +{\rtf1\ansi\ansicpg1252\uc1\deff37\stshfdbch11\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe2052{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman{\*\falt Times};} +{\f2\fmodern\fcharset0\fprq1{\*\panose 02070309020205020404}Courier New{\*\falt Arial};}{\f3\froman\fcharset2\fprq2{\*\panose 05050102010706020507}Symbol{\*\falt Bookshelf Symbol 3};} +{\f10\fnil\fcharset2\fprq2{\*\panose 05000000000000000000}Wingdings{\*\falt Symbol};}{\f11\froman\fcharset128\fprq1{\*\panose 02020609040205080304}MS Mincho{\*\falt ?l?r ??\'81\'66c};} +{\f37\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Tahoma{\*\falt ?l?r ??u!??I};}{\f41\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Verdana{\*\falt Tahoma};} +{\f43\fswiss\fcharset0\fprq2{\*\panose 020b0603020202020204}Trebuchet MS{\*\falt Arial};}{\f211\froman\fcharset128\fprq1{\*\panose 00000000000000000000}@MS Mincho{\*\falt @MS Gothic};}{\f212\froman\fcharset238\fprq2 Times New Roman CE{\*\falt Times};} +{\f213\froman\fcharset204\fprq2 Times New Roman Cyr{\*\falt Times};}{\f215\froman\fcharset161\fprq2 Times New Roman Greek{\*\falt Times};}{\f216\froman\fcharset162\fprq2 Times New Roman Tur{\*\falt Times};} +{\f217\froman\fcharset177\fprq2 Times New Roman (Hebrew){\*\falt Times};}{\f218\froman\fcharset178\fprq2 Times New Roman (Arabic){\*\falt Times};}{\f219\froman\fcharset186\fprq2 Times New Roman Baltic{\*\falt Times};} +{\f220\froman\fcharset163\fprq2 Times New Roman (Vietnamese){\*\falt Times};}{\f232\fmodern\fcharset238\fprq1 Courier New CE{\*\falt Arial};}{\f233\fmodern\fcharset204\fprq1 Courier New Cyr{\*\falt Arial};} +{\f235\fmodern\fcharset161\fprq1 Courier New Greek{\*\falt Arial};}{\f236\fmodern\fcharset162\fprq1 Courier New Tur{\*\falt Arial};}{\f237\fmodern\fcharset177\fprq1 Courier New (Hebrew){\*\falt Arial};} +{\f238\fmodern\fcharset178\fprq1 Courier New (Arabic){\*\falt Arial};}{\f239\fmodern\fcharset186\fprq1 Courier New Baltic{\*\falt Arial};}{\f240\fmodern\fcharset163\fprq1 Courier New (Vietnamese){\*\falt Arial};} +{\f582\fswiss\fcharset238\fprq2 Tahoma CE{\*\falt ?l?r ??u!??I};}{\f583\fswiss\fcharset204\fprq2 Tahoma Cyr{\*\falt ?l?r ??u!??I};}{\f585\fswiss\fcharset161\fprq2 Tahoma Greek{\*\falt ?l?r ??u!??I};} +{\f586\fswiss\fcharset162\fprq2 Tahoma Tur{\*\falt ?l?r ??u!??I};}{\f587\fswiss\fcharset177\fprq2 Tahoma (Hebrew){\*\falt ?l?r ??u!??I};}{\f588\fswiss\fcharset178\fprq2 Tahoma (Arabic){\*\falt ?l?r ??u!??I};} +{\f589\fswiss\fcharset186\fprq2 Tahoma Baltic{\*\falt ?l?r ??u!??I};}{\f590\fswiss\fcharset163\fprq2 Tahoma (Vietnamese){\*\falt ?l?r ??u!??I};}{\f591\fswiss\fcharset222\fprq2 Tahoma (Thai){\*\falt ?l?r ??u!??I};} +{\f622\fswiss\fcharset238\fprq2 Verdana CE{\*\falt Tahoma};}{\f623\fswiss\fcharset204\fprq2 Verdana Cyr{\*\falt Tahoma};}{\f625\fswiss\fcharset161\fprq2 Verdana Greek{\*\falt Tahoma};}{\f626\fswiss\fcharset162\fprq2 Verdana Tur{\*\falt Tahoma};} +{\f629\fswiss\fcharset186\fprq2 Verdana Baltic{\*\falt Tahoma};}{\f630\fswiss\fcharset163\fprq2 Verdana (Vietnamese){\*\falt Tahoma};}{\f642\fswiss\fcharset238\fprq2 Trebuchet MS CE{\*\falt Arial};} +{\f643\fswiss\fcharset204\fprq2 Trebuchet MS Cyr{\*\falt Arial};}{\f645\fswiss\fcharset161\fprq2 Trebuchet MS Greek{\*\falt Arial};}{\f646\fswiss\fcharset162\fprq2 Trebuchet MS Tur{\*\falt Arial};} +{\f649\fswiss\fcharset186\fprq2 Trebuchet MS Baltic{\*\falt Arial};}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0; +\red255\green255\blue255;\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{ +\ql \li0\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \snext0 \sautoupd Normal;}{\s1\ql \fi-357\li357\ri0\sb120\sa120\widctlpar +\jclisttab\tx360\aspalpha\aspnum\faauto\ls17\outlinelevel0\adjustright\rin0\lin357\itap0 \b\fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext1 heading 1;}{\s2\ql \fi-363\li720\ri0\sb120\sa120\widctlpar +\jclisttab\tx720\aspalpha\aspnum\faauto\ls17\ilvl1\outlinelevel1\adjustright\rin0\lin720\itap0 \b\fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext2 heading 2;}{ +\s3\ql \fi-357\li1077\ri0\sb120\sa120\widctlpar\tx1077\jclisttab\tx1440\aspalpha\aspnum\faauto\ls17\ilvl2\outlinelevel2\adjustright\rin0\lin1077\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext3 +heading 3;}{\s4\ql \fi-358\li1435\ri0\sb120\sa120\widctlpar\jclisttab\tx1437\aspalpha\aspnum\faauto\ls17\ilvl3\outlinelevel3\adjustright\rin0\lin1435\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 +\sbasedon0 \snext4 heading 4;}{\s5\ql \fi-357\li1792\ri0\sb120\sa120\widctlpar\tx1792\jclisttab\tx2155\aspalpha\aspnum\faauto\ls17\ilvl4\outlinelevel4\adjustright\rin0\lin1792\itap0 +\fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext5 heading 5;}{\s6\ql \fi-357\li2149\ri0\sb120\sa120\widctlpar +\jclisttab\tx2152\aspalpha\aspnum\faauto\ls17\ilvl5\outlinelevel5\adjustright\rin0\lin2149\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext6 heading 6;}{ +\s7\ql \fi-357\li2506\ri0\sb120\sa120\widctlpar\jclisttab\tx2509\aspalpha\aspnum\faauto\ls17\ilvl6\outlinelevel6\adjustright\rin0\lin2506\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext7 +heading 7;}{\s8\ql \fi-357\li2863\ri0\sb120\sa120\widctlpar\jclisttab\tx2866\aspalpha\aspnum\faauto\ls17\ilvl7\outlinelevel7\adjustright\rin0\lin2863\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 +\sbasedon0 \snext8 heading 8;}{\s9\ql \fi-358\li3221\ri0\sb120\sa120\widctlpar\jclisttab\tx3223\aspalpha\aspnum\faauto\ls17\ilvl8\outlinelevel8\adjustright\rin0\lin3221\itap0 +\fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext9 heading 9;}{\*\cs10 \additive \slink68 \slocked \ssemihidden Default Paragraph Font;}{\* +\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv +\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\loch\f0\hich\af0\dbch\af11\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}{ +\s15\ql \li357\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin357\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext15 Body 1;}{ +\s16\ql \li720\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext16 Body 2;}{ +\s17\ql \li1077\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1077\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext17 Body 3;}{ +\s18\ql \li1435\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1435\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext18 Body 4;}{ +\s19\ql \li1803\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1803\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext19 Body 5;}{ +\s20\ql \li2160\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin2160\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext20 Body 6;}{ +\s21\ql \li2506\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin2506\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext21 Body 7;}{ +\s22\ql \li2863\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin2863\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext22 Body 8;}{ +\s23\ql \li3221\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin3221\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext23 Body 9;}{ +\s24\ql \fi-357\li357\ri0\sb120\sa120\widctlpar\jclisttab\tx360\aspalpha\aspnum\faauto\ls1\adjustright\rin0\lin357\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext24 Bullet 1;}{ +\s25\ql \fi-363\li720\ri0\sb120\sa120\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls2\adjustright\rin0\lin720\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext25 Bullet 2;}{ +\s26\ql \fi-357\li1077\ri0\sb120\sa120\widctlpar\jclisttab\tx1080\aspalpha\aspnum\faauto\ls3\adjustright\rin0\lin1077\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext26 Bullet 3;}{ +\s27\ql \fi-358\li1435\ri0\sb120\sa120\widctlpar\jclisttab\tx1437\aspalpha\aspnum\faauto\ls4\adjustright\rin0\lin1435\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext27 Bullet 4;}{ +\s28\ql \fi-357\li1792\ri0\sb120\sa120\widctlpar\jclisttab\tx1795\aspalpha\aspnum\faauto\ls5\adjustright\rin0\lin1792\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext28 Bullet 5;}{ +\s29\ql \fi-357\li2149\ri0\sb120\sa120\widctlpar\jclisttab\tx2152\aspalpha\aspnum\faauto\ls6\adjustright\rin0\lin2149\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext29 Bullet 6;}{ +\s30\ql \fi-357\li2506\ri0\sb120\sa120\widctlpar\jclisttab\tx2509\aspalpha\aspnum\faauto\ls7\adjustright\rin0\lin2506\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext30 Bullet 7;}{ +\s31\ql \fi-357\li2863\ri0\sb120\sa120\widctlpar\jclisttab\tx2866\aspalpha\aspnum\faauto\ls8\adjustright\rin0\lin2863\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext31 Bullet 8;}{ +\s32\ql \fi-358\li3221\ri0\sb120\sa120\widctlpar\jclisttab\tx3223\aspalpha\aspnum\faauto\ls9\adjustright\rin0\lin3221\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon23 \snext32 Bullet 9;}{ +\s33\ql \li0\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \b\fs28\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 Heading EULA;}{\s34\ql \li0\ri0\sb120\sa120\widctlpar\brdrb +\brdrs\brdrw10\brsp20 \aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \b\fs28\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 Heading Software Title;}{ +\s35\ql \li0\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \b\fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext35 Preamble;}{\s36\ql \li0\ri0\sb120\sa120\widctlpar\brdrb +\brdrs\brdrw10\brsp20 \aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \b\fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext1 Preamble Border;}{ +\s37\qc \li0\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \b\fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext37 Heading Warranty;}{ +\s38\ql \fi-360\li360\ri0\sb120\sa120\widctlpar\jclisttab\tx360\aspalpha\aspnum\faauto\ls11\outlinelevel0\adjustright\rin0\lin360\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext0 +Heading 1 Warranty;}{\s39\ql \fi-360\li720\ri0\sb120\sa120\widctlpar\jclisttab\tx720\aspalpha\aspnum\faauto\ls11\ilvl1\outlinelevel1\adjustright\rin0\lin720\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 +\sbasedon0 \snext0 Heading 2 Warranty;}{\s40\ql \fi-357\li1077\ri0\sb120\sa120\widctlpar\tx1077\jclisttab\tx1440\aspalpha\aspnum\faauto\ls10\ilvl2\outlinelevel2\adjustright\rin0\lin1077\itap0 +\b\fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon3 \snext40 Heading 3 Bold;}{\s41\ql \fi-358\li1435\ri0\sb120\sa120\widctlpar\jclisttab\tx1437\aspalpha\aspnum\faauto\ls4\adjustright\rin0\lin1435\itap0 +\fs19\ul\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon27 \snext41 Bullet 4 Underline;}{\s42\ql \li0\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 +\fs19\ul\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon26 \snext42 Bullet 3 Underline;}{\*\cs43 \additive \b\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\langnp1033\langfenp1033 \sbasedon10 \slocked +Heading 2 Char;}{\s44\ql \li720\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin720\itap0 \fs19\ul\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon16 \snext44 Body 2 Underline;}{ +\s45\ql \li1077\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin1077\itap0 \fs19\ul\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon17 \snext45 Body 3 Underline;}{ +\s46\ql \li0\ri0\sb120\sa120\sl480\slmult1\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext46 Body Text 2;}{ +\s47\ql \fi-358\li1435\ri0\sb120\sa120\widctlpar\jclisttab\tx1437\aspalpha\aspnum\faauto\ls4\adjustright\rin0\lin1435\itap0 \i\fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon27 \snext47 Bullet 4 Italics;}{\* +\cs48 \additive \f37\lang1033\langfe1033\langnp1033\langfenp1033 \sbasedon10 \slocked Body 2 Char;}{\*\cs49 \additive \f37\lang1033\langfe1033\langnp1033\langfenp1033 \sbasedon10 \slocked Body 3 Char;}{\*\cs50 \additive +\f37\lang1033\langfe1033\langnp1033\langfenp1033 \sbasedon10 \slocked Body 4 Char;}{\*\cs51 \additive \f37\lang1033\langfe1033\langnp1033\langfenp1033 \sbasedon10 \slocked Body 1 Char;}{\s52\ql \li0\ri0\sb120\sa120\widctlpar\brdrt\brdrs\brdrw10\brsp20 +\aspalpha\aspnum\faauto\adjustright\rin0\lin0\rtlgutter\itap0 \b\fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon35 \snext52 Preamble Border Above;}{ +\s53\ql \li0\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext53 \ssemihidden footnote text;}{\*\cs54 \additive \super +\sbasedon10 \ssemihidden footnote reference;}{\s55\ql \li0\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext55 \ssemihidden +endnote text;}{\*\cs56 \additive \super \sbasedon10 \ssemihidden endnote reference;}{\s57\ql \li0\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 +\fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext57 \ssemihidden annotation text;}{\*\cs58 \additive \fs16 \sbasedon10 \ssemihidden annotation reference;}{\s59\ql \li0\ri0\sa160\sl-240\slmult0 +\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext59 Char;}{\s60\ql \li0\ri0\sa160\sl-240\slmult0 +\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext60 Char Char Char Char;}{\*\cs61 \additive \ul\cf2 \sbasedon10 Hyperlink;}{ +\s62\ql \li0\ri0\sb120\sa120\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs16\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext62 \ssemihidden Balloon Text;}{\*\cs63 \additive +\b\f43\lang1033\langfe1033\langnp1033\langfenp1033 \sbasedon10 Heading 2 Char1;}{\*\cs64 \additive \sbasedon10 page number;}{\s65\ql \li0\ri0\sa160\sl-240\slmult0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 +\fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext65 Char Char Char Char1;}{\s66\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 +\b\fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \snext0 \styrsid8999754 Body 0 Bold;}{\s67\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 +\fs19\lang1033\langfe1033\loch\f37\hich\af37\dbch\af11\cgrid\langnp1033\langfenp1033 \snext0 \styrsid8999754 Body 0;}{\s68\ql \li0\ri0\sa160\sl-240\slmult0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 +\fs20\lang1033\langfe1033\loch\f41\hich\af41\dbch\af11\cgrid\langnp1033\langfenp1033 \sbasedon0 \snext68 \slink10 \styrsid10356816 Default Paragraph Font Para Char;}}{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\listtable{\list\listtemplateid176468498 +\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid692200086\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \s32\fi-358\li3221\jclisttab\tx3223\lin3221 }{\listlevel +\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0 +\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0 +\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0 +\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext +\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689 +\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;} +\f2\fbias0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li6480 +\jclisttab\tx6480\lin6480 }{\listname ;}\listid196815738}{\list\listtemplateid-699924060{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\b\i0\f43\fs20\fbias0 +\fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\'01\u-3913 ?;}{\levelnumbers;}\b\i0\f3\fs20\fbias0 \fi-360\li717\jclisttab\tx717\lin717 } +{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\b\i0\f37\fs20\fbias0 \fi-357\li1077\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3\leveljc0 +\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\b0\i0\strike0\f43\fs20\ulnone\fbias0 \fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc1\levelnfcn1\leveljc0\leveljcn0\levelfollow0 +\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\b0\i0\strike0\f43\fs20\ulnone\fbias0 \fi-357\li1792\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0 +\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\b0\i0\f43\fs20\fbias0 \fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext +\'02\'06.;}{\levelnumbers\'01;}\b0\i0\f43\fs20\fbias0 \fi-357\li2506\jclisttab\tx2509\lin2506 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;} +\b0\i0\f43\fs20\fbias0 \fi-357\li2863\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\b0\i0\f43\fs20\fbias0 \fi-358\li3221 +\jclisttab\tx3223\lin3221 }{\listname ;}\listid320961430}{\list\listtemplateid-1793664660{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\b\i0\fbias0 \s38 +\fi-360\li360\jclisttab\tx360\lin360 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\b\i0\fbias0 \s39\fi-360\li720\jclisttab\tx720\lin720 }{\listlevel +\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02);}{\levelnumbers\'01;}\fbias0 \fi-360\li1080\jclisttab\tx1080\lin1080 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0 +\levelstartat1\levelspace0\levelindent0{\leveltext\'03(\'03);}{\levelnumbers\'02;}\fbias0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext +\'03(\'04);}{\levelnumbers\'02;}\fbias0 \fi-360\li1800\jclisttab\tx1800\lin1800 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'03(\'05);}{\levelnumbers\'02;}\fbias0 \fi-360\li2160 +\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\fbias0 \fi-360\li2520\jclisttab\tx2520\lin2520 }{\listlevel\levelnfc4\levelnfcn4 +\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'07.;}{\levelnumbers\'01;}\fbias0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0 +\levelindent0{\leveltext\'02\'08.;}{\levelnumbers\'01;}\fbias0 \fi-360\li3240\jclisttab\tx3240\lin3240 }{\listname ;}\listid394402059}{\list\listtemplateid1928476992{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0 +\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\b\i0\f43\fs20\fbias0 \fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers +\'01;}\b\i0\f43\fs20\fbias0 \fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\b\i0\f37\fs20\fbias0 \s40\fi-357\li1077 +\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\b0\i0\strike0\f43\fs20\ulnone\fbias0 \fi-358\li1435\jclisttab\tx1437\lin1435 } +{\listlevel\levelnfc1\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\b0\i0\strike0\f43\fs20\ulnone\fbias0 \fi-357\li1792\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0 +\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\b0\i0\f43\fs20\fbias0 \fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0 +\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\b0\i0\f43\fs20\fbias0 \fi-357\li2506\jclisttab\tx2509\lin2506 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0 +{\leveltext\'02i.;}{\levelnumbers;}\b0\i0\f43\fs20\fbias0 \fi-357\li2863\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;} +\b0\i0\f43\fs20\fbias0 \fi-358\li3221\jclisttab\tx3223\lin3221 }{\listname ;}\listid398796681}{\list\listtemplateid789093748\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext +\leveltemplateid-317712510\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \s25\fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691 +\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;} +\f10\fbias0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li2880 +\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel +\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23 +\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0 +\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0 +{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid477573462}{\list\listtemplateid190114934\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0 +\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li1077\jclisttab\tx1077\lin1077 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1 +\levelspace360\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li1797\jclisttab\tx1797\lin1797 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext +\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li2517\jclisttab\tx2517\lin2517 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid67698689 +\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li3237\jclisttab\tx3237\lin3237 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;} +\f2\fbias0 \fi-360\li3957\jclisttab\tx3957\lin3957 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li4677 +\jclisttab\tx4677\lin4677 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li5397\jclisttab\tx5397\lin5397 } +{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li6117\jclisttab\tx6117\lin6117 }{\listlevel\levelnfc23\levelnfcn23 +\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li6837\jclisttab\tx6837\lin6837 }{\listname ;}\listid509564613}{\list\listtemplateid1948578256 +{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\b\i0\f43\fs20\fbias0 \fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0 +\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\b\i0\fs20\fbias0 \fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0 +\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\b0\i0\f43\fs20\fbias0 \fi-357\li1077\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext +\'02\'03.;}{\levelnumbers\'01;}\b0\i0\strike0\f43\fs20\ulnone\fbias0 \fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc1\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;} +\b0\i0\strike0\f43\fs20\ulnone\fbias0 \fi-357\li1792\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\b0\i0\f43\fs20\fbias0 +\fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\b0\i0\f43\fs20\fbias0 \fi-357\li2506\jclisttab\tx2509\lin2506 } +{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\b0\i0\f43\fs20\fbias0 \fi-357\li2863\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0 +\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\b0\i0\f43\fs20\fbias0 \fi-358\li3221\jclisttab\tx3223\lin3221 }{\listname ;}\listid630479929}{\list\listtemplateid67698717{\listlevel\levelnfc0\levelnfcn0 +\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00);}{\levelnumbers\'01;}\fi-360\li360\jclisttab\tx360\lin360 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0 +{\leveltext\'02\'01);}{\levelnumbers\'01;}\fi-360\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02);}{\levelnumbers\'01;}\fi-360\li1080 +\jclisttab\tx1080\lin1080 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'03(\'03);}{\levelnumbers\'02;}\fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc4\levelnfcn4\leveljc0 +\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'03(\'04);}{\levelnumbers\'02;}\fi-360\li1800\jclisttab\tx1800\lin1800 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0 +{\leveltext\'03(\'05);}{\levelnumbers\'02;}\fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\fi-360\li2520 +\jclisttab\tx2520\lin2520 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'07.;}{\levelnumbers\'01;}\fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc2\levelnfcn2\leveljc0 +\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'08.;}{\levelnumbers\'01;}\fi-360\li3240\jclisttab\tx3240\lin3240 }{\listname ;}\listid700712945}{\list\listtemplateid680715664{\listlevel\levelnfc0\levelnfcn0\leveljc0 +\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\b\i0\f43\fs20\fbias0 \s1\fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1 +\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\b\i0\f43\fs20\fbias0 \s2\fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext +\'02\'02.;}{\levelnumbers\'01;}\b\i0\f37\fs20\fbias0 \s3\fi-357\li1077\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;} +\b0\i0\strike0\f43\fs20\ulnone\fbias0 \s4\fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc1\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;} +\b0\i0\strike0\f43\fs20\ulnone\fbias0 \s5\fi-357\li1792\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\b0\i0\f43\fs20\fbias0 \s6 +\fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\b0\i0\f43\fs20\fbias0 \s7\fi-357\li2506\jclisttab\tx2509\lin2506 } +{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\b0\i0\f43\fs20\fbias0 \s8\fi-357\li2863\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0 +\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\b0\i0\f43\fs20\fbias0 \s9\fi-358\li3221\jclisttab\tx3223\lin3221 }{\listname ;}\listid752163927}{\list\listtemplateid2088029282{\listlevel\levelnfc0 +\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\b\i0\f43\fs20\fbias0 \fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0 +\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\b\i0\f43\fs20\fbias0 \fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc2\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext +\'02\'02.;}{\levelnumbers\'01;}\b\i0\f37\fs20\fbias0 \fi-357\li1077\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;} +\b0\i0\strike0\f43\fs20\ulnone\fbias0 \fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc1\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;} +\b0\i0\strike0\f43\fs20\ulnone\fbias0 \fi-357\li1792\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'05.;}{\levelnumbers\'01;}\b0\i0\f43\fs20\fbias0 +\fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;}\b0\i0\f43\fs20\fbias0 \fi-357\li2506\jclisttab\tx2509\lin2506 } +{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\b0\i0\f43\fs20\fbias0 \fi-357\li2863\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0 +\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\b0\i0\f43\fs20\fbias0 \fi-358\li3221\jclisttab\tx3223\lin3221 }{\listname ;}\listid800729109}{\list\listtemplateid-296591990\listhybrid{\listlevel\levelnfc23 +\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid-48305026\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \s31\fi-357\li2863\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc23\levelnfcn23\leveljc0 +\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1 +\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0 +{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext +\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693 +\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;} +\f3\fbias0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li5760 +\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li6480\jclisttab\tx6480\lin6480 } +{\listname ;}\listid810947713}{\list\listtemplateid1567531878{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\b\i0\f43\fs20\fbias0 \fi-357\li357 +\jclisttab\tx360\lin357 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\b\i0\f43\fs20\fbias0 \fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc2 +\levelnfcn2\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\b0\i0\f43\fs20\fbias0 \fi-357\li1077\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0\levelfollow0 +\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\b0\i0\strike0\f43\fs20\ulnone\fbias0 \fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc1\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0 +\levelindent0{\leveltext\'02\'04.;}{\levelnumbers\'01;}\b0\i0\strike0\f43\fs20\ulnone\fbias0 \fi-357\li1792\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext +\'02\'05.;}{\levelnumbers\'01;}\b0\i0\f43\fs20\fbias0 \fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;} +\b0\i0\f43\fs20\fbias0 \fi-357\li2506\jclisttab\tx2509\lin2506 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\b0\i0\f43\fs20\fbias0 \fi-357\li2863 +\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\b0\i0\f43\fs20\fbias0 \fi-358\li3221\jclisttab\tx3223\lin3221 }{\listname +;}\listid826823576}{\list\listtemplateid2088029282{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'00.;}{\levelnumbers\'01;}\b\i0\f43\fs20\fbias0 \fi-357\li357\jclisttab\tx360\lin357 } +{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'01.;}{\levelnumbers\'01;}\b\i0\f43\fs20\fbias0 \fi-363\li720\jclisttab\tx720\lin720 }{\listlevel\levelnfc2\levelnfcn2\leveljc0 +\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'02.;}{\levelnumbers\'01;}\b\i0\f37\fs20\fbias0 \fi-357\li1077\jclisttab\tx1440\lin1077 }{\listlevel\levelnfc3\levelnfcn3\leveljc0\leveljcn0\levelfollow0\levelstartat1 +\levelspace0\levelindent0{\leveltext\'02\'03.;}{\levelnumbers\'01;}\b0\i0\strike0\f43\fs20\ulnone\fbias0 \fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc1\levelnfcn1\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0 +{\leveltext\'02\'04.;}{\levelnumbers\'01;}\b0\i0\strike0\f43\fs20\ulnone\fbias0 \fi-357\li1792\jclisttab\tx2155\lin1792 }{\listlevel\levelnfc0\levelnfcn0\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext +\'02\'05.;}{\levelnumbers\'01;}\b0\i0\f43\fs20\fbias0 \fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc4\levelnfcn4\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02\'06.;}{\levelnumbers\'01;} +\b0\i0\f43\fs20\fbias0 \fi-357\li2506\jclisttab\tx2509\lin2506 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02i.;}{\levelnumbers;}\b0\i0\f43\fs20\fbias0 \fi-357\li2863 +\jclisttab\tx2866\lin2863 }{\listlevel\levelnfc255\levelnfcn255\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\'02A.;}{\levelnumbers;}\b0\i0\f43\fs20\fbias0 \fi-358\li3221\jclisttab\tx3223\lin3221 }{\listname +;}\listid974869818}{\list\listtemplateid-1813845996\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid2033377338\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \s30 +\fi-357\li2506\jclisttab\tx2509\lin2506 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li1440\jclisttab\tx1440\lin1440 +}{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23 +\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0 +\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0 +\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext +\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691 +\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;} +\f10\fbias0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1219436735}{\list\listtemplateid-41362566\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext +\leveltemplateid-1175557160\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \s27\fi-358\li1435\jclisttab\tx1437\lin1435 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691 +\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;} +\f10\fbias0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li2880 +\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel +\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23 +\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0 +\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0 +{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1559511898}{\list\listtemplateid-743794326\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0 +\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid1229593488\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \s26\fi-357\li1077\jclisttab\tx1080\lin1077 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0 +\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0 +{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext +\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691 +\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;} +\f10\fbias0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li5040 +\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel +\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1567649130} +{\list\listtemplateid1363474438\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace1077\levelindent0{\leveltext\leveltemplateid1637229796\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \s28\fi-357\li1792 +\jclisttab\tx1795\lin1792 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace1077\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li1440\jclisttab\tx1440\lin1440 } +{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace1077\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23 +\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace1077\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0 +\leveljcn0\levelfollow0\levelstartat1\levelspace1077\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1 +\levelspace1077\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace1077\levelindent0 +{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace1077\levelindent0{\leveltext +\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace1077\levelindent0{\leveltext\leveltemplateid67698693 +\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1848404271}{\list\listtemplateid-1802592190\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0 +\levelindent0{\leveltext\leveltemplateid961321180\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \s29\fi-357\li2149\jclisttab\tx2152\lin2149 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext +\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693 +\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;} +\f3\fbias0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li3600 +\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li4320\jclisttab\tx4320\lin4320 } +{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23 +\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li5760\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0 +\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li6480\jclisttab\tx6480\lin6480 }{\listname ;}\listid1877695764}{\list\listtemplateid1186249844\listhybrid{\listlevel +\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid1182702444\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \s24\fi-357\li357\jclisttab\tx360\lin357 }{\listlevel\levelnfc23\levelnfcn23 +\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li1440\jclisttab\tx1440\lin1440 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0 +\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li2160\jclisttab\tx2160\lin2160 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0 +\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;}\f3\fbias0 \fi-360\li2880\jclisttab\tx2880\lin2880 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext +\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li3600\jclisttab\tx3600\lin3600 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693 +\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li4320\jclisttab\tx4320\lin4320 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698689\'01\u-3913 ?;}{\levelnumbers;} +\f3\fbias0 \fi-360\li5040\jclisttab\tx5040\lin5040 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698691\'01o;}{\levelnumbers;}\f2\fbias0 \fi-360\li5760 +\jclisttab\tx5760\lin5760 }{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace0\levelindent0{\leveltext\leveltemplateid67698693\'01\u-3929 ?;}{\levelnumbers;}\f10\fbias0 \fi-360\li6480\jclisttab\tx6480\lin6480 } +{\listname ;}\listid2054619191}}{\*\listoverridetable{\listoverride\listid2054619191\listoverridecount0\ls1}{\listoverride\listid477573462\listoverridecount0\ls2}{\listoverride\listid1567649130\listoverridecount0\ls3}{\listoverride\listid1559511898 +\listoverridecount0\ls4}{\listoverride\listid1848404271\listoverridecount0\ls5}{\listoverride\listid1877695764\listoverridecount0\ls6}{\listoverride\listid1219436735\listoverridecount0\ls7}{\listoverride\listid810947713\listoverridecount0\ls8} +{\listoverride\listid196815738\listoverridecount0\ls9}{\listoverride\listid398796681\listoverridecount0\ls10}{\listoverride\listid394402059\listoverridecount0\ls11}{\listoverride\listid700712945\listoverridecount0\ls12}{\listoverride\listid826823576 +\listoverridecount0\ls13}{\listoverride\listid630479929\listoverridecount0\ls14}{\listoverride\listid800729109\listoverridecount0\ls15}{\listoverride\listid974869818\listoverridecount0\ls16}{\listoverride\listid752163927\listoverridecount0\ls17} +{\listoverride\listid320961430\listoverridecount0\ls18}{\listoverride\listid509564613\listoverridecount0\ls19}}{\*\rsidtbl \rsid17701\rsid81130\rsid340347\rsid345491\rsid480810\rsid535495\rsid555183\rsid787759\rsid1012355\rsid1122066\rsid1528414 +\rsid1589072\rsid1725164\rsid1845488\rsid1977600\rsid2784514\rsid2950031\rsid3042060\rsid3082212\rsid3162620\rsid3370445\rsid3416253\rsid3611186\rsid3739474\rsid3895692\rsid4022155\rsid4739523\rsid4865423\rsid4995346\rsid5185544\rsid5459775\rsid5536377 +\rsid5733284\rsid6184270\rsid6306623\rsid6498245\rsid6758513\rsid7041369\rsid7226971\rsid7276367\rsid7290457\rsid7345747\rsid7425099\rsid7433926\rsid7438204\rsid7619174\rsid7692510\rsid7878867\rsid7996763\rsid8134375\rsid8324055\rsid8325040\rsid8419363 +\rsid8458805\rsid8738620\rsid8812012\rsid8858237\rsid8999754\rsid9068683\rsid9321702\rsid9378228\rsid9380242\rsid9651656\rsid9857610\rsid9860938\rsid9964378\rsid10356816\rsid10813938\rsid10975197\rsid11347136\rsid11541952\rsid11558388\rsid11754382 +\rsid11874088\rsid12000207\rsid12000701\rsid12209854\rsid12542098\rsid12585274\rsid12596065\rsid12664082\rsid13334496\rsid13505730\rsid13637289\rsid13908819\rsid14113253\rsid14168694\rsid14293847\rsid14491415\rsid14504489\rsid14705568\rsid14894057 +\rsid14897950\rsid14943232\rsid15493712\rsid15601712\rsid15872081\rsid15925451\rsid15991509\rsid15999285\rsid16141742\rsid16395859\rsid16450365\rsid16661796\rsid16712132}{\*\generator Microsoft Word 11.0.6568;}{\info +{\title MICROSOFT [PRE-RELEASE ][EVALUATION ]SOFTWARE LICENSE TERMS}{\creatim\yr2006\mo4\dy6\hr11\min24}{\revtim\yr2006\mo4\dy6\hr11\min25}{\printim\yr2006\mo2\dy10\hr10\min10}{\version3}{\edmins4}{\nofpages3}{\nofwords1277}{\nofchars7279} +{\nofcharsws8539}{\vern24579}}{\*\userprops {\propname db_build_version}\proptype30{\staticval 2.6}{\propname db_charger_document_reference}\proptype3{\staticval 4582}{\propname db_charger_client_name}\proptype30{\staticval tbc}{\propname db_charger_matte +r_number}\proptype30{\staticval tbc}{\propname autosave}\proptype30{\staticval false}{\propname owner}\proptype30{\staticval REDMOND\'5cdcorey}{\propname db_master_reference}\proptype30{\staticval USETERMS_OTHERSUPER_ENGLISH}{\propname db_master_version} +\proptype30{\staticval 20060202}{\propname db_master_clock}\proptype3{\staticval 337}{\propname db_master_name}\proptype30{\staticval List of Beta, Evaluation or Standalone Software License Terms Languages}{\propname db_master_description}\proptype30 +{\staticval }{\propname db_base_url}\proptype30{\staticval http://usetermassembly/dealbuilder_live/DealBuilderNET/dealbuilder.aspx}{\propname ProductVersion}\proptype30{\staticval 0}{\propname MScom}\proptype11{\staticval 0}{\propname Language} +\proptype30{\staticval English}{\propname CanadaAvail}\proptype11{\staticval 1}{\propname CanadaFrench}\proptype11{\staticval 0}{\propname FileFormat}\proptype11{\staticval 0}{\propname MandatoryActivation}\proptype11{\staticval 0}{\propname SoftwareType} +\proptype30{\staticval Beta Software}{\propname ProductName}\proptype30{\staticval ASP.NET Code-N... [truncated message content] |
|
From: <m_h...@us...> - 2006-07-06 19:45:13
|
Revision: 76 Author: m_hildebrand Date: 2006-07-06 12:44:23 -0700 (Thu, 06 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=76&view=rev Log Message: ----------- Lots and lots of new stuff, mostly for infrastructure and starting to work on AD/DB authentication Modified Paths: -------------- Website/ActionItem.aspx Website/Administration.aspx Website/App_Themes/Python/python.css Website/Assignments.aspx Website/Default.aspx Website/Execution.aspx Website/PrivacyPolicy.aspx Website/Reports.aspx Website/SiteMap.aspx Website/TCDB.master Website/TestManagement.aspx Website/WorkOrder.aspx Added Paths: ----------- Website/App_Code/ Website/App_Code/TCDB_Constants.cs Website/App_Code/TCDB_Users.cs Website/App_Themes/Python/Images/Header-Background.gif Website/App_Themes/Python/Images/TCDB-2006-Logo-on-Blue.gif Website/Includes/ActionItems.ascx Website/Includes/Assignments.ascx Website/Includes/AssignmentsTree.ascx Website/Includes/Builds.ascx Website/Includes/Execution.ascx Website/Includes/FeatureTree.ascx Website/Includes/Features.ascx Website/Includes/Footer.ascx Website/Includes/Header.ascx Website/Includes/Header_CurrentInfo.ascx Website/Includes/Header_Menu.ascx Website/Includes/Header_User.ascx Website/Includes/Notes.ascx Website/Includes/Objectives.ascx Website/Includes/Platforms.ascx Website/Includes/Products.ascx Website/Includes/Reports.ascx Website/Includes/Tags.ascx Website/Includes/TestCases.ascx Website/Includes/Users.ascx Website/Includes/Versions.ascx Website/Includes/WorkOrders.ascx Website/web.config Removed Paths: ------------- Website/ActionItem.aspx.cs Website/Administration.aspx.cs Website/Assignments.aspx.cs Website/Default.aspx.cs Website/Execution.aspx.cs Website/Includes/TCDB_ActionItems.ascx Website/Includes/TCDB_ActionItems.ascx.cs Website/Includes/TCDB_Assignments.ascx Website/Includes/TCDB_Assignments.ascx.cs Website/Includes/TCDB_AssignmentsTree.ascx Website/Includes/TCDB_AssignmentsTree.ascx.cs Website/Includes/TCDB_Authentication.ascx Website/Includes/TCDB_Authentication.ascx.cs Website/Includes/TCDB_Builds.ascx Website/Includes/TCDB_Builds.ascx.cs Website/Includes/TCDB_Execution.ascx Website/Includes/TCDB_Execution.ascx.cs Website/Includes/TCDB_FeatureTree.ascx Website/Includes/TCDB_FeatureTree.ascx.cs Website/Includes/TCDB_Features.ascx Website/Includes/TCDB_Features.ascx.cs Website/Includes/TCDB_Footer.ascx Website/Includes/TCDB_Footer.ascx.cs Website/Includes/TCDB_Header.ascx Website/Includes/TCDB_Header.ascx.cs Website/Includes/TCDB_Header_CurrentInfo.ascx Website/Includes/TCDB_Header_Menu.ascx Website/Includes/TCDB_Header_User.ascx Website/Includes/TCDB_Notes.ascx Website/Includes/TCDB_Notes.ascx.cs Website/Includes/TCDB_Objectives.ascx Website/Includes/TCDB_Objectives.ascx.cs Website/Includes/TCDB_Platforms.ascx Website/Includes/TCDB_Platforms.ascx.cs Website/Includes/TCDB_Products.ascx Website/Includes/TCDB_Products.ascx.cs Website/Includes/TCDB_Reports.ascx Website/Includes/TCDB_Reports.ascx.cs Website/Includes/TCDB_Tags.ascx Website/Includes/TCDB_Tags.ascx.cs Website/Includes/TCDB_TestCases.ascx Website/Includes/TCDB_TestCases.ascx.cs Website/Includes/TCDB_Users.ascx Website/Includes/TCDB_Users.ascx.cs Website/Includes/TCDB_Versions.ascx Website/Includes/TCDB_Versions.ascx.cs Website/Includes/TCDB_WorkOrders.ascx Website/Includes/TCDB_WorkOrders.ascx.cs Website/PrivacyPolicy.aspx.cs Website/Reports.aspx.cs Website/SiteMap.aspx.cs Website/TCDB.master.cs Website/TestManagement.aspx.cs Website/WorkOrder.aspx.cs Modified: Website/ActionItem.aspx =================================================================== --- Website/ActionItem.aspx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/ActionItem.aspx 2006-07-06 19:44:23 UTC (rev 76) @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="ActionItem.aspx.cs" Inherits="ActionItem" Title="Untitled Page" %> +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" Title="Untitled Page" %> <asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> </asp:Content> <asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> Deleted: Website/ActionItem.aspx.cs =================================================================== --- Website/ActionItem.aspx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/ActionItem.aspx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 ActionItem : System.Web.UI.Page -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Modified: Website/Administration.aspx =================================================================== --- Website/Administration.aspx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Administration.aspx 2006-07-06 19:44:23 UTC (rev 76) @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="Administration.aspx.cs" Inherits="Administration" Title="Untitled Page" %> +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" Title="Untitled Page" %> <asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> </asp:Content> <asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> Deleted: Website/Administration.aspx.cs =================================================================== --- Website/Administration.aspx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Administration.aspx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Administration : System.Web.UI.Page -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Added: Website/App_Code/TCDB_Constants.cs =================================================================== --- Website/App_Code/TCDB_Constants.cs (rev 0) +++ Website/App_Code/TCDB_Constants.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1,21 @@ +using System; +using System.Data; +using System.Configuration; +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; + +namespace TCDB_Constants +{ + /// <summary> + /// Summary description for TCDB_Constant + /// </summary> + public static class TCDB_Constant + { + public static int USER_FAILEDLOGIN = -2; + public static int USER_NOTREGISTERED = -1; + } +} \ No newline at end of file Added: Website/App_Code/TCDB_Users.cs =================================================================== --- Website/App_Code/TCDB_Users.cs (rev 0) +++ Website/App_Code/TCDB_Users.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1,271 @@ +using System; +using System.Data; +using System.DirectoryServices; +using System.Data.SqlClient; +using System.Configuration; +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; +using System.Security; +using TCDB_Constants; +using System.Collections; +using System.Collections.Generic; + + +namespace TCDB_Users +{ + /// <summary> + /// A class containing database interactions for users in the TCDB System + /// TCDB_Users holds all the moethods that interact with the User DB + /// </summary> + public class TCDB_UserDB : Page + { + /// <summary> + /// Attemps to authenticate a user by checking for the user in the database. + /// </summary> + /// <param name="strEmail">The user's email.</param> + /// <param name="strPassword">The user's password.</param> + /// <return> + /// The DefaultValue is returned if nothing happens or an exception is thrown + /// If the user login failed, -2 is returned. + /// If the user is not registered, -1 is returned. + /// Otherwise the user's ID is returned. + /// </return> + /// <value> + /// An <c>int</c> representing the user's ID or DefaultValue if the process fails + /// </value> + public static int TCDB_AuthenticateUser(string strUserName, string strPassword) + { + // TODO: Add logic here to determine and use the appropriate + // authentication method based on configuration data + bool result = false; + DirectoryEntry de = new DirectoryEntry("LDAP://slam", strUserName, strPassword); + DirectorySearcher ds = new DirectorySearcher(de); + ds.SearchScope = SearchScope.OneLevel; + try + { + SearchResult sr = ds.FindOne(); + if (sr != null) result = true; + } + catch + { + result = false; + } + + if (!result) + { + return TCDB_Constant.USER_FAILEDLOGIN; + } + + // TODO: Look up the user ID from the DB now that we have a valid user + // and return the user object + return 0; + + } + } + + /// <summary> + /// A class representing one user object + /// </summary> + public class TCDB_User + { + private int userid; + private string username; + private string email; + private string officePhone; + private string homePhone; + private string firstName; + private string lastName; + private bool automation; + private bool isAuthenticated; + /* TODO: Implement these as the time is right + private List<TCDB_Feature> features; + private List<TCDB_Assignment> assignmentsCreated; + private List<TCDB_Assignment> assignments; + private List<TCDB_Objective> objectives; + private List<TCDB_WorkOrderTemplate> savedWorkOrders; + private TCDB_RightsCollection rights; + private List<TCDB_TestCase> testCasesCreated; + private List<TCDB_TestCase> testCasesEdited; + */ + + /// <summary> + /// Default constructor, returns an anonymous user + /// TODO: Make this information come from the database rather than being hard coded here + /// </summary> + public TCDB_User() + { + userid = 0; + username = "Guest"; + email = ""; + officePhone = ""; + homePhone = ""; + firstName = "Guest"; + lastName = "User"; + automation = false; + isAuthenticated = false; + } + + /// <summary> + /// Load a specific user based on username + /// </summary> + /// <param name="username"></param> + public TCDB_User(string username) + { + // TODO: Write this function + } + + /// <summary> + /// Load a specific user based on id + /// </summary> + /// <param name="id"></param> + public TCDB_User(int id) + { + // TODO: Write this function + } + + public int USERID + { + get { return userid; } + set { userid = value; } + } + + public string USERNAME + { + get { return username; } + set { username = value; } + } + + public string EMAIL + { + get { return email; } + set { email = value; } + } + + public string OFFICEPHONE + { + get { return officePhone; } + set { officePhone = value; } + } + + public string HOMEPHONE + { + get { return homePhone; } + set { homePhone = value; } + } + + public string FIRSTNAME + { + get { return firstName; } + set { firstName = value; } + } + + public string LASTNAME + { + get { return lastName; } + set { lastName = value; } + } + + public string FULLNAME + { + get { return FIRSTNAME + " " + LASTNAME;} + } + + public bool AUTOMATION + { + get { return automation; } + set { automation = value; } + } + + public bool ISAUTHENTICATED + { + get { return isAuthenticated; } + } + } + + public class TCDB_RightsCollection : CollectionBase + { + private List<TCDB_Right> rights; + + public int Count + { + get { return rights.Count; } + } + + public void Clear() + { + rights = new List<TCDB_Right>(); + } + + public bool Equals(Object o) + { + // TODO: Finish this + return false; + } + + public IEnumerator GetEnumerator() + { + // TODO: Finish this + return null; + } + + public int GetHashCode() + { + // TODO: Finish this + return 0; + } + + public Type GetType() + { + // TODO: Finish this + return null; + } + + public void RemoveAt(int index) + { + // TODO: Implement the function + if (index < 0 || index >= rights.Count) + throw new ArgumentOutOfRangeException(index.ToString(), "Index out of range."); + } + + public string ToString() + { + return "System.Object"; + } +/* + protected ArrayList InnerList + { + // TODO: Finish this + get { return new ArrayList(); } + } + + protected IList List + { + get { return rights; } + } + + ~TCDB_RightsCollection() + { + rights = null; + } + + protected TCDB_RightsCollection MemberwiseClone() + { + // TODO: Finish this + return this; + } + +*/ + + } + + public class TCDB_Right + { + public TCDB_Right() + { + } + } +} \ No newline at end of file Added: Website/App_Themes/Python/Images/Header-Background.gif =================================================================== (Binary files differ) Property changes on: Website/App_Themes/Python/Images/Header-Background.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: Website/App_Themes/Python/Images/TCDB-2006-Logo-on-Blue.gif =================================================================== (Binary files differ) Property changes on: Website/App_Themes/Python/Images/TCDB-2006-Logo-on-Blue.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: Website/App_Themes/Python/python.css =================================================================== --- Website/App_Themes/Python/python.css 2006-07-06 19:25:37 UTC (rev 75) +++ Website/App_Themes/Python/python.css 2006-07-06 19:44:23 UTC (rev 76) @@ -12,6 +12,98 @@ font-size: 10pt; } +/********** BEGIN Header Content **********/ +#HeaderContent +{ + background-image: url(images/Header-Background.gif); + background-repeat: repeat-x; + height: 50px; +} + +#HeaderContent A +{ + color: White; +} + +#HeaderContent A:hover, #HeaderContent A:active +{ + color: #FDB928; +} + +#HeaderContent #Logo +{ + background-position: left top; + left: 0px; + background-image: url(Images/TCDB-2006-Logo-on-Blue.gif); + width: 200px; + height: 50px; + background-repeat: no-repeat; + position: absolute; + top: -1px; + left: 5px; +} + +#HeaderContent #MainMenu +{ + text-align: right; + top: 0px; + padding: 5px 10px 2px 0px; + color: White; +} + +#HeaderContent #MainMenu #User +{ + padding-bottom: 6px; +} + +#HeaderContent #MainMenu #CurrentInfo, #HeaderContent #MainMenu #Menu +{ + display: inline; + border-top: solid thin red; + padding-top: 2px; +} + +#HeaderContent #MainMenu #CurrentInfo +{ + padding-right: 30px; +} + +/* Define the login information */ +#User table +{ + display: inline; + margin-top: 15px; + position: relative; + top: 8px; +} + +#User table td +{ + display: inline; +} + +/* Define the username and password box sizes */ +#User #UserName, #User #Password +{ + display: inline; +} + +#UserName input, #Password input +{ + width: 80px; +} + +#User #RememberMe +{ + display: inline; + position: relative; + top: 2px; + left: -4px; +} + +/********** END Header Content **********/ + +/********** BEGIN Footer Content **********/ #FooterContent A { color: White; @@ -51,4 +143,6 @@ * html #FooterContent { margin-top: -1.8em; -} \ No newline at end of file +} + +/********** END Footer Content **********/ \ No newline at end of file Modified: Website/Assignments.aspx =================================================================== --- Website/Assignments.aspx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Assignments.aspx 2006-07-06 19:44:23 UTC (rev 76) @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="Assignments.aspx.cs" Inherits="Assignments" Title="Untitled Page" %> +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" Title="Untitled Page" %> <asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> </asp:Content> <asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> Deleted: Website/Assignments.aspx.cs =================================================================== --- Website/Assignments.aspx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Assignments.aspx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Assignments : System.Web.UI.Page -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Modified: Website/Default.aspx =================================================================== --- Website/Default.aspx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Default.aspx 2006-07-06 19:44:23 UTC (rev 76) @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="Default.aspx.cs" Inherits="_Default" Title="Untitled Page" %> +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" Title="Untitled Page" %> <asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> </asp:Content> <asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> Deleted: Website/Default.aspx.cs =================================================================== --- Website/Default.aspx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Default.aspx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 _Default : System.Web.UI.Page -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Modified: Website/Execution.aspx =================================================================== --- Website/Execution.aspx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Execution.aspx 2006-07-06 19:44:23 UTC (rev 76) @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="Execution.aspx.cs" Inherits="Execution" Title="Untitled Page" %> +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" Title="Untitled Page" %> <asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> </asp:Content> <asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> Deleted: Website/Execution.aspx.cs =================================================================== --- Website/Execution.aspx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Execution.aspx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Execution : System.Web.UI.Page -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Copied: Website/Includes/ActionItems.ascx (from rev 73, Website/Includes/TCDB_ActionItems.ascx) =================================================================== --- Website/Includes/ActionItems.ascx (rev 0) +++ Website/Includes/ActionItems.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> Copied: Website/Includes/Assignments.ascx (from rev 73, Website/Includes/TCDB_Assignments.ascx) =================================================================== --- Website/Includes/Assignments.ascx (rev 0) +++ Website/Includes/Assignments.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> Copied: Website/Includes/AssignmentsTree.ascx (from rev 73, Website/Includes/TCDB_AssignmentsTree.ascx) =================================================================== --- Website/Includes/AssignmentsTree.ascx (rev 0) +++ Website/Includes/AssignmentsTree.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> Copied: Website/Includes/Builds.ascx (from rev 73, Website/Includes/TCDB_Builds.ascx) =================================================================== --- Website/Includes/Builds.ascx (rev 0) +++ Website/Includes/Builds.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> Copied: Website/Includes/Execution.ascx (from rev 73, Website/Includes/TCDB_Execution.ascx) =================================================================== --- Website/Includes/Execution.ascx (rev 0) +++ Website/Includes/Execution.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> Copied: Website/Includes/FeatureTree.ascx (from rev 73, Website/Includes/TCDB_FeatureTree.ascx) =================================================================== --- Website/Includes/FeatureTree.ascx (rev 0) +++ Website/Includes/FeatureTree.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> Copied: Website/Includes/Features.ascx (from rev 73, Website/Includes/TCDB_Features.ascx) =================================================================== --- Website/Includes/Features.ascx (rev 0) +++ Website/Includes/Features.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> Copied: Website/Includes/Footer.ascx (from rev 73, Website/Includes/TCDB_Footer.ascx) =================================================================== --- Website/Includes/Footer.ascx (rev 0) +++ Website/Includes/Footer.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1,2 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> +\xA9 2006 <a href="http://www.quest.com">Quest Software, Inc.</a> | <a href="PrivacyPolicy.aspx">Privacy Policy</a> | <a href="SiteMap.aspx">Site Map</a> Copied: Website/Includes/Header.ascx (from rev 73, Website/Includes/TCDB_Header.ascx) =================================================================== --- Website/Includes/Header.ascx (rev 0) +++ Website/Includes/Header.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1,18 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> +<%@ Register TagPrefix="TCDB" TagName="User" src="~/Includes/Header_User.ascx" %> +<%@ Register TagPrefix="TCDB" TagName="CurrentInfo" src="~/Includes/Header_CurrentInfo.ascx" %> +<%@ Register TagPrefix="TCDB" TagName="Menu" src="~/Includes/Header_Menu.ascx" %> +<div id="Logo"></div> +<div id="MainMenu"> + <div id="User"> + <TCDB:User runat="server" /> + </div> + <% if (Request.IsAuthenticated) { %> + <div id="CurrentInfo"> + <TCDB:CurrentInfo runat="server" /> + </div> + <div id="Menu"> + <TCDB:Menu runat="server" /> + </div> + <% } %> +</div> \ No newline at end of file Copied: Website/Includes/Header_CurrentInfo.ascx (from rev 74, Website/Includes/TCDB_Header_CurrentInfo.ascx) =================================================================== --- Website/Includes/Header_CurrentInfo.ascx (rev 0) +++ Website/Includes/Header_CurrentInfo.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1,2 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> +Product | Version | Build \ No newline at end of file Copied: Website/Includes/Header_Menu.ascx (from rev 74, Website/Includes/TCDB_Header_Menu.ascx) =================================================================== --- Website/Includes/Header_Menu.ascx (rev 0) +++ Website/Includes/Header_Menu.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1,2 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> +Assignments | Execute | Management \ No newline at end of file Copied: Website/Includes/Header_User.ascx (from rev 74, Website/Includes/TCDB_Header_User.ascx) =================================================================== --- Website/Includes/Header_User.ascx (rev 0) +++ Website/Includes/Header_User.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1,35 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> +<%@ Import Namespace="TCDB_Users" %> + +<script runat="server"> + + protected void Login_Click(object sender, EventArgs e) + {/* + if (TCDB_UserDB.TCDB_AuthenticateUser(UserNameControl.Text, PasswordControl.Text) > 0) + { + } + else + { + + }*/ + } +</script> + +<asp:LoginView ID="LoginView1" runat="server"> +<AnonymousTemplate> +<asp:Login ID="Login1" runat="server"> +<LayoutTemplate> + <asp:Label ID="lblMessage" runat="server" Text="" /> + Username: <div id="UserName"><asp:TextBox ID="UserNameControl" runat="server" /></div> + <asp:RequiredFieldValidator ID="UserNameRequired" runat="server" ControlToValidate="UserNameControl" Text="*" /> + Password: <div id="Password"><asp:TextBox ID="PasswordControl" runat="server" TextMode="password" /></div> + <asp:RequiredFieldValidator ID="PasswordRequired" runat="server" ControlToValidate="PasswordControl" Text="*" /> + Remember Me: <div id="RememberMe"><asp:CheckBox ID="RememberMeControl" runat="server" /></div> + <asp:LinkButton ID="Login" CommandName="Login" Text="Login" runat="server" OnClick="Login_Click" /> +</LayoutTemplate> + </asp:Login> +</AnonymousTemplate> +<LoggedInTemplate> +Welcome <asp:LoginName ID="LoginName" runat="server" /> (<asp:LoginStatus ID="LoginStatus" runat="server" />) | Settings | Admin +</LoggedInTemplate> +</asp:LoginView> \ No newline at end of file Copied: Website/Includes/Notes.ascx (from rev 73, Website/Includes/TCDB_Notes.ascx) =================================================================== --- Website/Includes/Notes.ascx (rev 0) +++ Website/Includes/Notes.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> Copied: Website/Includes/Objectives.ascx (from rev 73, Website/Includes/TCDB_Objectives.ascx) =================================================================== --- Website/Includes/Objectives.ascx (rev 0) +++ Website/Includes/Objectives.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> Copied: Website/Includes/Platforms.ascx (from rev 73, Website/Includes/TCDB_Platforms.ascx) =================================================================== --- Website/Includes/Platforms.ascx (rev 0) +++ Website/Includes/Platforms.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> Copied: Website/Includes/Products.ascx (from rev 73, Website/Includes/TCDB_Products.ascx) =================================================================== --- Website/Includes/Products.ascx (rev 0) +++ Website/Includes/Products.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> Copied: Website/Includes/Reports.ascx (from rev 73, Website/Includes/TCDB_Reports.ascx) =================================================================== --- Website/Includes/Reports.ascx (rev 0) +++ Website/Includes/Reports.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> Deleted: Website/Includes/TCDB_ActionItems.ascx =================================================================== --- Website/Includes/TCDB_ActionItems.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_ActionItems.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_ActionItems.ascx.cs" Inherits="Includes_TCDB_ActionItems" %> Deleted: Website/Includes/TCDB_ActionItems.ascx.cs =================================================================== --- Website/Includes/TCDB_ActionItems.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_ActionItems.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_ActionItems : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_Assignments.ascx =================================================================== --- Website/Includes/TCDB_Assignments.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Assignments.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Assignments.ascx.cs" Inherits="Includes_TCDB_Assignments" %> Deleted: Website/Includes/TCDB_Assignments.ascx.cs =================================================================== --- Website/Includes/TCDB_Assignments.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Assignments.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_Assignments : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_AssignmentsTree.ascx =================================================================== --- Website/Includes/TCDB_AssignmentsTree.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_AssignmentsTree.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_AssignmentsTree.ascx.cs" Inherits="Includes_TCDB_AssignmentsTree" %> Deleted: Website/Includes/TCDB_AssignmentsTree.ascx.cs =================================================================== --- Website/Includes/TCDB_AssignmentsTree.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_AssignmentsTree.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_AssignmentsTree : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_Authentication.ascx =================================================================== --- Website/Includes/TCDB_Authentication.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Authentication.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Authentication.ascx.cs" Inherits="Includes_TCDB_Authentication" %> Deleted: Website/Includes/TCDB_Authentication.ascx.cs =================================================================== --- Website/Includes/TCDB_Authentication.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Authentication.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_Authentication : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_Builds.ascx =================================================================== --- Website/Includes/TCDB_Builds.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Builds.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Builds.ascx.cs" Inherits="Includes_TCDB_Builds" %> Deleted: Website/Includes/TCDB_Builds.ascx.cs =================================================================== --- Website/Includes/TCDB_Builds.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Builds.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_Builds : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_Execution.ascx =================================================================== --- Website/Includes/TCDB_Execution.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Execution.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Execution.ascx.cs" Inherits="Includes_TCDB_Execution" %> Deleted: Website/Includes/TCDB_Execution.ascx.cs =================================================================== --- Website/Includes/TCDB_Execution.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Execution.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_Execution : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_FeatureTree.ascx =================================================================== --- Website/Includes/TCDB_FeatureTree.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_FeatureTree.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_FeatureTree.ascx.cs" Inherits="Includes_TCDB_FeatureTree" %> Deleted: Website/Includes/TCDB_FeatureTree.ascx.cs =================================================================== --- Website/Includes/TCDB_FeatureTree.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_FeatureTree.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_FeatureTree : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_Features.ascx =================================================================== --- Website/Includes/TCDB_Features.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Features.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Features.ascx.cs" Inherits="Includes_TCDB_Features" %> Deleted: Website/Includes/TCDB_Features.ascx.cs =================================================================== --- Website/Includes/TCDB_Features.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Features.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_Features : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_Footer.ascx =================================================================== --- Website/Includes/TCDB_Footer.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Footer.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1,2 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Footer.ascx.cs" Inherits="Includes_TCDB_Footer" %> -\xA9 2006 <a href="http://www.quest.com">Quest Software, Inc.</a> | <a href="PrivacyPolicy.aspx">Privacy Policy</a> | <a href="SiteMap.aspx">Site Map</a> Deleted: Website/Includes/TCDB_Footer.ascx.cs =================================================================== --- Website/Includes/TCDB_Footer.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Footer.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_Footer : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_Header.ascx =================================================================== --- Website/Includes/TCDB_Header.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Header.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1,2 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Header.ascx.cs" Inherits="Includes_TCDB_Header" %> -this is the header \ No newline at end of file Deleted: Website/Includes/TCDB_Header.ascx.cs =================================================================== --- Website/Includes/TCDB_Header.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Header.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_Header : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_Header_CurrentInfo.ascx =================================================================== --- Website/Includes/TCDB_Header_CurrentInfo.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Header_CurrentInfo.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1,2 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" %> -Product | Version | Build \ No newline at end of file Deleted: Website/Includes/TCDB_Header_Menu.ascx =================================================================== --- Website/Includes/TCDB_Header_Menu.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Header_Menu.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1,2 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" %> -Assignments | Execute | Management \ No newline at end of file Deleted: Website/Includes/TCDB_Header_User.ascx =================================================================== --- Website/Includes/TCDB_Header_User.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Header_User.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1,19 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" %> -<asp:LoginView ID="LoginView1" runat="server"> -<AnonymousTemplate> -<asp:Login ID="Login1" runat="server"> -<LayoutTemplate> - <asp:Label ID="lblMessage" runat="server" Text="" /> - Username: <div id="UserName"><asp:TextBox ID="UserName" runat="server" /></div> - <asp:RequiredFieldValidator ID="UserNameRequired" runat="server" ControlToValidate="UserName" Text="*" /> - Password: <div id="Password"><asp:TextBox ID="Password" runat="server" TextMode="password" /></div> - <asp:RequiredFieldValidator ID="PasswordRequired" runat="server" ControlToValidate="Password" Text="*" /> - Remember Me: <div id="RememberMe"><asp:CheckBox ID="RememberMe" runat="server" /></div> - <asp:LinkButton ID="Login" CommandName="Login" Text="Login" runat="server" OnClick="Login_Click" /> -</LayoutTemplate> - </asp:Login> -</AnonymousTemplate> -<LoggedInTemplate> -Welcome <asp:LoginName ID="LoginName" runat="server" /> (<asp:LoginStatus ID="LoginStatus" runat="server" />) | Settings | Admin -</LoggedInTemplate> -</asp:LoginView> \ No newline at end of file Deleted: Website/Includes/TCDB_Notes.ascx =================================================================== --- Website/Includes/TCDB_Notes.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Notes.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Notes.ascx.cs" Inherits="Includes_TCDB_Notes" %> Deleted: Website/Includes/TCDB_Notes.ascx.cs =================================================================== --- Website/Includes/TCDB_Notes.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Notes.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_Notes : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_Objectives.ascx =================================================================== --- Website/Includes/TCDB_Objectives.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Objectives.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Objectives.ascx.cs" Inherits="Includes_TCDB_Objectives" %> Deleted: Website/Includes/TCDB_Objectives.ascx.cs =================================================================== --- Website/Includes/TCDB_Objectives.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Objectives.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_Objectives : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_Platforms.ascx =================================================================== --- Website/Includes/TCDB_Platforms.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Platforms.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Platforms.ascx.cs" Inherits="Includes_TCDB_Platforms" %> Deleted: Website/Includes/TCDB_Platforms.ascx.cs =================================================================== --- Website/Includes/TCDB_Platforms.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Platforms.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_Platforms : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_Products.ascx =================================================================== --- Website/Includes/TCDB_Products.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Products.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Products.ascx.cs" Inherits="Includes_TCDB_Products" %> Deleted: Website/Includes/TCDB_Products.ascx.cs =================================================================== --- Website/Includes/TCDB_Products.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Products.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_Products : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_Reports.ascx =================================================================== --- Website/Includes/TCDB_Reports.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Reports.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Reports.ascx.cs" Inherits="Includes_TCDB_Reports" %> Deleted: Website/Includes/TCDB_Reports.ascx.cs =================================================================== --- Website/Includes/TCDB_Reports.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Reports.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_Reports : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_Tags.ascx =================================================================== --- Website/Includes/TCDB_Tags.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Tags.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Tags.ascx.cs" Inherits="Includes_TCDB_Tags" %> Deleted: Website/Includes/TCDB_Tags.ascx.cs =================================================================== --- Website/Includes/TCDB_Tags.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Tags.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_Tags : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_TestCases.ascx =================================================================== --- Website/Includes/TCDB_TestCases.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_TestCases.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_TestCases.ascx.cs" Inherits="Includes_TCDB_TestCases" %> Deleted: Website/Includes/TCDB_TestCases.ascx.cs =================================================================== --- Website/Includes/TCDB_TestCases.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_TestCases.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_TestCases : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_Users.ascx =================================================================== --- Website/Includes/TCDB_Users.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Users.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Users.ascx.cs" Inherits="Includes_TCDB_Users" %> Deleted: Website/Includes/TCDB_Users.ascx.cs =================================================================== --- Website/Includes/TCDB_Users.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Users.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_Users : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_Versions.ascx =================================================================== --- Website/Includes/TCDB_Versions.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Versions.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_Versions.ascx.cs" Inherits="Includes_TCDB_Versions" %> Deleted: Website/Includes/TCDB_Versions.ascx.cs =================================================================== --- Website/Includes/TCDB_Versions.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_Versions.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_Versions : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Deleted: Website/Includes/TCDB_WorkOrders.ascx =================================================================== --- Website/Includes/TCDB_WorkOrders.ascx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_WorkOrders.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -1 +0,0 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="TCDB_WorkOrders.ascx.cs" Inherits="Includes_TCDB_WorkOrders" %> Deleted: Website/Includes/TCDB_WorkOrders.ascx.cs =================================================================== --- Website/Includes/TCDB_WorkOrders.ascx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Includes/TCDB_WorkOrders.ascx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Includes_TCDB_WorkOrders : System.Web.UI.UserControl -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Copied: Website/Includes/Tags.ascx (from rev 73, Website/Includes/TCDB_Tags.ascx) =================================================================== --- Website/Includes/Tags.ascx (rev 0) +++ Website/Includes/Tags.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> Copied: Website/Includes/TestCases.ascx (from rev 73, Website/Includes/TCDB_TestCases.ascx) =================================================================== --- Website/Includes/TestCases.ascx (rev 0) +++ Website/Includes/TestCases.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> Copied: Website/Includes/Users.ascx (from rev 73, Website/Includes/TCDB_Users.ascx) =================================================================== --- Website/Includes/Users.ascx (rev 0) +++ Website/Includes/Users.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> Copied: Website/Includes/Versions.ascx (from rev 73, Website/Includes/TCDB_Versions.ascx) =================================================================== --- Website/Includes/Versions.ascx (rev 0) +++ Website/Includes/Versions.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> Copied: Website/Includes/WorkOrders.ascx (from rev 73, Website/Includes/TCDB_WorkOrders.ascx) =================================================================== --- Website/Includes/WorkOrders.ascx (rev 0) +++ Website/Includes/WorkOrders.ascx 2006-07-06 19:44:23 UTC (rev 76) @@ -0,0 +1 @@ +<%@ Control Language="C#" AutoEventWireup="true" %> Modified: Website/PrivacyPolicy.aspx =================================================================== --- Website/PrivacyPolicy.aspx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/PrivacyPolicy.aspx 2006-07-06 19:44:23 UTC (rev 76) @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="PrivacyPolicy.aspx.cs" Inherits="PrivacyPolicy" Title="Untitled Page" %> +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" Title="Untitled Page" %> <asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> </asp:Content> <asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> Deleted: Website/PrivacyPolicy.aspx.cs =================================================================== --- Website/PrivacyPolicy.aspx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/PrivacyPolicy.aspx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 PrivacyPolicy : System.Web.UI.Page -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Modified: Website/Reports.aspx =================================================================== --- Website/Reports.aspx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Reports.aspx 2006-07-06 19:44:23 UTC (rev 76) @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="Reports.aspx.cs" Inherits="Reports" Title="Untitled Page" %> +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" Title="Untitled Page" %> <asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> </asp:Content> <asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> Deleted: Website/Reports.aspx.cs =================================================================== --- Website/Reports.aspx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/Reports.aspx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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 Reports : System.Web.UI.Page -{ - protected void Page_Load(object sender, EventArgs e) - { - - } -} Modified: Website/SiteMap.aspx =================================================================== --- Website/SiteMap.aspx 2006-07-06 19:25:37 UTC (rev 75) +++ Website/SiteMap.aspx 2006-07-06 19:44:23 UTC (rev 76) @@ -1,4 +1,4 @@ -<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" CodeFile="SiteMap.aspx.cs" Inherits="SiteMap" Title="Untitled Page" %> +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" Title="Untitled Page" %> <asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> </asp:Content> <asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> Deleted: Website/SiteMap.aspx.cs =================================================================== --- Website/SiteMap.aspx.cs 2006-07-06 19:25:37 UTC (rev 75) +++ Website/SiteMap.aspx.cs 2006-07-06 19:44:23 UTC (rev 76) @@ -1,18 +0,0 @@ -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... [truncated message content] |
|
From: <m_h...@us...> - 2006-07-07 00:01:28
|
Revision: 81 Author: m_hildebrand Date: 2006-07-06 17:01:18 -0700 (Thu, 06 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=81&view=rev Log Message: ----------- Got the authentication hooked up to AD Modified Paths: -------------- Design/Architecture/Namespace, Class, and Public Method Definitions.doc Website/App_Code/TCDB_Constants.cs Website/App_Code/TCDB_Users.cs Website/App_Themes/Python/python.css Website/Includes/Header_User.ascx Website/web.config Added Paths: ----------- Website/App_Code/AD_Authentication.cs Website/Includes/AdministrationTree.ascx Website/Includes/SqlDatabase.ascx Modified: Design/Architecture/Namespace, Class, and Public Method Definitions.doc =================================================================== (Binary files differ) Added: Website/App_Code/AD_Authentication.cs =================================================================== --- Website/App_Code/AD_Authentication.cs (rev 0) +++ Website/App_Code/AD_Authentication.cs 2006-07-07 00:01:18 UTC (rev 81) @@ -0,0 +1,79 @@ +using System; +using System.Data; +using System.DirectoryServices; +using System.Configuration; +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; +using TCDB_Users; + +namespace AD_Auth +{ + /// <summary> + /// Summary description for AD_Authentication + /// </summary> + public static class AD_Authentication + { + public static bool AD_Authenticate(string strDomain, string strUserName, string strPassword) + { + bool result = false; + DirectoryEntry de = new DirectoryEntry("LDAP://" + strDomain, strUserName, strPassword); + DirectorySearcher ds = new DirectorySearcher(de); + ds.SearchScope = SearchScope.OneLevel; + try + { + SearchResult sr = ds.FindOne(); + if (sr != null) result = true; + } + catch + { + result = false; + } + + return result; + } + + public static TCDB_User AD_GetUserInfo(string strDomain, string strUserName, string strPassword) + { + DirectoryEntry de = new DirectoryEntry("LDAP://" + strDomain, strUserName, strPassword); + DirectorySearcher ds = new DirectorySearcher(de); + ds.SearchScope = SearchScope.Subtree; + ds.Filter = "(&(objectClass=user)(sAMAccountName=" + strUserName + "))"; + TCDB_User user = new TCDB_User(); + + user.USERID = TCDB_Constants.TCDB_Constant.USER_NEWUSER; + user.AUTOMATION = false; + user.ISAUTHENTICATED = true; + user.USERNAME = strUserName; + string myText = ""; + try + { + SearchResult sr = ds.FindOne(); + if (sr != null) + { + ResultPropertyCollection rpc = sr.Properties; + + user.FIRSTNAME = rpc["givenName"][0].ToString(); + user.LASTNAME = rpc["sn"][0].ToString(); + user.EMAIL = rpc["mail"][0].ToString(); + user.HOMEPHONE = rpc["homePhone"][0].ToString(); + user.OFFICEPHONE = rpc["telephoneNumber"][0].ToString(); + } + } + catch + { + } + finally + { + ds.Dispose(); + de.Dispose(); + } + + return user; + } + + } +} \ No newline at end of file Modified: Website/App_Code/TCDB_Constants.cs =================================================================== --- Website/App_Code/TCDB_Constants.cs 2006-07-06 22:45:02 UTC (rev 80) +++ Website/App_Code/TCDB_Constants.cs 2006-07-07 00:01:18 UTC (rev 81) @@ -17,5 +17,6 @@ { public static int USER_FAILEDLOGIN = -2; public static int USER_NOTREGISTERED = -1; + public static int USER_NEWUSER = -1; } } \ No newline at end of file Modified: Website/App_Code/TCDB_Users.cs =================================================================== --- Website/App_Code/TCDB_Users.cs 2006-07-06 22:45:02 UTC (rev 80) +++ Website/App_Code/TCDB_Users.cs 2006-07-07 00:01:18 UTC (rev 81) @@ -1,6 +1,5 @@ using System; using System.Data; -using System.DirectoryServices; using System.Data.SqlClient; using System.Configuration; using System.Web; @@ -13,6 +12,7 @@ using TCDB_Constants; using System.Collections; using System.Collections.Generic; +using AD_Auth; namespace TCDB_Users @@ -37,34 +37,43 @@ /// <value> /// An <c>int</c> representing the user's ID or DefaultValue if the process fails /// </value> - public static int TCDB_AuthenticateUser(string strUserName, string strPassword) + public static TCDB_User TCDB_AuthenticateUser(string strDomain, string strUserName, string strPassword) { // TODO: Add logic here to determine and use the appropriate // authentication method based on configuration data - bool result = false; - DirectoryEntry de = new DirectoryEntry("LDAP://slam", strUserName, strPassword); - DirectorySearcher ds = new DirectorySearcher(de); - ds.SearchScope = SearchScope.OneLevel; - try + + // Using AD authentication + if (!AD_Authentication.AD_Authenticate(strDomain, strUserName, strPassword)) { - SearchResult sr = ds.FindOne(); - if (sr != null) result = true; + // We can't authenticate, so return the guest user + return new TCDB_User(); } - catch - { - result = false; - } - if (!result) + // Determine if the user exists in the DB or not. If not, we need to get + // the basic info + TCDB_User user = TCDB_GetUserInfo(strUserName); + if (user.USERID > 1) { - return TCDB_Constant.USER_FAILEDLOGIN; + user.ISAUTHENTICATED = true; + return user; } - // TODO: Look up the user ID from the DB now that we have a valid user - // and return the user object - return 0; + // Using AD authentication + user = AD_Authentication.AD_GetUserInfo(strDomain, strUserName, strPassword); + + + + return user; } + + public static TCDB_User TCDB_GetUserInfo(string strUserName) + { + // TODO: Check against the DB for user information + return new TCDB_User(); + } + + } /// <summary> @@ -183,6 +192,7 @@ public bool ISAUTHENTICATED { get { return isAuthenticated; } + set { isAuthenticated = value; } } } Modified: Website/App_Themes/Python/python.css =================================================================== --- Website/App_Themes/Python/python.css 2006-07-06 22:45:02 UTC (rev 80) +++ Website/App_Themes/Python/python.css 2006-07-07 00:01:18 UTC (rev 81) @@ -83,17 +83,17 @@ } /* Define the username and password box sizes */ -#User #UserName, #User #Password +#User #UserNameControl, #User #PasswordControl { display: inline; } -#UserName input, #Password input +#UserNameControl input, #PasswordControl input { width: 80px; } -#User #RememberMe +#User #RememberMeControl { display: inline; position: relative; Added: Website/Includes/AdministrationTree.ascx =================================================================== --- Website/Includes/AdministrationTree.ascx (rev 0) +++ Website/Includes/AdministrationTree.ascx 2006-07-07 00:01:18 UTC (rev 81) @@ -0,0 +1,5 @@ +<%@ Control Language="C#" ClassName="AdministrationTree" %> + +<script runat="server"> + +</script> Modified: Website/Includes/Header_User.ascx =================================================================== --- Website/Includes/Header_User.ascx 2006-07-06 22:45:02 UTC (rev 80) +++ Website/Includes/Header_User.ascx 2006-07-07 00:01:18 UTC (rev 81) @@ -2,30 +2,25 @@ <%@ Import Namespace="TCDB_Users" %> <script runat="server"> - - protected void Login_Click(object sender, EventArgs e) - {/* - if (TCDB_UserDB.TCDB_AuthenticateUser(UserNameControl.Text, PasswordControl.Text) > 0) - { - } - else - { - - }*/ + protected void Login_Authenticate(object sender, EventArgs e) + { + int temp = 1; + string [] user = ((System.Web.UI.WebControls.Login)sender).UserName.Split("\\".ToCharArray()); + TCDB_UserDB.TCDB_AuthenticateUser(user[0], user[1], ((System.Web.UI.WebControls.Login)sender).Password); } </script> -<asp:LoginView ID="LoginView1" runat="server"> +<asp:LoginView ID="LoginView" runat="server"> <AnonymousTemplate> -<asp:Login ID="Login1" runat="server"> +<asp:Login ID="Login1" OnAuthenticate="Login_Authenticate" runat="server"> <LayoutTemplate> <asp:Label ID="lblMessage" runat="server" Text="" /> - Username: <div id="UserName"><asp:TextBox ID="UserNameControl" runat="server" /></div> - <asp:RequiredFieldValidator ID="UserNameRequired" runat="server" ControlToValidate="UserNameControl" Text="*" /> - Password: <div id="Password"><asp:TextBox ID="PasswordControl" runat="server" TextMode="password" /></div> - <asp:RequiredFieldValidator ID="PasswordRequired" runat="server" ControlToValidate="PasswordControl" Text="*" /> - Remember Me: <div id="RememberMe"><asp:CheckBox ID="RememberMeControl" runat="server" /></div> - <asp:LinkButton ID="Login" CommandName="Login" Text="Login" runat="server" OnClick="Login_Click" /> + Username: <div id="UserNameControl"><asp:TextBox ID="UserName" runat="server" /></div> + <asp:RequiredFieldValidator ID="UserNameRequired" runat="server" ControlToValidate="UserName" Text="*" /> + Password: <div id="PasswordControl"><asp:TextBox ID="Password" runat="server" TextMode="password" /></div> + <asp:RequiredFieldValidator ID="PasswordRequired" runat="server" ControlToValidate="Password" Text="*" /> + Remember Me: <div id="RememberMeControl"><asp:CheckBox ID="RememberMe" runat="server" /></div> + <asp:LinkButton ID="LoginControl" CommandName="Login" Text="Login" runat="server" /> </LayoutTemplate> </asp:Login> </AnonymousTemplate> Added: Website/Includes/SqlDatabase.ascx =================================================================== --- Website/Includes/SqlDatabase.ascx (rev 0) +++ Website/Includes/SqlDatabase.ascx 2006-07-07 00:01:18 UTC (rev 81) @@ -0,0 +1,5 @@ +<%@ Control Language="C#" ClassName="SqlDatabase" %> + + + + Modified: Website/web.config =================================================================== --- Website/web.config 2006-07-06 22:45:02 UTC (rev 80) +++ Website/web.config 2006-07-07 00:01:18 UTC (rev 81) @@ -44,9 +44,15 @@ --> </microsoft.web> <appSettings/> - <connectionStrings/> + <connectionStrings> + <add name="dadConnectionString" connectionString="Data Source=dad\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw" + providerName="System.Data.SqlClient" /> + </connectionStrings> <system.web> - <pages theme="Python" styleSheetTheme="Python"> + <authentication mode="Forms"> + <forms loginUrl="login.aspx" /> + </authentication> + <pages styleSheetTheme="Python"> <!-- TODO: Make sure the theme is being pulled dynamically --> <controls> <add namespace="Microsoft.Web.UI" assembly="Microsoft.Web.Atlas" tagPrefix="atlas"/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <m_h...@us...> - 2006-07-07 23:33:32
|
Revision: 89 Author: m_hildebrand Date: 2006-07-07 16:33:22 -0700 (Fri, 07 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=89&view=rev Log Message: ----------- Got hooked up to AD and the DB Modified Paths: -------------- Website/App_Code/AD_Authentication.cs Website/App_Code/TCDB_Constants.cs Website/App_Code/TCDB_Users.cs Website/App_Themes/Python/python.css Website/Includes/Header.ascx Website/Includes/Header_User.ascx Website/TCDB.master Added Paths: ----------- Website/App_Code/TCDB_Products.cs Website/App_Code/dadDataSet.xsd Website/App_Code/dadDataSet.xss Website/Includes/Authenticate.ascx Modified: Website/App_Code/AD_Authentication.cs =================================================================== --- Website/App_Code/AD_Authentication.cs 2006-07-07 22:50:32 UTC (rev 88) +++ Website/App_Code/AD_Authentication.cs 2006-07-07 23:33:22 UTC (rev 89) @@ -17,10 +17,15 @@ /// </summary> public static class AD_Authentication { - public static bool AD_Authenticate(string strDomain, string strUserName, string strPassword) + public static bool AD_Authenticate(string strUserName, string strPassword) { bool result = false; - DirectoryEntry de = new DirectoryEntry("LDAP://" + strDomain, strUserName, strPassword); + string[] UserName = strUserName.Split("\\".ToCharArray()); + + // If we don't have a domain and a username, we need to fail + if (UserName.Length < 2) + return false; + DirectoryEntry de = new DirectoryEntry("LDAP://" + UserName[0], UserName[1], strPassword); DirectorySearcher ds = new DirectorySearcher(de); ds.SearchScope = SearchScope.OneLevel; try @@ -36,19 +41,32 @@ return result; } - public static TCDB_User AD_GetUserInfo(string strDomain, string strUserName, string strPassword) + public static string AD_CleanUserName(string strUserName) { - DirectoryEntry de = new DirectoryEntry("LDAP://" + strDomain, strUserName, strPassword); + string[] UserName = strUserName.Split("\\".ToCharArray()); + if (UserName.Length < 2) + return strUserName; + return UserName[1]; + } + + public static TCDB_User AD_GetUserInfo(string strUserName, string strPassword) + { + string[] UserName = strUserName.Split("\\".ToCharArray()); + TCDB_User user = new TCDB_User(); + + // If we don't have a domain and a username, we need to fail + if (UserName.Length < 2) + return user; + + DirectoryEntry de = new DirectoryEntry("LDAP://" + UserName[0], UserName[1], strPassword); DirectorySearcher ds = new DirectorySearcher(de); ds.SearchScope = SearchScope.Subtree; - ds.Filter = "(&(objectClass=user)(sAMAccountName=" + strUserName + "))"; - TCDB_User user = new TCDB_User(); + ds.Filter = "(&(objectClass=user)(sAMAccountName=" + UserName[1] + "))"; user.USERID = TCDB_Constants.TCDB_Constant.USER_NEWUSER; user.AUTOMATION = false; user.ISAUTHENTICATED = true; - user.USERNAME = strUserName; - string myText = ""; + user.USERNAME = UserName[1]; try { SearchResult sr = ds.FindOne(); @@ -61,6 +79,7 @@ user.EMAIL = rpc["mail"][0].ToString(); user.HOMEPHONE = rpc["homePhone"][0].ToString(); user.OFFICEPHONE = rpc["telephoneNumber"][0].ToString(); + user.CELLPHONE = rpc["mobile"][0].ToString(); } } catch Modified: Website/App_Code/TCDB_Constants.cs =================================================================== --- Website/App_Code/TCDB_Constants.cs 2006-07-07 22:50:32 UTC (rev 88) +++ Website/App_Code/TCDB_Constants.cs 2006-07-07 23:33:22 UTC (rev 89) @@ -15,8 +15,15 @@ /// </summary> public static class TCDB_Constant { + // TODO: Load the strings from the DB where appropriate public static int USER_FAILEDLOGIN = -2; public static int USER_NOTREGISTERED = -1; public static int USER_NEWUSER = -1; + public static int USER_ANONYMOUSUSERID = 0; + public static string USER_ANONYMOUSUSERNAME = "Guest"; + public static string USER_ANONYMOUSFIRSTNAME = "Guest"; + public static string USER_ANONYMOUSLASTNAME = "User"; + + public static string ACTION_NEWUSER = "nu"; } } \ No newline at end of file Added: Website/App_Code/TCDB_Products.cs =================================================================== --- Website/App_Code/TCDB_Products.cs (rev 0) +++ Website/App_Code/TCDB_Products.cs 2006-07-07 23:33:22 UTC (rev 89) @@ -0,0 +1,173 @@ +using System; +using System.Data; +using System.Configuration; +using System.Collections.Generic; +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; +using TCDB_Users; + +namespace TCDB_Products +{ + /// <summary> + /// Summary description for TCDB_Products + /// </summary> + public class TCDB_ProductDB : Page + { + public static TCDB_Product TCDB_GetProduct(bool isActive, int productID) + { + dadDataSet ds = new dadDataSet(); + dadDataSetTableAdapters.db_productsTableAdapter ta = new dadDataSetTableAdapters.db_productsTableAdapter(); + ta.GetData(isActive, productID); + ta.Fill(ds.db_products, isActive, productID); + + TCDB_Product product = new TCDB_Product(); + + DataTableReader dr = ds.CreateDataReader(); + if (dr.HasRows && dr.Read()) + { + product.PRODUCTID = int.Parse(dr["productID"].ToString()); + product.NAME = dr["name"].ToString(); + product.DESCRIPTION = dr["description"].ToString(); + product.CODENAME = dr["codeName"].ToString(); + product.DEVMANAGER = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["devManager"].ToString())); + product.QAMANAGER = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["qaManager"].ToString())); + product.DEVLEAD = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["devLead"].ToString())); + product.QALEAD = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["qaLead"].ToString())); + product.PM = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["pm"].ToString())); + product.ACTIVE = (bool)(dr["active"]); + } + + return product; + } + + public static List<TCDB_Product> TCDB_GetProductList(bool isActive) + { + dadDataSet ds = new dadDataSet(); + dadDataSetTableAdapters.db_productsTableAdapter ta = new dadDataSetTableAdapters.db_productsTableAdapter(); + ta.GetData(isActive, null); + ta.Fill(ds.db_products, isActive, null); + + List<TCDB_Product> productList = new List<TCDB_Product>(); + + DataTableReader dr = ds.CreateDataReader(); + if (dr.HasRows) + { + while (dr.Read()) { + TCDB_Product product = new TCDB_Product(); + product.PRODUCTID = int.Parse(dr["productID"].ToString()); + product.NAME = dr["name"].ToString(); + product.DESCRIPTION = dr["description"].ToString(); + product.CODENAME = dr["codeName"].ToString(); + product.DEVMANAGER = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["devManager"].ToString())); + product.QAMANAGER = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["qaManager"].ToString())); + product.DEVLEAD = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["devLead"].ToString())); + product.QALEAD = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["qaLead"].ToString())); + product.PM = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["pm"].ToString())); + product.ACTIVE = (bool)(dr["active"]); + + productList.Add(product); + } + } + + return productList; + } + } + + public class TCDB_Product + { + private int productid; + private string name; + private string description; + private string codeName; + private TCDB_User devManager; + private TCDB_User qaManager; + private TCDB_User devLead; + private TCDB_User qaLead; + private TCDB_User pm; + private bool active; + // TODO: Implement these as the time is right + //private List<TCDB_Tag> tags; + + public TCDB_Product() + { + productid = 0; + name = null; + description = null; + codeName = null; + devManager = null; + qaManager = null; + devLead = null; + qaLead = null; + pm = null; + active = false; + } + + public TCDB_Product(int id) + { + } + + public int PRODUCTID + { + get { return productid; } + set { productid = value; } + } + + public string NAME + { + get { return name; } + set { name = value; } + } + + public string DESCRIPTION + { + get { return description; } + set { description = value; } + } + + public string CODENAME + { + get { return codeName; } + set { codeName = value; } + } + + public TCDB_User DEVMANAGER + { + get { return devManager; } + set { devManager = value; } + } + + public TCDB_User QAMANAGER + { + get { return qaManager; } + set { qaManager = value; } + } + + public TCDB_User DEVLEAD + { + get { return devLead; } + set { devLead = value; } + } + + public TCDB_User QALEAD + { + get { return qaLead; } + set { qaLead = value; } + } + + public TCDB_User PM + { + get { return pm; } + set { pm = value; } + } + + public bool ACTIVE + { + get { return active; } + set { active = value; } + } + } +} \ No newline at end of file Modified: Website/App_Code/TCDB_Users.cs =================================================================== --- Website/App_Code/TCDB_Users.cs 2006-07-07 22:50:32 UTC (rev 88) +++ Website/App_Code/TCDB_Users.cs 2006-07-07 23:33:22 UTC (rev 89) @@ -2,8 +2,10 @@ using System.Data; using System.Data.SqlClient; using System.Configuration; +using System.Diagnostics; using System.Web; using System.Web.Security; +using System.Web.Configuration; using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; @@ -12,6 +14,7 @@ using TCDB_Constants; using System.Collections; using System.Collections.Generic; +using System.Collections.Specialized; using AD_Auth; @@ -37,21 +40,24 @@ /// <value> /// An <c>int</c> representing the user's ID or DefaultValue if the process fails /// </value> - public static TCDB_User TCDB_AuthenticateUser(string strDomain, string strUserName, string strPassword) + public static TCDB_User TCDB_AuthenticateUser(string strUserName, string strPassword) { // TODO: Add logic here to determine and use the appropriate // authentication method based on configuration data // Using AD authentication - if (!AD_Authentication.AD_Authenticate(strDomain, strUserName, strPassword)) + if (!AD_Authentication.AD_Authenticate(strUserName, strPassword)) { // We can't authenticate, so return the guest user return new TCDB_User(); } + // Using AD authentication + string cleanUserName = AD_Authentication.AD_CleanUserName(strUserName); + // Determine if the user exists in the DB or not. If not, we need to get // the basic info - TCDB_User user = TCDB_GetUserInfo(strUserName); + TCDB_User user = TCDB_GetUserInfo(cleanUserName); if (user.USERID > 1) { user.ISAUTHENTICATED = true; @@ -59,18 +65,62 @@ } // Using AD authentication - user = AD_Authentication.AD_GetUserInfo(strDomain, strUserName, strPassword); + user = AD_Authentication.AD_GetUserInfo(strUserName, strPassword); + return user; + } + public static TCDB_User TCDB_GetUserInfo(string strUserName) + { + // TODO: Check against the DB for user information + dadDataSet ds = new dadDataSet(); + dadDataSetTableAdapters.db_usersTableAdapter ta = new dadDataSetTableAdapters.db_usersTableAdapter(); + ta.GetData(strUserName, null); + ta.Fill(ds.db_users, strUserName, null); + TCDB_User user = new TCDB_User(); + DataTableReader dr = ds.CreateDataReader(); + if (dr.HasRows && dr.Read()) + { + user.USERID = int.Parse(dr["userID"].ToString()); + user.USERNAME = dr["username"].ToString(); + user.FIRSTNAME = dr["firstName"].ToString(); + user.LASTNAME = dr["lastName"].ToString(); + user.EMAIL = dr["email"].ToString(); + user.OFFICEPHONE = dr["officePhone"].ToString(); + user.HOMEPHONE = dr["homePhone"].ToString(); + user.CELLPHONE = dr["cellPhone"].ToString(); + user.AUTOMATION = (bool)(dr["automation"]); + } return user; } - public static TCDB_User TCDB_GetUserInfo(string strUserName) + public static TCDB_User TCDB_GetUserInfo(int id) { // TODO: Check against the DB for user information - return new TCDB_User(); + dadDataSet ds = new dadDataSet(); + dadDataSetTableAdapters.db_usersTableAdapter ta = new dadDataSetTableAdapters.db_usersTableAdapter(); + ta.GetData(null, id); + ta.Fill(ds.db_users, null, id); + + TCDB_User user = new TCDB_User(); + + DataTableReader dr = ds.CreateDataReader(); + if (dr.HasRows && dr.Read()) + { + user.USERID = int.Parse(dr["userID"].ToString()); + user.USERNAME = dr["username"].ToString(); + user.FIRSTNAME = dr["firstName"].ToString(); + user.LASTNAME = dr["lastName"].ToString(); + user.EMAIL = dr["email"].ToString(); + user.OFFICEPHONE = dr["officePhone"].ToString(); + user.HOMEPHONE = dr["homePhone"].ToString(); + user.CELLPHONE = dr["cellPhone"].ToString(); + user.AUTOMATION = (bool)(dr["automation"]); + } + + return user; } @@ -86,17 +136,19 @@ private string email; private string officePhone; private string homePhone; + private string cellPhone; private string firstName; private string lastName; private bool automation; private bool isAuthenticated; + private List<TCDB_Right> rights; + private List<TCDB_Config> config; /* TODO: Implement these as the time is right private List<TCDB_Feature> features; private List<TCDB_Assignment> assignmentsCreated; private List<TCDB_Assignment> assignments; private List<TCDB_Objective> objectives; private List<TCDB_WorkOrderTemplate> savedWorkOrders; - private TCDB_RightsCollection rights; private List<TCDB_TestCase> testCasesCreated; private List<TCDB_TestCase> testCasesEdited; */ @@ -107,15 +159,18 @@ /// </summary> public TCDB_User() { - userid = 0; - username = "Guest"; + userid = TCDB_Constant.USER_ANONYMOUSUSERID; + username = TCDB_Constant.USER_ANONYMOUSUSERNAME; email = ""; officePhone = ""; homePhone = ""; - firstName = "Guest"; - lastName = "User"; + cellPhone = ""; + firstName = TCDB_Constant.USER_ANONYMOUSFIRSTNAME; + lastName = TCDB_Constant.USER_ANONYMOUSLASTNAME; automation = false; isAuthenticated = false; + rights = null; + config = null; } /// <summary> @@ -166,6 +221,12 @@ set { homePhone = value; } } + public string CELLPHONE + { + get { return cellPhone; } + set { cellPhone = value; } + } + public string FIRSTNAME { get { return firstName; } @@ -194,88 +255,82 @@ get { return isAuthenticated; } set { isAuthenticated = value; } } - } - public class TCDB_RightsCollection : CollectionBase - { - private List<TCDB_Right> rights; - - public int Count + public override string ToString() { - get { return rights.Count; } + return FULLNAME; } - public void Clear() + public List<TCDB_Right> GetRights() { - rights = new List<TCDB_Right>(); + // TODO: If rights == null + // load the rights from the db + return rights; } - public bool Equals(Object o) + public List<TCDB_Config> GetConfig() { - // TODO: Finish this - return false; + // TODO: If config == null + // load the config from the db + return config; } + } - public IEnumerator GetEnumerator() - { - // TODO: Finish this - return null; - } + public class TCDB_Right + { + private int m_id; + private string m_name; + private string m_description; - public int GetHashCode() + public TCDB_Right(int id, string name, string description) { - // TODO: Finish this - return 0; + m_id = id; + m_name = name; + m_description = description; } - public Type GetType() + public int ID { - // TODO: Finish this - return null; + get { return m_id; } } - public void RemoveAt(int index) + public string NAME { - // TODO: Implement the function - if (index < 0 || index >= rights.Count) - throw new ArgumentOutOfRangeException(index.ToString(), "Index out of range."); + get { return m_name; } } - public string ToString() + public string DESCRIPTION { - return "System.Object"; + get { return m_description; } } -/* - protected ArrayList InnerList - { - // TODO: Finish this - get { return new ArrayList(); } - } + } - protected IList List + public class TCDB_Config + { + private int m_uid; + private string m_key; + private string m_value; + + public TCDB_Config(int uid, string key, string value) { - get { return rights; } + m_uid = uid; + m_key = key; + m_value = value; } - ~TCDB_RightsCollection() + public int UID { - rights = null; + get { return m_uid; } } - protected TCDB_RightsCollection MemberwiseClone() + public string KEY { - // TODO: Finish this - return this; + get { return m_key; } } -*/ - - } - - public class TCDB_Right - { - public TCDB_Right() + public string VALUE { + get { return m_value; } } } } \ No newline at end of file Added: Website/App_Code/dadDataSet.xsd =================================================================== --- Website/App_Code/dadDataSet.xsd (rev 0) +++ Website/App_Code/dadDataSet.xsd 2006-07-07 23:33:22 UTC (rev 89) @@ -0,0 +1,305 @@ +<?xml version="1.0" encoding="utf-8"?> +<xs:schema id="dadDataSet" targetNamespace="http://tempuri.org/dadDataSet.xsd" xmlns:mstns="http://tempuri.org/dadDataSet.xsd" xmlns="http://tempuri.org/dadDataSet.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:msprop="urn:schemas-microsoft-com:xml-msprop" attributeFormDefault="qualified" elementFormDefault="qualified"> + <xs:annotation> + <xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource"> + <DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" GeneratorFunctionsComponentClassName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" UserFunctionsComponentName="QueriesTableAdapter" xmlns="urn:schemas-microsoft-com:xml-msdatasource"> + <Connections> + <Connection AppSettingsObjectName="Web.config" AppSettingsPropertyName="dadConnectionString" ConnectionStringObject="" IsAppSettingsProperty="True" Modifier="Assembly" Name="dadConnectionString (Web.config)" ParameterPrefix="@" PropertyReference="AppConfig.System.Configuration.ConfigurationManager.0.ConnectionStrings.dadConnectionString.ConnectionString" Provider="System.Data.SqlClient"> + </Connection> + </Connections> + <Tables> + <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_usersTableAdapter" GeneratorDataComponentClassName="db_usersTableAdapter" Name="db_users" UserDataComponentName="db_usersTableAdapter"> + <MainSource> + <DbSource ConnectionRef="dadConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_users" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="True" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> + <InsertCommand> + <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> + <CommandText>dbo.ins_user</CommandText> + <Parameters> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@username" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="username" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@firstName" Precision="0" ProviderType="VarChar" Scale="0" Size="24" SourceColumn="firstName" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@lastName" Precision="0" ProviderType="VarChar" Scale="0" Size="24" SourceColumn="lastName" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@email" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="email" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@officePhone" Precision="0" ProviderType="VarChar" Scale="0" Size="14" SourceColumn="officePhone" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@homePhone" Precision="0" ProviderType="VarChar" Scale="0" Size="14" SourceColumn="homePhone" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@cellPhone" Precision="0" ProviderType="VarChar" Scale="0" Size="14" SourceColumn="cellPhone" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@automation" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumn="automation" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + </Parameters> + </DbCommand> + </InsertCommand> + <SelectCommand> + <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> + <CommandText>dbo.sel_users</CommandText> + <Parameters> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@username" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@userID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + </Parameters> + </DbCommand> + </SelectCommand> + <UpdateCommand> + <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> + <CommandText>dbo.upd_users</CommandText> + <Parameters> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@userID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="userID" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@username" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="username" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@email" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="email" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@officePhone" Precision="0" ProviderType="VarChar" Scale="0" Size="14" SourceColumn="officePhone" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@homePhone" Precision="0" ProviderType="VarChar" Scale="0" Size="14" SourceColumn="homePhone" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@cellPhone" Precision="0" ProviderType="VarChar" Scale="0" Size="14" SourceColumn="cellPhone" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@firstName" Precision="0" ProviderType="VarChar" Scale="0" Size="24" SourceColumn="firstName" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@lastName" Precision="0" ProviderType="VarChar" Scale="0" Size="24" SourceColumn="lastName" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@automation" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumn="automation" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + </Parameters> + </DbCommand> + </UpdateCommand> + </DbSource> + </MainSource> + <Mappings> + <Mapping SourceColumn="userID" DataSetColumn="userID" /> + <Mapping SourceColumn="username" DataSetColumn="username" /> + <Mapping SourceColumn="email" DataSetColumn="email" /> + <Mapping SourceColumn="officePhone" DataSetColumn="officePhone" /> + <Mapping SourceColumn="homePhone" DataSetColumn="homePhone" /> + <Mapping SourceColumn="cellPhone" DataSetColumn="cellPhone" /> + <Mapping SourceColumn="firstName" DataSetColumn="firstName" /> + <Mapping SourceColumn="lastName" DataSetColumn="lastName" /> + <Mapping SourceColumn="fullName" DataSetColumn="fullName" /> + <Mapping SourceColumn="automation" DataSetColumn="automation" /> + </Mappings> + <Sources> + </Sources> + </TableAdapter> + <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_productsTableAdapter" GeneratorDataComponentClassName="db_productsTableAdapter" Name="db_products" UserDataComponentName="db_productsTableAdapter"> + <MainSource> + <DbSource ConnectionRef="dadConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_products" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="True" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> + <InsertCommand> + <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> + <CommandText>dbo.ins_product</CommandText> + <Parameters> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@name" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="name" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@description" Precision="0" ProviderType="Text" Scale="0" Size="2147483647" SourceColumn="description" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@devManager" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="devManager" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@qaManager" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="qaManager" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@devLead" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="devLead" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@qaLead" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="qaLead" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@pm" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="pm" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@codeName" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="codeName" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@active" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumn="active" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + </Parameters> + </DbCommand> + </InsertCommand> + <SelectCommand> + <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> + <CommandText>dbo.sel_products</CommandText> + <Parameters> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@active" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@productID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + </Parameters> + </DbCommand> + </SelectCommand> + <UpdateCommand> + <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> + <CommandText>dbo.upd_product</CommandText> + <Parameters> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@productID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="productID" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@name" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="name" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@description" Precision="0" ProviderType="Text" Scale="0" Size="2147483647" SourceColumn="description" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@devManager" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="devManager" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@qaManager" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="qaManager" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@devLead" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="devLead" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@qaLead" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="qaLead" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@pm" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="pm" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@codeName" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="codeName" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@active" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumn="active" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + </Parameters> + </DbCommand> + </UpdateCommand> + </DbSource> + </MainSource> + <Mappings> + <Mapping SourceColumn="productID" DataSetColumn="productID" /> + <Mapping SourceColumn="name" DataSetColumn="name" /> + <Mapping SourceColumn="description" DataSetColumn="description" /> + <Mapping SourceColumn="devManager" DataSetColumn="devManager" /> + <Mapping SourceColumn="qaManager" DataSetColumn="qaManager" /> + <Mapping SourceColumn="devLead" DataSetColumn="devLead" /> + <Mapping SourceColumn="qaLead" DataSetColumn="qaLead" /> + <Mapping SourceColumn="pm" DataSetColumn="pm" /> + <Mapping SourceColumn="codeName" DataSetColumn="codeName" /> + <Mapping SourceColumn="active" DataSetColumn="active" /> + </Mappings> + <Sources> + </Sources> + </TableAdapter> + </Tables> + <Sources> + </Sources> + </DataSource> + </xs:appinfo> + </xs:annotation> + <xs:element name="dadDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="dadDataSet" msprop:Generator_DataSetName="dadDataSet"> + <xs:complexType> + <xs:choice minOccurs="0" maxOccurs="unbounded"> + <xs:element name="db_users" msprop:Generator_UserTableName="db_users" msprop:Generator_RowDeletedName="db_usersRowDeleted" msprop:Generator_TableClassName="db_usersDataTable" msprop:Generator_RowChangedName="db_usersRowChanged" msprop:Generator_RowClassName="db_usersRow" msprop:Generator_RowChangingName="db_usersRowChanging" msprop:Generator_RowEvArgName="db_usersRowChangeEvent" msprop:Generator_RowEvHandlerName="db_usersRowChangeEventHandler" msprop:Generator_TablePropName="db_users" msprop:Generator_TableVarName="tabledb_users" msprop:Generator_RowDeletingName="db_usersRowDeleting"> + <xs:complexType> + <xs:sequence> + <xs:element name="userID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="userID" msprop:Generator_ColumnPropNameInRow="userID" msprop:Generator_ColumnVarNameInTable="columnuserID" msprop:Generator_ColumnPropNameInTable="userIDColumn" type="xs:int" /> + <xs:element name="username" msprop:Generator_UserColumnName="username" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_ColumnVarNameInTable="columnusername" msprop:Generator_ColumnPropNameInTable="usernameColumn"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:maxLength value="50" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="email" msprop:Generator_UserColumnName="email" msprop:Generator_ColumnPropNameInRow="email" msprop:Generator_ColumnVarNameInTable="columnemail" msprop:Generator_ColumnPropNameInTable="emailColumn"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:maxLength value="50" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="officePhone" msprop:Generator_UserColumnName="officePhone" msprop:Generator_ColumnPropNameInRow="officePhone" msprop:Generator_ColumnVarNameInTable="columnofficePhone" msprop:Generator_ColumnPropNameInTable="officePhoneColumn" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:maxLength value="14" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="homePhone" msprop:Generator_UserColumnName="homePhone" msprop:Generator_ColumnPropNameInRow="homePhone" msprop:Generator_ColumnVarNameInTable="columnhomePhone" msprop:Generator_ColumnPropNameInTable="homePhoneColumn" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:maxLength value="14" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="cellPhone" msprop:Generator_UserColumnName="cellPhone" msprop:Generator_ColumnPropNameInRow="cellPhone" msprop:Generator_ColumnVarNameInTable="columncellPhone" msprop:Generator_ColumnPropNameInTable="cellPhoneColumn" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:maxLength value="14" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="firstName" msprop:Generator_UserColumnName="firstName" msprop:Generator_ColumnPropNameInRow="firstName" msprop:Generator_ColumnVarNameInTable="columnfirstName" msprop:Generator_ColumnPropNameInTable="firstNameColumn"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:maxLength value="24" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="lastName" msprop:Generator_UserColumnName="lastName" msprop:Generator_ColumnPropNameInRow="lastName" msprop:Generator_ColumnVarNameInTable="columnlastName" msprop:Generator_ColumnPropNameInTable="lastNameColumn"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:maxLength value="24" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="fullName" msdata:ReadOnly="true" msprop:Generator_UserColumnName="fullName" msprop:Generator_ColumnPropNameInRow="fullName" msprop:Generator_ColumnVarNameInTable="columnfullName" msprop:Generator_ColumnPropNameInTable="fullNameColumn" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:maxLength value="49" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="automation" msprop:Generator_UserColumnName="automation" msprop:Generator_ColumnPropNameInRow="automation" msprop:Generator_ColumnVarNameInTable="columnautomation" msprop:Generator_ColumnPropNameInTable="automationColumn" type="xs:boolean" /> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="db_products" msprop:Generator_UserTableName="db_products" msprop:Generator_RowDeletedName="db_productsRowDeleted" msprop:Generator_TableClassName="db_productsDataTable" msprop:Generator_RowChangedName="db_productsRowChanged" msprop:Generator_RowClassName="db_productsRow" msprop:Generator_RowChangingName="db_productsRowChanging" msprop:Generator_RowEvArgName="db_productsRowChangeEvent" msprop:Generator_RowEvHandlerName="db_productsRowChangeEventHandler" msprop:Generator_TablePropName="db_products" msprop:Generator_TableVarName="tabledb_products" msprop:Generator_RowDeletingName="db_productsRowDeleting"> + <xs:complexType> + <xs:sequence> + <xs:element name="productID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="productID" msprop:Generator_ColumnPropNameInRow="productID" msprop:Generator_ColumnVarNameInTable="columnproductID" msprop:Generator_ColumnPropNameInTable="productIDColumn" type="xs:int" /> + <xs:element name="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInTable="nameColumn" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:maxLength value="255" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="description" msprop:Generator_UserColumnName="description" msprop:Generator_ColumnPropNameInRow="description" msprop:Generator_ColumnVarNameInTable="columndescription" msprop:Generator_ColumnPropNameInTable="descriptionColumn" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:maxLength value="2147483647" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="devManager" msprop:Generator_UserColumnName="devManager" msprop:Generator_ColumnPropNameInRow="devManager" msprop:Generator_ColumnVarNameInTable="columndevManager" msprop:Generator_ColumnPropNameInTable="devManagerColumn" type="xs:int" minOccurs="0" /> + <xs:element name="qaManager" msprop:Generator_UserColumnName="qaManager" msprop:Generator_ColumnPropNameInRow="qaManager" msprop:Generator_ColumnVarNameInTable="columnqaManager" msprop:Generator_ColumnPropNameInTable="qaManagerColumn" type="xs:int" minOccurs="0" /> + <xs:element name="devLead" msprop:Generator_UserColumnName="devLead" msprop:Generator_ColumnPropNameInRow="devLead" msprop:Generator_ColumnVarNameInTable="columndevLead" msprop:Generator_ColumnPropNameInTable="devLeadColumn" type="xs:int" minOccurs="0" /> + <xs:element name="qaLead" msprop:Generator_UserColumnName="qaLead" msprop:Generator_ColumnPropNameInRow="qaLead" msprop:Generator_ColumnVarNameInTable="columnqaLead" msprop:Generator_ColumnPropNameInTable="qaLeadColumn" type="xs:int" minOccurs="0" /> + <xs:element name="pm" msprop:Generator_UserColumnName="pm" msprop:Generator_ColumnPropNameInRow="pm" msprop:Generator_ColumnVarNameInTable="columnpm" msprop:Generator_ColumnPropNameInTable="pmColumn" type="xs:int" minOccurs="0" /> + <xs:element name="codeName" msprop:Generator_UserColumnName="codeName" msprop:Generator_ColumnPropNameInRow="codeName" msprop:Generator_ColumnVarNameInTable="columncodeName" msprop:Generator_ColumnPropNameInTable="codeNameColumn" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:maxLength value="10" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + <xs:element name="active" msprop:Generator_UserColumnName="active" msprop:Generator_ColumnPropNameInRow="active" msprop:Generator_ColumnVarNameInTable="columnactive" msprop:Generator_ColumnPropNameInTable="activeColumn" type="xs:boolean" /> + </xs:sequence> + </xs:complexType> + </xs:element> + </xs:choice> + </xs:complexType> + <xs:unique name="Constraint1" msdata:PrimaryKey="true"> + <xs:selector xpath=".//mstns:db_users" /> + <xs:field xpath="mstns:email" /> + <xs:field xpath="mstns:firstName" /> + <xs:field xpath="mstns:lastName" /> + </xs:unique> + <xs:unique name="db_products_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true"> + <xs:selector xpath=".//mstns:db_products" /> + <xs:field xpath="mstns:productID" /> + </xs:unique> + </xs:element> +</xs:schema> \ No newline at end of file Added: Website/App_Code/dadDataSet.xss =================================================================== --- Website/App_Code/dadDataSet.xss (rev 0) +++ Website/App_Code/dadDataSet.xss 2006-07-07 23:33:22 UTC (rev 89) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--<autogenerated> + This code was generated by a tool to store the dataset designer's layout information. + Changes to this file may cause incorrect behavior and will be lost if + the code is regenerated. +</autogenerated>--> +<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="0" ViewPortY="0" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout"> + <Shapes> + <Shape ID="DesignTable:db_users" ZOrder="2" X="87" Y="57" Height="241" Width="201" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="194" /> + <Shape ID="DesignTable:db_products" ZOrder="1" X="381" Y="68" Height="241" Width="213" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="194" /> + </Shapes> + <Connectors /> +</DiagramLayout> \ No newline at end of file Modified: Website/App_Themes/Python/python.css =================================================================== --- Website/App_Themes/Python/python.css 2006-07-07 22:50:32 UTC (rev 88) +++ Website/App_Themes/Python/python.css 2006-07-07 23:33:22 UTC (rev 89) @@ -67,42 +67,27 @@ { padding-right: 30px; } +/********** END Header Content **********/ +/********** BEGIN Login Content **********/ /* Define the login information */ -#User table +#Login table { - display: inline; - margin-top: 15px; - position: relative; - top: 8px; + margin: 20px; } -#User table td -{ - display: inline; -} - -/* Define the username and password box sizes */ -#User #UserNameControl, #User #PasswordControl -{ - display: inline; -} - #UserNameControl input, #PasswordControl input { - width: 80px; + width: 100px; } -#User #RememberMeControl +#RememberMeControl { - display: inline; position: relative; top: 2px; left: -4px; } -/********** END Header Content **********/ - /********** BEGIN Footer Content **********/ #FooterContent A { Added: Website/Includes/Authenticate.ascx =================================================================== --- Website/Includes/Authenticate.ascx (rev 0) +++ Website/Includes/Authenticate.ascx 2006-07-07 23:33:22 UTC (rev 89) @@ -0,0 +1,163 @@ +<%@ Control Language="C#" ClassName="Authenticate" %> +<%@ Import Namespace="TCDB_Users" %> +<%@ Import Namespace="TCDB_Constants" %> +<%@ Import Namespace="TCDB_Products" %> +<%@ Import Namespace="System.Collections.Generic" %> +<%@ Import Namespace="System.Data" %> + +<script runat="server"> + + void Page_Load(Object sender, EventArgs e) + { + LoginUser.Visible = true; + CreateUser.Visible = false; + Results.Visible = false; + } + + protected void Login_Authenticate(object sender, EventArgs e) + { + + TCDB_User myUser = new TCDB_User(); + myUser = TCDB_UserDB.TCDB_AuthenticateUser(LoginUser.UserName, LoginUser.Password); + + if (myUser.USERID > TCDB_Constant.USER_ANONYMOUSUSERID) + { + // We have a valid user who is already in the DB + FormsAuthentication.SetAuthCookie(LoginUser.UserName, LoginUser.RememberMeSet); + Response.Redirect(FormsAuthentication.GetRedirectUrl(LoginUser.UserName, LoginUser.RememberMeSet)); + } + else if (myUser.USERID < TCDB_Constant.USER_ANONYMOUSUSERID) + { + // We have a valid user who needs to be added to the DB + + // Populate the new user control + cuUserName.Text = myUser.USERNAME; + cuFirstName.Text = myUser.FIRSTNAME; + cuLastName.Text = myUser.LASTNAME; + cuEmail.Text = myUser.EMAIL; + cuOfficePhone.Text = myUser.OFFICEPHONE; + cuHomePhone.Text = myUser.HOMEPHONE; + cuCellPhone.Text = myUser.CELLPHONE; + + // Populate the product with a list of products + // Create a table to store data for the DropDownListControl + DataTable dt = new DataTable(); + + // Define the columns used + dt.Columns.Add(new DataColumn("id", typeof(int))); + dt.Columns.Add(new DataColumn("name", typeof(string))); + + List<TCDB_Product> productList = TCDB_ProductDB.TCDB_GetProductList(true); + foreach (TCDB_Product product in productList) + { + DataRow dr = dt.NewRow(); + dr["id"] = product.PRODUCTID; + dr["name"] = product.NAME; + dt.Rows.Add(dr); + } + + // Create a DataView from dt to act as the ds for the control + cuProduct.DataSource = new DataView(dt); + + cuProduct.DataValueField = "id"; + cuProduct.DataTextField = "name"; + + // Bind the data to the control + cuProduct.DataBind(); + + // Hide the login control and show the new user control + LoginUser.Visible = false; + CreateUser.Visible = true; + Results.Visible = false; + } + } + + protected void Create_User(object sender, EventArgs e) + { + // TODO: make the call to the TCDB_UserDB.CreateUser or whatever to save the userinfo to the DB + + // TODO: Lookup the admin/lead for the selected product and send an action item to give permissions + + // TODO: Populate the results control with text from the DB + Results.Text = "Your user has been created. Please check with your product admin for access."; + + // Hide and show the appropriate controls + LoginUser.Visible = false; + CreateUser.Visible = false; + Results.Visible = true; + } +</script> + + +<asp:Login ID="LoginUser" OnAuthenticate="Login_Authenticate" runat="server"> + <LayoutTemplate> + Please login<br /> + <asp:Label ID="lblMessage" runat="server" Text="" /> + <div id="UserNameControl">Username: <asp:TextBox ID="UserName" runat="server" /></div><asp:RequiredFieldValidator ID="UserNameRequired" runat="server" ControlToValidate="UserName" Text="*" /> + <div id="PasswordControl">Password: <asp:TextBox ID="Password" runat="server" TextMode="password" /></div><asp:RequiredFieldValidator ID="PasswordRequired" runat="server" ControlToValidate="Password" Text="*" /> + <div id="RememberMeControl">Remember Me: <asp:CheckBox ID="RememberMe" runat="server" /></div> + <asp:LinkButton ID="LoginControl" CommandName="Login" Text="Login" runat="server" /> + </LayoutTemplate> +</asp:Login> + +<asp:Wizard ID="CreateUser" runat="server" DisplaySideBar="false" FinishCompleteButtonType="Link" FinishCompleteButtonText="Create User" OnFinishButtonClick="Create_User"> + <WizardSteps> + <asp:WizardStep ID="CreateUserStep1" runat="server" StepType="auto"> + <div id="Title">Please Verify Your Details</div> + <div id="UserName"><asp:Label ID="UserNameText" runat="server" AssociatedControlID="cuUserName">User Name:</asp:Label></div> + <div id="UserNameControl"> + <asp:TextBox ID="cuUserName" runat="server" ReadOnly="true"></asp:TextBox> + <as... [truncated message content] |
|
From: <ro...@us...> - 2006-07-25 21:17:17
|
Revision: 219 Author: rouquin Date: 2006-07-25 14:15:20 -0700 (Tue, 25 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=219&view=rev Log Message: ----------- Worked on the Remember me issue. I think I may just have been misunderstanding how it works. I expected it to have all my information when I come back, but it seems more like it will just let you be logged in when you come back. If you have to login it will still require you to type everything in. Anyhow, I increased the auth/session timeout from 30 minutes to 1440 (the entire day). Maybe that will help. Modified Paths: -------------- Website/App_Code/Assignments.cs Website/App_Code/Common.cs Website/App_Themes/Python/python.css Website/web.config Modified: Website/App_Code/Assignments.cs =================================================================== --- Website/App_Code/Assignments.cs 2006-07-25 19:58:26 UTC (rev 218) +++ Website/App_Code/Assignments.cs 2006-07-25 21:15:20 UTC (rev 219) @@ -106,7 +106,7 @@ { string subject = ConfigDB.GetConfigString("assignment_new_subject") + " " + ai.NAME; string body = ai.CREATOR.FULLNAME + " " + ConfigDB.GetConfigString("assignment_new_body") + - "<a href=\"" + ConfigDB.GetConfigString("site_url") + "Assignments.aspx?" + + "<a href=\"" + ConfigDB.GetConfigString("site_url") + "ActionItem.aspx?" + Constants.CODE_AI + "=" + ai.ID.ToString() + "\"> " + ai.NAME + "</a><br><br>-----------------------------------<br><br>" + ai.DESCRIPTION; @@ -133,7 +133,7 @@ { string subject = ConfigDB.GetConfigString("assignment_updated_subject") + " " + ai.NAME; string body = updatingUser.FULLNAME + " " + ConfigDB.GetConfigString("assignment_updated_body") + - "<a href=\"" + ConfigDB.GetConfigString("site_url") + "Assignments.aspx?" + + "<a href=\"" + ConfigDB.GetConfigString("site_url") + "ActionItem.aspx?" + Constants.CODE_AI + "=" + ai.ID.ToString() + "\"> " + ai.NAME + "</a><br><br>-------------------------------------------------------<br><br>" + ai.DESCRIPTION; bool result = true; @@ -178,7 +178,7 @@ string subject = ConfigDB.GetConfigString("assignment_completed_subject") + " " + ai.NAME; string body = updatingUser.FULLNAME + " " + ConfigDB.GetConfigString("assignment_completed_body") + - "<a href=\"" + ConfigDB.GetConfigString("site_url") + "Assignments.aspx?" + + "<a href=\"" + ConfigDB.GetConfigString("site_url") + "ActionItem.aspx?" + Constants.CODE_AI + "=" + ai.ID.ToString() + "\"> " + ai.NAME + "</a><br><br>-----------------------------------------------------------<br><br>" + ai.DESCRIPTION; Modified: Website/App_Code/Common.cs =================================================================== --- Website/App_Code/Common.cs 2006-07-25 19:58:26 UTC (rev 218) +++ Website/App_Code/Common.cs 2006-07-25 21:15:20 UTC (rev 219) @@ -162,19 +162,6 @@ "mail", "Specify the AD attribute that stores the users' email address")); - // uidnumber_attribute - values = new Dictionary<String, String>(); - group.Add(new Config("uidnumber_attribute", - "uidNumber AD Attribute Name", - "textbox", - values, - "", - false, - 1, - "schema", - "uidNumber", - "Specify the AD attribute that stores the users' ID")); - // homephone_attribute values = new Dictionary<String, String>(); group.Add(new Config("homephone_attribute", Modified: Website/App_Themes/Python/python.css =================================================================== --- Website/App_Themes/Python/python.css 2006-07-25 19:58:26 UTC (rev 218) +++ Website/App_Themes/Python/python.css 2006-07-25 21:15:20 UTC (rev 219) @@ -323,7 +323,7 @@ #Login label, #Login A { text-align: right; - width: 120px; + width: 0px; padding-right: 5px; } @@ -331,7 +331,7 @@ { position: relative; top: -4px; - left: 0px; + left: 80px; text-align: left; } Modified: Website/web.config =================================================================== --- Website/web.config 2006-07-25 19:58:26 UTC (rev 218) +++ Website/web.config 2006-07-25 21:15:20 UTC (rev 219) @@ -7,7 +7,7 @@ machine.config.comments usually located in \Windows\Microsoft.Net\Framework\v2.x\Config --> -<configuration> +<configuration xmlns="http://schemas.microsoft.com/.NetConfiguration/v2.0"> <!-- The configSections define a section for ASP.NET Atlas. --> @@ -90,7 +90,7 @@ <rollingStyle value="Size" /> <staticLogFileName value="true" /> <layout type="log4net.Layout.PatternLayout"> - <header value="[Opening log file] " /> + <header value="[Opening log file]
" /> <!--<footer value="[Footer] " />--> <conversionPattern value="%date [%thread] %5level [%logger] %message%newline%exception" /> <!--<conversionPattern value="%date [%thread] %5level %logger [%location] %message%newline %exception" />--> @@ -132,10 +132,7 @@ providerName="System.Data.SqlClient" /> </connectionStrings> <system.web> - <authentication mode="Forms"> - <forms loginUrl="login.aspx"/> - </authentication> - <sessionState mode="InProc" cookieless="false" timeout="30"/> + <sessionState mode="InProc" cookieless="false" timeout="1440"/> <pages styleSheetTheme="Python"> <!-- TODO: Make sure the theme is being pulled dynamically --> <controls> @@ -201,6 +198,7 @@ <authentication mode="Windows"/> --> + <authentication mode="Forms" /> <!-- The <customErrors> section enables configuration of what to do if/when an unhandled error occurs @@ -229,4 +227,11 @@ </system.web> </location> --> + <system.net> + <mailSettings> + <smtp from="tcdb.vintela.com"> + <network host="relay.quest.com" password="" userName="" /> + </smtp> + </mailSettings> + </system.net> </configuration> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <m_h...@us...> - 2006-07-31 17:09:37
|
Revision: 241 Author: m_hildebrand Date: 2006-07-31 10:09:29 -0700 (Mon, 31 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=241&view=rev Log Message: ----------- Added "add user" icon and appropriate css styles for it Changed the order of items in the footer Modified Paths: -------------- Website/Administration.aspx Website/App_Themes/Python/python.css Website/Includes/Footer.ascx Added Paths: ----------- Website/App_Themes/Python/Images/user_add_32.png Modified: Website/Administration.aspx =================================================================== --- Website/Administration.aspx 2006-07-31 15:39:18 UTC (rev 240) +++ Website/Administration.aspx 2006-07-31 17:09:29 UTC (rev 241) @@ -9,7 +9,7 @@ <tr> <td align="center" valign="middle"> <!-- ***NONPRODUCTION***<asp:LinkButton ID="newProduct" runat="server" PostBackUrl="~/Product.aspx?mode=new">New Product</asp:LinkButton> --> - <asp:LinkButton ID="newUser" runat="server" PostBackUrl="~/UserSettings.aspx?mode=new">New User</asp:LinkButton></td> + <div class="button"><asp:LinkButton ID="newUser" runat="server" PostBackUrl="~/UserSettings.aspx?mode=new"><img src="App_Themes/Python/Images/user_add_32.png" alt="New User" />New User</asp:LinkButton></div></td> </tr> </table> </asp:Content> Added: Website/App_Themes/Python/Images/user_add_32.png =================================================================== (Binary files differ) Property changes on: Website/App_Themes/Python/Images/user_add_32.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: Website/App_Themes/Python/python.css =================================================================== --- Website/App_Themes/Python/python.css 2006-07-31 15:39:18 UTC (rev 240) +++ Website/App_Themes/Python/python.css 2006-07-31 17:09:29 UTC (rev 241) @@ -121,6 +121,18 @@ list-style-type: circle; } +.button +{ + display: inline; +} + +.button IMG +{ + display: block; + border: none; +} + + /********** END Global Classes **********/ /********** BEGIN Calendar Classes **********/ Modified: Website/Includes/Footer.ascx =================================================================== --- Website/Includes/Footer.ascx 2006-07-31 15:39:18 UTC (rev 240) +++ Website/Includes/Footer.ascx 2006-07-31 17:09:29 UTC (rev 241) @@ -1,6 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" Inherits="Footer" CodeFile="Footer.ascx.cs" %> -\xA9 2006 <a href="http://www.quest.com">Quest Software, Inc.</a> | TCDB -<%= TCDB.Common.ConfigDB.GetConfigString("tcdb_version") %> +\xA9 2006 <a href="http://www.quest.com">Quest Software, Inc.</a> <% if (m_user.ISAUTHENTICATED) { @@ -9,5 +8,7 @@ Map</a><% } %> + | TCDB +<%= TCDB.Common.ConfigDB.GetConfigString("tcdb_version") %> | Page loaded in <%= PageLoad() %> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <m_h...@us...> - 2006-07-31 21:10:27
|
Revision: 246 Author: m_hildebrand Date: 2006-07-31 14:10:19 -0700 (Mon, 31 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=246&view=rev Log Message: ----------- More pretty icons Modified Paths: -------------- Website/Administration.aspx Website/App_Themes/Python/Python.skin Website/App_Themes/Python/python.css Added Paths: ----------- Website/App_Themes/Python/Images/user_role_48.png Modified: Website/Administration.aspx =================================================================== --- Website/Administration.aspx 2006-07-31 20:39:34 UTC (rev 245) +++ Website/Administration.aspx 2006-07-31 21:10:19 UTC (rev 246) @@ -9,7 +9,15 @@ <tr> <td align="center" valign="middle"> <!-- ***NONPRODUCTION***<asp:LinkButton ID="newProduct" runat="server" PostBackUrl="~/Product.aspx?mode=new">New Product</asp:LinkButton> --> - <div class="button"><asp:LinkButton ID="newUser" runat="server" PostBackUrl="~/UserSettings.aspx?mode=new"><asp:Image runat="server" SkinID="newUserImage" AlternateText="New User" />New User</asp:LinkButton></div></td> + <div class="button"> + <asp:LinkButton ID="newUser" runat="server" PostBackUrl="~/UserSettings.aspx?mode=new"> + <asp:Image ID="newUserIcon" runat="server" SkinID="newUserImage" AlternateText="New User" />New + User</asp:LinkButton></div> + <div class="button"> + <asp:LinkButton ID="userRole" runat="server" PostBackUrl="~/AdminRole.aspx?p=1"> + <asp:Image ID="userRoleIcon" runat="server" SkinID="userRoleImage" AlternateText="User Roles" />User + Roles</asp:LinkButton></div> + </td> </tr> </table> </asp:Content> Added: Website/App_Themes/Python/Images/user_role_48.png =================================================================== (Binary files differ) Property changes on: Website/App_Themes/Python/Images/user_role_48.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: Website/App_Themes/Python/Python.skin =================================================================== --- Website/App_Themes/Python/Python.skin 2006-07-31 20:39:34 UTC (rev 245) +++ Website/App_Themes/Python/Python.skin 2006-07-31 21:10:19 UTC (rev 246) @@ -22,6 +22,7 @@ --%> <asp:GridView runat="server" SkinId="assignments" Width="100%" /> <asp:Image runat="server" SkinId="newUserImage" ImageUrl="Images/user_add_48.png" /> +<asp:Image runat="server" SkinId="userRoleImage" ImageUrl="Images/user_role_48.png" /> <asp:Image runat="server" SkinId="priority_high_small" ImageUrl="Images/priority_high_small.png" /> <asp:Image runat="server" SkinId="priority_high_large" ImageUrl="Images/priority_high_large.png" /> <asp:Image runat="server" SkinId="priority_normal_small" ImageUrl="" /> Modified: Website/App_Themes/Python/python.css =================================================================== --- Website/App_Themes/Python/python.css 2006-07-31 20:39:34 UTC (rev 245) +++ Website/App_Themes/Python/python.css 2006-07-31 21:10:19 UTC (rev 246) @@ -124,12 +124,34 @@ .button { display: inline; + position: relative; + top: 15px; + left: -20px; } +.button LABEL +{ + position: relative; + left: -30px; + top: 3px; + text-decoration: none; +} + +.button A +{ + text-decoration: none; + font-weight: bold; +} + + .button IMG { - display: block; + /*display: block;*/ border: none; + position: relative; + left: 30px; + top: -3px; + z-index: -10; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ro...@us...> - 2006-08-04 21:21:43
|
Revision: 273 Author: rouquin Date: 2006-08-04 14:21:34 -0700 (Fri, 04 Aug 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=273&view=rev Log Message: ----------- Did a bunch of rights work on the administration branch. Tested as a VAS Administrator. Modified Paths: -------------- Website/Administration.aspx Website/Includes/ActionItems.ascx Website/Includes/ActionItems.ascx.cs Website/Includes/AdministrationTree.ascx.cs Website/Includes/UserSettings.ascx Website/Includes/UserSettings.ascx.cs Modified: Website/Administration.aspx =================================================================== --- Website/Administration.aspx 2006-08-04 19:31:36 UTC (rev 272) +++ Website/Administration.aspx 2006-08-04 21:21:34 UTC (rev 273) @@ -1,23 +1,13 @@ <%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" Title="TCDB: Administration" %> <%@ Register Src="~/Includes/AdministrationTree.ascx" TagPrefix="admin" TagName="Tree" %> +<%@ Register Src="~/Includes/Administration.ascx" TagPrefix="admin" TagName="Nav" %> + <asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" runat="Server"> <admin:Tree runat="server" ID="Tree" /> </asp:Content> <asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" runat="Server"> - <div class="pictureMenu"> - <% if (TCDB.Common.Constants.IS_DEV_ENV) - { %> - <asp:LinkButton ID="newProduct" runat="server" PostBackUrl="~/Product.aspx?mode=new">New Product</asp:LinkButton> <% } %> - <div class="button"> - <asp:LinkButton ID="newUser" runat="server" PostBackUrl="~/UserSettings.aspx?mode=new"> - <asp:Image ID="newUserIcon" runat="server" SkinID="newUserImage" AlternateText="New User" />New - User</asp:LinkButton></div> - <div class="button"> - <asp:LinkButton ID="userRole" runat="server" PostBackUrl="~/AdminRole.aspx"> - <asp:Image ID="userRoleIcon" runat="server" SkinID="userRoleImage" AlternateText="User Roles" />User - Roles</asp:LinkButton></div> - </div> + <admin:Nav runat="server" ID="Nav" /> </asp:Content> <asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" runat="Server"> </asp:Content> Modified: Website/Includes/ActionItems.ascx =================================================================== --- Website/Includes/ActionItems.ascx 2006-08-04 19:31:36 UTC (rev 272) +++ Website/Includes/ActionItems.ascx 2006-08-04 21:21:34 UTC (rev 273) @@ -216,9 +216,7 @@ </div> <div class="item"> <label> - Assigned To:</label><asp:DropDownList ID="assignedTo" runat="server" DataSourceID="UserDataSource" - DataTextField="fullName" DataValueField="userID" SelectedValue='<%# Bind("assignedID") %>' - OnDataBound="assignedTo_DataBound"> + Assigned To:</label><asp:DropDownList ID="assignedTo" runat="server" SelectedValue='<%# Bind("assignedID") %>' OnInit="assignedTo_Init"> </asp:DropDownList> </div> </div> @@ -302,9 +300,8 @@ ToolTip='<%# Bind("creatorID") %>'></asp:Label></div> <div class="item"> <label> - Assigned To:</label><asp:DropDownList ID="assignedTo" runat="server" DataSourceID="UserDataSource" - DataTextField="fullName" DataValueField="userID" AppendDataBoundItems="True" - SelectedValue='<%# Bind("assignedID") %>' OnDataBound="assignedTo_DataBound"> + Assigned To:</label><asp:DropDownList ID="assignedTo" runat="server" + SelectedValue='<%# Bind("assignedID") %>' OnInit="assignedTo_Init"> </asp:DropDownList></div> </div> <div class="end"> Modified: Website/Includes/ActionItems.ascx.cs =================================================================== --- Website/Includes/ActionItems.ascx.cs 2006-08-04 19:31:36 UTC (rev 272) +++ Website/Includes/ActionItems.ascx.cs 2006-08-04 21:21:34 UTC (rev 273) @@ -368,13 +368,6 @@ !(ai.CREATOR.ID == m_user.ID && m_user.HasRight("status_created_ai", productID)))) dateFinished.Enabled = false; } - protected void assignedTo_DataBound(object sender, EventArgs e) - { - DropDownList assignedTo = (DropDownList)ActionItemsView.FindControl("assignedTo"); - - if (!m_user.HasRight("create_other_ai", Constants.PRODUCT_ANYID)) - assignedTo.Enabled = false; - } protected void NewButton_Init(object sender, EventArgs e) { LinkButton newBtn = (LinkButton)sender; @@ -403,4 +396,41 @@ !(ai.CREATOR.ID == m_user.ID && m_user.HasRight("delete_created_ai", productID))) deleteBtn.Visible = false; } + protected void assignedTo_Init(object sender, EventArgs e) + { + DropDownList assignedTo = (DropDownList)sender; + + if (!m_user.HasRight("create_other_ai", Constants.PRODUCT_ANYID)) + { + assignedTo.Enabled = false; + assignedTo.Items.Add(new ListItem(m_user.FULLNAME, m_user.ID.ToString())); + } + else + { + assignedTo.Enabled = true; + + tcdbDataSetTableAdapters.db_productsTableAdapter pAdapter = new tcdbDataSetTableAdapters.db_productsTableAdapter(); + tcdbDataSet.db_productsDataTable pTable = pAdapter.GetData(true, null); + tcdbDataSetTableAdapters.db_roleProductUserTableAdapter rpuAdapter = new tcdbDataSetTableAdapters.db_roleProductUserTableAdapter(); + + foreach (tcdbDataSet.db_productsRow pRow in pTable) + { + if (m_user.HasRight("create_other_ai",pRow.productID)) + { + tcdbDataSet.db_roleProductUserDataTable rpuTable = rpuAdapter.GetData(null, pRow.productID, true); + + int lastID = -1; + foreach (tcdbDataSet.db_roleProductUserRow rpuRow in rpuTable) + { + if (lastID == rpuRow.userID) + continue; + lastID = rpuRow.userID; + + assignedTo.Items.Add(new ListItem(rpuRow.fullName, rpuRow.userID.ToString())); + } + } + } + + } + } } Modified: Website/Includes/AdministrationTree.ascx.cs =================================================================== --- Website/Includes/AdministrationTree.ascx.cs 2006-08-04 19:31:36 UTC (rev 272) +++ Website/Includes/AdministrationTree.ascx.cs 2006-08-04 21:21:34 UTC (rev 273) @@ -21,7 +21,7 @@ protected void Page_Load(object sender, EventArgs e) { if (!m_user.ISAUTHENTICATED) { return; } - if (!m_user.HasRight("view_admin", Constants.PRODUCT_ANYID)) + if (this.Visible && !m_user.HasRight("view_admin", Constants.PRODUCT_ANYID)) Response.Redirect("~/Assignments.aspx?" + Constants.CODE_USER + "=" + m_user.ID); } @@ -56,23 +56,26 @@ { foreach (tcdbDataSet.db_productsRow row in productTable) { - // Create the new node. - TreeNode newNode = new TreeNode(); - newNode.Text = "<product>" + row.name + "</product>"; - newNode.Value = row.productID.ToString(); + if (m_user.HasRight("view_product", row.productID)) + { + // Create the new node. + TreeNode newNode = new TreeNode(); + newNode.Text = "<product>" + row.name + "</product>"; + newNode.Value = row.productID.ToString(); - // Set the PopulateOnDemand property to true so that the child nodes can be - // dynamically populated. - newNode.PopulateOnDemand = true; + // Set the PopulateOnDemand property to true so that the child nodes can be + // dynamically populated. + newNode.PopulateOnDemand = true; - // Set additional properties for the node. - newNode.SelectAction = TreeNodeSelectAction.Expand; - newNode.NavigateUrl = "~/Product.aspx?" + Constants.CODE_PRODUCT + "=" + newNode.Value; + // Set additional properties for the node. + newNode.SelectAction = TreeNodeSelectAction.Expand; + newNode.NavigateUrl = "~/Product.aspx?" + Constants.CODE_PRODUCT + "=" + newNode.Value; - // Add the new node to the ChildNodes collection of the parent node. - parent.ChildNodes.Add(newNode); - if (nodes.Contains(newNode.ValuePath)) - newNode.Expand(); + // Add the new node to the ChildNodes collection of the parent node. + parent.ChildNodes.Add(newNode); + if (nodes.Contains(newNode.ValuePath)) + newNode.Expand(); + } } } } @@ -361,6 +364,7 @@ tcdbDataSetTableAdapters.db_roleProductUserTableAdapter userAdapter = new tcdbDataSetTableAdapters.db_roleProductUserTableAdapter(); tcdbDataSet.db_roleProductUserDataTable userTable = userAdapter.GetData(null, Convert.ToInt32(parent.Parent.Value), true); int lastID = -1; + int productID = Convert.ToInt32(parent.Parent.Value); foreach (tcdbDataSet.db_roleProductUserRow row in userTable) { @@ -369,15 +373,18 @@ else lastID = row.userID; - // Create the new node. - TreeNode newNode = new TreeNode(); - newNode.Text = row.fullName; - newNode.Value = row.userID.ToString(); ; - newNode.PopulateOnDemand = true; - newNode.SelectAction = TreeNodeSelectAction.Expand; - newNode.NavigateUrl = "~/UserSettings.aspx?"+Constants.CODE_USER+"=" + newNode.Value; - parent.ChildNodes.Add(newNode); - newNode.Expand(); + if (m_user.HasRight("view_other_settings", productID)) + { + // Create the new node. + TreeNode newNode = new TreeNode(); + newNode.Text = row.fullName; + newNode.Value = row.userID.ToString(); ; + newNode.PopulateOnDemand = true; + newNode.SelectAction = TreeNodeSelectAction.Expand; + newNode.NavigateUrl = "~/UserSettings.aspx?" + Constants.CODE_PRODUCT + "=" + productID + "&" + Constants.CODE_USER + "=" + newNode.Value; + parent.ChildNodes.Add(newNode); + newNode.Expand(); + } } } protected void BuildAllUserList(TreeNode parent) Modified: Website/Includes/UserSettings.ascx =================================================================== --- Website/Includes/UserSettings.ascx 2006-08-04 19:31:36 UTC (rev 272) +++ Website/Includes/UserSettings.ascx 2006-08-04 21:21:34 UTC (rev 273) @@ -92,11 +92,8 @@ runat="server" ID="newLabel" OnLoad="newLabel_Load"> | </asp:Label> <asp:LinkButton ID="Edit" runat="server" CommandName="Edit" OnInit="Edit_Init">Edit User</asp:LinkButton><asp:Label runat="server" ID="editLabel" OnLoad="editLabel_Load"> | </asp:Label> - <% if (TCDB.Common.Constants.IS_DEV_ENV) - { %> <asp:LinkButton ID="editConfig" runat="server" CommandName="editConfig" OnCommand="editConfig" OnInit="editConfig_Init">Preferences</asp:LinkButton> - <% } %> <asp:Label runat="server" ID="deleteLabel" OnLoad="deleteLabel_Load"> | </asp:Label><asp:LinkButton ID="Delete" runat="server" CommandName="Delete" OnLoad="deleteButton_Load">Delete</asp:LinkButton> </div> @@ -309,9 +306,9 @@ <asp:LinkButton ID="UpdateCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" Text="Cancel" /> | <asp:LinkButton ID="sync" runat="server" Text="Sync with AD" OnCommand="SyncWithAD" /> - <!-- + <asp:Label ID="passwordLbl" runat="server" Text="Password: "></asp:Label><asp:TextBox - ID="passwordBox" runat="server" TextMode="Password"></asp:TextBox>--> + ID="passwordBox" runat="server" TextMode="Password"></asp:TextBox> </div> <div class="right"> </div> Modified: Website/Includes/UserSettings.ascx.cs =================================================================== --- Website/Includes/UserSettings.ascx.cs 2006-08-04 19:31:36 UTC (rev 272) +++ Website/Includes/UserSettings.ascx.cs 2006-08-04 21:21:34 UTC (rev 273) @@ -20,21 +20,31 @@ { private static ILog m_logg = LogManager.GetLogger("Page:UserSettings"); int userID = Convert.ToInt32(HttpContext.Current.Request.QueryString[Constants.CODE_USER]); + User user; String mode = HttpContext.Current.Request.QueryString["mode"]; - String product = HttpContext.Current.Request.QueryString[Constants.CODE_PRODUCT]; + int productID = Convert.ToInt32(HttpContext.Current.Request.QueryString[Constants.CODE_PRODUCT]); protected void Page_Load(object sender, EventArgs e) { + // input check if (!m_user.ISAUTHENTICATED) { return; } - if (!m_user.HasRight("view_my_settings", Constants.PRODUCT_ANYID)) - Response.Redirect("~/Assignments.aspx?" + Constants.CODE_USER + "=" + m_user.ID); - - m_logg.Debug("Loading page UserSettings"); if (userID == 0) { m_logg.Debug("Unable to locate user ID in query string. Default to current user"); userID = m_user.ID; } + + // Get user + user = UserDB.GetUserInfo(userID); + + // Rights check + if (userID == m_user.ID && !m_user.HasRight("view_my_settings", productID)) + Response.Redirect("~/Assignments.aspx?" + Constants.CODE_USER + "=" + m_user.ID); + if (userID != m_user.ID && !(user.HasRights(productID) && m_user.HasRight("view_other_settings", productID))) + Response.Redirect("~/UserSettings.aspx?" + Constants.CODE_USER + "=" + m_user.ID); + + // Settings init + m_logg.Debug("Loading page UserSettings"); Session.Add("userID", userID); Session.Add("tableName", "tcdb_user"); @@ -44,61 +54,67 @@ protected void deleteButton_Load(object sender, EventArgs e) { - if (mode == "read" || !m_user.HasRight("delete_user", Constants.PRODUCT_ANYID) || userID == m_user.ID) - { - LinkButton deleteButton = (LinkButton)UserSettingsView.FindControl("New"); + LinkButton deleteButton = (LinkButton)sender; + if (user == null) user = UserDB.GetUserInfo(userID); + + if ( mode == "read" || !(user.HasRights(productID) && m_user.HasRight("delete_user", productID)) || userID == m_user.ID) deleteButton.Visible = false; - } } protected void newButton_Load(object sender, EventArgs e) { - if (mode == "read" || !m_user.HasRight("create_user", Constants.PRODUCT_ANYID)) - { - LinkButton deleteButton = (LinkButton)UserSettingsView.FindControl("Delete"); - deleteButton.Visible = false; - } + LinkButton newButton = (LinkButton)sender; + if (user == null) user = UserDB.GetUserInfo(userID); + + if (mode == "read" || !(user.HasRights(productID) && m_user.HasRight("create_user", Constants.PRODUCT_ANYID))) + newButton.Visible = false; } protected void Edit_Init(object sender, EventArgs e) { LinkButton editBtn = (LinkButton)sender; + if (user == null) user = UserDB.GetUserInfo(userID); + if ( (userID == m_user.ID && !m_user.HasRight("edit_my_settings", Constants.PRODUCT_ANYID)) && - (mode != "read" && !m_user.HasRight("edit_other_settings", Constants.PRODUCT_ANYID))) + (mode != "read" && !(user.HasRights(productID) && m_user.HasRight("edit_other_settings", productID)))) editBtn.Visible = false; } protected void editConfig_Init(object sender, EventArgs e) { LinkButton editConfigBtn = (LinkButton)sender; + if (user == null) user = UserDB.GetUserInfo(userID); - if (!m_user.HasRight("view_my_preferences", Constants.PRODUCT_ANYID)) + if ((userID == m_user.ID && !m_user.HasRight("edit_my_settings", Constants.PRODUCT_ANYID)) && + (mode != "read" && !(user.HasRights(productID) && m_user.HasRight("edit_other_settings", productID)))) editConfigBtn.Visible = false; } protected void deleteLabel_Load(object sender, EventArgs e) { - if (mode == "read" || !m_user.HasRight("delete_user", Constants.PRODUCT_ANYID) || userID == m_user.ID) - { - Label deleteLabel = (Label)UserSettingsView.FindControl("deleteLabel"); + Label deleteLabel = (Label)sender; + if (user == null) user = UserDB.GetUserInfo(userID); + + if (mode == "read" || !(user.HasRights(productID) && m_user.HasRight("delete_user", productID)) || userID == m_user.ID) deleteLabel.Visible = false; - } } protected void newLabel_Load(object sender, EventArgs e) { - if (mode == "read" || !m_user.HasRight("create_user",Constants.PRODUCT_ANYID)) - { - Label newLabel = (Label)UserSettingsView.FindControl("newLabel"); + Label newLabel = (Label)sender; + if (user == null) user = UserDB.GetUserInfo(userID); + + if (mode == "read" || !(user.HasRights(productID) && m_user.HasRight("create_user", Constants.PRODUCT_ANYID))) newLabel.Visible = false; - } } protected void editLabel_Load(object sender, EventArgs e) { - Label editLabel = (Label)UserSettingsView.FindControl("editLabel"); + Label editLabel = (Label)sender; + if (user == null) user = UserDB.GetUserInfo(userID); - if (!m_user.HasRight("delete_user",Constants.PRODUCT_ANYID)) + if ((userID == m_user.ID && !m_user.HasRight("view_my_preferences", Constants.PRODUCT_ANYID)) || + (userID != m_user.ID && !(user.HasRights(productID) && m_user.HasRight("view_other_preferences", productID)))) editLabel.Visible = false; } @@ -141,7 +157,7 @@ tcdbDataSetTableAdapters.db_roleUserProductTableAdapter rupAdapter = new tcdbDataSetTableAdapters.db_roleUserProductTableAdapter(); Dictionary<String, ArrayList> ProductRoles = (Dictionary<String, ArrayList>)Session["ProductRoles"]; - /* + // Clear roles rupAdapter.upd_userRoleProduct(userID, null, null, false); @@ -157,8 +173,8 @@ rupAdapter.ins_userRoleProduct(userID, roleID, productID); } } - */ - + + /* tcdbDataSetTableAdapters.db_productsTableAdapter pAdapter = new tcdbDataSetTableAdapters.db_productsTableAdapter(); tcdbDataSet.db_productsDataTable pTable = pAdapter.GetData(true, null); tcdbDataSetTableAdapters.db_roleTableAdapter rAdapter = new tcdbDataSetTableAdapters.db_roleTableAdapter(); @@ -179,6 +195,7 @@ } } + * */ } protected void SyncWithAD(object sender, CommandEventArgs e) @@ -268,7 +285,8 @@ { Literal roleTree = (Literal)sender; - if (m_user.HasRight("view_my_roles", Constants.PRODUCT_ANYID)) + if ( (userID == m_user.ID && m_user.HasRight("view_my_roles", Constants.PRODUCT_ANYID)) || + (userID != m_user.ID && m_user.HasRight("view_other_roles", Constants.PRODUCT_ANYID))) { roleTree.Visible = true; roleTree.ID = "roleTree"; @@ -286,21 +304,25 @@ foreach (tcdbDataSet.db_productsRow pRow in pTable) { - // Get Roles - tcdbDataSetTableAdapters.db_roleUserProductTableAdapter rupAdapter = new tcdbDataSetTableAdapters.db_roleUserProductTableAdapter(); - tcdbDataSet.db_roleUserProductDataTable rupTable = rupAdapter.GetData(userID, pRow.productID, true); - ArrayList roles = new ArrayList(); + if ((userID == m_user.ID && m_user.HasRight("view_my_roles", pRow.productID)) || + (userID != m_user.ID && m_user.HasRight("view_other_roles", pRow.productID))) + { + // Get Roles + tcdbDataSetTableAdapters.db_roleUserProductTableAdapter rupAdapter = new tcdbDataSetTableAdapters.db_roleUserProductTableAdapter(); + tcdbDataSet.db_roleUserProductDataTable rupTable = rupAdapter.GetData(userID, pRow.productID, true); + ArrayList roles = new ArrayList(); - foreach (tcdbDataSet.db_roleUserProductRow rupRow in rupTable) - roles.Add(rupRow.roleName); + foreach (tcdbDataSet.db_roleUserProductRow rupRow in rupTable) + roles.Add(rupRow.roleName); - if (roles.Count > 0) - ProductRoles[pRow.name] = roles; + if (roles.Count > 0) + ProductRoles[pRow.name] = roles; + } } // Setup list foreach (String product in ProductRoles.Keys) - { + { roleTree.Text += "\t<li><strong>" + product + "</strong>\n"; roleTree.Text += "\t\t<ul>\n"; @@ -361,14 +383,17 @@ foreach (tcdbDataSet.db_productsRow row in pTable) { - TreeNode child = new TreeNode(); - child.Text = "<label>" + row.name + "</label>"; - child.Value = row.productID.ToString(); - child.SelectAction = TreeNodeSelectAction.Select; - child.PopulateOnDemand = true; - child.ShowCheckBox = false; + if (m_user.HasRight("edit_role_users", row.productID)) + { + TreeNode child = new TreeNode(); + child.Text = "<label>" + row.name + "</label>"; + child.Value = row.productID.ToString(); + child.SelectAction = TreeNodeSelectAction.Select; + child.PopulateOnDemand = true; + child.ShowCheckBox = false; - parent.ChildNodes.Add(child); + parent.ChildNodes.Add(child); + } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <m_h...@us...> - 2006-08-11 19:48:39
|
Revision: 310 Author: m_hildebrand Date: 2006-08-11 12:48:28 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=310&view=rev Log Message: ----------- Cleaned up some session state stuff Changed constants from static variables to actual constants Modified Paths: -------------- Website/App_Code/Common.cs Website/Assignments.aspx Website/Includes/ActionItems.ascx Website/Includes/ActionItems.ascx.cs Website/Includes/AdministrationTree.ascx Website/Includes/AdministrationTree.ascx.cs Website/Includes/Assignments.ascx Website/Includes/Assignments.ascx.cs Website/Includes/AssignmentsTree.ascx Website/Includes/AssignmentsTree.ascx.cs Website/Includes/Authenticate.ascx.cs Website/Includes/Header_Menu.ascx.cs Website/Includes/Header_User.ascx.cs Modified: Website/App_Code/Common.cs =================================================================== --- Website/App_Code/Common.cs 2006-08-11 19:46:14 UTC (rev 309) +++ Website/App_Code/Common.cs 2006-08-11 19:48:28 UTC (rev 310) @@ -4,6 +4,7 @@ using System.Net.Mail; using System.Web; using System.Web.Security; +using System.Web.SessionState; using System.Web.UI; using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; @@ -659,7 +660,7 @@ Dictionary<String, List<Config>> settings = new Dictionary<string, List<Config>>(); Dictionary<String, String> values; List<Config> group; - + // Start clean settings.Clear(); @@ -1270,7 +1271,7 @@ } } catch (Exception ex) - { + { m_logg.Debug("Error saving config string [" + name + " = " + value + "] for userID [" + userID.ToString() + "]", ex); } @@ -1385,125 +1386,127 @@ public static class Constants { // TODO: Load the values from the DB where appropriate - public static int FAILEDLOGIN = -2; - public static int NOTREGISTERED = -1; - public static int NEWUSER = -1; + public const int FAILEDLOGIN = -2; + public const int NOTREGISTERED = -1; + public const int NEWUSER = -1; // Defaults in the database - public static int ANONYMOUSUSERID = 1; - public static int PRODUCT_SITEID = 1; - public static int PRODUCT_ANYID = -1; - public static int PRODUCT_CREATED = -2; + public const int ANONYMOUSUSERID = 1; + public const int PRODUCT_SITEID = 1; + public const int PRODUCT_ANYID = -1; + public const int PRODUCT_CREATED = -2; - public static int ROLE_ADMIN = 1; + public const int ROLE_ADMIN = 1; public static int ROLE_BASIC_USER = 2; - public static string CODE_AI = "ai"; - public static string CODE_ASSIGNMENT = "a"; - public static string CODE_BUILD = "b"; - public static string CODE_CREATED = "created"; - public static string CODE_MODE = "m"; - public static string CODE_PRODUCT = "p"; - public static string CODE_RIGHT = "rt"; - public static string CODE_ROLE = "r"; - public static string CODE_TYPE = "t"; - public static string CODE_USER = "u"; - public static string CODE_VERSION = "v"; - public static string CODE_WO = "wo"; - + public const string CODE_ASSIGNMENT = "a"; + public const string CODE_USER = "u"; + public const string CODE_AI = "ai"; + public const string CODE_WO = "wo"; + public const string CODE_BUILD = "b"; + public const string CODE_PRODUCT = "p"; + public const string CODE_VERSION = "v"; + public const string CODE_RIGHT = "rt"; + public const string CODE_ROLE = "r"; + public const string CODE_MODE = "m"; + public const string CODE_CREATED = "created"; + public const string CODE_TYPE = "t"; + public const string CODE_VALUE = "va"; + public const string CODE_ROOT = "r"; + public const string CODE_NEW = "new"; // TODO: figure this one out - //public static bool ASSIGNMENT_PRIORITY_ALL = null; - public static bool ASSIGNMENT_PRIORITY_HIGH = true; - public static bool ASSIGNMENT_PRIORITY_NORMAL = false; - public static int ASSIGNMENT_FINISHEDANDUNFINISHED = 2; - public static int ASSIGNMENT_FINISHED = 1; - public static int ASSIGNMENT_UNFINISHED = 0; - public static int ASSIGNMENT_NEW = 3; - public static string ASSIGNMENT_MINE = "My Assignments"; - public static string ASSIGNMENT_CREATED = "My Created Assignments"; + //public const bool ASSIGNMENT_PRIORITY_ALL = null; + public const bool ASSIGNMENT_PRIORITY_HIGH = true; + public const bool ASSIGNMENT_PRIORITY_NORMAL = false; + public const int ASSIGNMENT_FINISHEDANDUNFINISHED = 2; + public const int ASSIGNMENT_FINISHED = 1; + public const int ASSIGNMENT_UNFINISHED = 0; + public const int ASSIGNMENT_NEW = 3; + public const string ASSIGNMENT_MINE = "My Assignments"; + public const string ASSIGNMENT_CREATED = "My Created Assignments"; - public static string TCDB_VERSION = "1.0.0 Alpha 3"; - public static bool IS_DEV_ENV = true; + public const string TCDB_VERSION = "1.0.0 Alpha 3"; + public const bool IS_DEV_ENV = true; // Rights - public static string RIGHTS_DEV_ACCESS = "dev_access"; + public const string RIGHTS_DEV_ACCESS = "dev_access"; - public static string RIGHTS_ADMIN_VIEW = "admin_view"; + public const string RIGHTS_ADMIN_VIEW = "admin_view"; - public static string RIGHTS_AI_VIEW_MY = "ai_view_my"; - public static string RIGHTS_AI_VIEW_CREATED = "ai_view_created"; - public static string RIGHTS_AI_VIEW_OTHER = "ai_view_other"; - public static string RIGHTS_AI_EDIT_MY = "ai_edit_my"; - public static string RIGHTS_AI_EDIT_CREATED = "ai_edit_created"; - public static string RIGHTS_AI_EDIT_OTHER = "ai_edit_other"; - public static string RIGHTS_AI_CREATE_MY = "ai_create_my"; - public static string RIGHTS_AI_CREATE_OTHER = "ai_create_other"; - public static string RIGHTS_AI_STATUS_MY = "ai_status_my"; - public static string RIGHTS_AI_STATUS_CREATED = "ai_status_created"; - public static string RIGHTS_AI_STATUS_OTHER = "ai_status_other"; - public static string RIGHTS_AI_DELETE_MY = "ai_delete_my"; - public static string RIGHTS_AI_DELETE_CREATED = "ai_delete_created"; - public static string RIGHTS_AI_DELETE_OTHER = "ai_delete_other"; - public static string RIGHTS_AI_REASSIGN_OTHER = "ai_reassign_other"; - - public static string RIGHTS_WO_VIEW_MY = "wo_view_my"; - public static string RIGHTS_WO_VIEW_CREATED = "wo_view_created"; - public static string RIGHTS_WO_VIEW_OTHER = "wo_view_other"; - public static string RIGHTS_WO_EDIT_MY = "wo_edit_my"; - public static string RIGHTS_WO_EDIT_CREATED = "wo_edit_created"; - public static string RIGHTS_WO_EDIT_OTHER = "wo_edit_other"; - public static string RIGHTS_WO_CREATE_MY = "wo_create_my"; - public static string RIGHTS_WO_CREATE_OTHER = "wo_create_other"; - public static string RIGHTS_WO_STATUS_MY = "wo_status_my"; - public static string RIGHTS_WO_STATUS_CREATED = "wo_status_created"; - public static string RIGHTS_WO_STATUS_OTHER = "wo_status_other"; - public static string RIGHTS_WO_DELETE_MY = "wo_delete_my"; - public static string RIGHTS_WO_DELETE_CREATED = "wo_delete_created"; - public static string RIGHTS_WO_DELETE_OTHER = "wo_delete_other"; - public static string RIGHTS_WO_REASSIGN_OTHER = "wo_reassign_other"; + public const string RIGHTS_AI_VIEW_MY = "ai_view_my"; + public const string RIGHTS_AI_VIEW_CREATED = "ai_view_created"; + public const string RIGHTS_AI_VIEW_OTHER = "ai_view_other"; + public const string RIGHTS_AI_EDIT_MY = "ai_edit_my"; + public const string RIGHTS_AI_EDIT_CREATED = "ai_edit_created"; + public const string RIGHTS_AI_EDIT_OTHER = "ai_edit_other"; + public const string RIGHTS_AI_CREATE_MY = "ai_create_my"; + public const string RIGHTS_AI_CREATE_OTHER = "ai_create_other"; + public const string RIGHTS_AI_STATUS_MY = "ai_status_my"; + public const string RIGHTS_AI_STATUS_CREATED = "ai_status_created"; + public const string RIGHTS_AI_STATUS_OTHER = "ai_status_other"; + public const string RIGHTS_AI_DELETE_MY = "ai_delete_my"; + public const string RIGHTS_AI_DELETE_CREATED = "ai_delete_created"; + public const string RIGHTS_AI_DELETE_OTHER = "ai_delete_other"; + public const string RIGHTS_AI_REASSIGN_OTHER = "ai_reassign_other"; - public static string RIGHTS_USER_VIEW_MY = "user_view_my"; - public static string RIGHTS_USER_VIEW_OTHER = "user_view_other"; - public static string RIGHTS_USER_EDIT_MY = "user_edit_my"; - public static string RIGHTS_USER_EDIT_OTHER = "user_edit_other"; - public static string RIGHTS_USER_CREATE = "user_create"; - public static string RIGHTS_USER_DELETE = "user_delete"; + public const string RIGHTS_WO_VIEW_MY = "wo_view_my"; + public const string RIGHTS_WO_VIEW_CREATED = "wo_view_created"; + public const string RIGHTS_WO_VIEW_OTHER = "wo_view_other"; + public const string RIGHTS_WO_EDIT_MY = "wo_edit_my"; + public const string RIGHTS_WO_EDIT_CREATED = "wo_edit_created"; + public const string RIGHTS_WO_EDIT_OTHER = "wo_edit_other"; + public const string RIGHTS_WO_CREATE_MY = "wo_create_my"; + public const string RIGHTS_WO_CREATE_OTHER = "wo_create_other"; + public const string RIGHTS_WO_STATUS_MY = "wo_status_my"; + public const string RIGHTS_WO_STATUS_CREATED = "wo_status_created"; + public const string RIGHTS_WO_STATUS_OTHER = "wo_status_other"; + public const string RIGHTS_WO_DELETE_MY = "wo_delete_my"; + public const string RIGHTS_WO_DELETE_CREATED = "wo_delete_created"; + public const string RIGHTS_WO_DELETE_OTHER = "wo_delete_other"; + public const string RIGHTS_WO_REASSIGN_OTHER = "wo_reassign_other"; - public static string RIGHTS_PREFERENCE_VIEW_MY = "preference_view_my"; - public static string RIGHTS_PREFERENCE_VIEW_OTHER = "preference_view_other"; - public static string RIGHTS_PREFERENCE_EDIT_MY = "preference_edit_my"; - public static string RIGHTS_PREFERENCE_EDIT_OTHER = "preference_edit_other"; + public const string RIGHTS_USER_VIEW_MY = "user_view_my"; + public const string RIGHTS_USER_VIEW_OTHER = "user_view_other"; + public const string RIGHTS_USER_EDIT_MY = "user_edit_my"; + public const string RIGHTS_USER_EDIT_OTHER = "user_edit_other"; + public const string RIGHTS_USER_CREATE = "user_create"; + public const string RIGHTS_USER_DELETE = "user_delete"; - public static string RIGHTS_ROLE_VIEW_MY = "role_view_my"; - public static string RIGHTS_ROLE_VIEW_OTHER = "role_view_other"; - public static string RIGHTS_ROLE_EDIT = "role_edit"; - public static string RIGHTS_ROLE_EDIT_MY = "role_edit_my"; - public static string RIGHTS_ROLE_EDIT_USERS = "role_edit_users"; - public static string RIGHTS_ROLE_CREATE = "role_create"; - public static string RIGHTS_ROLE_DELETE = "role_delete"; + public const string RIGHTS_PREFERENCE_VIEW_MY = "preference_view_my"; + public const string RIGHTS_PREFERENCE_VIEW_OTHER = "preference_view_other"; + public const string RIGHTS_PREFERENCE_EDIT_MY = "preference_edit_my"; + public const string RIGHTS_PREFERENCE_EDIT_OTHER = "preference_edit_other"; - public static string RIGHTS_RIGHTS_VIEW = "rights_view"; + public const string RIGHTS_ROLE_VIEW_MY = "role_view_my"; + public const string RIGHTS_ROLE_VIEW_OTHER = "role_view_other"; + public const string RIGHTS_ROLE_EDIT = "role_edit"; + public const string RIGHTS_ROLE_EDIT_MY = "role_edit_my"; + public const string RIGHTS_ROLE_EDIT_USERS = "role_edit_users"; + public const string RIGHTS_ROLE_CREATE = "role_create"; + public const string RIGHTS_ROLE_DELETE = "role_delete"; - public static string RIGHTS_PRODUCT_VIEW = "product_view"; - public static string RIGHTS_PRODUCT_EDIT = "product_edit"; - public static string RIGHTS_PRODUCT_CREATE = "product_create"; - public static string RIGHTS_PRODUCT_DELETE = "product_delete"; + public const string RIGHTS_RIGHTS_VIEW = "rights_view"; - public static string RIGHTS_VERSION_VIEW = "version_view"; - public static string RIGHTS_VERSION_EDIT = "version_edit"; - public static string RIGHTS_VERSION_CREATE = "version_create"; - public static string RIGHTS_VERSION_HIDE = "version_hide"; + public const string RIGHTS_PRODUCT_VIEW = "product_view"; + public const string RIGHTS_PRODUCT_EDIT = "product_edit"; + public const string RIGHTS_PRODUCT_CREATE = "product_create"; + public const string RIGHTS_PRODUCT_DELETE = "product_delete"; - public static string RIGHTS_BUILD_VIEW = "build_view"; - public static string RIGHTS_BUILD_EDIT = "build_edit"; - public static string RIGHTS_BUILD_CREATE = "build_create"; - public static string RIGHTS_BUILD_HIDE = "build_hide"; + public const string RIGHTS_VERSION_VIEW = "version_view"; + public const string RIGHTS_VERSION_EDIT = "version_edit"; + public const string RIGHTS_VERSION_CREATE = "version_create"; + public const string RIGHTS_VERSION_HIDE = "version_hide"; - public static string RIGHTS_TESTPASS_VIEW = "testpass_view"; - public static string RIGHTS_TESTPASS_EDIT = "testpass_edit"; - public static string RIGHTS_TESTPASS_CREATE = "testpass_create"; - public static string RIGHTS_TESTPASS_HIDE = "testpass_hide"; + public const string RIGHTS_BUILD_VIEW = "build_view"; + public const string RIGHTS_BUILD_EDIT = "build_edit"; + public const string RIGHTS_BUILD_CREATE = "build_create"; + public const string RIGHTS_BUILD_HIDE = "build_hide"; + + public const string RIGHTS_TESTPASS_VIEW = "testpass_view"; + public const string RIGHTS_TESTPASS_EDIT = "testpass_edit"; + public const string RIGHTS_TESTPASS_CREATE = "testpass_create"; + public const string RIGHTS_TESTPASS_HIDE = "testpass_hide"; } public static class Help @@ -1656,5 +1659,30 @@ } return result; } + + public static void Tree_SetValue(TreeNode n, string key, string value) + { + string encodedValues = n.Value; + encodedValues = encodedValues + "|" + key + ":" + value; + n.Value = encodedValues; + } + + public static string Tree_GetValue(TreeNode n, string key) + { + string encodedValues = n.Value; + char[] delim = "|".ToCharArray(); + string[] split = null; + split = encodedValues.Split(delim); + delim = ":".ToCharArray(); + string[] kvPair = null; + foreach (string s in split) + { + kvPair = s.Split(delim); + if (kvPair[0] == key) + return kvPair[1]; + } + + return null; + } } } Modified: Website/Assignments.aspx =================================================================== --- Website/Assignments.aspx 2006-08-11 19:46:14 UTC (rev 309) +++ Website/Assignments.aspx 2006-08-11 19:48:28 UTC (rev 310) @@ -1,13 +1,29 @@ -<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" Title="TCDB: Assignments" %> +<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" Title="TCDB: Assignments" + ClassName="TCDB.Page.Assignments" %> +<%@ Import Namespace="TCDB.Code" %> <%@ Register Src="~/Includes/AssignmentsTree.ascx" TagPrefix="assignment" TagName="Tree" %> <%@ Register Src="~/Includes/Assignments.ascx" TagPrefix="assignment" TagName="Form" %> - +<%@ Register Src="~/Includes/ActionItems.ascx" TagPrefix="assignment" TagName="ActionItem" %> +<%@ Register Src="~/Includes/ActionItems.ascx" TagPrefix="assignment" TagName="WorkOrder" %> <asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" runat="Server"> - <assignment:Tree runat="Server" ID="Tree" /> + <assignment:Tree runat="Server" ID="Tree" /> </asp:Content> <asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" runat="Server"> + <% + string tab = Convert.ToString(Session["AssignmentTab_Name"]); + if (tab == Constants.CODE_AI) + { %> + <assignment:ActionItem runat="server" ID="ActionItem" /> + <% } + else if (tab == Constants.CODE_WO) + { %> + <assignment:WorkOrder runat="server" ID="WorkOrder" /> + <% } + else + { %> <assignment:Form ID="List" runat="server" /> + <% } %> </asp:Content> <asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" runat="Server"> </asp:Content> Modified: Website/Includes/ActionItems.ascx =================================================================== --- Website/Includes/ActionItems.ascx 2006-08-11 19:46:14 UTC (rev 309) +++ Website/Includes/ActionItems.ascx 2006-08-11 19:48:28 UTC (rev 310) @@ -324,8 +324,8 @@ TypeName="tcdbDataSetTableAdapters.db_actionItemsTableAdapter" InsertMethod="Insert" UpdateMethod="Update" DeleteMethod="Delete"> <SelectParameters> - <asp:SessionParameter Name="actionItemID" SessionField="item_id" Type="Int32" /> - <asp:SessionParameter DefaultValue="" Name="active" SessionField="active" Type="Boolean" /> + <asp:SessionParameter Name="actionItemID" SessionField="AssignmentTab_item_id" Type="Int32" /> + <asp:SessionParameter DefaultValue="" Name="active" SessionField="AssignmentTab_active" Type="Boolean" /> </SelectParameters> <InsertParameters> <asp:Parameter Name="name" Type="String" /> Modified: Website/Includes/ActionItems.ascx.cs =================================================================== --- Website/Includes/ActionItems.ascx.cs 2006-08-11 19:46:14 UTC (rev 309) +++ Website/Includes/ActionItems.ascx.cs 2006-08-11 19:48:28 UTC (rev 310) @@ -20,30 +20,42 @@ public partial class ActionItems : SiteUserControl { private static Logger m_logg = new Logger("TCDB.ActionItems"); + private const string PREFIX = "AssignmentTab_"; private ActionItem ai; private String item_id = ""; private int productID = 0; private String mode = ""; + private bool current = false; protected void Page_Load(object sender, EventArgs e) { + if (Convert.ToString(Session[PREFIX + "Name"]) != Constants.CODE_AI) + { + current = false; + return; + } + else + { + current = true; + } + if (productID == 0) productID = Constants.PRODUCT_SITEID; // Load session data try { - item_id = Session[Constants.CODE_AI].ToString(); + item_id = Session[PREFIX + Constants.CODE_AI].ToString(); } catch { } try { - mode = Session[Constants.CODE_MODE].ToString(); + mode = Session[PREFIX + Constants.CODE_MODE].ToString(); } catch { } try { - productID = Convert.ToInt32(Session[Constants.CODE_PRODUCT]); + productID = Convert.ToInt32(Session[PREFIX + Constants.CODE_PRODUCT]); } catch { } @@ -59,18 +71,25 @@ } else { - ai = ActionItemDB.GetActionItem(Convert.ToInt32(item_id), active); + try + { + ai = ActionItemDB.GetActionItem(Convert.ToInt32(item_id), active); + } + catch { } if (ai != null && (!m_user.HasRight(Constants.RIGHTS_AI_VIEW_OTHER, productID) && !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_VIEW_MY, productID)) && !(ai.CREATOR.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_VIEW_CREATED, productID)))) + { + Response.Redirect("~/Assignments.aspx?" + Constants.CODE_USER + "=" + m_user.ID); + } } - Session.Add("item_id", item_id); - Session.Add("productID", productID); - Session.Add("tableName", "tcdb_actionItem"); + Session.Add(PREFIX + "item_id", item_id); + Session.Add(PREFIX + "productID", productID); + Session.Add(PREFIX + "tableName", "tcdb_actionItem"); if (mode == "new" && (m_user.HasRight(Constants.RIGHTS_AI_CREATE_MY) || m_user.HasRight(Constants.RIGHTS_AI_CREATE_OTHER))) ActionItemsView.ChangeMode(FormViewMode.Insert); @@ -120,13 +139,13 @@ if (dateFinished.SelectedValue != null) { - dateFinished.ClearDateText = "Clear Date"; + dateFinished.ClearDateText = "Clear Date"; statusList.SelectedValue = statusList.Items.FindByText("Completed").Value; percentList.SelectedValue = "100"; } else { - dateFinished.ClearDateText = ""; + dateFinished.ClearDateText = ""; if (statusList.SelectedItem.Text == "Completed") statusList.SelectedValue = statusList.Items.FindByText("Active").Value; if (percentList.SelectedValue == "100") @@ -170,7 +189,7 @@ if (dateFinished.SelectedValue == null) dateFinished.SelectedValue = DateTime.Today; - dateFinished.ClearDateText = "Clear Date"; + dateFinished.ClearDateText = "Clear Date"; } } else @@ -191,7 +210,7 @@ CalendarPopup dateFinished = (CalendarPopup)ActionItemsView.FindControl("dateFinished"); dateFinished.Clear(); dateFinished.PostedDate = ""; - dateFinished.ClearDateText = ""; + dateFinished.ClearDateText = ""; } } if (ActionItemsView.CurrentMode == FormViewMode.ReadOnly) @@ -229,7 +248,7 @@ CalendarPopup dateFinished = (CalendarPopup)ActionItemsView.FindControl("dateFinished"); dateFinished.SelectedValue = DateTime.Today; - dateFinished.ClearDateText = "Clear Date"; + dateFinished.ClearDateText = "Clear Date"; } } else @@ -250,7 +269,7 @@ CalendarPopup dateFinished = (CalendarPopup)ActionItemsView.FindControl("dateFinished"); dateFinished.Clear(); dateFinished.PostedDate = ""; - dateFinished.ClearDateText = ""; + dateFinished.ClearDateText = ""; } } @@ -269,6 +288,8 @@ protected void ActionItemsView_DataBound(object sender, EventArgs e) { + if (!current) return; + DataRowView data = (DataRowView)ActionItemsView.DataItem; if (ActionItemsView.CurrentMode == FormViewMode.Insert) @@ -303,22 +324,22 @@ Page.Title = "TCDB: " + data["name"].ToString(); if (ActionItemsView.CurrentMode == FormViewMode.Edit) { - CalendarPopup dateDue = (CalendarPopup)ActionItemsView.FindControl("dateDue"); - CalendarPopup dateFinished = (CalendarPopup)ActionItemsView.FindControl("dateFinished"); + CalendarPopup dateDue = (CalendarPopup)ActionItemsView.FindControl("dateDue"); + CalendarPopup dateFinished = (CalendarPopup)ActionItemsView.FindControl("dateFinished"); - if (data["dateFinished"].ToString() == "") + if (data["dateFinished"].ToString() == "") { - dateFinished.SelectedValue = null; - dateFinished.ClearDateText = " "; - dateFinished.Clear(); + dateFinished.SelectedValue = null; + dateFinished.ClearDateText = " "; + dateFinished.Clear(); } else - { - dateFinished.SelectedValue = (Nullable<DateTime>)data["dateFinished"]; - dateFinished.VisibleDate = dateFinished.SelectedDate; + { + dateFinished.SelectedValue = (Nullable<DateTime>)data["dateFinished"]; + dateFinished.VisibleDate = dateFinished.SelectedDate; + } + dateDue.VisibleDate = dateDue.SelectedDate; } - dateDue.VisibleDate = dateDue.SelectedDate; - } else { Label nameLabel = (Label)ActionItemsView.FindControl("nameLbl"); @@ -378,6 +399,8 @@ protected void statusList_Init(object sender, EventArgs e) { + if (!current) return; + DropDownList statusList = (DropDownList)sender; if (ai != null && @@ -388,6 +411,8 @@ } protected void percentList_Init(object sender, EventArgs e) { + if (!current) return; + RadioButtonList percentList = (RadioButtonList)sender; if (ai != null && @@ -398,6 +423,8 @@ } protected void dateFinished_Init(object sender, EventArgs e) { + if (!current) return; + CalendarPopup dateFinished = (CalendarPopup)sender; if (ai != null && @@ -408,18 +435,22 @@ } protected void NewButton_Init(object sender, EventArgs e) { + if (!current) return; + LinkButton newBtn = (LinkButton)sender; - Label newLbl = (Label)ActionItemsView.FindControl("newLbl"); + Label newLbl = (Label)ActionItemsView.FindControl("newLbl"); if (ai != null && !m_user.HasRight(Constants.RIGHTS_AI_CREATE_MY, Constants.PRODUCT_ANYID) && !m_user.HasRight(Constants.RIGHTS_AI_CREATE_OTHER, Constants.PRODUCT_ANYID)) - { + { newBtn.Visible = false; - newLbl.Visible = false; + newLbl.Visible = false; + } } - } protected void EditButton_Init(object sender, EventArgs e) { + if (!current) return; + LinkButton editBtn = (LinkButton)sender; if (ai != null && @@ -430,21 +461,25 @@ } protected void DeleteButton_Init(object sender, EventArgs e) { + if (!current) return; + LinkButton deleteBtn = (LinkButton)sender; - Label deleteLbl = (Label)ActionItemsView.FindControl("deleteLbl"); - Label deletedLbl = (Label)ActionItemsView.FindControl("deletedLbl"); + Label deleteLbl = (Label)ActionItemsView.FindControl("deleteLbl"); + Label deletedLbl = (Label)ActionItemsView.FindControl("deletedLbl"); - if (deletedLbl.Visible || (ai != null && - !m_user.HasRight(Constants.RIGHTS_AI_DELETE_OTHER, productID) && - !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_DELETE_MY, productID)) && - !(ai.CREATOR.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_DELETE_CREATED, productID)))) - { + if (deletedLbl.Visible || (ai != null && + !m_user.HasRight(Constants.RIGHTS_AI_DELETE_OTHER, productID) && + !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_DELETE_MY, productID)) && + !(ai.CREATOR.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_DELETE_CREATED, productID)))) + { deleteBtn.Visible = false; - deleteLbl.Visible = false; + deleteLbl.Visible = false; + } } - } protected void assignedTo_Init(object sender, EventArgs e) { + if (!current) return; + DropDownList assignedTo = (DropDownList)sender; if (ai == null) ai = ActionItemDB.GetActionItem(Convert.ToInt32(item_id), active); @@ -461,15 +496,15 @@ { assignedTo.Enabled = true; - List<Product> products = ProductDB.GetProductList(true); + List<Product> products = ProductDB.GetProductList(true); tcdbDataSetTableAdapters.db_roleProductUserTableAdapter rpuAdapter = new tcdbDataSetTableAdapters.db_roleProductUserTableAdapter(); - foreach (Product product in products) + foreach (Product product in products) { - if ((ActionItemsView.CurrentMode == FormViewMode.Insert && m_user.HasRight(Constants.RIGHTS_AI_CREATE_OTHER, product.ID)) || - (ActionItemsView.CurrentMode == FormViewMode.Edit && m_user.HasRight(Constants.RIGHTS_AI_REASSIGN_OTHER, ai.CREATOR, product.ID))) + if ((ActionItemsView.CurrentMode == FormViewMode.Insert && m_user.HasRight(Constants.RIGHTS_AI_CREATE_OTHER, product.ID)) || + (ActionItemsView.CurrentMode == FormViewMode.Edit && m_user.HasRight(Constants.RIGHTS_AI_REASSIGN_OTHER, ai.CREATOR, product.ID))) { - tcdbDataSet.db_roleProductUserDataTable rpuTable = rpuAdapter.GetData(null, product.ID, true); + tcdbDataSet.db_roleProductUserDataTable rpuTable = rpuAdapter.GetData(null, product.ID, true); int lastID = -1; foreach (tcdbDataSet.db_roleProductUserRow rpuRow in rpuTable) @@ -487,6 +522,8 @@ } protected void activeBox_Init(object sender, EventArgs e) { + if (!current) return; + CheckBox activeBox = (CheckBox)sender; Label deletedLbl = (Label)ActionItemsView.FindControl("deletedLbl"); Modified: Website/Includes/AdministrationTree.ascx =================================================================== --- Website/Includes/AdministrationTree.ascx 2006-08-11 19:46:14 UTC (rev 309) +++ Website/Includes/AdministrationTree.ascx 2006-08-11 19:48:28 UTC (rev 310) @@ -1,11 +1,11 @@ -<%@ Control Language="C#" AutoEventWireup="true" CodeFile="AdministrationTree.ascx.cs" Inherits="TCDB.AdministrationTree" %> - +<%@ Control Language="C#" AutoEventWireup="true" CodeFile="AdministrationTree.ascx.cs" + Inherits="TCDB.AdministrationTree" %> <asp:TreeView ID="AdminTree" runat="server" SelectedNodeStyle-CssClass="selectednode" - OnTreeNodePopulate="AdminTree_TreeNodePopulate" ExpandDepth="1" OnTreeNodeCollapsed="AdminTree_TreeNodeCollapsed" - OnTreeNodeExpanded="AdminTree_TreeNodeExpanded" OnInit="AdminTree_Init"> + OnTreeNodePopulate="AdminTree_TreeNodePopulate" OnTreeNodeCollapsed="AdminTree_TreeNodeCollapsed" + OnTreeNodeExpanded="AdminTree_TreeNodeExpanded" OnInit="AdminTree_Init" + OnSelectedNodeChanged="AdminTree_SelectedNodeChanged" ExpandDepth="1"> <Nodes> - <asp:TreeNode Text="Administration" Value="Users" PopulateOnDemand="True" SelectAction="Expand" - NavigateUrl="~/Administration.aspx" /> + <asp:TreeNode Text="Administration" Value="Admin" PopulateOnDemand="True" SelectAction="Expand" /> </Nodes> <SelectedNodeStyle CssClass="selectednode" /> -</asp:TreeView> \ No newline at end of file +</asp:TreeView> Modified: Website/Includes/AdministrationTree.ascx.cs =================================================================== --- Website/Includes/AdministrationTree.ascx.cs 2006-08-11 19:46:14 UTC (rev 309) +++ Website/Includes/AdministrationTree.ascx.cs 2006-08-11 19:48:28 UTC (rev 310) @@ -15,6 +15,8 @@ { public partial class AdministrationTree : SiteUserControl { + private const string PREFIX = "AdministrationTree_"; + private const string PREFIX_TAB = "AdministrationTab_"; private static Logger m_logg = new Logger("TCDB.AdministrationTree"); protected void Page_Load(object sender, EventArgs e) @@ -30,6 +32,60 @@ if (Session["AdminNodes"] == null) Session.Add("AdminNodes", new ArrayList()); } + + protected void AdminTree_SelectedNodeChanged(object sender, EventArgs e) + { + TreeNode node = AdminTree.SelectedNode; + String nodeType = Help.Tree_GetValue(node, "NodeType"); + if (nodeType == null) nodeType = "Root"; + + String nodeValue = Help.Tree_GetValue(node, "Value"); + node.Selected = false; + + Session.Remove(Constants.CODE_USER); + Session.Remove(Constants.CODE_PRODUCT); + Session.Remove(Constants.CODE_MODE); + switch (nodeType) + { + case "Root": + Response.Redirect("~/Administration.aspx"); + break; + case "Product": + Session[Constants.CODE_PRODUCT] = nodeValue; + Response.Redirect("~/Assignments.aspx"); + break; + case "User": + Session[Constants.CODE_USER] = nodeValue; + Session[Constants.CODE_PRODUCT] = Help.Tree_GetValue(node.Parent, "Value"); + try + { + if (bool.Parse(Help.Tree_GetValue(node, "IsCreated"))) + { + Session[Constants.CODE_MODE] = Constants.CODE_CREATED; + Session[Constants.CODE_PRODUCT] = Constants.PRODUCT_ANYID; + } + } + catch { } + Response.Redirect("~/Assignments.aspx"); + break; + case "Created": + Session[Constants.CODE_MODE] = Constants.CODE_CREATED; + Response.Redirect("~/Assignments.aspx"); + break; + case "ActionItem": + Session[Constants.CODE_AI] = nodeValue; + Response.Redirect("~/ActionItem.aspx"); + break; + case "WorkOrder": + Session[Constants.CODE_WO] = nodeValue; + Response.Redirect("~/WorkOrder.aspx"); + break; + default: + break; + } + // } + } + protected void AdminTree_TreeNodeExpanded(object sender, TreeNodeEventArgs e) { ArrayList nodes = (ArrayList)Session["AdminNodes"]; @@ -58,7 +114,7 @@ // Create the new node. TreeNode newNode = new TreeNode(); newNode.Text = "<product>" + product.NAME + "</product>"; - newNode.Value = product.ID.ToString(); + Help.Tree_SetValue(newNode, PREFIX + Constants.CODE_PRODUCT, product.ID.ToString()); // Set the PopulateOnDemand property to true so that the child nodes can be // dynamically populated. @@ -66,7 +122,7 @@ // Set additional properties for the node. newNode.SelectAction = TreeNodeSelectAction.Expand; - newNode.NavigateUrl = "~/Product.aspx?" + Constants.CODE_PRODUCT + "=" + newNode.Value; + newNode.NavigateUrl = "~/Product.aspx"; if (!product.ACTIVE) newNode.Text = "<font class='deleted'>" + newNode.Text + "</font>"; Modified: Website/Includes/Assignments.ascx =================================================================== --- Website/Includes/Assignments.ascx 2006-08-11 19:46:14 UTC (rev 309) +++ Website/Includes/Assignments.ascx 2006-08-11 19:48:28 UTC (rev 310) @@ -8,10 +8,10 @@ <SelectParameters> <asp:Parameter Name="aType" Type="String" /> <asp:Parameter Name="finished" Type="Int32" /> - <asp:SessionParameter Name="assignedID" SessionField="uid" Type="Int32" /> - <asp:SessionParameter Name="creatorID" SessionField="myID" Type="Int32" /> + <asp:SessionParameter Name="assignedID" SessionField="AssignmentTree_u" Type="Int32" /> + <asp:SessionParameter Name="creatorID" SessionField="AssignmentTab_myID" Type="Int32" /> <asp:Parameter Name="highPriority" Type="Boolean" /> - <asp:SessionParameter DefaultValue="" Name="active" SessionField="active" Type="Boolean" /> + <asp:SessionParameter DefaultValue="" Name="active" SessionField="AssignmentTab_active" Type="Boolean" /> </SelectParameters> </asp:ObjectDataSource> <div id="Assignments"> Modified: Website/Includes/Assignments.ascx.cs =================================================================== --- Website/Includes/Assignments.ascx.cs 2006-08-11 19:46:14 UTC (rev 309) +++ Website/Includes/Assignments.ascx.cs 2006-08-11 19:48:28 UTC (rev 310) @@ -20,33 +20,44 @@ /// </summary> public partial class Assignments : SiteUserControl { + private const string PREFIX = "AssignmentTab_"; + private const string PREFIX_TREE = "AssignmentTree_"; private static Logger m_logg = new Logger("TCDB.Assignments"); private int uid = 0; - private String mode = null; + private string mode = null; private int productID = 0; private const int MAX_NAME_LENGTH = 30; + private bool current = false; protected void Page_Load(object sender, EventArgs e) { - Session.Remove("uid"); - Session.Remove("myID"); + if (Convert.ToString(Session[PREFIX + "Name"]) != Constants.CODE_ASSIGNMENT) + { + current = false; + return; + } + else + { + current = true; + } + m_logg.Debug("Loading assignments for [" + m_user.ToString() + "]"); // Load session data try { - uid = Convert.ToInt32(Session[Constants.CODE_USER]); + uid = Convert.ToInt32(Session[PREFIX_TREE + Constants.CODE_USER]); } catch { } try { - mode = Session[Constants.CODE_MODE].ToString(); + mode = Session[PREFIX_TREE + Constants.CODE_MODE].ToString(); } catch { } try { - productID = Convert.ToInt32(Session[Constants.CODE_PRODUCT]); + productID = Convert.ToInt32(Session[PREFIX_TREE + Constants.CODE_PRODUCT]); } catch { } @@ -120,12 +131,14 @@ } } if (mode == Constants.CODE_CREATED) - Session["myID"] = m_user.ID; + Session[PREFIX + "myID"] = m_user.ID; if (uid != 0) - Session.Add("uid", uid); + Session.Add(PREFIX_TREE + Constants.CODE_USER, uid); + else + Session.Remove(PREFIX_TREE + Constants.CODE_USER); m_logg.Debug("Databinding the AssignmentsGridView"); - if (Session["refresh"] != null) + if (Session[PREFIX + "refresh"] != null) AssignmentsGridView.DataBind(); } @@ -299,22 +312,22 @@ // update Session if (date.ID == "toDate") - Session["toDate"] = date.SelectedDate; + Session[PREFIX + "toDate"] = date.SelectedDate; else if (date.ID == "fromDate") - Session["fromDate"] = date.SelectedDate; + Session[PREFIX + "fromDate"] = date.SelectedDate; else if (date.ID == "toDueDate") - Session["toDueDate"] = date.SelectedDate; + Session[PREFIX + "toDueDate"] = date.SelectedDate; else if (date.ID == "fromDueDate") - Session["fromDueDate"] = date.SelectedDate; + Session[PREFIX + "fromDueDate"] = date.SelectedDate; else if (date.ID == "toFinishedDate") - Session["toFinishedDate"] = date.SelectedDate; + Session[PREFIX + "toFinishedDate"] = date.SelectedDate; else if (date.ID == "fromFinishedDate") - Session["fromFinishedDate"] = date.SelectedDate; + Session[PREFIX + "fromFinishedDate"] = date.SelectedDate; - Session.Add("refresh", true); + Session.Add(PREFIX + "refresh", true); AssignmentsGridView.DataBind(); } - + /* protected String getURL(int cid, String type, String name) { String displayName; @@ -332,31 +345,36 @@ m_logg.Error("Bad Assignment type. Can't display URL"); return ""; } - } + }*/ + protected void AssignmentsGridView_Sorted(object sender, EventArgs e) { - Session["refresh"] = true; + Session[PREFIX + "refresh"] = true; //foreach (GridViewRow row in AssignmentsGridView.Rows) // filter(row); } protected void AssignmentsGridView_DataBinding(object sender, EventArgs e) { - if (Session["refresh"] != null) + if (!current) return; + + if (Session[PREFIX + "refresh"] != null) { AssignmentsGridView.Visible = true; NoAssignments.Visible = false; - Session["rows"] = 0; + Session[PREFIX + "rows"] = 0; } } protected void AssignmentsGridView_DataBound(object sender, EventArgs e) { - if (Session["refresh"] != null) + if (!current) return; + + if (Session[PREFIX + "refresh"] != null) { - Session.Remove("refresh"); + Session.Remove(PREFIX + "refresh"); // TODO: Figure out how to dynamically set the column head here but still have it linkable/sortable //AssignmentsGridView.Columns[0].HeaderText = "<div class=\"priority_high\" />"; - int rows = Convert.ToInt32(Session["rows"]); + int rows = Convert.ToInt32(Session[PREFIX + "rows"]); if (rows < 2) { AssignmentsGridView.Visible = false; @@ -368,11 +386,13 @@ } protected void AssignmentsGridView_RowDataBound(object sender, GridViewRowEventArgs e) { - if (Session["refresh"] != null) + if (!current) return; + + if (Session[PREFIX + "refresh"] != null) { e.Row.Visible = filter(e.Row); if (e.Row.Visible) - Session["rows"] = Convert.ToInt32(Session["rows"]) + 1; + Session[PREFIX + "rows"] = Convert.ToInt32(Session[PREFIX + "rows"]) + 1; } } protected void AssignmentsGridView_RowCommand(object sender, GridViewCommandEventArgs e) @@ -385,13 +405,14 @@ if (type == Constants.CODE_AI) { - - Session[Constants.CODE_AI] = childID; + Session[PREFIX + "Name"] = Constants.CODE_AI; + Session[PREFIX + Constants.CODE_AI] = childID; Response.Redirect("~/ActionItem.aspx"); } else if (type == Constants.CODE_WO) { - Session[Constants.CODE_WO] = childID; + Session[PREFIX + "Name"] = Constants.CODE_AI; + Session[PREFIX + Constants.CODE_WO] = childID; Response.Redirect("~/WorkOrder.aspx"); } } @@ -412,11 +433,11 @@ woStatusList.Items.FindByText("Completed").Selected = false; } // update Session - Session["showCompleted"] = cboShowCompleted.Checked; - Session["showAICompleted"] = aiStatusList.Items.FindByText("Completed").Selected; - Session["showWOCompleted"] = woStatusList.Items.FindByText("Completed").Selected; + Session[PREFIX + "showCompleted"] = cboShowCompleted.Checked; + Session[PREFIX + "showAICompleted"] = aiStatusList.Items.FindByText("Completed").Selected; + Session[PREFIX + "showWOCompleted"] = woStatusList.Items.FindByText("Completed").Selected; - Session.Add("refresh", true); + Session.Add(PREFIX + "refresh", true); Response.Redirect(Request.RawUrl); } protected void cboStatusFilter_CheckedChanged(object sender, EventArgs e) @@ -431,9 +452,9 @@ aiStatusList.Enabled = false; woStatusList.Enabled = false; } - Session["filterStatus"] = cboStatusFilter.Checked; + Session[PREFIX + "filterStatus"] = cboStatusFilter.Checked; - Session.Add("refresh", true); + Session.Add(PREFIX + "refresh", true); AssignmentsGridView.DataBind(); } protected void aiStatusList_SelectedIndexChanged(object sender, EventArgs e) @@ -444,13 +465,13 @@ cboShowCompleted.Checked = false; // update Session - Session["showAIActive"] = aiStatusList.Items.FindByText("Active").Selected; - Session["showAIInactive"] = aiStatusList.Items.FindByText("Inactive").Selected; - Session["showAINotStarted"] = aiStatusList.Items.FindByText("Not Started").Selected; - Session["showAICompleted"] = aiStatusList.Items.FindByText("Completed").Selected; - Session["showCompleted"] = cboShowCompleted.Checked; + Session[PREFIX + "showAIActive"] = aiStatusList.Items.FindByText("Active").Selected; + Session[PREFIX + "showAIInactive"] = aiStatusList.Items.FindByText("Inactive").Selected; + Session[PREFIX + "showAINotStarted"] = aiStatusList.Items.FindByText("Not Started").Selected; + Session[PREFIX + "showAICompleted"] = aiStatusList.Items.FindByText("Completed").Selected; + Session[PREFIX + "showCompleted"] = cboShowCompleted.Checked; - Session.Add("refresh", true); + Session.Add(PREFIX + "refresh", true); Response.Redirect(Request.RawUrl); } protected void woStatusList_SelectedIndexChanged(object sender, EventArgs e) @@ -460,13 +481,13 @@ else cboShowCompleted.Checked = false; // update Session - Session["showWOActive"] = woStatusList.Items.FindByText("Active").Selected; - Session["showWOInactive"] = woStatusList.Items.FindByText("Inactive").Selected; - Session["showWONotStarted"] = woStatusList.Items.FindByText("Not Started").Selected; - Session["showWOCompleted"] = woStatusList.Items.FindByText("Completed").Selected; - Session["showCompleted"] = cboShowCompleted.Checked; + Session[PREFIX + "showWOActive"] = woStatusList.Items.FindByText("Active").Selected; + Session[PREFIX + "showWOInactive"] = woStatusList.Items.FindByText("Inactive").Selected; + Session[PREFIX + "showWONotStarted"] = woStatusList.Items.FindByText("Not Started").Selected; + Session[PREFIX + "showWOCompleted"] = woStatusList.Items.FindByText("Completed").Selected; + Session[PREFIX + "showCompleted"] = cboShowCompleted.Checked; - Session.Add("refresh", true); + Session.Add(PREFIX + "refresh", true); AssignmentsGridView.DataBind(); } protected void cboTypeFilter_CheckedChanged(object sender, EventArgs e) @@ -481,46 +502,46 @@ cboShowActionItems.Enabled = false; cboShowWorkOrders.Enabled = false; } - Session["filterType"] = cboTypeFilter.Checked; - Session["showActionItems"] = cboShowActionItems.Checked; - Session["showWorkOrders"] = cboShowWorkOrders.Checked; + Session[PREFIX + "filterType"] = cboTypeFilter.Checked; + Session[PREFIX + "showActionItems"] = cboShowActionItems.Checked; + Session[PREFIX + "showWorkOrders"] = cboShowWorkOrders.Checked; - Session.Add("refresh", true); + Session.Add(PREFIX + "refresh", true); AssignmentsGridView.DataBind(); } protected void cboShowActionItems_CheckedChanged(object sender, EventArgs e) { - Session["showActionItems"] = cboShowActionItems.Checked; + Session[PREFIX + "showActionItems"] = cboShowActionItems.Checked; - Session.Add("refresh", true); + Session.Add(PREFIX + "refresh", true); AssignmentsGridView.DataBind(); } protected void cboShowWorkOrders_CheckedChanged(object sender, EventArgs e) { - Session["showWorkOrders"] = cboShowWorkOrders.Checked; + Session[PREFIX + "showWorkOrders"] = cboShowWorkOrders.Checked; - Session.Add("refresh", true); + Session.Add(PREFIX + "refresh", true); AssignmentsGridView.DataBind(); } protected void cboDateFilter_CheckedChanged(object sender, EventArgs e) { - Session["filterAssignedDate"] = cboDateFilter.Checked; + Session[PREFIX + "filterAssignedDate"] = cboDateFilter.Checked; - Session.Add("refresh", true); + Session.Add(PREFIX + "refresh", true); AssignmentsGridView.DataBind(); } protected void cboDueFilter_CheckedChanged(object sender, EventArgs e) { - Session["filterDueDate"] = cboDueFilter.Checked; + Session[PREFIX + "filterDueDate"] = cboDueFilter.Checked; - Session.Add("refresh", true); + Session.Add(PREFIX + "refresh", true); AssignmentsGridView.DataBind(); } protected void cboFinishedFilter_CheckedChanged(object sender, EventArgs e) { - Session["filterFinishedDate"] = cboFinishedFilter.Checked; + Session[PREFIX + "filterFinishedDate"] = cboFinishedFilter.Checked; - Session.Add("refresh", true); + Session.Add(PREFIX + "refresh", true); AssignmentsGridView.DataBind(); } protected void cboPriorityFilter_CheckedChanged(object sender, EventArgs e) @@ -535,297 +556,337 @@ cboHighPriority.Enabled = false; cboLowPriority.Enabled = false; } - Session["filterPriority"] = cboPriorityFilter.Checked; + Session[PREFIX + "filterPriority"] = cboPriorityFilter.Checked; - Session.Add("refresh", true); + Session.Add(PREFIX + "refresh", true); AssignmentsGridView.DataBind(); } protected void cboHighPriority_CheckedChanged(object sender, EventArgs e) { - Session["showHighPriority"] = cboPriorityFilter.Checked; + Session[PREFIX + "showHighPriority"] = cboPriorityFilter.Checked; - Session.Add("refresh", true); + Session.Add(PREFIX + "refresh", true); AssignmentsGridView.DataBind(); } protected void cboLowPriority_CheckedChanged(object sender, EventArgs e) { - Session["showLowPriority"] = cboPriorityFilter.Checked; + Session[PREFIX + "showLowPriority"] = cboPriorityFilter.Checked; - Session.Add("refresh", true); + Session.Add(PREFIX + "refresh", true); AssignmentsGridView.DataBind(); } protected void aiStatusList_DataBound(object sender, EventArgs e) { + if (!current) return; + if (!IsPostBack) { - if (Session["showAIActive"] == null) + if (Session[PREFIX + "showAIActive"] == null) { aiStatusList.Items.FindByText("Active").Selected = m_user.GetConfigBool("filter_show_ai_active"); - Session["showAIActive"] = aiStatusList.Items.FindByText("Active").Selected; + Session[PREFIX + "showAIActive"] = aiStatusList.Items.FindByText("Active").Selected; } else - aiStatusList.Items.FindByText("Active").Selected = Convert.ToBoolean(Session["showAIActive"]); - if (Session["showAIInactive"] == null) + aiStatusList.Items.FindByText("Active").Selected = Convert.ToBoolean(Session[PREFIX + "showAIActive"]); + if (Session[PREFIX + "showAIInactive"] == null) { aiStatusList.Items.FindByText("Inactive").Selected = m_user.GetConfigBool("filter_show_ai_inactive"); - Session["showAIInactive"] = aiStatusList.Items.FindByText("Inactive").Selected; + Session[PREFIX + "showAIInactive"] = aiStatusList.Items.FindByText("Inactive").Selected; } else - aiStatusList.Items.FindByText("Inactive").Selected = Convert.ToBoolean(Session["showAIInactive"]); - if (Session["showAICompleted"] == null) + aiStatusList.Items.FindByText("Inactive").Selected = Convert.ToBoolean(Session[PREFIX + "showAIInactive"]); + if (Session[PREFIX + "showAICompleted"] == null) { aiStatusList.Items.FindByText("Completed").Selected = m_user.GetConfigBool("filter_show_ai_complete"); - Session["showAICompleted"] = aiStatusList.Items.FindByText("Completed").Selected; + Session[PREFIX + "showAICompleted"] = aiStatusList.Items.FindByText("Completed").Selected; } else - aiStatusList.Items.FindByText("Completed").Selected = Convert.ToBoolean(Session["showAICompleted"]); - if (Session["showAINotStarted"] == null) + aiStatusList.Items.FindByText("Completed").Selected = Convert.ToBoolean(Session[PREFIX + "showAICompleted"]); + if (Session[PREFIX + "showAINotStarted"] == null) { aiStatusList.Items.FindByText("Not Started").Selected = m_user.GetConfigBool("filter_show_ai_not_started"); - Session["showAINotStarted"] = aiStatusList.Items.FindByText("Not Started").Selected; + Session[PREFIX + "showAINotStarted"] = aiStatusList.Items.FindByText("Not Started").Selected; } else - aiStatusList.Items.FindByText("Not Started").Selected = Convert.ToBoolean(Session["showAINotStarted"]); + aiStatusList.Items.FindByText("Not Started").Selected = Convert.ToBoolean(Session[PREFIX + "showAINotStarted"]); - if (Session["refresh"] != null) + if (Session[PREFIX + "refresh"] != null) AssignmentsGridView.DataBind(); else - Session.Add("refresh", true); + Session.Add(PREFIX + "refresh", true); } } protected void woStatusList_DataBound(object sender, EventArgs e) { + if (!current) return; + if (!IsPostBack) { - if (Session["showWOActive"] == null) + if (Session[PREFIX + "showWOActive"] == null) { woStatusList.Items.FindByText("Active").Selected = m_user.GetConfigBool("filter_show_wo_active"); - Session["showWOActive"] = woStatusList.Items.FindByText("Active").Selected; + Session[PREFIX + "showWOActive"] = woStatusList.Items.FindByText("Active").Selected; } else - woStatusList.Items.FindByText("Active").Selected = Convert.ToBoolean(Session["showWOActive"]); - if (Session["showWOInactive"] == null) + woStatusList.Items.FindByText("Active").Selected = Convert.ToBoolean(Session[PREFIX + "showWOActive"]); + if (Session[PREFIX + "showWOInactive"] == null) { woStatusList.Items.FindByText("Inactive").Selected = m_user.GetConfigBool("filter_show_wo_inactive"); - Session["showWOInactive"] = woStatusList.Items.FindByText("Inactive").Selected; + Session[PREFIX + "showWOInactive"] = woStatusList.Items.FindByText("Inactive").Selected; } else - woStatusList.Items.FindByText("Inactive").Selected = Convert.ToBoolean(Session["showWOInactive"]); - if (Session["showWOCompleted"] == null) + woStatusList.Items.FindByText("Inactive").Selected = Convert.ToBoolean(Session[PREFIX + "showWOInactive"]); + if (Session[PREFIX + "showWOCompleted"] == null) { woStatusList.Items.FindByText("Completed").Selected = m_user.GetConfigBool("filter_show_wo_completed"); - Session["showWOCompleted"] = woStatusList.Items.FindByText("Completed").Selected; + Session[PREFIX + "showWOCompleted"] = woStatusList.Items.FindByText("Completed").Selected; } else - woStatusList.Items.FindByText("Completed").Selected = Convert.ToBoolean(Session["showWOCompleted"]); - if (Session["showWONotStarted"] == null) + woStatusList.Items.FindByText("Completed").Selected = Convert.ToBoolean(Session[PREFIX + "showWOCompleted"]); + if (Session[PREFIX + "showWONotStarted"] == null) { woStatusList.Items.FindByText("Not Started").Selected = m_user.GetConfigBool("filter_show_wo_not_started"); - Session["showWONotStarted"] = woStatusList.Items.FindByText("Not Started").Selected; + Session[PREFIX + "showWONotStarted"] = woStatusList.Items.FindByText("Not Started").Selected; } else - woStatusList.Items.FindByText("Not Started").Selected = Convert.ToBoolean(Session["showWONotStarted"]); + woStatusList.Items.FindByText("Not Started").Selected = Convert.ToBoolean(Session[PREFIX + "showWONotStarted"]); - if (Session["refresh"] != null) + if (Session[PREFIX + "refresh"] != null) AssignmentsGridView.DataBind(); else - Session.Add("refresh", true); + Session.Add(PREFIX + "refresh", true); } } protected void toDate_Init(object sender, EventArgs e) { + if (!current) return; + if (!IsPostBack) { - if (Session["toDate"] == null) + if (Session[PREFIX + "toDate"] == null) { toDate.SelectedDate = m_user.GetConfigDate("filter_show_to_assigned_date"); - Session["toD... [truncated message content] |
|
From: <m_h...@us...> - 2006-08-14 17:09:51
|
Revision: 314 Author: m_hildebrand Date: 2006-08-14 10:09:39 -0700 (Mon, 14 Aug 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=314&view=rev Log Message: ----------- I don't remember... sorry. Modified Paths: -------------- Website/App_Code/Common.cs Website/App_Code/SiteMaster.cs Website/App_Code/SiteUserControl.cs Website/Includes/ActionItems.ascx Website/Includes/ActionItems.ascx.cs Website/Includes/AdministrationTree.ascx Website/Includes/AdministrationTree.ascx.cs Website/Includes/Footer.ascx.cs Website/TCDB.master Removed Paths: ------------- Website/WorkOrder.aspx Modified: Website/App_Code/Common.cs =================================================================== --- Website/App_Code/Common.cs 2006-08-14 16:33:49 UTC (rev 313) +++ Website/App_Code/Common.cs 2006-08-14 17:09:39 UTC (rev 314) @@ -1409,11 +1409,12 @@ public const string CODE_RIGHT = "rt"; public const string CODE_ROLE = "r"; public const string CODE_MODE = "m"; - public const string CODE_CREATED = "created"; + public const string CODE_CREATED = "c"; public const string CODE_TYPE = "t"; public const string CODE_VALUE = "va"; public const string CODE_ROOT = "r"; - public const string CODE_NEW = "new"; + public const string CODE_NEW = "n"; + public const string CODE_ERROR = "e"; // TODO: figure this one out //public const bool ASSIGNMENT_PRIORITY_ALL = null; Modified: Website/App_Code/SiteMaster.cs =================================================================== --- Website/App_Code/SiteMaster.cs 2006-08-14 16:33:49 UTC (rev 313) +++ Website/App_Code/SiteMaster.cs 2006-08-14 17:09:39 UTC (rev 314) @@ -1,5 +1,6 @@ using System; using System.Data; +using System.Collections; using System.Configuration; using System.Web; using System.Web.Security; @@ -19,7 +20,6 @@ public class SiteMaster : System.Web.UI.MasterPage { protected User m_user = null; - protected DateTime m_startTime = new DateTime(); protected HttpRequest m_request = null; protected static Logger m_logg = new Logger("TCDB.SiteMaster"); @@ -30,7 +30,7 @@ m_logg.Debug("[" + Request.UserHostName + " (" + Request.UserHostAddress + ")] " + "Processing authenticated user startup"); m_request = LoadRequest(); m_user = LoadSessionUser(); - m_startTime = LoadStartTime(); + StartTime(); } } @@ -47,17 +47,35 @@ return Request; } - public DateTime LoadStartTime() + public DateTime StartTime() { + IEnumerator keys = Session.Contents.Keys.GetEnumerator(); + String key_string = ""; + while (keys.MoveNext()) + { + key_string = key_string + "\t[" + keys.Current.ToString() + "]\t=\t[" + Session[keys.Current.ToString()] + "]\n"; + } + m_logg.Debug("Beginning page load for [" + Request.RawUrl + "] with {\n" + key_string + "}"); + + m_logg.Debug("Loading the request start time"); - if (m_startTime != new DateTime()) + Nullable<DateTime> start = null; + try { + start = (DateTime)Session["startTime"]; + } + catch { } + + if (start != null) + { m_logg.Debug("Returning an existing time"); - return m_startTime; + return (DateTime)start; } - m_logg.Debug("Returning the current time"); - return DateTime.Now; + m_logg.Debug("No existing start time, starting time now"); + Session["startTime"] = DateTime.Now; + + return (DateTime)Session["startTime"]; } public User LoadSessionUser() Modified: Website/App_Code/SiteUserControl.cs =================================================================== --- Website/App_Code/SiteUserControl.cs 2006-08-14 16:33:49 UTC (rev 313) +++ Website/App_Code/SiteUserControl.cs 2006-08-14 17:09:39 UTC (rev 314) @@ -19,7 +19,6 @@ { protected static Nullable<bool> active = true; protected static User m_user = null; - protected static DateTime m_startTime = DateTime.Now; protected static HttpRequest m_request = null; private static Logger m_logg = new Logger("TCDB.SiteUserControl"); @@ -45,7 +44,7 @@ try { m_logg.Debug("Loading request start time"); - m_startTime = ((SiteMaster)(this.Page.Master)).LoadStartTime(); + ((SiteMaster)(this.Page.Master)).StartTime(); } catch (Exception ex) { Modified: Website/Includes/ActionItems.ascx =================================================================== --- Website/Includes/ActionItems.ascx 2006-08-14 16:33:49 UTC (rev 313) +++ Website/Includes/ActionItems.ascx 2006-08-14 17:09:39 UTC (rev 314) @@ -10,7 +10,7 @@ <asp:FormView ID="ActionItemsView" runat="server" DataSourceID="ActionItemDataSource" DataKeyNames="actionItemID" CellPadding="4" ForeColor="#333333" OnDataBound="ActionItemsView_DataBound" OnItemCommand="ActionItemsView_ItemCommand" Width="100%" OnItemInserted="ActionItemsView_ItemInserted" - OnItemUpdated="ActionItemsView_ItemUpdated"> + OnItemUpdated="ActionItemsView_ItemUpdated" > <HeaderTemplate> <asp:ObjectDataSource ID="StatusDataSource" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetData" TypeName="tcdbDataSetTableAdapters.db_statusTableAdapter"> @@ -33,14 +33,14 @@ Status:</label><asp:DropDownList ID="statusList" runat="server" AutoPostBack="True" OnSelectedIndexChanged="statusChanged" DataSourceID="StatusDataSource" DataTextField="statusName" DataValueField="statusID" AppendDataBoundItems="True" SelectedValue='<%# Bind("statusID") %>' - OnInit="statusList_Init"> + OnLoad="statusList_Load"> </asp:DropDownList> </div> <div class="buttons"> <label> % Complete:</label><asp:RadioButtonList ID="percentList" runat="server" RepeatDirection="Horizontal" AutoPostBack="True" OnSelectedIndexChanged="percentChanged" SelectedValue='<%# Bind("percentComplete") %>' - CssClass="buttons" OnInit="percentList_Init"> + CssClass="buttons" OnLoad="percentList_Load"> <asp:ListItem>0</asp:ListItem> <asp:ListItem>25</asp:ListItem> <asp:ListItem>50</asp:ListItem> @@ -49,7 +49,7 @@ </asp:RadioButtonList></div> <asp:Label ID="deletedLbl" runat="server" Text="Deleted: "></asp:Label><strong></strong><asp:CheckBox ID="activeBox" runat="server" AutoPostBack="True" OnCheckedChanged="activeBox_CheckedChanged" - OnInit="activeBox_Init" /></div> + OnLoad="activeBox_Load" /></div> <div class="end"> </div> </div> @@ -104,11 +104,11 @@ <div class="left"> <div class="bottom"> <asp:LinkButton ID="NewButton" runat="server" CausesValidation="False" CommandName="New" - Text="New" OnInit="NewButton_Init" /><asp:Label ID="newLbl" runat="server"> | </asp:Label><asp:LinkButton + Text="New" OnLoad="NewButton_Load" /><asp:Label ID="newLbl" runat="server"> | </asp:Label><asp:LinkButton ID="EditButton" runat="server" CausesValidation="False" CommandName="Edit" Text="Edit" - OnInit="EditButton_Init" /><asp:Label ID="deleteLbl" runat="server"> | </asp:Label><asp:LinkButton + OnLoad="EditButton_Load" /><asp:Label ID="deleteLbl" runat="server"> | </asp:Label><asp:LinkButton ID="DeleteButton" runat="server" CausesValidation="False" CommandName="deleteItem" - Text="Delete" OnCommand="deleteItem" OnInit="DeleteButton_Init" /> + Text="Delete" OnCommand="deleteItem" OnLoad="DeleteButton_Load" /> </div> </div> <div class="right"> @@ -183,7 +183,7 @@ ShowGoToToday="True" NullableLabelText="Select a date" ControlDisplay="LabelImage" ImageUrl="../App_Themes/Python/Images/calendar.gif" Nullable="True" OnDateChanged="dateFinished_DateChanged" SelectedDate="" UpperBoundDate="12/31/9999 23:59:59" VisibleDate="" AutoPostBack="True" - OnInit="dateFinished_Init"> + OnLoad="dateFinished_Load"> </ew:CalendarPopup> </div> </div> @@ -324,7 +324,7 @@ UpdateMethod="Update" DeleteMethod="Delete"> <SelectParameters> <asp:SessionParameter Name="actionItemID" SessionField="AssignmentTab_item_id" Type="Int32" /> - <asp:SessionParameter DefaultValue="" Name="active" SessionField="AssignmentTab_active" Type="Boolean" /> + <asp:SessionParameter DefaultValue="" Name="active" SessionField="active" Type="Boolean" /> </SelectParameters> <InsertParameters> <asp:Parameter Name="name" Type="String" /> Modified: Website/Includes/ActionItems.ascx.cs =================================================================== --- Website/Includes/ActionItems.ascx.cs 2006-08-14 16:33:49 UTC (rev 313) +++ Website/Includes/ActionItems.ascx.cs 2006-08-14 17:09:39 UTC (rev 314) @@ -22,7 +22,11 @@ private static Logger m_logg = new Logger("TCDB.ActionItems"); private const string PREFIX = "AssignmentTab_"; private ActionItem ai; +<<<<<<< .mine + private String item_id = null; +======= private int item_id = 0; +>>>>>>> .theirs private int productID = 0; private String mode = ""; private bool current = false; @@ -38,50 +42,82 @@ { current = true; } - // Load session data +<<<<<<< .mine + try { - item_id = Convert.ToInt32(Session[PREFIX + Constants.CODE_AI]); + mode = Session[PREFIX + Constants.CODE_MODE].ToString(); } catch { } + + if (mode == Constants.CODE_NEW && (m_user.HasRight(Constants.RIGHTS_AI_CREATE_MY) || m_user.HasRight(Constants.RIGHTS_AI_CREATE_OTHER))) + { + ActionItemsView.ChangeMode(FormViewMode.Insert); + return; + } + + + if (productID == 0) + productID = Constants.PRODUCT_SITEID; + +======= + + + + + + + + + + + + + + + + + +>>>>>>> .theirs + // Load session data try { - mode = Session[PREFIX + Constants.CODE_MODE].ToString(); + item_id = Convert.ToInt32(Session[PREFIX + Constants.CODE_AI]); } catch { } + try { productID = Convert.ToInt32(Session[PREFIX + Constants.CODE_PRODUCT]); } catch { productID = Constants.PRODUCT_SITEID; } - + m_logg.Debug("Loading page ActionItems"); if (item_id == 0) { - m_logg.Debug("Unable to locate action item ID in query string"); - if (mode != "new") - { - m_logg.Debug("Mode not set, redirecting to Assignments page"); - Response.Redirect("Assignments.aspx?" + Constants.CODE_USER + "=" + m_user.ID); - } + m_logg.Debug("Unable to locate action item ID"); + + m_logg.Debug("Mode not set, redirecting to Assignments page"); + Session.Remove(PREFIX + "Name"); + Response.Redirect("~/Assignments.aspx"); } - else + + try { - try - { - ai = ActionItemDB.GetActionItem(Convert.ToInt32(item_id), active); - } - catch { } + ai = ActionItemDB.GetActionItem(Convert.ToInt32(item_id), active); + } + catch { } - if (ai != null && - (!m_user.HasRight(Constants.RIGHTS_AI_VIEW_OTHER, productID) && - !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_VIEW_MY, productID)) && - !(ai.CREATOR.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_VIEW_CREATED, productID)))) - { - - Response.Redirect("~/Assignments.aspx?" + Constants.CODE_USER + "=" + m_user.ID); - } + if (ai != null && + (!m_user.HasRight(Constants.RIGHTS_AI_VIEW_OTHER, productID) && + !(ai.ASSIGNED.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_VIEW_MY, productID)) && + !(ai.CREATOR.ID == m_user.ID && m_user.HasRight(Constants.RIGHTS_AI_VIEW_CREATED, productID)))) + { + m_logg.Debug("User doesn't have permissions for the requested operation, returning to assignments page"); + Session[Constants.CODE_ERROR] = "Permission denied."; + Session.Remove(PREFIX + "Name"); + Response.Redirect("~/Assignments.aspx"); } if (item_id == 0) @@ -90,9 +126,6 @@ Session[PREFIX + "item_id"] = item_id; Session[PREFIX + "productID"] = productID; Session[PREFIX + "tableName"] = "tcdb_actionItem"; - - if (mode == "new" && (m_user.HasRight(Constants.RIGHTS_AI_CREATE_MY) || m_user.HasRight(Constants.RIGHTS_AI_CREATE_OTHER))) - ActionItemsView.ChangeMode(FormViewMode.Insert); } protected void updateStatus() @@ -349,19 +382,32 @@ } } else - Response.Redirect("Assignments.aspx?" + Constants.CODE_USER + "=" + m_user.ID); + { + Session.Remove(PREFIX + "Name"); + Response.Redirect("~/Assignments.aspx"); + } } protected void ActionItemsView_ItemCommand(object sender, FormViewCommandEventArgs e) { if (e.CommandName == "Cancel" && ActionItemsView.CurrentMode == FormViewMode.Insert) - Response.Redirect("Assignments.aspx?" + Constants.CODE_USER + "=" + m_user.ID); + { + Session.Remove(PREFIX + "Name"); + Response.Redirect("~/Assignments.aspx"); + } } protected void deleteItem(object sender, CommandEventArgs e) { tcdbDataSetTableAdapters.db_actionItemsTableAdapter aiAdapter = new tcdbDataSetTableAdapters.db_actionItemsTableAdapter(); aiAdapter.Delete(item_id, 0); - Response.Redirect("Assignments.aspx?" + Constants.CODE_USER + "=" + m_user.ID); + Session[Constants.CODE_ERROR] = "Action Item Deleted"; + Session.Remove(PREFIX + "Name"); + Response.Redirect("~/Assignments.aspx"); } + + protected void ActionItemsView_ItemInsert(object sender, FormViewInsertEventArgs e) + { + int i = 1; + } protected void ActionItemsView_ItemInserted(object sender, FormViewInsertedEventArgs e) { if (e.Exception == null) @@ -381,13 +427,17 @@ //set the content' m_logg.Debug("Preparing to send mail notification"); ActionItemDB.SendNewActionItemMail(id); - - Response.Redirect("ActionItem.aspx?" + Constants.CODE_AI + "=" + id); + Session.Remove(PREFIX + Constants.CODE_MODE); + Session[PREFIX + Constants.CODE_AI] = id; + Response.Redirect("~/Assignments.aspx"); } else { m_logg.Info("ERROR: Action Item Creation failed"); - Response.Redirect("Assignments.aspx?" + Constants.CODE_USER + "=" + m_user.ID); + Session[Constants.CODE_ERROR] = "ERROR: Action Item Creation Failed"; + Session.Remove(PREFIX + Constants.CODE_MODE); + Session.Remove(PREFIX + "Name"); + Response.Redirect("~/Assignments.aspx"); } } } @@ -395,10 +445,20 @@ { if (e.Exception != null) { - updateStatus(); + updateStatus(); +<<<<<<< .mine + Session[Constants.CODE_ERROR] = "Action Item Updated"; + Session.Remove(PREFIX + Constants.CODE_MODE); + Session[PREFIX + Constants.CODE_AI] = item_id.ToString(); + Response.Redirect("~/Assignments.aspx"); +======= Response.Redirect("ActionItem.aspx?" + Constants.CODE_AI + "=" + item_id); - } + + + +>>>>>>> .theirs } + } protected void statusList_Init(object sender, EventArgs e) { Modified: Website/Includes/AdministrationTree.ascx =================================================================== --- Website/Includes/AdministrationTree.ascx 2006-08-14 16:33:49 UTC (rev 313) +++ Website/Includes/AdministrationTree.ascx 2006-08-14 17:09:39 UTC (rev 314) @@ -4,7 +4,7 @@ OnCheckedChanged="showHidden_CheckedChanged" OnLoad="showHidden_Load" OnInit="showHidden_Init" /> <asp:TreeView ID="AdminTree" runat="server" SelectedNodeStyle-CssClass="selectednode" OnTreeNodePopulate="AdminTree_TreeNodePopulate" OnTreeNodeCollapsed="AdminTree_TreeNodeCollapsed" - OnTreeNodeExpanded="AdminTree_TreeNodeExpanded" OnInit="AdminTree_Init" OnSelectedNodeChanged="AdminTree_SelectedNodeChanged" + OnTreeNodeExpanded="AdminTree_TreeNodeExpanded" OnLoad="AdminTree_Load" OnSelectedNodeChanged="AdminTree_SelectedNodeChanged" ExpandDepth="1"> <Nodes> <asp:TreeNode Text="Administration" Value="Admin" PopulateOnDemand="True" SelectAction="Expand" /> Modified: Website/Includes/AdministrationTree.ascx.cs =================================================================== --- Website/Includes/AdministrationTree.ascx.cs 2006-08-14 16:33:49 UTC (rev 313) +++ Website/Includes/AdministrationTree.ascx.cs 2006-08-14 17:09:39 UTC (rev 314) @@ -26,7 +26,7 @@ Response.Redirect("~/Assignments.aspx?" + Constants.CODE_USER + "=" + m_user.ID); } - protected void AdminTree_Init(object sender, EventArgs args) + protected void AdminTree_Load(object sender, EventArgs args) { m_logg.Debug("Initializing admin tree"); if (Session[PREFIX + "Nodes"] == null) Modified: Website/Includes/Footer.ascx.cs =================================================================== --- Website/Includes/Footer.ascx.cs 2006-08-14 16:33:49 UTC (rev 313) +++ Website/Includes/Footer.ascx.cs 2006-08-14 17:09:39 UTC (rev 314) @@ -7,6 +7,7 @@ using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; +using System.Collections; using TCDB.Code; @@ -22,18 +23,31 @@ protected string PageLoad() { string result; - TimeSpan loadtime = DateTime.Now - m_startTime; + try + { + TimeSpan loadtime = DateTime.Now - (DateTime)Session["startTime"]; + Session.Remove("startTime"); - if (loadtime.Milliseconds < 99) - { - result = loadtime.Milliseconds + " milliseconds"; + if (loadtime.Milliseconds < 99) + { + result = loadtime.Milliseconds + " milliseconds"; + } + else + { + result = loadtime.TotalSeconds.ToString("F") + " seconds"; + } + IEnumerator keys = Session.Contents.Keys.GetEnumerator(); + String key_string = ""; + while (keys.MoveNext()) + { + key_string = key_string + "\t[" + keys.Current.ToString() + "]\t=\t[" + Session[keys.Current.ToString()] + "]\n"; + } + m_logg.Debug("Page load took [" + result + "] for [" + Request.RawUrl + "] with {\n" + key_string + "}"); } - else + catch { - result = loadtime.TotalSeconds.ToString("F") + " seconds"; + result = ""; } - - m_logg.Debug("Page load took [" + result + "]"); return result; } Modified: Website/TCDB.master =================================================================== --- Website/TCDB.master 2006-08-14 16:33:49 UTC (rev 313) +++ Website/TCDB.master 2006-08-14 17:09:39 UTC (rev 314) @@ -55,7 +55,8 @@ try { - string error = ConfigDB.GetConfigString(m_user.ID, "error"); + string error = (string)Session[Constants.CODE_ERROR]; + Session.Remove(Constants.CODE_ERROR); if (error.Length > 0) { errorLabel.Text = error; Deleted: Website/WorkOrder.aspx =================================================================== --- Website/WorkOrder.aspx 2006-08-14 16:33:49 UTC (rev 313) +++ Website/WorkOrder.aspx 2006-08-14 17:09:39 UTC (rev 314) @@ -1,8 +0,0 @@ -<%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" Title="TCDB: Work Order" %> - -<asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> -</asp:Content> -<asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> -</asp:Content> -<asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" Runat="Server"> -</asp:Content> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ro...@us...> - 2006-07-10 19:09:15
|
Revision: 91 Author: rouquin Date: 2006-07-10 12:09:08 -0700 (Mon, 10 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=91&view=rev Log Message: ----------- Started porting AssignmentsTree.ascx to Website. Not fully working yet. Still waiting for stored procedures, but testing it with manual queries for now. Modified Paths: -------------- Website/Assignments.aspx Website/Includes/AssignmentsTree.ascx Website/Includes/Header.ascx Website/Includes/Header_Menu.ascx Website/TCDB.master Modified: Website/Assignments.aspx =================================================================== --- Website/Assignments.aspx 2006-07-10 17:12:54 UTC (rev 90) +++ Website/Assignments.aspx 2006-07-10 19:09:08 UTC (rev 91) @@ -1,8 +1,10 @@ <%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" Title="Untitled Page" %> -<asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> + +<%@ Register Src="~/Includes/AssignmentsTree.ascx" TagPrefix="assignment" TagName="Tree" %> +<asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" runat="Server"> + <assignment:Tree ID=tree runat=server /> </asp:Content> -<asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> +<asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" runat="Server"> </asp:Content> -<asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" Runat="Server"> +<asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" runat="Server"> </asp:Content> - Modified: Website/Includes/AssignmentsTree.ascx =================================================================== --- Website/Includes/AssignmentsTree.ascx 2006-07-10 17:12:54 UTC (rev 90) +++ Website/Includes/AssignmentsTree.ascx 2006-07-10 19:09:08 UTC (rev 91) @@ -1 +1,133 @@ <%@ Control Language="C#" AutoEventWireup="true" %> +<%@ Import Namespace=System.Data.SqlClient %> +<%@ Import Namespace=System.Data %> + +<script runat=server > + + private SqlConnection _DBConnection = new SqlConnection("Data Source=DAD\\SQLSERVER2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw"); + + protected void Page_Load(object sender, EventArgs e) + { + DBConnection.Open(); + + } + public SqlConnection DBConnection { + get { return _DBConnection; } + } + public void updateTree() + { + foreach (TreeNode node in TreeView1.Nodes) + { + node.ChildNodes.Clear(); + TreeView1_TreeNodePopulate(TreeView1, new TreeNodeEventArgs(node)); + } + TreeView1.ExpandAll(); + } + protected void TreeView1_TreeNodePopulate(object sender, TreeNodeEventArgs e) + { + TreeView tv = (TreeView)sender; + DataSet ResultsDataSet = new DataSet(); + SqlDataAdapter DBAdapter; + String query; + + // Call the appropriate method to populate a node at a particular level. + switch (e.Node.Depth) + { + case 0: + // Populate the first-level nodes. + DBAdapter = new SqlDataAdapter("SELECT userID,firstName,lastName FROM tcdb_user", DBConnection); + DBAdapter.Fill(ResultsDataSet); + + if (ResultsDataSet.Tables.Count > 0) + { + foreach (DataRow row in ResultsDataSet.Tables[0].Rows) + { + // Create the new node. + TreeNode newNode = new TreeNode(); + newNode.Text = row["firstName"] + " " + row["lastName"]; + newNode.Value = row["userID"].ToString(); + + // Set the PopulateOnDemand property to true so that the child nodes can be + // dynamically populated. + newNode.PopulateOnDemand = true; + + // Set additional properties for the node. + newNode.SelectAction = TreeNodeSelectAction.Expand; + newNode.NavigateUrl = "~/Assignments.aspx?id=" + row["userID"]; + + // Add the new node to the ChildNodes collection of the parent node. + e.Node.ChildNodes.Add(newNode); + } + } + break; + case 1: + // Populate the second-level nodes. + query = "SELECT ai.actionItemID, ai.name FROM tcdb_actionItem ai" + + "INNER JOIN tcdb_assignment a ON ai.actionItemID = a.actionItemID " + + "WHERE (NOT a.statusID=12) AND (a.assignedID = " + e.Node.Value + ") ORDER BY a.highPriority DESC"; + DBAdapter = new SqlDataAdapter(query, DBConnection); + DBAdapter.Fill(ResultsDataSet); + + if (ResultsDataSet.Tables.Count > 0) + { + foreach (DataRow row in ResultsDataSet.Tables[0].Rows) + { + // Create the new node. + TreeNode newNode = new TreeNode(); + newNode.Text = row["name"].ToString(); + newNode.Value = row["actionItemID"].ToString(); + + // Set the PopulateOnDemand property to true so that the child nodes can be + // dynamically populated. + newNode.PopulateOnDemand = true; + + // Set additional properties for the node. + newNode.SelectAction = TreeNodeSelectAction.Expand; + newNode.NavigateUrl = "~/ActionItemEdit.aspx?id=" + newNode.Value; + + // Add the new node to the ChildNodes collection of the parent node. + e.Node.ChildNodes.Add(newNode); + } + } + ResultsDataSet.Clear(); + query = "SELECT wo.WorkOrderID, wo.name FROM tcdb_workOrder wo" + + "INNER JOIN tcdb_assignment a ON wo.WorkOrderID = a.workOrderID " + + "WHERE (NOT a.statusID=16) AND (a.assignedID = " + e.Node.Value + ")"; + DBAdapter = new SqlDataAdapter(query, DBConnection); + DBAdapter.Fill(ResultsDataSet); + + if (ResultsDataSet.Tables.Count > 0) + { + foreach (DataRow row in ResultsDataSet.Tables[0].Rows) + { + // Create the new node. + TreeNode newNode = new TreeNode(); + newNode.Text = row["name"].ToString(); + newNode.Value = row["workOrderID"].ToString(); + + // Set the PopulateOnDemand property to true so that the child nodes can be + // dynamically populated. + newNode.PopulateOnDemand = true; + + // Set additional properties for the node. + newNode.SelectAction = TreeNodeSelectAction.Expand; + newNode.NavigateUrl = "~/WorkOrderEdit.aspx?id=" + newNode.Value; + + // Add the new node to the ChildNodes collection of the parent node. + e.Node.ChildNodes.Add(newNode); + } + } + break; + + } + } +</script> + +<asp:TreeView ID=TreeView1 runat="server" SelectedNodeStyle-CssClass="selectednode" + OnTreeNodePopulate=TreeView1_TreeNodePopulate> + <Nodes> + <asp:TreeNode Text="User Assignments" Value="Users" PopulateOnDemand="True" SelectAction=Expand + NavigateUrl="~/Assignments.aspx" /> + </Nodes> + <SelectedNodeStyle CssClass="selectednode" /> +</asp:TreeView> Modified: Website/Includes/Header.ascx =================================================================== --- Website/Includes/Header.ascx 2006-07-10 17:12:54 UTC (rev 90) +++ Website/Includes/Header.ascx 2006-07-10 19:09:08 UTC (rev 91) @@ -1,5 +1,5 @@ <%@ Control Language="C#" AutoEventWireup="true" %> -<%@ Register TagPrefix="TCDB" TagName="User" src="~/Includes/Header_User.ascx" %> +<%@ Register TagPrefix="TCDB" TagName="User" src="~/Includes/Header_User.ascx" %> <%@ Register TagPrefix="TCDB" TagName="CurrentInfo" src="~/Includes/Header_CurrentInfo.ascx" %> <%@ Register TagPrefix="TCDB" TagName="Menu" src="~/Includes/Header_Menu.ascx" %> <%@ Import Namespace="TCDB_Users" %> @@ -12,13 +12,13 @@ <% if (Request.IsAuthenticated) { %> <div id="MainMenu"> <div id="User"> - <TCDB:User runat="server" /> + <TCDB:User id=user runat="server" /> </div> <div id="CurrentInfo"> - <TCDB:CurrentInfo runat="server" /> + <TCDB:CurrentInfo id=currentInfo runat="server" /> </div> <div id="Menu"> - <TCDB:Menu runat="server" /> + <TCDB:Menu ID=menu runat="server" /> </div> </div> <% } %> Modified: Website/Includes/Header_Menu.ascx =================================================================== --- Website/Includes/Header_Menu.ascx 2006-07-10 17:12:54 UTC (rev 90) +++ Website/Includes/Header_Menu.ascx 2006-07-10 19:09:08 UTC (rev 91) @@ -1,2 +1,2 @@ <%@ Control Language="C#" AutoEventWireup="true" %> -Assignments | Execute | Management \ No newline at end of file +<a href="Assignments.aspx">Assignments</a> | Execute | Management \ No newline at end of file Modified: Website/TCDB.master =================================================================== --- Website/TCDB.master 2006-07-10 17:12:54 UTC (rev 90) +++ Website/TCDB.master 2006-07-10 19:09:08 UTC (rev 91) @@ -12,7 +12,7 @@ <div id="NonFooter"> <form id="Form1" runat="server"> <div id="HeaderContent"> - <TCDB:Header runat="server" /> + <TCDB:Header id=header runat="server" /> </div> <% if (Request.IsAuthenticated) { %> @@ -32,13 +32,13 @@ else {%> <div id="Login"> - <TCDB:Authenticate runat="server" /> + <TCDB:Authenticate id=authenticate runat="server" /> </div> <% } %> </form> </div> <div id="FooterContent"> - <TCDB:Footer runat="server" /> + <TCDB:Footer id=footer runat="server" /> </div> </body> </html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <m_h...@us...> - 2006-07-11 00:16:26
|
Revision: 92 Author: m_hildebrand Date: 2006-07-10 17:16:13 -0700 (Mon, 10 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=92&view=rev Log Message: ----------- Cleaned up AssignmentsTree and worked on some backend code. Started work on notes. Modified Paths: -------------- Website/App_Code/AD_Authentication.cs Website/App_Code/TCDB_Products.cs Website/App_Code/TCDB_Users.cs Website/App_Code/dadDataSet.xsd Website/App_Code/dadDataSet.xss Website/Assignments.aspx Website/Includes/AssignmentsTree.ascx Website/Includes/Authenticate.ascx Website/Includes/Header.ascx Website/Includes/Header_User.ascx Website/TCDB.master Website/web.config Added Paths: ----------- Website/App_Code/TCDB_Assignments.cs Website/App_Code/TCDB_Common.cs Website/App_Code/TCDB_Notes.cs Website/App_Code/TCDB_Statuses.cs Removed Paths: ------------- Website/App_Code/TCDB_Constants.cs Modified: Website/App_Code/AD_Authentication.cs =================================================================== --- Website/App_Code/AD_Authentication.cs 2006-07-10 19:09:08 UTC (rev 91) +++ Website/App_Code/AD_Authentication.cs 2006-07-11 00:16:13 UTC (rev 92) @@ -9,6 +9,7 @@ using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; using TCDB_Users; +using TCDB_Common; namespace AD_Auth { @@ -63,7 +64,7 @@ ds.SearchScope = SearchScope.Subtree; ds.Filter = "(&(objectClass=user)(sAMAccountName=" + UserName[1] + "))"; - user.USERID = TCDB_Constants.TCDB_Constant.USER_NEWUSER; + user.ID = TCDB_Constant.USER_NEWUSER; user.AUTOMATION = false; user.ISAUTHENTICATED = true; user.USERNAME = UserName[1]; Added: Website/App_Code/TCDB_Assignments.cs =================================================================== --- Website/App_Code/TCDB_Assignments.cs (rev 0) +++ Website/App_Code/TCDB_Assignments.cs 2006-07-11 00:16:13 UTC (rev 92) @@ -0,0 +1,354 @@ +using System; +using System.Data; +using System.Collections.Generic; +using System.Configuration; +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; +using TCDB_Statuses; +using TCDB_Common; +using TCDB_Users; + +namespace TCDB_Assignments +{ + /// <summary> + /// Summary description for TCDB_Assignments + /// </summary> + public class TCDB_AssignmentDB : Page + { + public static List<TCDB_Assignment> TCDB_GetAssignmentList(string aType, int finished, int assignedID, string highPriority) + { + dadDataSet ds = new dadDataSet(); + dadDataSetTableAdapters.db_assignmentsTableAdapter ta = new dadDataSetTableAdapters.db_assignmentsTableAdapter(); + // TODO: figure out the high priority stuff! + ta.GetData(aType, finished, assignedID, null); + ta.Fill(ds.db_assignments, aType, finished, assignedID, null); + + List<TCDB_Assignment> assignmentList = new List<TCDB_Assignment>(); + + DataTableReader dr = ds.db_assignments.CreateDataReader(); + if (dr.HasRows) + { + while (dr.Read()) + { + TCDB_Assignment assignment = new TCDB_Assignment(); + + string type = TCDB_Help.TCDB_DB_StringParse(dr["aType"], TCDB_Constant.ASSIGNMENT_DEFAULTTYPE); + if (type == TCDB_Constant.ASSIGNMENT_TYPE_ACTIONITEM) + { + assignment.ACTIONITEM = TCDB_ActionItemDB.TCDB_GetActionItem(TCDB_Help.TCDB_DB_IntParse(dr["childID"], TCDB_Constant.ACTIONITEM_DEFAULTID)); + assignment.WOTOTALTEST = 0; + assignment.WOPASSRATE = 0; + assignment.WOPASS = 0; + assignment.WOFAIL = 0; + assignment.WOERROR = 0; + } + else if (type == TCDB_Constant.ASSIGNMENT_TYPE_WORKORDER) + { + assignment.WORKORDER = TCDB_WorkOrderDB.TCDB_GetWorkOrder(TCDB_Help.TCDB_DB_IntParse(dr["childID"], TCDB_Constant.WORKORDER_DEFAULTID)); + assignment.WOTOTALTEST = TCDB_Help.TCDB_DB_IntParse(dr["WOTotalTest"], 0); + assignment.WOPASSRATE = TCDB_Help.TCDB_DB_IntParse(dr["WOPassRate"], 0); + assignment.WOPASS = TCDB_Help.TCDB_DB_IntParse(dr["WOPass"], 0); + assignment.WOFAIL = TCDB_Help.TCDB_DB_IntParse(dr["WOFail"], 0); + assignment.WOERROR = TCDB_Help.TCDB_DB_IntParse(dr["WOError"], 0); + } + + 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.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"], ""); + + assignmentList.Add(assignment); + } + } + + return assignmentList; + } + } + + public class TCDB_ActionItemDB : Page + { + public static TCDB_ActionItem TCDB_GetActionItem(int id) + { + dadDataSet ds = new dadDataSet(); + dadDataSetTableAdapters.db_actionItemsTableAdapter ta = new dadDataSetTableAdapters.db_actionItemsTableAdapter(); + ta.GetData(id); + ta.Fill(ds.db_actionItems, id); + + TCDB_ActionItem ai = new TCDB_ActionItem(); + + DataTableReader dr = ds.db_users.CreateDataReader(); + if (dr.HasRows && dr.Read()) + { + ai.ID = TCDB_Help.TCDB_DB_IntParse(dr["actionItemID"], TCDB_Constant.ACTIONITEM_DEFAULTID); + ai.NAME = TCDB_Help.TCDB_DB_StringParse(dr["name"], TCDB_Constant.ACTIONITEM_DEFAULTNAME); + ai.DESCRIPTION = TCDB_Help.TCDB_DB_StringParse(dr["description"], TCDB_Constant.ACTIONITEM_DEFAULTDESCRIPTION); + ai.CREATORID = TCDB_Help.TCDB_DB_IntParse(dr["creatorID"], TCDB_Constant.ACTIONITEM_DEFAULTCREATORID); + ai.PERCENTCOMPLETE = TCDB_Help.TCDB_DB_IntParse(dr["percentComplete"], TCDB_Constant.ACTIONITEM_DEFAULTPERCENTCOMPLETE); + } + + return ai; + } + } + + public class TCDB_WorkOrderDB : Page + { + public static TCDB_WorkOrder TCDB_GetWorkOrder(int id) + { + /* + dadDataSet ds = new dadDataSet(); + dadDataSetTableAdapters.db_actionItemsTableAdapter ta = new dadDataSetTableAdapters.db_actionItemsTableAdapter(); + ta.GetData(id); + ta.Fill(ds.db_actionItems, id); + + TCDB_ActionItem ai = new TCDB_ActionItem(); + + DataTableReader dr = ds.db_users.CreateDataReader(); + if (dr.HasRows && dr.Read()) + { + ai.ID = TCDB_Help.TCDB_DB_IntParse(dr["actionItemID"], TCDB_Constant.ACTIONITEM_DEFAULTID); + ai.NAME = TCDB_Help.TCDB_DB_StringParse(dr["name"], TCDB_Constant.ACTIONITEM_DEFAULTNAME); + ai.DESCRIPTION = TCDB_Help.TCDB_DB_StringParse(dr["description"], TCDB_Constant.ACTIONITEM_DEFAULTDESCRIPTION); + ai.CREATORID = TCDB_Help.TCDB_DB_IntParse(dr["creatorID"], TCDB_Constant.ACTIONITEM_DEFAULTCREATORID); + ai.PERCENTCOMPLETE = TCDB_Help.TCDB_DB_IntParse(dr["percentComplete"], TCDB_Constant.ACTIONITEM_DEFAULTPERCENTCOMPLETE); + } + + return ai; + * */ + return new TCDB_WorkOrder(); + } + } + + public class TCDB_Assignment + { + private int p_id; + private string p_name; + private string p_creator; + private string p_assigned; + private DateTime p_dateAssigned; + private DateTime p_dateFinished; + private DateTime p_dueDate; + private TCDB_WorkOrder p_workOrder; + private TCDB_ActionItem p_actionItem; + private bool p_highPriority; + private string p_statusName; + private int p_woTotalTest; + private int p_woPassRate; + private int p_woPass; + private int p_woFail; + private int p_woError; + + public TCDB_Assignment() + { + p_id = 0; + p_name = ""; + p_creator = ""; + p_assigned = ""; + p_dateAssigned = TCDB_Constant.ASSIGNMENT_DEFAULTDATEASSIGNED; + p_dateFinished = TCDB_Constant.ASSIGNMENT_DEFAULTDATEFINISHED; + p_dueDate = TCDB_Constant.ASSIGNMENT_DEFAULTDUEDATE; + p_workOrder = null; + p_actionItem = null; + p_highPriority = false; + p_statusName = ""; + p_woTotalTest = 0; + p_woPassRate = 0; + p_woPass = 0; + p_woFail = 0; + p_woError = 0; + } + + public int ID + { + get { return p_id; } + set { p_id = value; } + } + + public string NAME + { + get { return p_name; } + set { p_name = value; } + } + + public string CREATOR + { + get { return p_creator; } + set { p_creator = value; } + } + + public string ASSIGNED + { + get { return p_assigned; } + set { p_assigned = value; } + } + + public DateTime DATEASSIGNED + { + get { return p_dateAssigned; } + set { p_dateAssigned = value; } + } + + public DateTime DATEFINISHED + { + get { return p_dateFinished; } + set { p_dateFinished = value; } + } + + public DateTime DUEDATE + { + get { return p_dueDate; } + set { p_dueDate = value; } + } + + public TCDB_WorkOrder WORKORDER + { + get { return p_workOrder; } + set { p_workOrder = value; } + } + + public TCDB_ActionItem ACTIONITEM + { + get { return p_actionItem; } + set { p_actionItem = value; } + } + + public bool HIGHPRIORITY + { + get { return p_highPriority; } + set { p_highPriority = value; } + } + + public string STATUSNAME + { + get { return p_statusName; } + set { p_statusName = value; } + } + + public bool ISWORKORDER + { + get { + if (p_workOrder == null) + return false; + else + return true; + } + } + + public bool ISACTIONITEM + { + get + { + if (p_actionItem == null) + return false; + else + return true; + } + } + + public int WOTOTALTEST + { + get { return p_woTotalTest; } + set { p_woTotalTest = value; } + } + + public int WOPASSRATE + { + get { return p_woPassRate; } + set { p_woPassRate = value; } + } + + public int WOPASS + { + get { return p_woPass; } + set { p_woPass = value; } + } + + public int WOFAIL + { + get { return p_woFail; } + set { p_woFail = value; } + } + + public int WOERROR + { + get { return p_woError; } + set { p_woError = value; } + } + + } + + public class TCDB_ActionItem + { + private int p_id; + private string p_name; + private string p_description; + private int p_creatorID; + private int p_percentComplete; + + public TCDB_ActionItem() + { + p_id = 0; + p_name = ""; + p_description = ""; + p_creatorID = 0; + p_percentComplete = 0; + } + + public TCDB_ActionItem(int id, string name, string description, int creatorID, int percentComplete) + { + p_id = id; + p_name = name; + p_description = description; + p_creatorID = creatorID; + p_percentComplete = percentComplete; + } + + public int ID + { + get { return p_id; } + set { p_id = value; } + } + + public string NAME + { + get { return p_name; } + set { p_name = value; } + } + + public string DESCRIPTION + { + get { return p_description; } + set { p_description = value; } + } + + public int CREATORID + { + get { return p_creatorID; } + set { p_creatorID = value; } + } + + public int PERCENTCOMPLETE + { + get { return p_percentComplete; } + set { p_percentComplete = value; } + } + + public override string ToString() + { + return NAME; + } + } + + public class TCDB_WorkOrder + { + public TCDB_WorkOrder() + { + } + } +} \ No newline at end of file Copied: Website/App_Code/TCDB_Common.cs (from rev 89, Website/App_Code/TCDB_Constants.cs) =================================================================== --- Website/App_Code/TCDB_Common.cs (rev 0) +++ Website/App_Code/TCDB_Common.cs 2006-07-11 00:16:13 UTC (rev 92) @@ -0,0 +1,142 @@ +using System; +using System.Data; +using System.Configuration; +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; +using TCDB_Users; + +namespace TCDB_Common +{ + /// <summary> + /// Summary description for TCDB_Constant + /// </summary> + public static class TCDB_Constant + { + // TODO: Load the values from the DB where appropriate + public static int USER_FAILEDLOGIN = -2; + public static int USER_NOTREGISTERED = -1; + public static int USER_NEWUSER = -1; + + public static int USER_ANONYMOUSUSERID = 0; + public static string USER_ANONYMOUSUSERNAME = "Guest"; + public static string USER_ANONYMOUSFIRSTNAME = "Guest"; + public static string USER_ANONYMOUSLASTNAME = "User"; + public static string USER_ANONYMOUSEMAIL = ""; + public static string USER_ANONYMOUSOFFICEPHONE = ""; + public static string USER_ANONYMOUSHOMEPHONE = ""; + public static string USER_ANONYMOUSCELLPHONE = ""; + public static bool USER_ANONYMOUSAUTOMATION = false; + + public static int ACTIONITEM_DEFAULTID = 0; + public static string ACTIONITEM_DEFAULTNAME = ""; + public static string ACTIONITEM_DEFAULTDESCRIPTION = ""; + public static int ACTIONITEM_DEFAULTCREATORID = USER_ANONYMOUSUSERID; + public static int ACTIONITEM_DEFAULTPERCENTCOMPLETE = 0; + + public static int PRODUCT_DEFAULTID = 0; + public static string PRODUCT_DEFAULTNAME = ""; + public static string PRODUCT_DEFAULTDESCRIPTION = ""; + public static string PRODUCT_DEFAULTCODENAME = ""; + public static int PRODUCT_DEFAULTDEVMANAGERID = USER_ANONYMOUSUSERID; + public static int PRODUCT_DEFAULTQAMANAGERID = USER_ANONYMOUSUSERID; + public static int PRODUCT_DEFAULTDEVLEADID = USER_ANONYMOUSUSERID; + public static int PRODUCT_DEFAULTQALEADID = USER_ANONYMOUSUSERID; + public static int PRODUCT_DEFAULTPMID = USER_ANONYMOUSUSERID; + public static bool PRODUCT_DEFAULTACTIVE = false; + + public static int STATUS_DEFAULTID = 0; + public static string STATUS_DEFAULTGROUP = ""; + public static string STATUS_DEFAULTNAME = ""; + public static string STATUS_DEFAULTDESCRIPTION = ""; + + public static int NOTE_DEFAULTID = 0; + public static DateTime NOTE_DEFAULTDATE = new DateTime(1, 1, 1); + public static string NOTE_DEFAULTNOTEFIELD = ""; + public static int NOTE_DEFAULTAUTHOR = USER_ANONYMOUSUSERID; + + public static string ASSIGNMENT_TYPE_WORKORDER = "WO"; + public static string ASSIGNMENT_TYPE_ACTIONITEM = "AI"; + public static string ASSIGNMENT_TYPE_BOTH = null; + public static string ASSIGNMENT_DEFAULTTYPE = ""; + // TODO: figure this one out + //public static bool ASSIGNMENT_PRIORITY_ALL = null; + public static bool ASSIGNMENT_PRIORITY_HIGH = true; + public static bool ASSIGNMENT_PRIORITY_NORMAL = false; + public static int ASSIGNMENT_FINISHEDANDUNFINISHED = 0; + public static int ASSIGNMENT_FINISHED = 1; + public static int ASSIGNMENT_UNFINISHED = 2; + + public static int ASSIGNMENT_DEFAULTCREATOR = USER_ANONYMOUSUSERID; + public static int ASSIGNMENT_DEFAULTASSIGNEDID = USER_ANONYMOUSUSERID; + public static DateTime ASSIGNMENT_DEFAULTDATEASSIGNED = NOTE_DEFAULTDATE; + public static DateTime ASSIGNMENT_DEFAULTDUEDATE = NOTE_DEFAULTDATE; + public static DateTime ASSIGNMENT_DEFAULTDATEFINISHED = NOTE_DEFAULTDATE; + public static bool ASSIGNMENT_DEFAULTHIGHPRIORITY = false; + + public static int WORKORDER_DEFAULTID = 0; + } + + public static class TCDB_Help + { + + public static int TCDB_DB_IntParse(object value, int defaultValue) + { + int result = defaultValue; + try + { + result = int.Parse(value.ToString()); + } + catch + { + result = defaultValue; + } + return result; + } + + public static string TCDB_DB_StringParse(object value, string defaultValue) + { + string result = defaultValue; + try + { + result = value.ToString(); + } + catch + { + result = defaultValue; + } + return result; + } + + public static bool TCDB_DB_BoolParse(object value, bool defaultValue) + { + bool result = defaultValue; + try + { + result = (bool)value; + } + catch + { + result = defaultValue; + } + return result; + } + + public static DateTime TCDB_DB_DateTimeParse(object value, DateTime defaultValue) + { + DateTime result = defaultValue; + try + { + result = new DateTime(long.Parse(value.ToString())); + } + catch + { + result = defaultValue; + } + return result; + } + } +} \ No newline at end of file Deleted: Website/App_Code/TCDB_Constants.cs =================================================================== --- Website/App_Code/TCDB_Constants.cs 2006-07-10 19:09:08 UTC (rev 91) +++ Website/App_Code/TCDB_Constants.cs 2006-07-11 00:16:13 UTC (rev 92) @@ -1,29 +0,0 @@ -using System; -using System.Data; -using System.Configuration; -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; - -namespace TCDB_Constants -{ - /// <summary> - /// Summary description for TCDB_Constant - /// </summary> - public static class TCDB_Constant - { - // TODO: Load the strings from the DB where appropriate - public static int USER_FAILEDLOGIN = -2; - public static int USER_NOTREGISTERED = -1; - public static int USER_NEWUSER = -1; - public static int USER_ANONYMOUSUSERID = 0; - public static string USER_ANONYMOUSUSERNAME = "Guest"; - public static string USER_ANONYMOUSFIRSTNAME = "Guest"; - public static string USER_ANONYMOUSLASTNAME = "User"; - - public static string ACTION_NEWUSER = "nu"; - } -} \ No newline at end of file Added: Website/App_Code/TCDB_Notes.cs =================================================================== --- Website/App_Code/TCDB_Notes.cs (rev 0) +++ Website/App_Code/TCDB_Notes.cs 2006-07-11 00:16:13 UTC (rev 92) @@ -0,0 +1,97 @@ +using System; +using System.Data; +using System.Configuration; +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; +using TCDB_Users; +using TCDB_Common; + +namespace TCDB_Notes +{ + /// <summary> + /// Summary description for TCDB_Notes + /// </summary> + public class TCDB_NoteDB : Page + { + public static TCDB_Note TCDB_GetNote(int id) + { + dadDataSet ds = new dadDataSet(); + dadDataSetTableAdapters.db_notesTableAdapter ta = new dadDataSetTableAdapters.db_notesTableAdapter(); + ta.GetData(null, id); + ta.Fill(ds.db_notes, null, id); + + TCDB_Note note = null; + + DataTableReader dr = ds.CreateDataReader(); + if (dr.HasRows && dr.Read()) + { + int noteid = TCDB_Help.TCDB_DB_IntParse(dr["noteID"], TCDB_Constant.NOTE_DEFAULTID); + DateTime dateCreated = TCDB_Help.TCDB_DB_DateTimeParse(dr["dateCreated"], TCDB_Constant.NOTE_DEFAULTDATE); + string noteField = TCDB_Help.TCDB_DB_StringParse(dr["noteField"], TCDB_Constant.NOTE_DEFAULTNOTEFIELD); + int noteAuthor = TCDB_Help.TCDB_DB_IntParse(dr["noteAuthor"], TCDB_Constant.NOTE_DEFAULTAUTHOR); + + note = new TCDB_Note(noteid, dateCreated, noteField, noteAuthor); + } + + return note; + } + + } + + public class TCDB_Note + { + private int p_id; + private DateTime p_dateCreated; + private string p_noteField; + private TCDB_User p_noteAuthor; + + public TCDB_Note(int id, DateTime dateCreated, string noteField, TCDB_User noteAuthor) + { + p_id = id; + p_dateCreated = dateCreated; + p_noteField = noteField; + p_noteAuthor = noteAuthor; + } + + public TCDB_Note(int id, DateTime dateCreated, string noteField, int noteAuthor) + { + p_id = id; + p_dateCreated = dateCreated; + p_noteField = noteField; + p_noteAuthor = TCDB_UserDB.TCDB_GetUserInfo(noteAuthor); + } + + public TCDB_Note() + { + p_id = TCDB_Constant.NOTE_DEFAULTID; + p_dateCreated = TCDB_Constant.NOTE_DEFAULTDATE; + p_noteField = TCDB_Constant.NOTE_DEFAULTNOTEFIELD; + p_noteAuthor = TCDB_UserDB.TCDB_GetUserInfo(TCDB_Constant.NOTE_DEFAULTAUTHOR); + } + + public int ID + { + get { return p_id; } + } + + public DateTime DATECREATED + { + get { return p_dateCreated; } + } + + public string NOTEFIELD + { + get { return p_noteField; } + set { p_noteField = value; } + } + + public TCDB_User NOTEAUTHOR + { + get { return p_noteAuthor; } + } + } +} \ No newline at end of file Modified: Website/App_Code/TCDB_Products.cs =================================================================== --- Website/App_Code/TCDB_Products.cs 2006-07-10 19:09:08 UTC (rev 91) +++ Website/App_Code/TCDB_Products.cs 2006-07-11 00:16:13 UTC (rev 92) @@ -9,6 +9,7 @@ using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; using TCDB_Users; +using TCDB_Common; namespace TCDB_Products { @@ -29,16 +30,18 @@ DataTableReader dr = ds.CreateDataReader(); if (dr.HasRows && dr.Read()) { - product.PRODUCTID = int.Parse(dr["productID"].ToString()); - product.NAME = dr["name"].ToString(); - product.DESCRIPTION = dr["description"].ToString(); - product.CODENAME = dr["codeName"].ToString(); - product.DEVMANAGER = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["devManager"].ToString())); - product.QAMANAGER = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["qaManager"].ToString())); - product.DEVLEAD = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["devLead"].ToString())); - product.QALEAD = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["qaLead"].ToString())); - product.PM = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["pm"].ToString())); - product.ACTIVE = (bool)(dr["active"]); + int id = TCDB_Help.TCDB_DB_IntParse(dr["productID"], TCDB_Constant.PRODUCT_DEFAULTID); + string name = TCDB_Help.TCDB_DB_StringParse(dr["name"], TCDB_Constant.PRODUCT_DEFAULTNAME); + string description = TCDB_Help.TCDB_DB_StringParse(dr["description"], TCDB_Constant.PRODUCT_DEFAULTDESCRIPTION); + string codeName = TCDB_Help.TCDB_DB_StringParse(dr["codeName"], TCDB_Constant.PRODUCT_DEFAULTCODENAME); + TCDB_User devManager = TCDB_UserDB.TCDB_GetUserInfo(TCDB_Help.TCDB_DB_IntParse(dr["devManager"], TCDB_Constant.PRODUCT_DEFAULTDEVMANAGERID)); + TCDB_User qaManager = TCDB_UserDB.TCDB_GetUserInfo(TCDB_Help.TCDB_DB_IntParse(dr["qaManager"], TCDB_Constant.PRODUCT_DEFAULTQAMANAGERID)); + TCDB_User devLead = TCDB_UserDB.TCDB_GetUserInfo(TCDB_Help.TCDB_DB_IntParse(dr["devLead"], TCDB_Constant.PRODUCT_DEFAULTDEVLEADID)); + TCDB_User qaLead = TCDB_UserDB.TCDB_GetUserInfo(TCDB_Help.TCDB_DB_IntParse(dr["qaLead"], TCDB_Constant.PRODUCT_DEFAULTQALEADID)); + TCDB_User pm = TCDB_UserDB.TCDB_GetUserInfo(TCDB_Help.TCDB_DB_IntParse(dr["pm"], TCDB_Constant.PRODUCT_DEFAULTPMID)); + bool active = TCDB_Help.TCDB_DB_BoolParse(dr["active"], TCDB_Constant.PRODUCT_DEFAULTACTIVE); + + product = new TCDB_Product(id, name, description, codeName, devManager, qaManager, devLead, qaLead, pm, active); } return product; @@ -53,22 +56,35 @@ List<TCDB_Product> productList = new List<TCDB_Product>(); - DataTableReader dr = ds.CreateDataReader(); + DataTableReader dr = ds.db_products.CreateDataReader(); if (dr.HasRows) { + int id = TCDB_Constant.PRODUCT_DEFAULTID; + string name = TCDB_Constant.PRODUCT_DEFAULTNAME; + string description = TCDB_Constant.PRODUCT_DEFAULTDESCRIPTION; + string codeName = TCDB_Constant.PRODUCT_DEFAULTCODENAME; + TCDB_User devManager = TCDB_UserDB.TCDB_GetUserInfo(TCDB_Constant.PRODUCT_DEFAULTDEVMANAGERID); + TCDB_User qaManager = TCDB_UserDB.TCDB_GetUserInfo(TCDB_Constant.PRODUCT_DEFAULTQAMANAGERID); + TCDB_User devLead = TCDB_UserDB.TCDB_GetUserInfo(TCDB_Constant.PRODUCT_DEFAULTDEVLEADID); + TCDB_User qaLead = TCDB_UserDB.TCDB_GetUserInfo(TCDB_Constant.PRODUCT_DEFAULTQALEADID); + TCDB_User pm = TCDB_UserDB.TCDB_GetUserInfo(TCDB_Constant.PRODUCT_DEFAULTPMID); + bool active = TCDB_Constant.PRODUCT_DEFAULTACTIVE; + while (dr.Read()) { TCDB_Product product = new TCDB_Product(); - product.PRODUCTID = int.Parse(dr["productID"].ToString()); - product.NAME = dr["name"].ToString(); - product.DESCRIPTION = dr["description"].ToString(); - product.CODENAME = dr["codeName"].ToString(); - product.DEVMANAGER = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["devManager"].ToString())); - product.QAMANAGER = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["qaManager"].ToString())); - product.DEVLEAD = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["devLead"].ToString())); - product.QALEAD = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["qaLead"].ToString())); - product.PM = TCDB_UserDB.TCDB_GetUserInfo(int.Parse(dr["pm"].ToString())); - product.ACTIVE = (bool)(dr["active"]); + id = TCDB_Help.TCDB_DB_IntParse(dr["productID"], TCDB_Constant.PRODUCT_DEFAULTID); + name = TCDB_Help.TCDB_DB_StringParse(dr["name"], TCDB_Constant.PRODUCT_DEFAULTNAME); + description = TCDB_Help.TCDB_DB_StringParse(dr["description"], TCDB_Constant.PRODUCT_DEFAULTDESCRIPTION); + codeName = TCDB_Help.TCDB_DB_StringParse(dr["codeName"], TCDB_Constant.PRODUCT_DEFAULTCODENAME); + devManager = TCDB_UserDB.TCDB_GetUserInfo(TCDB_Help.TCDB_DB_IntParse(dr["devManager"], TCDB_Constant.PRODUCT_DEFAULTDEVMANAGERID)); + qaManager = TCDB_UserDB.TCDB_GetUserInfo(TCDB_Help.TCDB_DB_IntParse(dr["qaManager"], TCDB_Constant.PRODUCT_DEFAULTQAMANAGERID)); + devLead = TCDB_UserDB.TCDB_GetUserInfo(TCDB_Help.TCDB_DB_IntParse(dr["devLead"], TCDB_Constant.PRODUCT_DEFAULTDEVLEADID)); + qaLead = TCDB_UserDB.TCDB_GetUserInfo(TCDB_Help.TCDB_DB_IntParse(dr["qaLead"], TCDB_Constant.PRODUCT_DEFAULTQALEADID)); + pm = TCDB_UserDB.TCDB_GetUserInfo(TCDB_Help.TCDB_DB_IntParse(dr["pm"], TCDB_Constant.PRODUCT_DEFAULTPMID)); + active = TCDB_Help.TCDB_DB_BoolParse(dr["active"], TCDB_Constant.PRODUCT_DEFAULTACTIVE); + + product = new TCDB_Product(id, name, description, codeName, devManager, qaManager, devLead, qaLead, pm, active); productList.Add(product); } } @@ -79,95 +95,111 @@ public class TCDB_Product { - private int productid; - private string name; - private string description; - private string codeName; - private TCDB_User devManager; - private TCDB_User qaManager; - private TCDB_User devLead; - private TCDB_User qaLead; - private TCDB_User pm; - private bool active; + private int p_productid; + private string p_name; + private string p_description; + private string p_codeName; + private TCDB_User p_devManager; + private TCDB_User p_qaManager; + private TCDB_User p_devLead; + private TCDB_User p_qaLead; + private TCDB_User p_pm; + private bool p_active; // TODO: Implement these as the time is right //private List<TCDB_Tag> tags; public TCDB_Product() { - productid = 0; - name = null; - description = null; - codeName = null; - devManager = null; - qaManager = null; - devLead = null; - qaLead = null; - pm = null; - active = false; + p_productid = 0; + p_name = null; + p_description = null; + p_codeName = null; + p_devManager = null; + p_qaManager = null; + p_devLead = null; + p_qaLead = null; + p_pm = null; + p_active = false; } - - public TCDB_Product(int id) + + public TCDB_Product(int id, string name, string description, string codeName, TCDB_User devManager, + TCDB_User qaManager, TCDB_User devLead, TCDB_User qaLead, TCDB_User pm, bool active) { + p_productid = id; + p_name = name; + p_description = description; + p_codeName = codeName; + p_devManager = devManager; + p_qaManager = qaManager; + p_devLead = devLead; + p_qaLead = qaLead; + p_pm = pm; + p_active = active; } - public int PRODUCTID + public int ID { - get { return productid; } - set { productid = value; } + get { return p_productid; } + set { p_productid = value; } } public string NAME { - get { return name; } - set { name = value; } + get { return p_name; } + set { p_name = value; } } public string DESCRIPTION { - get { return description; } - set { description = value; } + get { return p_description; } + set { p_description = value; } } public string CODENAME { - get { return codeName; } - set { codeName = value; } + get { return p_codeName; } + set { p_codeName = value; } } public TCDB_User DEVMANAGER { - get { return devManager; } - set { devManager = value; } + get { return p_devManager; } + set { p_devManager = value; } } public TCDB_User QAMANAGER { - get { return qaManager; } - set { qaManager = value; } + get { return p_qaManager; } + set { p_qaManager = value; } } public TCDB_User DEVLEAD { - get { return devLead; } - set { devLead = value; } + get { return p_devLead; } + set { p_devLead = value; } } public TCDB_User QALEAD { - get { return qaLead; } - set { qaLead = value; } + get { return p_qaLead; } + set { p_qaLead = value; } } public TCDB_User PM { - get { return pm; } - set { pm = value; } + get { return p_pm; } + set { p_pm = value; } } public bool ACTIVE { - get { return active; } - set { active = value; } + get { return p_active; } + set { p_active = value; } } + + public override string ToString() + { + return NAME; + } } } \ No newline at end of file Added: Website/App_Code/TCDB_Statuses.cs =================================================================== --- Website/App_Code/TCDB_Statuses.cs (rev 0) +++ Website/App_Code/TCDB_Statuses.cs 2006-07-11 00:16:13 UTC (rev 92) @@ -0,0 +1,92 @@ +using System; +using System.Data; +using System.Configuration; +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; +using TCDB_Common; + +namespace TCDB_Statuses +{ + public class TCDB_StatusDB : Page + { + public static TCDB_Status GetStatus(string statusGroup, string statusName, int id) + { + // TODO: Load a status type from the DB + // TODO: Check against the DB for user information + dadDataSet ds = new dadDataSet(); + dadDataSetTableAdapters.db_statusTableAdapter ta = new dadDataSetTableAdapters.db_statusTableAdapter(); + ta.GetData(statusGroup, statusName, id); + ta.Fill(ds.db_status, statusGroup, statusName, id); + + TCDB_Status status = new TCDB_Status(); + + DataTableReader dr = ds.db_status.CreateDataReader(); + if (dr.HasRows && dr.Read()) + { + status.ID = TCDB_Help.TCDB_DB_IntParse(dr["statusID"], TCDB_Constant.STATUS_DEFAULTID); + status.GROUP = TCDB_Help.TCDB_DB_StringParse(dr["statusGroup"], TCDB_Constant.STATUS_DEFAULTGROUP); + status.NAME = TCDB_Help.TCDB_DB_StringParse(dr["statusName"], TCDB_Constant.STATUS_DEFAULTNAME); + status.DESCRIPTION = TCDB_Help.TCDB_DB_StringParse(dr["description"], TCDB_Constant.STATUS_DEFAULTDESCRIPTION); + } + + return status; + } + } + + public class TCDB_Status + { + private int p_id; + private string p_group; + private string p_name; + private string p_description; + + public TCDB_Status() + { + p_id = 0; + p_group = null; + p_name = null; + p_description = null; + } + + public TCDB_Status(int id, string group, string name, string description) + { + p_id = id; + p_group = group; + p_name = name; + p_description = description; + } + + public int ID + { + get { return p_id; } + set { p_id = value; } + } + + public string GROUP + { + get { return p_group; } + set { p_group = value; } + } + + public string NAME + { + get { return p_name; } + set { p_name = value; } + } + + public string DESCRIPTION + { + get { return p_description; } + set { p_description = 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-10 19:09:08 UTC (rev 91) +++ Website/App_Code/TCDB_Users.cs 2006-07-11 00:16:13 UTC (rev 92) @@ -11,13 +11,15 @@ using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; using System.Security; -using TCDB_Constants; using System.Collections; using System.Collections.Generic; using System.Collections.Specialized; +using TCDB_Assignments; +using TCDB_Common; using AD_Auth; + namespace TCDB_Users { /// <summary> @@ -58,7 +60,7 @@ // Determine if the user exists in the DB or not. If not, we need to get // the basic info TCDB_User user = TCDB_GetUserInfo(cleanUserName); - if (user.USERID > 1) + if (user.ID > 1) { user.ISAUTHENTICATED = true; return user; @@ -82,15 +84,15 @@ DataTableReader dr = ds.CreateDataReader(); if (dr.HasRows && dr.Read()) { - user.USERID = int.Parse(dr["userID"].ToString()); - user.USERNAME = dr["username"].ToString(); - user.FIRSTNAME = dr["firstName"].ToString(); - user.LASTNAME = dr["lastName"].ToString(); - user.EMAIL = dr["email"].ToString(); - user.OFFICEPHONE = dr["officePhone"].ToString(); - user.HOMEPHONE = dr["homePhone"].ToString(); - user.CELLPHONE = dr["cellPhone"].ToString(); - user.AUTOMATION = (bool)(dr["automation"]); + user.ID = TCDB_Help.TCDB_DB_IntParse(dr["userID"], TCDB_Constant.USER_ANONYMOUSUSERID); + user.USERNAME = TCDB_Help.TCDB_DB_StringParse(dr["username"], TCDB_Constant.USER_ANONYMOUSUSERNAME); + user.FIRSTNAME = TCDB_Help.TCDB_DB_StringParse(dr["firstName"], TCDB_Constant.USER_ANONYMOUSFIRSTNAME); + user.LASTNAME = TCDB_Help.TCDB_DB_StringParse(dr["lastName"], TCDB_Constant.USER_ANONYMOUSLASTNAME); + user.EMAIL = TCDB_Help.TCDB_DB_StringParse(dr["email"], TCDB_Constant.USER_ANONYMOUSEMAIL); + user.OFFICEPHONE = TCDB_Help.TCDB_DB_StringParse(dr["officePhone"], TCDB_Constant.USER_ANONYMOUSOFFICEPHONE); + user.HOMEPHONE = TCDB_Help.TCDB_DB_StringParse(dr["homePhone"], TCDB_Constant.USER_ANONYMOUSHOMEPHONE); + user.CELLPHONE = TCDB_Help.TCDB_DB_StringParse(dr["cellPhone"], TCDB_Constant.USER_ANONYMOUSCELLPHONE); + user.AUTOMATION = TCDB_Help.TCDB_DB_BoolParse(dr["automation"], TCDB_Constant.USER_ANONYMOUSAUTOMATION); } return user; @@ -106,22 +108,75 @@ TCDB_User user = new TCDB_User(); - DataTableReader dr = ds.CreateDataReader(); + DataTableReader dr = ds.db_users.CreateDataReader(); if (dr.HasRows && dr.Read()) { - user.USERID = int.Parse(dr["userID"].ToString()); - user.USERNAME = dr["username"].ToString(); - user.FIRSTNAME = dr["firstName"].ToString(); - user.LASTNAME = dr["lastName"].ToString(); - user.EMAIL = dr["email"].ToString(); - user.OFFICEPHONE = dr["officePhone"].ToString(); - user.HOMEPHONE = dr["homePhone"].ToString(); - user.CELLPHONE = dr["cellPhone"].ToString(); - user.AUTOMATION = (bool)(dr["automation"]); + user.ID = TCDB_Help.TCDB_DB_IntParse(dr["userID"], TCDB_Constant.USER_ANONYMOUSUSERID); + user.USERNAME = TCDB_Help.TCDB_DB_StringParse(dr["username"], TCDB_Constant.USER_ANONYMOUSUSERNAME); + user.FIRSTNAME = TCDB_Help.TCDB_DB_StringParse(dr["firstName"], TCDB_Constant.USER_ANONYMOUSFIRSTNAME); + user.LASTNAME = TCDB_Help.TCDB_DB_StringParse(dr["lastName"], TCDB_Constant.USER_ANONYMOUSLASTNAME); + user.EMAIL = TCDB_Help.TCDB_DB_StringParse(dr["email"], TCDB_Constant.USER_ANONYMOUSEMAIL); + user.OFFICEPHONE = TCDB_Help.TCDB_DB_StringParse(dr["officePhone"], TCDB_Constant.USER_ANONYMOUSOFFICEPHONE); + user.HOMEPHONE = TCDB_Help.TCDB_DB_StringParse(dr["homePhone"], TCDB_Constant.USER_ANONYMOUSHOMEPHONE); + user.CELLPHONE = TCDB_Help.TCDB_DB_StringParse(dr["cellPhone"], TCDB_Constant.USER_ANONYMOUSCELLPHONE); + user.AUTOMATION = TCDB_Help.TCDB_DB_BoolParse(dr["automation"], TCDB_Constant.USER_ANONYMOUSAUTOMATION); } return user; } + + public static List<TCDB_User> TCDB_GetUserList() + { + // TODO: Check against the DB for user information + dadDataSet ds = new dadDataSet(); + dadDataSetTableAdapters.db_usersTableAdapter ta = new dadDataSetTableAdapters.db_usersTableAdapter(); + ta.GetData(null, null); + ta.Fill(ds.db_users, null, null); + + List<TCDB_User> userList = new List<TCDB_User>(); + + DataTableReader dr = ds.db_users.CreateDataReader(); + if (dr.HasRows) + { + while (dr.Read()) + { + TCDB_User user = new TCDB_User(); + + user.ID = TCDB_Help.TCDB_DB_IntParse(dr["userID"], TCDB_Constant.USER_ANONYMOUSUSERID); + user.USERNAME = TCDB_Help.TCDB_DB_StringParse(dr["username"], TCDB_Constant.USER_ANONYMOUSUSERNAME); + user.FIRSTNAME = TCDB_Help.TCDB_DB_StringParse(dr["firstName"], TCDB_Constant.USER_ANONYMOUSFIRSTNAME); + user.LASTNAME = TCDB_Help.TCDB_DB_StringParse(dr["lastName"], TCDB_Constant.USER_ANONYMOUSLASTNAME); + user.EMAIL = TCDB_Help.TCDB_DB_StringParse(dr["email"], TCDB_Constant.USER_ANONYMOUSEMAIL); + user.OFFICEPHONE = TCDB_Help.TCDB_DB_StringParse(dr["officePhone"], TCDB_Constant.USER_ANONYMOUSOFFICEPHONE); + user.HOMEPHONE = TCDB_Help.TCDB_DB_StringParse(dr["homePhone"], TCDB_Constant.USER_ANONYMOUSHOMEPHONE); + user.CELLPHONE = TCDB_Help.TCDB_DB_StringParse(dr["cellPhone"], TCDB_Constant.USER_ANONYMOUSCELLPHONE); + user.AUTOMATION = TCDB_Help.TCDB_DB_BoolParse(dr["automation"], TCDB_Constant.USER_ANONYMOUSAUTOMATION); + + userList.Add(user); + } + } + + return userList; + } + + public static bool TCDB_SaveUser(TCDB_User user) + { + dadDataSet ds = new dadDataSet(); + dadDataSetTableAdapters.db_usersTableAdapter ta = new dadDataSetTableAdapters.db_usersTableAdapter(); + try + { + ta.Insert(user.USERNAME, user.FIRSTNAME, user.LASTNAME, user.EMAIL, user.OFFICEPHONE, user.HOMEPHONE, user.CELLPHONE, user.AUTOMATION); + } + catch + { + return false; + } + + if (ds.db_users.HasErrors) + return false; + + return true; + } } @@ -143,20 +198,31 @@ private bool isAuthenticated; private List<TCDB_Right> rights; private List<TCDB_Config> config; + private List<TCDB_Assignment> assignments; /* TODO: Implement these as the time is right private List<TCDB_Feature> features; private List<TCDB_Assignment> assignmentsCreated; - private List<TCDB_Assignment> assignments; private List<TCDB_Objective> objectives; private List<TCDB_WorkOrderTemplate> savedWorkOrders; private List<TCDB_TestCase> testCasesCreated; private List<TCDB_TestCase> testCasesEdited; */ - /// <summary> - /// Default constructor, returns an anonymous user - /// TODO: Make this information come from the database rather than being hard coded here - /// </summary> + public List<TCDB_Assignment> ASSIGNMENTS + { + // TODO: This list needs to be able to reflect filters! + get + { + List<TCDB_Assignment> assignments = new List<TCDB_Assignment>(); + if (assignments == null) + { + assignments = TCDB_AssignmentDB.TCDB_GetAssignmentList(TCDB_Constant.ASSIGNMENT_TYPE_BOTH, + TCDB_Constant.ASSIGNMENT_FINISHEDANDUNFINISHED, ID, null); + } + return assignments; + } + } + public TCDB_User() { userid = TCDB_Constant.USER_ANONYMOUSUSERID; @@ -171,28 +237,38 @@ isAuthenticated = false; rights = null; config = null; + assignments = null; } - /// <summary> - /// Load a specific user based on username - /// </summary> - /// <param name="username"></param> public TCDB_User(string username) { - // TODO: Write this function + TCDB_BuildUser(TCDB_UserDB.TCDB_GetUserInfo(username)); } - /// <summary> - /// Load a specific user based on id - /// </summary> - /// <param name="id"></param> public TCDB_User(int id) { - // TODO: Write this function + TCDB_BuildUser(TCDB_UserDB.TCDB_GetUserInfo(id)); } - public int USERID + private void TCDB_BuildUser(TCDB_User user) { + userid = user.ID; + username = user.USERNAME; + email = user.EMAIL; + officePhone = user.OFFICEPHONE; + homePhone = user.HOMEPHONE; + cellPhone = user.CELLPHONE; + firstName = user.FIRSTNAME; + lastName = user.LASTNAME; + automation = user.AUTOMATION; + isAuthenticated = user.ISAUTHENTICATED; + rights = user.rights; + config = user.config; + assignments = null; + } + + public int ID + { get { return userid; } set { userid = value; } } Modified: Website/App_Code/dadDataSet.xsd =================================================================== --- Website/App_Code/dadDataSet.xsd 2006-07-10 19:09:08 UTC (rev 91) +++ Website/App_Code/dadDataSet.xsd 2006-07-11 00:16:13 UTC (rev 92) @@ -2,10 +2,12 @@ <xs:schema id="dadDataSet" targetNamespace="http://tempuri.org/dadDataSet.xsd" xmlns:mstns="http://tempuri.org/dadDataSet.xsd" xmlns="http://tempuri.org/dadDataSet.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:msprop="urn:schemas-microsoft-com:xml-msprop" attributeFormDefault="qualified" elementFormDefault="qualified"> <xs:annotation> <xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource"> - <DataSource DefaultConnectionIndex="0" FunctionsComponentName="QueriesTableAdapter" GeneratorFunctionsComponentClassName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" UserFunctionsComponentName="QueriesTableAdapter" xmlns="urn:schemas-microsoft-com:xml-msdatasource"> + <DataSource DefaultConnectionIndex="1" FunctionsComponentName="QueriesTableAdapter" GeneratorFunctionsComponentClassName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" UserFunctionsComponentName="QueriesTableAdapter" xmlns="urn:schemas-microsoft-com:xml-msdatasource"> <Connections> <Connection AppSettingsObjectName="Web.config" AppSettingsPropertyName="dadConnectionString" ConnectionStringObject="" IsAppSettingsProperty="True" Modifier="Assembly" Name="dadConnectionString (Web.config)" ParameterPrefix="@" PropertyReference="AppConfig.System.Configuration.ConfigurationManager.0.ConnectionStrings.dadConnectionString.ConnectionString" Provider="System.Data.SqlClient"> </Connection> + <Connection AppSettingsObjectName="Web.config" AppSettingsPropertyName="tcdbConnectionString" ConnectionStringObject="" IsAppSettingsProperty="True" Modifier="Assembly" Name="tcdbConnectionString (Web.config)" ParameterPrefix="@" PropertyReference="AppConfig.System.Configuration.ConfigurationManager.0.ConnectionStrings.tcdbConnectionString.ConnectionString" Provider="System.Data.SqlClient"> + </Connection> </Connections> <Tables> <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_usersTableAdapter" GeneratorDataComponentClassName="db_usersTableAdapter" Name="db_users" UserDataComponentName="db_usersTableAdapter"> @@ -182,6 +184,156 @@ <Sources> </Sources> </TableAdapter> + <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_actionItemsTableAdapter" GeneratorDataComponentClassName="db_actionItemsTableAdapter" Name="db_actionItems" UserDataComponentName="db_actionItemsTableAdapter"> + <MainSource> + <DbSource ConnectionRef="dadConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_actionItems" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="True" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> + <InsertCommand> + <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> + <CommandText>dbo.ins_actionItem</CommandText> + <Parameters> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@name" Precision="0" ProviderType="VarChar" Scale="0" Size="255" SourceColumn="name" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@description" Precision="0" ProviderType="Text" Scale="0" Size="2147483647" SourceColumn="description" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@creatorID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@assignedID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="DateTime" Direction="Input" ParameterName="@dateDue" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumn="dateDue" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@testPassID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumn="" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Boolean" Direction="Input" ParameterName="@highPriority" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumn="highPriority" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + </Parameters> + </DbCommand> + </InsertCommand> + <SelectCommand> + <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> + <CommandText>dbo.sel_actionItems</CommandText> + <Parameters> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@actionItemID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + </Parameters> + </DbCommand> + </SelectCommand> + </DbSource> + </MainSource> + <Mappings> + <Mapping SourceColumn="actionItemID" DataSetColumn="actionItemID" /> + <Mapping SourceColumn="name" DataSetColumn="name" /> + <Mapping SourceColumn="description" DataSetColumn="description" /> + <Mapping SourceColumn="dateAssigned" DataSetColumn="dateAssigned" /> + <Mapping SourceColumn="dateDue" DataSetColumn="dateDue" /> + <Mapping SourceColumn="percentComplete" DataSetColumn="percentComplete" /> + <Mapping SourceColumn="statusName" DataSetColumn="statusName" /> + <Mapping SourceColumn="createdBy" DataSetColumn="createdBy" /> + <Mapping SourceColumn="highPriority" DataSetColumn="highPriority" /> + <Mapping SourceColumn="createdById" DataSetColumn="createdById" /> + </Mappings> + <Sources> + </Sources> + </TableAdapter> + <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_statusTableAdapter" GeneratorDataComponentClassName="db_statusTableAdapter" Name="db_status" UserDataComponentName="db_statusTableAdapter"> + <MainSource> + <DbSource ConnectionRef="dadConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_status" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="True" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="True" UserGetMethodName="GetData" UserSourceName="Fill"> + <SelectCommand> + <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> + <CommandText>dbo.sel_status</CommandText> + <Parameters> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@statusGroup" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="AnsiString" Direction="Input" ParameterName="@statusName" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="Input" ParameterName="@statusID" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + </Parameters> + </DbCommand> + </SelectCommand> + </DbSource> + </MainSource> + <Mappings> + <Mapping SourceColumn="statusID" DataSetColumn="statusID" /> + <Mapping SourceColumn="Description" DataSetColumn="Description" /> + </Mappings> + <Sources> + </Sources> + </TableAdapter> + <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_notesTableAdapter" GeneratorDataComponentClassName="db_notesTableAdapter" Name="db_notes" UserDataComponentName="db_notesTableAdapter"> + <MainSource> + <DbSource ConnectionRef="tcdbConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_notes" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="False" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> + <SelectCommand> + <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> + <CommandText>dbo.sel_notes</CommandText> + <Parameters> + <Parameter AllowDbNull="True" AutogeneratedName="" Data... [truncated message content] |
|
From: <ro...@us...> - 2006-07-11 14:15:33
|
Revision: 93 Author: rouquin Date: 2006-07-11 07:15:24 -0700 (Tue, 11 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=93&view=rev Log Message: ----------- Gave id's to controls so that the design view would like them. Modified Paths: -------------- Website/App_Code/dadDataSet.xsd Website/Assignments.aspx Website/Includes/Header.ascx Website/TCDB.master Modified: Website/App_Code/dadDataSet.xsd =================================================================== --- Website/App_Code/dadDataSet.xsd 2006-07-11 00:16:13 UTC (rev 92) +++ Website/App_Code/dadDataSet.xsd 2006-07-11 14:15:24 UTC (rev 93) @@ -39,7 +39,7 @@ </DbCommand> </InsertCommand> <SelectCommand> - <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> + <DbCommand CommandType="StoredProcedure" ModifiedByUser="True"> <CommandText>dbo.sel_users</CommandText> <Parameters> <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> @@ -346,146 +346,146 @@ <xs:element name="db_users" msprop:Generator_UserTableName="db_users" msprop:Generator_RowDeletedName="db_usersRowDeleted" msprop:Generator_RowChangedName="db_usersRowChanged" msprop:Generator_RowClassName="db_usersRow" msprop:Generator_RowChangingName="db_usersRowChanging" msprop:Generator_RowEvArgName="db_usersRowChangeEvent" msprop:Generator_RowEvHandlerName="db_usersRowChangeEventHandler" msprop:Generator_TableClassName="db_usersDataTable" msprop:Generator_TableVarName="tabledb_users" msprop:Generator_RowDeletingName="db_usersRowDeleting" msprop:Generator_TablePropName="db_users"> <xs:complexType> <xs:sequence> - <xs:element name="userID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="userID" msprop:Generator_ColumnPropNameInRow="userID" msprop:Generator_ColumnVarNameInTable="columnuserID" msprop:Generator_ColumnPropNameInTable="userIDColumn" type="xs:int" /> - <xs:element name="username" msprop:Generator_UserColumnName="username" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_ColumnVarNameInTable="columnusername" msprop:Generator_ColumnPropNameInTable="usernameColumn"> + <xs:element name="userID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="userID" msprop:Generator_ColumnVarNameInTable="columnuserID" msprop:Generator_ColumnPropNameInRow="userID" msprop:Generator_ColumnPropNameInTable="userIDColumn" type="xs:int" /> + <xs:element name="username" msprop:Generator_UserColumnName="username" msprop:Generator_ColumnVarNameInTable="columnusername" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_ColumnPropNameInTable="usernameColumn"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="50" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="email" msprop:Generator_UserColumnName="email" msprop:Generator_ColumnPropNameInRow="email" msprop:Generator_ColumnVarNameInTable="columnemail" msprop:Generator_ColumnPropNameInTable="emailColumn"> + <xs:element name="email" msprop:Generator_UserColumnName="email" msprop:Generator_ColumnVarNameInTable="columnemail" msprop:Generator_ColumnPropNameInRow="email" msprop:Generator_ColumnPropNameInTable="emailColumn"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="50" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="officePhone" msprop:Generator_UserColumnName="officePhone" msprop:Generator_ColumnPropNameInRow="officePhone" msprop:Generator_ColumnVarNameInTable="columnofficePhone" msprop:Generator_ColumnPropNameInTable="officePhoneColumn" minOccurs="0"> + <xs:element name="officePhone" msprop:Generator_UserColumnName="officePhone" msprop:Generator_ColumnVarNameInTable="columnofficePhone" msprop:Generator_ColumnPropNameInRow="officePhone" msprop:Generator_ColumnPropNameInTable="officePhoneColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="14" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="homePhone" msprop:Generator_UserColumnName="homePhone" msprop:Generator_ColumnPropNameInRow="homePhone" msprop:Generator_ColumnVarNameInTable="columnhomePhone" msprop:Generator_ColumnPropNameInTable="homePhoneColumn" minOccurs="0"> + <xs:element name="homePhone" msprop:Generator_UserColumnName="homePhone" msprop:Generator_ColumnVarNameInTable="columnhomePhone" msprop:Generator_ColumnPropNameInRow="homePhone" msprop:Generator_ColumnPropNameInTable="homePhoneColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="14" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="cellPhone" msprop:Generator_UserColumnName="cellPhone" msprop:Generator_ColumnPropNameInRow="cellPhone" msprop:Generator_ColumnVarNameInTable="columncellPhone" msprop:Generator_ColumnPropNameInTable="cellPhoneColumn" minOccurs="0"> + <xs:element name="cellPhone" msprop:Generator_UserColumnName="cellPhone" msprop:Generator_ColumnVarNameInTable="columncellPhone" msprop:Generator_ColumnPropNameInRow="cellPhone" msprop:Generator_ColumnPropNameInTable="cellPhoneColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="14" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="firstName" msprop:Generator_UserColumnName="firstName" msprop:Generator_ColumnPropNameInRow="firstName" msprop:Generator_ColumnVarNameInTable="columnfirstName" msprop:Generator_ColumnPropNameInTable="firstNameColumn"> + <xs:element name="firstName" msprop:Generator_UserColumnName="firstName" msprop:Generator_ColumnVarNameInTable="columnfirstName" msprop:Generator_ColumnPropNameInRow="firstName" msprop:Generator_ColumnPropNameInTable="firstNameColumn"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="24" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="lastName" msprop:Generator_UserColumnName="lastName" msprop:Generator_ColumnPropNameInRow="lastName" msprop:Generator_ColumnVarNameInTable="columnlastName" msprop:Generator_ColumnPropNameInTable="lastNameColumn"> + <xs:element name="lastName" msprop:Generator_UserColumnName="lastName" msprop:Generator_ColumnVarNameInTable="columnlastName" msprop:Generator_ColumnPropNameInRow="lastName" msprop:Generator_ColumnPropNameInTable="lastNameColumn"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="24" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="fullName" msdata:ReadOnly="true" msprop:Generator_UserColumnName="fullName" msprop:Generator_ColumnPropNameInRow="fullName" msprop:Generator_ColumnVarNameInTable="columnfullName" msprop:Generator_ColumnPropNameInTable="fullNameColumn" minOccurs="0"> + <xs:element name="fullName" msdata:ReadOnly="true" msprop:Generator_UserColumnName="fullName" msprop:Generator_ColumnVarNameInTable="columnfullName" msprop:Generator_ColumnPropNameInRow="fullName" msprop:Generator_ColumnPropNameInTable="fullNameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="49" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="automation" msprop:Generator_UserColumnName="automation" msprop:Generator_ColumnPropNameInRow="automation" msprop:Generator_ColumnVarNameInTable="columnautomation" msprop:Generator_ColumnPropNameInTable="automationColumn" type="xs:boolean" /> + <xs:element name="automation" msprop:Generator_UserColumnName="automation" msprop:Generator_ColumnVarNameInTable="columnautomation" msprop:Generator_ColumnPropNameInRow="automation" msprop:Generator_ColumnPropNameInTable="automationColumn" type="xs:boolean" /> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="db_products" msprop:Generator_UserTableName="db_products" msprop:Generator_RowDeletedName="db_productsRowDeleted" msprop:Generator_RowChangedName="db_productsRowChanged" msprop:Generator_RowClassName="db_productsRow" msprop:Generator_RowChangingName="db_productsRowChanging" msprop:Generator_RowEvArgName="db_productsRowChangeEvent" msprop:Generator_RowEvHandlerName="db_productsRowChangeEventHandler" msprop:Generator_TableClassName="db_productsDataTable" msprop:Generator_TableVarName="tabledb_products" msprop:Generator_RowDeletingName="db_productsRowDeleting" msprop:Generator_TablePropName="db_products"> <xs:complexType> <xs:sequence> - <xs:element name="productID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="productID" msprop:Generator_ColumnPropNameInRow="productID" msprop:Generator_ColumnVarNameInTable="columnproductID" msprop:Generator_ColumnPropNameInTable="productIDColumn" type="xs:int" /> - <xs:element name="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInTable="nameColumn" minOccurs="0"> + <xs:element name="productID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="productID" msprop:Generator_ColumnVarNameInTable="columnproductID" msprop:Generator_ColumnPropNameInRow="productID" msprop:Generator_ColumnPropNameInTable="productIDColumn" type="xs:int" /> + <xs:element name="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnPropNameInTable="nameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="255" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="description" msprop:Generator_UserColumnName="description" msprop:Generator_ColumnPropNameInRow="description" msprop:Generator_ColumnVarNameInTable="columndescription" msprop:Generator_ColumnPropNameInTable="descriptionColumn" minOccurs="0"> + <xs:element name="description" msprop:Generator_UserColumnName="description" msprop:Generator_ColumnVarNameInTable="columndescription" msprop:Generator_ColumnPropNameInRow="description" msprop:Generator_ColumnPropNameInTable="descriptionColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="2147483647" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="devManager" msprop:Generator_UserColumnName="devManager" msprop:Generator_ColumnPropNameInRow="devManager" msprop:Generator_ColumnVarNameInTable="columndevManager" msprop:Generator_ColumnPropNameInTable="devManagerColumn" type="xs:int" minOccurs="0" /> - <xs:element name="qaManager" msprop:Generator_UserColumnName="qaManager" msprop:Generator_ColumnPropNameInRow="qaManager" msprop:Generator_ColumnVarNameInTable="columnqaManager" msprop:Generator_ColumnPropNameInTable="qaManagerColumn" type="xs:int" minOccurs="0" /> - <xs:element name="devLead" msprop:Generator_UserColumnName="devLead" msprop:Generator_ColumnPropNameInRow="devLead" msprop:Generator_ColumnVarNameInTable="columndevLead" msprop:Generator_ColumnPropNameInTable="devLeadColumn" type="xs:int" minOccurs="0" /> - <xs:element name="qaLead" msprop:Generator_UserColumnName="qaLead" msprop:Generator_ColumnPropNameInRow="qaLead" msprop:Generator_ColumnVarNameInTable="columnqaLead" msprop:Generator_ColumnPropNameInTable="qaLeadColumn" type="xs:int" minOccurs="0" /> - <xs:element name="pm" msprop:Generator_UserColumnName="pm" msprop:Generator_ColumnPropNameInRow="pm" msprop:Generator_ColumnVarNameInTable="columnpm" msprop:Generator_ColumnPropNameInTable="pmColumn" type="xs:int" minOccurs="0" /> - <xs:element name="codeName" msprop:Generator_UserColumnName="codeName" msprop:Generator_ColumnPropNameInRow="codeName" msprop:Generator_ColumnVarNameInTable="columncodeName" msprop:Generator_ColumnPropNameInTable="codeNameColumn" minOccurs="0"> + <xs:element name="devManager" msprop:Generator_UserColumnName="devManager" msprop:Generator_ColumnVarNameInTable="columndevManager" msprop:Generator_ColumnPropNameInRow="devManager" msprop:Generator_ColumnPropNameInTable="devManagerColumn" type="xs:int" minOccurs="0" /> + <xs:element name="qaManager" msprop:Generator_UserColumnName="qaManager" msprop:Generator_ColumnVarNameInTable="columnqaManager" msprop:Generator_ColumnPropNameInRow="qaManager" msprop:Generator_ColumnPropNameInTable="qaManagerColumn" type="xs:int" minOccurs="0" /> + <xs:element name="devLead" msprop:Generator_UserColumnName="devLead" msprop:Generator_ColumnVarNameInTable="columndevLead" msprop:Generator_ColumnPropNameInRow="devLead" msprop:Generator_ColumnPropNameInTable="devLeadColumn" type="xs:int" minOccurs="0" /> + <xs:element name="qaLead" msprop:Generator_UserColumnName="qaLead" msprop:Generator_ColumnVarNameInTable="columnqaLead" msprop:Generator_ColumnPropNameInRow="qaLead" msprop:Generator_ColumnPropNameInTable="qaLeadColumn" type="xs:int" minOccurs="0" /> + <xs:element name="pm" msprop:Generator_UserColumnName="pm" msprop:Generator_ColumnVarNameInTable="columnpm" msprop:Generator_ColumnPropNameInRow="pm" msprop:Generator_ColumnPropNameInTable="pmColumn" type="xs:int" minOccurs="0" /> + <xs:element name="codeName" msprop:Generator_UserColumnName="codeName" msprop:Generator_ColumnVarNameInTable="columncodeName" msprop:Generator_ColumnPropNameInRow="codeName" msprop:Generator_ColumnPropNameInTable="codeNameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="10" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="active" msprop:Generator_UserColumnName="active" msprop:Generator_ColumnPropNameInRow="active" msprop:Generator_ColumnVarNameInTable="columnactive" msprop:Generator_ColumnPropNameInTable="activeColumn" type="xs:boolean" /> + <xs:element name="active" msprop:Generator_UserColumnName="active" msprop:Generator_ColumnVarNameInTable="columnactive" msprop:Generator_ColumnPropNameInRow="active" msprop:Generator_ColumnPropNameInTable="activeColumn" type="xs:boolean" /> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="db_actionItems" msprop:Generator_UserTableName="db_actionItems" msprop:Generator_RowDeletedName="db_actionItemsRowDeleted" msprop:Generator_RowChangedName="db_actionItemsRowChanged" msprop:Generator_RowClassName="db_actionItemsRow" msprop:Generator_RowChangingName="db_actionItemsRowChanging" msprop:Generator_RowEvArgName="db_actionItemsRowChangeEvent" msprop:Generator_RowEvHandlerName="db_actionItemsRowChangeEventHandler" msprop:Generator_TableClassName="db_actionItemsDataTable" msprop:Generator_TableVarName="tabledb_actionItems" msprop:Generator_RowDeletingName="db_actionItemsRowDeleting" msprop:Generator_TablePropName="db_actionItems"> <xs:complexType> <xs:sequence> - <xs:element name="actionItemID" msprop:Generator_UserColumnName="actionItemID" msprop:Generator_ColumnVarNameInTable="columnactionItemID" msprop:Generator_ColumnPropNameInRow="actionItemID" msprop:Generator_ColumnPropNameInTable="actionItemIDColumn" type="xs:int" /> - <xs:element name="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnPropNameInTable="nameColumn" minOccurs="0"> + <xs:element name="actionItemID" msprop:Generator_UserColumnName="actionItemID" msprop:Generator_ColumnPropNameInRow="actionItemID" msprop:Generator_ColumnVarNameInTable="columnactionItemID" msprop:Generator_ColumnPropNameInTable="actionItemIDColumn" type="xs:int" /> + <xs:element name="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInTable="nameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="255" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="description" msprop:Generator_UserColumnName="description" msprop:Generator_ColumnVarNameInTable="columndescription" msprop:Generator_ColumnPropNameInRow="description" msprop:Generator_ColumnPropNameInTable="descriptionColumn" minOccurs="0"> + <xs:element name="description" msprop:Generator_UserColumnName="description" msprop:Generator_ColumnPropNameInRow="description" msprop:Generator_ColumnVarNameInTable="columndescription" msprop:Generator_ColumnPropNameInTable="descriptionColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="2147483647" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="dateAssigned" msprop:Generator_UserColumnName="dateAssigned" msprop:Generator_ColumnVarNameInTable="columndateAssigned" msprop:Generator_ColumnPropNameInRow="dateAssigned" msprop:Generator_ColumnPropNameInTable="dateAssignedColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="dateDue" msprop:Generator_UserColumnName="dateDue" msprop:Generator_ColumnVarNameInTable="columndateDue" msprop:Generator_ColumnPropNameInRow="dateDue" msprop:Generator_ColumnPropNameInTable="dateDueColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="percentComplete" msprop:Generator_UserColumnName="percentComplete" msprop:Generator_ColumnVarNameInTable="columnpercentComplete" msprop:Generator_ColumnPropNameInRow="percentComplete" msprop:Generator_ColumnPropNameInTable="percentCompleteColumn" type="xs:int" minOccurs="0" /> - <xs:element name="statusName" msprop:Generator_UserColumnName="statusName" msprop:Generator_ColumnVarNameInTable="columnstatusName" msprop:Generator_ColumnPropNameInRow="statusName" msprop:Generator_ColumnPropNameInTable="statusNameColumn" minOccurs="0"> + <xs:element name="dateAssigned" msprop:Generator_UserColumnName="dateAssigned" msprop:Generator_ColumnPropNameInRow="dateAssigned" msprop:Generator_ColumnVarNameInTable="columndateAssigned" msprop:Generator_ColumnPropNameInTable="dateAssignedColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="dateDue" msprop:Generator_UserColumnName="dateDue" msprop:Generator_ColumnPropNameInRow="dateDue" msprop:Generator_ColumnVarNameInTable="columndateDue" msprop:Generator_ColumnPropNameInTable="dateDueColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="percentComplete" msprop:Generator_UserColumnName="percentComplete" msprop:Generator_ColumnPropNameInRow="percentComplete" msprop:Generator_ColumnVarNameInTable="columnpercentComplete" msprop:Generator_ColumnPropNameInTable="percentCompleteColumn" type="xs:int" minOccurs="0" /> + <xs:element name="statusName" msprop:Generator_UserColumnName="statusName" msprop:Generator_ColumnPropNameInRow="statusName" msprop:Generator_ColumnVarNameInTable="columnstatusName" msprop:Generator_ColumnPropNameInTable="statusNameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="50" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="createdBy" msdata:ReadOnly="true" msprop:Generator_UserColumnName="createdBy" msprop:Generator_ColumnVarNameInTable="columncreatedBy" msprop:Generator_ColumnPropNameInRow="createdBy" msprop:Generator_ColumnPropNameInTable="createdByColumn" minOccurs="0"> + <xs:element name="createdBy" msdata:ReadOnly="true" msprop:Generator_UserColumnName="createdBy" msprop:Generator_ColumnPropNameInRow="createdBy" msprop:Generator_ColumnVarNameInTable="columncreatedBy" msprop:Generator_ColumnPropNameInTable="createdByColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="49" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="highPriority" msprop:Generator_UserColumnName="highPriority" msprop:Generator_ColumnVarNameInTable="columnhighPriority" msprop:Generator_ColumnPropNameInRow="highPriority" msprop:Generator_ColumnPropNameInTable="highPriorityColumn" type="xs:boolean" minOccurs="0" /> - <xs:element name="createdById" msprop:Generator_UserColumnName="createdById" msprop:Generator_ColumnVarNameInTable="columncreatedById" msprop:Generator_ColumnPropNameInRow="createdById" msprop:Generator_ColumnPropNameInTable="createdByIdColumn" type="xs:int" /> + <xs:element name="highPriority" msprop:Generator_UserColumnName="highPriority" msprop:Generator_ColumnPropNameInRow="highPriority" msprop:Generator_ColumnVarNameInTable="columnhighPriority" msprop:Generator_ColumnPropNameInTable="highPriorityColumn" type="xs:boolean" minOccurs="0" /> + <xs:element name="createdById" msprop:Generator_UserColumnName="createdById" msprop:Generator_ColumnPropNameInRow="createdById" msprop:Generator_ColumnVarNameInTable="columncreatedById" msprop:Generator_ColumnPropNameInTable="createdByIdColumn" type="xs:int" /> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="db_status" msprop:Generator_UserTableName="db_status" msprop:Generator_RowDeletedName="db_statusRowDeleted" msprop:Generator_RowChangedName="db_statusRowChanged" msprop:Generator_RowClassName="db_statusRow" msprop:Generator_RowChangingName="db_statusRowChanging" msprop:Generator_RowEvArgName="db_statusRowChangeEvent" msprop:Generator_RowEvHandlerName="db_statusRowChangeEventHandler" msprop:Generator_TableClassName="db_statusDataTable" msprop:Generator_TableVarName="tabledb_status" msprop:Generator_RowDeletingName="db_statusRowDeleting" msprop:Generator_TablePropName="db_status"> <xs:complexType> <xs:sequence> - <xs:element name="statusID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="statusID" msprop:Generator_ColumnPropNameInRow="statusID" msprop:Generator_ColumnVarNameInTable="columnstatusID" msprop:Generator_ColumnPropNameInTable="statusIDColumn" type="xs:int" /> - <xs:element name="Description" msprop:Generator_UserColumnName="Description" msprop:Generator_ColumnPropNameInRow="Description" msprop:Generator_ColumnVarNameInTable="columnDescription" msprop:Generator_ColumnPropNameInTable="DescriptionColumn" minOccurs="0"> + <xs:element name="statusID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="statusID" msprop:Generator_ColumnVarNameInTable="columnstatusID" msprop:Generator_ColumnPropNameInRow="statusID" msprop:Generator_ColumnPropNameInTable="statusIDColumn" type="xs:int" /> + <xs:element name="Description" msprop:Generator_UserColumnName="Description" msprop:Generator_ColumnVarNameInTable="columnDescription" msprop:Generator_ColumnPropNameInRow="Description" msprop:Generator_ColumnPropNameInTable="DescriptionColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="2147483647" /> @@ -495,70 +495,70 @@ </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="db_notes" msprop:Generator_UserTableName="db_notes" msprop:Generator_RowDeletedName="db_notesRowDeleted" msprop:Generator_TableClassName="db_notesDataTable" msprop:Generator_RowChangedName="db_notesRowChanged" msprop:Generator_RowClassName="db_notesRow" msprop:Generator_RowChangingName="db_notesRowChanging" msprop:Generator_RowEvArgName="db_notesRowChangeEvent" msprop:Generator_RowEvHandlerName="db_notesRowChangeEventHandler" msprop:Generator_TablePropName="db_notes" msprop:Generator_TableVarName="tabledb_notes" msprop:Generator_RowDeletingName="db_notesRowDeleting"> + <xs:element name="db_notes" msprop:Generator_UserTableName="db_notes" msprop:Generator_RowDeletedName="db_notesRowDeleted" msprop:Generator_RowChangedName="db_notesRowChanged" msprop:Generator_RowClassName="db_notesRow" msprop:Generator_RowChangingName="db_notesRowChanging" msprop:Generator_RowEvArgName="db_notesRowChangeEvent" msprop:Generator_RowEvHandlerName="db_notesRowChangeEventHandler" msprop:Generator_TableClassName="db_notesDataTable" msprop:Generator_TableVarName="tabledb_notes" msprop:Generator_RowDeletingName="db_notesRowDeleting" msprop:Generator_TablePropName="db_notes"> <xs:complexType> <xs:sequence> - <xs:element name="noteID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="noteID" msprop:Generator_ColumnPropNameInRow="noteID" msprop:Generator_ColumnVarNameInTable="columnnoteID" msprop:Generator_ColumnPropNameInTable="noteIDColumn" type="xs:int" /> - <xs:element name="dateCreated" msprop:Generator_UserColumnName="dateCreated" msprop:Generator_ColumnPropNameInRow="dateCreated" msprop:Generator_ColumnVarNameInTable="columndateCreated" msprop:Generator_ColumnPropNameInTable="dateCreatedColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="noteField" msprop:Generator_UserColumnName="noteField" msprop:Generator_ColumnPropNameInRow="noteField" msprop:Generator_ColumnVarNameInTable="columnnoteField" msprop:Generator_ColumnPropNameInTable="noteFieldColumn" minOccurs="0"> + <xs:element name="noteID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="noteID" msprop:Generator_ColumnVarNameInTable="columnnoteID" msprop:Generator_ColumnPropNameInRow="noteID" msprop:Generator_ColumnPropNameInTable="noteIDColumn" type="xs:int" /> + <xs:element name="dateCreated" msprop:Generator_UserColumnName="dateCreated" msprop:Generator_ColumnVarNameInTable="columndateCreated" msprop:Generator_ColumnPropNameInRow="dateCreated" msprop:Generator_ColumnPropNameInTable="dateCreatedColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="noteField" msprop:Generator_UserColumnName="noteField" msprop:Generator_ColumnVarNameInTable="columnnoteField" msprop:Generator_ColumnPropNameInRow="noteField" msprop:Generator_ColumnPropNameInTable="noteFieldColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="2147483647" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="noteAuthor" msprop:Generator_UserColumnName="noteAuthor" msprop:Generator_ColumnPropNameInRow="noteAuthor" msprop:Generator_ColumnVarNameInTable="columnnoteAuthor" msprop:Generator_ColumnPropNameInTable="noteAuthorColumn" type="xs:int" minOccurs="0" /> + <xs:element name="noteAuthor" msprop:Generator_UserColumnName="noteAuthor" msprop:Generator_ColumnVarNameInTable="columnnoteAuthor" msprop:Generator_ColumnPropNameInRow="noteAuthor" msprop:Generator_ColumnPropNameInTable="noteAuthorColumn" type="xs:int" minOccurs="0" /> </xs:sequence> </xs:complexType> </xs:element> - <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: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: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"> + <xs:element name="aType" msdata:ReadOnly="true" msprop:Generator_UserColumnName="aType" msprop:Generator_ColumnVarNameInTable="columnaType" msprop:Generator_ColumnPropNameInRow="aType" msprop:Generator_ColumnPropNameInTable="aTypeColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="2" /> </xs:restriction> </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="creator" msdata:ReadOnly="true" msprop:Generator_UserColumnName="creator" msprop:Generator_ColumnPropNameInRow="creator" msprop:Generator_ColumnVarNameInTable="columncreator" msprop:Generator_ColumnPropNameInTable="creatorColumn" minOccurs="0"> + <xs:element name="childID" msdata:ReadOnly="true" msprop:Generator_UserColumnName="childID" msprop:Generator_ColumnVarNameInTable="columnchildID" msprop:Generator_ColumnPropNameInRow="childID" msprop:Generator_ColumnPropNameInTable="childIDColumn" type="xs:int" minOccurs="0" /> + <xs:element name="creator" msdata:ReadOnly="true" msprop:Generator_UserColumnName="creator" msprop:Generator_ColumnVarNameInTable="columncreator" msprop:Generator_ColumnPropNameInRow="creator" msprop:Generator_ColumnPropNameInTable="creatorColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="49" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="assigned" msdata:ReadOnly="true" msprop:Generator_UserColumnName="assigned" msprop:Generator_ColumnPropNameInRow="assigned" msprop:Generator_ColumnVarNameInTable="columnassigned" msprop:Generator_ColumnPropNameInTable="assignedColumn" minOccurs="0"> + <xs:element name="assigned" msdata:ReadOnly="true" msprop:Generator_UserColumnName="assigned" msprop:Generator_ColumnVarNameInTable="columnassigned" msprop:Generator_ColumnPropNameInRow="assigned" msprop:Generator_ColumnPropNameInTable="assignedColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="49" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="assignedID" msprop:Generator_UserColumnName="assignedID" msprop:Generator_ColumnPropNameInRow="assignedID" msprop:Generator_ColumnVarNameInTable="columnassignedID" msprop:Generator_ColumnPropNameInTable="assignedIDColumn" type="xs:int" minOccurs="0" /> - <xs:element name="dateAssigned" msprop:Generator_UserColumnName="dateAssigned" msprop:Generator_ColumnPropNameInRow="dateAssigned" msprop:Generator_ColumnVarNameInTable="columndateAssigned" msprop:Generator_ColumnPropNameInTable="dateAssignedColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="dateDue" msprop:Generator_UserColumnName="dateDue" msprop:Generator_ColumnPropNameInRow="dateDue" msprop:Generator_ColumnVarNameInTable="columndateDue" msprop:Generator_ColumnPropNameInTable="dateDueColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="dateFinished" msprop:Generator_UserColumnName="dateFinished" msprop:Generator_ColumnPropNameInRow="dateFinished" msprop:Generator_ColumnVarNameInTable="columndateFinished" msprop:Generator_ColumnPropNameInTable="dateFinishedColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="highPriority" msprop:Generator_UserColumnName="highPriority" msprop:Generator_ColumnPropNameInRow="highPriority" msprop:Generator_ColumnVarNameInTable="columnhighPriority" msprop:Generator_ColumnPropNameInTable="highPriorityColumn" type="xs:boolean" minOccurs="0" /> - <xs:element name="statusName" msprop:Generator_UserColumnName="statusName" msprop:Generator_ColumnPropNameInRow="statusName" msprop:Generator_ColumnVarNameInTable="columnstatusName" msprop:Generator_ColumnPropNameInTable="statusNameColumn" minOccurs="0"> + <xs:element name="assignedID" msprop:Generator_UserColumnName="assignedID" msprop:Generator_ColumnVarNameInTable="columnassignedID" msprop:Generator_ColumnPropNameInRow="assignedID" msprop:Generator_ColumnPropNameInTable="assignedIDColumn" type="xs:int" minOccurs="0" /> + <xs:element name="dateAssigned" msprop:Generator_UserColumnName="dateAssigned" msprop:Generator_ColumnVarNameInTable="columndateAssigned" msprop:Generator_ColumnPropNameInRow="dateAssigned" msprop:Generator_ColumnPropNameInTable="dateAssignedColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="dateDue" msprop:Generator_UserColumnName="dateDue" msprop:Generator_ColumnVarNameInTable="columndateDue" msprop:Generator_ColumnPropNameInRow="dateDue" msprop:Generator_ColumnPropNameInTable="dateDueColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="dateFinished" msprop:Generator_UserColumnName="dateFinished" msprop:Generator_ColumnVarNameInTable="columndateFinished" msprop:Generator_ColumnPropNameInRow="dateFinished" msprop:Generator_ColumnPropNameInTable="dateFinishedColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="highPriority" msprop:Generator_UserColumnName="highPriority" msprop:Generator_ColumnVarNameInTable="columnhighPriority" msprop:Generator_ColumnPropNameInRow="highPriority" msprop:Generator_ColumnPropNameInTable="highPriorityColumn" type="xs:boolean" minOccurs="0" /> + <xs:element name="statusName" msprop:Generator_UserColumnName="statusName" msprop:Generator_ColumnVarNameInTable="columnstatusName" msprop:Generator_ColumnPropNameInRow="statusName" msprop:Generator_ColumnPropNameInTable="statusNameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="50" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="WOTotalTest" msprop:Generator_UserColumnName="WOTotalTest" msprop:Generator_ColumnPropNameInRow="WOTotalTest" msprop:Generator_ColumnVarNameInTable="columnWOTotalTest" msprop:Generator_ColumnPropNameInTable="WOTotalTestColumn" type="xs:int" minOccurs="0" /> - <xs:element name="WOPassRate" msdata:ReadOnly="true" msprop:Generator_UserColumnName="WOPassRate" msprop:Generator_ColumnPropNameInRow="WOPassRate" msprop:Generator_ColumnVarNameInTable="columnWOPassRate" msprop:Generator_ColumnPropNameInTable="WOPassRateColumn" minOccurs="0"> + <xs:element name="WOTotalTest" msprop:Generator_UserColumnName="WOTotalTest" msprop:Generator_ColumnVarNameInTable="columnWOTotalTest" msprop:Generator_ColumnPropNameInRow="WOTotalTest" msprop:Generator_ColumnPropNameInTable="WOTotalTestColumn" type="xs:int" minOccurs="0" /> + <xs:element name="WOPassRate" msdata:ReadOnly="true" msprop:Generator_UserColumnName="WOPassRate" msprop:Generator_ColumnVarNameInTable="columnWOPassRate" msprop:Generator_ColumnPropNameInRow="WOPassRate" msprop:Generator_ColumnPropNameInTable="WOPassRateColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="31" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="WOPass" msprop:Generator_UserColumnName="WOPass" msprop:Generator_ColumnPropNameInRow="WOPass" msprop:Generator_ColumnVarNameInTable="columnWOPass" msprop:Generator_ColumnPropNameInTable="WOPassColumn" type="xs:int" minOccurs="0" /> - <xs:element name="WOFail" msprop:Generator_UserColumnName="WOFail" msprop:Generator_ColumnPropNameInRow="WOFail" msprop:Generator_ColumnVarNameInTable="columnWOFail" msprop:Generator_ColumnPropNameInTable="WOFailColumn" type="xs:int" minOccurs="0" /> - <xs:element name="WOError" msprop:Generator_UserColumnName="WOError" msprop:Generator_ColumnPropNameInRow="WOError" msprop:Generator_ColumnVarNameInTable="columnWOError" msprop:Generator_ColumnPropNameInTable="WOErrorColumn" type="xs:int" minOccurs="0" /> + <xs:element name="WOPass" msprop:Generator_UserColumnName="WOPass" msprop:Generator_ColumnVarNameInTable="columnWOPass" msprop:Generator_ColumnPropNameInRow="WOPass" msprop:Generator_ColumnPropNameInTable="WOPassColumn" type="xs:int" minOccurs="0" /> + <xs:element name="WOFail" msprop:Generator_UserColumnName="WOFail" msprop:Generator_ColumnVarNameInTable="columnWOFail" msprop:Generator_ColumnPropNameInRow="WOFail" msprop:Generator_ColumnPropNameInTable="WOFailColumn" type="xs:int" minOccurs="0" /> + <xs:element name="WOError" msprop:Generator_UserColumnName="WOError" msprop:Generator_ColumnVarNameInTable="columnWOError" msprop:Generator_ColumnPropNameInRow="WOError" msprop:Generator_ColumnPropNameInTable="WOErrorColumn" type="xs:int" minOccurs="0" /> </xs:sequence> </xs:complexType> </xs:element> Modified: Website/Assignments.aspx =================================================================== --- Website/Assignments.aspx 2006-07-11 00:16:13 UTC (rev 92) +++ Website/Assignments.aspx 2006-07-11 14:15:24 UTC (rev 93) @@ -2,7 +2,7 @@ <%@ Register Src="~/Includes/AssignmentsTree.ascx" TagPrefix="assignment" TagName="Tree" %> <asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" runat="Server"> - <assignment:Tree runat="Server" /> + <assignment:Tree runat="Server" id=Tree /> </asp:Content> <asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" runat="Server"> </asp:Content> Modified: Website/Includes/Header.ascx =================================================================== --- Website/Includes/Header.ascx 2006-07-11 00:16:13 UTC (rev 92) +++ Website/Includes/Header.ascx 2006-07-11 14:15:24 UTC (rev 93) @@ -26,13 +26,13 @@ %> <div id="MainMenu"> <div id="User"> - <TCDB:User runat="server" /> + <TCDB:User runat="server" id=User /> </div> <div id="CurrentInfo"> - <TCDB:CurrentInfo runat="server" /> + <TCDB:CurrentInfo runat="server" id=CurrentInfo /> </div> <div id="Menu"> - <TCDB:Menu runat="server" /> + <TCDB:Menu runat="server" id=Menu /> </div> </div> <% } Modified: Website/TCDB.master =================================================================== --- Website/TCDB.master 2006-07-11 00:16:13 UTC (rev 92) +++ Website/TCDB.master 2006-07-11 14:15:24 UTC (rev 93) @@ -12,7 +12,7 @@ <div id="NonFooter"> <form id="Form1" runat="server"> <div id="HeaderContent"> - <TCDB:Header runat="server" /> + <TCDB:Header runat="server" id=Header /> </div> <% if (Request.IsAuthenticated) { %> @@ -32,13 +32,13 @@ else {%> <div id="Login"> - <TCDB:Authenticate runat="server" /> + <TCDB:Authenticate runat="server" id=Authenticate /> </div> <% } %> </form> </div> <div id="FooterContent"> - <TCDB:Footer runat="server" /> + <TCDB:Footer runat="server" id=Footer /> </div> </body> </html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <m_h...@us...> - 2006-07-11 16:11:36
|
Revision: 94 Author: m_hildebrand Date: 2006-07-11 08:16:23 -0700 (Tue, 11 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=94&view=rev Log Message: ----------- Placed quotes around values of k/v pairs Modified Paths: -------------- Website/Assignments.aspx Website/Includes/Header.ascx Website/TCDB.master Modified: Website/Assignments.aspx =================================================================== --- Website/Assignments.aspx 2006-07-11 14:15:24 UTC (rev 93) +++ Website/Assignments.aspx 2006-07-11 15:16:23 UTC (rev 94) @@ -2,7 +2,7 @@ <%@ Register Src="~/Includes/AssignmentsTree.ascx" TagPrefix="assignment" TagName="Tree" %> <asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" runat="Server"> - <assignment:Tree runat="Server" id=Tree /> + <assignment:Tree runat="Server" id="Tree" /> </asp:Content> <asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" runat="Server"> </asp:Content> Modified: Website/Includes/Header.ascx =================================================================== --- Website/Includes/Header.ascx 2006-07-11 14:15:24 UTC (rev 93) +++ Website/Includes/Header.ascx 2006-07-11 15:16:23 UTC (rev 94) @@ -26,13 +26,13 @@ %> <div id="MainMenu"> <div id="User"> - <TCDB:User runat="server" id=User /> + <TCDB:User runat="server" id="User" /> </div> <div id="CurrentInfo"> - <TCDB:CurrentInfo runat="server" id=CurrentInfo /> + <TCDB:CurrentInfo runat="server" id="CurrentInfo" /> </div> <div id="Menu"> - <TCDB:Menu runat="server" id=Menu /> + <TCDB:Menu runat="server" id="Menu" /> </div> </div> <% } Modified: Website/TCDB.master =================================================================== --- Website/TCDB.master 2006-07-11 14:15:24 UTC (rev 93) +++ Website/TCDB.master 2006-07-11 15:16:23 UTC (rev 94) @@ -12,7 +12,7 @@ <div id="NonFooter"> <form id="Form1" runat="server"> <div id="HeaderContent"> - <TCDB:Header runat="server" id=Header /> + <TCDB:Header runat="server" id="Header" /> </div> <% if (Request.IsAuthenticated) { %> @@ -32,13 +32,13 @@ else {%> <div id="Login"> - <TCDB:Authenticate runat="server" id=Authenticate /> + <TCDB:Authenticate runat="server" id="Authenticate" /> </div> <% } %> </form> </div> <div id="FooterContent"> - <TCDB:Footer runat="server" id=Footer /> + <TCDB:Footer runat="server" id="Footer" /> </div> </body> </html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <m_h...@us...> - 2006-07-11 19:33:19
|
Revision: 97 Author: m_hildebrand Date: 2006-07-11 12:32:56 -0700 (Tue, 11 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=97&view=rev Log Message: ----------- Assigned global object g_user as the currently logged in user Modified Paths: -------------- Website/App_Code/TCDB_Assignments.cs Website/App_Code/TCDB_Common.cs Website/App_Code/TCDB_Products.cs Website/App_Code/TCDB_Users.cs Website/App_Code/dadDataSet.xsd Website/Includes/ActionItems.ascx Website/Includes/AdministrationTree.ascx Website/Includes/Assignments.ascx Website/Includes/AssignmentsTree.ascx Website/Includes/Authenticate.ascx Website/Includes/Builds.ascx Website/Includes/Execution.ascx Website/Includes/FeatureTree.ascx Website/Includes/Features.ascx Website/Includes/Footer.ascx Website/Includes/Header.ascx Website/Includes/Header_CurrentInfo.ascx Website/Includes/Header_Menu.ascx Website/Includes/Header_User.ascx Website/Includes/Notes.ascx Website/Includes/Objectives.ascx Website/Includes/Platforms.ascx Website/Includes/Products.ascx Website/Includes/Reports.ascx Website/Includes/SqlDatabase.ascx Website/Includes/Tags.ascx Website/Includes/TestCases.ascx Website/Includes/Users.ascx Website/Includes/Versions.ascx Website/Includes/WorkOrders.ascx Website/Plugins/VAS_Execution.ascx Website/TCDB.master Website/WorkOrder.aspx Added Paths: ----------- Website/App_Code/TCDB_Logs.cs Website/Global.asax Modified: Website/App_Code/TCDB_Assignments.cs =================================================================== --- Website/App_Code/TCDB_Assignments.cs 2006-07-11 17:05:34 UTC (rev 96) +++ Website/App_Code/TCDB_Assignments.cs 2006-07-11 19:32:56 UTC (rev 97) @@ -56,6 +56,7 @@ assignment.WOERROR = TCDB_Help.TCDB_DB_IntParse(dr["WOError"], 0); } + 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); @@ -86,15 +87,35 @@ DataTableReader dr = ds.db_users.CreateDataReader(); if (dr.HasRows && dr.Read()) { - ai.ID = TCDB_Help.TCDB_DB_IntParse(dr["actionItemID"], TCDB_Constant.ACTIONITEM_DEFAULTID); - ai.NAME = TCDB_Help.TCDB_DB_StringParse(dr["name"], TCDB_Constant.ACTIONITEM_DEFAULTNAME); - ai.DESCRIPTION = TCDB_Help.TCDB_DB_StringParse(dr["description"], TCDB_Constant.ACTIONITEM_DEFAULTDESCRIPTION); - ai.CREATORID = TCDB_Help.TCDB_DB_IntParse(dr["creatorID"], TCDB_Constant.ACTIONITEM_DEFAULTCREATORID); - ai.PERCENTCOMPLETE = TCDB_Help.TCDB_DB_IntParse(dr["percentComplete"], TCDB_Constant.ACTIONITEM_DEFAULTPERCENTCOMPLETE); + ai.ID = TCDB_Help.TCDB_DB_IntParse(dr["actionItemID"], 0); + ai.NAME = TCDB_Help.TCDB_DB_StringParse(dr["name"], ""); + ai.DESCRIPTION = TCDB_Help.TCDB_DB_StringParse(dr["description"], ""); + ai.CREATOR = new TCDB_User(TCDB_Help.TCDB_DB_IntParse(dr["creatorID"], TCDB_Constant.USER_ANONYMOUSUSERID)); + ai.ASSIGNED = new TCDB_User(TCDB_Help.TCDB_DB_IntParse(dr["assignedID"], TCDB_Constant.USER_ANONYMOUSUSERID)); + ai.PERCENTCOMPLETE = TCDB_Help.TCDB_DB_IntParse(dr["percentComplete"], 0); } return ai; } + + public static bool TCDB_SaveActionItem(TCDB_ActionItem ai) + { + dadDataSet ds = new dadDataSet(); + dadDataSetTableAdapters.db_actionItemsTableAdapter ta = new dadDataSetTableAdapters.db_actionItemsTableAdapter(); + try + { + ta.Insert(ai.NAME, ai.DESCRIPTION, ai.CREATOR.ID, ai.ASSIGNED.ID, DateTime.Now, null, TCDB_Constant.ASSIGNMENT_PRIORITY_HIGH); + } + catch + { + return false; + } + + if (ds.db_users.HasErrors) + return false; + + return true; + } } public class TCDB_WorkOrderDB : Page @@ -288,7 +309,8 @@ private int p_id; private string p_name; private string p_description; - private int p_creatorID; + private TCDB_User p_creator; + private TCDB_User p_assigned; private int p_percentComplete; public TCDB_ActionItem() @@ -296,16 +318,18 @@ p_id = 0; p_name = ""; p_description = ""; - p_creatorID = 0; + p_creator = new TCDB_User(); + p_assigned = new TCDB_User(); p_percentComplete = 0; } - public TCDB_ActionItem(int id, string name, string description, int creatorID, int percentComplete) + public TCDB_ActionItem(int id, string name, string description, TCDB_User creator, TCDB_User assigned, int percentComplete) { p_id = id; p_name = name; p_description = description; - p_creatorID = creatorID; + p_creator = creator; + p_assigned = assigned; p_percentComplete = percentComplete; } @@ -327,12 +351,18 @@ set { p_description = value; } } - public int CREATORID + public TCDB_User CREATOR { - get { return p_creatorID; } - set { p_creatorID = value; } + get { return p_creator; } + set { p_creator = value; } } + public TCDB_User ASSIGNED + { + get { return p_assigned; } + set { p_assigned = value; } + } + public int PERCENTCOMPLETE { get { return p_percentComplete; } Modified: Website/App_Code/TCDB_Common.cs =================================================================== --- Website/App_Code/TCDB_Common.cs 2006-07-11 17:05:34 UTC (rev 96) +++ Website/App_Code/TCDB_Common.cs 2006-07-11 19:32:56 UTC (rev 97) @@ -31,6 +31,9 @@ public static string USER_ANONYMOUSCELLPHONE = ""; public static bool USER_ANONYMOUSAUTOMATION = false; + public static string USER_AI_NAME = "Assign permissions: "; + public static string USER_AI_DESCRIPTION = "Please assign appropriate permissions for new user: "; + public static int ACTIONITEM_DEFAULTID = 0; public static string ACTIONITEM_DEFAULTNAME = ""; public static string ACTIONITEM_DEFAULTDESCRIPTION = ""; Added: Website/App_Code/TCDB_Logs.cs =================================================================== --- Website/App_Code/TCDB_Logs.cs (rev 0) +++ Website/App_Code/TCDB_Logs.cs 2006-07-11 19:32:56 UTC (rev 97) @@ -0,0 +1,39 @@ +using System; +using System.Data; +using System.Configuration; +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; + +namespace TCDB_Logs +{ + public class TCDB_Log + { + public TCDB_Log() + { + } + + public void Info() + { + } + + public void Debug() + { + } + + public void Error() + { + } + + public void Fatal() + { + } + + public void Warn() + { + } + } +} \ No newline at end of file Modified: Website/App_Code/TCDB_Products.cs =================================================================== --- Website/App_Code/TCDB_Products.cs 2006-07-11 17:05:34 UTC (rev 96) +++ Website/App_Code/TCDB_Products.cs 2006-07-11 19:32:56 UTC (rev 97) @@ -27,7 +27,7 @@ TCDB_Product product = new TCDB_Product(); - DataTableReader dr = ds.CreateDataReader(); + DataTableReader dr = ds.db_products.CreateDataReader(); if (dr.HasRows && dr.Read()) { int id = TCDB_Help.TCDB_DB_IntParse(dr["productID"], TCDB_Constant.PRODUCT_DEFAULTID); Modified: Website/App_Code/TCDB_Users.cs =================================================================== --- Website/App_Code/TCDB_Users.cs 2006-07-11 17:05:34 UTC (rev 96) +++ Website/App_Code/TCDB_Users.cs 2006-07-11 19:32:56 UTC (rev 97) @@ -10,6 +10,7 @@ using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; + using System.Security; using System.Collections; using System.Collections.Generic; @@ -17,6 +18,7 @@ using TCDB_Assignments; using TCDB_Common; using AD_Auth; +using System.Web.SessionState; @@ -71,6 +73,21 @@ return user; } + public static TCDB_User TCDB_GetUserInstance() + { + TCDB_User user; + try + { + user = (TCDB_User)(HttpContext.Current.Items["user"]); + } + catch + { + user = new TCDB_User(); + } + + return user; + } + public static TCDB_User TCDB_GetUserInfo(string strUserName) { // TODO: Check against the DB for user information @@ -186,58 +203,43 @@ /// </summary> public class TCDB_User { - private int userid; - private string username; - private string email; - private string officePhone; - private string homePhone; - private string cellPhone; - private string firstName; - private string lastName; - private bool automation; - private bool isAuthenticated; - private List<TCDB_Right> rights; - private List<TCDB_Config> config; - private List<TCDB_Assignment> assignments; + private int p_id; + private string p_username; + private string p_email; + private string p_officePhone; + private string p_homePhone; + private string p_cellPhone; + private string p_firstName; + private string p_lastName; + private bool p_automation; + private bool p_isAuthenticated; + private List<TCDB_Right> p_rights; + private List<TCDB_Config> p_config; + private List<TCDB_Assignment> p_assignments; /* TODO: Implement these as the time is right - private List<TCDB_Feature> features; - private List<TCDB_Assignment> assignmentsCreated; - private List<TCDB_Objective> objectives; - private List<TCDB_WorkOrderTemplate> savedWorkOrders; - private List<TCDB_TestCase> testCasesCreated; - private List<TCDB_TestCase> testCasesEdited; + private List<TCDB_Feature> p_features; + private List<TCDB_Assignment> p_assignmentsCreated; + private List<TCDB_Objective> p_objectives; + private List<TCDB_WorkOrderTemplate> p_savedWorkOrders; + private List<TCDB_TestCase> p_testCasesCreated; + private List<TCDB_TestCase> p_testCasesEdited; */ - public List<TCDB_Assignment> ASSIGNMENTS - { - // TODO: This list needs to be able to reflect filters! - get - { - List<TCDB_Assignment> assignments = new List<TCDB_Assignment>(); - if (assignments == null) - { - assignments = TCDB_AssignmentDB.TCDB_GetAssignmentList(TCDB_Constant.ASSIGNMENT_TYPE_BOTH, - TCDB_Constant.ASSIGNMENT_FINISHEDANDUNFINISHED, ID, null); - } - return assignments; - } - } - public TCDB_User() { - userid = TCDB_Constant.USER_ANONYMOUSUSERID; - username = TCDB_Constant.USER_ANONYMOUSUSERNAME; - email = ""; - officePhone = ""; - homePhone = ""; - cellPhone = ""; - firstName = TCDB_Constant.USER_ANONYMOUSFIRSTNAME; - lastName = TCDB_Constant.USER_ANONYMOUSLASTNAME; - automation = false; - isAuthenticated = false; - rights = null; - config = null; - assignments = null; + p_id = TCDB_Constant.USER_ANONYMOUSUSERID; + p_username = TCDB_Constant.USER_ANONYMOUSUSERNAME; + p_email = ""; + p_officePhone = ""; + p_homePhone = ""; + p_cellPhone = ""; + p_firstName = TCDB_Constant.USER_ANONYMOUSFIRSTNAME; + p_lastName = TCDB_Constant.USER_ANONYMOUSLASTNAME; + p_automation = false; + p_isAuthenticated = false; + p_rights = null; + p_config = null; + p_assignments = null; } public TCDB_User(string username) @@ -252,67 +254,67 @@ private void TCDB_BuildUser(TCDB_User user) { - userid = user.ID; - username = user.USERNAME; - email = user.EMAIL; - officePhone = user.OFFICEPHONE; - homePhone = user.HOMEPHONE; - cellPhone = user.CELLPHONE; - firstName = user.FIRSTNAME; - lastName = user.LASTNAME; - automation = user.AUTOMATION; - isAuthenticated = user.ISAUTHENTICATED; - rights = user.rights; - config = user.config; - assignments = null; + p_id = user.ID; + p_username = user.USERNAME; + p_email = user.EMAIL; + p_officePhone = user.OFFICEPHONE; + p_homePhone = user.HOMEPHONE; + p_cellPhone = user.CELLPHONE; + p_firstName = user.FIRSTNAME; + p_lastName = user.LASTNAME; + p_automation = user.AUTOMATION; + p_isAuthenticated = user.ISAUTHENTICATED; + p_rights = user.GetRights(false); + p_config = user.GetConfig(false); + p_assignments = user.GetAssignments(false); } public int ID { - get { return userid; } - set { userid = value; } + get { return p_id; } + set { p_id = value; } } public string USERNAME { - get { return username; } - set { username = value; } + get { return p_username; } + set { p_username = value; } } public string EMAIL { - get { return email; } - set { email = value; } + get { return p_email; } + set { p_email = value; } } public string OFFICEPHONE { - get { return officePhone; } - set { officePhone = value; } + get { return p_officePhone; } + set { p_officePhone = value; } } public string HOMEPHONE { - get { return homePhone; } - set { homePhone = value; } + get { return p_homePhone; } + set { p_homePhone = value; } } public string CELLPHONE { - get { return cellPhone; } - set { cellPhone = value; } + get { return p_cellPhone; } + set { p_cellPhone = value; } } public string FIRSTNAME { - get { return firstName; } - set { firstName = value; } + get { return p_firstName; } + set { p_firstName = value; } } public string LASTNAME { - get { return lastName; } - set { lastName = value; } + get { return p_lastName; } + set { p_lastName = value; } } public string FULLNAME @@ -322,14 +324,14 @@ public bool AUTOMATION { - get { return automation; } - set { automation = value; } + get { return p_automation; } + set { p_automation = value; } } public bool ISAUTHENTICATED { - get { return isAuthenticated; } - set { isAuthenticated = value; } + get { return p_isAuthenticated; } + set { p_isAuthenticated = value; } } public override string ToString() @@ -337,19 +339,31 @@ return FULLNAME; } - public List<TCDB_Right> GetRights() + public List<TCDB_Right> GetRights(bool reload) { // TODO: If rights == null // load the rights from the db - return rights; + return p_rights; } - public List<TCDB_Config> GetConfig() + public List<TCDB_Config> GetConfig(bool reload) { // TODO: If config == null // load the config from the db - return config; + return p_config; } + + public List<TCDB_Assignment> GetAssignments(bool reload) + { + // TODO: This list needs to be able to reflect filters! + p_assignments = new List<TCDB_Assignment>(); + if (p_assignments == null || reload) + { + p_assignments = TCDB_AssignmentDB.TCDB_GetAssignmentList(TCDB_Constant.ASSIGNMENT_TYPE_BOTH, + TCDB_Constant.ASSIGNMENT_FINISHEDANDUNFINISHED, ID, null); + } + return p_assignments; + } } public class TCDB_Right Modified: Website/App_Code/dadDataSet.xsd =================================================================== --- Website/App_Code/dadDataSet.xsd 2006-07-11 17:05:34 UTC (rev 96) +++ Website/App_Code/dadDataSet.xsd 2006-07-11 19:32:56 UTC (rev 97) @@ -39,7 +39,7 @@ </DbCommand> </InsertCommand> <SelectCommand> - <DbCommand CommandType="StoredProcedure" ModifiedByUser="True"> + <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> <CommandText>dbo.sel_users</CommandText> <Parameters> <Parameter AllowDbNull="True" AutogeneratedName="" DataSourceName="" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="False" SourceVersion="Current"> @@ -330,6 +330,7 @@ <Mapping SourceColumn="WOPass" DataSetColumn="WOPass" /> <Mapping SourceColumn="WOFail" DataSetColumn="WOFail" /> <Mapping SourceColumn="WOError" DataSetColumn="WOError" /> + <Mapping SourceColumn="aName" DataSetColumn="aName" /> </Mappings> <Sources> </Sources> @@ -346,146 +347,146 @@ <xs:element name="db_users" msprop:Generator_UserTableName="db_users" msprop:Generator_RowDeletedName="db_usersRowDeleted" msprop:Generator_RowChangedName="db_usersRowChanged" msprop:Generator_RowClassName="db_usersRow" msprop:Generator_RowChangingName="db_usersRowChanging" msprop:Generator_RowEvArgName="db_usersRowChangeEvent" msprop:Generator_RowEvHandlerName="db_usersRowChangeEventHandler" msprop:Generator_TableClassName="db_usersDataTable" msprop:Generator_TableVarName="tabledb_users" msprop:Generator_RowDeletingName="db_usersRowDeleting" msprop:Generator_TablePropName="db_users"> <xs:complexType> <xs:sequence> - <xs:element name="userID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="userID" msprop:Generator_ColumnVarNameInTable="columnuserID" msprop:Generator_ColumnPropNameInRow="userID" msprop:Generator_ColumnPropNameInTable="userIDColumn" type="xs:int" /> - <xs:element name="username" msprop:Generator_UserColumnName="username" msprop:Generator_ColumnVarNameInTable="columnusername" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_ColumnPropNameInTable="usernameColumn"> + <xs:element name="userID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="userID" msprop:Generator_ColumnPropNameInRow="userID" msprop:Generator_ColumnVarNameInTable="columnuserID" msprop:Generator_ColumnPropNameInTable="userIDColumn" type="xs:int" /> + <xs:element name="username" msprop:Generator_UserColumnName="username" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_ColumnVarNameInTable="columnusername" msprop:Generator_ColumnPropNameInTable="usernameColumn"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="50" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="email" msprop:Generator_UserColumnName="email" msprop:Generator_ColumnVarNameInTable="columnemail" msprop:Generator_ColumnPropNameInRow="email" msprop:Generator_ColumnPropNameInTable="emailColumn"> + <xs:element name="email" msprop:Generator_UserColumnName="email" msprop:Generator_ColumnPropNameInRow="email" msprop:Generator_ColumnVarNameInTable="columnemail" msprop:Generator_ColumnPropNameInTable="emailColumn"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="50" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="officePhone" msprop:Generator_UserColumnName="officePhone" msprop:Generator_ColumnVarNameInTable="columnofficePhone" msprop:Generator_ColumnPropNameInRow="officePhone" msprop:Generator_ColumnPropNameInTable="officePhoneColumn" minOccurs="0"> + <xs:element name="officePhone" msprop:Generator_UserColumnName="officePhone" msprop:Generator_ColumnPropNameInRow="officePhone" msprop:Generator_ColumnVarNameInTable="columnofficePhone" msprop:Generator_ColumnPropNameInTable="officePhoneColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="14" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="homePhone" msprop:Generator_UserColumnName="homePhone" msprop:Generator_ColumnVarNameInTable="columnhomePhone" msprop:Generator_ColumnPropNameInRow="homePhone" msprop:Generator_ColumnPropNameInTable="homePhoneColumn" minOccurs="0"> + <xs:element name="homePhone" msprop:Generator_UserColumnName="homePhone" msprop:Generator_ColumnPropNameInRow="homePhone" msprop:Generator_ColumnVarNameInTable="columnhomePhone" msprop:Generator_ColumnPropNameInTable="homePhoneColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="14" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="cellPhone" msprop:Generator_UserColumnName="cellPhone" msprop:Generator_ColumnVarNameInTable="columncellPhone" msprop:Generator_ColumnPropNameInRow="cellPhone" msprop:Generator_ColumnPropNameInTable="cellPhoneColumn" minOccurs="0"> + <xs:element name="cellPhone" msprop:Generator_UserColumnName="cellPhone" msprop:Generator_ColumnPropNameInRow="cellPhone" msprop:Generator_ColumnVarNameInTable="columncellPhone" msprop:Generator_ColumnPropNameInTable="cellPhoneColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="14" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="firstName" msprop:Generator_UserColumnName="firstName" msprop:Generator_ColumnVarNameInTable="columnfirstName" msprop:Generator_ColumnPropNameInRow="firstName" msprop:Generator_ColumnPropNameInTable="firstNameColumn"> + <xs:element name="firstName" msprop:Generator_UserColumnName="firstName" msprop:Generator_ColumnPropNameInRow="firstName" msprop:Generator_ColumnVarNameInTable="columnfirstName" msprop:Generator_ColumnPropNameInTable="firstNameColumn"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="24" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="lastName" msprop:Generator_UserColumnName="lastName" msprop:Generator_ColumnVarNameInTable="columnlastName" msprop:Generator_ColumnPropNameInRow="lastName" msprop:Generator_ColumnPropNameInTable="lastNameColumn"> + <xs:element name="lastName" msprop:Generator_UserColumnName="lastName" msprop:Generator_ColumnPropNameInRow="lastName" msprop:Generator_ColumnVarNameInTable="columnlastName" msprop:Generator_ColumnPropNameInTable="lastNameColumn"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="24" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="fullName" msdata:ReadOnly="true" msprop:Generator_UserColumnName="fullName" msprop:Generator_ColumnVarNameInTable="columnfullName" msprop:Generator_ColumnPropNameInRow="fullName" msprop:Generator_ColumnPropNameInTable="fullNameColumn" minOccurs="0"> + <xs:element name="fullName" msdata:ReadOnly="true" msprop:Generator_UserColumnName="fullName" msprop:Generator_ColumnPropNameInRow="fullName" msprop:Generator_ColumnVarNameInTable="columnfullName" msprop:Generator_ColumnPropNameInTable="fullNameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="49" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="automation" msprop:Generator_UserColumnName="automation" msprop:Generator_ColumnVarNameInTable="columnautomation" msprop:Generator_ColumnPropNameInRow="automation" msprop:Generator_ColumnPropNameInTable="automationColumn" type="xs:boolean" /> + <xs:element name="automation" msprop:Generator_UserColumnName="automation" msprop:Generator_ColumnPropNameInRow="automation" msprop:Generator_ColumnVarNameInTable="columnautomation" msprop:Generator_ColumnPropNameInTable="automationColumn" type="xs:boolean" /> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="db_products" msprop:Generator_UserTableName="db_products" msprop:Generator_RowDeletedName="db_productsRowDeleted" msprop:Generator_RowChangedName="db_productsRowChanged" msprop:Generator_RowClassName="db_productsRow" msprop:Generator_RowChangingName="db_productsRowChanging" msprop:Generator_RowEvArgName="db_productsRowChangeEvent" msprop:Generator_RowEvHandlerName="db_productsRowChangeEventHandler" msprop:Generator_TableClassName="db_productsDataTable" msprop:Generator_TableVarName="tabledb_products" msprop:Generator_RowDeletingName="db_productsRowDeleting" msprop:Generator_TablePropName="db_products"> <xs:complexType> <xs:sequence> - <xs:element name="productID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="productID" msprop:Generator_ColumnVarNameInTable="columnproductID" msprop:Generator_ColumnPropNameInRow="productID" msprop:Generator_ColumnPropNameInTable="productIDColumn" type="xs:int" /> - <xs:element name="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnPropNameInTable="nameColumn" minOccurs="0"> + <xs:element name="productID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="productID" msprop:Generator_ColumnPropNameInRow="productID" msprop:Generator_ColumnVarNameInTable="columnproductID" msprop:Generator_ColumnPropNameInTable="productIDColumn" type="xs:int" /> + <xs:element name="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInTable="nameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="255" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="description" msprop:Generator_UserColumnName="description" msprop:Generator_ColumnVarNameInTable="columndescription" msprop:Generator_ColumnPropNameInRow="description" msprop:Generator_ColumnPropNameInTable="descriptionColumn" minOccurs="0"> + <xs:element name="description" msprop:Generator_UserColumnName="description" msprop:Generator_ColumnPropNameInRow="description" msprop:Generator_ColumnVarNameInTable="columndescription" msprop:Generator_ColumnPropNameInTable="descriptionColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="2147483647" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="devManager" msprop:Generator_UserColumnName="devManager" msprop:Generator_ColumnVarNameInTable="columndevManager" msprop:Generator_ColumnPropNameInRow="devManager" msprop:Generator_ColumnPropNameInTable="devManagerColumn" type="xs:int" minOccurs="0" /> - <xs:element name="qaManager" msprop:Generator_UserColumnName="qaManager" msprop:Generator_ColumnVarNameInTable="columnqaManager" msprop:Generator_ColumnPropNameInRow="qaManager" msprop:Generator_ColumnPropNameInTable="qaManagerColumn" type="xs:int" minOccurs="0" /> - <xs:element name="devLead" msprop:Generator_UserColumnName="devLead" msprop:Generator_ColumnVarNameInTable="columndevLead" msprop:Generator_ColumnPropNameInRow="devLead" msprop:Generator_ColumnPropNameInTable="devLeadColumn" type="xs:int" minOccurs="0" /> - <xs:element name="qaLead" msprop:Generator_UserColumnName="qaLead" msprop:Generator_ColumnVarNameInTable="columnqaLead" msprop:Generator_ColumnPropNameInRow="qaLead" msprop:Generator_ColumnPropNameInTable="qaLeadColumn" type="xs:int" minOccurs="0" /> - <xs:element name="pm" msprop:Generator_UserColumnName="pm" msprop:Generator_ColumnVarNameInTable="columnpm" msprop:Generator_ColumnPropNameInRow="pm" msprop:Generator_ColumnPropNameInTable="pmColumn" type="xs:int" minOccurs="0" /> - <xs:element name="codeName" msprop:Generator_UserColumnName="codeName" msprop:Generator_ColumnVarNameInTable="columncodeName" msprop:Generator_ColumnPropNameInRow="codeName" msprop:Generator_ColumnPropNameInTable="codeNameColumn" minOccurs="0"> + <xs:element name="devManager" msprop:Generator_UserColumnName="devManager" msprop:Generator_ColumnPropNameInRow="devManager" msprop:Generator_ColumnVarNameInTable="columndevManager" msprop:Generator_ColumnPropNameInTable="devManagerColumn" type="xs:int" minOccurs="0" /> + <xs:element name="qaManager" msprop:Generator_UserColumnName="qaManager" msprop:Generator_ColumnPropNameInRow="qaManager" msprop:Generator_ColumnVarNameInTable="columnqaManager" msprop:Generator_ColumnPropNameInTable="qaManagerColumn" type="xs:int" minOccurs="0" /> + <xs:element name="devLead" msprop:Generator_UserColumnName="devLead" msprop:Generator_ColumnPropNameInRow="devLead" msprop:Generator_ColumnVarNameInTable="columndevLead" msprop:Generator_ColumnPropNameInTable="devLeadColumn" type="xs:int" minOccurs="0" /> + <xs:element name="qaLead" msprop:Generator_UserColumnName="qaLead" msprop:Generator_ColumnPropNameInRow="qaLead" msprop:Generator_ColumnVarNameInTable="columnqaLead" msprop:Generator_ColumnPropNameInTable="qaLeadColumn" type="xs:int" minOccurs="0" /> + <xs:element name="pm" msprop:Generator_UserColumnName="pm" msprop:Generator_ColumnPropNameInRow="pm" msprop:Generator_ColumnVarNameInTable="columnpm" msprop:Generator_ColumnPropNameInTable="pmColumn" type="xs:int" minOccurs="0" /> + <xs:element name="codeName" msprop:Generator_UserColumnName="codeName" msprop:Generator_ColumnPropNameInRow="codeName" msprop:Generator_ColumnVarNameInTable="columncodeName" msprop:Generator_ColumnPropNameInTable="codeNameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="10" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="active" msprop:Generator_UserColumnName="active" msprop:Generator_ColumnVarNameInTable="columnactive" msprop:Generator_ColumnPropNameInRow="active" msprop:Generator_ColumnPropNameInTable="activeColumn" type="xs:boolean" /> + <xs:element name="active" msprop:Generator_UserColumnName="active" msprop:Generator_ColumnPropNameInRow="active" msprop:Generator_ColumnVarNameInTable="columnactive" msprop:Generator_ColumnPropNameInTable="activeColumn" type="xs:boolean" /> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="db_actionItems" msprop:Generator_UserTableName="db_actionItems" msprop:Generator_RowDeletedName="db_actionItemsRowDeleted" msprop:Generator_RowChangedName="db_actionItemsRowChanged" msprop:Generator_RowClassName="db_actionItemsRow" msprop:Generator_RowChangingName="db_actionItemsRowChanging" msprop:Generator_RowEvArgName="db_actionItemsRowChangeEvent" msprop:Generator_RowEvHandlerName="db_actionItemsRowChangeEventHandler" msprop:Generator_TableClassName="db_actionItemsDataTable" msprop:Generator_TableVarName="tabledb_actionItems" msprop:Generator_RowDeletingName="db_actionItemsRowDeleting" msprop:Generator_TablePropName="db_actionItems"> <xs:complexType> <xs:sequence> - <xs:element name="actionItemID" msprop:Generator_UserColumnName="actionItemID" msprop:Generator_ColumnPropNameInRow="actionItemID" msprop:Generator_ColumnVarNameInTable="columnactionItemID" msprop:Generator_ColumnPropNameInTable="actionItemIDColumn" type="xs:int" /> - <xs:element name="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInTable="nameColumn" minOccurs="0"> + <xs:element name="actionItemID" msprop:Generator_UserColumnName="actionItemID" msprop:Generator_ColumnVarNameInTable="columnactionItemID" msprop:Generator_ColumnPropNameInRow="actionItemID" msprop:Generator_ColumnPropNameInTable="actionItemIDColumn" type="xs:int" /> + <xs:element name="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnPropNameInTable="nameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="255" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="description" msprop:Generator_UserColumnName="description" msprop:Generator_ColumnPropNameInRow="description" msprop:Generator_ColumnVarNameInTable="columndescription" msprop:Generator_ColumnPropNameInTable="descriptionColumn" minOccurs="0"> + <xs:element name="description" msprop:Generator_UserColumnName="description" msprop:Generator_ColumnVarNameInTable="columndescription" msprop:Generator_ColumnPropNameInRow="description" msprop:Generator_ColumnPropNameInTable="descriptionColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="2147483647" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="dateAssigned" msprop:Generator_UserColumnName="dateAssigned" msprop:Generator_ColumnPropNameInRow="dateAssigned" msprop:Generator_ColumnVarNameInTable="columndateAssigned" msprop:Generator_ColumnPropNameInTable="dateAssignedColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="dateDue" msprop:Generator_UserColumnName="dateDue" msprop:Generator_ColumnPropNameInRow="dateDue" msprop:Generator_ColumnVarNameInTable="columndateDue" msprop:Generator_ColumnPropNameInTable="dateDueColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="percentComplete" msprop:Generator_UserColumnName="percentComplete" msprop:Generator_ColumnPropNameInRow="percentComplete" msprop:Generator_ColumnVarNameInTable="columnpercentComplete" msprop:Generator_ColumnPropNameInTable="percentCompleteColumn" type="xs:int" minOccurs="0" /> - <xs:element name="statusName" msprop:Generator_UserColumnName="statusName" msprop:Generator_ColumnPropNameInRow="statusName" msprop:Generator_ColumnVarNameInTable="columnstatusName" msprop:Generator_ColumnPropNameInTable="statusNameColumn" minOccurs="0"> + <xs:element name="dateAssigned" msprop:Generator_UserColumnName="dateAssigned" msprop:Generator_ColumnVarNameInTable="columndateAssigned" msprop:Generator_ColumnPropNameInRow="dateAssigned" msprop:Generator_ColumnPropNameInTable="dateAssignedColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="dateDue" msprop:Generator_UserColumnName="dateDue" msprop:Generator_ColumnVarNameInTable="columndateDue" msprop:Generator_ColumnPropNameInRow="dateDue" msprop:Generator_ColumnPropNameInTable="dateDueColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="percentComplete" msprop:Generator_UserColumnName="percentComplete" msprop:Generator_ColumnVarNameInTable="columnpercentComplete" msprop:Generator_ColumnPropNameInRow="percentComplete" msprop:Generator_ColumnPropNameInTable="percentCompleteColumn" type="xs:int" minOccurs="0" /> + <xs:element name="statusName" msprop:Generator_UserColumnName="statusName" msprop:Generator_ColumnVarNameInTable="columnstatusName" msprop:Generator_ColumnPropNameInRow="statusName" msprop:Generator_ColumnPropNameInTable="statusNameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="50" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="createdBy" msdata:ReadOnly="true" msprop:Generator_UserColumnName="createdBy" msprop:Generator_ColumnPropNameInRow="createdBy" msprop:Generator_ColumnVarNameInTable="columncreatedBy" msprop:Generator_ColumnPropNameInTable="createdByColumn" minOccurs="0"> + <xs:element name="createdBy" msdata:ReadOnly="true" msprop:Generator_UserColumnName="createdBy" msprop:Generator_ColumnVarNameInTable="columncreatedBy" msprop:Generator_ColumnPropNameInRow="createdBy" msprop:Generator_ColumnPropNameInTable="createdByColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="49" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="highPriority" msprop:Generator_UserColumnName="highPriority" msprop:Generator_ColumnPropNameInRow="highPriority" msprop:Generator_ColumnVarNameInTable="columnhighPriority" msprop:Generator_ColumnPropNameInTable="highPriorityColumn" type="xs:boolean" minOccurs="0" /> - <xs:element name="createdById" msprop:Generator_UserColumnName="createdById" msprop:Generator_ColumnPropNameInRow="createdById" msprop:Generator_ColumnVarNameInTable="columncreatedById" msprop:Generator_ColumnPropNameInTable="createdByIdColumn" type="xs:int" /> + <xs:element name="highPriority" msprop:Generator_UserColumnName="highPriority" msprop:Generator_ColumnVarNameInTable="columnhighPriority" msprop:Generator_ColumnPropNameInRow="highPriority" msprop:Generator_ColumnPropNameInTable="highPriorityColumn" type="xs:boolean" minOccurs="0" /> + <xs:element name="createdById" msprop:Generator_UserColumnName="createdById" msprop:Generator_ColumnVarNameInTable="columncreatedById" msprop:Generator_ColumnPropNameInRow="createdById" msprop:Generator_ColumnPropNameInTable="createdByIdColumn" type="xs:int" /> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="db_status" msprop:Generator_UserTableName="db_status" msprop:Generator_RowDeletedName="db_statusRowDeleted" msprop:Generator_RowChangedName="db_statusRowChanged" msprop:Generator_RowClassName="db_statusRow" msprop:Generator_RowChangingName="db_statusRowChanging" msprop:Generator_RowEvArgName="db_statusRowChangeEvent" msprop:Generator_RowEvHandlerName="db_statusRowChangeEventHandler" msprop:Generator_TableClassName="db_statusDataTable" msprop:Generator_TableVarName="tabledb_status" msprop:Generator_RowDeletingName="db_statusRowDeleting" msprop:Generator_TablePropName="db_status"> <xs:complexType> <xs:sequence> - <xs:element name="statusID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="statusID" msprop:Generator_ColumnVarNameInTable="columnstatusID" msprop:Generator_ColumnPropNameInRow="statusID" msprop:Generator_ColumnPropNameInTable="statusIDColumn" type="xs:int" /> - <xs:element name="Description" msprop:Generator_UserColumnName="Description" msprop:Generator_ColumnVarNameInTable="columnDescription" msprop:Generator_ColumnPropNameInRow="Description" msprop:Generator_ColumnPropNameInTable="DescriptionColumn" minOccurs="0"> + <xs:element name="statusID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="statusID" msprop:Generator_ColumnPropNameInRow="statusID" msprop:Generator_ColumnVarNameInTable="columnstatusID" msprop:Generator_ColumnPropNameInTable="statusIDColumn" type="xs:int" /> + <xs:element name="Description" msprop:Generator_UserColumnName="Description" msprop:Generator_ColumnPropNameInRow="Description" msprop:Generator_ColumnVarNameInTable="columnDescription" msprop:Generator_ColumnPropNameInTable="DescriptionColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="2147483647" /> @@ -498,67 +499,74 @@ <xs:element name="db_notes" msprop:Generator_UserTableName="db_notes" msprop:Generator_RowDeletedName="db_notesRowDeleted" msprop:Generator_RowChangedName="db_notesRowChanged" msprop:Generator_RowClassName="db_notesRow" msprop:Generator_RowChangingName="db_notesRowChanging" msprop:Generator_RowEvArgName="db_notesRowChangeEvent" msprop:Generator_RowEvHandlerName="db_notesRowChangeEventHandler" msprop:Generator_TableClassName="db_notesDataTable" msprop:Generator_TableVarName="tabledb_notes" msprop:Generator_RowDeletingName="db_notesRowDeleting" msprop:Generator_TablePropName="db_notes"> <xs:complexType> <xs:sequence> - <xs:element name="noteID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="noteID" msprop:Generator_ColumnVarNameInTable="columnnoteID" msprop:Generator_ColumnPropNameInRow="noteID" msprop:Generator_ColumnPropNameInTable="noteIDColumn" type="xs:int" /> - <xs:element name="dateCreated" msprop:Generator_UserColumnName="dateCreated" msprop:Generator_ColumnVarNameInTable="columndateCreated" msprop:Generator_ColumnPropNameInRow="dateCreated" msprop:Generator_ColumnPropNameInTable="dateCreatedColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="noteField" msprop:Generator_UserColumnName="noteField" msprop:Generator_ColumnVarNameInTable="columnnoteField" msprop:Generator_ColumnPropNameInRow="noteField" msprop:Generator_ColumnPropNameInTable="noteFieldColumn" minOccurs="0"> + <xs:element name="noteID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="noteID" msprop:Generator_ColumnPropNameInRow="noteID" msprop:Generator_ColumnVarNameInTable="columnnoteID" msprop:Generator_ColumnPropNameInTable="noteIDColumn" type="xs:int" /> + <xs:element name="dateCreated" msprop:Generator_UserColumnName="dateCreated" msprop:Generator_ColumnPropNameInRow="dateCreated" msprop:Generator_ColumnVarNameInTable="columndateCreated" msprop:Generator_ColumnPropNameInTable="dateCreatedColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="noteField" msprop:Generator_UserColumnName="noteField" msprop:Generator_ColumnPropNameInRow="noteField" msprop:Generator_ColumnVarNameInTable="columnnoteField" msprop:Generator_ColumnPropNameInTable="noteFieldColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="2147483647" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="noteAuthor" msprop:Generator_UserColumnName="noteAuthor" msprop:Generator_ColumnVarNameInTable="columnnoteAuthor" msprop:Generator_ColumnPropNameInRow="noteAuthor" msprop:Generator_ColumnPropNameInTable="noteAuthorColumn" type="xs:int" minOccurs="0" /> + <xs:element name="noteAuthor" msprop:Generator_UserColumnName="noteAuthor" msprop:Generator_ColumnPropNameInRow="noteAuthor" msprop:Generator_ColumnVarNameInTable="columnnoteAuthor" msprop:Generator_ColumnPropNameInTable="noteAuthorColumn" type="xs:int" minOccurs="0" /> </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:complexType> <xs:sequence> - <xs:element name="aType" msdata:ReadOnly="true" msprop:Generator_UserColumnName="aType" msprop:Generator_ColumnVarNameInTable="columnaType" msprop:Generator_ColumnPropNameInRow="aType" msprop:Generator_ColumnPropNameInTable="aTypeColumn" minOccurs="0"> + <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"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="2" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="childID" msdata:ReadOnly="true" msprop:Generator_UserColumnName="childID" msprop:Generator_ColumnVarNameInTable="columnchildID" msprop:Generator_ColumnPropNameInRow="childID" msprop:Generator_ColumnPropNameInTable="childIDColumn" type="xs:int" minOccurs="0" /> - <xs:element name="creator" msdata:ReadOnly="true" msprop:Generator_UserColumnName="creator" msprop:Generator_ColumnVarNameInTable="columncreator" msprop:Generator_ColumnPropNameInRow="creator" msprop:Generator_ColumnPropNameInTable="creatorColumn" 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="49" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="assigned" msdata:ReadOnly="true" msprop:Generator_UserColumnName="assigned" msprop:Generator_ColumnVarNameInTable="columnassigned" msprop:Generator_ColumnPropNameInRow="assigned" msprop:Generator_ColumnPropNameInTable="assignedColumn" minOccurs="0"> + <xs:element name="assigned" msdata:ReadOnly="true" msprop:Generator_UserColumnName="assigned" msprop:Generator_ColumnPropNameInRow="assigned" msprop:Generator_ColumnVarNameInTable="columnassigned" msprop:Generator_ColumnPropNameInTable="assignedColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="49" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="assignedID" msprop:Generator_UserColumnName="assignedID" msprop:Generator_ColumnVarNameInTable="columnassignedID" msprop:Generator_ColumnPropNameInRow="assignedID" msprop:Generator_ColumnPropNameInTable="assignedIDColumn" type="xs:int" minOccurs="0" /> - <xs:element name="dateAssigned" msprop:Generator_UserColumnName="dateAssigned" msprop:Generator_ColumnVarNameInTable="columndateAssigned" msprop:Generator_ColumnPropNameInRow="dateAssigned" msprop:Generator_ColumnPropNameInTable="dateAssignedColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="dateDue" msprop:Generator_UserColumnName="dateDue" msprop:Generator_ColumnVarNameInTable="columndateDue" msprop:Generator_ColumnPropNameInRow="dateDue" msprop:Generator_ColumnPropNameInTable="dateDueColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="dateFinished" msprop:Generator_UserColumnName="dateFinished" msprop:Generator_ColumnVarNameInTable="columndateFinished" msprop:Generator_ColumnPropNameInRow="dateFinished" msprop:Generator_ColumnPropNameInTable="dateFinishedColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="highPriority" msprop:Generator_UserColumnName="highPriority" msprop:Generator_ColumnVarNameInTable="columnhighPriority" msprop:Generator_ColumnPropNameInRow="highPriority" msprop:Generator_ColumnPropNameInTable="highPriorityColumn" type="xs:boolean" minOccurs="0" /> - <xs:element name="statusName" msprop:Generator_UserColumnName="statusName" msprop:Generator_ColumnVarNameInTable="columnstatusName" msprop:Generator_ColumnPropNameInRow="statusName" msprop:Generator_ColumnPropNameInTable="statusNameColumn" minOccurs="0"> + <xs:element name="assignedID" msprop:Generator_UserColumnName="assignedID" msprop:Generator_ColumnPropNameInRow="assignedID" msprop:Generator_ColumnVarNameInTable="columnassignedID" msprop:Generator_ColumnPropNameInTable="assignedIDColumn" type="xs:int" minOccurs="0" /> + <xs:element name="dateAssigned" msprop:Generator_UserColumnName="dateAssigned" msprop:Generator_ColumnPropNameInRow="dateAssigned" msprop:Generator_ColumnVarNameInTable="columndateAssigned" msprop:Generator_ColumnPropNameInTable="dateAssignedColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="dateDue" msprop:Generator_UserColumnName="dateDue" msprop:Generator_ColumnPropNameInRow="dateDue" msprop:Generator_ColumnVarNameInTable="columndateDue" msprop:Generator_ColumnPropNameInTable="dateDueColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="dateFinished" msprop:Generator_UserColumnName="dateFinished" msprop:Generator_ColumnPropNameInRow="dateFinished" msprop:Generator_ColumnVarNameInTable="columndateFinished" msprop:Generator_ColumnPropNameInTable="dateFinishedColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="highPriority" msprop:Generator_UserColumnName="highPriority" msprop:Generator_ColumnPropNameInRow="highPriority" msprop:Generator_ColumnVarNameInTable="columnhighPriority" msprop:Generator_ColumnPropNameInTable="highPriorityColumn" type="xs:boolean" minOccurs="0" /> + <xs:element name="statusName" msprop:Generator_UserColumnName="statusName" msprop:Generator_ColumnPropNameInRow="statusName" msprop:Generator_ColumnVarNameInTable="columnstatusName" msprop:Generator_ColumnPropNameInTable="statusNameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="50" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="WOTotalTest" msprop:Generator_UserColumnName="WOTotalTest" msprop:Generator_ColumnVarNameInTable="columnWOTotalTest" msprop:Generator_ColumnPropNameInRow="WOTotalTest" msprop:Generator_ColumnPropNameInTable="WOTotalTestColumn" type="xs:int" minOccurs="0" /> - <xs:element name="WOPassRate" msdata:ReadOnly="true" msprop:Generator_UserColumnName="WOPassRate" msprop:Generator_ColumnVarNameInTable="columnWOPassRate" msprop:Generator_ColumnPropNameInRow="WOPassRate" msprop:Generator_ColumnPropNameInTable="WOPassRateColumn" minOccurs="0"> + <xs:element name="WOTotalTest" msprop:Generator_UserColumnName="WOTotalTest" msprop:Generator_ColumnPropNameInRow="WOTotalTest" msprop:Generator_ColumnVarNameInTable="columnWOTotalTest" msprop:Generator_ColumnPropNameInTable="WOTotalTestColumn" type="xs:int" minOccurs="0" /> + <xs:element name="WOPassRate" msdata:ReadOnly="true" msprop:Generator_UserColumnName="WOPassRate" msprop:Generator_ColumnPropNameInRow="WOPassRate" msprop:Generator_ColumnVarNameInTable="columnWOPassRate" msprop:Generator_ColumnPropNameInTable="WOPassRateColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="31" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="WOPass" msprop:Generator_UserColumnName="WOPass" msprop:Generator_ColumnVarNameInTable="columnWOPass" msprop:Generator_ColumnPropNameInRow="WOPass" msprop:Generator_ColumnPropNameInTable="WOPassColumn" type="xs:int" minOccurs="0" /> - <xs:element name="WOFail" msprop:Generator_UserColumnName="WOFail" msprop:Generator_ColumnVarNameInTable="columnWOFail" msprop:Generator_ColumnPropNameInRow="WOFail" msprop:Generator_ColumnPropNameInTable="WOFailColumn" type="xs:int" minOccurs="0" /> - <xs:element name="WOError" msprop:Generator_UserColumnName="WOError" msprop:Generator_ColumnVarNameInTable="columnWOError" msprop:Generator_ColumnPropNameInRow="WOError" msprop:Generator_ColumnPropNameInTable="WOErrorColumn" type="xs:int" minOccurs="0" /> + <xs:element name="WOPass" msprop:Generator_UserColumnName="WOPass" msprop:Generator_ColumnPropNameInRow="WOPass" msprop:Generator_ColumnVarNameInTable="columnWOPass" msprop:Generator_ColumnPropNameInTable="WOPassColumn" type="xs:int" minOccurs="0" /> + <xs:element name="WOFail" msprop:Generator_UserColumnName="WOFail" msprop:Generator_ColumnPropNameInRow="WOFail" msprop:Generator_ColumnVarNameInTable="columnWOFail" msprop:Generator_ColumnPropNameInTable="WOFailColumn" type="xs:int" minOccurs="0" /> + <xs:element name="WOError" msprop:Generator_UserColumnName="WOError" msprop:Generator_ColumnPropNameInRow="WOError" msprop:Generator_ColumnVarNameInTable="columnWOError" msprop:Generator_ColumnPropNameInTable="WOErrorColumn" type="xs:int" minOccurs="0" /> + <xs:element name="aName" msdata:ReadOnly="true" msprop:Generator_UserColumnName="aName" msprop:Generator_ColumnPropNameInRow="aName" msprop:Generator_ColumnVarNameInTable="columnaName" msprop:Generator_ColumnPropNameInTable="aNameColumn" minOccurs="0"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:maxLength value="255" /> + </xs:restriction> + </xs:simpleType> + </xs:element> </xs:sequence> </xs:complexType> </xs:element> Added: Website/Global.asax =================================================================== --- Website/Global.asax (rev 0) +++ Website/Global.asax 2006-07-11 19:32:56 UTC (rev 97) @@ -0,0 +1,26 @@ +<%@ Application Language="C#" %> +<%@ Import Namespace="TCDB_Users" %> + +<script runat="server"> + + void Application_PreRequestHandlerExecute(object sender, EventArgs e) + { + TCDB_User user; + + // Fires when a security module establishes the identity of the user + if (!Context.Items.Contains("user")) + { + try + { + user = TCDB_UserDB.TCDB_GetUserInfo((int)(Session["userID"])); + } + catch + { + user = new TCDB_User(); + } + + Context.Items.Add("user", user); + } + + } +</script> Modified: Website/Includes/ActionItems.ascx =================================================================== --- Website/Includes/ActionItems.ascx 2006-07-11 17:05:34 UTC (rev 96) +++ Website/Includes/ActionItems.ascx 2006-07-11 19:32:56 UTC (rev 97) @@ -1 +1,3 @@ <%@ Control Language="C#" AutoEventWireup="true" %> +<%@ Import Namespace="TCDB_Users" %> +<script runat="server">TCDB_User g_user = TCDB_UserDB.TCDB_GetUserInstance();</script> Modified: Website/Includes/AdministrationTree.ascx =================================================================== --- Website/Includes/AdministrationTree.ascx 2006-07-11 17:05:34 UTC (rev 96) +++ Website/Includes/AdministrationTree.ascx 2006-07-11 19:32:56 UTC (rev 97) @@ -1,4 +1,6 @@ <%@ Control Language="C#" ClassName="AdministrationTree" %> +<%@ Import Namespace="TCDB_Users" %> +<script runat="server">TCDB_User g_user = TCDB_UserDB.TCDB_GetUserInstance();</script> <script runat="server"> Modified: Website/Includes/Assignments.ascx =================================================================== --- Website/Includes/Assignments.ascx 2006-07-11 17:05:34 UTC (rev 96) +++ Website/Includes/Assignments.ascx 2006-07-11 19:32:56 UTC (rev 97) @@ -1 +1,3 @@ <%@ Control Language="C#" AutoEventWireup="true" %> +<%@ Import Namespace="TCDB_Users" %> +<script runat="server">TCDB_User g_user = TCDB_UserDB.TCDB_GetUserInstance();</script> Modified: Website/Includes/AssignmentsTree.ascx =================================================================== --- Website/Includes/AssignmentsTree.ascx 2006-07-11 17:05:34 UTC (rev 96) +++ Website/Includes/AssignmentsTree.ascx 2006-07-11 19:32:56 UTC (rev 97) @@ -4,8 +4,8 @@ <%@ Import Namespace="System.Collections.Generic" %> <%@ Import Namespace="TCDB_Assignments" %> <%@ Import Namespace="TCDB_Users" %> +<script runat="server">TCDB_User g_user = TCDB_UserDB.TCDB_GetUserInstance();</script> - <script runat="server"> protected void Page_Load(object sender, EventArgs e) @@ -24,11 +24,6 @@ protected void AssignmentsTree_TreeNodePopulate(object sender, TreeNodeEventArgs e) { - TreeView tv = (TreeView)sender; - DataSet ResultsDataSet = new DataSet(); - SqlDataAdapter DBAdapter; - String query; - // Call the appropriate method to populate a node at a particular level. switch (e.Node.Depth) { @@ -46,7 +41,7 @@ priv... [truncated message content] |
|
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. |
|
From: <m_h...@us...> - 2006-07-11 22:27:12
|
Revision: 101 Author: m_hildebrand Date: 2006-07-11 15:27:04 -0700 (Tue, 11 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=101&view=rev Log Message: ----------- Finished authentication stuff and started work on Assignments Modified Paths: -------------- Website/App_Code/TCDB_Common.cs Website/App_Code/TCDB_Users.cs Website/App_Code/dadDataSet.xsd Website/Global.asax Website/Includes/Assignments.ascx Website/Includes/AssignmentsTree.ascx Website/Includes/Authenticate.ascx Website/Includes/Header.ascx Website/TCDB.master Website/web.config Modified: Website/App_Code/TCDB_Common.cs =================================================================== --- Website/App_Code/TCDB_Common.cs 2006-07-11 21:36:18 UTC (rev 100) +++ Website/App_Code/TCDB_Common.cs 2006-07-11 22:27:04 UTC (rev 101) @@ -31,6 +31,10 @@ public static string USER_ANONYMOUSCELLPHONE = ""; public static bool USER_ANONYMOUSAUTOMATION = false; + public static string CODE_USER = "u"; + public static string CODE_AI = "ai"; + public static string CODE_WO = "wo"; + public static string USER_AI_NAME = "Assign permissions: "; public static string USER_AI_DESCRIPTION = "Please assign appropriate permissions for new user: "; Modified: Website/App_Code/TCDB_Users.cs =================================================================== --- Website/App_Code/TCDB_Users.cs 2006-07-11 21:36:18 UTC (rev 100) +++ Website/App_Code/TCDB_Users.cs 2006-07-11 22:27:04 UTC (rev 101) @@ -10,7 +10,6 @@ using System.Web.UI.WebControls; using System.Web.UI.WebControls.WebParts; using System.Web.UI.HtmlControls; - using System.Security; using System.Collections; using System.Collections.Generic; @@ -225,20 +224,6 @@ 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; Modified: Website/App_Code/dadDataSet.xsd =================================================================== --- Website/App_Code/dadDataSet.xsd 2006-07-11 21:36:18 UTC (rev 100) +++ Website/App_Code/dadDataSet.xsd 2006-07-11 22:27:04 UTC (rev 101) @@ -6,8 +6,6 @@ <Connections> <Connection AppSettingsObjectName="Web.config" AppSettingsPropertyName="dadConnectionString" ConnectionStringObject="" IsAppSettingsProperty="True" Modifier="Assembly" Name="dadConnectionString (Web.config)" ParameterPrefix="@" PropertyReference="AppConfig.System.Configuration.ConfigurationManager.0.ConnectionStrings.dadConnectionString.ConnectionString" Provider="System.Data.SqlClient"> </Connection> - <Connection AppSettingsObjectName="Web.config" AppSettingsPropertyName="tcdbConnectionString" ConnectionStringObject="" IsAppSettingsProperty="True" Modifier="Assembly" Name="tcdbConnectionString (Web.config)" ParameterPrefix="@" PropertyReference="AppConfig.System.Configuration.ConfigurationManager.0.ConnectionStrings.tcdbConnectionString.ConnectionString" Provider="System.Data.SqlClient"> - </Connection> </Connections> <Tables> <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_usersTableAdapter" GeneratorDataComponentClassName="db_usersTableAdapter" Name="db_users" UserDataComponentName="db_usersTableAdapter"> @@ -267,7 +265,7 @@ </TableAdapter> <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_notesTableAdapter" GeneratorDataComponentClassName="db_notesTableAdapter" Name="db_notes" UserDataComponentName="db_notesTableAdapter"> <MainSource> - <DbSource ConnectionRef="tcdbConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_notes" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="False" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> + <DbSource ConnectionRef="dadConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_notes" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="False" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> <SelectCommand> <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> <CommandText>dbo.sel_notes</CommandText> @@ -294,7 +292,7 @@ </TableAdapter> <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_assignmentsTableAdapter" GeneratorDataComponentClassName="db_assignmentsTableAdapter" Name="db_assignments" UserDataComponentName="db_assignmentsTableAdapter"> <MainSource> - <DbSource ConnectionRef="tcdbConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_assignments" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="False" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> + <DbSource ConnectionRef="dadConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_assignments" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="False" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> <SelectCommand> <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> <CommandText>dbo.sel_assignments</CommandText> @@ -331,7 +329,6 @@ <Mapping SourceColumn="WOPass" DataSetColumn="WOPass" /> <Mapping SourceColumn="WOFail" DataSetColumn="WOFail" /> <Mapping SourceColumn="WOError" DataSetColumn="WOError" /> - <Mapping SourceColumn="aName" DataSetColumn="aName" /> </Mappings> <Sources> </Sources> @@ -524,7 +521,6 @@ </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"> @@ -532,13 +528,6 @@ </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> - </xs:element> <xs:element name="assigned" msdata:ReadOnly="true" msprop:Generator_UserColumnName="assigned" msprop:Generator_ColumnPropNameInRow="assigned" msprop:Generator_ColumnVarNameInTable="columnassigned" msprop:Generator_ColumnPropNameInTable="assignedColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> Modified: Website/Global.asax =================================================================== --- Website/Global.asax 2006-07-11 21:36:18 UTC (rev 100) +++ Website/Global.asax 2006-07-11 22:27:04 UTC (rev 101) @@ -1,4 +1,5 @@ <%@ Application Language="C#" %> +<%@ Import Namespace="TCDB_Common" %> <%@ Import Namespace="TCDB_Users" %> <script runat="server"> @@ -13,6 +14,7 @@ try { user = TCDB_UserDB.TCDB_GetUserInfo((int)(Session["userID"])); + if (user.ID != TCDB_Constant.USER_ANONYMOUSUSERID) user.ISAUTHENTICATED = true; } catch { Modified: Website/Includes/Assignments.ascx =================================================================== --- Website/Includes/Assignments.ascx 2006-07-11 21:36:18 UTC (rev 100) +++ Website/Includes/Assignments.ascx 2006-07-11 22:27:04 UTC (rev 101) @@ -1,11 +1,14 @@ <%@ Control Language="C#" AutoEventWireup="true" %> +<%@ Import Namespace="System.Collections.Generic" %> <%@ Import Namespace="System.Data" %> <%@ Import Namespace="System.Data.SqlClient" %> +<%@ Import Namespace="TCDB_Assignments" %> +<%@ Import Namespace="TCDB_Common" %> -<script runat=server> +<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) { /* @@ -34,95 +37,102 @@ private void filter(GridViewRow gRow) { - if (gRow.RowType == DataControlRowType.DataRow) + if (gRow.RowType != DataControlRowType.DataRow) { - DataRowView data = (DataRowView)gRow.DataItem; - if (data != null) - { - GridView1.Visible = true; - gRow.Visible = true; + return; + } + + DataRowView data = (DataRowView)gRow.DataItem; + if (data == null) + { + return; + } + + AssignmentsGridView.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 priority image + bool priority = Convert.ToBoolean(data["highPriority"].ToString()); + if (priority) + gRow.Cells[0].Text = "<div class=\"normal_priority\" />"; + else + gRow.Cells[0].Text = "<div class=\"high_priority\" />"; - // 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>"; + // 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?ai=" + id + "\">" + name + "</a>"; + else if (type == TCDB_Common.TCDB_Constant.ASSIGNMENT_TYPE_WORKORDER) + gRow.Cells[1].Text = "<a href=\"WorkOrder.aspx?wo=" + 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") + if (cboPriorityFilter.Checked) + { + switch (priority) + { + case true: + if (!cboHighPriority.Checked) gRow.Visible = false; - else if (!cboFilterStarted.Checked && status == "Started") + break; + case false: + if (!cboLowPriority.Checked) 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; + break; + } + } - 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; + 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) + AssignmentsGridView.Visible = true; + else + AssignmentsGridView.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 && cboFinishedFilter.Checked) - { - DateTime dateAssigned = Convert.ToDateTime(data["dateAssigned"]); - DateTime to = toFinishedDate.DateValue; - DateTime from = fromFinishedDate.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 ((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) + protected void AssignmentsGridView_RowDataBound(object sender, GridViewRowEventArgs e) { filter(e.Row); } @@ -139,7 +149,7 @@ { cboFilterCompleted.Checked = false; } - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } protected void cboStatusFilter_CheckedChanged(object sender, EventArgs e) { @@ -157,15 +167,15 @@ cboFilterStarted.Enabled = false; cboFilterInactive.Enabled = false; } - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } protected void cboFilterStarted_CheckedChanged(object sender, EventArgs e) { - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } protected void cboFilterNotStarted_CheckedChanged(object sender, EventArgs e) { - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } protected void cboFilterCompleted_CheckedChanged(object sender, EventArgs e) { @@ -173,11 +183,11 @@ cboShowCompleted.Checked = true; else cboShowCompleted.Checked = false; - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } protected void cboFilterInactive_CheckedChanged(object sender, EventArgs e) { - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } protected void cboTypeFilter_CheckedChanged(object sender, EventArgs e) { @@ -191,22 +201,22 @@ cboShowActionItems.Enabled = false; cboShowWorkOrders.Enabled = false; } - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } protected void cboShowActionItems_CheckedChanged(object sender, EventArgs e) { - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } protected void cboShowWorkOrders_CheckedChanged(object sender, EventArgs e) { - GridView1.DataBind(); + AssignmentsGridView.DataBind(); }/* protected void fromDate_PreRender(object sender, EventArgs e) { if (curFromDate != fromDate.DateValue) { curFromDate = fromDate.DateValue; - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } } protected void toDate_PreRender(object sender, EventArgs e) @@ -214,7 +224,7 @@ if (curToDate != toDate.DateValue) { curToDate = toDate.DateValue; - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } } protected void cboDateFilter_CheckedChanged(object sender, EventArgs e) @@ -229,14 +239,14 @@ toDate.Enabled = false; fromDate.Enabled = false; } - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } protected void fromDueDate_PreRender(object sender, EventArgs e) { if (curFromDueDate != fromDueDate.DateValue) { curFromDueDate = fromDueDate.DateValue; - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } } protected void toDueDate_PreRender(object sender, EventArgs e) @@ -244,7 +254,7 @@ if (curToDueDate != toDueDate.DateValue) { curToDueDate = toDueDate.DateValue; - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } } protected void fromFinishedDate_PreRender(object sender, EventArgs e) @@ -252,7 +262,7 @@ if (curFromFinishedDate != fromFinishedDate.DateValue) { curFromFinishedDate = fromFinishedDate.DateValue; - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } } protected void toFinishedDate_PreRender(object sender, EventArgs e) @@ -260,7 +270,7 @@ if (curToFinishedDate != toFinishedDate.DateValue) { curToFinishedDate = toFinishedDate.DateValue; - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } } protected void cboDueFilter_CheckedChanged(object sender, EventArgs e) @@ -275,7 +285,7 @@ toDueDate.Enabled = false; fromDueDate.Enabled = false; } - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } protected void cboFinishedFilter_CheckedChanged(object sender, EventArgs e) { @@ -289,7 +299,7 @@ toFinishedDate.Enabled = false; fromFinishedDate.Enabled = false; } - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } protected void fromDate_Init(object sender, EventArgs e) @@ -316,22 +326,24 @@ cboHighPriority.Enabled = false; cboLowPriority.Enabled = false; } - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } protected void cboHighPriority_CheckedChanged(object sender, EventArgs e) { - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } protected void cboLowPriority_CheckedChanged(object sender, EventArgs e) { - GridView1.DataBind(); + AssignmentsGridView.DataBind(); } + + </script> <table width="100%"> <tr> - <td align=center> + <td align="center"> <div id="MyAssignments"> <table width="100%" cellpadding="0" cellspacing="0" border="0"> <tr> @@ -339,7 +351,7 @@ <h2> My Assignments</h2> </td> - <td align="right" valign="bottom" style="padding-right: 20px;"> + <td align="right" valign="bottom" style="padding-right: 20px; width: 513px;"> <asp:CheckBox ID="cboShowCompleted" runat="server" Text="Show Completed" TextAlign="Left" AutoPostBack="true" OnCheckedChanged="cboShowCompleted_CheckedChanged" /></td> </tr> @@ -351,8 +363,17 @@ <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%" > + <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> + <asp:GridView ID="AssignmentsGridView" runat="server" GridLines="None" AllowPaging="True" AllowSorting="True" + AutoGenerateColumns="False" RowStyle-CssClass="gridhover" DataSourceID="AssignmentDataSource" OnRowDataBound="AssignmentsGridView_RowDataBound" Width="100%" > <Columns> <asp:ImageField DataImageUrlField="highPriority" ShowHeader="False"> </asp:ImageField> @@ -384,15 +405,6 @@ </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> Modified: Website/Includes/AssignmentsTree.ascx =================================================================== --- Website/Includes/AssignmentsTree.ascx 2006-07-11 21:36:18 UTC (rev 100) +++ Website/Includes/AssignmentsTree.ascx 2006-07-11 22:27:04 UTC (rev 101) @@ -3,15 +3,12 @@ <%@ Import Namespace="System.Data" %> <%@ Import Namespace="System.Collections.Generic" %> <%@ Import Namespace="TCDB_Assignments" %> +<%@ Import Namespace="TCDB_Common" %> <%@ Import Namespace="TCDB_Users" %> <script runat="server">TCDB_User g_user = TCDB_UserDB.TCDB_GetUserInstance();</script> <script runat="server"> - protected void Page_Load(object sender, EventArgs e) - { - } - public void updateTree() { foreach (TreeNode node in AssignmentsTree.Nodes) @@ -24,9 +21,6 @@ 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) { @@ -56,13 +50,13 @@ if (a.ISACTIONITEM) { child.Value = a.ACTIONITEM.ID.ToString(); - child.NavigateUrl = "~/ActionItem.aspx?id="+child.Value; + child.NavigateUrl = "~/ActionItem.aspx?" + TCDB_Constant.CODE_AI + "=" + child.Value; } else { // TODO: Enable this! child.Value = a.WORKORDER.ID.ToString(); - child.NavigateUrl = "~/WorkOrder.aspx?id="+child.Value; + child.NavigateUrl = "~/WorkOrder.aspx?" + TCDB_Constant.CODE_WO + "=" + child.Value; } // Set the PopulateOnDemand property to true so that the child nodes can be @@ -87,26 +81,23 @@ { foreach (TCDB_User u in userList) { - if (u.USERNAME == "jjohnson") - { - // Create the new child node. - TreeNode child = new TreeNode(); - child.Text = u.FULLNAME; - child.Value = u.ID.ToString(); + // 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; + // Set the PopulateOnDemand property to true so that the child nodes can be + // dynamically populated. + child.PopulateOnDemand = true; - // 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; + // 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?" + TCDB_Constant.CODE_USER + "=" + child.Value; - // Add the new child node to the ChildNodes collection of the parent node. - parent.ChildNodes.Add(child); - } + // Add the new child node to the ChildNodes collection of the parent node. + parent.ChildNodes.Add(child); } } } Modified: Website/Includes/Authenticate.ascx =================================================================== --- Website/Includes/Authenticate.ascx 2006-07-11 21:36:18 UTC (rev 100) +++ Website/Includes/Authenticate.ascx 2006-07-11 22:27:04 UTC (rev 101) @@ -80,7 +80,7 @@ } else { - int i = 1; + // TODO: Create this error message //ErrorLabel.Text = "Error logging in. Please try again."; } } @@ -111,6 +111,7 @@ // TODO: after implementing the commented out section, default admin = null TCDB_User admin = product.QALEAD; /* + // TODO: What happens if there is more than one user with this right? if (product.QALEAD.GetRights().HasRight(TCDB_Constant.RIGHTS_ASSIGNPERMISSION, product)) { admin = product.QALEAD; @@ -126,8 +127,9 @@ */ // Send an action item - TCDB_ActionItem ai = new TCDB_ActionItem(0, TCDB_Constant.USER_AI_NAME + newUser.FIRSTNAME, - TCDB_Constant.USER_AI_DESCRIPTION + newUser.FULLNAME, admin, newUser, 0); + + TCDB_ActionItem ai = new TCDB_ActionItem(0, TCDB_Constant.USER_AI_NAME + newUser.FIRSTNAME, + TCDB_Constant.USER_AI_DESCRIPTION + newUser.FULLNAME, newUser, admin, 0); if (!TCDB_ActionItemDB.TCDB_SaveActionItem(ai)) { // TODO: Populate the results control with text from the DB Modified: Website/Includes/Header.ascx =================================================================== --- Website/Includes/Header.ascx 2006-07-11 21:36:18 UTC (rev 100) +++ Website/Includes/Header.ascx 2006-07-11 22:27:04 UTC (rev 101) @@ -6,20 +6,10 @@ <%@ Import Namespace="TCDB_Users" %> <script runat="server">TCDB_User g_user = TCDB_UserDB.TCDB_GetUserInstance();</script> -<script runat="server"> - -</script> - <div id="Logo"></div> <% 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"> Modified: Website/TCDB.master =================================================================== --- Website/TCDB.master 2006-07-11 21:36:18 UTC (rev 100) +++ Website/TCDB.master 2006-07-11 22:27:04 UTC (rev 101) @@ -17,7 +17,8 @@ <div id="HeaderContent"> <TCDB:Header runat="server" id="Header" /> </div> - <% if (g_user.ISAUTHENTICATED) + <% + if (g_user.ISAUTHENTICATED) { %> <div id="TreeContent"> <asp:ContentPlaceHolder ID="TreeContentPlaceHolder" runat="server"> Modified: Website/web.config =================================================================== --- Website/web.config 2006-07-11 21:36:18 UTC (rev 100) +++ Website/web.config 2006-07-11 22:27:04 UTC (rev 101) @@ -47,8 +47,6 @@ <connectionStrings> <add name="dadConnectionString" connectionString="Data Source=dad\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw" providerName="System.Data.SqlClient" /> - <add name="tcdbConnectionString" connectionString="Data Source=dad\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=sa;Password=Test123" - providerName="System.Data.SqlClient" /> </connectionStrings> <system.web> <authentication mode="Forms"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ro...@us...> - 2006-07-12 15:22:53
|
Revision: 104 Author: rouquin Date: 2006-07-12 08:22:44 -0700 (Wed, 12 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=104&view=rev Log Message: ----------- Small changes to assignments and started editing ActionItems Modified Paths: -------------- Website/ActionItem.aspx Website/App_Code/dadDataSet.xsd Website/Includes/ActionItems.ascx Website/Includes/Assignments.ascx Website/Includes/AssignmentsTree.ascx Website/web.config Modified: Website/ActionItem.aspx =================================================================== --- Website/ActionItem.aspx 2006-07-12 01:25:33 UTC (rev 103) +++ Website/ActionItem.aspx 2006-07-12 15:22:44 UTC (rev 104) @@ -1,7 +1,12 @@ <%@ Page Language="C#" MasterPageFile="~/TCDB.master" AutoEventWireup="true" Title="Untitled Page" %> -<asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" Runat="Server"> + +<%@ Register Src="~/Includes/AssignmentsTree.ascx" TagPrefix="assignment" TagName="Tree" %> +<%@ Register Src="~/Includes/ActionItems.ascx" TagPrefix="assignment" TagName="ActionItem" %> +<asp:Content ID="TreeContent" ContentPlaceHolderID="TreeContentPlaceHolder" runat="Server"> + <assignment:Tree runat="server" ID="Tree" /> </asp:Content> -<asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" Runat="Server"> +<asp:Content ID="MainContent" ContentPlaceHolderID="MainContentPlaceHolder" runat="Server"> + <assignment:ActionItem runat="server" ID="ActionItem" /> </asp:Content> -<asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" Runat="Server"> +<asp:Content ID="NotesContent" ContentPlaceHolderID="NotesContentPlaceHolder" runat="Server"> </asp:Content> Modified: Website/App_Code/dadDataSet.xsd =================================================================== --- Website/App_Code/dadDataSet.xsd 2006-07-12 01:25:33 UTC (rev 103) +++ Website/App_Code/dadDataSet.xsd 2006-07-12 15:22:44 UTC (rev 104) @@ -345,146 +345,146 @@ <xs:element name="db_users" msprop:Generator_UserTableName="db_users" msprop:Generator_RowDeletedName="db_usersRowDeleted" msprop:Generator_RowChangedName="db_usersRowChanged" msprop:Generator_RowClassName="db_usersRow" msprop:Generator_RowChangingName="db_usersRowChanging" msprop:Generator_RowEvArgName="db_usersRowChangeEvent" msprop:Generator_RowEvHandlerName="db_usersRowChangeEventHandler" msprop:Generator_TableClassName="db_usersDataTable" msprop:Generator_TableVarName="tabledb_users" msprop:Generator_RowDeletingName="db_usersRowDeleting" msprop:Generator_TablePropName="db_users"> <xs:complexType> <xs:sequence> - <xs:element name="userID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="userID" msprop:Generator_ColumnPropNameInRow="userID" msprop:Generator_ColumnVarNameInTable="columnuserID" msprop:Generator_ColumnPropNameInTable="userIDColumn" type="xs:int" /> - <xs:element name="username" msprop:Generator_UserColumnName="username" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_ColumnVarNameInTable="columnusername" msprop:Generator_ColumnPropNameInTable="usernameColumn"> + <xs:element name="userID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="userID" msprop:Generator_ColumnVarNameInTable="columnuserID" msprop:Generator_ColumnPropNameInRow="userID" msprop:Generator_ColumnPropNameInTable="userIDColumn" type="xs:int" /> + <xs:element name="username" msprop:Generator_UserColumnName="username" msprop:Generator_ColumnVarNameInTable="columnusername" msprop:Generator_ColumnPropNameInRow="username" msprop:Generator_ColumnPropNameInTable="usernameColumn"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="50" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="email" msprop:Generator_UserColumnName="email" msprop:Generator_ColumnPropNameInRow="email" msprop:Generator_ColumnVarNameInTable="columnemail" msprop:Generator_ColumnPropNameInTable="emailColumn"> + <xs:element name="email" msprop:Generator_UserColumnName="email" msprop:Generator_ColumnVarNameInTable="columnemail" msprop:Generator_ColumnPropNameInRow="email" msprop:Generator_ColumnPropNameInTable="emailColumn"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="50" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="officePhone" msprop:Generator_UserColumnName="officePhone" msprop:Generator_ColumnPropNameInRow="officePhone" msprop:Generator_ColumnVarNameInTable="columnofficePhone" msprop:Generator_ColumnPropNameInTable="officePhoneColumn" minOccurs="0"> + <xs:element name="officePhone" msprop:Generator_UserColumnName="officePhone" msprop:Generator_ColumnVarNameInTable="columnofficePhone" msprop:Generator_ColumnPropNameInRow="officePhone" msprop:Generator_ColumnPropNameInTable="officePhoneColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="14" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="homePhone" msprop:Generator_UserColumnName="homePhone" msprop:Generator_ColumnPropNameInRow="homePhone" msprop:Generator_ColumnVarNameInTable="columnhomePhone" msprop:Generator_ColumnPropNameInTable="homePhoneColumn" minOccurs="0"> + <xs:element name="homePhone" msprop:Generator_UserColumnName="homePhone" msprop:Generator_ColumnVarNameInTable="columnhomePhone" msprop:Generator_ColumnPropNameInRow="homePhone" msprop:Generator_ColumnPropNameInTable="homePhoneColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="14" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="cellPhone" msprop:Generator_UserColumnName="cellPhone" msprop:Generator_ColumnPropNameInRow="cellPhone" msprop:Generator_ColumnVarNameInTable="columncellPhone" msprop:Generator_ColumnPropNameInTable="cellPhoneColumn" minOccurs="0"> + <xs:element name="cellPhone" msprop:Generator_UserColumnName="cellPhone" msprop:Generator_ColumnVarNameInTable="columncellPhone" msprop:Generator_ColumnPropNameInRow="cellPhone" msprop:Generator_ColumnPropNameInTable="cellPhoneColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="14" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="firstName" msprop:Generator_UserColumnName="firstName" msprop:Generator_ColumnPropNameInRow="firstName" msprop:Generator_ColumnVarNameInTable="columnfirstName" msprop:Generator_ColumnPropNameInTable="firstNameColumn"> + <xs:element name="firstName" msprop:Generator_UserColumnName="firstName" msprop:Generator_ColumnVarNameInTable="columnfirstName" msprop:Generator_ColumnPropNameInRow="firstName" msprop:Generator_ColumnPropNameInTable="firstNameColumn"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="24" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="lastName" msprop:Generator_UserColumnName="lastName" msprop:Generator_ColumnPropNameInRow="lastName" msprop:Generator_ColumnVarNameInTable="columnlastName" msprop:Generator_ColumnPropNameInTable="lastNameColumn"> + <xs:element name="lastName" msprop:Generator_UserColumnName="lastName" msprop:Generator_ColumnVarNameInTable="columnlastName" msprop:Generator_ColumnPropNameInRow="lastName" msprop:Generator_ColumnPropNameInTable="lastNameColumn"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="24" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="fullName" msdata:ReadOnly="true" msprop:Generator_UserColumnName="fullName" msprop:Generator_ColumnPropNameInRow="fullName" msprop:Generator_ColumnVarNameInTable="columnfullName" msprop:Generator_ColumnPropNameInTable="fullNameColumn" minOccurs="0"> + <xs:element name="fullName" msdata:ReadOnly="true" msprop:Generator_UserColumnName="fullName" msprop:Generator_ColumnVarNameInTable="columnfullName" msprop:Generator_ColumnPropNameInRow="fullName" msprop:Generator_ColumnPropNameInTable="fullNameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="49" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="automation" msprop:Generator_UserColumnName="automation" msprop:Generator_ColumnPropNameInRow="automation" msprop:Generator_ColumnVarNameInTable="columnautomation" msprop:Generator_ColumnPropNameInTable="automationColumn" type="xs:boolean" /> + <xs:element name="automation" msprop:Generator_UserColumnName="automation" msprop:Generator_ColumnVarNameInTable="columnautomation" msprop:Generator_ColumnPropNameInRow="automation" msprop:Generator_ColumnPropNameInTable="automationColumn" type="xs:boolean" /> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="db_products" msprop:Generator_UserTableName="db_products" msprop:Generator_RowDeletedName="db_productsRowDeleted" msprop:Generator_RowChangedName="db_productsRowChanged" msprop:Generator_RowClassName="db_productsRow" msprop:Generator_RowChangingName="db_productsRowChanging" msprop:Generator_RowEvArgName="db_productsRowChangeEvent" msprop:Generator_RowEvHandlerName="db_productsRowChangeEventHandler" msprop:Generator_TableClassName="db_productsDataTable" msprop:Generator_TableVarName="tabledb_products" msprop:Generator_RowDeletingName="db_productsRowDeleting" msprop:Generator_TablePropName="db_products"> <xs:complexType> <xs:sequence> - <xs:element name="productID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="productID" msprop:Generator_ColumnPropNameInRow="productID" msprop:Generator_ColumnVarNameInTable="columnproductID" msprop:Generator_ColumnPropNameInTable="productIDColumn" type="xs:int" /> - <xs:element name="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInTable="nameColumn" minOccurs="0"> + <xs:element name="productID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="productID" msprop:Generator_ColumnVarNameInTable="columnproductID" msprop:Generator_ColumnPropNameInRow="productID" msprop:Generator_ColumnPropNameInTable="productIDColumn" type="xs:int" /> + <xs:element name="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnPropNameInTable="nameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="255" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="description" msprop:Generator_UserColumnName="description" msprop:Generator_ColumnPropNameInRow="description" msprop:Generator_ColumnVarNameInTable="columndescription" msprop:Generator_ColumnPropNameInTable="descriptionColumn" minOccurs="0"> + <xs:element name="description" msprop:Generator_UserColumnName="description" msprop:Generator_ColumnVarNameInTable="columndescription" msprop:Generator_ColumnPropNameInRow="description" msprop:Generator_ColumnPropNameInTable="descriptionColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="2147483647" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="devManager" msprop:Generator_UserColumnName="devManager" msprop:Generator_ColumnPropNameInRow="devManager" msprop:Generator_ColumnVarNameInTable="columndevManager" msprop:Generator_ColumnPropNameInTable="devManagerColumn" type="xs:int" minOccurs="0" /> - <xs:element name="qaManager" msprop:Generator_UserColumnName="qaManager" msprop:Generator_ColumnPropNameInRow="qaManager" msprop:Generator_ColumnVarNameInTable="columnqaManager" msprop:Generator_ColumnPropNameInTable="qaManagerColumn" type="xs:int" minOccurs="0" /> - <xs:element name="devLead" msprop:Generator_UserColumnName="devLead" msprop:Generator_ColumnPropNameInRow="devLead" msprop:Generator_ColumnVarNameInTable="columndevLead" msprop:Generator_ColumnPropNameInTable="devLeadColumn" type="xs:int" minOccurs="0" /> - <xs:element name="qaLead" msprop:Generator_UserColumnName="qaLead" msprop:Generator_ColumnPropNameInRow="qaLead" msprop:Generator_ColumnVarNameInTable="columnqaLead" msprop:Generator_ColumnPropNameInTable="qaLeadColumn" type="xs:int" minOccurs="0" /> - <xs:element name="pm" msprop:Generator_UserColumnName="pm" msprop:Generator_ColumnPropNameInRow="pm" msprop:Generator_ColumnVarNameInTable="columnpm" msprop:Generator_ColumnPropNameInTable="pmColumn" type="xs:int" minOccurs="0" /> - <xs:element name="codeName" msprop:Generator_UserColumnName="codeName" msprop:Generator_ColumnPropNameInRow="codeName" msprop:Generator_ColumnVarNameInTable="columncodeName" msprop:Generator_ColumnPropNameInTable="codeNameColumn" minOccurs="0"> + <xs:element name="devManager" msprop:Generator_UserColumnName="devManager" msprop:Generator_ColumnVarNameInTable="columndevManager" msprop:Generator_ColumnPropNameInRow="devManager" msprop:Generator_ColumnPropNameInTable="devManagerColumn" type="xs:int" minOccurs="0" /> + <xs:element name="qaManager" msprop:Generator_UserColumnName="qaManager" msprop:Generator_ColumnVarNameInTable="columnqaManager" msprop:Generator_ColumnPropNameInRow="qaManager" msprop:Generator_ColumnPropNameInTable="qaManagerColumn" type="xs:int" minOccurs="0" /> + <xs:element name="devLead" msprop:Generator_UserColumnName="devLead" msprop:Generator_ColumnVarNameInTable="columndevLead" msprop:Generator_ColumnPropNameInRow="devLead" msprop:Generator_ColumnPropNameInTable="devLeadColumn" type="xs:int" minOccurs="0" /> + <xs:element name="qaLead" msprop:Generator_UserColumnName="qaLead" msprop:Generator_ColumnVarNameInTable="columnqaLead" msprop:Generator_ColumnPropNameInRow="qaLead" msprop:Generator_ColumnPropNameInTable="qaLeadColumn" type="xs:int" minOccurs="0" /> + <xs:element name="pm" msprop:Generator_UserColumnName="pm" msprop:Generator_ColumnVarNameInTable="columnpm" msprop:Generator_ColumnPropNameInRow="pm" msprop:Generator_ColumnPropNameInTable="pmColumn" type="xs:int" minOccurs="0" /> + <xs:element name="codeName" msprop:Generator_UserColumnName="codeName" msprop:Generator_ColumnVarNameInTable="columncodeName" msprop:Generator_ColumnPropNameInRow="codeName" msprop:Generator_ColumnPropNameInTable="codeNameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="10" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="active" msprop:Generator_UserColumnName="active" msprop:Generator_ColumnPropNameInRow="active" msprop:Generator_ColumnVarNameInTable="columnactive" msprop:Generator_ColumnPropNameInTable="activeColumn" type="xs:boolean" /> + <xs:element name="active" msprop:Generator_UserColumnName="active" msprop:Generator_ColumnVarNameInTable="columnactive" msprop:Generator_ColumnPropNameInRow="active" msprop:Generator_ColumnPropNameInTable="activeColumn" type="xs:boolean" /> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="db_actionItems" msprop:Generator_UserTableName="db_actionItems" msprop:Generator_RowDeletedName="db_actionItemsRowDeleted" msprop:Generator_RowChangedName="db_actionItemsRowChanged" msprop:Generator_RowClassName="db_actionItemsRow" msprop:Generator_RowChangingName="db_actionItemsRowChanging" msprop:Generator_RowEvArgName="db_actionItemsRowChangeEvent" msprop:Generator_RowEvHandlerName="db_actionItemsRowChangeEventHandler" msprop:Generator_TableClassName="db_actionItemsDataTable" msprop:Generator_TableVarName="tabledb_actionItems" msprop:Generator_RowDeletingName="db_actionItemsRowDeleting" msprop:Generator_TablePropName="db_actionItems"> <xs:complexType> <xs:sequence> - <xs:element name="actionItemID" msprop:Generator_UserColumnName="actionItemID" msprop:Generator_ColumnVarNameInTable="columnactionItemID" msprop:Generator_ColumnPropNameInRow="actionItemID" msprop:Generator_ColumnPropNameInTable="actionItemIDColumn" type="xs:int" /> - <xs:element name="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnPropNameInTable="nameColumn" minOccurs="0"> + <xs:element name="actionItemID" msprop:Generator_UserColumnName="actionItemID" msprop:Generator_ColumnPropNameInRow="actionItemID" msprop:Generator_ColumnVarNameInTable="columnactionItemID" msprop:Generator_ColumnPropNameInTable="actionItemIDColumn" type="xs:int" /> + <xs:element name="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInTable="nameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="255" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="description" msprop:Generator_UserColumnName="description" msprop:Generator_ColumnVarNameInTable="columndescription" msprop:Generator_ColumnPropNameInRow="description" msprop:Generator_ColumnPropNameInTable="descriptionColumn" minOccurs="0"> + <xs:element name="description" msprop:Generator_UserColumnName="description" msprop:Generator_ColumnPropNameInRow="description" msprop:Generator_ColumnVarNameInTable="columndescription" msprop:Generator_ColumnPropNameInTable="descriptionColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="2147483647" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="dateAssigned" msprop:Generator_UserColumnName="dateAssigned" msprop:Generator_ColumnVarNameInTable="columndateAssigned" msprop:Generator_ColumnPropNameInRow="dateAssigned" msprop:Generator_ColumnPropNameInTable="dateAssignedColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="dateDue" msprop:Generator_UserColumnName="dateDue" msprop:Generator_ColumnVarNameInTable="columndateDue" msprop:Generator_ColumnPropNameInRow="dateDue" msprop:Generator_ColumnPropNameInTable="dateDueColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="percentComplete" msprop:Generator_UserColumnName="percentComplete" msprop:Generator_ColumnVarNameInTable="columnpercentComplete" msprop:Generator_ColumnPropNameInRow="percentComplete" msprop:Generator_ColumnPropNameInTable="percentCompleteColumn" type="xs:int" minOccurs="0" /> - <xs:element name="statusName" msprop:Generator_UserColumnName="statusName" msprop:Generator_ColumnVarNameInTable="columnstatusName" msprop:Generator_ColumnPropNameInRow="statusName" msprop:Generator_ColumnPropNameInTable="statusNameColumn" minOccurs="0"> + <xs:element name="dateAssigned" msprop:Generator_UserColumnName="dateAssigned" msprop:Generator_ColumnPropNameInRow="dateAssigned" msprop:Generator_ColumnVarNameInTable="columndateAssigned" msprop:Generator_ColumnPropNameInTable="dateAssignedColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="dateDue" msprop:Generator_UserColumnName="dateDue" msprop:Generator_ColumnPropNameInRow="dateDue" msprop:Generator_ColumnVarNameInTable="columndateDue" msprop:Generator_ColumnPropNameInTable="dateDueColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="percentComplete" msprop:Generator_UserColumnName="percentComplete" msprop:Generator_ColumnPropNameInRow="percentComplete" msprop:Generator_ColumnVarNameInTable="columnpercentComplete" msprop:Generator_ColumnPropNameInTable="percentCompleteColumn" type="xs:int" minOccurs="0" /> + <xs:element name="statusName" msprop:Generator_UserColumnName="statusName" msprop:Generator_ColumnPropNameInRow="statusName" msprop:Generator_ColumnVarNameInTable="columnstatusName" msprop:Generator_ColumnPropNameInTable="statusNameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="50" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="createdBy" msdata:ReadOnly="true" msprop:Generator_UserColumnName="createdBy" msprop:Generator_ColumnVarNameInTable="columncreatedBy" msprop:Generator_ColumnPropNameInRow="createdBy" msprop:Generator_ColumnPropNameInTable="createdByColumn" minOccurs="0"> + <xs:element name="createdBy" msdata:ReadOnly="true" msprop:Generator_UserColumnName="createdBy" msprop:Generator_ColumnPropNameInRow="createdBy" msprop:Generator_ColumnVarNameInTable="columncreatedBy" msprop:Generator_ColumnPropNameInTable="createdByColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="49" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="highPriority" msprop:Generator_UserColumnName="highPriority" msprop:Generator_ColumnVarNameInTable="columnhighPriority" msprop:Generator_ColumnPropNameInRow="highPriority" msprop:Generator_ColumnPropNameInTable="highPriorityColumn" type="xs:boolean" minOccurs="0" /> - <xs:element name="createdById" msprop:Generator_UserColumnName="createdById" msprop:Generator_ColumnVarNameInTable="columncreatedById" msprop:Generator_ColumnPropNameInRow="createdById" msprop:Generator_ColumnPropNameInTable="createdByIdColumn" type="xs:int" /> + <xs:element name="highPriority" msprop:Generator_UserColumnName="highPriority" msprop:Generator_ColumnPropNameInRow="highPriority" msprop:Generator_ColumnVarNameInTable="columnhighPriority" msprop:Generator_ColumnPropNameInTable="highPriorityColumn" type="xs:boolean" minOccurs="0" /> + <xs:element name="createdById" msprop:Generator_UserColumnName="createdById" msprop:Generator_ColumnPropNameInRow="createdById" msprop:Generator_ColumnVarNameInTable="columncreatedById" msprop:Generator_ColumnPropNameInTable="createdByIdColumn" type="xs:int" /> </xs:sequence> </xs:complexType> </xs:element> <xs:element name="db_status" msprop:Generator_UserTableName="db_status" msprop:Generator_RowDeletedName="db_statusRowDeleted" msprop:Generator_RowChangedName="db_statusRowChanged" msprop:Generator_RowClassName="db_statusRow" msprop:Generator_RowChangingName="db_statusRowChanging" msprop:Generator_RowEvArgName="db_statusRowChangeEvent" msprop:Generator_RowEvHandlerName="db_statusRowChangeEventHandler" msprop:Generator_TableClassName="db_statusDataTable" msprop:Generator_TableVarName="tabledb_status" msprop:Generator_RowDeletingName="db_statusRowDeleting" msprop:Generator_TablePropName="db_status"> <xs:complexType> <xs:sequence> - <xs:element name="statusID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="statusID" msprop:Generator_ColumnPropNameInRow="statusID" msprop:Generator_ColumnVarNameInTable="columnstatusID" msprop:Generator_ColumnPropNameInTable="statusIDColumn" type="xs:int" /> - <xs:element name="Description" msprop:Generator_UserColumnName="Description" msprop:Generator_ColumnPropNameInRow="Description" msprop:Generator_ColumnVarNameInTable="columnDescription" msprop:Generator_ColumnPropNameInTable="DescriptionColumn" minOccurs="0"> + <xs:element name="statusID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="statusID" msprop:Generator_ColumnVarNameInTable="columnstatusID" msprop:Generator_ColumnPropNameInRow="statusID" msprop:Generator_ColumnPropNameInTable="statusIDColumn" type="xs:int" /> + <xs:element name="Description" msprop:Generator_UserColumnName="Description" msprop:Generator_ColumnVarNameInTable="columnDescription" msprop:Generator_ColumnPropNameInRow="Description" msprop:Generator_ColumnPropNameInTable="DescriptionColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="2147483647" /> @@ -497,68 +497,68 @@ <xs:element name="db_notes" msprop:Generator_UserTableName="db_notes" msprop:Generator_RowDeletedName="db_notesRowDeleted" msprop:Generator_RowChangedName="db_notesRowChanged" msprop:Generator_RowClassName="db_notesRow" msprop:Generator_RowChangingName="db_notesRowChanging" msprop:Generator_RowEvArgName="db_notesRowChangeEvent" msprop:Generator_RowEvHandlerName="db_notesRowChangeEventHandler" msprop:Generator_TableClassName="db_notesDataTable" msprop:Generator_TableVarName="tabledb_notes" msprop:Generator_RowDeletingName="db_notesRowDeleting" msprop:Generator_TablePropName="db_notes"> <xs:complexType> <xs:sequence> - <xs:element name="noteID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="noteID" msprop:Generator_ColumnPropNameInRow="noteID" msprop:Generator_ColumnVarNameInTable="columnnoteID" msprop:Generator_ColumnPropNameInTable="noteIDColumn" type="xs:int" /> - <xs:element name="dateCreated" msprop:Generator_UserColumnName="dateCreated" msprop:Generator_ColumnPropNameInRow="dateCreated" msprop:Generator_ColumnVarNameInTable="columndateCreated" msprop:Generator_ColumnPropNameInTable="dateCreatedColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="noteField" msprop:Generator_UserColumnName="noteField" msprop:Generator_ColumnPropNameInRow="noteField" msprop:Generator_ColumnVarNameInTable="columnnoteField" msprop:Generator_ColumnPropNameInTable="noteFieldColumn" minOccurs="0"> + <xs:element name="noteID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="noteID" msprop:Generator_ColumnVarNameInTable="columnnoteID" msprop:Generator_ColumnPropNameInRow="noteID" msprop:Generator_ColumnPropNameInTable="noteIDColumn" type="xs:int" /> + <xs:element name="dateCreated" msprop:Generator_UserColumnName="dateCreated" msprop:Generator_ColumnVarNameInTable="columndateCreated" msprop:Generator_ColumnPropNameInRow="dateCreated" msprop:Generator_ColumnPropNameInTable="dateCreatedColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="noteField" msprop:Generator_UserColumnName="noteField" msprop:Generator_ColumnVarNameInTable="columnnoteField" msprop:Generator_ColumnPropNameInRow="noteField" msprop:Generator_ColumnPropNameInTable="noteFieldColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="2147483647" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="noteAuthor" msprop:Generator_UserColumnName="noteAuthor" msprop:Generator_ColumnPropNameInRow="noteAuthor" msprop:Generator_ColumnVarNameInTable="columnnoteAuthor" msprop:Generator_ColumnPropNameInTable="noteAuthorColumn" type="xs:int" minOccurs="0" /> + <xs:element name="noteAuthor" msprop:Generator_UserColumnName="noteAuthor" msprop:Generator_ColumnVarNameInTable="columnnoteAuthor" msprop:Generator_ColumnPropNameInRow="noteAuthor" msprop:Generator_ColumnPropNameInTable="noteAuthorColumn" type="xs:int" minOccurs="0" /> </xs:sequence> </xs:complexType> </xs:element> - <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: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: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"> + <xs:element name="aType" msdata:ReadOnly="true" msprop:Generator_UserColumnName="aType" msprop:Generator_ColumnVarNameInTable="columnaType" msprop:Generator_ColumnPropNameInRow="aType" msprop:Generator_ColumnPropNameInTable="aTypeColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="2" /> </xs:restriction> </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="creator" msdata:ReadOnly="true" msprop:Generator_UserColumnName="creator" msprop:Generator_ColumnPropNameInRow="creator" msprop:Generator_ColumnVarNameInTable="columncreator" msprop:Generator_ColumnPropNameInTable="creatorColumn" minOccurs="0"> + <xs:element name="childID" msdata:ReadOnly="true" msprop:Generator_UserColumnName="childID" msprop:Generator_ColumnVarNameInTable="columnchildID" msprop:Generator_ColumnPropNameInRow="childID" msprop:Generator_ColumnPropNameInTable="childIDColumn" type="xs:int" minOccurs="0" /> + <xs:element name="creator" msdata:ReadOnly="true" msprop:Generator_UserColumnName="creator" msprop:Generator_ColumnVarNameInTable="columncreator" msprop:Generator_ColumnPropNameInRow="creator" 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="assigned" msdata:ReadOnly="true" msprop:Generator_UserColumnName="assigned" msprop:Generator_ColumnPropNameInRow="assigned" msprop:Generator_ColumnVarNameInTable="columnassigned" msprop:Generator_ColumnPropNameInTable="assignedColumn" minOccurs="0"> + <xs:element name="assigned" msdata:ReadOnly="true" msprop:Generator_UserColumnName="assigned" msprop:Generator_ColumnVarNameInTable="columnassigned" msprop:Generator_ColumnPropNameInRow="assigned" msprop:Generator_ColumnPropNameInTable="assignedColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="49" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="assignedID" msprop:Generator_UserColumnName="assignedID" msprop:Generator_ColumnPropNameInRow="assignedID" msprop:Generator_ColumnVarNameInTable="columnassignedID" msprop:Generator_ColumnPropNameInTable="assignedIDColumn" type="xs:int" minOccurs="0" /> - <xs:element name="dateAssigned" msprop:Generator_UserColumnName="dateAssigned" msprop:Generator_ColumnPropNameInRow="dateAssigned" msprop:Generator_ColumnVarNameInTable="columndateAssigned" msprop:Generator_ColumnPropNameInTable="dateAssignedColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="dateDue" msprop:Generator_UserColumnName="dateDue" msprop:Generator_ColumnPropNameInRow="dateDue" msprop:Generator_ColumnVarNameInTable="columndateDue" msprop:Generator_ColumnPropNameInTable="dateDueColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="dateFinished" msprop:Generator_UserColumnName="dateFinished" msprop:Generator_ColumnPropNameInRow="dateFinished" msprop:Generator_ColumnVarNameInTable="columndateFinished" msprop:Generator_ColumnPropNameInTable="dateFinishedColumn" type="xs:dateTime" minOccurs="0" /> - <xs:element name="highPriority" msprop:Generator_UserColumnName="highPriority" msprop:Generator_ColumnPropNameInRow="highPriority" msprop:Generator_ColumnVarNameInTable="columnhighPriority" msprop:Generator_ColumnPropNameInTable="highPriorityColumn" type="xs:boolean" minOccurs="0" /> - <xs:element name="statusName" msprop:Generator_UserColumnName="statusName" msprop:Generator_ColumnPropNameInRow="statusName" msprop:Generator_ColumnVarNameInTable="columnstatusName" msprop:Generator_ColumnPropNameInTable="statusNameColumn" minOccurs="0"> + <xs:element name="assignedID" msprop:Generator_UserColumnName="assignedID" msprop:Generator_ColumnVarNameInTable="columnassignedID" msprop:Generator_ColumnPropNameInRow="assignedID" msprop:Generator_ColumnPropNameInTable="assignedIDColumn" type="xs:int" minOccurs="0" /> + <xs:element name="dateAssigned" msprop:Generator_UserColumnName="dateAssigned" msprop:Generator_ColumnVarNameInTable="columndateAssigned" msprop:Generator_ColumnPropNameInRow="dateAssigned" msprop:Generator_ColumnPropNameInTable="dateAssignedColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="dateDue" msprop:Generator_UserColumnName="dateDue" msprop:Generator_ColumnVarNameInTable="columndateDue" msprop:Generator_ColumnPropNameInRow="dateDue" msprop:Generator_ColumnPropNameInTable="dateDueColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="dateFinished" msprop:Generator_UserColumnName="dateFinished" msprop:Generator_ColumnVarNameInTable="columndateFinished" msprop:Generator_ColumnPropNameInRow="dateFinished" msprop:Generator_ColumnPropNameInTable="dateFinishedColumn" type="xs:dateTime" minOccurs="0" /> + <xs:element name="highPriority" msprop:Generator_UserColumnName="highPriority" msprop:Generator_ColumnVarNameInTable="columnhighPriority" msprop:Generator_ColumnPropNameInRow="highPriority" msprop:Generator_ColumnPropNameInTable="highPriorityColumn" type="xs:boolean" minOccurs="0" /> + <xs:element name="statusName" msprop:Generator_UserColumnName="statusName" msprop:Generator_ColumnVarNameInTable="columnstatusName" msprop:Generator_ColumnPropNameInRow="statusName" msprop:Generator_ColumnPropNameInTable="statusNameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="50" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="WOTotalTest" msprop:Generator_UserColumnName="WOTotalTest" msprop:Generator_ColumnPropNameInRow="WOTotalTest" msprop:Generator_ColumnVarNameInTable="columnWOTotalTest" msprop:Generator_ColumnPropNameInTable="WOTotalTestColumn" type="xs:int" minOccurs="0" /> - <xs:element name="WOPassRate" msdata:ReadOnly="true" msprop:Generator_UserColumnName="WOPassRate" msprop:Generator_ColumnPropNameInRow="WOPassRate" msprop:Generator_ColumnVarNameInTable="columnWOPassRate" msprop:Generator_ColumnPropNameInTable="WOPassRateColumn" minOccurs="0"> + <xs:element name="WOTotalTest" msprop:Generator_UserColumnName="WOTotalTest" msprop:Generator_ColumnVarNameInTable="columnWOTotalTest" msprop:Generator_ColumnPropNameInRow="WOTotalTest" msprop:Generator_ColumnPropNameInTable="WOTotalTestColumn" type="xs:int" minOccurs="0" /> + <xs:element name="WOPassRate" msdata:ReadOnly="true" msprop:Generator_UserColumnName="WOPassRate" msprop:Generator_ColumnVarNameInTable="columnWOPassRate" msprop:Generator_ColumnPropNameInRow="WOPassRate" msprop:Generator_ColumnPropNameInTable="WOPassRateColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="31" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="WOPass" msprop:Generator_UserColumnName="WOPass" msprop:Generator_ColumnPropNameInRow="WOPass" msprop:Generator_ColumnVarNameInTable="columnWOPass" msprop:Generator_ColumnPropNameInTable="WOPassColumn" type="xs:int" minOccurs="0" /> - <xs:element name="WOFail" msprop:Generator_UserColumnName="WOFail" msprop:Generator_ColumnPropNameInRow="WOFail" msprop:Generator_ColumnVarNameInTable="columnWOFail" msprop:Generator_ColumnPropNameInTable="WOFailColumn" type="xs:int" minOccurs="0" /> - <xs:element name="WOError" msprop:Generator_UserColumnName="WOError" msprop:Generator_ColumnPropNameInRow="WOError" msprop:Generator_ColumnVarNameInTable="columnWOError" msprop:Generator_ColumnPropNameInTable="WOErrorColumn" type="xs:int" minOccurs="0" /> - <xs:element name="aName" msdata:ReadOnly="true" msprop:Generator_UserColumnName="aName" msprop:Generator_ColumnPropNameInRow="aName" msprop:Generator_ColumnVarNameInTable="columnaName" msprop:Generator_ColumnPropNameInTable="aNameColumn" minOccurs="0"> + <xs:element name="WOPass" msprop:Generator_UserColumnName="WOPass" msprop:Generator_ColumnVarNameInTable="columnWOPass" msprop:Generator_ColumnPropNameInRow="WOPass" msprop:Generator_ColumnPropNameInTable="WOPassColumn" type="xs:int" minOccurs="0" /> + <xs:element name="WOFail" msprop:Generator_UserColumnName="WOFail" msprop:Generator_ColumnVarNameInTable="columnWOFail" msprop:Generator_ColumnPropNameInRow="WOFail" msprop:Generator_ColumnPropNameInTable="WOFailColumn" type="xs:int" minOccurs="0" /> + <xs:element name="WOError" msprop:Generator_UserColumnName="WOError" msprop:Generator_ColumnVarNameInTable="columnWOError" msprop:Generator_ColumnPropNameInRow="WOError" msprop:Generator_ColumnPropNameInTable="WOErrorColumn" type="xs:int" minOccurs="0" /> + <xs:element name="aName" msdata:ReadOnly="true" msprop:Generator_UserColumnName="aName" msprop:Generator_ColumnVarNameInTable="columnaName" msprop:Generator_ColumnPropNameInRow="aName" msprop:Generator_ColumnPropNameInTable="aNameColumn" minOccurs="0"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="255" /> @@ -593,4 +593,4 @@ <xs:field xpath="mstns:noteID" /> </xs:unique> </xs:element> -</xs:schema> +</xs:schema> \ No newline at end of file Modified: Website/Includes/ActionItems.ascx =================================================================== --- Website/Includes/ActionItems.ascx 2006-07-12 01:25:33 UTC (rev 103) +++ Website/Includes/ActionItems.ascx 2006-07-12 15:22:44 UTC (rev 104) @@ -1,3 +1,451 @@ <%@ Control Language="C#" AutoEventWireup="true" %> +<%@ Register Assembly="FreeTextBox" Namespace="FreeTextBoxControls" TagPrefix="FTB" %> +<%@ Import Namespace="System.Collections.Generic" %> +<%@ Import Namespace="System.Data" %> +<%@ Import Namespace="System.Data.SqlClient" %> +<%@ Import Namespace="TCDB_Assignments" %> +<%@ Import Namespace="TCDB_Common" %> <%@ Import Namespace="TCDB_Users" %> -<script runat="server">TCDB_User g_user = TCDB_UserDB.TCDB_GetUserInstance();</script> + +<script runat="server">TCDB_User g_user = TCDB_UserDB.TCDB_GetUserInstance(); +</script> + +<script runat=server> + String id = HttpContext.Current.Request.QueryString[TCDB_Constant.CODE_AI]; + String mode = HttpContext.Current.Request.QueryString["mode"]; + //bool priority; + + protected void Page_Load(object sender, EventArgs e) + { + if (id == null && mode == null) + Response.Redirect("Assignments.aspx"); + Session.Add("id", id); + + if (mode != null && mode == "new") + FormView1.ChangeMode(FormViewMode.Insert); + + //ImageButton priorityImg = (ImageButton)FormView1.FindControl("priorityImg"); + //if (priorityImg != null && priorityImg.ImageUrl == "Images/exclamation.jpg") + // priority = true; + + //ObjectDataSource notes = (ObjectDataSource)Master.FindControl("NoteDataSource"); + //notes.SelectParameters["tableName"].DefaultValue = "ActionItem"; + } + protected void RadioButtonList1_SelectedIndexChanged(object sender, EventArgs e) + { + /* + if (FormView1.CurrentMode != FormViewMode.Insert) + { + RadioButtonList percentList = (RadioButtonList)sender; + SqlCommand cmd = new SqlCommand("UPDATE ActionItem SET percentComplete="+percentList.SelectedValue+" WHERE actionItemID="+id, Master.DBConnection); + cmd.ExecuteNonQuery(); + + if (percentList.SelectedIndex == 4) + { + cmd.CommandText = "UPDATE Assignments SET dateFinished='" + DateTime.Today + "' WHERE actionItemID=" + id; + cmd.ExecuteNonQuery(); + } + else + { + cmd.CommandText = "UPDATE Assignments SET dateFinished=null WHERE actionItemID=" + id; + cmd.ExecuteNonQuery(); + } + FormView1.DataBind(); + } + * */ + } + protected void DropDownList1_SelectedIndexChanged(object sender, EventArgs e) + { + /* + if (FormView1.CurrentMode != FormViewMode.Insert) + { + DropDownList statusList = (DropDownList)sender; + SqlCommand cmd = new SqlCommand("UPDATE Assignments SET statusID=" + statusList.SelectedValue + " WHERE actionItemID=" + id, Master.DBConnection); + cmd.ExecuteNonQuery(); + FormView1.DataBind(); + } + * */ + } + + protected void FormView1_ItemUpdated(object sender, FormViewUpdatedEventArgs e) + { + /* + DatePicker dueDate = (DatePicker)FormView1.FindControl("dueDate"); + DropDownList assignedTo = (DropDownList)FormView1.FindControl("assignedTo"); + + SqlCommand cmd = new SqlCommand("UPDATE Assignments SET " + + "dateDue='" + dueDate.DateValue + + "',assignedID='" + assignedTo.SelectedValue + + "',highPriorityID='" + priority + + "' WHERE actionItemID=" + id, Master.DBConnection); + cmd.ExecuteNonQuery(); + + Master.updateTree(); + */ + } + protected void FormView1_ItemInserted(object sender, FormViewInsertedEventArgs e) + { + /* + Label createdBy = (Label)FormView1.FindControl("createdByLbl"); + Label dateAssigned = (Label)FormView1.FindControl("dateAssignedLbl"); + DatePicker dueDate = (DatePicker)FormView1.FindControl("dueDate"); + DropDownList assignedTo = (DropDownList)FormView1.FindControl("assignedTo"); + DropDownList statusList = (DropDownList)FormView1.FindControl("statusList"); + RadioButtonList percentList = (RadioButtonList)FormView1.FindControl("percentList"); + + // Get inserted ActionItem + SqlDataAdapter DBAdapter = new SqlDataAdapter("SELECT MAX(actionItemID) AS newID FROM ActionItem",Master.DBConnection); + DataSet data = new DataSet(); + DBAdapter.Fill(data); + id = data.Tables[0].Rows[0]["newID"].ToString(); + + String due = "null"; + + if (dueDate.DateValue != DateTime.MinValue) + due = "'" + dueDate.DateValue + "'"; + + SqlCommand cmd = new SqlCommand("INSERT INTO Assignments (actionItemID,dateAssigned,dateDue,creatorID,assignedID,statusID,highPriorityID) VALUES ('" + + id + "','" + + dateAssigned.Text + "'," + + due + "," + + createdBy.Attributes["id"] + "," + + assignedTo.SelectedValue + "," + + statusList.SelectedValue + ",'" + + priority + "')", Master.DBConnection); + cmd.ExecuteNonQuery(); + cmd.CommandText = "UPDATE ActionItem SET percentComplete=" + percentList.SelectedValue + " WHERE actionItemID=" + id; + cmd.ExecuteNonQuery(); + Master.updateTree(); + Response.Redirect("~/ActionItemEdit.aspx?id=" + id); + */ + } + protected void FormView1_ItemDeleted(object sender, FormViewDeletedEventArgs e) + { + /* + SqlCommand cmd = new SqlCommand("DELETE FROM Assignments WHERE actionItemID=" + id, Master.DBConnection); + cmd.ExecuteNonQuery(); + Master.updateTree(); + + Response.Redirect("Assignments.aspx?id=" + Profile.userID); + * */ + } + + protected void FormView1_DataBound(object sender, EventArgs e) + { + /* + DatePicker dueDate = (DatePicker)FormView1.FindControl("dueDate"); + DropDownList statusList = (DropDownList) FormView1.FindControl("statusList"); + RadioButtonList percentList = (RadioButtonList)FormView1.FindControl("percentList"); + Image priorityImg = (Image)FormView1.FindControl("priorityImg"); + DataRowView data = (DataRowView)FormView1.DataItem; + + if (data != null) + { + String status = data["statusID"].ToString(); + String percent = data["percentComplete"].ToString(); + String highpriority = data["highPriorityID"].ToString(); + + if (status != "") + statusList.SelectedValue = status; + if (percent != "") + percentList.SelectedValue = percent; + if (highpriority == "True") + { + priorityImg.ImageUrl = "Images/exclamation.jpg"; + priority = true; + } + else + { + priorityImg.ImageUrl = "Images/no-exclamation.jpg"; + priority = false; + } + + if (FormView1.CurrentMode != FormViewMode.ReadOnly) + { + String due = data["dateDue"].ToString(); + + if (due != "") + dueDate.DateValue = Convert.ToDateTime(due); + } + } + else if (FormView1.CurrentMode == FormViewMode.Insert) + { + Label createdBy = (Label)FormView1.FindControl("createdByLbl"); + Label dateAssigned = (Label)FormView1.FindControl("dateAssignedLbl"); + DropDownList assignedTo = (DropDownList)FormView1.FindControl("assignedTo"); + + createdBy.Text = Profile.FirstName + " " + Profile.LastName; + createdBy.Attributes.Add("id", Profile.userID); + dateAssigned.Text = DateTime.Today.ToShortDateString(); + dueDate.DateValue = DateTime.Today; + assignedTo.SelectedValue = Profile.userID; + } + */ + } + protected void priorityImg_Click(object sender, ImageClickEventArgs e) + { + /* + ImageButton priorityImg = (ImageButton)sender; + + if (FormView1.CurrentMode != FormViewMode.ReadOnly) + { + if (priority) + { + priorityImg.ImageUrl = "Images/no-exclamation.jpg"; + priority = false; + } + else + { + priorityImg.ImageUrl = "Images/exclamation.jpg"; + priority = true; + } + } + * */ + } + protected void FormView1_ItemCommand(object sender, FormViewCommandEventArgs e) + { + /* + if (e.CommandName == "Cancel" && FormView1.CurrentMode == FormViewMode.Insert) + Response.Redirect("Assignments.aspx?id=" + Profile.userID); + * */ + } +</script> + +<asp:FormView ID="FormView1" runat="server" DataSourceID="ActionItemDataSource" DataKeyNames="actionItemID" + CellPadding=4 ForeColor="#333333" OnItemUpdated=FormView1_ItemUpdated OnItemInserted=FormView1_ItemInserted + OnDataBound=FormView1_DataBound OnItemDeleted=FormView1_ItemDeleted OnItemCommand=FormView1_ItemCommand > + <HeaderTemplate> + <div id="ActionItem"> + <table width=700> + <tr> + <td> + <h2> + Action Item</h2> + </td> + <td align=right> + <div id="radiolist"> + <strong>Status: </strong> <asp:DropDownList ID="statusList" runat="server" AutoPostBack="True" + OnSelectedIndexChanged="DropDownList1_SelectedIndexChanged" DataSourceID=StatusDataSource + DataTextField=statusName DataValueField=statusID AppendDataBoundItems=True> + </asp:DropDownList><br /> + <strong>Percent Complete: </strong> + <asp:RadioButtonList ID="percentList" runat="server" RepeatDirection="Horizontal" + AutoPostBack=True OnSelectedIndexChanged=RadioButtonList1_SelectedIndexChanged> + <asp:ListItem Selected=True>0</asp:ListItem> + <asp:ListItem>25</asp:ListItem> + <asp:ListItem>50</asp:ListItem> + <asp:ListItem>75</asp:ListItem> + <asp:ListItem>100</asp:ListItem> + </asp:RadioButtonList> + <asp:ObjectDataSource ID="StatusDataSource" runat="server" OldValuesParameterFormatString="original_{0}" + SelectMethod="GetData" TypeName="dadDataSetTableAdapters.db_statusTableAdapter"> + <SelectParameters> + <asp:Parameter DefaultValue="ActionItem" Name="statusGroup" Type="String" /> + <asp:Parameter Name="statusName" Type="String" /> + <asp:Parameter Name="statusID" Type="Int32" /> + </SelectParameters> + </asp:ObjectDataSource> + </div> + </td> + </tr> + </table> + </div> + </HeaderTemplate> + <ItemTemplate> + <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="700"> + <tr> + <td colspan=2 width="60%" align=left> + <asp:ImageButton ID="priorityImg" runat="server" Enabled="False" Height="19px" ImageUrl="~/Images/no-exclamation.jpg" + OnClick="priorityImg_Click" Width="20px" /> + <asp:Label ID="nameLabel" runat="server" Text='<%# Eval("name") %>' Style="font-size: large; + color: black; font-family: Arial;"></asp:Label><br /> + <strong>Test Pass:</strong> + <asp:Label ID="testPassLbl" runat="server" Text='<%# Eval("testPassName") %>'></asp:Label></td> + <td align=right colspan=2 width="40%"> + <strong>Assigned: </strong><asp:Label ID="dateAssignedLbl" runat="server" Text='<%# Eval("dateAssigned") %>'></asp:Label><br /> + <strong>Due: <asp:Label ID="dateDueLbl" runat="server" Font-Bold="False" Text='<%# Eval("dateDue") %>'></asp:Label></strong><br /> + <strong>Finished:</strong> <asp:Label ID="dateFinishedLbl" runat="server" Font-Bold="False" + Text='<%# Eval("dateFinished") %>'></asp:Label></td> + </tr> + <tr> + <td colspan="4" class="hr"></td> + </tr> + <tr> + <td colspan=4 valign=top> + <strong>Description:</strong><br /> + <asp:Label ID="descriptionLabel" runat="server" Text='<%# Eval("description") %>'></asp:Label> + </td> + </tr> + <tr> + <td colspan="4" class="hr"></td> + </tr> + <tr> + <td colspan=2 width="55%"> + <asp:LinkButton ID="NewButton" runat="server" CausesValidation="False" CommandName="New" + Text="New" /> | <asp:LinkButton ID="EditButton" runat="server" CausesValidation="False" + CommandName="Edit" Text="Edit" /> | <asp:LinkButton ID="DeleteButton" runat="server" + CausesValidation="False" CommandName="Delete" Text="Delete" /> + </td> + <td align=right colspan=2 width="45%"> + <strong>Created By: + <asp:Label ID="createdByLbl" runat="server" Font-Bold="False" Text='<%# Eval("createdBy") %>'></asp:Label></strong><br /> + <strong>Assigned To:</strong> <asp:Label ID="assignedToLbl" runat="server" Font-Bold="False" + Text='<%# Eval("assignedTo") %>'></asp:Label> + </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> + </ItemTemplate> + <EditItemTemplate> + <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=700> + <tr> + <td colspan="2" width="55%" align=left valign=top> + <strong> <asp:ImageButton ID="priorityImg" runat="server" Height="19px" ImageUrl="~/Images/no-exclamation.jpg" + OnClick="priorityImg_Click" Width="20px" /> + Name: </strong><asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("name") %>' + Width="70%" /> + <br /> + <strong>Test Pass:</strong> + <asp:DropDownList ID="DropDownList1" runat="server" AppendDataBoundItems="True" SelectedValue='<%# Bind("testPassID") %>'> + <asp:ListItem Value="-1"><none></asp:ListItem> + </asp:DropDownList></td> + <td align=right colspan=2 width="45%"> + <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" run at="server" DateFormatString="MM/dd/yyyy" DateValue='<%# Eval("dateDue") %>' /> --> + <br /> + <strong>Finished: + <asp:Label ID="dateFinishedLbl" runat="server" Font-Bold="False" Text='<%# Eval("dateFinished") %>'></asp:Label> </strong> + </td> + </tr> + <tr> + <td colspan="4" class="hr"><br /> + </td> + </tr> + <tr> + <td colspan="4"> + <strong>Description:</strong><br /> + <FTB:FreeTextBox ID="FreeTextBox1" runat="server" SupportFolder="~" Text='<%# Bind("description") %>' + Height="100%" Width="100%" /> + </td> + </tr> + <tr> + <td colspan="4" class="hr"><br /> + </td> + </tr> + <tr> + <td colspan=2 width="60%" align=left> + <asp:LinkButton ID="UpdateButton" runat="server" CausesValidation="True" CommandName="Update" + Text="Update"> + </asp:LinkButton> | + <asp:LinkButton ID="UpdateCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" + Text="Cancel"> + </asp:LinkButton> + </td> + <td align=right colspan=2 width="%40"> + <strong>Created By:</strong> + <asp:Label ID="createdByLbl" runat="server" Text='<%# Eval("createdBy") %>'></asp:Label><br /> + <strong>Assigned To:</strong> + <asp:DropDownList ID="assignedTo" runat="server" DataSourceID="UserDataSource" DataTextField="Name" + DataValueField="userID" SelectedValue='<%# Eval("assignedID","{0}") %>'> + </asp:DropDownList><br /> + <asp:ObjectDataSource ID="UserDataSource" runat="server" OldValuesParameterFormatString="original_{0}" + SelectMethod="GetUserNames" TypeName="DummyData... [truncated message content] |
|
From: <m_h...@us...> - 2006-07-12 16:52:51
|
Revision: 105 Author: m_hildebrand Date: 2006-07-12 09:52:44 -0700 (Wed, 12 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=105&view=rev Log Message: ----------- Working on implementing the python theme some more Modified Paths: -------------- Website/App_Themes/Python/python.css Website/Global.asax Website/Includes/Assignments.ascx Modified: Website/App_Themes/Python/python.css =================================================================== --- Website/App_Themes/Python/python.css 2006-07-12 15:22:44 UTC (rev 104) +++ Website/App_Themes/Python/python.css 2006-07-12 16:52:44 UTC (rev 105) @@ -3,13 +3,13 @@ height: 100%; } -body +body { height: 100%; margin: 0; padding: 0; font-family: Verdana, Sans-Serif; - font-size: 10pt; + font-size: 8pt; } /********** BEGIN Header Content **********/ @@ -33,14 +33,14 @@ #HeaderContent #Logo { background-position: left top; - left: 0px; - background-image: url(Images/TCDB-2006-Logo-on-Blue.gif); - width: 200px; - height: 50px; - background-repeat: no-repeat; - position: absolute; - top: -1px; - left: 5px; + left: 0px; + background-image: url(Images/TCDB-2006-Logo-on-Blue.gif); + width: 200px; + height: 50px; + background-repeat: no-repeat; + position: absolute; + top: -1px; + left: 5px; } #HeaderContent #MainMenu @@ -87,16 +87,60 @@ top: 2px; left: -4px; } +/********** END Login Content **********/ +/********** BEGIN Page Content **********/ +#TreeContent +{ + float: left; + border: solid thin red; + padding-right: 10px; +} + +#MainContent +{ + overflow: hidden; + border: solid thin green; +} + +#NotesContent +{ + float: right; + border: solid thin blue; +} + + +/********** END Page Content **********/ + + +/********** BEGIN Assignments Content **********/ +#Assignments .hover:hover +{ + background-color: #eee; +} + +#Assignments h2 +{ + display: inline; + border: solid thin red; +} + +#Assignments quickFilter +{ + border: solid thick blue; +} + +/********** END Assignments Content **********/ + /********** BEGIN Footer Content **********/ #FooterContent A { - color: White; + color: White; } #FooterContent A:hover, #FooterContent A:active { - color: #FDB928; + color: #FDB928; } #NonFooter @@ -114,12 +158,12 @@ #FooterContent { - background-color: #022e66; - color: white; - padding-bottom: 4px; - vertical-align: middle; - padding-top: 4px; - text-align: center; + background-color: #022e66; + color: white; + padding-bottom: 4px; + vertical-align: middle; + padding-top: 4px; + text-align: center; position: relative; margin: -1.8em auto 0 auto; } @@ -127,7 +171,90 @@ /* A CSS hack that only applies to IE -- specifies a different height for the footer */ * html #FooterContent { - margin-top: -1.8em; + margin-top: -1.8em; } +/********** END Footer Content **********/ -/********** END Footer Content **********/ \ No newline at end of file +/********** BEGIN Box Content **********/ + +/* Snazzy borders by Stu Nicholls (http://www.cssplay.co.uk/boxes/snazzy.html) */ +.xsnazzy h1, .xsnazzy h2, .xsnazzy p +{ + margin: 0 10px; + letter-spacing: 1px; +} +.xsnazzy h1 +{ + font-size: 2.5em; + color: #fff; +} +.xsnazzy h2 +{ + font-size: 2em; + color: #06a; + border: 0; +} +.xsnazzy p +{ + padding-bottom: 0.5em; +} +.xsnazzy h2 +{ + padding-top: 0.5em; +} +.xsnazzy +{ + background: transparent; + margin: .5em 1em; /*margin:1em;*/ +} + +.xtop, .xbottom +{ + display: block; + background: transparent; + font-size: 1px; +} +.xb1, .xb2, .xb3, .xb4 +{ + display: block; + overflow: hidden; +} +.xb1, .xb2, .xb3 +{ + height: 1px; +} +.xb2, .xb3, .xb4 +{ + background: #d4d4d4; + border-left: 1px solid #08c; + border-right: 1px solid #08c; +} +.xb1 +{ + margin: 0 5px; + background: #08c; +} +.xb2 +{ + margin: 0 3px; + border-width: 0 2px; +} +.xb3 +{ + margin: 0 2px; +} +.xb4 +{ + height: 2px; + margin: 0 1px; +} + +.xboxcontent +{ + display: block; + background: #d4d4d4; + border: 0 solid #08c; + border-width: 0 1px; + padding: 0px 5px 0px 5px; +} +/********** END Box Content **********/ Modified: Website/Global.asax =================================================================== --- Website/Global.asax 2006-07-12 15:22:44 UTC (rev 104) +++ Website/Global.asax 2006-07-12 16:52:44 UTC (rev 105) @@ -23,6 +23,5 @@ Context.Items.Add("user", user); } - } </script> Modified: Website/Includes/Assignments.ascx =================================================================== --- Website/Includes/Assignments.ascx 2006-07-12 15:22:44 UTC (rev 104) +++ Website/Includes/Assignments.ascx 2006-07-12 16:52:44 UTC (rev 105) @@ -56,18 +56,18 @@ // Set priority image bool priority = Convert.ToBoolean(data["highPriority"].ToString()); if (priority) - gRow.Cells[0].Text = "<div class=\"normal_priority\" />"; + gRow.Cells[0].Text = "<div class=\"priority_normal\" />"; else - gRow.Cells[0].Text = "<div class=\"high_priority\" />"; + gRow.Cells[0].Text = "<div class=\"priority_high\" />"; // 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?ai=" + id + "\">" + name + "</a>"; - else if (type == TCDB_Common.TCDB_Constant.ASSIGNMENT_TYPE_WORKORDER) - gRow.Cells[1].Text = "<a href=\"WorkOrder.aspx?wo=" + id + "\">" + name + "</a>"; + if (type == TCDB_Constant.ASSIGNMENT_TYPE_ACTIONITEM) + gRow.Cells[1].Text = "<a href=\"ActionItem.aspx?" + TCDB_Constant.CODE_AI + "=" + id + "\">" + name + "</a>"; + else if (type == TCDB_Constant.ASSIGNMENT_TYPE_WORKORDER) + gRow.Cells[1].Text = "<a href=\"WorkOrder.aspx?" + TCDB_Constant.CODE_WO + "=" + id + "\">" + name + "</a>"; if (cboPriorityFilter.Checked) { @@ -343,96 +343,112 @@ </script> -<table width="900"> - <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"> - <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"> - <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> - <asp:GridView ID="AssignmentsGridView" runat="server" GridLines="None" AllowPaging="True" - AllowSorting="True" AutoGenerateColumns="False" RowStyle-CssClass="gridhover" - DataSourceID="AssignmentDataSource" OnRowDataBound="AssignmentsGridView_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 id="Assignments"> + <h2> + My Assignments</h2> + <div id="quickFilter"> + s</div> + <asp:CheckBox ID="cboShowCompleted" runat="server" Text="Show Completed" TextAlign="Left" + AutoPostBack="true" OnCheckedChanged="cboShowCompleted_CheckedChanged" /> + <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"> + <asp:GridView ID="AssignmentsGridView" runat="server" GridLines="None" AllowPaging="True" + AllowSorting="True" AutoGenerateColumns="False" RowStyle-CssClass="hover" DataSourceID="AssignmentDataSource" + OnRowDataBound="AssignmentsGridView_RowDataBound"> + <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> + </asp:GridView> + + </div> + <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> + </b></b> + </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> + <!-- + <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> <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 width="100%"> - <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"> @@ -440,39 +456,6 @@ <div class="xboxcontent"> <table width="100%"> <tr> - <td align="left" valign="bottom"> - <h4> - Type:</h4> - </td> - <td align="right"> - <asp:CheckBox ID="cboTypeFilter" runat="server" Checked="True" AutoPostBack="True" - OnCheckedChanged="cboTypeFilter_CheckedChanged" /></td> - </tr> - <tr> - <td colspan="2" class="hr"> - </td> - </tr> - <tr> - <td colspan=2 align=left> - <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" /> - </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%"> - <tr> <td align="left"> <h4> Status:</h4> @@ -661,9 +644,8 @@ <td style="height: 22px"> <asp:Button ID="Update" runat="server" Text="Refresh" /></td> </tr> - --> - </table> - </div> - </td> - </tr> -</table> + </table> + </div> + </td> + </tr> --> +</div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <m_h...@us...> - 2006-07-12 17:21:28
|
Revision: 107 Author: m_hildebrand Date: 2006-07-12 10:21:24 -0700 (Wed, 12 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=107&view=rev Log Message: ----------- continued progress on implementation of python theme Modified Paths: -------------- Website/Includes/Assignments.ascx Website/Includes/AssignmentsTree.ascx Website/web.config Modified: Website/Includes/Assignments.ascx =================================================================== --- Website/Includes/Assignments.ascx 2006-07-12 17:06:23 UTC (rev 106) +++ Website/Includes/Assignments.ascx 2006-07-12 17:21:24 UTC (rev 107) @@ -32,7 +32,8 @@ else id = Profile.userID; */ - id = g_user.ID.ToString(); + // TODO: uncomment this line! + //id = g_user.ID.ToString(); } Session.Add("id", id); } @@ -69,6 +70,7 @@ else if (type == TCDB_Constant.ASSIGNMENT_TYPE_WORKORDER) gRow.Cells[1].Text = "<a href=\"WorkOrder.aspx?" + TCDB_Constant.CODE_WO + "=" + id + "\">" + name + "</a>"; + /* if (cboPriorityFilter.Checked) { switch (priority) @@ -83,6 +85,7 @@ break; } } + */ String status = data["statusName"].ToString(); if (gRow.Visible && cboStatusFilter.Checked) @@ -394,6 +397,22 @@ <asp:BoundField DataField="statusName" HeaderText="Status" ReadOnly="True" SortExpression="stateName"> <ItemStyle HorizontalAlign="Center" /> </asp:BoundField> + <asp:BoundField DataField="WOTotalTest" HeaderText="Total" ReadOnly="true" SortExpression="total"> + <ItemStyle HorizontalAlign="Center" /> + </asp:BoundField> + <asp:BoundField DataField="WOPassRate" HeaderText="Pass Rate" ReadOnly="true" SortExpression="passRate"> + <ItemStyle HorizontalAlign="Center" /> + </asp:BoundField> + <asp:BoundField DataField="WOPass" HeaderText="# Pass" ReadOnly="true" SortExpression="pass"> + <ItemStyle HorizontalAlign="Center" /> + </asp:BoundField> + <asp:BoundField DataField="WOFail" HeaderText="# Fail" ReadOnly="true" SortExpression="fail"> + <ItemStyle HorizontalAlign="Center" /> + </asp:BoundField> + <asp:BoundField DataField="WOError" HeaderText="# Error" ReadOnly="true" SortExpression="error"> + <ItemStyle HorizontalAlign="Center" /> + </asp:BoundField> + </Columns> </asp:GridView> @@ -520,7 +539,6 @@ </div> </td> </tr> - <!-- <tr> <td valign="top"> <div class="xsnazzy"> Modified: Website/Includes/AssignmentsTree.ascx =================================================================== --- Website/Includes/AssignmentsTree.ascx 2006-07-12 17:06:23 UTC (rev 106) +++ Website/Includes/AssignmentsTree.ascx 2006-07-12 17:21:24 UTC (rev 107) @@ -75,13 +75,15 @@ { // Populate the first-level nodes with users List<TCDB_User> userList = TCDB_UserDB.TCDB_GetUserList(); - + int numFoundUsers = 0; + if (userList.Count > 0) { foreach (TCDB_User u in userList) { if (u.ID != g_user.ID) continue; + numFoundUsers++; // Create the new child node. TreeNode child = new TreeNode(); @@ -102,6 +104,9 @@ parent.ChildNodes.Add(child); } } + + // If we only found one user (the current user), hide the tree + if (numFoundUsers <= 1) AssignmentsTree.Visible = false; } </script> Modified: Website/web.config =================================================================== --- Website/web.config 2006-07-12 17:06:23 UTC (rev 106) +++ Website/web.config 2006-07-12 17:21:24 UTC (rev 107) @@ -45,7 +45,7 @@ </microsoft.web> <appSettings/> <connectionStrings> - <add name="dadConnectionString" connectionString="Data Source=dad\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw" providerName="System.Data.SqlClient"/> + <add name="dadConnectionString" connectionString="Data Source=dad\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw;Connect timeout=60" providerName="System.Data.SqlClient"/> </connectionStrings> <system.web> <authentication mode="Forms"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <m_h...@us...> - 2006-07-12 18:50:55
|
Revision: 111 Author: m_hildebrand Date: 2006-07-12 11:50:48 -0700 (Wed, 12 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=111&view=rev Log Message: ----------- Almost finished applying theme info to the assignments page. It still could use a little TLC though. Filters are disabled. Modified Paths: -------------- Website/App_Themes/Python/python.css Website/Includes/Assignments.ascx Website/Includes/Authenticate.ascx Website/Includes/Header_User.ascx Website/web.config Modified: Website/App_Themes/Python/python.css =================================================================== --- Website/App_Themes/Python/python.css 2006-07-12 18:06:58 UTC (rev 110) +++ Website/App_Themes/Python/python.css 2006-07-12 18:50:48 UTC (rev 111) @@ -67,6 +67,12 @@ { padding-right: 30px; } + +.username +{ + color: #FDB928; + display: inline; +} /********** END Header Content **********/ /********** BEGIN Login Content **********/ @@ -93,20 +99,22 @@ #TreeContent { float: left; - border: solid thin red; + /* border: solid thin red; */ padding-right: 10px; } #MainContent { overflow: hidden; - border: solid thin green; + /* border: solid thin green; */ + max-width: 75%; + min-width: 25%; } #NotesContent { float: right; - border: solid thin blue; + /* border: solid thin blue; */ } @@ -119,17 +127,45 @@ background-color: #eee; } -#Assignments h2 +#Assignments #AssignmentsHeader { + padding-top: 15px; + display: block; + /* border: solid thin black; */ +} + +#AssignmentsHeader h2 +{ display: inline; - border: solid thin red; + left: 0px; + padding-left: 15px; + margin-bottom: 0px; + padding-bottom: 0px; + /* border: solid thin blue; */ } -#Assignments quickFilter +#AssignmentsHeader .buttons { - border: solid thick blue; + display: inline; + padding: auto 10px auto 50px; + margin: auto 10px auto 50px; } +#AssignmentsHeader .quickFilter +{ + display: inline; + right: 0px; + padding-right: 15px; + /* border: solid thin red; */ + position: relative; +} + +.quickFilter input +{ + position: relative; + top: 3px; +} + /********** END Assignments Content **********/ /********** BEGIN Footer Content **********/ @@ -256,5 +292,11 @@ border: 0 solid #08c; border-width: 0 1px; padding: 0px 5px 0px 5px; -} +} /********** END Box Content **********/ + +.priority_high:after +{ + content: " (!) "; + color: red; +} Modified: Website/Includes/Assignments.ascx =================================================================== --- Website/Includes/Assignments.ascx 2006-07-12 18:06:58 UTC (rev 110) +++ Website/Includes/Assignments.ascx 2006-07-12 18:50:48 UTC (rev 111) @@ -30,10 +30,9 @@ AssignmentDataSource.SelectParameters.Clear(); } else - id = Profile.userID; */ // TODO: uncomment this line! - //id = g_user.ID.ToString(); + id = g_user.ID.ToString(); } Session.Add("id", id); } @@ -356,12 +355,19 @@ </SelectParameters> </asp:ObjectDataSource> <div id="Assignments"> - <h2> - My Assignments</h2> - <div id="quickFilter"> + <div id="AssignmentsHeader"> + <h2> + My Assignments</h2> + <div class="buttons"> + <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> </div> - <asp:CheckBox ID="cboShowCompleted" runat="server" Text="Show Completed" TextAlign="Left" - AutoPostBack="true" OnCheckedChanged="cboShowCompleted_CheckedChanged" /> + <div class="quickFilter"> + <asp:CheckBox ID="cboShowCompleted" runat="server" Text="Show Completed" TextAlign="Left" + AutoPostBack="true" OnCheckedChanged="cboShowCompleted_CheckedChanged" /> + </div> + </div> <div class="xsnazzy"> <b class="xtop"><b class="xb1"></b><b class="xb2"></b><b class="xb3"></b><b class="xb4"> </b></b> @@ -412,7 +418,6 @@ <asp:BoundField DataField="WOError" HeaderText="# Error" ReadOnly="true" SortExpression="error"> <ItemStyle HorizontalAlign="Center" /> </asp:BoundField> - </Columns> </asp:GridView> @@ -420,9 +425,6 @@ <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> </b></b> </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> <!-- <tr> <td> Modified: Website/Includes/Authenticate.ascx =================================================================== --- Website/Includes/Authenticate.ascx 2006-07-12 18:06:58 UTC (rev 110) +++ Website/Includes/Authenticate.ascx 2006-07-12 18:50:48 UTC (rev 111) @@ -110,7 +110,7 @@ // TODO: after implementing the commented out section, default admin = null TCDB_User admin = product.QALEAD; - /* + // TODO: What happens if there is more than one user with this right? if (product.QALEAD.HasRight(TCDB_Constant.RIGHTS_ASSIGNPERMISSION, product.ID)) { @@ -122,12 +122,12 @@ } else { - admin = TCDB_Config.GetAdmin(); + // TODO: uncomment this after TCDB_Config is implemented + // admin = TCDB_Config.GetAdmin(); } - */ + // Send an action item - TCDB_ActionItem ai = new TCDB_ActionItem(0, TCDB_Constant.USER_AI_NAME + newUser.FIRSTNAME, TCDB_Constant.USER_AI_DESCRIPTION + newUser.FULLNAME, newUser, admin, 0); if (!TCDB_ActionItemDB.TCDB_SaveActionItem(ai)) Modified: Website/Includes/Header_User.ascx =================================================================== --- Website/Includes/Header_User.ascx 2006-07-12 18:06:58 UTC (rev 110) +++ Website/Includes/Header_User.ascx 2006-07-12 18:50:48 UTC (rev 111) @@ -13,4 +13,4 @@ } </script> -Welcome <asp:LoginName ID="LoginName" runat="server" /> (<asp:LoginStatus ID="LoginStatus" runat="server" OnLoggingOut="LoginStatus_LoggingOut" />) | Settings | Admin \ No newline at end of file +Welcome <div class="username"><%= g_user.FULLNAME %></div> (<asp:LoginStatus ID="LoginStatus" runat="server" OnLoggingOut="LoginStatus_LoggingOut" />) | Settings | Admin \ No newline at end of file Modified: Website/web.config =================================================================== --- Website/web.config 2006-07-12 18:06:58 UTC (rev 110) +++ Website/web.config 2006-07-12 18:50:48 UTC (rev 111) @@ -45,7 +45,7 @@ </microsoft.web> <appSettings/> <connectionStrings> - <add name="dadConnectionString" connectionString="Data Source=dad\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw;Connect timeout=60" providerName="System.Data.SqlClient"/> + <add name="dadConnectionString" connectionString="Data Source=dad\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw;Connect timeout=3600" providerName="System.Data.SqlClient"/> </connectionStrings> <system.web> <authentication mode="Forms"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <m_h...@us...> - 2006-07-13 00:02:41
|
Revision: 117 Author: m_hildebrand Date: 2006-07-12 17:02:32 -0700 (Wed, 12 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=117&view=rev Log Message: ----------- Continued work on making Action Items look pretty. Almost there--at least for viewing them! Also, removed any references to "dad" except for in the connection string, all objects using it renamed to "tcdb". Modified Paths: -------------- Website/App_Code/TCDB_Assignments.cs Website/App_Code/TCDB_Notes.cs Website/App_Code/TCDB_Products.cs Website/App_Code/TCDB_Statuses.cs Website/App_Code/TCDB_Users.cs Website/App_Code/dadDataSet.xsd Website/App_Themes/Python/python.css Website/Global.asax Website/Includes/ActionItems.ascx Website/Includes/Assignments.ascx Website/web.config Modified: Website/App_Code/TCDB_Assignments.cs =================================================================== --- Website/App_Code/TCDB_Assignments.cs 2006-07-12 23:03:48 UTC (rev 116) +++ Website/App_Code/TCDB_Assignments.cs 2006-07-13 00:02:32 UTC (rev 117) @@ -21,8 +21,8 @@ { public static List<TCDB_Assignment> TCDB_GetAssignmentList(string aType, int finished, int assignedID, string highPriority) { - dadDataSet ds = new dadDataSet(); - dadDataSetTableAdapters.db_assignmentsTableAdapter ta = new dadDataSetTableAdapters.db_assignmentsTableAdapter(); + tcdbDataSet ds = new tcdbDataSet(); + tcdbDataSetTableAdapters.db_assignmentsTableAdapter ta = new tcdbDataSetTableAdapters.db_assignmentsTableAdapter(); // TODO: figure out the high priority stuff! ta.GetData(aType, finished, assignedID, null); ta.Fill(ds.db_assignments, aType, finished, assignedID, null); @@ -77,8 +77,8 @@ { public static TCDB_ActionItem TCDB_GetActionItem(int id) { - dadDataSet ds = new dadDataSet(); - dadDataSetTableAdapters.db_actionItemsTableAdapter ta = new dadDataSetTableAdapters.db_actionItemsTableAdapter(); + tcdbDataSet ds = new tcdbDataSet(); + tcdbDataSetTableAdapters.db_actionItemsTableAdapter ta = new tcdbDataSetTableAdapters.db_actionItemsTableAdapter(); ta.GetData(id); ta.Fill(ds.db_actionItems, id); @@ -100,8 +100,8 @@ public static bool TCDB_SaveActionItem(TCDB_ActionItem ai) { - dadDataSet ds = new dadDataSet(); - dadDataSetTableAdapters.db_actionItemsTableAdapter ta = new dadDataSetTableAdapters.db_actionItemsTableAdapter(); + tcdbDataSet ds = new tcdbDataSet(); + tcdbDataSetTableAdapters.db_actionItemsTableAdapter ta = new tcdbDataSetTableAdapters.db_actionItemsTableAdapter(); try { ta.Insert(ai.NAME, ai.DESCRIPTION, ai.CREATOR.ID, ai.ASSIGNED.ID, DateTime.Now, null, TCDB_Constant.ASSIGNMENT_PRIORITY_HIGH); @@ -123,8 +123,8 @@ public static TCDB_WorkOrder TCDB_GetWorkOrder(int id) { /* - dadDataSet ds = new dadDataSet(); - dadDataSetTableAdapters.db_actionItemsTableAdapter ta = new dadDataSetTableAdapters.db_actionItemsTableAdapter(); + tcdbDataSet ds = new tcdbDataSet(); + tcdbDataSetTableAdapters.db_actionItemsTableAdapter ta = new tcdbDataSetTableAdapters.db_actionItemsTableAdapter(); ta.GetData(id); ta.Fill(ds.db_actionItems, id); Modified: Website/App_Code/TCDB_Notes.cs =================================================================== --- Website/App_Code/TCDB_Notes.cs 2006-07-12 23:03:48 UTC (rev 116) +++ Website/App_Code/TCDB_Notes.cs 2006-07-13 00:02:32 UTC (rev 117) @@ -19,8 +19,8 @@ { public static TCDB_Note TCDB_GetNote(int id) { - dadDataSet ds = new dadDataSet(); - dadDataSetTableAdapters.db_notesTableAdapter ta = new dadDataSetTableAdapters.db_notesTableAdapter(); + tcdbDataSet ds = new tcdbDataSet(); + tcdbDataSetTableAdapters.db_notesTableAdapter ta = new tcdbDataSetTableAdapters.db_notesTableAdapter(); ta.GetData(null, id); ta.Fill(ds.db_notes, null, id); Modified: Website/App_Code/TCDB_Products.cs =================================================================== --- Website/App_Code/TCDB_Products.cs 2006-07-12 23:03:48 UTC (rev 116) +++ Website/App_Code/TCDB_Products.cs 2006-07-13 00:02:32 UTC (rev 117) @@ -20,8 +20,8 @@ { public static TCDB_Product TCDB_GetProduct(bool isActive, int productID) { - dadDataSet ds = new dadDataSet(); - dadDataSetTableAdapters.db_productsTableAdapter ta = new dadDataSetTableAdapters.db_productsTableAdapter(); + tcdbDataSet ds = new tcdbDataSet(); + tcdbDataSetTableAdapters.db_productsTableAdapter ta = new tcdbDataSetTableAdapters.db_productsTableAdapter(); ta.GetData(isActive, productID); ta.Fill(ds.db_products, isActive, productID); @@ -49,8 +49,8 @@ public static List<TCDB_Product> TCDB_GetProductList(bool isActive) { - dadDataSet ds = new dadDataSet(); - dadDataSetTableAdapters.db_productsTableAdapter ta = new dadDataSetTableAdapters.db_productsTableAdapter(); + tcdbDataSet ds = new tcdbDataSet(); + tcdbDataSetTableAdapters.db_productsTableAdapter ta = new tcdbDataSetTableAdapters.db_productsTableAdapter(); ta.GetData(isActive, null); ta.Fill(ds.db_products, isActive, null); Modified: Website/App_Code/TCDB_Statuses.cs =================================================================== --- Website/App_Code/TCDB_Statuses.cs 2006-07-12 23:03:48 UTC (rev 116) +++ Website/App_Code/TCDB_Statuses.cs 2006-07-13 00:02:32 UTC (rev 117) @@ -17,8 +17,8 @@ { // TODO: Load a status type from the DB // TODO: Check against the DB for user information - dadDataSet ds = new dadDataSet(); - dadDataSetTableAdapters.db_statusTableAdapter ta = new dadDataSetTableAdapters.db_statusTableAdapter(); + tcdbDataSet ds = new tcdbDataSet(); + tcdbDataSetTableAdapters.db_statusTableAdapter ta = new tcdbDataSetTableAdapters.db_statusTableAdapter(); ta.GetData(statusGroup, statusName, id); ta.Fill(ds.db_status, statusGroup, statusName, id); Modified: Website/App_Code/TCDB_Users.cs =================================================================== --- Website/App_Code/TCDB_Users.cs 2006-07-12 23:03:48 UTC (rev 116) +++ Website/App_Code/TCDB_Users.cs 2006-07-13 00:02:32 UTC (rev 117) @@ -90,8 +90,8 @@ public static TCDB_User TCDB_GetUserInfo(string strUserName) { // TODO: Check against the DB for user information - dadDataSet ds = new dadDataSet(); - dadDataSetTableAdapters.db_usersTableAdapter ta = new dadDataSetTableAdapters.db_usersTableAdapter(); + tcdbDataSet ds = new tcdbDataSet(); + tcdbDataSetTableAdapters.db_usersTableAdapter ta = new tcdbDataSetTableAdapters.db_usersTableAdapter(); ta.GetData(strUserName, null); ta.Fill(ds.db_users, strUserName, null); @@ -117,8 +117,8 @@ public static TCDB_User TCDB_GetUserInfo(int id) { // TODO: Check against the DB for user information - dadDataSet ds = new dadDataSet(); - dadDataSetTableAdapters.db_usersTableAdapter ta = new dadDataSetTableAdapters.db_usersTableAdapter(); + tcdbDataSet ds = new tcdbDataSet(); + tcdbDataSetTableAdapters.db_usersTableAdapter ta = new tcdbDataSetTableAdapters.db_usersTableAdapter(); ta.GetData(null, id); ta.Fill(ds.db_users, null, id); @@ -144,8 +144,8 @@ public static List<TCDB_User> TCDB_GetUserList() { // TODO: Check against the DB for user information - dadDataSet ds = new dadDataSet(); - dadDataSetTableAdapters.db_usersTableAdapter ta = new dadDataSetTableAdapters.db_usersTableAdapter(); + tcdbDataSet ds = new tcdbDataSet(); + tcdbDataSetTableAdapters.db_usersTableAdapter ta = new tcdbDataSetTableAdapters.db_usersTableAdapter(); ta.GetData(null, null); ta.Fill(ds.db_users, null, null); @@ -177,8 +177,8 @@ public static bool TCDB_SaveUser(TCDB_User user) { - dadDataSet ds = new dadDataSet(); - dadDataSetTableAdapters.db_usersTableAdapter ta = new dadDataSetTableAdapters.db_usersTableAdapter(); + tcdbDataSet ds = new tcdbDataSet(); + tcdbDataSetTableAdapters.db_usersTableAdapter ta = new tcdbDataSetTableAdapters.db_usersTableAdapter(); try { ta.Insert(user.USERNAME, user.FIRSTNAME, user.LASTNAME, user.EMAIL, user.OFFICEPHONE, user.HOMEPHONE, user.CELLPHONE, user.AUTOMATION); Modified: Website/App_Code/dadDataSet.xsd =================================================================== --- Website/App_Code/dadDataSet.xsd 2006-07-12 23:03:48 UTC (rev 116) +++ Website/App_Code/dadDataSet.xsd 2006-07-13 00:02:32 UTC (rev 117) @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8"?> -<xs:schema id="dadDataSet" targetNamespace="http://tempuri.org/dadDataSet.xsd" xmlns:mstns="http://tempuri.org/dadDataSet.xsd" xmlns="http://tempuri.org/dadDataSet.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:msprop="urn:schemas-microsoft-com:xml-msprop" attributeFormDefault="qualified" elementFormDefault="qualified"> +<xs:schema id="tcdbDataSet" targetNamespace="http://tempuri.org/tcdbDataSet.xsd" xmlns:mstns="http://tempuri.org/tcdbDataSet.xsd" xmlns="http://tempuri.org/tcdbDataSet.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata" xmlns:msprop="urn:schemas-microsoft-com:xml-msprop" attributeFormDefault="qualified" elementFormDefault="qualified"> <xs:annotation> <xs:appinfo source="urn:schemas-microsoft-com:xml-msdatasource"> <DataSource DefaultConnectionIndex="1" FunctionsComponentName="QueriesTableAdapter" GeneratorFunctionsComponentClassName="QueriesTableAdapter" Modifier="AutoLayout, AnsiClass, Class, Public" SchemaSerializationMode="IncludeSchema" UserFunctionsComponentName="QueriesTableAdapter" xmlns="urn:schemas-microsoft-com:xml-msdatasource"> <Connections> - <Connection AppSettingsObjectName="Web.config" AppSettingsPropertyName="dadConnectionString" ConnectionStringObject="" IsAppSettingsProperty="True" Modifier="Assembly" Name="dadConnectionString (Web.config)" ParameterPrefix="@" PropertyReference="AppConfig.System.Configuration.ConfigurationManager.0.ConnectionStrings.dadConnectionString.ConnectionString" Provider="System.Data.SqlClient"> + <Connection AppSettingsObjectName="Web.config" AppSettingsPropertyName="tcdbConnectionString" ConnectionStringObject="" IsAppSettingsProperty="True" Modifier="Assembly" Name="tcdbConnectionString (Web.config)" ParameterPrefix="@" PropertyReference="AppConfig.System.Configuration.ConfigurationManager.0.ConnectionStrings.tcdbConnectionString.ConnectionString" Provider="System.Data.SqlClient"> </Connection> </Connections> <Tables> <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_usersTableAdapter" GeneratorDataComponentClassName="db_usersTableAdapter" Name="db_users" UserDataComponentName="db_usersTableAdapter"> <MainSource> - <DbSource ConnectionRef="dadConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_users" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="True" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> + <DbSource ConnectionRef="tcdbConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_users" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="True" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> <InsertCommand> <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> <CommandText>dbo.ins_user</CommandText> @@ -95,7 +95,7 @@ </TableAdapter> <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_productsTableAdapter" GeneratorDataComponentClassName="db_productsTableAdapter" Name="db_products" UserDataComponentName="db_productsTableAdapter"> <MainSource> - <DbSource ConnectionRef="dadConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_products" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="True" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> + <DbSource ConnectionRef="tcdbConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_products" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="True" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> <InsertCommand> <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> <CommandText>dbo.ins_product</CommandText> @@ -184,7 +184,7 @@ </TableAdapter> <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_actionItemsTableAdapter" GeneratorDataComponentClassName="db_actionItemsTableAdapter" Name="db_actionItems" UserDataComponentName="db_actionItemsTableAdapter"> <MainSource> - <DbSource ConnectionRef="dadConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_actionItems" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="True" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> + <DbSource ConnectionRef="tcdbConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_actionItems" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="True" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> <InsertCommand> <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> <CommandText>dbo.ins_actionItem</CommandText> @@ -243,7 +243,7 @@ </TableAdapter> <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_statusTableAdapter" GeneratorDataComponentClassName="db_statusTableAdapter" Name="db_status" UserDataComponentName="db_statusTableAdapter"> <MainSource> - <DbSource ConnectionRef="dadConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_status" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="False" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> + <DbSource ConnectionRef="tcdbConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_status" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="False" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> <SelectCommand> <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> <CommandText>dbo.sel_status</CommandText> @@ -270,7 +270,7 @@ </TableAdapter> <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_notesTableAdapter" GeneratorDataComponentClassName="db_notesTableAdapter" Name="db_notes" UserDataComponentName="db_notesTableAdapter"> <MainSource> - <DbSource ConnectionRef="dadConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_notes" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="False" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> + <DbSource ConnectionRef="tcdbConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_notes" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="False" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> <SelectCommand> <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> <CommandText>dbo.sel_notes</CommandText> @@ -297,7 +297,7 @@ </TableAdapter> <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="db_assignmentsTableAdapter" GeneratorDataComponentClassName="db_assignmentsTableAdapter" Name="db_assignments" UserDataComponentName="db_assignmentsTableAdapter"> <MainSource> - <DbSource ConnectionRef="dadConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_assignments" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="False" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> + <DbSource ConnectionRef="tcdbConnectionString (Web.config)" DbObjectName="tcdb.dbo.sel_assignments" DbObjectType="StoredProcedure" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="False" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetData" UserSourceName="Fill"> <SelectCommand> <DbCommand CommandType="StoredProcedure" ModifiedByUser="False"> <CommandText>dbo.sel_assignments</CommandText> @@ -344,7 +344,7 @@ </DataSource> </xs:appinfo> </xs:annotation> - <xs:element name="dadDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="dadDataSet" msprop:Generator_DataSetName="dadDataSet"> + <xs:element name="tcdbDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:Generator_UserDSName="tcdbDataSet" msprop:Generator_DataSetName="tcdbDataSet"> <xs:complexType> <xs:choice minOccurs="0" maxOccurs="unbounded"> <xs:element name="db_users" msprop:Generator_UserTableName="db_users" msprop:Generator_RowDeletedName="db_usersRowDeleted" msprop:Generator_RowChangedName="db_usersRowChanged" msprop:Generator_RowClassName="db_usersRow" msprop:Generator_RowChangingName="db_usersRowChanging" msprop:Generator_RowEvArgName="db_usersRowChangeEvent" msprop:Generator_RowEvHandlerName="db_usersRowChangeEventHandler" msprop:Generator_TableClassName="db_usersDataTable" msprop:Generator_TableVarName="tabledb_users" msprop:Generator_RowDeletingName="db_usersRowDeleting" msprop:Generator_TablePropName="db_users"> Modified: Website/App_Themes/Python/python.css =================================================================== --- Website/App_Themes/Python/python.css 2006-07-12 23:03:48 UTC (rev 116) +++ Website/App_Themes/Python/python.css 2006-07-13 00:02:32 UTC (rev 117) @@ -98,23 +98,20 @@ /********** BEGIN Page Content **********/ #TreeContent { - float: left; - /* border: solid thin red; */ + float: left; /* border: solid thin red; */ padding-right: 10px; } #MainContent { - overflow: hidden; - /* border: solid thin green; */ + overflow: hidden; /* border: solid thin green; */ max-width: 75%; min-width: 25%; } #NotesContent { - float: right; - /* border: solid thin blue; */ + float: right; /* border: solid thin blue; */ } @@ -131,7 +128,6 @@ { padding-top: 15px; display: block; - /* border: solid thin black; */ } #AssignmentsHeader h2 @@ -141,7 +137,6 @@ padding-left: 15px; margin-bottom: 0px; padding-bottom: 0px; - /* border: solid thin blue; */ } #AssignmentsHeader .buttons @@ -156,11 +151,10 @@ display: inline; right: 0px; padding-right: 15px; - /* border: solid thin red; */ position: relative; } -.quickFilter input +#AssignmentsHeader .quickFilter input { position: relative; top: 3px; @@ -168,6 +162,72 @@ /********** END Assignments Content **********/ +/********** BEGIN Action Item Content **********/ + +#ActionItem +{ + width: 100%; +} + +#ActionItem #aiHeader +{ + padding-top: 15px; + display: block; +} + +#aiHeader, #aiContent +{ + width: 100%; +} + +#aiHeader h2 +{ + display: inline; + left: 0px; + padding-left: 15px; + margin-bottom: 0px; + padding-bottom: 0px; +} + +#aiHeader .buttons +{ + display: inline; +} + +#aiHeader .status +{ + display: inline; + right: 0px; + padding-right: 15px; + position: relative; +} + +#aiHeader .status input +{ + position: relative; + top: 3px; +} +/* +#aiContent .aiTop, #aiContent .aiMiddle +{ + border-bottom: solid thin red; +} +*/ +#aiContent .top .priority +{ + display: inline; + position: relative; + top: 2px; +} + +#aiContent .aiTop h2, #aiContent .aiTop .aiLeft, #aiContent .aiTop .aiRight +{ + display: inline; +} + + +/********** END Action Item Content **********/ + /********** BEGIN Footer Content **********/ #FooterContent A { @@ -214,7 +274,7 @@ /********** BEGIN Box Content **********/ /* Snazzy borders by Stu Nicholls (http://www.cssplay.co.uk/boxes/snazzy.html) */ -.xsnazzy h1, .xsnazzy h2, .xsnazzy p +/*.xsnazzy h1, .xsnazzy h2, .xsnazzy p { margin: 0 10px; letter-spacing: 1px; @@ -238,6 +298,7 @@ { padding-top: 0.5em; } +*/ .xsnazzy { background: transparent; @@ -295,8 +356,35 @@ } /********** END Box Content **********/ +/********** BEGIN Global Classes **********/ + .priority_high:after { content: " (!) "; color: red; } + +.left +{ + float: left; + display: inline; +} + +.right +{ + float: right; + position: relative; + right: 0px; + display: inline; +} + +.bottom +{ + clear: both; +} + +.hr +{ + border-bottom: solid thin red; + margin: 5px; +} \ No newline at end of file Modified: Website/Global.asax =================================================================== --- Website/Global.asax 2006-07-12 23:03:48 UTC (rev 116) +++ Website/Global.asax 2006-07-13 00:02:32 UTC (rev 117) @@ -11,16 +11,27 @@ // Fires when a security module establishes the identity of the user if (!Context.Items.Contains("user")) { + /* try { - user = TCDB_UserDB.TCDB_GetUserInfo((int)(Session["userID"])); + * */ + int id = 0; + try + { + id = (int)Session["userID"]; + } + catch { + id = 0; + } + user = TCDB_UserDB.TCDB_GetUserInfo(id); +// user = TCDB_UserDB.TCDB_GetUserInfo((int)(Session["userID"])); if (user.ID != TCDB_Constant.USER_ANONYMOUSUSERID) user.ISAUTHENTICATED = true; - } + /*} catch { user = new TCDB_User(); } - +*/ Context.Items.Add("user", user); } } Modified: Website/Includes/ActionItems.ascx =================================================================== --- Website/Includes/ActionItems.ascx 2006-07-12 23:03:48 UTC (rev 116) +++ Website/Includes/ActionItems.ascx 2006-07-13 00:02:32 UTC (rev 117) @@ -6,6 +6,7 @@ <%@ Import Namespace="TCDB_Assignments" %> <%@ Import Namespace="TCDB_Common" %> <%@ Import Namespace="TCDB_Users" %> + <script runat="server"> TCDB_User g_user = TCDB_UserDB.TCDB_GetUserInstance(); String id = HttpContext.Current.Request.QueryString[TCDB_Constant.CODE_AI]; @@ -152,22 +153,22 @@ } else * */ - if (FormView1.CurrentMode == FormViewMode.Insert) - { - Label createdBy = (Label)FormView1.FindControl("createdByLbl"); - Label dateAssigned = (Label)FormView1.FindControl("dateAssignedLbl"); - DropDownList assignedTo = (DropDownList)FormView1.FindControl("assignedTo"); - DropDownList status = (DropDownList)FormView1.FindControl("statusList"); - RadioButtonList percent = (RadioButtonList)FormView1.FindControl("percentList"); + if (FormView1.CurrentMode == FormViewMode.Insert) + { + Label createdBy = (Label)FormView1.FindControl("createdByLbl"); + Label dateAssigned = (Label)FormView1.FindControl("dateAssignedLbl"); + DropDownList assignedTo = (DropDownList)FormView1.FindControl("assignedTo"); + DropDownList status = (DropDownList)FormView1.FindControl("statusList"); + RadioButtonList percent = (RadioButtonList)FormView1.FindControl("percentList"); - createdBy.Text = g_user.FULLNAME; - createdBy.Attributes.Add("id", g_user.ID.ToString()); - dateAssigned.Text = DateTime.Today.ToShortDateString(); - //dueDate.DateValue = DateTime.Today; - assignedTo.SelectedValue = g_user.ID.ToString(); - status.SelectedIndex = 0; - percent.SelectedIndex = 0; - } + createdBy.Text = g_user.FULLNAME; + createdBy.Attributes.Add("id", g_user.ID.ToString()); + dateAssigned.Text = DateTime.Today.ToShortDateString(); + //dueDate.DateValue = DateTime.Today; + assignedTo.SelectedValue = g_user.ID.ToString(); + status.SelectedIndex = 0; + percent.SelectedIndex = 0; + } } protected void FormView1_ItemCommand(object sender, FormViewCommandEventArgs e) { @@ -178,202 +179,220 @@ } </script> -<asp:FormView ID="FormView1" runat="server" DataSourceID="ActionItemDataSource" DataKeyNames="actionItemID" - CellPadding=4 ForeColor="#333333" OnItemUpdated=FormView1_ItemUpdated OnItemInserted=FormView1_ItemInserted - OnDataBound=FormView1_DataBound OnItemDeleted=FormView1_ItemDeleted OnItemCommand=FormView1_ItemCommand> - <HeaderTemplate> - <table width=900 border=1> - <tr> - <td> +<div id="ActionItem"> + <asp:FormView ID="FormView1" runat="server" DataSourceID="ActionItemDataSource" DataKeyNames="actionItemID" + CellPadding="4" ForeColor="#333333" OnItemUpdated="FormView1_ItemUpdated" OnItemInserted="FormView1_ItemInserted" + OnDataBound="FormView1_DataBound" OnItemDeleted="FormView1_ItemDeleted" OnItemCommand="FormView1_ItemCommand" + Width="100%"> + <HeaderTemplate> + <asp:ObjectDataSource ID="StatusDataSource" runat="server" OldValuesParameterFormatString="original_{0}" + SelectMethod="GetData" TypeName="tcdbDataSetTableAdapters.db_statusTableAdapter"> + <SelectParameters> + <asp:Parameter DefaultValue="ActionItem" Name="statusGroup" Type="String" /> + <asp:Parameter Name="statusName" Type="String" /> + <asp:Parameter Name="statusID" Type="Int32" /> + </SelectParameters> + </asp:ObjectDataSource> + <div id="aiHeader"> + <div class="left"> <h2> Action Item</h2> - </td> - <td align=center> - <strong>Status:</strong> <asp:DropDownList ID="statusList" runat="server" AutoPostBack="True" - OnSelectedIndexChanged="DropDownList1_SelectedIndexChanged" DataSourceID=StatusDataSource - DataTextField=statusName DataValueField=statusID AppendDataBoundItems=True SelectedValue='<%# Bind("statusID") %>'> - </asp:DropDownList><br /> - <strong>Percent Complete:</strong> <asp:RadioButtonList ID="percentList" runat="server" RepeatDirection="Horizontal" - AutoPostBack="True" OnSelectedIndexChanged="RadioButtonList1_SelectedIndexChanged" SelectedValue='<%# Bind("percentComplete") %>'> - <asp:ListItem>0</asp:ListItem> - <asp:ListItem>25</asp:ListItem> - <asp:ListItem>50</asp:ListItem> - <asp:ListItem>75</asp:ListItem> - <asp:ListItem>100</asp:ListItem> - </asp:RadioButtonList> - <asp:ObjectDataSource ID="StatusDataSource" runat="server" OldValuesParameterFormatString="original_{0}" - SelectMethod="GetData" TypeName="dadDataSetTableAdapters.db_statusTableAdapter"> - <SelectParameters> - <asp:Parameter DefaultValue="ActionItem" Name="statusGroup" Type="String" /> - <asp:Parameter Name="statusName" Type="String" /> - <asp:Parameter Name="statusID" Type="Int32" /> - </SelectParameters> - </asp:ObjectDataSource> - </td> - </tr> - </table> - </HeaderTemplate> - <ItemTemplate> - <table width="900" border=1> - <tr> - <td colspan=2 width="60%" align=left> - <asp:Label ID="nameLabel" runat="server" Text='<%# Eval("name") %>' Style="font-size: large; - color: black; font-family: Arial;"></asp:Label><br /> - <strong>High Priority: - <asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Eval("highPriority") %>' - Enabled="False" Font-Bold="False" /><br /> - Test Pass:</strong> - <asp:Label ID="testPassLbl" runat="server" Text='<%# Eval("testPass") %>'></asp:Label></td> - <td align=right colspan=2 width="40%"> - <strong>Assigned: </strong><asp:Label ID="dateAssignedLbl" runat="server" Text='<%# Eval("dateAssigned") %>'></asp:Label><br /> - <strong>Due: <asp:Label ID="dateDueLbl" runat="server" Font-Bold="False" Text='<%# Eval("dateDue") %>'></asp:Label></strong><br /> - <strong>Finished:</strong> <asp:Label ID="dateFinishedLbl" runat="server" Font-Bold="False" Text='<%# Eval("dateFinished") %>'></asp:Label></td> - </tr> - <tr> - <td colspan="4" class="hr"> - </td> - </tr> - <tr> - <td colspan=4 valign=top style="height: 40px"> - <strong>Description:</strong><br /> - <asp:Label ID="descriptionLabel" runat="server" Text='<%# Eval("description") %>'></asp:Label> - </td> - </tr> - <tr> - <td colspan="4" class="hr"> - </td> - </tr> - <tr> - <td colspan=2 width="55%"> - <asp:LinkButton ID="NewButton" runat="server" CausesValidation="False" CommandName="New" - Text="New" /> | <asp:LinkButton ID="EditButton" runat="server" CausesValidation="False" - CommandName="Edit" Text="Edit" /> | <asp:LinkButton ID="DeleteButton" runat="server" - CausesValidation="False" CommandName="Delete" Text="Delete" /> - </td> - <td align=right colspan=2 width="45%"> - <strong>Created By: - <asp:Label ID="createdByLbl" runat="server" Font-Bold="False" Text='<%# Eval("createdBy") %>'></asp:Label></strong><br /> - <strong>Assigned To:</strong> <asp:Label ID="assignedToLbl" runat="server" Font-Bold="False" Text='<%# Eval("assigned") %>'></asp:Label> - </td> - </tr> - </table> - </ItemTemplate> - <EditItemTemplate> - <table width=700 border=1> - <tr> - <td colspan="2" width="55%" align=left valign=top> - <strong> - Name: </strong><asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("name") %>' + </div> + <div class="right"> + <div class="buttons"> + Percent Complete:<asp:RadioButtonList ID="percentList" runat="server" RepeatDirection="Horizontal" + AutoPostBack="True" OnSelectedIndexChanged="RadioButtonList1_SelectedIndexChanged" + SelectedValue='<%# Bind("percentComplete") %>' CssClass="buttons"> + <asp:ListItem>0</asp:ListItem> + <asp:ListItem>25</asp:ListItem> + <asp:ListItem>50</asp:ListItem> + <asp:ListItem>75</asp:ListItem> + <asp:ListItem>100</asp:ListItem> + </asp:RadioButtonList></div> + <div class="status"> + Status:<asp:DropDownList ID="statusList" runat="server" AutoPostBack="True" OnSelectedIndexChanged="DropDownList1_SelectedIndexChanged" + DataSourceID="StatusDataSource" DataTextField="statusName" DataValueField="statusID" + AppendDataBoundItems="True" SelectedValue='<%# Bind("statusID") %>'> + </asp:DropDownList> + </div> + </div> + <div class="bottom"> + </div> + </div> + </HeaderTemplate> + <ItemTemplate> + <div id="aiContent"> + <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 class="aiTop"> + <div class="left"> + <!-- TODO: change how priority is working here! --> + <asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Eval("highPriority") %>' + Enabled="False" /> + <h2> + <asp:Label ID="nameLabel" runat="server" Text='<%# Eval("name") %>'></asp:Label></h2> + <h3> + Test Pass:</h3> + <asp:Label ID="testPassLbl" runat="server" Text='<%# Eval("testPass") %>'></asp:Label> + </div> + <div class="right"> + Assigned: + <asp:Label ID="dateAssignedLbl" runat="server" Text='<%# Eval("dateAssigned") %>'></asp:Label><br /> + Due: + <asp:Label ID="dateDueLbl" runat="server" Text='<%# Eval("dateDue") %>'></asp:Label><br /> + Finished: + <asp:Label ID="dateFinishedLbl" runat="server" Text='<%# Eval("dateFinished") %>'></asp:Label> + </div> + <div class="bottom"> + </div> + <div class="hr"> + </div> + </div> + <div class="aiMiddle"> + <strong>Description:</strong><br /> + <asp:Label ID="descriptionLabel" runat="server" Text='<%# Eval("description") %>'></asp:Label> + <div class="hr"> + </div> + </div> + <div class="aiBottom"> + <div class="left"> + <asp:LinkButton ID="NewButton" runat="server" CausesValidation="False" CommandName="New" + Text="New" /> | <asp:LinkButton ID="EditButton" runat="server" CausesValidation="False" + CommandName="Edit" Text="Edit" /> | <asp:LinkButton ID="DeleteButton" runat="server" + CausesValidation="False" CommandName="Delete" Text="Delete" /> + </div> + <div class="right"> + Created By: + <asp:Label ID="createdByLbl" runat="server" Font-Bold="False" Text='<%# Eval("createdBy") %>'></asp:Label><br /> + Assigned To: <asp:Label ID="assignedToLbl" runat="server" Font-Bold="False" + Text='<%# Eval("assigned") %>'></asp:Label> + </div> + <div class="bottom"> + </div> + </div> + <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> + </b></b> + </div> + </div> + </ItemTemplate> + <EditItemTemplate> + <table width="700" border="1"> + <tr> + <td colspan="2" width="55%" align="left" valign="top"> + <strong>Name: </strong><asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("name") %>' Width="70%" /> - <br /> - <strong>High Priority: - <asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Bind("highPriority") %>' - Font-Bold="False" /><br /> - Test Pass:</strong> - <asp:DropDownList ID="DropDownList1" runat="server" AppendDataBoundItems="True"> - <asp:ListItem Value="-1" Selected=True><none></asp:ListItem> - </asp:DropDownList></td> - <td align=right colspan=2 width="45%"> - <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" run at="server" DateFormatString="MM/dd/yyyy" DateValue='<%# Eval("dateDue") %>' /> --> - <br /> - <strong>Finished: </strong> - </td> - </tr> - <tr> - <td colspan="4" class="hr"> - </td> - </tr> - <tr> - <td colspan="4"> - <strong>Description:</strong><br /> - <FTB:FreeTextBox ID="FreeTextBox1" runat="server" SupportFolder="~" Text='<%# Bind("description") %>' - Height="100%" Width="100%" /> - </td> - </tr> - <tr> - <td colspan="4" class="hr"> - </td> - </tr> - <tr> - <td colspan=2 width="60%" align=left> - <asp:LinkButton ID="UpdateButton" runat="server" CausesValidation="True" CommandName="Update" - Text="Update"> - </asp:LinkButton> | - <asp:LinkButton ID="UpdateCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" - Text="Cancel"> - </asp:LinkButton> - </td> - <td align=right colspan=2 width="%40"> - <strong>Created By:</strong> - <asp:Label ID="createdByLbl" runat="server" Text='<%# Eval("createdBy") %>'></asp:Label><br /> - <strong>Assigned To:</strong> - <asp:DropDownList ID="assignedTo" runat="server" DataSourceID="UserDataSource" DataTextField="fullName" - DataValueField="userID" SelectedValue='<%# Bind("assignedID") %>'> - </asp:DropDownList><br /> - </td> - </tr> - </table> - </EditItemTemplate> - <InsertItemTemplate> - <table width=700 border=1> - <tr> - <td colspan="2" width="55%" align=left valign=top> - <strong> - Name:</strong> - <asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("name") %>' Width="70%" /><br /> - <strong>High Priority: - <asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Bind("highPriority") %>' - Font-Bold="False" /><br /> - Test Pass:</strong> - <asp:DropDownList ID="DropDownList1" runat="server" AppendDataBoundItems="True"> - <asp:ListItem Value="-1" Selected=True><none></asp:ListItem> - </asp:DropDownList> - <td align=right colspan=2 width="45%"> - <strong>Assigned: </strong> - <asp:Label ID="dateAssignedLbl" runat="server" Text="Label"></asp:Label><br /> - <strong>Due: </strong> - <!-- <cc1:DatePicker ID="dueDate" run at="server" DateFormatString="MM/dd/yyyy" /><br /> --> - <strong>Finished: </strong></td> - </tr> - <tr> - <td colspan="4" class="hr" style="height: 22px"> - </td> - </tr> - <tr> - <td colspan="4"> - <FTB:FreeTextBox ID="FreeTextBox1" runat="server" SupportFolder="~" Text='<%# Bind("description") %>' - Height="100%" Width="100%" /> - </td> - </tr> - <tr> - <td colspan="4" class="hr"> - </td> - </tr> - <tr> - <td colspan=2 width="60%" align=left> - <asp:LinkButton ID="InsertButton" runat="server" CausesValidation="True" CommandName="Insert" - Text="Insert"> - </asp:LinkButton> | - <asp:LinkButton ID="InsertCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" - Text="Cancel"></asp:LinkButton> - </td> - <td align=right colspan=2 width="40%"> - <strong>Created By: <asp:Label ID="createdByLbl" runat="server" Font-Bold="False" - Text="Label"></asp:Label></strong><br /> - <strong>Assigned To: <asp:DropDownList ID="assignedTo" runat="server" DataSourceID="UserDataSource" - DataTextField="fullName" DataValueField="userID" AppendDataBoundItems=True SelectedValue='<%# Bind("assignedID") %>'> - </asp:DropDownList></strong> - </td> - </tr> - </table> - </InsertItemTemplate> -</asp:FormView> + <br /> + <strong>High Priority: + <asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Bind("highPriority") %>' + Font-Bold="False" /><br /> + Test Pass:</strong> + <asp:DropDownList ID="DropDownList1" runat="server" AppendDataBoundItems="True"> + <asp:ListItem Value="-1" Selected="True"><none></asp:ListItem> + </asp:DropDownList></td> + <td align="right" colspan="2" width="45%"> + <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" run at="server" DateFormatString="MM/dd/yyyy" DateValue='<%# Eval("dateDue") %>' /> --> + <br /> + <strong>Finished: </strong> + </td> + </tr> + <tr> + <td colspan="4" class="hr"> + </td> + </tr> + <tr> + <td colspan="4"> + <strong>Description:</strong><br /> + <FTB:FreeTextBox ID="FreeTextBox1" runat="server" SupportFolder="~" Text='<%# Bind("description") %>' + Height="100%" Width="100%" /> + </td> + </tr> + <tr> + <td colspan="4" class="hr"> + </td> + </tr> + <tr> + <td colspan="2" width="60%" align="left"> + <asp:LinkButton ID="UpdateButton" runat="server" CausesValidation="True" CommandName="Update" + Text="Update"> + </asp:LinkButton> | + <asp:LinkButton ID="UpdateCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" + Text="Cancel"> + </asp:LinkButton> + </td> + <td align="right" colspan="2" width="%40"> + <strong>Created By:</strong> + <asp:Label ID="createdByLbl" runat="server" Text='<%# Eval("createdBy") %>'></asp:Label><br /> + <strong>Assigned To:</strong> + <asp:DropDownList ID="assignedTo" runat="server" DataSourceID="UserDataSource" DataTextField="fullName" + DataValueField="userID" SelectedValue='<%# Bind("assignedID") %>'> + </asp:DropDownList><br /> + </td> + </tr> + </table> + </EditItemTemplate> + <InsertItemTemplate> + <table width="700" border="1"> + <tr> + <td colspan="2" width="55%" align="left" valign="top"> + <strong>Name:</strong> + <asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("name") %>' Width="70%" /><br /> + <strong>High Priority: + <asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Bind("highPriority") %>' + Font-Bold="False" /><br /> + Test Pass:</strong> + <asp:DropDownList ID="DropDownList1" runat="server" AppendDataBoundItems="True"> + <asp:ListItem Value="-1" Selected="True"><none></asp:ListItem> + </asp:DropDownList> + <td align="right" colspan="2" width="45%"> + <strong>Assigned: </strong> + <asp:Label ID="dateAssignedLbl" runat="server" Text="Label"></asp:Label><br /> + <strong>Due: </strong> + <!-- <cc1:DatePicker ID="dueDate" run at="server" DateFormatString="MM/dd/yyyy" /><br /> --> + <strong>Finished: </strong></td> + </tr> + <tr> + <td colspan="4" class="hr" style="height: 22px"> + </td> + </tr> + <tr> + <td colspan="4"> + <FTB:FreeTextBox ID="FreeTextBox1" runat="server" SupportFolder="~" Text='<%# Bind("description") %>' + Height="100%" Width="100%" /> + </td> + </tr> + <tr> + <td colspan="4" class="hr"> + </td> + </tr> + <tr> + <td colspan="2" width="60%" align="left"> + <asp:LinkButton ID="InsertButton" runat="server" CausesValidation="True" CommandName="Insert" + Text="Insert"> + </asp:LinkButton> | + <asp:LinkButton ID="InsertCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" + Text="Cancel"></asp:LinkButton> + </td> + <td align="right" colspan="2" width="40%"> + <strong>Created By: <asp:Label ID="createdByLbl" runat="server" Font-Bold="False" + Text="Label"></asp:Label></strong><br /> + <strong>Assigned To: <asp:DropDownList ID="assignedTo" runat="server" DataSourceID="UserDataSource" + DataTextField="fullName" DataValueField="userID" AppendDataBoundItems="True" + SelectedValue='<%# Bind("assignedID") %>'> + </asp:DropDownList></strong> + </td> + </tr> + </table> + </InsertItemTemplate> + </asp:FormView> +</div> <asp:ObjectDataSource ID="ActionItemDataSource" runat="server" OldValuesParameterFormatString="original_{0}" - SelectMethod="GetData" TypeName="dadDataSetTableAdapters.db_actionItemsTableAdapter" - InsertMethod=Insert UpdateMethod=Update DataObjectTypeName=dadDataSet> + SelectMethod="GetData" TypeName="tcdbDataSetTableAdapters.db_actionItemsTableAdapter" + InsertMethod="Insert" UpdateMethod="Update" DataObjectTypeName="tcdbDataSet"> <SelectParameters> <asp:SessionParameter Name="actionItemID" SessionField="id" Type="Int32" /> </SelectParameters> @@ -387,32 +406,33 @@ <asp:Parameter Name="highPriority" Type="Boolean" /> </InsertParameters> </asp:ObjectDataSource> - <asp:ObjectDataSource ID="UserDataSource" runat="server" OldValuesParameterFormatString="original_{0}" - SelectMethod="GetData" TypeName="dadDataSetTableAdapters.db_usersTableAdapter" InsertMethod=Insert UpdateMethod=Update> - <UpdateParameters> - <asp:Parameter Name="userID" Type="Int32" /> - <asp:Parameter Name="username" Type="String" /> - <asp:Parameter Name="email" Type="String" /> - <asp:Parameter Name="officePhone" Type="String" /> - <asp:Parameter Name="homePhone" Type="String" /> - <asp:Parameter Name="cellPhone" Type="String" /> - <asp:Parameter Name="firstName" Type="String" /> - <asp:Parameter Name="lastName" Type="String" /> - <asp:Parameter Name="automation" Type="Boolean" /> - </UpdateParameters> - <SelectParameters> - <asp:Parameter Name="username" Type="String" /> - <asp:Parameter Name="userID" Type="Int32" /> - </SelectParameters> - <InsertParameters> - <asp:Parameter Name="username" Type="String" /> - <asp:Parameter Name="firstName" Type="String" /> - <asp:Parameter Name="lastName" Type="String" /> - <asp:Parameter Name="email" Type="String" /> - <asp:Parameter Name="officePhone" Type="String" /> - <asp:Parameter Name="homePhone" Type="String" /> - <asp:Parameter Name="cellPhone" Type="String" /> - <asp:Parameter Name="automation" Type="Boolean" /> - </InsertParameters> - </asp:ObjectDataSource> +<asp:ObjectDataSource ID="UserDataSource" runat="server" OldValuesParameterFormatString="original_{0}" + SelectMethod="GetData" TypeName="tcdbDataSetTableAdapters.db_usersTableAdapter" + InsertMethod="Insert" UpdateMethod="Update"> + <UpdateParameters> + <asp:Parameter Name="userID" Type="Int32" /> + <asp:Parameter Name="username" Type="String" /> + <asp:Parameter Name="email" Type="String" /> + <asp:Parameter Name="officePhone" Type="String" /> + <asp:Parameter Name="homePhone" Type="String" /> + <asp:Parameter Name="cellPhone" Type="String" /> + <asp:Parameter Name="firstName" Type="String" /> + <asp:Parameter Name="lastName" Type="String" /> + <asp:Parameter Name="automation" Type="Boolean" /> + </UpdateParameters> + <SelectParameters> + <asp:Parameter Name="username" Type="String" /> + <asp:Parameter Name="userID" Type="Int32" /> + </SelectParameters> + <InsertParameters> + <asp:Parameter Name="username" Type="String" /> + <asp:Parameter Name="firstName" Type="String" /> + <asp:Parameter Name="lastName" Type="String" /> + <asp:Parameter Name="email" Type="String" /> + <asp:Parameter Name="officePhone" Type="String" /> + <asp:Parameter Name="homePhone" Type="String" /> + <asp:Parameter Name="cellPhone" Type="String" /> + <asp:Parameter Name="automation" Type="Boolean" /> + </InsertParameters> +</asp:ObjectDataSource> \ No newline at end of file Modified: Website/Includes/Assignments.ascx =================================================================== --- Website/Includes/Assignments.ascx 2006-07-12 23:03:48 UTC (rev 116) +++ Website/Includes/Assignments.ascx 2006-07-13 00:02:32 UTC (rev 117) @@ -346,7 +346,7 @@ </script> <asp:ObjectDataSource ID="AssignmentDataSource" runat="server" OldValuesParameterFormatString="original_{0}" - SelectMethod="GetData" TypeName="dadDataSetTableAdapters.db_assignmentsTableAdapter"> + SelectMethod="GetData" TypeName="tcdbDataSetTableAdapters.db_assignmentsTableAdapter"> <SelectParameters> <asp:Parameter Name="aType" Type="String" /> <asp:Parameter Name="finished" Type="Int32" /> @@ -356,74 +356,81 @@ </asp:ObjectDataSource> <div id="Assignments"> <div id="AssignmentsHeader"> - <h2> - My Assignments</h2> - <div class="buttons"> - <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> + <div class="left"> + <h2> + My Assignments</h2> </div> - <div class="quickFilter"> - <asp:CheckBox ID="cboShowCompleted" runat="server" Text="Show Completed" TextAlign="Left" - AutoPostBack="true" OnCheckedChanged="cboShowCompleted_CheckedChanged" /> + <div class="right"> + <div class="buttons"> + <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> + </div> + <div class="quickFilter"> + <asp:CheckBox ID="cboShowCompleted" runat="server" Text="Show Completed" TextAlign="Left" + AutoPostBack="true" OnCheckedChanged="cboShowCompleted_CheckedChanged" /> + </div> </div> + <div class="bottom"></div> </div> - <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"> - <asp:GridView ID="AssignmentsGridView" runat="server" GridLines="None" AllowPaging="True" - AllowSorting="True" AutoGenerateColumns="False" RowStyle-CssClass="hover" DataSourceID="AssignmentDataSource" - OnRowDataBound="AssignmentsGridView_RowDataBound"> - <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" ... [truncated message content] |
|
From: <m_h...@us...> - 2006-07-13 03:41:30
|
Revision: 118 Author: m_hildebrand Date: 2006-07-12 20:41:21 -0700 (Wed, 12 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=118&view=rev Log Message: ----------- Continued work on making action items look pretty. they're ready to be used, but can definately still use a lot of TLC. Modified Paths: -------------- Website/App_Code/TCDB_Users.cs Website/App_Themes/Python/python.css Website/Bin/App_Licenses.dll Website/Includes/ActionItems.ascx Website/Includes/Assignments.ascx Website/Includes/Authenticate.ascx Website/web.config Modified: Website/App_Code/TCDB_Users.cs =================================================================== --- Website/App_Code/TCDB_Users.cs 2006-07-13 00:02:32 UTC (rev 117) +++ Website/App_Code/TCDB_Users.cs 2006-07-13 03:41:21 UTC (rev 118) @@ -341,9 +341,15 @@ public bool HasRight(string right, int productID) { // TODO: Implement this function! - return false; + return true; } + public static bool HasRight(string userID, string right, int productID) + { + // TODO: Implement this function! + return true; + } + public List<TCDB_Right> GetRights(bool reload) { // TODO: If rights == null Modified: Website/App_Themes/Python/python.css =================================================================== --- Website/App_Themes/Python/python.css 2006-07-13 00:02:32 UTC (rev 117) +++ Website/App_Themes/Python/python.css 2006-07-13 03:41:21 UTC (rev 118) @@ -357,6 +357,10 @@ /********** END Box Content **********/ /********** BEGIN Global Classes **********/ +.priority_high, .priority_normal +{ + display: inline; +} .priority_high:after { @@ -387,4 +391,10 @@ { border-bottom: solid thin red; margin: 5px; +} + +label +{ + font-weight: bold; + margin-right: 5px; } \ No newline at end of file Modified: Website/Bin/App_Licenses.dll =================================================================== (Binary files differ) Modified: Website/Includes/ActionItems.ascx =================================================================== --- Website/Includes/ActionItems.ascx 2006-07-13 00:02:32 UTC (rev 117) +++ Website/Includes/ActionItems.ascx 2006-07-13 03:41:21 UTC (rev 118) @@ -200,20 +200,23 @@ </div> <div class="right"> <div class="buttons"> - Percent Complete:<asp:RadioButtonList ID="percentList" runat="server" RepeatDirection="Horizontal" - AutoPostBack="True" OnSelectedIndexChanged="RadioButtonList1_SelectedIndexChanged" - SelectedValue='<%# Bind("percentComplete") %>' CssClass="buttons"> - <asp:ListItem>0</asp:ListItem> - <asp:ListItem>25</asp:ListItem> - <asp:ListItem>50</asp:ListItem> - <asp:ListItem>75</asp:ListItem> - <asp:ListItem>100</asp:ListItem> - </asp:RadioButtonList></div> + <label> + Percent Complete:</label><asp:RadioButtonList ID="percentList" runat="server" RepeatDirection="Horizontal" + AutoPostBack="True" OnSelectedIndexChanged="RadioButtonList1_SelectedIndexChanged" + SelectedValue='<%# Bind("percentComplete") %>' CssClass="buttons"> + <asp:ListItem>0</asp:ListItem> + <asp:ListItem>25</asp:ListItem> + <asp:ListItem>50</asp:ListItem> + <asp:ListItem>75</asp:ListItem> + <asp:ListItem>100</asp:ListItem> + </asp:RadioButtonList></div> <div class="status"> - Status:<asp:DropDownList ID="statusList" runat="server" AutoPostBack="True" OnSelectedIndexChanged="DropDownList1_SelectedIndexChanged" - DataSourceID="StatusDataSource" DataTextField="statusName" DataValueField="statusID" - AppendDataBoundItems="True" SelectedValue='<%# Bind("statusID") %>'> - </asp:DropDownList> + <label> + Status:</label><asp:DropDownList ID="statusList" runat="server" AutoPostBack="True" + OnSelectedIndexChanged="DropDownList1_SelectedIndexChanged" DataSourceID="StatusDataSource" + DataTextField="statusName" DataValueField="statusID" AppendDataBoundItems="True" + SelectedValue='<%# Bind("statusID") %>'> + </asp:DropDownList> </div> </div> <div class="bottom"> @@ -228,22 +231,21 @@ <div class="xboxcontent"> <div class="aiTop"> <div class="left"> - <!-- TODO: change how priority is working here! --> - <asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Eval("highPriority") %>' - Enabled="False" /> + <asp:Literal ID="priority_high" runat="server" Visible='<%# Eval("highPriority") %>' + Text='<div class="priority_high"></div>'></asp:Literal> <h2> <asp:Label ID="nameLabel" runat="server" Text='<%# Eval("name") %>'></asp:Label></h2> - <h3> - Test Pass:</h3> - <asp:Label ID="testPassLbl" runat="server" Text='<%# Eval("testPass") %>'></asp:Label> + <br /> + <label> + Test Pass:</label><asp:Label ID="testPassLbl" runat="server" Text='<%# Eval("testPass") %>'></asp:Label> </div> <div class="right"> - Assigned: - <asp:Label ID="dateAssignedLbl" runat="server" Text='<%# Eval("dateAssigned") %>'></asp:Label><br /> - Due: - <asp:Label ID="dateDueLbl" runat="server" Text='<%# Eval("dateDue") %>'></asp:Label><br /> - Finished: - <asp:Label ID="dateFinishedLbl" runat="server" Text='<%# Eval("dateFinished") %>'></asp:Label> + <label> + Assigned:</label><asp:Label ID="dateAssignedLbl" runat="server" Text='<%# Eval("dateAssigned") %>'></asp:Label><br /> + <label> + Due:</label><asp:Label ID="dateDueLbl" runat="server" Text='<%# Eval("dateDue") %>'></asp:Label><br /> + <label> + Finished:</label><asp:Label ID="dateFinishedLbl" runat="server" Text='<%# Eval("dateFinished") %>'></asp:Label> </div> <div class="bottom"> </div> @@ -251,142 +253,176 @@ </div> </div> <div class="aiMiddle"> - <strong>Description:</strong><br /> + <label> + Description:</label><br /> <asp:Label ID="descriptionLabel" runat="server" Text='<%# Eval("description") %>'></asp:Label> <div class="hr"> </div> </div> <div class="aiBottom"> <div class="left"> + <br /> <asp:LinkButton ID="NewButton" runat="server" CausesValidation="False" CommandName="New" Text="New" /> | <asp:LinkButton ID="EditButton" runat="server" CausesValidation="False" CommandName="Edit" Text="Edit" /> | <asp:LinkButton ID="DeleteButton" runat="server" CausesValidation="False" CommandName="Delete" Text="Delete" /> </div> <div class="right"> - Created By: - <asp:Label ID="createdByLbl" runat="server" Font-Bold="False" Text='<%# Eval("createdBy") %>'></asp:Label><br /> - Assigned To: <asp:Label ID="assignedToLbl" runat="server" Font-Bold="False" - Text='<%# Eval("assigned") %>'></asp:Label> + <label> + Created By:</label><asp:Label ID="createdByLbl" runat="server" Font-Bold="False" + Text='<%# Eval("createdBy") %>'></asp:Label><br /> + <label> + Assigned To:</label><asp:Label ID="assignedToLbl" runat="server" Font-Bold="False" + Text='<%# Eval("assigned") %>'></asp:Label> </div> <div class="bottom"> </div> </div> - <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> - </b></b> </div> + <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> + </b></b> </div> </ItemTemplate> <EditItemTemplate> - <table width="700" border="1"> - <tr> - <td colspan="2" width="55%" align="left" valign="top"> - <strong>Name: </strong><asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("name") %>' - Width="70%" /> - <br /> - <strong>High Priority: - <asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Bind("highPriority") %>' - Font-Bold="False" /><br /> - Test Pass:</strong> - <asp:DropDownList ID="DropDownList1" runat="server" AppendDataBoundItems="True"> - <asp:ListItem Value="-1" Selected="True"><none></asp:ListItem> - </asp:DropDownList></td> - <td align="right" colspan="2" width="45%"> - <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" run at="server" DateFormatString="MM/dd/yyyy" DateValue='<%# Eval("dateDue") %>' /> --> - <br /> - <strong>Finished: </strong> - </td> - </tr> - <tr> - <td colspan="4" class="hr"> - </td> - </tr> - <tr> - <td colspan="4"> - <strong>Description:</strong><br /> - <FTB:FreeTextBox ID="FreeTextBox1" runat="server" SupportFolder="~" Text='<%# Bind("description") %>' - Height="100%" Width="100%" /> - </td> - </tr> - <tr> - <td colspan="4" class="hr"> - </td> - </tr> - <tr> - <td colspan="2" width="60%" align="left"> - <asp:LinkButton ID="UpdateButton" runat="server" CausesValidation="True" CommandName="Update" - Text="Update"> - </asp:LinkButton> | - <asp:LinkButton ID="UpdateCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" - Text="Cancel"> - </asp:LinkButton> - </td> - <td align="right" colspan="2" width="%40"> - <strong>Created By:</strong> - <asp:Label ID="createdByLbl" runat="server" Text='<%# Eval("createdBy") %>'></asp:Label><br /> - <strong>Assigned To:</strong> - <asp:DropDownList ID="assignedTo" runat="server" DataSourceID="UserDataSource" DataTextField="fullName" - DataValueField="userID" SelectedValue='<%# Bind("assignedID") %>'> - </asp:DropDownList><br /> - </td> - </tr> - </table> + <div id="aiContent"> + <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 class="aiTop"> + <div class="left"> + <asp:Literal ID="priority_high" runat="server" Visible='<%# Eval("highPriority") %>' + Text='<div class="priority_high"></div>'></asp:Literal> + <label> + Name</label><asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("name") %>' + Width="70%" /> + <br /> + <label> + High Priority</label><asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Bind("highPriority") %>' + Font-Bold="False" /><br /> + <label> + Test Pass:</label><asp:DropDownList ID="DropDownList1" runat="server" AppendDataBoundItems="True"> + <asp:ListItem Value="-1" Selected="True"><none></asp:ListItem> + </asp:DropDownList> + </div> + <div class="right"> + <label> + Assigned:</label><asp:Label ID="dateAssignedLbl" runat="server" Font-Bold="False" + Text='<%# Eval("dateAssigned") %>'></asp:Label><br /> + <label> + Due:</label><!-- TODO: date picker goes here --><br /> + <label> + Finished:</label><!-- TODO: date picker goes here --> + </div> + <div class="bottom"> + </div> + <div class="hr"> + </div> + </div> + <div class="aiMiddle"> + <label> + Description:</label><br /> + <FTB:FreeTextBox ID="FreeTextBox1" runat="server" SupportFolder="~" Text='<%# Bind("description") %>' + Height="100%" Width="100%" /> + <div class="hr"> + </div> + </div> + <div class="aiBottom"> + <div class="left"> + <br /> + <asp:LinkButton ID="UpdateButton" runat="server" CausesValidation="True" CommandName="Update" + Text="Update"> + </asp:LinkButton> | + <asp:LinkButton ID="UpdateCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" + Text="Cancel"> + </asp:LinkButton> + </div> + <div class="right"> + <label> + Created By:</label><asp:Label ID="createdByLbl" runat="server" Text='<%# Eval("createdBy") %>'></asp:Label><br /> + <label> + Assigned To:</label><asp:DropDownList ID="assignedTo" runat="server" DataSourceID="UserDataSource" + DataTextField="fullName" DataValueField="userID" SelectedValue='<%# Bind("assignedID") %>'> + </asp:DropDownList> + </div> + <div class="bottom"> + </div> + </div> + </div> + <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> + </b></b> + </div> + </div> </EditItemTemplate> <InsertItemTemplate> - <table width="700" border="1"> - <tr> - <td colspan="2" width="55%" align="left" valign="top"> - <strong>Name:</strong> - <asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("name") %>' Width="70%" /><br /> - <strong>High Priority: - <asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Bind("highPriority") %>' - Font-Bold="False" /><br /> - Test Pass:</strong> - <asp:DropDownList ID="DropDownList1" runat="server" AppendDataBoundItems="True"> - <asp:ListItem Value="-1" Selected="True"><none></asp:ListItem> - </asp:DropDownList> - <td align="right" colspan="2" width="45%"> - <strong>Assigned: </strong> - <asp:Label ID="dateAssignedLbl" runat="server" Text="Label"></asp:Label><br /> - <strong>Due: </strong> - <!-- <cc1:DatePicker ID="dueDate" run at="server" DateFormatString="MM/dd/yyyy" /><br /> --> - <strong>Finished: </strong></td> - </tr> - <tr> - <td colspan="4" class="hr" style="height: 22px"> - </td> - </tr> - <tr> - <td colspan="4"> - <FTB:FreeTextBox ID="FreeTextBox1" runat="server" SupportFolder="~" Text='<%# Bind("description") %>' - Height="100%" Width="100%" /> - </td> - </tr> - <tr> - <td colspan="4" class="hr"> - </td> - </tr> - <tr> - <td colspan="2" width="60%" align="left"> - <asp:LinkButton ID="InsertButton" runat="server" CausesValidation="True" CommandName="Insert" - Text="Insert"> - </asp:LinkButton> | - <asp:LinkButton ID="InsertCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" - Text="Cancel"></asp:LinkButton> - </td> - <td align="right" colspan="2" width="40%"> - <strong>Created By: <asp:Label ID="createdByLbl" runat="server" Font-Bold="False" - Text="Label"></asp:Label></strong><br /> - <strong>Assigned To: <asp:DropDownList ID="assignedTo" runat="server" DataSourceID="UserDataSource" - DataTextField="fullName" DataValueField="userID" AppendDataBoundItems="True" - SelectedValue='<%# Bind("assignedID") %>'> - </asp:DropDownList></strong> - </td> - </tr> - </table> + <div id="aiContent"> + <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 class="aiTop"> + <div class="left"> + <label> + Name</label><asp:TextBox ID="TextBox1" runat="server" Text='<%# Bind("name") %>' + Width="70%" /> + <br /> + <label> + High Priority</label><asp:CheckBox ID="priorityBox" runat="server" Checked='<%# Bind("highPriority") %>' + Font-Bold="False" /><br /> + <label> + Test Pass:</label> + <asp:DropDownList ID="DropDownList1" runat="server" AppendDataBoundItems="True"> + <asp:ListItem Value="-1" Selected="True"><none></asp:ListItem> + </asp:DropDownList> + </div> + <div class="right"> + <label> + Assigned:</label> + <asp:Label ID="dateAssignedLbl" runat="server" Text="Label"></asp:Label><br /> + <label> + Due:</label><!-- TODO: date picker goes here --><br /> + <label> + Finished:</label><!-- TODO: date picker goes here --> + </div> + <div class="bottom"> + </div> + <div class="hr"> + </div> + </div> + <div class="aiMiddle"> + <label> + Description:</label><br /> + <FTB:FreeTextBox ID="FreeTextBox1" runat="server" SupportFolder="~" Text='<%# Bind("description") %>' + Height="100%" Width="100%" /> + <div class="hr"> + </div> + </div> + <div class="aiBottom"> + <div class="left"> + <br /> + <asp:LinkButton ID="InsertButton" runat="server" CausesValidation="True" CommandName="Insert" + Text="Insert"> + </asp:LinkButton> | + <asp:LinkButton ID="InsertCancelButton" runat="server" CausesValidation="False" CommandName="Cancel" + Text="Cancel"></asp:LinkButton> + </div> + <div class="right"> + <label> + Created By:</label><asp:Label ID="createdByLbl" runat="server" Font-Bold="False" + Text="Label"></asp:Label><br /> + <label> + Assigned To:</label><asp:DropDownList ID="assignedTo" runat="server" DataSourceID="UserDataSource" + DataTextField="fullName" DataValueField="userID" AppendDataBoundItems="True" + SelectedValue='<%# Bind("assignedID") %>'></asp:DropDownList> + </div> + <div class="bottom"> + </div> + </div> + </div> + <b class="xbottom"><b class="xb4"></b><b class="xb3"></b><b class="xb2"></b><b class="xb1"> + </b></b> + </div> + </div> </InsertItemTemplate> </asp:FormView> </div> Modified: Website/Includes/Assignments.ascx =================================================================== --- Website/Includes/Assignments.ascx 2006-07-13 00:02:32 UTC (rev 117) +++ Website/Includes/Assignments.ascx 2006-07-13 03:41:21 UTC (rev 118) @@ -23,16 +23,16 @@ */ if (id == null) { - /* - if (User.IsInRole("Admin")) + if (g_user.HasRight(TCDB_Constant.RIGHTS_SITEADMIN, 0)) { - AssignmentDataSource.SelectMethod = "GetAllAssignmentNames"; - AssignmentDataSource.SelectParameters.Clear(); + // Admin user should get everything, so don't set any values! + + //AssignmentDataSource.SelectMethod = "GetAllAssignmentNames"; + //AssignmentDataSource.SelectParameters.Clear(); + } else - */ - // TODO: uncomment this line! - id = g_user.ID.ToString(); + id = g_user.ID.ToString(); } Session.Add("id", id); } @@ -56,9 +56,9 @@ // Set priority image bool priority = Convert.ToBoolean(data["highPriority"].ToString()); if (priority) + gRow.Cells[0].Text = "<div class=\"priority_high\" />"; + else gRow.Cells[0].Text = "<div class=\"priority_normal\" />"; - else - gRow.Cells[0].Text = "<div class=\"priority_high\" />"; // Set Hyperlink URL String id = data["childID"].ToString(); Modified: Website/Includes/Authenticate.ascx =================================================================== --- Website/Includes/Authenticate.ascx 2006-07-13 00:02:32 UTC (rev 117) +++ Website/Includes/Authenticate.ascx 2006-07-13 03:41:21 UTC (rev 118) @@ -76,7 +76,8 @@ { // We have a valid user who is already in the DB FormsAuthentication.SetAuthCookie(LoginUser.UserName, LoginUser.RememberMeSet); - Response.Redirect(FormsAuthentication.GetRedirectUrl(LoginUser.UserName, LoginUser.RememberMeSet)); + Response.Redirect(Request.RawUrl); + //Response.Redirect(FormsAuthentication.GetRedirectUrl(LoginUser.UserName, LoginUser.RememberMeSet)); } else { Modified: Website/web.config =================================================================== --- Website/web.config 2006-07-13 00:02:32 UTC (rev 117) +++ Website/web.config 2006-07-13 03:41:21 UTC (rev 118) @@ -45,7 +45,7 @@ </microsoft.web> <appSettings/> <connectionStrings> - <add name="tcdbConnectionString" connectionString="Data Source=dad\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw;Connect timeout=3600" providerName="System.Data.SqlClient"/> + <add name="tcdbConnectionString" connectionString="Data Source=dad.vintela.com\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw;Connect timeout=30" providerName="System.Data.SqlClient"/> </connectionStrings> <system.web> <authentication mode="Forms"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <ro...@us...> - 2006-07-26 14:32:45
|
Revision: 222 Author: rouquin Date: 2006-07-26 07:32:35 -0700 (Wed, 26 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=222&view=rev Log Message: ----------- The user settings page wasn't updating so I tweaked it an it works now. I was also have some serious session timeout issues on IE. I added a little more session processing to help though I'm not sure if that was the issue. It seems that the SQL based session is more reliable but not as flexible (only handles serializable objects). Modified Paths: -------------- Website/App_Code/GlobalClass.cs Website/App_Code/SiteMaster.cs Website/Includes/UserSettings.ascx Website/Includes/UserSettings.ascx.cs Website/web.config Modified: Website/App_Code/GlobalClass.cs =================================================================== --- Website/App_Code/GlobalClass.cs 2006-07-25 22:01:30 UTC (rev 221) +++ Website/App_Code/GlobalClass.cs 2006-07-26 14:32:35 UTC (rev 222) @@ -71,6 +71,14 @@ // everything } + void Session_Start(object sender, EventArgs e) + { + if (User.Identity.IsAuthenticated) + { + Session["m_user"] = UserDB.GetUserInfo(User.Identity.Name); + } + } + void Application_PreRequestHandlerExecute(object sender, EventArgs e) { Modified: Website/App_Code/SiteMaster.cs =================================================================== --- Website/App_Code/SiteMaster.cs 2006-07-25 22:01:30 UTC (rev 221) +++ Website/App_Code/SiteMaster.cs 2006-07-26 14:32:35 UTC (rev 222) @@ -23,11 +23,14 @@ protected override void OnInit(EventArgs e) { - m_user = LoadSessionUser(); - m_startTime = LoadStartTime(); + if (Page.User.Identity.IsAuthenticated) + { + m_user = LoadSessionUser(); + m_startTime = LoadStartTime(); - //TimeSpan d = DateTime.Now - m_startTime; - //d.Milliseconds; + //TimeSpan d = DateTime.Now - m_startTime; + //d.Milliseconds; + } } public DateTime LoadStartTime() @@ -42,12 +45,11 @@ public User LoadSessionUser() { - if (m_user != null) + if (m_user != null && m_user.ISAUTHENTICATED) { return m_user; } - int id = 0; m_logg.Debug("Entering the SiteUserControl LoadUser"); try Modified: Website/Includes/UserSettings.ascx =================================================================== --- Website/Includes/UserSettings.ascx 2006-07-25 22:01:30 UTC (rev 221) +++ Website/Includes/UserSettings.ascx 2006-07-26 14:32:35 UTC (rev 222) @@ -3,7 +3,7 @@ <div id="UserSettings"> <asp:FormView ID="FormView1" runat="server" DataSourceID="UserDataSource" DataKeyNames="userID" OnItemDeleted="FormView1_ItemDeleted" OnItemCommand="FormView1_ItemCommand" OnItemInserted="FormView1_ItemInserted" - OnItemUpdated="FormView1_ItemUpdated"> + OnItemUpdated="FormView1_ItemUpdated" OnDataBound="FormView1_DataBound"> <HeaderTemplate> <div class="ch"> <h2> @@ -22,7 +22,7 @@ <div class="item"> <label> User:</label> - <asp:Label ID="usernameLabel" runat="server" Text='<%# Bind("username") %>'></asp:Label> + <asp:Label ID="usernameLabel" runat="server" Text='<%# Eval("username") %>'></asp:Label> </div> <div class="item"> <label> @@ -33,7 +33,7 @@ <div class="item"> <label> Email:</label> - <asp:Label ID="emailLabel" runat="server" Text='<%# Bind("email") %>'></asp:Label> + <asp:Label ID="emailLabel" runat="server" Text='<%# Eval("email") %>'></asp:Label> </div> </div> <div class="end"> @@ -46,17 +46,17 @@ <div class="item"> <label> Office #:</label> - <asp:Label ID="officeHome" runat="server" Text='<%# Bind("officePhone") %>'></asp:Label> + <asp:Label ID="officeHome" runat="server" Text='<%# Eval("officePhone") %>'></asp:Label> </div> <div class="item"> <label> Home #:</label> - <asp:Label ID="homePhoneLabel" runat="server" Text='<%# Bind("homePhone") %>'></asp:Label> + <asp:Label ID="homePhoneLabel" runat="server" Text='<%# Eval("homePhone") %>'></asp:Label> </div> <div class="item"> <label> Cell #:</label> - <asp:Label ID="cellPhoneLabel" runat="server" Text='<%# Bind("cellPhone") %>'></asp:Label> + <asp:Label ID="cellPhoneLabel" runat="server" Text='<%# Eval("cellPhone") %>'></asp:Label> </div> </div> <div class="end"> @@ -74,7 +74,7 @@ <div class="item"> <label> Automation:</label> - <asp:CheckBox ID="automationCheckBox" runat="server" Checked='<%# Bind("automation") %>' + <asp:CheckBox ID="automationCheckBox" runat="server" Checked='<%# Eval("automation") %>' Enabled="false" /> </div> </div> @@ -113,17 +113,14 @@ <div class="item"> <label> User:</label> - <asp:Label ID="usernameLbl" runat="server" Text='<%# Bind("username") %>'></asp:Label> + <asp:TextBox ID="usernameBox" runat="server" Text='<%# Bind("username") %>'></asp:TextBox> </div> <div class="item"> <label> Name: </label> - <asp:TextBox ID="firstNameBox" runat="server" Text='<%# Eval("firstName") %>'></asp:TextBox> - <asp:TextBox ID="lastNameBox" runat="server" Text='<%# Eval("lastName") %>'></asp:TextBox> - <!-- - <asp:Label ID="FirstNameLabel" runat="server" Text='<%# Eval("firstName") %>'></asp:Label> - <asp:Label ID="LastNameLabel" runat="server" Text='<%# Eval("lastName") %>'></asp:Label>--> + <asp:TextBox ID="firstNameBox" runat="server" Text='<%# Bind("firstName") %>'></asp:TextBox> + <asp:TextBox ID="lastNameBox" runat="server" Text='<%# Bind("lastName") %>'></asp:TextBox> </div> <div class="item"> <label> Modified: Website/Includes/UserSettings.ascx.cs =================================================================== --- Website/Includes/UserSettings.ascx.cs 2006-07-25 22:01:30 UTC (rev 221) +++ Website/Includes/UserSettings.ascx.cs 2006-07-26 14:32:35 UTC (rev 222) @@ -116,12 +116,7 @@ protected void SyncWithAD(object sender, CommandEventArgs e) { - String username = ""; - if (FormView1.CurrentMode == FormViewMode.Edit) - username = ((Label) FormView1.FindControl("usernameLbl")).Text; - else - username = ((TextBox)FormView1.FindControl("usernameBox")).Text; - + String username = ((TextBox)FormView1.FindControl("usernameBox")).Text; User curUser = AD_Authentication.AD_GetUserInfo(m_user.USERNAME, m_user.PASSWORD, username); if (curUser.ID != -1) @@ -149,4 +144,15 @@ else Response.Redirect("UserConfig.aspx?" + Constants.CODE_USER + "=" + userID); } + protected void FormView1_DataBound(object sender, EventArgs e) + { + if (FormView1.CurrentMode == FormViewMode.Edit) + { + if (mode == "read") + { + TextBox username = (TextBox)FormView1.FindControl("usernameBox"); + username.Enabled = false; + } + } + } } Modified: Website/web.config =================================================================== --- Website/web.config 2006-07-25 22:01:30 UTC (rev 221) +++ Website/web.config 2006-07-26 14:32:35 UTC (rev 222) @@ -132,7 +132,8 @@ providerName="System.Data.SqlClient" /> </connectionStrings> <system.web> - <sessionState mode="InProc" cookieless="false" timeout="1440"/> + <sessionState mode="InProc" cookieless="false" timeout="20"/> + <pages styleSheetTheme="Python"> <!-- TODO: Make sure the theme is being pulled dynamically --> <controls> @@ -198,7 +199,9 @@ <authentication mode="Windows"/> --> - <authentication mode="Forms" /> + <authentication mode="Forms" > + <forms timeout="50000000"/> + </authentication> <!-- The <customErrors> section enables configuration of what to do if/when an unhandled error occurs This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X