Menu
▾
▴
[tcdb-devel] SF.net SVN: tcdb: [75] WebPrototype
|
From: <ro...@us...> - 2006-07-06 19:25:55
|
Revision: 75 Author: rouquin Date: 2006-07-06 12:25:37 -0700 (Thu, 06 Jul 2006) ViewCVS: http://svn.sourceforge.net/tcdb/?rev=75&view=rev Log Message: ----------- Added more database tables to work with the Admin pages. Renamed a couple attributes (which I had to update on a number of pages). Finished versionEdit. Modified Paths: -------------- WebPrototype/ActionItemEdit.aspx WebPrototype/Admin.aspx.cs WebPrototype/AdminMaster.master.cs WebPrototype/App_Code/DummyDataSet.xsd WebPrototype/App_Code/DummyDataSet.xss WebPrototype/App_Data/ASPNETDB.MDF WebPrototype/App_Data/Database.mdf WebPrototype/App_Data/Database_log.LDF WebPrototype/App_Data/aspnetdb_log.ldf WebPrototype/Assignments.aspx WebPrototype/Assignments.aspx.cs WebPrototype/ObjectiveEdit.aspx WebPrototype/ObjectiveEdit.aspx.cs WebPrototype/TestCaseEdit.aspx WebPrototype/TestCaseEdit.aspx.cs WebPrototype/WorkOrderEdit.aspx WebPrototype/versionEdit.aspx WebPrototype/versionEdit.aspx.cs Modified: WebPrototype/ActionItemEdit.aspx =================================================================== --- WebPrototype/ActionItemEdit.aspx 2006-07-06 18:05:10 UTC (rev 74) +++ WebPrototype/ActionItemEdit.aspx 2006-07-06 19:25:37 UTC (rev 75) @@ -23,7 +23,7 @@ <div id="radiolist"> <strong>Status: </strong> <asp:DropDownList ID="statusList" runat="server" AutoPostBack="True" OnSelectedIndexChanged="DropDownList1_SelectedIndexChanged" DataSourceID=StatusDataSource - DataTextField=stateName DataValueField=id AppendDataBoundItems=True> + DataTextField=statusName DataValueField=statusID AppendDataBoundItems=True> </asp:DropDownList><br /> <strong>Percent Complete: </strong> <asp:RadioButtonList ID="percentList" runat="server" RepeatDirection="Horizontal" @@ -35,9 +35,9 @@ <asp:ListItem>100</asp:ListItem> </asp:RadioButtonList> <asp:ObjectDataSource ID="StatusDataSource" runat="server" OldValuesParameterFormatString="original_{0}" - SelectMethod="GetStatusDataByGroup" TypeName="DummyDataSetTableAdapters.StatusTableAdapter"> + SelectMethod="GetStatusByGroup" TypeName="DummyDataSetTableAdapters.StatusTableAdapter"> <SelectParameters> - <asp:Parameter DefaultValue="ActionItem" Name="groupName" Type="String" /> + <asp:Parameter DefaultValue="ActionItem" Name="statusGroup" Type="String" /> </SelectParameters> </asp:ObjectDataSource> </div> Modified: WebPrototype/Admin.aspx.cs =================================================================== --- WebPrototype/Admin.aspx.cs 2006-07-06 18:05:10 UTC (rev 74) +++ WebPrototype/Admin.aspx.cs 2006-07-06 19:25:37 UTC (rev 75) @@ -13,6 +13,9 @@ { protected void Page_Load(object sender, EventArgs e) { - + if (!User.Identity.IsAuthenticated || Profile.userID == "") + { + Response.Redirect("Default.aspx"); + } } } Modified: WebPrototype/AdminMaster.master.cs =================================================================== --- WebPrototype/AdminMaster.master.cs 2006-07-06 18:05:10 UTC (rev 74) +++ WebPrototype/AdminMaster.master.cs 2006-07-06 19:25:37 UTC (rev 75) @@ -130,7 +130,7 @@ { // Create the new node. newNode = new TreeNode(); - newNode.Text = "<font color=black><i>" + row["number"] + "</i></font>"; + newNode.Text = "<font color=blue><i>" + row["number"] + "</i></font>"; newNode.Value = row["versionID"].ToString(); // Set the PopulateOnDemand property to true so that the child nodes can be @@ -149,7 +149,7 @@ else if (e.Node.Value == "tag") { // Populate Tags - query = "SELECT * FROM tags"; + query = "SELECT * FROM tags WHERE productID="+e.Node.Parent.Value; DBAdapter = new SqlDataAdapter(query, DBConnection); DBAdapter.Fill(ResultsDataSet); @@ -160,7 +160,7 @@ // Create the new node. newNode = new TreeNode(); newNode.Text = "<font color=blue><i>" + row["name"] + "</i></font>"; - newNode.Value = row["id"].ToString(); + newNode.Value = row["tagID"].ToString(); // Set the PopulateOnDemand property to true so that the child nodes can be // dynamically populated. @@ -264,7 +264,7 @@ else if (e.Node.Parent.Value == "status") { // Populate status - query = "SELECT * FROM status where groupname='" + e.Node.Value+"'"; + query = "SELECT * FROM status where statusGroup='" + e.Node.Value+"'"; DBAdapter = new SqlDataAdapter(query, DBConnection); DBAdapter.Fill(ResultsDataSet); @@ -274,8 +274,8 @@ { // Create the new node. newNode = new TreeNode(); - newNode.Text = "<font color=blue><i>" + row["stateName"] + "</i></font>"; - newNode.Value = row["id"].ToString(); + newNode.Text = "<font color=blue><i>" + row["statusName"] + "</i></font>"; + newNode.Value = row["statusID"].ToString(); // Set the PopulateOnDemand property to true so that the child nodes can be // dynamically populated. Modified: WebPrototype/App_Code/DummyDataSet.xsd =================================================================== --- WebPrototype/App_Code/DummyDataSet.xsd 2006-07-06 18:05:10 UTC (rev 74) +++ WebPrototype/App_Code/DummyDataSet.xsd 2006-07-06 19:25:37 UTC (rev 75) @@ -47,11 +47,11 @@ <SelectCommand> <DbCommand CommandType="Text" ModifiedByUser="True"> <CommandText>SELECT Objective.dateCreated, Objective.description, Objective.featureID, Feature.name AS featureName, Objective.name, Objective.objectiveID, - Objective.statusID, Status.stateName, Objective.userID, Users.firstName + ' ' + Users.lastName AS createdBy + Objective.statusID, Status.statusName, Objective.userID, Users.firstName + ' ' + Users.lastName AS createdBy FROM Objective LEFT OUTER JOIN Feature ON Objective.featureID = Feature.featureID LEFT OUTER JOIN Users ON Users.userID = Objective.userID LEFT OUTER JOIN - Status ON Status.id = Objective.statusID + Status ON Status.statusID = Objective.statusID WHERE (Objective.objectiveID = @objectiveID)</CommandText> <Parameters> <Parameter AllowDbNull="False" AutogeneratedName="objectiveID" ColumnName="objectiveID" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.Objective" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@objectiveID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="objectiveID" SourceColumnNullMapping="False" SourceVersion="Current"> @@ -146,10 +146,10 @@ <DbCommand CommandType="Text" ModifiedByUser="True"> <CommandText>SELECT TestCase.testcaseID, TestCase.objectiveID, Objective.name AS objectiveName, TestCase.name, TestCase.number, TestCase.steps, TestCase.creatorID, u1.firstName + ' ' + u1.lastName AS createdBy, TestCase.lastEditID, u2.firstName + ' ' + u2.lastName AS editedBy, - TestCase.dateCreated, TestCase.dateEdited, TestCase.statusID, Status.stateName + TestCase.dateCreated, TestCase.dateEdited, TestCase.statusID, Status.statusName FROM TestCase LEFT OUTER JOIN Objective ON TestCase.objectiveID = Objective.objectiveID LEFT OUTER JOIN - Status ON Status.id = TestCase.statusID LEFT OUTER JOIN + Status ON Status.statusID = TestCase.statusID LEFT OUTER JOIN Users AS u1 ON u1.userID = TestCase.creatorID LEFT OUTER JOIN Users AS u2 ON u2.userID = TestCase.lastEditID WHERE (TestCase.testcaseID = @testcaseID)</CommandText> @@ -217,7 +217,7 @@ <DbSource ConnectionRef="DummyDatabaseConnectionString (Web.config)" DbObjectName="dbo.Tags" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="False" GeneratorGetMethodName="GetAllTagData" GetMethodModifier="Public" GetMethodName="GetAllTagData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetAllTagData" UserSourceName="GetAllTagData"> <SelectCommand> <DbCommand CommandType="Text" ModifiedByUser="True"> - <CommandText>SELECT id, name, description + <CommandText>SELECT * FROM Tags</CommandText> <Parameters> </Parameters> @@ -226,17 +226,18 @@ </DbSource> </MainSource> <Mappings> - <Mapping SourceColumn="id" DataSetColumn="id" /> <Mapping SourceColumn="name" DataSetColumn="name" /> <Mapping SourceColumn="description" DataSetColumn="description" /> + <Mapping SourceColumn="tagID" DataSetColumn="tagID" /> + <Mapping SourceColumn="productID" DataSetColumn="productID" /> </Mappings> <Sources> <DbSource ConnectionRef="DummyDatabaseConnectionString (Web.config)" DbObjectName="dbo.Tags" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="True" GeneratorGetMethodName="GetTagsByTestCaseID" GetMethodModifier="Public" GetMethodName="GetTagsByTestCaseID" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="True" UserGetMethodName="GetTagsByTestCaseID" UserSourceName="GetTagsByTestCaseID1"> <SelectCommand> <DbCommand CommandType="Text" ModifiedByUser="True"> - <CommandText>SELECT Tags.id, Tags.name, Tags.description + <CommandText>SELECT Tags.description, Tags.name, Tags.productID, Tags.tagID FROM Tags INNER JOIN - testCaseTags ON testCaseTags.tagID = Tags.id + testCaseTags ON testCaseTags.tagID = Tags.tagID WHERE (testCaseTags.testCaseID = @testcaseID)</CommandText> <Parameters> <Parameter AllowDbNull="False" AutogeneratedName="testcaseID" ColumnName="testCaseID" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.testCaseTags" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@testcaseID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="testCaseID" SourceColumnNullMapping="False" SourceVersion="Current"> @@ -471,39 +472,46 @@ </TableAdapter> <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="StatusTableAdapter" GeneratorDataComponentClassName="StatusTableAdapter" Name="Status" UserDataComponentName="StatusTableAdapter"> <MainSource> - <DbSource ConnectionRef="DummyDatabaseConnectionString (Web.config)" DbObjectName="dbo.Status" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="False" GeneratorGetMethodName="GetStatusDataByGroup" GetMethodModifier="Public" GetMethodName="GetStatusDataByGroup" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetStatusDataByGroup" UserSourceName="GetStatusDataByGroup"> + <DbSource ConnectionRef="DummyDatabaseConnectionString (Web.config)" DbObjectName="dbo.Status" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="False" GeneratorGetMethodName="GetAllStatus" GetMethodModifier="Public" GetMethodName="GetAllStatus" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="False" UserGetMethodName="GetAllStatus" UserSourceName="GetAllStatus"> <SelectCommand> <DbCommand CommandType="Text" ModifiedByUser="True"> - <CommandText>SELECT id, stateName, description, groupName -FROM Status -WHERE (groupName = @groupName)</CommandText> + <CommandText>SELECT * FROM Status</CommandText> <Parameters> - <Parameter AllowDbNull="True" AutogeneratedName="groupName" ColumnName="groupName" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.Status" DataTypeServer="nchar(20)" DbType="String" Direction="Input" ParameterName="@groupName" Precision="0" ProviderType="NChar" Scale="0" Size="20" SourceColumn="groupName" SourceColumnNullMapping="False" SourceVersion="Current"> - </Parameter> </Parameters> </DbCommand> </SelectCommand> </DbSource> </MainSource> <Mappings> - <Mapping SourceColumn="id" DataSetColumn="id" /> - <Mapping SourceColumn="stateName" DataSetColumn="stateName" /> <Mapping SourceColumn="description" DataSetColumn="description" /> - <Mapping SourceColumn="groupName" DataSetColumn="groupName" /> + <Mapping SourceColumn="statusID" DataSetColumn="statusID" /> + <Mapping SourceColumn="statusGroup" DataSetColumn="statusGroup" /> + <Mapping SourceColumn="statusName" DataSetColumn="statusName" /> </Mappings> <Sources> + <DbSource ConnectionRef="DummyDatabaseConnectionString (Web.config)" DbObjectName="dbo.Status" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="True" GeneratorGetMethodName="GetStatusByGroup" GetMethodModifier="Public" GetMethodName="GetStatusByGroup" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="True" UserGetMethodName="GetStatusByGroup" UserSourceName="GetStatusByGroup1"> + <SelectCommand> + <DbCommand CommandType="Text" ModifiedByUser="True"> + <CommandText>SELECT * FROM Status WHERE statusGroup=@statusGroup</CommandText> + <Parameters> + <Parameter AllowDbNull="False" AutogeneratedName="statusGroup" ColumnName="statusGroup" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.Status" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@statusGroup" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="statusGroup" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + </Parameters> + </DbCommand> + </SelectCommand> + </DbSource> <DbSource ConnectionRef="DummyDatabaseConnectionString (Web.config)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="True" GeneratorSourceName="InsertStatus" Modifier="Public" Name="InsertStatus" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="True" UserGetMethodName="GetDataBy" UserSourceName="InsertStatus"> <InsertCommand> <DbCommand CommandType="Text" ModifiedByUser="True"> <CommandText>INSERT INTO Status - (groupName, stateName, description) -VALUES (@groupName,@stateName,@description)</CommandText> + (statusGroup, statusName, description) +VALUES (@statusGroup,@statusName,@description)</CommandText> <Parameters> - <Parameter AllowDbNull="True" AutogeneratedName="groupName" ColumnName="groupName" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.Status" DataTypeServer="nchar(20)" DbType="String" Direction="Input" ParameterName="@groupName" Precision="0" ProviderType="NChar" Scale="0" Size="20" SourceColumn="groupName" SourceColumnNullMapping="False" SourceVersion="Current"> + <Parameter AllowDbNull="False" AutogeneratedName="statusGroup" ColumnName="statusGroup" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.Status" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@statusGroup" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="statusGroup" SourceColumnNullMapping="False" SourceVersion="Current"> </Parameter> - <Parameter AllowDbNull="True" AutogeneratedName="stateName" ColumnName="stateName" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.Status" DataTypeServer="nchar(50)" DbType="String" Direction="Input" ParameterName="@stateName" Precision="0" ProviderType="NChar" Scale="0" Size="50" SourceColumn="stateName" SourceColumnNullMapping="False" SourceVersion="Current"> + <Parameter AllowDbNull="False" AutogeneratedName="statusName" ColumnName="statusName" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.Status" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@statusName" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="statusName" SourceColumnNullMapping="False" SourceVersion="Current"> </Parameter> - <Parameter AllowDbNull="True" AutogeneratedName="description" ColumnName="description" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.Status" DataTypeServer="nvarchar(255)" DbType="String" Direction="Input" ParameterName="@description" Precision="0" ProviderType="NVarChar" Scale="0" Size="255" SourceColumn="description" SourceColumnNullMapping="False" SourceVersion="Current"> + <Parameter AllowDbNull="True" AutogeneratedName="description" ColumnName="description" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.Status" DataTypeServer="text" DbType="AnsiString" Direction="Input" ParameterName="@description" Precision="0" ProviderType="Text" Scale="0" Size="2147483647" SourceColumn="description" SourceColumnNullMapping="False" SourceVersion="Current"> </Parameter> </Parameters> </DbCommand> @@ -554,6 +562,31 @@ <Mapping SourceColumn="active" DataSetColumn="active" /> </Mappings> <Sources> + <DbSource ConnectionRef="DummyDatabaseConnectionString (Web.config)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="True" GeneratorSourceName="DeleteVersionByID" Modifier="Public" Name="DeleteVersionByID" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="True" UserGetMethodName="GetDataBy" UserSourceName="DeleteVersionByID"> + <DeleteCommand> + <DbCommand CommandType="Text" ModifiedByUser="True"> + <CommandText>DELETE FROM version WHERE versionID=@original_versionID</CommandText> + <Parameters> + <Parameter AllowDbNull="False" AutogeneratedName="original_versionID" ColumnName="versionID" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.version" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@original_versionID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="versionID" SourceColumnNullMapping="False" SourceVersion="Original"> + </Parameter> + </Parameters> + </DbCommand> + </DeleteCommand> + </DbSource> + <DbSource ConnectionRef="DummyDatabaseConnectionString (Web.config)" DbObjectType="Unknown" GenerateMethods="Get" GenerateShortCommands="True" GeneratorGetMethodName="GetVersionByID" GetMethodModifier="Public" GetMethodName="GetVersionByID" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="True" UserGetMethodName="GetVersionByID" UserSourceName="FillBy"> + <SelectCommand> + <DbCommand CommandType="Text" ModifiedByUser="True"> + <CommandText>SELECT version.versionID, version.productID, product.name AS productName, version.number, version.dateCreated, version.active +FROM version LEFT OUTER JOIN + product ON product.productID = version.productID +WHERE (version.versionID = @versionID)</CommandText> + <Parameters> + <Parameter AllowDbNull="False" AutogeneratedName="versionID" ColumnName="versionID" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.version" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@versionID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="versionID" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + </Parameters> + </DbCommand> + </SelectCommand> + </DbSource> <DbSource ConnectionRef="DummyDatabaseConnectionString (Web.config)" DbObjectName="dbo.version" DbObjectType="Table" GenerateMethods="Get" GenerateShortCommands="True" GeneratorGetMethodName="GetVersionsByProductID" GetMethodModifier="Public" GetMethodName="GetVersionsByProductID" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="True" UserGetMethodName="GetVersionsByProductID" UserSourceName="GetVersionsByProductID1"> <SelectCommand> <DbCommand CommandType="Text" ModifiedByUser="True"> @@ -581,6 +614,42 @@ </DbCommand> </SelectCommand> </DbSource> + <DbSource ConnectionRef="DummyDatabaseConnectionString (Web.config)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="True" GeneratorSourceName="InsertVersion" Modifier="Public" Name="InsertVersion" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="True" UserGetMethodName="GetDataBy2" UserSourceName="InsertVersion"> + <InsertCommand> + <DbCommand CommandType="Text" ModifiedByUser="True"> + <CommandText>INSERT INTO version + (productID, number, dateCreated) +VALUES (@productID,@number,@dateCreated)</CommandText> + <Parameters> + <Parameter AllowDbNull="False" AutogeneratedName="productID" ColumnName="productID" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.version" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@productID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="productID" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="False" AutogeneratedName="number" ColumnName="number" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.version" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@number" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="number" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="False" AutogeneratedName="dateCreated" ColumnName="dateCreated" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.version" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@dateCreated" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="dateCreated" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + </Parameters> + </DbCommand> + </InsertCommand> + </DbSource> + <DbSource ConnectionRef="DummyDatabaseConnectionString (Web.config)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="True" GeneratorGetMethodName="GetDataBy1" GeneratorSourceName="UpdateVersionByID" Modifier="Public" Name="UpdateVersionByID" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="True" UserGetMethodName="GetDataBy1" UserSourceName="UpdateVersionByID"> + <UpdateCommand> + <DbCommand CommandType="Text" ModifiedByUser="True"> + <CommandText>UPDATE version +SET productID = @productID, number = @number, active = @active +WHERE (versionID = @original_versionID)</CommandText> + <Parameters> + <Parameter AllowDbNull="False" AutogeneratedName="productID" ColumnName="productID" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.version" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@productID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="productID" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="False" AutogeneratedName="number" ColumnName="number" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.version" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@number" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="number" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="False" AutogeneratedName="active" ColumnName="active" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.version" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@active" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="active" SourceColumnNullMapping="False" SourceVersion="Current"> + </Parameter> + <Parameter AllowDbNull="False" AutogeneratedName="original_versionID" ColumnName="versionID" DataSourceName="[C:\DOCUMENTS AND SETTINGS\MICHAELT\DESKTOP\TCDB\WEBPROTOTYPE\APP_DATA\DATABASE.MDF].dbo.version" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@original_versionID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="versionID" SourceColumnNullMapping="False" SourceVersion="Original"> + </Parameter> + </Parameters> + </DbCommand> + </UpdateCommand> + </DbSource> </Sources> </TableAdapter> <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="versionTestCaseTableAdapter" GeneratorDataComponentClassName="versionTestCaseTableAdapter" Name="versionTestCase" UserDataComponentName="versionTestCaseTableAdapter"> @@ -674,21 +743,21 @@ <DbCommand CommandType="Text" ModifiedByUser="True"> <CommandText>SELECT 'AI' AS Type, ActionItem.name AS Assignment, Assignments.assignmentID, u1.firstName + ' ' + u1.lastName AS Creator, u2.firstName + ' ' + u2.lastName AS Assignee, Assignments.dateAssigned, Assignments.dateFinished, Assignments.dateDue, Assignments.statusID, - Status.stateName, Assignments.actionItemID AS id, Assignments.highPriorityID + Status.statusName, Assignments.actionItemID AS id, Assignments.highPriorityID FROM Assignments INNER JOIN ActionItem ON ActionItem.actionItemID = Assignments.actionItemID LEFT OUTER JOIN Users AS u1 ON u1.userID = Assignments.creatorID LEFT OUTER JOIN Users AS u2 ON u2.userID = Assignments.assignedID LEFT OUTER JOIN - Status ON Status.id = Assignments.statusID + Status ON Status.statusID = Assignments.statusID UNION SELECT 'WO' AS Type, WorkOrder.name AS Assignment, Assignments.assignmentID, u1.firstName + ' ' + u1.lastName AS Creator, u2.firstName + ' ' + u2.lastName AS Assignee, Assignments.dateAssigned, Assignments.dateFinished, Assignments.dateDue, Assignments.statusID, - Status.stateName, Assignments.workOrderID AS id, Assignments.highPriorityID + Status.statusName, Assignments.workOrderID AS id, Assignments.highPriorityID FROM Assignments INNER JOIN WorkOrder ON WorkOrder.workOrderID = Assignments.workOrderID LEFT OUTER JOIN Users AS u1 ON u1.userID = Assignments.creatorID LEFT OUTER JOIN Users AS u2 ON u2.userID = Assignments.assignedID LEFT OUTER JOIN - Status ON Status.id = Assignments.statusID</CommandText> + Status ON Status.statusID = Assignments.statusID</CommandText> <Parameters> </Parameters> </DbCommand> @@ -699,23 +768,23 @@ <DbCommand CommandType="Text" ModifiedByUser="True"> <CommandText>SELECT 'AI' AS Type, ActionItem.name AS Assignment, Assignments.assignmentID, u1.firstName + ' ' + u1.lastName AS Creator, u2.firstName + ' ' + u2.lastName AS Assignee, Assignments.dateAssigned, Assignments.dateFinished, Assignments.dateDue, Assignments.statusID, - Status.stateName, Assignments.actionItemID AS id, Assignments.highPriorityID + Status.statusName, Assignments.actionItemID AS id, Assignments.highPriorityID FROM Assignments INNER JOIN ActionItem ON ActionItem.actionItemID = Assignments.actionItemID LEFT OUTER JOIN Users AS u1 ON u1.userID = Assignments.creatorID LEFT OUTER JOIN Users AS u2 ON u2.userID = Assignments.assignedID LEFT OUTER JOIN - Status ON Status.id = Assignments.statusID + Status ON Status.statusID = Assignments.statusID WHERE (Assignments.assignedID = @assignedID) UNION -SELECT 'WO' AS Type, WorkOrder.name AS Assignment, Assignments.assignmentID, u1.firstName + ' ' + u1.lastName AS Creator, - u2.firstName + ' ' + u2.lastName AS Assignee, Assignments.dateAssigned, Assignments.dateFinished, Assignments.dateDue, Assignments.statusID, - Status.stateName, Assignments.workOrderID AS id, Assignments.highPriorityID -FROM Assignments INNER JOIN - WorkOrder ON WorkOrder.workOrderID = Assignments.workOrderID LEFT OUTER JOIN - Users AS u1 ON u1.userID = Assignments.creatorID LEFT OUTER JOIN - Users AS u2 ON u2.userID = Assignments.assignedID LEFT OUTER JOIN - Status ON Status.id = Assignments.statusID -WHERE (Assignments.assignedID = @assignedID)</CommandText> +SELECT 'WO' AS Type, WorkOrder.name AS Assignment, Assignments_1.assignmentID, u1.firstName + ' ' + u1.lastName AS Creator, + u2.firstName + ' ' + u2.lastName AS Assignee, Assignments_1.dateAssigned, Assignments_1.dateFinished, Assignments_1.dateDue, + Assignments_1.statusID, Status_1.statusName, Assignments_1.workOrderID AS id, Assignments_1.highPriorityID +FROM Assignments AS Assignments_1 INNER JOIN + WorkOrder ON WorkOrder.workOrderID = Assignments_1.workOrderID LEFT OUTER JOIN + Users AS u1 ON u1.userID = Assignments_1.creatorID LEFT OUTER JOIN + Users AS u2 ON u2.userID = Assignments_1.assignedID LEFT OUTER JOIN + Status AS Status_1 ON Status_1.statusID = Assignments_1.statusID +WHERE (Assignments_1.assignedID = @assignedID)</CommandText> <Parameters> <Parameter AllowDbNull="True" AutogeneratedName="assignedID" ColumnName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@assignedID" Precision="0" Scale="0" Size="4" SourceColumn="" SourceColumnNullMapping="False" SourceVersion="Current"> </Parameter> @@ -1177,8 +1246,7 @@ <xs:element name="Tags" msprop:Generator_UserTableName="Tags" msprop:Generator_RowDeletedName="TagsRowDeleted" msprop:Generator_RowChangedName="TagsRowChanged" msprop:Generator_RowClassName="TagsRow" msprop:Generator_RowChangingName="TagsRowChanging" msprop:Generator_RowEvArgName="TagsRowChangeEvent" msprop:Generator_RowEvHandlerName="TagsRowChangeEventHandler" msprop:Generator_TableClassName="TagsDataTable" msprop:Generator_TableVarName="tableTags" msprop:Generator_RowDeletingName="TagsRowDeleting" msprop:Generator_TablePropName="Tags"> <xs:complexType> <xs:sequence> - <xs:element name="id" msprop:Generator_UserColumnName="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" 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="name" msprop:Generator_UserColumnName="name" msprop:Generator_ColumnVarNameInTable="columnname" msprop:Generator_ColumnPropNameInRow="name" msprop:Generator_ColumnPropNameInTable="nameColumn"> <xs:simpleType> <xs:restriction base="xs:string"> <xs:maxLength value="50" /> @@ -1192,6 +1260,8 @@ </xs:restriction> </xs:simpleType> </xs:element> + <xs:element name="tagID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="tagID" msprop:Generator_ColumnPropNameInRow="tagID" msprop:Generator_ColumnVarNameInTable="columntagID" msprop:Generator_ColumnPropNameInTable="tagIDColumn" type="xs:int" /> + <xs:element name="productID" msprop:Generator_UserColumnName="productID" msprop:Generator_ColumnPropNameInRow="productID" msprop:Generator_ColumnVarNameInTable="columnproductID" msprop:Generator_ColumnPropNameInTable="productIDColumn" type="xs:int" /> </xs:sequence> </xs:complexType> </xs:element> @@ -1288,25 +1358,25 @@ <xs:element name="Status" msprop:Generator_UserTableName="Status" msprop:Generator_RowDeletedName="StatusRowDeleted" msprop:Generator_RowChangedName="StatusRowChanged" msprop:Generator_RowClassName="StatusRow" msprop:Generator_RowChangingName="StatusRowChanging" msprop:Generator_RowEvArgName="StatusRowChangeEvent" msprop:Generator_RowEvHandlerName="StatusRowChangeEventHandler" msprop:Generator_TableClassName="StatusDataTable" msprop:Generator_TableVarName="tableStatus" msprop:Generator_RowDeletingName="StatusRowDeleting" msprop:Generator_TablePropName="Status"> <xs:complexType> <xs:sequence> - <xs:element name="id" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_UserColumnName="id" msprop:Generator_ColumnVarNameInTable="columnid" msprop:Generator_ColumnPropNameInRow="id" msprop:Generator_ColumnPropNameInTable="idColumn" type="xs:int" /> - <xs:element name="stateName" msprop:Generator_UserColumnName="stateName" msprop:Generator_ColumnVarNameInTable="columnstateName" msprop:Generator_ColumnPropNameInRow="stateName" msprop:Generator_ColumnPropNameInTable="stateNameColumn" 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="50" /> + <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="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="statusGroup" msprop:Generator_UserColumnName="statusGroup" msprop:Generator_ColumnVarNameInTable="columnstatusGroup" msprop:Generator_ColumnPropNameInRow="statusGroup" msprop:Generator_ColumnPropNameInTable="statusGroupColumn"> <xs:simpleType> <xs:restriction base="xs:string"> - <xs:maxLength value="255" /> + <xs:maxLength value="50" /> </xs:restriction> </xs:simpleType> </xs:element> - <xs:element name="groupName" msprop:Generator_UserColumnName="groupName" msprop:Generator_ColumnVarNameInTable="columngroupName" msprop:Generator_ColumnPropNameInRow="groupName" msprop:Generator_ColumnPropNameInTable="groupNameColumn" minOccurs="0"> + <xs:element name="statusName" msprop:Generator_UserColumnName="statusName" msprop:Generator_ColumnVarNameInTable="columnstatusName" msprop:Generator_ColumnPropNameInRow="statusName" msprop:Generator_ColumnPropNameInTable="statusNameColumn"> <xs:simpleType> <xs:restriction base="xs:string"> - <xs:maxLength value="20" /> + <xs:maxLength value="50" /> </xs:restriction> </xs:simpleType> </xs:element> @@ -1530,12 +1600,16 @@ </xs:unique> <xs:unique name="Tags_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true"> <xs:selector xpath=".//mstns:Tags" /> - <xs:field xpath="mstns:id" /> + <xs:field xpath="mstns:tagID" /> </xs:unique> <xs:unique name="product_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true"> <xs:selector xpath=".//mstns:product" /> <xs:field xpath="mstns:productID" /> </xs:unique> + <xs:unique name="Status_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true"> + <xs:selector xpath=".//mstns:Status" /> + <xs:field xpath="mstns:statusID" /> + </xs:unique> <xs:unique name="testCaseTags_Constraint1" msdata:ConstraintName="Constraint1" msdata:PrimaryKey="true"> <xs:selector xpath=".//mstns:testCaseTags" /> <xs:field xpath="mstns:testCaseTagsID" /> Modified: WebPrototype/App_Code/DummyDataSet.xss =================================================================== --- WebPrototype/App_Code/DummyDataSet.xss 2006-07-06 18:05:10 UTC (rev 74) +++ WebPrototype/App_Code/DummyDataSet.xss 2006-07-06 19:25:37 UTC (rev 75) @@ -4,27 +4,27 @@ 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="-10" ViewPortY="-10" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout"> +<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="335" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout"> <Shapes> - <Shape ID="DesignTable:Objective" ZOrder="5" X="608" Y="25" Height="258" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="22" OldDataTableHeight="0" SplitterPosition="143" /> - <Shape ID="DesignTable:TestCase" ZOrder="4" X="628" Y="288" Height="309" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="194" /> - <Shape ID="DesignTable:Tags" ZOrder="17" X="945" Y="383" Height="139" Width="226" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="75" /> + <Shape ID="DesignTable:Objective" ZOrder="6" X="608" Y="25" Height="258" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="22" OldDataTableHeight="0" SplitterPosition="143" /> + <Shape ID="DesignTable:TestCase" ZOrder="5" X="628" Y="288" Height="309" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="194" /> + <Shape ID="DesignTable:Tags" ZOrder="17" X="950" Y="323" Height="156" Width="209" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" /> <Shape ID="DesignTable:product" ZOrder="19" X="949" Y="18" Height="292" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" /> - <Shape ID="DesignTable:Users" ZOrder="1" X="718" Y="823" Height="292" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" /> - <Shape ID="DesignTable:Status" ZOrder="18" X="8" Y="617" Height="156" Width="275" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" /> - <Shape ID="DesignTable:testCaseTags" ZOrder="16" X="962" Y="543" Height="122" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="75" /> - <Shape ID="DesignTable:version" ZOrder="2" X="704" Y="618" Height="190" Width="243" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="109" /> - <Shape ID="DesignTable:versionTestCase" ZOrder="3" X="954" Y="674" Height="122" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="75" /> - <Shape ID="DesignTable:featureVersion" ZOrder="15" X="954" Y="810" Height="139" Width="226" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="75" /> - <Shape ID="DesignTable:Assignments" ZOrder="8" X="21" Y="21" Height="275" Width="240" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="194" /> - <Shape ID="DesignTable:ActionItem" ZOrder="7" X="312" Y="8" Height="207" Width="279" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" /> - <Shape ID="DesignTable:WorkOrder" ZOrder="14" X="326" Y="242" Height="207" Width="269" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" /> - <Shape ID="DesignTable:workOrderTestCase" ZOrder="13" X="324" Y="458" Height="139" Width="289" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="75" /> - <Shape ID="DesignTable:platform" ZOrder="12" X="326" Y="608" Height="139" Width="204" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="75" /> - <Shape ID="DesignTable:result" ZOrder="11" X="14" Y="792" Height="139" Width="174" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" /> - <Shape ID="DesignTable:architecture" ZOrder="9" X="318" Y="766" Height="105" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="58" /> - <Shape ID="DesignTable:os" ZOrder="10" X="541" Y="625" Height="122" Width="154" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="75" /> - <Shape ID="DesignTable:Feature" ZOrder="6" X="22" Y="320" Height="275" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="160" /> + <Shape ID="DesignTable:Users" ZOrder="1" X="651" Y="848" Height="292" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="177" /> + <Shape ID="DesignTable:Status" ZOrder="18" X="8" Y="617" Height="173" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" /> + <Shape ID="DesignTable:testCaseTags" ZOrder="16" X="950" Y="485" Height="122" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="75" /> + <Shape ID="DesignTable:version" ZOrder="2" X="704" Y="618" Height="224" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="109" /> + <Shape ID="DesignTable:versionTestCase" ZOrder="4" X="956" Y="622" Height="122" Width="234" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="75" /> + <Shape ID="DesignTable:featureVersion" ZOrder="3" X="962" Y="755" Height="139" Width="226" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="75" /> + <Shape ID="DesignTable:Assignments" ZOrder="9" X="21" Y="21" Height="275" Width="240" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="194" /> + <Shape ID="DesignTable:ActionItem" ZOrder="8" X="312" Y="8" Height="207" Width="279" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" /> + <Shape ID="DesignTable:WorkOrder" ZOrder="15" X="326" Y="242" Height="207" Width="269" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" /> + <Shape ID="DesignTable:workOrderTestCase" ZOrder="14" X="324" Y="458" Height="139" Width="289" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="75" /> + <Shape ID="DesignTable:platform" ZOrder="13" X="326" Y="608" Height="139" Width="204" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="75" /> + <Shape ID="DesignTable:result" ZOrder="12" X="43" Y="824" Height="139" Width="174" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="92" /> + <Shape ID="DesignTable:architecture" ZOrder="10" X="318" Y="766" Height="105" Width="211" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="58" /> + <Shape ID="DesignTable:os" ZOrder="11" X="541" Y="625" Height="122" Width="154" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="75" /> + <Shape ID="DesignTable:Feature" ZOrder="7" X="22" Y="320" Height="275" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="160" /> </Shapes> <Connectors /> </DiagramLayout> \ No newline at end of file Modified: WebPrototype/App_Data/ASPNETDB.MDF =================================================================== (Binary files differ) Modified: WebPrototype/App_Data/Database.mdf =================================================================== (Binary files differ) Modified: WebPrototype/App_Data/Database_log.LDF =================================================================== (Binary files differ) Modified: WebPrototype/App_Data/aspnetdb_log.ldf =================================================================== (Binary files differ) Modified: WebPrototype/Assignments.aspx =================================================================== --- WebPrototype/Assignments.aspx 2006-07-06 18:05:10 UTC (rev 74) +++ WebPrototype/Assignments.aspx 2006-07-06 19:25:37 UTC (rev 75) @@ -55,7 +55,7 @@ HtmlEncode="False" ReadOnly="True" SortExpression="dateFinished"> <ItemStyle HorizontalAlign="Center" /> </asp:BoundField> - <asp:BoundField DataField="stateName" HeaderText="Status" ReadOnly="True" SortExpression="stateName"> + <asp:BoundField DataField="statusName" HeaderText="Status" ReadOnly="True" SortExpression="stateName"> <ItemStyle HorizontalAlign="Center" /> </asp:BoundField> </Columns> @@ -64,7 +64,7 @@ <asp:ObjectDataSource ID="AssignmentDataSource" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="GetAssignmentNamesByUser" TypeName="DummyDataSetTableAdapters.AssignmentsTableAdapter"> <SelectParameters> - <asp:Parameter Name="assignedID" Type="Int32" /> + <asp:SessionParameter Name="assignedID" SessionField="id" Type="Int32" /> </SelectParameters> </asp:ObjectDataSource> Modified: WebPrototype/Assignments.aspx.cs =================================================================== --- WebPrototype/Assignments.aspx.cs 2006-07-06 18:05:10 UTC (rev 74) +++ WebPrototype/Assignments.aspx.cs 2006-07-06 19:25:37 UTC (rev 75) @@ -24,13 +24,9 @@ if (id == null) { - AssignmentDataSource.SelectMethod = "GetAllAssignmentNames"; - AssignmentDataSource.SelectParameters.Clear(); + id = Profile.userID; } - else - { - AssignmentDataSource.SelectParameters["assignedID"].DefaultValue = id; - } + Session.Add("id", id); } private void filter(GridViewRow gRow) Modified: WebPrototype/ObjectiveEdit.aspx =================================================================== --- WebPrototype/ObjectiveEdit.aspx 2006-07-06 18:05:10 UTC (rev 74) +++ WebPrototype/ObjectiveEdit.aspx 2006-07-06 19:25:37 UTC (rev 75) @@ -38,7 +38,7 @@ </td> <td colspan="1" align=right> <strong>Status:</strong> - <asp:Label ID="statusLbl" runat="server" Text='<%# Eval("stateName") %>'></asp:Label> + <asp:Label ID="statusLbl" runat="server" Text='<%# Eval("statusName") %>'></asp:Label> </td> </tr> <tr> @@ -107,12 +107,12 @@ </td> <td align=right> <strong>Status:</strong> <asp:DropDownList ID="status" runat="server" - DataSourceID="statusDataSource" DataTextField="stateName" DataValueField="id" SelectedValue='<%# Bind("statusID") %>'> + DataSourceID="statusDataSource" DataTextField="statusName" DataValueField="statusID" SelectedValue='<%# Bind("statusID") %>'> </asp:DropDownList> <asp:ObjectDataSource ID="statusDataSource" runat="server" OldValuesParameterFormatString="original_{0}" TypeName="DummyDataSetTableAdapters.StatusTableAdapter" SelectMethod=GetStatusDataByGroup> <SelectParameters> - <asp:Parameter DefaultValue="objective" Name="groupName" Type="String" /> + <asp:Parameter DefaultValue="objective" Name="statusGroup" Type="String" /> </SelectParameters> </asp:ObjectDataSource> </td> @@ -187,12 +187,12 @@ </td> <td align=right> <strong>Status:</strong> <asp:DropDownList ID="status" runat="server" - DataSourceID="statusDataSource" DataTextField="stateName" DataValueField="id" SelectedValue='<%# Bind("statusID") %>'> + DataSourceID="statusDataSource" DataTextField="statusName" DataValueField="statusID" SelectedValue='<%# Bind("statusID") %>'> </asp:DropDownList> <asp:ObjectDataSource ID="statusDataSource" runat="server" OldValuesParameterFormatString="original_{0}" TypeName="DummyDataSetTableAdapters.StatusTableAdapter" SelectMethod=GetStatusDataByGroup> <SelectParameters> - <asp:Parameter DefaultValue="objective" Name="groupName" Type="String" /> + <asp:Parameter DefaultValue="objective" Name="statusGroup" Type="String" /> </SelectParameters> </asp:ObjectDataSource> </td> @@ -256,7 +256,7 @@ <asp:Parameter Name="original_objectiveID" Type="Int32" /> </UpdateParameters> <SelectParameters> - <asp:Parameter Name="objectiveID" Type="Int32" /> + <asp:SessionParameter Name="objectiveID" SessionField="id" Type="Int32" /> </SelectParameters> </asp:ObjectDataSource> </asp:Content> Modified: WebPrototype/ObjectiveEdit.aspx.cs =================================================================== --- WebPrototype/ObjectiveEdit.aspx.cs 2006-07-06 18:05:10 UTC (rev 74) +++ WebPrototype/ObjectiveEdit.aspx.cs 2006-07-06 19:25:37 UTC (rev 75) @@ -14,11 +14,15 @@ public partial class ObjectiveEdit : System.Web.UI.Page { - int id = System.Convert.ToInt32(HttpContext.Current.Request.QueryString["id"]); + String id = HttpContext.Current.Request.QueryString["id"]; protected void Page_Load(object sender, EventArgs e) { - objectiveDataSource.SelectParameters["objectiveID"].DefaultValue = id.ToString(); + if (id == null) + { + id = "0"; + } + Session.Add("id", id); } protected void FormView1_DataBound(object sender, EventArgs e) @@ -52,7 +56,7 @@ DBAdapter.Fill(result); if (result.Tables.Count > 0 && result.Tables[0].Rows.Count > 0) { - id = Convert.ToInt32(result.Tables[0].Rows[0]["newID"]); + id = result.Tables[0].Rows[0]["newID"].ToString(); } SqlCommand cmd = new SqlCommand("UPDATE Objective Set " + "userID=" + createdBy.Attributes["userID"] + Modified: WebPrototype/TestCaseEdit.aspx =================================================================== --- WebPrototype/TestCaseEdit.aspx 2006-07-06 18:05:10 UTC (rev 74) +++ WebPrototype/TestCaseEdit.aspx 2006-07-06 19:25:37 UTC (rev 75) @@ -36,7 +36,7 @@ Text='<%# Eval("dateEdited", "{0:d}") %>'></asp:Label></strong> <br /> <strong>Status: </strong> - <asp:Label ID="statusLbl" runat="server" Font-Bold="False" Text='<%# Eval("stateName") %>'></asp:Label> + <asp:Label ID="statusLbl" runat="server" Font-Bold="False" Text='<%# Eval("statusName") %>'></asp:Label> </td> </tr> <tr> @@ -59,7 +59,7 @@ <td colspan=2 valign=top width="50%"> <strong>Tags:</strong><br /> <asp:ListBox ID="tagListBox" runat="server" DataSourceID="TagDataSource" DataTextField="name" - DataValueField="id" Height="104px" Width="100%" SelectionMode=Multiple></asp:ListBox><asp:ObjectDataSource + DataValueField="tagID" Height="104px" Width="100%" SelectionMode=Multiple></asp:ListBox><asp:ObjectDataSource ID="TagDataSource" runat="server... [truncated message content] |
