diff --git a/UIUtils/CMTTrendModelClosePositionDialog.xaml b/UIUtils/CMTTrendModelClosePositionDialog.xaml
index acc2da9..32d9510 100644
--- a/UIUtils/CMTTrendModelClosePositionDialog.xaml
+++ b/UIUtils/CMTTrendModelClosePositionDialog.xaml
@@ -1,7 +1,7 @@
+
@@ -40,7 +41,7 @@
-
+
100.00
@@ -48,6 +49,8 @@
Delete Stop
+
+
diff --git a/UIUtils/CMTTrendModelClosePositionDialog.xaml.cs b/UIUtils/CMTTrendModelClosePositionDialog.xaml.cs
index 0bea07e..757ae02 100644
--- a/UIUtils/CMTTrendModelClosePositionDialog.xaml.cs
+++ b/UIUtils/CMTTrendModelClosePositionDialog.xaml.cs
@@ -138,11 +138,32 @@ namespace TradeBlotter.UIUtils
private bool Validate()
{
DateGenerator dateGenerator=new DateGenerator();
- if(null==Symbol) return false;
- if(Utility.IsEpoch(PurchaseDate)) return false;
- if(Utility.IsEpoch(SellDate))return false;
- if(!dateGenerator.IsMarketOpen(SellDate)) return false;
- if(double.IsNaN(SellPrice)) return false;
+ if(null==Symbol)
+ {
+ SetMessage("Invalid Symbol.");
+ return false;
+ }
+ if(Utility.IsEpoch(PurchaseDate))
+ {
+ SetMessage("Invalid Purchase Date.");
+ return false;
+ }
+ if(Utility.IsEpoch(SellDate))
+ {
+ SetMessage("Invalid Sell Date.");
+ return false;
+ }
+ if(!dateGenerator.IsMarketOpen(SellDate))
+ {
+ SetMessage("Market closed on Sell Date.");
+ return false;
+ }
+ if(double.IsNaN(SellPrice))
+ {
+ SetMessage("Invalid Sell Price.");
+ return false;
+ }
+ SetMessage("");
return true;
}
private void UpdateSellPrice()
@@ -155,5 +176,9 @@ namespace TradeBlotter.UIUtils
if(null==companyProfile||null==companyProfile.CompanyName) return;
lblCompanyName.Content=companyProfile.CompanyName.ToUpper();
}
+ private void SetMessage(String message)
+ {
+ lblMessage.Content=message;
+ }
}
}