From d0e6c7f6e032c8a5e24a4e6ca54076ec2a59910d Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Sat, 9 Nov 2019 23:46:35 +0900 Subject: [PATCH 1/3] Analyzer Settings GUI fix --- Core/ProfitTrailer/StrategyHelper.cs | 3 + Monitor/Pages/SettingsAnalyzer.cshtml | 170 ++++++++++---------------- 2 files changed, 68 insertions(+), 105 deletions(-) diff --git a/Core/ProfitTrailer/StrategyHelper.cs b/Core/ProfitTrailer/StrategyHelper.cs index 285c89c..2ababbd 100644 --- a/Core/ProfitTrailer/StrategyHelper.cs +++ b/Core/ProfitTrailer/StrategyHelper.cs @@ -420,6 +420,9 @@ namespace Core.ProfitTrailer case "ignoring buy trigger": result = String.Concat(strategyLetter, "TRIG"); break; + case "no dca buy logic": + result = String.Concat(strategyLetter, "NO DCA"); + break; default: break; } diff --git a/Monitor/Pages/SettingsAnalyzer.cshtml b/Monitor/Pages/SettingsAnalyzer.cshtml index 7c20569..89410c8 100644 --- a/Monitor/Pages/SettingsAnalyzer.cshtml +++ b/Monitor/Pages/SettingsAnalyzer.cshtml @@ -13,17 +13,17 @@

Analyzer Settings

- In this area you may change the settings of your settings.analyzer.json file. Please use this with caution as all settings you saved here will directly affect your PT Magic bot. + In this area you may change the settings of your settings.analyzer.json file.
Please use this with caution as all settings you saved here will directly affect your PT Magic bot.

-

Please note: When you save your settings using this interface, all existing comments will be removed from your settings.analyzer.json!

+

NOTICE: When you save your settings using this interface, any existing comments will be removed from your settings.analyzer.json!

-
+
-

Restore Backup

+

Restore Backup

You messed up your settings?
Restore your backup! @@ -34,7 +34,7 @@

-
+

Download Settings

@@ -47,19 +47,7 @@
-
-
-

Upload Settings

- -

- Found some settings somewhere?
Upload them! -

- - -
-
+
@@ -67,7 +55,8 @@
-

Market Trends (@Model.PTMagicConfiguration.AnalyzerSettings.MarketAnalyzer.MarketTrends.Count)

+

Market Trends (@Model.PTMagicConfiguration.AnalyzerSettings.MarketAnalyzer.MarketTrends.Count)

+
-

Global Settings (@Model.PTMagicConfiguration.AnalyzerSettings.GlobalSettings.Count)

+

