diff --git a/Monitor/Pages/MarketAnalyzer.cshtml b/Monitor/Pages/MarketAnalyzer.cshtml index 826d417..13a2f25 100644 --- a/Monitor/Pages/MarketAnalyzer.cshtml +++ b/Monitor/Pages/MarketAnalyzer.cshtml @@ -155,14 +155,14 @@ else
-

Market Trend Averages at @Model.PTMagicConfiguration.GeneralSettings.Application.Exchange

+

Live Trends at @Model.PTMagicConfiguration.GeneralSettings.Application.Exchange

- + @@ -190,9 +190,9 @@ else } else { - + } - + } } diff --git a/Monitor/Pages/SalesAnalyzer.cshtml b/Monitor/Pages/SalesAnalyzer.cshtml index 43edd36..0496bc6 100644 --- a/Monitor/Pages/SalesAnalyzer.cshtml +++ b/Monitor/Pages/SalesAnalyzer.cshtml @@ -118,8 +118,8 @@ - + @@ -130,7 +130,7 @@ - + @@ -151,10 +151,10 @@ - - - - + + + +
Name Markets TimeframeThreshold %Threshold Change
@marketTrend.TrendThreshold@marketTrend.TrendThreshold %@trendChangeOutput%@trendChangeOutput%
Total AVG/DayAVG/Month (@totalMonths Months) AVG/Month
@avgMonthlySales
@Model.PTData.Misc.Market@Model.PTData.Misc.Market @totalProfit.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")) @Math.Round(totalProfit / totalDays, 8).ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")) @avgMonthlyProfit.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US"))@Html.Raw(Math.Round(totalProfitFiat / totalMonths, 0).ToString("#,#0", new System.Globalization.CultureInfo("en-US")))
% Gain@totalPercentGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))%@avgDailyGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))%@avgMonthlyGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))%Gain@totalPercentGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) %@avgDailyGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) %@avgMonthlyGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) %
@@ -175,9 +175,9 @@ - Est. TCV - Est. @Model.PTData.Properties.Currency Value - Est. Gain + @Model.PTData.Misc.Market + @Model.PTData.Properties.Currency + Gain @@ -185,31 +185,31 @@ 1 Week @estimatedBalance1Week.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")) @Html.Raw(Math.Round(estimatedBalance1Week * Model.MiscData.FiatConversionRate, 0).ToString("#,#0", new System.Globalization.CultureInfo("en-US"))) - @Math.Round((estimatedBalance1Week - totalCurrentValue) / totalCurrentValue * 100, 2).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))% + @Math.Round((estimatedBalance1Week - totalCurrentValue) / totalCurrentValue * 100, 2).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) % 1 Month @estimatedBalance1Month.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")) @Html.Raw(Math.Round(estimatedBalance1Month * Model.MiscData.FiatConversionRate, 0).ToString("#,#0", new System.Globalization.CultureInfo("en-US"))) - @Math.Round((estimatedBalance1Month - totalCurrentValue) / totalCurrentValue * 100, 2).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))% + @Math.Round((estimatedBalance1Month - totalCurrentValue) / totalCurrentValue * 100, 2).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) % 3 Months @estimatedBalance3Months.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")) @Html.Raw(Math.Round(estimatedBalance3Months * Model.MiscData.FiatConversionRate, 0).ToString("#,#0", new System.Globalization.CultureInfo("en-US"))) - @Math.Round((estimatedBalance3Months - totalCurrentValue) / totalCurrentValue * 100, 2).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))% + @Math.Round((estimatedBalance3Months - totalCurrentValue) / totalCurrentValue * 100, 2).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) % 6 Months @estimatedBalance6Months.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")) @Html.Raw(Math.Round(estimatedBalance6Months * Model.MiscData.FiatConversionRate, 0).ToString("#,#0", new System.Globalization.CultureInfo("en-US"))) - @Math.Round((estimatedBalance6Months - totalCurrentValue) / totalCurrentValue * 100, 2).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))% + @Math.Round((estimatedBalance6Months - totalCurrentValue) / totalCurrentValue * 100, 2).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) % 1 Year @estimatedBalance1Year.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")) @Html.Raw(Math.Round(estimatedBalance1Year * Model.MiscData.FiatConversionRate, 0).ToString("#,#0", new System.Globalization.CultureInfo("en-US"))) - @Math.Round((estimatedBalance1Year - totalCurrentValue) / totalCurrentValue * 100, 2).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))% + @Math.Round((estimatedBalance1Year - totalCurrentValue) / totalCurrentValue * 100, 2).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) % @@ -217,6 +217,9 @@
+ + +
@@ -232,7 +235,7 @@ Sales Profit @Model.Summary.MainMarket Profit @Model.PTData.Properties.Currency - % Gain + Gain @@ -252,7 +255,7 @@ @sales @profit.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US")) @Math.Round(profitFiat,0).ToString("#,#0", new System.Globalization.CultureInfo("en-US")) - @avgProfit.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))% + @avgProfit.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) % } } @@ -261,7 +264,7 @@
-
+
@{ var maxMonths = Math.Min(Model.PTMagicConfiguration.GeneralSettings.Monitor.MaxMonthlySummaries, Model.MonthlyStats.Count); @@ -274,7 +277,7 @@ Sales Profit @Model.Summary.MainMarket Profit @Model.PTData.Properties.Currency - % Growth + Growth @@ -282,11 +285,11 @@ for (int i = 0; i < maxMonths; i++) { DateTime monthDate = DateTime.ParseExact(Model.PTData.MonthlyStats[i].Month, "M-yyyy", CultureInfo.InvariantCulture); - string monthName = monthDate.ToString("MMMM yyyy", CultureInfo.InvariantCulture); + string monthName = monthDate.ToString("MMMM", CultureInfo.InvariantCulture); var sales = Model.PTData.MonthlyStats[i].TotalSales; var profit = Model.PTData.MonthlyStats[i].TotalProfitCurrency; var profitFiat = Math.Round(profit * Model.PTData.Misc.FiatConversionRate, 0); - var growth = Model.PTData.MonthlyStats[i].AvgGrowth; + var growth = Math.Round(Model.PTData.MonthlyStats[i].AvgGrowth,2); @monthName @sales @@ -298,8 +301,10 @@ } -
+
+ @*
*@

Top @Model.PTMagicConfiguration.GeneralSettings.Monitor.MaxTopMarkets Sales Markets

@@ -310,7 +315,6 @@ - @@ -329,7 +333,6 @@ - rank++; } @@ -337,9 +340,9 @@
Profit @Model.PTData.Misc.Market Sales Avg/TradeProfit @Model.PTData.Properties.Currency
@profit @sales @avg @profitFiat
-
+ @*
*@ -
+
} @section Scripts { diff --git a/Monitor/Pages/_get/DashboardBottom.cshtml b/Monitor/Pages/_get/DashboardBottom.cshtml index e105a88..1f86804 100644 --- a/Monitor/Pages/_get/DashboardBottom.cshtml +++ b/Monitor/Pages/_get/DashboardBottom.cshtml @@ -12,7 +12,7 @@
-

Market Trend History

+

Market Trend History

@if (!Model.TrendChartDataJSON.Equals("")) {
@@ -53,7 +53,7 @@
@*
*@
-

Daily Profit +

Daily Profit @if (!Model.ProfitChartDataJSON.Equals("")) {
@@ -70,9 +70,9 @@
@*

*@ -

Live Trends   (@Model.PTMagicConfiguration.GeneralSettings.Application.Exchange)   - - ANALYZER +

Live Trends + + ANALYZER

@@ -80,7 +80,7 @@ - @@ -115,7 +115,7 @@ { } - + } } @@ -127,7 +127,7 @@

Sales Overview - + ANALYZER

@{ @@ -203,7 +203,7 @@
} - + @@ -214,7 +214,7 @@ } - + @@ -225,7 +225,7 @@ } - + @{ @@ -244,7 +244,7 @@ } - + @{ @@ -259,7 +259,7 @@ } - + @@ -270,7 +270,7 @@ } - +
Name Markets TimeframeThreshold   + Threshold   Change
@marketTrend.TrendThreshold %@trendChangeOutput%@trendChangeOutput %
@todaysFunding.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US"))@Html.Raw(todaysProfitFiat.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")))@todaysPercentGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))%@todaysPercentGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) %
Yesterday@yesterdaysFunding.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US"))@Html.Raw(yesterdaysProfitFiat.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")))@yesterdaysPercentGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))%@yesterdaysPercentGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) %
7 Days@last7DaysFunding.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US"))@Html.Raw(last7DaysProfitFiat.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")))@last7DaysPercentGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))%@last7DaysPercentGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) %
@thisMonthFunding.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US"))@Html.Raw(thisMonthProfitFiat.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")))@thisMonthPercentGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))%@thisMonthPercentGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) %
@lastMonthFunding.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US"))@Html.Raw(lastMonthProfitFiat.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")))@lastMonthPercentGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))%@lastMonthPercentGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) %
Total@totalFunding.ToString("#,#0.00000000", new System.Globalization.CultureInfo("en-US"))@Html.Raw(totalProfitFiat.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")))@totalPercentGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))%@totalPercentGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) %