diff --git a/Core/DataObjects/ProfitTrailerData.cs b/Core/DataObjects/ProfitTrailerData.cs
index b49fa63..df01a9a 100644
--- a/Core/DataObjects/ProfitTrailerData.cs
+++ b/Core/DataObjects/ProfitTrailerData.cs
@@ -355,15 +355,9 @@ namespace Core.Main.DataObjects
sellLogData.ProfitPercent = rsld.profit;
sellLogData.SoldPrice = rsld.currentPrice;
sellLogData.AverageBuyPrice = rsld.avgPrice;
- sellLogData.TotalCost = sellLogData.SoldAmount * sellLogData.AverageBuyPrice;
+ sellLogData.TotalCost = rsld.totalCost;
+ sellLogData.Profit = rsld.profitCurrency;
- // check if bot is a shortbot via PT API. Losses on short bot currently showing as gains. Issue #195
- // code removed
-
- double soldValueRaw = (sellLogData.SoldAmount * sellLogData.SoldPrice);
- double soldValueAfterFees = soldValueRaw - (soldValueRaw * ((double)rsld.fee / 100));
- sellLogData.SoldValue = soldValueAfterFees;
- sellLogData.Profit = Math.Round(sellLogData.SoldValue - sellLogData.TotalCost, 8);
//Convert Unix Timestamp to Datetime
System.DateTime dtDateTime = new DateTime(1970, 1, 1, 0, 0, 0, System.DateTimeKind.Utc);
diff --git a/Monitor/Pages/SalesAnalyzer.cshtml b/Monitor/Pages/SalesAnalyzer.cshtml
index 79e99b7..f75c554 100644
--- a/Monitor/Pages/SalesAnalyzer.cshtml
+++ b/Monitor/Pages/SalesAnalyzer.cshtml
@@ -62,14 +62,7 @@
@{
double totalProfit = 0;
- if (Model.PTData.Properties.Shorting)
- {
- totalProfit = Model.PTData.SellLog.Sum(s => s.Profit * (-1));
- }
- else
- {
- totalProfit = Model.PTData.SellLog.Sum(s => s.Profit);
- }
+ totalProfit = Model.PTData.SellLog.Sum(s => s.Profit);
double totalProfitFiat = Math.Round(totalProfit * Model.Summary.MainMarketPrice, 2);
double percentGain = Math.Round(totalProfit / Model.PTMagicConfiguration.GeneralSettings.Application.StartBalance * 100, 2);
double avgDailyGain = Model.DailyGains.Values.Average(dg => dg);
@@ -205,14 +198,7 @@
@for (DateTime salesDate = Model.DateTimeNow.DateTime.Date; salesDate >= Model.DateTimeNow.DateTime.AddDays(-Model.PTMagicConfiguration.GeneralSettings.Monitor.MaxDailySummaries) && salesDate >= Model.MinSellLogDate; salesDate = salesDate.AddDays(-1)) {
List salesDateSales = Model.PTData.SellLog.FindAll(sl => sl.SoldDate.Date == salesDate);
double salesDateProfit = 0;
- if (Model.PTData.Properties.Shorting)
- {
- salesDateProfit = salesDateSales.Sum(sl => sl.Profit * (-1));
- }
- else
- {
- salesDateProfit = salesDateSales.Sum(sl => sl.Profit);
- }
+ salesDateProfit = salesDateSales.Sum(sl => sl.Profit);
double salesDateProfitFiat = Math.Round(salesDateProfit * Model.Summary.MainMarketPrice, 2);
double salesDateStartBalance = Model.PTData.GetSnapshotBalance(salesDate);
double salesDateGain = Math.Round(salesDateProfit / salesDateStartBalance * 100, 2);
@@ -252,14 +238,7 @@
@for (DateTime salesMonthDate = salesMonthStartDate.Date; salesMonthDate >= Model.DateTimeNow.DateTime.AddMonths(-Model.PTMagicConfiguration.GeneralSettings.Monitor.MaxMonthlySummaries) && salesMonthDate >= minSellLogMonthDate; salesMonthDate = salesMonthDate.AddMonths(-1)) {
List salesMonthSales = Model.PTData.SellLog.FindAll(sl => sl.SoldDate.Date.Month == salesMonthDate.Month && sl.SoldDate.Date.Year == salesMonthDate.Year);
double salesDateProfit = 0;
- if (Model.PTData.Properties.Shorting)
- {
- salesDateProfit = salesMonthSales.Sum(sl => sl.Profit * (-1));
- }
- else
- {
- salesDateProfit = salesMonthSales.Sum(sl => sl.Profit);
- }
+ salesDateProfit = salesMonthSales.Sum(sl => sl.Profit);
double salesDateProfitFiat = Math.Round(salesDateProfit * Model.Summary.MainMarketPrice, 2);
double salesDateStartBalance = Model.PTData.GetSnapshotBalance(salesMonthDate);
double salesDateGain = Math.Round(salesDateProfit / salesDateStartBalance * 100, 2);
@@ -272,14 +251,7 @@
days++;
List monthDaySales = Model.PTData.SellLog.FindAll(sl => sl.SoldDate.Date == monthDay.Date);
double monthDayProfit = 0;
- if (Model.PTData.Properties.Shorting)
- {
- monthDayProfit = monthDaySales.Sum(sl => sl.Profit * (-1));
- }
- else
- {
- monthDayProfit = monthDaySales.Sum(sl => sl.Profit);
- }
+ monthDayProfit = monthDaySales.Sum(sl => sl.Profit);
double monthDayStartBalance = Model.PTData.GetSnapshotBalance(monthDay);
monthDailyProfit += Math.Round(monthDayProfit / monthDayStartBalance * 100, 2);
}
@@ -319,10 +291,6 @@
@{
var topMarkets = Model.PTData.SellLog.GroupBy(m => m.Market).Select(mg => mg.Sum(m => m.Profit));
- if (Model.PTData.Properties.Shorting)
- {
- topMarkets = Model.PTData.SellLog.GroupBy(m => m.Market).Select(mg => mg.Sum(m => m.Profit) * (-1));
- }
int marketRank = 0;
}
@foreach (KeyValuePair marketData in Model.TopMarkets) {
diff --git a/Monitor/Pages/SalesAnalyzer.cshtml.cs b/Monitor/Pages/SalesAnalyzer.cshtml.cs
index 1b2a00f..74d1b73 100644
--- a/Monitor/Pages/SalesAnalyzer.cshtml.cs
+++ b/Monitor/Pages/SalesAnalyzer.cshtml.cs
@@ -46,14 +46,7 @@ namespace Monitor.Pages
foreach (var market in markets)
{
double totalProfit = 0;
- if (PTData.Properties.Shorting)
- {
- totalProfit = PTData.SellLog.FindAll(m => m.Market == market.Key).Sum(m => m.Profit * (-1));
- }
- else
- {
- totalProfit = PTData.SellLog.FindAll(m => m.Market == market.Key).Sum(m => m.Profit);
- }
+ totalProfit = PTData.SellLog.FindAll(m => m.Market == market.Key).Sum(m => m.Profit);
topMarketsDic.Add(market.Key, totalProfit);
}
TopMarkets = new SortedDictionary(topMarketsDic).OrderByDescending(m => m.Value).Take(PTMagicConfiguration.GeneralSettings.Monitor.MaxTopMarkets);
@@ -81,14 +74,7 @@ namespace Monitor.Pages
}
double profit = 0;
int trades = PTData.SellLog.FindAll(t => t.SoldDate.Date == salesDate.Date).Count;
- if (PTData.Properties.Shorting)
- {
- profit = PTData.SellLog.FindAll(t => t.SoldDate.Date == salesDate.Date).Sum(t => t.Profit * (-1));
- }
- else
- {
- profit = PTData.SellLog.FindAll(t => t.SoldDate.Date == salesDate.Date).Sum(t => t.Profit);
- }
+ profit = PTData.SellLog.FindAll(t => t.SoldDate.Date == salesDate.Date).Sum(t => t.Profit);
double profitFiat = Math.Round(profit * Summary.MainMarketPrice, 2);
balance += profitFiat;
tradesPerDayJSON += "{x: new Date('" + salesDate.Date.ToString("yyyy-MM-dd") + "'), y: " + trades + "}";
@@ -124,14 +110,7 @@ namespace Monitor.Pages
{
List salesDateSales = PTData.SellLog.FindAll(sl => sl.SoldDate.Date == salesDate);
double salesDateProfit;
- if (PTData.Properties.Shorting)
- {
- salesDateProfit = salesDateSales.Sum(sl => sl.Profit * (-1));
- }
- else
- {
- salesDateProfit = salesDateSales.Sum(sl => sl.Profit);
- }
+ salesDateProfit = salesDateSales.Sum(sl => sl.Profit);
double salesDateStartBalance = PTData.GetSnapshotBalance(salesDate);
double salesDateGain = Math.Round(salesDateProfit / salesDateStartBalance * 100, 2);
DailyGains.Add(salesDate, salesDateGain);
@@ -142,14 +121,7 @@ namespace Monitor.Pages
{
List salesMonthSales = PTData.SellLog.FindAll(sl => sl.SoldDate.Date.Month == salesMonthDate.Month && sl.SoldDate.Date.Year == salesMonthDate.Year);
double salesDateProfit;
- if (PTData.Properties.Shorting)
- {
- salesDateProfit = salesMonthSales.Sum(sl => sl.Profit * (-1));
- }
- else
- {
- salesDateProfit = salesMonthSales.Sum(sl => sl.Profit);
- }
+ salesDateProfit = salesMonthSales.Sum(sl => sl.Profit);
double salesDateStartBalance = PTData.GetSnapshotBalance(salesMonthDate);
double salesDateGain = Math.Round(salesDateProfit / salesDateStartBalance * 100, 2);
MonthlyGains.Add(salesMonthDate, salesDateGain);
diff --git a/Monitor/Pages/_get/DashboardBottom.cshtml b/Monitor/Pages/_get/DashboardBottom.cshtml
index 03cff44..823b6f6 100644
--- a/Monitor/Pages/_get/DashboardBottom.cshtml
+++ b/Monitor/Pages/_get/DashboardBottom.cshtml
@@ -121,14 +121,7 @@
@{
double totalProfit = 0;
- if (Model.PTData.Properties.Shorting)
- {
- totalProfit = Model.PTData.SellLog.Sum(s => s.Profit * (-1));
- }
- else
- {
- totalProfit = Model.PTData.SellLog.Sum(s => s.Profit);
- }
+ totalProfit = Model.PTData.SellLog.Sum(s => s.Profit);
double totalProfitFiat = Math.Round(totalProfit * Model.Summary.MainMarketPrice, 2);
double percentGain = Math.Round(totalProfit / Model.PTMagicConfiguration.GeneralSettings.Application.StartBalance * 100, 2);
string percentGainText = percentGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) + "%";
@@ -138,53 +131,25 @@
}
double todaysProfit = 0;
- if (Model.PTData.Properties.Shorting)
- {
- todaysProfit = Model.PTData.SellLogToday.Sum(s => s.Profit * (-1));
- }
- else
- {
- todaysProfit = Model.PTData.SellLogToday.Sum(s => s.Profit);
- }
+ todaysProfit = Model.PTData.SellLogToday.Sum(s => s.Profit);
double todaysStartBalance = Model.PTData.GetSnapshotBalance(Model.DateTimeNow.DateTime);
double todaysProfitFiat = Math.Round(todaysProfit * Model.Summary.MainMarketPrice, 2);
double todaysPercentGain = Math.Round(todaysProfit / todaysStartBalance * 100, 2);
double yesterdaysProfit = 0;
- if (Model.PTData.Properties.Shorting)
- {
- yesterdaysProfit = Model.PTData.SellLogYesterday.Sum(s => s.Profit * (-1));
- }
- else
- {
- yesterdaysProfit = Model.PTData.SellLogYesterday.Sum(s => s.Profit);
- }
+ yesterdaysProfit = Model.PTData.SellLogYesterday.Sum(s => s.Profit);
double yesterdaysStartBalance = Model.PTData.GetSnapshotBalance(Model.DateTimeNow.DateTime.AddDays(-1));
double yesterdaysProfitFiat = Math.Round(yesterdaysProfit * Model.Summary.MainMarketPrice, 2);
double yesterdaysPercentGain = Math.Round(yesterdaysProfit / yesterdaysStartBalance * 100, 2);
double last7DaysProfit = 0;
- if (Model.PTData.Properties.Shorting)
- {
- last7DaysProfit = Model.PTData.SellLogLast7Days.Sum(s => s.Profit * (-1));
- }
- else
- {
- last7DaysProfit = Model.PTData.SellLogLast7Days.Sum(s => s.Profit);
- }
+ last7DaysProfit = Model.PTData.SellLogLast7Days.Sum(s => s.Profit);
double last7DaysStartBalance = Model.PTData.GetSnapshotBalance(Model.DateTimeNow.DateTime.AddDays(-7));
double last7DaysProfitFiat = Math.Round(last7DaysProfit * Model.Summary.MainMarketPrice, 2);
double last7DaysPercentGain = Math.Round(last7DaysProfit / last7DaysStartBalance * 100, 2);
double last30DaysProfit = 0;
- if (Model.PTData.Properties.Shorting)
- {
- last30DaysProfit = Model.PTData.SellLogLast30Days.Sum(s => s.Profit * (-1));
- }
- else
- {
- last30DaysProfit = Model.PTData.SellLogLast30Days.Sum(s => s.Profit);
- }
+ last30DaysProfit = Model.PTData.SellLogLast30Days.Sum(s => s.Profit);
double last30DaysStartBalance = Model.PTData.GetSnapshotBalance(Model.DateTimeNow.DateTime.AddDays(-30));
double last30DaysProfitFiat = Math.Round(last30DaysProfit * Model.Summary.MainMarketPrice, 2);
double last30DaysPercentGain = Math.Round(last30DaysProfit / last30DaysStartBalance * 100, 2);
diff --git a/Monitor/Pages/_get/DashboardBottom.cshtml.cs b/Monitor/Pages/_get/DashboardBottom.cshtml.cs
index 5eb3390..0ff5157 100644
--- a/Monitor/Pages/_get/DashboardBottom.cshtml.cs
+++ b/Monitor/Pages/_get/DashboardBottom.cshtml.cs
@@ -145,10 +145,6 @@ namespace Monitor.Pages
}
int trades = PTData.SellLog.FindAll(t => t.SoldDate.Date == salesDate).Count;
double profit = PTData.SellLog.FindAll(t => t.SoldDate.Date == salesDate).Sum(t => t.Profit);
- if (PTData.Properties.Shorting)
- {
- profit = profit * (-1);
- }
double profitFiat = Math.Round(profit * Summary.MainMarketPrice, 2);
profitPerDayJSON += "{x: new Date('" + salesDate.ToString("yyyy-MM-dd") + "'), y: " + profitFiat.ToString("0.00", new System.Globalization.CultureInfo("en-US")) + "}";
tradeDayIndex++;