From a40b899b1d50c3366468cd7128146ddad61af7da Mon Sep 17 00:00:00 2001
From: David Brazda <davidbrazda61@gmail.com>
Date: Mon, 24 Apr 2023 21:38:20 +0200
Subject: [PATCH] gui onclick timestamp enhancements

---
 v2realbot/static/js/mychart.js                |   6 +++++-
 v2realbot/static/js/mytables.js               |  13 +++++++++++++
 v2realbot/static/js/mywebsocket.js            |   3 ++-
 ...trategyOrderLimitVykladaci.cpython-310.pyc | Bin 7281 -> 7296 bytes
 .../strategy/__pycache__/base.cpython-310.pyc | Bin 13417 -> 13519 bytes
 v2realbot/strategy/base.py                    |   7 ++++++-
 6 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/v2realbot/static/js/mychart.js b/v2realbot/static/js/mychart.js
index b5832d0..d0a64e5 100644
--- a/v2realbot/static/js/mychart.js
+++ b/v2realbot/static/js/mychart.js
@@ -59,7 +59,11 @@ chart.subscribeCrosshairMove((param) => {
         });
 
 		firstRow.innerText += ' vwap' + '  ' + vwap.toFixed(2) + " O" + bars.open + " H" + bars.high + " L" + bars.low + " C" + bars.close + " V" + volumes.value + "";
-	}
+	
+        //display timestamp in trade-timestamp input field
+        $('#trade-timestamp').val(param.time)
+    
+    }
   else {
   	firstRow.innerText = '-';
   }
diff --git a/v2realbot/static/js/mytables.js b/v2realbot/static/js/mytables.js
index 39eea32..3ee103c 100644
--- a/v2realbot/static/js/mytables.js
+++ b/v2realbot/static/js/mytables.js
@@ -9,6 +9,11 @@ function findCommonElements3(arr1, arr2) {
 return arr1.some(item => arr2.includes(item))
 }
 
+function set_timestamp(timestamp) {
+    //console.log(timestamp);
+    $('#trade-timestamp').val(timestamp);
+}
+
 //KEY shortcuts
 Mousetrap.bind('e', function() { 
     $( "#button_edit" ).trigger( "click" );
@@ -222,6 +227,14 @@ $(document).ready(function () {
     })
 });
 
