[tcdb-devel] SF.net SVN: tcdb: [107] Website

[<m_h...@us...>]

Revision: 107
Author:   m_hildebrand
Date:     2006-07-12 10:21:24 -0700 (Wed, 12 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/tcdb/?rev=107&view=rev

Log Message:
-----------
continued progress on implementation of python theme

Modified Paths:
--------------
    Website/Includes/Assignments.ascx
    Website/Includes/AssignmentsTree.ascx
    Website/web.config
Modified: Website/Includes/Assignments.ascx
===================================================================
--- Website/Includes/Assignments.ascx	2006-07-12 17:06:23 UTC (rev 106)
+++ Website/Includes/Assignments.ascx	2006-07-12 17:21:24 UTC (rev 107)
@@ -32,7 +32,8 @@
             else
                 id = Profile.userID;
              */
-            id = g_user.ID.ToString();
+            // TODO: uncomment this line!
+            //id = g_user.ID.ToString();
         }
         Session.Add("id", id);
     }
@@ -69,6 +70,7 @@
         else if (type == TCDB_Constant.ASSIGNMENT_TYPE_WORKORDER)
             gRow.Cells[1].Text = "<a href=\"WorkOrder.aspx?" + TCDB_Constant.CODE_WO + "=" + id + "\">" + name + "</a>";
 
+        /*
         if (cboPriorityFilter.Checked)
         {
             switch (priority)
@@ -83,6 +85,7 @@
                     break;
             }
         }
+        */
 
         String status = data["statusName"].ToString();
         if (gRow.Visible && cboStatusFilter.Checked)
@@ -394,6 +397,22 @@
                     <asp:BoundField DataField="statusName" HeaderText="Status" ReadOnly="True" SortExpression="stateName">
                         <ItemStyle HorizontalAlign="Center" />
                     </asp:BoundField>
+                    <asp:BoundField DataField="WOTotalTest" HeaderText="Total" ReadOnly="true" SortExpression="total">
+                        <ItemStyle HorizontalAlign="Center" />
+                    </asp:BoundField>
+                    <asp:BoundField DataField="WOPassRate" HeaderText="Pass Rate" ReadOnly="true" SortExpression="passRate">
+                        <ItemStyle HorizontalAlign="Center" />
+                    </asp:BoundField>
+                    <asp:BoundField DataField="WOPass" HeaderText="# Pass" ReadOnly="true" SortExpression="pass">
+                        <ItemStyle HorizontalAlign="Center" />
+                    </asp:BoundField>
+                    <asp:BoundField DataField="WOFail" HeaderText="# Fail" ReadOnly="true" SortExpression="fail">
+                        <ItemStyle HorizontalAlign="Center" />
+                    </asp:BoundField>
+                    <asp:BoundField DataField="WOError" HeaderText="# Error" ReadOnly="true" SortExpression="error">
+                        <ItemStyle HorizontalAlign="Center" />
+                    </asp:BoundField>
+                    
                 </Columns>
             </asp:GridView>
             &nbsp; &nbsp; &nbsp; &nbsp;
@@ -520,7 +539,6 @@
                             </div>
                         </td>
                     </tr>
-                    <!--
                         <tr>
                             <td valign="top">
                                 <div class="xsnazzy">

Modified: Website/Includes/AssignmentsTree.ascx
===================================================================
--- Website/Includes/AssignmentsTree.ascx	2006-07-12 17:06:23 UTC (rev 106)
+++ Website/Includes/AssignmentsTree.ascx	2006-07-12 17:21:24 UTC (rev 107)
@@ -75,13 +75,15 @@
     {
         // Populate the first-level nodes with users
         List<TCDB_User> userList = TCDB_UserDB.TCDB_GetUserList();
-
+        int numFoundUsers = 0;
+        
         if (userList.Count > 0)
         {
             foreach (TCDB_User u in userList)
             {
                 if (u.ID != g_user.ID)
                     continue;
+                numFoundUsers++;
                 
                 // Create the new child node. 
                 TreeNode child = new TreeNode();
@@ -102,6 +104,9 @@
                 parent.ChildNodes.Add(child);
             }
         }
+
+        // If we only found one user (the current user), hide the tree
+        if (numFoundUsers <= 1) AssignmentsTree.Visible = false;
     }
 </script>
 

Modified: Website/web.config
===================================================================
--- Website/web.config	2006-07-12 17:06:23 UTC (rev 106)
+++ Website/web.config	2006-07-12 17:21:24 UTC (rev 107)
@@ -45,7 +45,7 @@
 	</microsoft.web>
 	<appSettings/>
 	<connectionStrings>
-		<add name="dadConnectionString" connectionString="Data Source=dad\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw" providerName="System.Data.SqlClient"/>
+		<add name="dadConnectionString" connectionString="Data Source=dad\sqlserver2005;Initial Catalog=tcdb;Persist Security Info=True;User ID=tcdb;Password=tcdbpw;Connect timeout=60" providerName="System.Data.SqlClient"/>
 	</connectionStrings>
 	<system.web>
 		<authentication mode="Forms">


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.