dwker/v2realbot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
David Brazda
2023-04-24 14:34:24 +02:00
parent c4ba2fa9d8
commit fb76a1a18a
4 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
v2realbot/static/index.html
View File

@ -43,7 +43,7 @@
<label>SYM: <input type="text" id="trade-symbol" autocomplete="off"/></label> <label>SYM: <input type="text" id="trade-symbol" autocomplete="off"/></label>
<label>Count: <input type="number" id="trade-count" autocomplete="off" value="2"/></label> <label>Count: <input type="number" id="trade-count" autocomplete="off" value="2"/></label>
<label>Minsize: <input type="number" id="trade-minsize" autocomplete="off" value="100"/></label> <label>Minsize: <input type="number" id="trade-minsize" autocomplete="off" value="100"/></label>
<label>Filter: <input type="text" id="trade-filter" autocomplete="off"/></label> <label>Filter: C,O,4,B,7,V,P<input type="text" id="trade-filter" autocomplete="off"/></label>
<button id="bt-trade" class="btn btn-success">Show</button></div> <button id="bt-trade" class="btn btn-success">Show</button></div>
<div id="trades-data" style="display: none" class="collapse in"> <div id="trades-data" style="display: none" class="collapse in">
<table id="trades-data-table" class="display dataTable no-footer" style="width: 300px;display: contents;"></table> <table id="trades-data-table" class="display dataTable no-footer" style="width: 300px;display: contents;"></table>

11
v2realbot/static/js/mytables.js
View File

@ -190,17 +190,20 @@ $(document).ready(function () {
console.log(filterList) console.log(filterList)
console.log(minsize) console.log(minsize)
var row = "" var row = ""
var puvodni = parseFloat($('#trade-timestamp').val()) //zakrouhleno na milisekundy
var puvodni = parseFloat(parseInt(parseFloat($('#trade-timestamp').val())*1000))/1000
console.log(puvodni)
$('#trades-data-table').html(row); $('#trades-data-table').html(row);
data.forEach((tradeLine) => { data.forEach((tradeLine) => {
//console.log(JSON.stringify(tradeLine)) //console.log(JSON.stringify(tradeLine))
date = new Date(tradeLine.timestamp) date = new Date(tradeLine.timestamp)
timestamp = date.getTime()/1000 timestamp = date.getTime()/1000
console.log(timestamp)
//trade contains filtered condition //trade contains filtered condition or size<minsize
bg = (findCommonElements3(filterList, tradeLine.conditions) ? 'style="background-color: #e6e6e6;"' : '') bg = (findCommonElements3(filterList, tradeLine.conditions) || (parseInt(tradeLine.size) < minsize) ? 'style="background-color: #e6e6e6;"' : '')
row += '<tr role="row" '+ ((timestamp == puvodni) ? 'class="selected"' : '') +' ' + bg + '><td>' + timestamp + '</td><td>' + tradeLine.price + '</td>' + row += '<tr role="row" '+ ((timestamp == puvodni) ? 'class="highlighted"' : '') +' ' + bg + '><td>' + timestamp + '</td><td>' + tradeLine.price + '</td>' +
'<td>' + tradeLine.size + '</td><td>' + tradeLine.id + '</td>' + '<td>' + tradeLine.size + '</td><td>' + tradeLine.id + '</td>' +
'<td>' + tradeLine.conditions + '</td><td>' + tradeLine.tape + '</td>' + '<td>' + tradeLine.conditions + '</td><td>' + tradeLine.tape + '</td>' +
'<td>' + tradeLine.timestamp + '</td></tr>'; '<td>' + tradeLine.timestamp + '</td></tr>';

4
v2realbot/static/js/mywebsocket.js
View File

@ -84,7 +84,9 @@ function connect(event) {
logcnt++; 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" data-target="#rec'+logcnt+'">'+logLine.time + " " + logLine.event + ' - '+ (logLine.message == undefined ? "" : logLine.message) +'</div>'
str_row = JSON.stringify(logLine.details, null, 2) 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>' //row_detail = '<div id="rec'+logcnt+'" data-toggle="collapse" data-target="#rec'+logcnt+'"class="collapse pidi"><pre>' + str_row + '</pre></div>'
row_detail = '<div id="rec'+logcnt+'" class="collapse pidi"><pre>' + str_row + '</pre></div>'
var lines = document.getElementById('lines') var lines = document.getElementById('lines')
var line = document.createElement('div') var line = document.createElement('div')

4
v2realbot/static/main.css
View File

@ -84,3 +84,7 @@ pre {
height: 350px; height: 350px;
overflow: auto; overflow: auto;
} }
.highlighted {
font-weight: bold;
}