+    //on hover of each logline move timestamp to trade history input field
+    //   $('.line').click(function () {
+    //     timestamp = $(this).data("timestamp");
+    //     console.log(timestamp);
+    //     $('#trade-timestamp').val(timestamp);
+    // })
+
+
     //button refresh
     $('#button_refresh').click(function () {
         runnerRecords.ajax.reload();
diff --git a/v2realbot/static/js/mywebsocket.js b/v2realbot/static/js/mywebsocket.js
index 5b503c3..395349a 100644
--- a/v2realbot/static/js/mywebsocket.js
+++ b/v2realbot/static/js/mywebsocket.js
@@ -82,7 +82,7 @@ function connect(event) {
 
 
                 logcnt++;
-                row = '<div data-toggle="collapse" data-target="#rec'+logcnt+'">'+logLine.time + " " + logLine.event + ' - '+ (logLine.message == undefined ? "" : logLine.message) +'</div>'
+                row = '<div data-toggle="collapse" onclick="set_timestamp(' + logLine.time + ')" data-target="#rec'+logcnt+'">'+logLine.time + " " + logLine.event + ' - '+ (logLine.message == undefined ? "" : logLine.message) +'</div>'
                 str_row = JSON.stringify(logLine.details, null, 2)
                 //row_detail = '<div id="rec'+logcnt+'" data-toggle="collapse" data-target="#rec'+logcnt+'"class="collapse pidi"><pre>' + str_row + '</pre></div>'
 
@@ -91,6 +91,7 @@ function connect(event) {
                 var lines = document.getElementById('lines')
                 var line = document.createElement('div')
                 line.classList.add("line")
+                line.dataset.timestamp = logLine.time
                 
                 line.insertAdjacentHTML( 'beforeend', row );
                 line.insertAdjacentHTML( 'beforeend', row_detail );
diff --git a/v2realbot/strategy/__pycache__/StrategyOrderLimitVykladaci.cpython-310.pyc b/v2realbot/strategy/__pycache__/StrategyOrderLimitVykladaci.cpython-310.pyc
index d78b5eb693b54a8d1771e3fb87bef6ec133e5041..9a896e19bac7986a587ca98f08119ddeb659c111 100644
GIT binary patch
delta 119
zcmexp(O}7&&&$ij00fCE-BP}9<ekXE_-FEbmSv1Jo84Fi85t8NN3bndR;gjgV$2e2
zW-Q^WVQpqi5$xq)WC&+SVF+emVJK0Zz*t#5S%Te@F=ulUJ0lY#$K(qfB0NPlKx2z+
UL4@VzdQJx>Mvu)0xHk#_0HNm|{Qv*}

delta 96
zcmZp${Aj_O&&$ij00hq$x}{v-$UBjR@zdn_EXx?nH@mS4GBU<Yj$m6Z$ydYL%$OqB
z%g)FU&XB?o%)r7>qB?=GvTU*vyC-A%<{WlLCPwzjd7N^aCvw^{G1_fD&%IFq05bd<
AYXATM

diff --git a/v2realbot/strategy/__pycache__/base.cpython-310.pyc b/v2realbot/strategy/__pycache__/base.cpython-310.pyc
index 56b12a18ca23b162335804bc63b608e95957d3be..5ab3345f8bb391202141c5c9d8381acd9e6b46d3 100644
GIT binary patch
delta 430
zcmaEvaXynTpO=@50SJ<|xus-9Z{(BaVvO3X#pTb)QNxg>0K}r3%eh}OGU`lD=GA6l
zW8!1nJc0K#BV*&{7=ArQ#<`oj1?Dp{F4?RtWW>z4esi2?EDPh~&3h!H85xx~OGw{i
zWVD|AU1k!a|Ku*&G{&IGA7%G5hE3imSIrnbSy#S^F@Ev}`Ao*t%~A@P%#0bETa?+E
zfTs1R>M$~H*}PM&jgfKRW(SQvMn;v*=QXvN8DC8Pt@D_rh9O>J@*Uk8M#;&MdefMS
zv?jmNb7Z^5$iPq>Guc=_dUB7x1LLyEj#5(f!X+#VSQj!ZU|Yxl)Wu%In8HxXP^44C
z1g4csK>lQ}VNPM}WvXS#lZWz|fFex2%s>$_s7gzy3?op687#vI7Xhhe>1C+}x+{xw
z0ap#nLPkcQZCTtkENm&PHVh>^lidvB8F?ow$f&TH07JWI>EyKrp8VWQKnF_z`4WtL
ij2ujp84Vi*&w@O`0Tkn4U|}@kkTBgm$?zHzqZt6?{&evG

delta 390
zcmX|6O(;ZB7`^AdJ2P*d-WWopG4eApW9FHOM6y&QKMR{DRxe`+HO7WFnM_%zk=z;<
z3Q2ZKcS}~HC@VI~f|Z@6jdGtR-{$N5bUNoL^*QHT)^&}@Gm3-Ooq6f2*Dx-^+89K>
z>=Ov{MLj|_Dh~ArASdR^W5A)<_a6bLqNg&U;6lt-PcyuW`?@KhNwn0z0exHv>|vA_
z1GAXmKY<%e^6Q3mn7lW*i5Y$sOu-VN#*~7j*lqSunRd|H0SIv$+5)b{NZSt3EMD6q
z3f{RV`oX`VYpCT5u_AXH1MX)KvSRXKV~U>}0~<NH!G=XvNxIIaf8U=WHkpU5SSZje
zTMCvil?*K?lBp><LnX!WDu0UipK;u*z_Ltc(PPDCCxDa7Y-YLoNycTfJixa*P1T(~
olP%I+ygWWs=B2V<mBcD|GM=k=bo#0eCJYI+wo81+UnshN0a9XWlK=n!

diff --git a/v2realbot/strategy/base.py b/v2realbot/strategy/base.py
index 5c9cf49..6799f2e 100644
--- a/v2realbot/strategy/base.py
+++ b/v2realbot/strategy/base.py
@@ -106,7 +106,7 @@ class Strategy:
             #propojujeme notifice s interfacem (pro callback)
             self.order_notifs.connect_callback(self)
             self.state = StrategyState(name=self.name, symbol = self.symbol, stratvars = self.stratvars, interface=self.interface, rectype=self.rectype)
-            
+
         elif mode == Mode.BT:
             self.dataloader = Trade_Offline_Streamer(start, end, btdata=self.btdata)
             self.bt = Backtester(symbol = self.symbol, order_fill_callback= self.order_updates, btdata=self.btdata, cash=cash, bp_from=start, bp_to=end)
@@ -121,6 +121,7 @@ class Strategy:
             return -1
         
         self.mode = mode
+        self.state.mode = self.mode
 
     """SAVE record to respective STATE variables (bar or trades)
     ukládáme i index pro případné indikátory - pro zobrazení v grafu
@@ -517,8 +518,12 @@ class StrategyState:
         self.iter_log_list = []
         self.profit = 0
         self.tradeList = []
+        self.mode = None
     
     def ilog(self, e: str = None, msg: str = None, **kwargs):
+        if self.mode == Mode.LIVE or self.mode == Mode.PAPER:
+            self.time = datetime.now().timestamp()
+
         if e is None:
             if msg is None:
                 row = dict(time=self.time, details=kwargs)