bugfix
This commit is contained in:
@ -43,7 +43,7 @@
|
||||
<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>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>
|
||||
<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>
|
||||
|
||||
@ -190,17 +190,20 @@ $(document).ready(function () {
|
||||
console.log(filterList)
|
||||
console.log(minsize)
|
||||
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);
|
||||
data.forEach((tradeLine) => {
|
||||
//console.log(JSON.stringify(tradeLine))
|
||||
date = new Date(tradeLine.timestamp)
|
||||
timestamp = date.getTime()/1000
|
||||
console.log(timestamp)
|
||||
|
||||
//trade contains filtered condition
|
||||
bg = (findCommonElements3(filterList, tradeLine.conditions) ? 'style="background-color: #e6e6e6;"' : '')
|
||||
//trade contains filtered condition or size<minsize
|
||||
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.conditions + '</td><td>' + tradeLine.tape + '</td>' +
|
||||
'<td>' + tradeLine.timestamp + '</td></tr>';
|
||||
|
||||
@ -84,7 +84,9 @@ function connect(event) {
|
||||
logcnt++;
|
||||
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)
|
||||
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 line = document.createElement('div')
|
||||
|
||||
@ -83,4 +83,8 @@ pre {
|
||||
#trades-data {
|
||||
height: 350px;
|
||||
overflow: auto;
|
||||
}
|
||||
|
||||
.highlighted {
|
||||
font-weight: bold;
|
||||
}
|
||||
Reference in New Issue
Block a user