Global Settings (@Model.PTMagicConfiguration.AnalyzerSettings.GlobalSettings.Count)

    @foreach (Core.Main.DataObjects.PTMagicData.GlobalSetting gs in Model.PTMagicConfiguration.AnalyzerSettings.GlobalSettings) { @@ -84,7 +73,7 @@
-

Single Market Settings (@Model.PTMagicConfiguration.AnalyzerSettings.SingleMarketSettings.Count)

+

Single Market Settings (@Model.PTMagicConfiguration.AnalyzerSettings.SingleMarketSettings.Count)

    @foreach (Core.Main.DataObjects.PTMagicData.SingleMarketSetting sms in Model.PTMagicConfiguration.AnalyzerSettings.SingleMarketSettings) { @@ -101,14 +90,32 @@
- +
+ +
+ @foreach (Core.Main.DataObjects.PTMagicData.GlobalSetting gs in Model.PTMagicConfiguration.AnalyzerSettings.GlobalSettings) { + Add before @Core.Helper.SystemHelper.SplitCamelCase(gs.SettingName) + } +
+
- +
+ +
+ @foreach (Core.Main.DataObjects.PTMagicData.SingleMarketSetting sms in Model.PTMagicConfiguration.AnalyzerSettings.SingleMarketSettings) { + Add before @Core.Helper.SystemHelper.SplitCamelCase(sms.SettingName) + } +
+ @foreach (Core.Main.DataObjects.PTMagicData.SingleMarketSetting sms in Model.PTMagicConfiguration.AnalyzerSettings.SingleMarketSettings) { + Add after @Core.Helper.SystemHelper.SplitCamelCase(sms.SettingName) + } +
+
@@ -119,33 +126,26 @@
-
-
-
-

MARKET ANALYZER

-
-
-
- -
- -
-
+

Market Analyzer

-
- -
- -
-
+
+ +
+ +
+
-
- -
- -
-
-
+
+ +
+ +
+
+ +
+ +
+
@@ -155,22 +155,7 @@
@if (Model.PTMagicConfiguration.AnalyzerSettings.MarketAnalyzer.MarketTrends.Count > 0) { @foreach (Core.Main.DataObjects.PTMagicData.MarketTrend mt in Model.PTMagicConfiguration.AnalyzerSettings.MarketAnalyzer.MarketTrends) { -
-
-
-
-
-
-

MARKET TREND: @Core.Helper.SystemHelper.StripBadCode(mt.Name, Core.Main.Constants.WhiteListNames)

-
-
-
-
-
-
-
-
-
+
} } else {
@@ -186,22 +171,7 @@
@if (Model.PTMagicConfiguration.AnalyzerSettings.GlobalSettings.Count > 0) { @foreach (Core.Main.DataObjects.PTMagicData.GlobalSetting gs in Model.PTMagicConfiguration.AnalyzerSettings.GlobalSettings) { -
-
-
-
-
-
-

GLOBAL SETTING: @Core.Helper.SystemHelper.StripBadCode(gs.SettingName, Core.Main.Constants.WhiteListNames)

-
-
-
-
-
-
-
-
-
+
} } else {
@@ -217,22 +187,7 @@
@if (Model.PTMagicConfiguration.AnalyzerSettings.SingleMarketSettings.Count > 0) { @foreach (Core.Main.DataObjects.PTMagicData.SingleMarketSetting sms in Model.PTMagicConfiguration.AnalyzerSettings.SingleMarketSettings) { -
-
-
-
-
-
-

SINGLE MARKET SETTING: @Core.Helper.SystemHelper.StripBadCode(sms.SettingName, Core.Main.Constants.WhiteListNames)

-
-
-
-
-
-
-
-
-
+
} } else {
@@ -244,6 +199,7 @@
}
+
@@ -331,14 +287,18 @@ $('.settings-markettrend.new').buildMarketTrendSettings(); break; case 'GlobalSetting': - $('#MarketAnalyzer_GlobalSettings').append('
'); - $('html, body').scrollTop($('#MarketAnalyzer_GlobalSettings').offset().top + $('#MarketAnalyzer_GlobalSettings').height() - 100); + $('html, body').scrollTop($('#MarketAnalyzer_GlobalSettings > [data-settingname="' + dataTarget + '"]').offset().top - 100); + $('#MarketAnalyzer_GlobalSettings > [data-settingname="' + dataTarget + '"]').before('
'); $('.settings-globalsetting.new').buildGlobalSettings(); break; case 'SingleMarketSetting': - - $('#MarketAnalyzer_SingleMarketSettings').append('
'); - $('html, body').scrollTop($('#MarketAnalyzer_SingleMarketSettings').offset().top + $('#MarketAnalyzer_SingleMarketSettings').height() - 100); + if (dataDirection === 'before') { + $('html, body').scrollTop($('#MarketAnalyzer_SingleMarketSettings > [data-settingname="' + dataTarget + '"]').offset().top - 100); + $('#MarketAnalyzer_SingleMarketSettings > [data-settingname="' + dataTarget + '"]').before('
'); + } else { + $('html, body').scrollTop($('#MarketAnalyzer_SingleMarketSettings > [data-settingname="' + dataTarget + '"]').offset().top + $('#MarketAnalyzer_SingleMarketSettings > [data-settingname="' + dataTarget + '"]').height() - 100); + $('#MarketAnalyzer_SingleMarketSettings > [data-settingname="' + dataTarget + '"]').after('
'); + } $('.settings-singlemarketsetting.new').buildSingleMarketSettings(); break; } From f010873ba6b3a5b68c1db59bd3ab0065edbce843 Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Sat, 9 Nov 2019 23:56:13 +0900 Subject: [PATCH 2/3] update version to 2.2.10 --- PTMagic/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PTMagic/Program.cs b/PTMagic/Program.cs index 8f68b7a..926dfec 100644 --- a/PTMagic/Program.cs +++ b/PTMagic/Program.cs @@ -7,7 +7,7 @@ using Core.Helper; using Core.Main.DataObjects.PTMagicData; using Microsoft.Extensions.DependencyInjection; -[assembly: AssemblyVersion("2.2.9")] +[assembly: AssemblyVersion("2.2.10")] [assembly: AssemblyProduct("PT Magic")] namespace PTMagic From 8fd5dca421b0589cf640a19a498df9a7a74ee635 Mon Sep 17 00:00:00 2001 From: HojouFotytu <36724681+HojouFotytu@users.noreply.github.com> Date: Sun, 10 Nov 2019 10:12:37 +0900 Subject: [PATCH 3/3] Fix NODCA strategy Shortcut --- Core/ProfitTrailer/StrategyHelper.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Core/ProfitTrailer/StrategyHelper.cs b/Core/ProfitTrailer/StrategyHelper.cs index 2ababbd..54e3c59 100644 --- a/Core/ProfitTrailer/StrategyHelper.cs +++ b/Core/ProfitTrailer/StrategyHelper.cs @@ -421,7 +421,7 @@ namespace Core.ProfitTrailer result = String.Concat(strategyLetter, "TRIG"); break; case "no dca buy logic": - result = String.Concat(strategyLetter, "NO DCA"); + result = String.Concat(strategyLetter, "NODCA"); break; default: break;