Menu
▾
▴
[tcdb-devel] SF.net SVN: tcdb: [117] Website
|
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] |
