Author: bendewey
Date: Sat Jul 18 17:06:25 2009
New Revision: 795399
URL: http://svn.apache.org/viewvc?rev=795399&view=rev
Log:
STONEHENGE-86 remove interfaceMode setting that was used, but not needed.
Modified:
incubator/stonehenge/trunk/stocktrader/dotnet/common/ServiceConfigurationSettings/Settings.cs
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx.cs
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/AccountOrders.ascx.cs
Modified:
incubator/stonehenge/trunk/stocktrader/dotnet/common/ServiceConfigurationSettings/Settings.cs
URL:
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/common/ServiceConfigurationSettings/Settings.cs?rev=795399&r1=795398&r2=795399&view=diff
==============================================================================
---
incubator/stonehenge/trunk/stocktrader/dotnet/common/ServiceConfigurationSettings/Settings.cs
(original)
+++
incubator/stonehenge/trunk/stocktrader/dotnet/common/ServiceConfigurationSettings/Settings.cs
Sat Jul 18 17:06:25 2009
@@ -76,11 +76,8 @@
public static string CLIENT_LABEL;
public static string BS_LABEL;
- public static int interfaceMode = -1;
-
public static readonly string CACHE_KEY_CLOSED_ORDERSALERT = "O";
-
-
+
//Page Names for StockTrader application
public static readonly string PAGE_HOME = "TradeHome.aspx";
public static readonly string PAGE_LOGIN = "Login.aspx";
@@ -113,29 +110,6 @@
Settings.BSL_PASSWORD =
ConfigurationManager.AppSettings.Get("BSL_PASSWORD");
Settings.CLIENT_LABEL =
ConfigurationManager.AppSettings.Get("CLIENT_LABEL");
Settings.BS_LABEL =
ConfigurationManager.AppSettings.Get("BS_LABEL");
- setAccessMode();
-
- }
-
-
- /// <summary>
- /// sets an interface mode which is used to detect whether or not the
DOTNET_CLIENT is being used.
- /// </summary>
- static public int setAccessMode()
- {
- //Using the database configuration system - this
BusinessServiceClient is created based on the CLIENTTOBS
- //Configuration Settings specified in the database i.e. the row
containing DOTNET_CLIENT
- var configClient = new ConfigServiceClient();
- var clientRequest = new ClientConfigRequest();
- clientRequest.ClientName = Settings.CLIENT_LABEL;
- var clientConfig = configClient.GetClientConfig(clientRequest);
-
- if (clientConfig.BSName.Equals(Settings.BS_LABEL))
- {
- interfaceMode = 1;
- }
- return interfaceMode;
- }
-
+ }
}
}
Modified:
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx
URL:
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx?rev=795399&r1=795398&r2=795399&view=diff
==============================================================================
---
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx
(original)
+++
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx
Sat Jul 18 17:06:25 2009
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
*/ %>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="MainContent" runat="server">
<controls:ClosedOrders id="ClosedOrdersControl" runat="server"
></controls:ClosedOrders>
<div class="main-title">
<h1>Account Information</h1>
<script type="text/javascript">
var thisdate = new Date();
document.writeln(thisdate.toLocaleString());
</script>
</div>
<table class="table-outer" cellspacing="0" align="center">
<thead>
<tr>
<th>Subtotal Buys</th>
<th>Subtotal Sells</th>
<th>Subtotal Fees</th>
<th>Net Impact Cash Balance</th>
</tr>
</thead>
<tbody>
<tr>
<td class="currency"><%=string.Format("{0:C}",
AccountOrdersControl.orderData.subtotalBuy)%></td>
<td class="currency"><%=string.Format("{0:C}",
AccountOrdersControl.orderData.subtotalSell)%></td>
<td class="currency"><%=string.Fo
rmat("{0:C}", AccountOrdersControl.orderData.txnFeesSubtotal)%></td>
<td
class="currency"><%=AccountOrdersControl.orderData.netImpactCashBalance%></td>
</tr>
</tbody>
</table>
-
<asp:Label ID="WASLimit" runat="server" />
<p style="float:right;"><asp:Label ID="orderLink"
runat="server"></asp:Label></p>
<p>Total Orders Shown: <b><asp:Label ID="NumOrdersShown" runat="server"
Text="numOrders" /></b></p>
<controls:AccountOrders id="AccountOrdersControl" runat="server" />
<table class="profile" cellspacing="0" width="100%">
<thead>
<tr>
+
<p style="float:right;"><asp:Label ID="orderLink"
runat="server"></asp:Label></p>
<p>Total Orders Shown: <b><asp:Label ID="NumOrdersShown" runat="server"
Text="numOrders" /></b></p>
<controls:AccountOrders id="AccountOrdersControl" runat="server" />
<table class="profile" cellspacing="0" width="100%">
<thead>
<tr>
<th>
<asp:Label ID="UpdateMessage" runat="server" Text="Update
Account Profile: " />
</th>
</tr>
</thead>
<tbody>
<tr>
<td>
<table cellspacing="0" align="center">
<tr>
<td>
Full Name:
</td>
<td>
<asp:TextBox ID="FullName" runat="server"
MaxLength="100" Width="200px" />
</td>
<td>
Email Address:
</td>
<td>
<asp:TextBox ID="Email" runat="server"
MaxLength="100" Width="200px" />
</td>
</tr>
<tr>
<td>
Address:
</td>
<td>
<asp:TextBox ID="Address" runat="server"
MaxLength="100" Width="200px" />
</td>
<td>
Password:
</td>
<td>
<asp:TextBox ID="Password" runat="server"
TextMode="Password" MaxLength="100" Width="200px" />
</td>
</tr>
<tr>
<td>
Credit Card:
</td>
<td>
<asp:TextBox ID="CreditCard" runat="server"
MaxLength="100" Width="200px" />
</td>
<td>
Confirm Password:
</td>
<td>
<asp:TextBox ID="ConfirmPassword"
runat="server" TextMode="Password" MaxLength="100" Width="200px" />
</td>
</tr>
<tr>
<td colspan="4" style="text-align:center">
<asp:RequiredFieldValidator
ID="RequiredFieldValidator4" runat="server" ControlToValidate="FullName"
Display="None" ErrorMessage="Please Enter a
Name" ValidationGroup="AccountEntry"></asp:RequiredFieldValidator>
<asp:RequiredFieldValidator
ID="RequiredFieldValidator3" runat="server" ControlToValidate="Email"
Display="None" ErrorMessage="Please Enter
an Email" ValidationGroup="AccountEntry"></asp:RequiredFieldValidator>
<asp:RequiredFieldValidator
ID="RequiredFieldValidator1" runat="server" ControlToValidate="Address"
Display="None" ErrorMessage="Please Enter
an Address" ValidationGroup="AccountEntry"></asp:RequiredFieldValidator>
<asp:RequiredFieldValidator
ID="RequiredFieldValidator5" runat="server" ControlToValidate="Password"
Display="None" ErrorMessage="Please Enter a
Password" ValidationGroup="AccountEntry"></asp:RequiredFieldValidator>
<asp:CompareValidator ID="CompareValidator1"
runat="server" ControlToCompare="Password"
ControlToValidate="ConfirmPassword"
Display="None" ErrorMessage="Passwords Do Not Match!"
ValidationGroup="AccountEntry"></asp:CompareValidator>
<asp:RequiredFieldValidator
ID="RequiredFieldValidator2" runat="server" ControlToValidate="CreditCard"
Display="None" ErrorMessage="Please Enter a
Credit Card" ValidationGroup="AccountEntry"></asp:RequiredFieldValidator>
<asp:ValidationSumm
ary ID="ValidationSummary1" runat="server" DisplayMode="List"
ValidationGroup="AccountEntry" />
</td>
</tr>
<tr>
<td colspan="4" class="button">
<asp:Button ID="UpdateProfileButton"
runat="server" CausesValidation="False" CssClass="button" Text="Update" />
</td>
</tr>
</table>
<br /><br />
<table align="center" class="profile-content"
cellspacing="0">
<tbody>
<tr>
<td class="left">
Account ID:
</td>
<td>
<asp:Label ID="AccountID" runat="se
rver" />
</td>
<td class="left">
Account Created
</td>
<td>
<asp:Label ID="CreationDate" runat="server"
/>
</td>
</tr>
<tr>
<td class="left">
User ID:
</td>
<td>
<asp:Label id="Name" runat="server" />
</td>
<td class="left">
Last Login:
</td>
<td>
<asp:Label ID="LastLogin" runat="server" />
</td>
</tr>
<tr>
<td class="left">
Opening Balance:
</td>
<td>
<asp:Label ID="OpenBalance" runat="server"
/>
</td>
<td class="left">
Total Logins:
</td>
<td>
<asp:Label ID="LoginCount" runat="server" />
</td>
</tr>
<tr>
<td class="left">
Cash Balance:
</td>
<td>
<asp:Label ID="Balance" runat="server" />
</td>
<td class="left">
Total Logouts:
</td>
<td>
<asp:Label id="TotalLogout" runat="server"
/>
</td>
</tr>
</tbody>
</table>
</td>
</tr>
Modified:
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx.cs
URL:
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx.cs?rev=795399&r1=795398&r2=795399&view=diff
==============================================================================
---
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx.cs
(original)
+++
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Account.aspx.cs
Sat Jul 18 17:06:25 2009
@@ -39,16 +39,9 @@
string userid = HttpContext.Current.User.Identity.Name;
string action = Request.QueryString["action"] ?? string.Empty;
- if (action.Equals("showtoporders",
StringComparison.InvariantCultureIgnoreCase)
- && (Settings.interfaceMode != 1))
- {
- NumOrdersShown.Text =
AccountOrdersControl.totalOrders.ToString();
- WASLimit.Text = "<div
style=\"font-size:8pt;color:darkred\">WebSphere Trade 6.1 Returns a Maximum of
5 Orders!</div>";
- }
- else
- NumOrdersShown.Text =
AccountOrdersControl.totalOrders.ToString();
+ NumOrdersShown.Text = AccountOrdersControl.totalOrders.ToString();
- if
(AccountOrdersControl.ordersRequested==Settings.MAX_DISPLAY_ORDERS)
+ if (AccountOrdersControl.ordersRequested ==
Settings.MAX_DISPLAY_ORDERS)
orderLink.Text = "<a
href=\"Account.aspx?action=showtoporders\">Show Top <b> " +
Settings.MAX_DISPLAY_TOP_ORDERS.ToString() + "</b> Orders</a>";
else
orderLink.Text = "<a href=\"Account.aspx\">Show Top <b>" +
Settings.MAX_DISPLAY_ORDERS.ToString() + "</b> Orders </a>";
Modified:
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/AccountOrders.ascx.cs
URL:
http://svn.apache.org/viewvc/incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/AccountOrders.ascx.cs?rev=795399&r1=795398&r2=795399&view=diff
==============================================================================
---
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/AccountOrders.ascx.cs
(original)
+++
incubator/stonehenge/trunk/stocktrader/dotnet/trader_client/Trade/Controls/AccountOrders.ascx.cs
Sat Jul 18 17:06:25 2009
@@ -44,8 +44,7 @@
string userid = HttpContext.Current.User.Identity.Name;
string action = Request.QueryString["action"] ?? string.Empty;
- if (action.Equals("showtoporders",
StringComparison.InvariantCultureIgnoreCase)
- && Settings.interfaceMode == 1)
+ if (action.Equals("showtoporders",
StringComparison.InvariantCultureIgnoreCase))
{
ordersRequested = Settings.MAX_DISPLAY_TOP_ORDERS;
orderData = businessServicesClient.getTopOrders(userid);
@@ -55,6 +54,7 @@
ordersRequested = Settings.MAX_DISPLAY_ORDERS;
orderData = businessServicesClient.getOrders(userid);
}
+
if (orderData.orders.Count != 0)
{
AccountOrdersRepeater.DataSource = orderData.orders;
