From e4e5d924449ae36cd8299a5f28276322b8c224bd Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Wed, 21 Apr 2021 17:14:21 +0900 Subject: [PATCH 1/2] Default settings.analyzer --- .../settings.analyzer.json | 298 ++++++++++++++++++ .../DevSettings/settings.analyzer.json | 138 ++++---- 2 files changed, 357 insertions(+), 79 deletions(-) create mode 100644 PTMagic/_defaults/_default_settings_PT_2.x/settings.analyzer.json diff --git a/PTMagic/_defaults/_default_settings_PT_2.x/settings.analyzer.json b/PTMagic/_defaults/_default_settings_PT_2.x/settings.analyzer.json new file mode 100644 index 0000000..dcbd5bf --- /dev/null +++ b/PTMagic/_defaults/_default_settings_PT_2.x/settings.analyzer.json @@ -0,0 +1,298 @@ +// +// The settings below offer a basic example of some of the options available when using PTMagic. +// You should take your time and adjust these settings according to your own personal preferences, and settings. +// +// Always test your PTMagic settings by running a Profit Trailer bot in TESTMODE, to make sure +// it is performing as you expect. +// +// For more information on these settings, see the wiki at: https://github.com/PTMagicians/PTMagic/wiki/settings.analyzer + + +{ + "AnalyzerSettings": { + "MarketAnalyzer": { + "StoreDataMaxHours": 48, // Number of hours to store market data + "IntervalMinutes": 2, // Interval in minutes for PTMagic to check market trends and triggers + "ExcludeMainCurrency": true, // Excludes the main currency (for example BTC) from market trend analysis + "MarketTrends": [ + { + "Name": "1h", // UNIQUE market trend name (to be referenced by your triggers below) + "Platform": "Exchange", // Platform to grab prices from (Allowed values are: CoinMarketCap, Exchange) + "MaxMarkets": 50, // Number of markets/pairs to analyze sorted by 24h volume + "TrendMinutes": 60, // Number of minutes to build a trend (1440 = 24h, 720 = 12h, 60 = 1h) + "TrendCurrency": "Market", // Trend Currency to build the trend against. If set to "Fiat", the trend will take the USD value of your main currency into account to build the trend. "Market" will build a trend against your base currency, such as BTC or USDT. + "TrendThreshold": 15, // Any coin that is above 15% or below -15% for this timeframe will not be used when calculating the market average. + "DisplayGraph": false, // Use this trend in the graph on the PTM Monitor dashboard and market analyzer? + "DisplayOnMarketAnalyzerList": false // Disply this trend on the PTM Monitor market analyzer? + }, + { + "Name": "6h", + "Platform": "Exchange", + "MaxMarkets": 50, + "TrendMinutes": 360, + "TrendCurrency": "Market", + "TrendThreshold": 30, + "DisplayGraph": true, + "DisplayOnMarketAnalyzerList": true + }, + { + "Name": "12h", + "Platform": "Exchange", + "MaxMarkets": 50, + "TrendMinutes": 720, + "TrendCurrency": "Market", + "TrendThreshold": 50, + "DisplayGraph": true, + "DisplayOnMarketAnalyzerList": true + }, + { + "Name": "24h", + "Platform": "Exchange", + "MaxMarkets": 50, + "TrendMinutes": 1440, + "TrendCurrency": "Market", + "TrendThreshold": 75, + "DisplayGraph": true, + "DisplayOnMarketAnalyzerList": true + } + ] + }, + // ================================ GLOBAL SETTINGS ================================ + // + "GlobalSettings": [ // Global settings for Profit Trailer properties + // + // =================================================================================== + // ----------------------------- + { + "SettingName": "EndOfTheWorld", // ANY UNIQUE name of your setting + "TriggerConnection": "AND", // Define if triggers will be connected by AND or OR + "Triggers": [ // Your triggers for this setting. You can use any of your defined trends from above + { + "MarketTrendName": "1h", // Reference to the market trend specified above + "MaxChange": 0 // The maximum value for this trigger to be true. (Any value below "0" will trigger this) + }, + { + "MarketTrendName": "12h", + "MaxChange": -2 + }, + { + "MarketTrendName": "24h", + "MaxChange": -5 + } + ], + "PairsProperties": { // Changes you wish to make to your PAIRS.properties settings + // Any valid setting from https://wiki.profittrailer.com/en/config can be used here. + // You can use a specific value, or apply a discrete OFFSET or OFFSETPERCENT to the value in your default PAIRS setting. + "DEFAULT_sell_only_mode_enabled": true, + "DEFAULT_trailing_profit_OFFSETPERCENT": -50 + }, + "DCAProperties": { // Changes you wish to make to your DCA.properties settings + "DEFAULT_DCA_trailing_profit_OFFSETPERCENT": -75 + }, + "IndicatorsProperties": { // Changes you wish to make to your INDICATORS.properties settings + } + }, + // ----------------------------- + { + "SettingName": "TankingDown", + "TriggerConnection": "AND", + "Triggers": [ + { + "MarketTrendName": "1h", + "MaxChange": 0 + } + ], + "PairsProperties": { + "max_trading_pairs_OFFSET": -2, + "DEFAULT_min_buy_volume_OFFSETPERCENT": 100, + //"DEFAULT_initial_cost_OFFSETPERCENT": -50, + //"DEFAULT_initial_cost_percentage_OFFSETPERCENT": -50, + "DEFAULT_trailing_buy_OFFSETPERCENT": 25, + "DEFAULT_trailing_profit_OFFSETPERCENT": -25 + }, + "DCAProperties": { + //"DEFAULT_DCA_rebuy_timeout_OFFSETPERCENT": 100, + "DEFAULT_DCA_trailing_buy_OFFSETPERCENT": 25, + "DEFAULT_DCA_trailing_profit_OFFSETPERCENT": -50 + }, + "IndicatorsProperties": { + } + }, + // ----------------------------- + { + "SettingName": "BearSighted", + "TriggerConnection": "AND", + "Triggers": [ + { + "MarketTrendName": "1h", + "MaxChange": 1 + }, + { + "MarketTrendName": "12h", + "MaxChange": 0 + }, + { + "MarketTrendName": "24h", + "MaxChange": -1, + "MinChange": -3 + } + ], + "PairsProperties": { + "max_trading_pairs_OFFSET": -1, + //"DEFAULT_initial_cost_OFFSETPERCENT": -25, + //"DEFAULT_initial_cost_percentage_OFFSETPERCENT": -25, + "DEFAULT_trailing_buy_OFFSETPERCENT": 10, + "DEFAULT_trailing_profit_OFFSETPERCENT": -10 + }, + "DCAProperties": { + "DEFAULT_DCA_trailing_buy_OFFSETPERCENT": 10, + "DEFAULT_DCA_trailing_profit_OFFSETPERCENT": -10, + }, + "IndicatorsProperties": { + } + }, + // ----------------------------- + { + "SettingName": "ReadyForLiftOff", + "TriggerConnection": "AND", + "Triggers": [ + { + "MarketTrendName": "1h", + "MinChange": 0 + }, + { + "MarketTrendName": "12h", + "MinChange": 0 + }, + { + "MarketTrendName": "24h", + "MinChange": 1, + "MaxChange": 3 + } + ], + "PairsProperties": { + "max_trading_pairs_OFFSET": 1, + //"DEFAULT_initial_cost_OFFSETPERCENT": 10, + //"DEFAULT_initial_cost_percentage_OFFSETPERCENT": 10, + "DEFAULT_trailing_buy_OFFSETPERCENT": -10, + "DEFAULT_A_sell_value_OFFSETPERCENT": 10 + }, + "DCAProperties": { + "DEFAULT_DCA_trailing_buy_OFFSETPERCENT": -10, + "DEFAULT_DCA_trailing_profit_OFFSETPERCENT": 10, + }, + "IndicatorsProperties": { + } + }, + // ----------------------------- + { + "SettingName": "ToTheMoon", + "TriggerConnection": "AND", + "Triggers": [ + { + "MarketTrendName": "1h", + "MinChange": 1 + }, + { + "MarketTrendName": "12h", + "MinChange": 1 + }, + { + "MarketTrendName": "24h", + "MinChange": 3 + } + ], + "PairsProperties": { + "max_trading_pairs_OFFSET": 2, + //"DEFAULT_initial_cost_OFFSETPERCENT": 20, + //"DEFAULT_initial_cost_percentage_OFFSETPERCENT": 20, + "DEFAULT_trailing_buy_OFFSETPERCENT": -10, + "DEFAULT_A_sell_value_OFFSETPERCENT": 20 + }, + "DCAProperties": { + "DEFAULT_DCA_trailing_buy_OFFSETPERCENT": -20, + "DEFAULT_DCA_trailing_profit_OFFSETPERCENT": 20, + }, + "IndicatorsProperties": { + } + }, + // ----------------------------- + { + "SettingName": "Default", + "PairsProperties": { + "File": "PAIRS.properties" + }, + "DCAProperties": { + "File": "DCA.properties" + }, + "IndicatorsProperties": { + "File": "INDICATORS.properties" + } + } + ], + // + // ================================ COIN-SPECIFIC SETTINGS ================================ + // + "SingleMarketSettings": [ // Single market/pair settings for Profit Trailer properties + // Any setting from https://wiki.profittrailer.com/en/config marked as COIN (coin-specific) can be used here. + // Only coins that meet the triggered conditions will have the settings applied. + // A variety of SMS can be employed to check for long-term down trends, sideways trends, over-extended uptrends, etc. + // If more than one SMS is true, the settings of the last applied SMS over-rides any prior SMS + { + "SettingName": "PumpNDumpProtection", + "TriggerConnection": "OR", + //"StopProcessWhenTriggered": true, // No SMS after this will be analyzed or applied if this SMS is true + //"AllowedGlobalSettings": "Default", // You can specify that this setting will only apply when a specific Global setting is active + //"IgnoredGlobalSettings": "Default", // You can specify that this setting will NOT apply when a specific Global setting is active + "Triggers": [ + { + "MarketTrendName": "1h", + "MarketTrendRelation": "Relative", // Relative = The single market trend is compared to the overall trend of the entire market + // Absolute = The Single market trend is considered on its own + "MinChange": 8 + }, + { + "MarketTrendName": "12h", + "MarketTrendRelation": "Relative", + "MinChange": 10 + }, + { + "MarketTrendName": "24h", + "MarketTrendRelation": "Relative", + "MinChange": 12 + } + ], + "OffTriggers": [ + { + "HoursSinceTriggered": 3 // Any coin that triggers this setting, will remain under this setting + // for 3 hours, since the last time it triggered. + } + ], + "PairsProperties": { + "DEFAULT_sell_only_mode_enabled": "true", + "DEFAULT_DCA_enabled": "false" + } + }, + { + "SettingName": "FreefallBlock", + "TriggerConnection": "OR", + "Triggers": [ + { + "MarketTrendName": "1h", + "MarketTrendRelation": "Absolute", + "MaxChange": -5 + } + ], + "OffTriggers": [ + { + "HoursSinceTriggered": 1 + } + ], + "PairsProperties": { + "DEFAULT_sell_only_mode_enabled": "true", + "DEFAULT_DCA_enabled": "false" + } + } + ] + } +} \ No newline at end of file diff --git a/_Development/DevSettings/settings.analyzer.json b/_Development/DevSettings/settings.analyzer.json index d1b0744..dcbd5bf 100644 --- a/_Development/DevSettings/settings.analyzer.json +++ b/_Development/DevSettings/settings.analyzer.json @@ -1,6 +1,7 @@ // // The settings below offer a basic example of some of the options available when using PTMagic. -// You should take your time and adjust these settings according to your own personal preferences. +// You should take your time and adjust these settings according to your own personal preferences, and settings. +// // Always test your PTMagic settings by running a Profit Trailer bot in TESTMODE, to make sure // it is performing as you expect. // @@ -10,21 +11,19 @@ { "AnalyzerSettings": { "MarketAnalyzer": { - "StoreDataMaxHours": 48, // Number of hours to store market data - "IntervalMinutes": 2, // Interval in minutes for PTMagic to check market trends and triggers - "ExcludeMainCurrency": true, // Excludes the main currency (for example BTC) from market trend analysis + "StoreDataMaxHours": 48, // Number of hours to store market data + "IntervalMinutes": 2, // Interval in minutes for PTMagic to check market trends and triggers + "ExcludeMainCurrency": true, // Excludes the main currency (for example BTC) from market trend analysis "MarketTrends": [ { - "Name": "1h", // UNIQUE market trend name (to be referenced by your triggers below) - "Platform": "Exchange", // Platform to grab prices from (Allowed values are: CoinMarketCap, Exchange) - "MaxMarkets": 50, // Number of markets/pairs to analyze sorted by 24h volume - "TrendMinutes": 60, // Number of minutes to build a trend (1440 = 24h, 720 = 12h, 60 = 1h) - "TrendCurrency": "Market", // Trend Currency to build the trend against. If set to "Fiat", the trend will - // take the USD value of your main currency into account to build the trend. - // "Market" will build a trend against your base currency, such as BTC or USDT. - "TrendThreshold": 15, // Any coin that is above 15% or below -15% for this timeframe will not be used when calculating the market average. - "DisplayGraph": false, // Use this trend in the graph on the PTM Monitor dashboard and market analyzer - "DisplayOnMarketAnalyzerList": false // Disply this trend for all coins on the PTM Monitor market analyzer + "Name": "1h", // UNIQUE market trend name (to be referenced by your triggers below) + "Platform": "Exchange", // Platform to grab prices from (Allowed values are: CoinMarketCap, Exchange) + "MaxMarkets": 50, // Number of markets/pairs to analyze sorted by 24h volume + "TrendMinutes": 60, // Number of minutes to build a trend (1440 = 24h, 720 = 12h, 60 = 1h) + "TrendCurrency": "Market", // Trend Currency to build the trend against. If set to "Fiat", the trend will take the USD value of your main currency into account to build the trend. "Market" will build a trend against your base currency, such as BTC or USDT. + "TrendThreshold": 15, // Any coin that is above 15% or below -15% for this timeframe will not be used when calculating the market average. + "DisplayGraph": false, // Use this trend in the graph on the PTM Monitor dashboard and market analyzer? + "DisplayOnMarketAnalyzerList": false // Disply this trend on the PTM Monitor market analyzer? }, { "Name": "6h", @@ -65,12 +64,12 @@ // =================================================================================== // ----------------------------- { - "SettingName": "EndOfTheWorld", // ANY UNIQUE name of your setting - "TriggerConnection": "AND", // Define if triggers will be connected by AND or OR - "Triggers": [ // Your triggers for this setting. You can use any of your defined trends from above + "SettingName": "EndOfTheWorld", // ANY UNIQUE name of your setting + "TriggerConnection": "AND", // Define if triggers will be connected by AND or OR + "Triggers": [ // Your triggers for this setting. You can use any of your defined trends from above { - "MarketTrendName": "1h", // Reference to the market trend specified above - "MaxChange": 0 // The maximum value for this trigger to be true. (Any value below "0" will trigger this) + "MarketTrendName": "1h", // Reference to the market trend specified above + "MaxChange": 0 // The maximum value for this trigger to be true. (Any value below "0" will trigger this) }, { "MarketTrendName": "12h", @@ -81,14 +80,16 @@ "MaxChange": -5 } ], - "PairsProperties": { // Properties for PAIRS.PROPERTIES - // Any valid setting from https://wiki.profittrailer.com/en/config can be used here. - // You can use a specific value, or apply a discrete OFFSET or OFFSETPERCENT to the value in your default PAIRS setting. - "DEFAULT_sell_only_mode_enabled": "true", + "PairsProperties": { // Changes you wish to make to your PAIRS.properties settings + // Any valid setting from https://wiki.profittrailer.com/en/config can be used here. + // You can use a specific value, or apply a discrete OFFSET or OFFSETPERCENT to the value in your default PAIRS setting. + "DEFAULT_sell_only_mode_enabled": true, "DEFAULT_trailing_profit_OFFSETPERCENT": -50 }, - "DCAProperties": { // Properties for DCA.PROPERTIES + "DCAProperties": { // Changes you wish to make to your DCA.properties settings "DEFAULT_DCA_trailing_profit_OFFSETPERCENT": -75 + }, + "IndicatorsProperties": { // Changes you wish to make to your INDICATORS.properties settings } }, // ----------------------------- @@ -99,29 +100,20 @@ { "MarketTrendName": "1h", "MaxChange": 0 - }, - { - "MarketTrendName": "12h", - "MaxChange": 0 - }, - { - "MarketTrendName": "24h", // Any value between -5 and -3 will make this trigger true. - "MaxChange": -3, - "MinChange": -5 // The minimum value for this trigger to be true. (Any value above "-5" will trigger this) } ], "PairsProperties": { - "max_trading_pairs_OFFSET": -2, - "DEFAULT_min_buy_volume_OFFSETPERCENT": 100, - //"DEFAULT_initial_cost_OFFSETPERCENT": -50, - //"DEFAULT_initial_cost_percentage_OFFSETPERCENT": -50, - "DEFAULT_trailing_buy_OFFSETPERCENT": 25, - "DEFAULT_trailing_profit_OFFSETPERCENT": -25 + "max_trading_pairs_OFFSET": -2, + "DEFAULT_min_buy_volume_OFFSETPERCENT": 100, + //"DEFAULT_initial_cost_OFFSETPERCENT": -50, + //"DEFAULT_initial_cost_percentage_OFFSETPERCENT": -50, + "DEFAULT_trailing_buy_OFFSETPERCENT": 25, + "DEFAULT_trailing_profit_OFFSETPERCENT": -25 }, "DCAProperties": { //"DEFAULT_DCA_rebuy_timeout_OFFSETPERCENT": 100, "DEFAULT_DCA_trailing_buy_OFFSETPERCENT": 25, - "DEFAULT_DCA_trailing_profit_OFFSETPERCENT": -50 + "DEFAULT_DCA_trailing_profit_OFFSETPERCENT": -50 }, "IndicatorsProperties": { } @@ -147,14 +139,14 @@ ], "PairsProperties": { "max_trading_pairs_OFFSET": -1, - //"DEFAULT_initial_cost_OFFSETPERCENT": -25, - //"DEFAULT_initial_cost_percentage_OFFSETPERCENT": -25, - "DEFAULT_trailing_buy_OFFSETPERCENT": 10, - "DEFAULT_trailing_profit_OFFSETPERCENT": -10 + //"DEFAULT_initial_cost_OFFSETPERCENT": -25, + //"DEFAULT_initial_cost_percentage_OFFSETPERCENT": -25, + "DEFAULT_trailing_buy_OFFSETPERCENT": 10, + "DEFAULT_trailing_profit_OFFSETPERCENT": -10 }, "DCAProperties": { "DEFAULT_DCA_trailing_buy_OFFSETPERCENT": 10, - "DEFAULT_DCA_trailing_profit_OFFSETPERCENT": -10, + "DEFAULT_DCA_trailing_profit_OFFSETPERCENT": -10, }, "IndicatorsProperties": { } @@ -180,14 +172,14 @@ ], "PairsProperties": { "max_trading_pairs_OFFSET": 1, - //"DEFAULT_initial_cost_OFFSETPERCENT": 10, - //"DEFAULT_initial_cost_percentage_OFFSETPERCENT": 10, - "DEFAULT_trailing_buy_OFFSETPERCENT": -10, - "DEFAULT_A_sell_value_OFFSETPERCENT": 10 + //"DEFAULT_initial_cost_OFFSETPERCENT": 10, + //"DEFAULT_initial_cost_percentage_OFFSETPERCENT": 10, + "DEFAULT_trailing_buy_OFFSETPERCENT": -10, + "DEFAULT_A_sell_value_OFFSETPERCENT": 10 }, "DCAProperties": { - "DEFAULT_DCA_trailing_buy_OFFSETPERCENT": -10, - "DEFAULT_DCA_trailing_profit_OFFSETPERCENT": 10, + "DEFAULT_DCA_trailing_buy_OFFSETPERCENT": -10, + "DEFAULT_DCA_trailing_profit_OFFSETPERCENT": 10, }, "IndicatorsProperties": { } @@ -212,9 +204,9 @@ ], "PairsProperties": { "max_trading_pairs_OFFSET": 2, - //"DEFAULT_initial_cost_OFFSETPERCENT": 20, - //"DEFAULT_initial_cost_percentage_OFFSETPERCENT": 20, - "DEFAULT_trailing_buy_OFFSETPERCENT": -10, + //"DEFAULT_initial_cost_OFFSETPERCENT": 20, + //"DEFAULT_initial_cost_percentage_OFFSETPERCENT": 20, + "DEFAULT_trailing_buy_OFFSETPERCENT": -10, "DEFAULT_A_sell_value_OFFSETPERCENT": 20 }, "DCAProperties": { @@ -238,36 +230,25 @@ } } ], + // // ================================ COIN-SPECIFIC SETTINGS ================================ // - "SingleMarketSettings": [ // Single market/pair settings for Profit Trailer properties - // Any setting from https://wiki.profittrailer.com/en/config - // marked as CS (coin-specific) can be used here. - // Only coins that meet the triggered conditions will have the settings applied. - { - "SettingName": "BlacklistCoins", - "StopProcessWhenTriggered": true, - "Triggers": [ - { - "AgeDaysLowerThan": 21 - } - ], - "PairsProperties": { - "DEFAULT_trading_enabled": "false", - "DEFAULT_sell_only_mode_enabled": "true", - "DEFAULT_DCA_enabled": "false" - } - }, - // ----------------------------- + "SingleMarketSettings": [ // Single market/pair settings for Profit Trailer properties + // Any setting from https://wiki.profittrailer.com/en/config marked as COIN (coin-specific) can be used here. + // Only coins that meet the triggered conditions will have the settings applied. + // A variety of SMS can be employed to check for long-term down trends, sideways trends, over-extended uptrends, etc. + // If more than one SMS is true, the settings of the last applied SMS over-rides any prior SMS { "SettingName": "PumpNDumpProtection", "TriggerConnection": "OR", + //"StopProcessWhenTriggered": true, // No SMS after this will be analyzed or applied if this SMS is true + //"AllowedGlobalSettings": "Default", // You can specify that this setting will only apply when a specific Global setting is active + //"IgnoredGlobalSettings": "Default", // You can specify that this setting will NOT apply when a specific Global setting is active "Triggers": [ { "MarketTrendName": "1h", - "MarketTrendRelation": "Relative", // The relation of the single market trend. Relative = Single market - // trend compared relative to the market trend - // Absolute = Single market trend viewed on its own + "MarketTrendRelation": "Relative", // Relative = The single market trend is compared to the overall trend of the entire market + // Absolute = The Single market trend is considered on its own "MinChange": 8 }, { @@ -283,8 +264,8 @@ ], "OffTriggers": [ { - "HoursSinceTriggered": 3 // Any coin that triggers this setting, will remain under this setting - // for 3 hours, since the last time it triggered. + "HoursSinceTriggered": 3 // Any coin that triggers this setting, will remain under this setting + // for 3 hours, since the last time it triggered. } ], "PairsProperties": { @@ -292,7 +273,6 @@ "DEFAULT_DCA_enabled": "false" } }, - // ----------------------------- { "SettingName": "FreefallBlock", "TriggerConnection": "OR", From d8b3ee612cacdd04c89a60078d47a41de89aecff Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Wed, 21 Apr 2021 19:29:42 +0900 Subject: [PATCH 2/2] Merge Target & Profit --- Monitor/Pages/SettingsGeneral.cshtml | 2 +- Monitor/Pages/_get/DashboardTop.cshtml | 68 +++++++++++--------------- 2 files changed, 29 insertions(+), 41 deletions(-) diff --git a/Monitor/Pages/SettingsGeneral.cshtml b/Monitor/Pages/SettingsGeneral.cshtml index 20f0d27..4989f93 100644 --- a/Monitor/Pages/SettingsGeneral.cshtml +++ b/Monitor/Pages/SettingsGeneral.cshtml @@ -190,7 +190,7 @@
- +
diff --git a/Monitor/Pages/_get/DashboardTop.cshtml b/Monitor/Pages/_get/DashboardTop.cshtml index 80d5569..9bdb3b4 100644 --- a/Monitor/Pages/_get/DashboardTop.cshtml +++ b/Monitor/Pages/_get/DashboardTop.cshtml @@ -98,10 +98,9 @@ 24H Cost - DCA - Sell - Target - Profit + DCA + Sell + Profit @@ -202,42 +201,32 @@ @Html.Raw(buyStrategyText) @Html.Raw(sellStrategyText) - - @if (!sellStrategyText.Contains("WATCHMODE")) - { - @if (sellStrategyText.Contains("CROSSED")) - // if leverage, recalculate profit target - { - string leverageText = sellStrategyText.Remove(0, sellStrategyText.IndexOf("CROSSED")+9); - leverage = leverageText.Remove(leverageText.IndexOf(".0)"), leverageText.Length - leverageText.IndexOf(".0)")); - leverageValue = double.Parse(leverage); - } - @if (sellStrategyText.Contains("ISOLATED")) - { - string leverageText = sellStrategyText.Remove(0, sellStrategyText.IndexOf("ISOLATED")+10); - leverage = leverageText.Remove(leverageText.IndexOf(".0)"), leverageText.Length - leverageText.IndexOf(".0)")); - leverageValue = double.Parse(leverage); - } - @if (leverageValue == 1) - { - @Html.Raw(dcaLogEntry.TargetGainValue.HasValue ? dcaLogEntry.TargetGainValue.Value.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) + "%" : " ") - } - else - { - double TargetGain = leverageValue * dcaLogEntry.TargetGainValue.Value; - @Html.Raw(dcaLogEntry.TargetGainValue.HasValue ? TargetGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")) + "%" : " ") - } - } - else - { - - } - + @if (!@lostValue) - { - profitPercentage = profitPercentage * leverageValue; - @profitPercentage.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))% - } + { + @if (!sellStrategyText.Contains("WATCHMODE")) + { + @if (sellStrategyText.Contains("CROSSED")) + // if leverage, recalculate profit target + { + string leverageText = sellStrategyText.Remove(0, sellStrategyText.IndexOf("CROSSED")+9); + leverage = leverageText.Remove(leverageText.IndexOf(".0)"), leverageText.Length - leverageText.IndexOf(".0)")); + leverageValue = double.Parse(leverage); + } + @if (sellStrategyText.Contains("ISOLATED")) + { + string leverageText = sellStrategyText.Remove(0, sellStrategyText.IndexOf("ISOLATED")+10); + leverage = leverageText.Remove(leverageText.IndexOf(".0)"), leverageText.Length - leverageText.IndexOf(".0)")); + leverageValue = double.Parse(leverage); + } + profitPercentage = profitPercentage * leverageValue; + double TargetGain = leverageValue * dcaLogEntry.TargetGainValue.Value; + @TargetGain.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))% +
+
@profitPercentage.ToString("#,#0.00", new System.Globalization.CultureInfo("en-US"))%
+ + } + } else { No Value! @@ -258,7 +247,6 @@ - @Html.Raw((((Model.TotalBagGain) / Model.TotalBagCost) * 100).ToString("#,#0.00", new System.Globalization.CultureInfo("en-US")))%