@millistream/millistream-widgets 1.0.24 → 1.0.26

package/millistream-widgets.js

@@ -3011,7 +3011,6 @@ function Milli_Chart(settings) {
         return 1;
     };
     // Size functions
-
     function setChartSize() {
         var offset = 0;
         // set canvas size to 0 so it does not prevent the div to resize
@@ -3454,6 +3453,637 @@ function Milli_Chart(settings) {
         }
     });
 }
+function Milli_OptionsList(settings) {
+    let _this = this;
+    let requestid = null;
+
+    _this.settings = {
+        autodraw: true,
+        //fields: ['insref','symbol','derivativeindicator','diff1d','diff1dprc','openinterest', 'quantity', 'bidprice', 'askprice', 'lastprice','strikeprice','strikedate','isin','instrumenttype','expirationtype','dte'],
+        fields: ['openinterest', 'quantity', 'bidprice', 'askprice', 'lastprice'],
+        instrument: 772,
+        instrumenttype: [5],
+        instrumentsubtype: [0],
+        messagetypes: 2,
+        num_decimals: 2,
+        onreadyCallback: null,
+        streaming: false,
+        target: null,
+        flash: true,
+        controlcolumn: 0,
+        stylecolumn: null,
+        strikedatefilter: [],
+        expirationtypefilter: [],
+        custom_columns: {},
+        sortorder: 'asc',
+        strikedateHeader: true,
+        hidePuts: false
+    };
+    MillistreamWidgetApi_AssignObject(MillistreamWidgetSettings, _this.settings);
+
+    if (settings) {
+        MillistreamWidgetApi_AssignObject(settings, _this.settings);
+    }
+
+    _this.unsubscriptions = {};
+    let m_instruments = new Map();
+    let m_cellMap = new Map();
+    let m_currentinsrefs = [];
+    let m_pushfields = [];
+    let m_strikes = [];
+    let m_strikedates = [];
+    let m_strikepricedecimals = 2;
+
+    let m_lang_en = {
+        askprice: 'Ask',
+        bidprice: 'Bid',
+        askquantity: 'Askquantity',
+        bidquantity: 'Bidquantity',
+        calls: 'CALLS',
+        date: 'Date',
+        dayhighprice: 'High',
+        daylowprice: 'Low',
+        diff1d: '+/-',
+        diff1dprc: '%',
+        lastprice: 'Last',
+        openinterest: 'OI',
+        quantity: 'Quantity',
+        puts: 'PUTS',
+        strikedate: 'Strike date',
+        strikeprice: 'Strike price',
+        symbol: 'Symbol',
+        time: 'Time',
+        rho: 'Rho',
+        theta: 'Theta',
+        delta: 'Delta',
+        vega: 'Vega',
+        gamma: 'Gamma',
+        iv: 'IV',
+        ivask: 'Ask IV',
+        ivbid: 'Bid IV',
+        weeklytype: '(w)',
+        dte: 'DTE',
+        strikes: 'Strikes'
+    };
+
+    let m_lang_sv = {
+        askprice: 'Sälj',
+        bidprice: 'Köp',
+        askquantity: 'Säljvolym',
+        bidquantity: 'Köpvolym',
+        calls: 'Köpoptioner',
+        date: 'Datum',
+        dayhighprice: 'Högst',
+        daylowprice: 'Lägst',
+        diff1d: '+/-',
+        diff1dprc: '%',
+        lastprice: 'Senast',
+        openinterest: 'ÖB',
+        puts: 'Säljoptioner',
+        quantity: 'Volym',
+        strikedate: 'Lösendag',
+        strikeprice: 'Lösenpris',
+        symbol: 'Kortnamn',
+        time: 'Tid',
+        rho: 'Rho',
+        theta: 'Theta',
+        delta: 'Delta',
+        vega: 'Vega',
+        gamma: 'Gamma',
+        iv: 'IV',
+        ivask: 'Sälj IV',
+        ivbid: 'Köp IV',
+        weeklytype: '(v)',
+        dte: 'DTE',
+        strikes: 'Lösenpris'
+    };
+
+    _this.destroyWidget = function() {
+        // if we have subscriptions send in an empty array to unsubscribe all and release it
+        if (MillistreamWidgetApi_isObjectEmpty(_this.unsubscriptions) == false)
+            _this.requestid = _this.settings.streaming.MillistreamWidgetStreamingApi_subscribeInstruments(_this, _this.requestid, []);
+        return 0;
+    };
+
+    _this.get_lang_text = function(string) {
+        if (_this.settings.custom_lang && _this.settings.custom_lang[string]) return _this.settings.custom_lang[string];
+        switch (_this.settings.language) {
+            case 'sv':
+                return m_lang_sv[string];
+            case 'en':
+                return m_lang_en[string];
+            default:
+                return string;
+        }
+    };
+
+    function add_custom_element(el, cl, parent, type, name, onclick, insref) {
+        let element = document.createElement(el);
+        if (cl) element.setAttribute("class", cl);
+        if (parent) parent.appendChild(element);
+        if (onclick) {
+            element.onclick = (function(e) {
+                _this.fire_custom_onclick(onclick, e, insref);
+            });
+        }
+        if (type) element.type = type;
+        if (name) element.value = name;
+        return element;
+    }
+
+    _this.fire_custom_onclick = function(onclick, e, insref) {
+        let instr = m_instruments.get(insref);
+        let obj = {};
+        obj.event = e;
+        obj.source = _this;
+
+        _this.settings.link_field.forEach(function(element) {
+            let info = MillistreamWidgetApi_getColumnInfo(_this, element);
+            if (typeof instr[info[0]] !== 'undefined') obj[element] = instr[info[0]]; // kolla om vi har push
+            else if (typeof instr[element] !== 'undefined') obj[element] = instr[element];
+        });
+        onclick(obj);
+    };
+
+
+    _this.getStrikeDates = function() {
+        return m_strikedates;
+    };
+
+    function getNumDecimals(widget, value) {
+        if (value == null) return 0;
+        let parts = value.toString().split('.');
+        if (parts.length == 2) {
+            while (parts[1].charAt(parts[1].length - 1) == "0") { // remove trailing zeros
+                parts[1] = parts[1].slice(0, -1);
+            }
+            return parts[1].length;
+        }
+        return 0;
+    }
+
+    function sortOptions(resp) {
+        let decimals = 0;
+        let expirys = [];
+
+        for (i = 0; i < resp.instruments.length; i++) {
+            let dec = getNumDecimals(_this, resp.instruments[i].strikeprice);
+            decimals = decimals > dec ? decimals : dec;
+
+            m_instruments.set(resp.instruments[i].insref, resp.instruments[i]);
+            let strike = null;
+            if (typeof expirys[resp.instruments[i].strikedate] === 'undefined') {
+                expirys[resp.instruments[i].strikedate] = 1;
+                let strikedata = {};
+                strikedata.strikedate = resp.instruments[i].strikedate;
+                strikedata.expirationtype = resp.instruments[i].expirationtype;
+                /*let date = new Date(resp.instruments[i].strikedate);
+                let opts;
+                switch (_this.settings.language) {
+                    case 'sv':
+                        opts = { day: 'numeric', month: 'short' };
+                        date = date.toLocaleDateString('sv-SE', opts);
+                        let parts = date.split(' ');
+                        date = parts[0] + ' ' + parts[1].substring(0, 3);
+                        break;
+                    default:
+                        opts = { month: 'short', day: 'numeric' };
+                        date = date.toLocaleDateString('en-US', opts);
+                        break;
+                }
+                //strikedata.date = date;*/
+                strikedata.dte = resp.instruments[i].dte;
+                m_strikedates.push(strikedata);
+            }
+            let f = 0;
+            if (resp.instruments[i].strikeprice != null) {
+                for (let s = 0; s < m_strikes.length; s++) {
+                    if (m_strikes[s].strikedate == resp.instruments[i].strikedate && m_strikes[s].strikeprice == resp.instruments[i].strikeprice) {
+                        strike = m_strikes[s];
+                        break;
+                    }
+                }
+            } else f = 1;
+
+            if (strike == null) {
+                m_strikes.push({
+                    strikedate: resp.instruments[i].strikedate,
+                    strikeprice: resp.instruments[i].strikeprice,
+                    calls: null,
+                    puts: null,
+                    future: f
+                });
+                if (resp.instruments[i].expirationtype) m_strikes[m_strikes.length - 1].expirationtype = parseInt(resp.instruments[i].expirationtype);
+                strike = m_strikes[m_strikes.length - 1];
+            }
+            if (resp.instruments[i].derivativeindicator == 0 || resp.instruments[i].derivativeindicator == 3) { // calls and futures
+                strike.calls = resp.instruments[i];
+            } else if (resp.instruments[i].derivativeindicator == 1) { // puts
+                strike.puts = resp.instruments[i];
+            }
+        }
+        m_strikepricedecimals = decimals == 1 ? 2 : decimals;
+        m_strikedates.sort(function(a, b) {
+            return a.strikedate.replace(/-/g, '') - b.strikedate.replace(/-/g, '');
+        });
+        m_strikes.sort(function(a, b) {
+            if (a.strikedate == b.strikedate) {
+                if (a.future == 1 || b.future == 1) {
+                    return (b.future - a.future);
+                }
+                return (a.strikeprice - b.strikeprice) * (_this.settings.sortorder == 'asc' ? 1 : -1);
+            }
+            return a.strikedate.replace(/-/g, '') - b.strikedate.replace(/-/g, '');
+        });
+    }
+    _this.applyFilter = function() {
+        check_which_strikes_to_show();
+    };
+
+    function check_which_strikes_to_show() {
+        if (m_strikes.length == 0)
+            return;
+        let strikedate = m_strikes[0].strikedate;
+        let pos = 0;
+        let newinsrefs = [];
+        let s, h1, h2, i;
+        for (i = 0; i < m_strikes.length; i++) {
+            if (m_strikes[i].strikedate != strikedate) {
+                if (_this.settings.strikedateHeader) {
+                    h1 = m_strikes[pos].row.parentNode.rows[m_strikes[pos].row.rowIndex - 1];
+                    h2 = m_strikes[pos].row.parentNode.rows[m_strikes[pos].row.rowIndex - 2];
+                }
+                if ((_this.settings.strikedatefilter.length != 0 && _this.settings.strikedatefilter.indexOf(strikedate) == -1) || (_this.settings.expirationtypefilter.length != 0 && _this.settings.expirationtypefilter.indexOf(m_strikes[i - 1].expirationtype) == -1) || typeof m_strikes[i].expirationtype === 'undefined') {
+                    if (_this.settings.strikedateHeader) {
+                        h1.style.display = 'none';
+                        h2.style.display = 'none';
+                    }
+                    for (s = pos; s < i; s++) {
+                        m_strikes[s].row.style.display = 'none';
+                    }
+                } else {
+                    if (_this.settings.strikedateHeader) {
+                        h1.style.display = 'table-row';
+                        h2.style.display = 'table-row';
+                    }
+                    for (s = pos; s < i; s++) {
+                        m_strikes[s].row.style.display = 'table-row';
+                        if (m_strikes[s].calls != null) newinsrefs.push(parseInt(m_strikes[s].calls.insref));
+                        if (m_strikes[s].puts != null) newinsrefs.push(parseInt(m_strikes[s].puts.insref));
+                    }
+                }
+                pos = i;
+                strikedate = m_strikes[i].strikedate;
+            }
+        }
+        if (i != 0) {
+            if (_this.settings.strikedateHeader) {
+                h1 = m_strikes[pos].row.parentNode.rows[m_strikes[pos].row.rowIndex - 1];
+                h2 = m_strikes[pos].row.parentNode.rows[m_strikes[pos].row.rowIndex - 2];
+            }
+            for (s = pos; s < i; s++) {
+                if ((_this.settings.strikedatefilter.length != 0 && _this.settings.strikedatefilter.indexOf(m_strikes[s].strikedate) == -1) || (_this.settings.expirationtypefilter.length == 0 && _this.settings.expirationtypefilter.indexOf(m_strikes[s].expirationtype) != -1)) {
+                    if (_this.settings.strikedateHeader) {
+                        h1.style.display = 'none';
+                        h2.style.display = 'none';
+                    }
+                    for (s = pos; s < i; s++) {
+                        m_strikes[s].row.style.display = 'none';
+                    }
+                    continue;
+                } else {
+                    if (_this.settings.strikedateHeader) {
+                        h1.style.display = 'table-row';
+                        h2.style.display = 'table-row';
+                    }
+                }
+                m_strikes[s].row.style.display = 'table-row';
+                if (m_strikes[s].calls != null) newinsrefs.push(parseInt(m_strikes[s].calls.insref));
+                if (m_strikes[s].puts != null) newinsrefs.push(parseInt(m_strikes[s].puts.insref));
+            }
+        }
+
+        if (_this.settings.streaming != false) {
+            const sortedinsrefs = newinsrefs.slice().sort();
+            let comp = (m_currentinsrefs.length === sortedinsrefs.length && m_currentinsrefs.slice().sort().every(function(value, index) {
+                return value === sortedinsrefs[index];
+            }));
+            if (comp == false) {
+                m_currentinsrefs = sortedinsrefs;
+                _this.requestid = _this.settings.streaming.MillistreamWidgetStreamingApi_subscribeInstruments(_this, _this.requestid, m_currentinsrefs);
+            }
+        }
+    }
+
+    _this.streamingCallback = function(insref, mref, json) {
+        let keys = Object.keys(json);
+        for (let s = 0; s < keys.length; s++) {
+            if (m_pushfields.indexOf(parseInt(keys[s])) == -1) {
+                continue; // not needed for display or link
+            }
+            let cellMap = m_cellMap.get(insref + ':' + keys[s]);
+            if (cellMap) {
+                let info = MillistreamWidgetApi_getColumnInfo(_this, keys[s]);
+                _this.settings.stylecolumn = cellMap.stylecolumn;
+                _this.settings.controlcolumn = cellMap.controlcolumn;
+                print_field(_this, cellMap.element, info[0], json[info[0]], _this.settings.num_decimals);
+            }
+        }
+    };
+
+    function buildlist(resp) {
+        m_cellMap.clear();
+        m_instruments.clear();
+        m_strikedates = [];
+        m_strikeprices = [];
+        sortOptions(resp);
+        if (typeof _this.settings.onData !== 'undefined') _this.settings.onData();
+
+        if (m_strikedates.length != 0) {
+            let table = MillistreamWidgetApi_addElement(_this, 'table', 'millistream-optionslist-table', _this.settings.target);
+            let pos = 0;
+            let info;
+            let callheader = null;
+            let putheader = null;
+            let tbody = MillistreamWidgetApi_addElement(_this, 'tbody', null, table);
+            let i;
+            for (i = 0; i < _this.settings.fields.length; i++) {
+                let f = MillistreamWidgetApi_getColumnInfo(_this, _this.settings.fields[i]);
+                if (-1 == m_pushfields.indexOf(f[0])) m_pushfields.push(f[0]);
+            }
+            if (m_strikedates.length == 0) return;
+            for (let s = 0; s < m_strikedates.length; s++) {
+                let display = '';
+                let tr;
+                if (_this.settings.strikedateHeader) {
+                    tr = MillistreamWidgetApi_addElement(_this, 'tr', null, tbody);
+                    tr.setAttribute('data-strikedate', m_strikedates[s].strikedate);
+                    if (_this.settings.strikedatefilter.length != 0 && _this.settings.strikedatefilter.indexOf(m_strikedates[s].strikedate) == -1) {
+                        tr.style.display = 'none';
+                        display = 'none';
+                    }
+                    callheader = MillistreamWidgetApi_addElement(_this, 'th', 'millistream-optionslist-header-calls' + ' millistream-string', tr, null, null);
+                    putheader = MillistreamWidgetApi_addElement(_this, 'th', 'millistream-optionslist-header-puts' + ' millistream-string', tr, null, null);
+                } else if (_this.settings.strikedatefilter.length != 0 && _this.settings.strikedatefilter.indexOf(m_strikedates[s].strikedate) == -1) {
+                    display = 'none';
+                }
+                tr = MillistreamWidgetApi_addElement(_this, 'tr', 'millistream-optionslist-options-table-header', tbody);
+
+                let cpos, added_columns = 0;
+
+                if (display == 'none') tr.style.display = 'none';
+                for (i = 0; i < _this.settings.fields.length; i++) {
+                    for (cpos in _this.settings.custom_columns) {
+                        if (cpos == added_columns) {
+                            MillistreamWidgetApi_addElement(_this, 'th', 'millistream-optionslist-table-th', tr, null, _this.settings.custom_columns[cpos].name);
+                            added_columns++;
+                        }
+                    }
+                    info = MillistreamWidgetApi_getColumnInfo(_this, _this.settings.fields[i]);
+                    th = MillistreamWidgetApi_addElement(_this, 'th', 'millistream-optionslist-table-th millistream-' + info[1] + ' millistream-' + _this.settings.fields[i], tr, null, info[3]);
+                    added_columns++;
+                }
+                for (cpos in _this.settings.custom_columns) {
+                    if (cpos == added_columns) {
+                        MillistreamWidgetApi_addElement(_this, 'th', 'millistream-optionslist-table-th', tr, null, this.settings.custom_columns[cpos].name);
+                        added_columns++;
+                    }
+                }
+                th = MillistreamWidgetApi_addElement(_this, 'th', 'millistream-optionslist-table-th millistream-optionslist-yheader millistream-sortable-cursor millistream-sorting-' + _this.settings.sortorder, tr);
+                th.innerHTML = _this.get_lang_text('strikes');
+                th.onclick = (function(e) {
+                    _this.settings.sortorder = _this.settings.sortorder == 'asc' ? 'desc' : 'asc';
+                    let tmp = [];
+                    let first = 0; // ignore first header and future
+                    while (first < table.childNodes[0].childNodes.length) {
+                        if (table.childNodes[0].childNodes[first].childNodes[0].nodeName == 'TH') {
+                            let offset = 0;
+                            if (!table.childNodes[0].childNodes[first].classList.contains('millistream-optionslist-options-table-header'))
+                                offset = 1;
+                            table.childNodes[0].childNodes[first + offset].cells[e.srcElement.cellIndex].classList.remove('millistream-sorting-' + (_this.settings.sortorder == 'asc' ? 'desc' : 'asc'));
+                            table.childNodes[0].childNodes[first + offset].cells[e.srcElement.cellIndex].classList.add('millistream-sorting-' + _this.settings.sortorder);
+                            for (s = 0; s < tmp.length; s++) {
+                                table.childNodes[0].insertBefore(tmp[s], table.childNodes[0].childNodes[first + offset]);
+                            }
+                            first = first + tmp.length + 1 + offset;
+                            tmp = [];
+                        }
+                        tmp.push(table.childNodes[0].childNodes[first]);
+                        table.childNodes[0].removeChild(table.childNodes[0].childNodes[first]);
+                    }
+                    if (tmp.length > 0) {
+                        for (s = 0; s < tmp.length; s++) {
+                            table.childNodes[0].insertBefore(tmp[s], table.childNodes[0].childNodes[first]);
+                        }
+                    }
+                    m_strikes.sort(function(a, b) {
+                        if (a.strikedate == b.strikedate) {
+                            return (a.strikeprice - b.strikeprice) * (_this.settings.sortorder == 'asc' ? 1 : -1);
+                        }
+                        return a.strikedate.replace(/-/g, '') - b.strikedate.replace(/-/g, '');
+                    });
+                });
+
+                cpos = 0;
+                //added_columns = 0;
+                if (_this.settings.hidePuts == false) {
+                    for (i = _this.settings.fields.length - 1; i >= 0; i--) {
+                        // flip bid and ask for puts
+                        if (_this.settings.fields[i] == 'bidprice' && _this.settings.fields[i].indexOf('askprice') != 0) {
+                            info = MillistreamWidgetApi_getColumnInfo(_this, 'askprice');
+                            MillistreamWidgetApi_addElement(_this, 'th', 'millistream-optionslist-table-th millistream-' + info[1] + ' millistream-askprice', tr, null, info[3]);
+                        } else
+                        if (_this.settings.fields[i] == 'askprice' && _this.settings.fields[i].indexOf('bidprice') != 0) {
+                            info = MillistreamWidgetApi_getColumnInfo(_this, 'bidprice');
+                            MillistreamWidgetApi_addElement(_this, 'th', 'millistream-optionslist-table-th millistream-' + info[1] + ' millistream-bidprice', tr, null, info[3]);
+                        } else {
+                            info = MillistreamWidgetApi_getColumnInfo(_this, _this.settings.fields[i]);
+                            MillistreamWidgetApi_addElement(_this, 'th', 'millistream-optionslist-table-th millistream-' + info[1] + ' millistream-' + _this.settings.fields[i], tr, null, info[3]);
+                        }
+                        for (cpos in _this.settings.custom_columns) {
+                            if (cpos == i + 1) {
+                                MillistreamWidgetApi_addElement(_this, 'th', 'millistream-optionslist-table-th', tr, null, _this.settings.custom_columns[cpos].name);
+                                added_columns++;
+                            }
+                        }
+                        added_columns++;
+                    }
+                    for (cpos in _this.settings.custom_columns) {
+                        if (cpos == i + 1) {
+                            MillistreamWidgetApi_addElement(_this, 'th', 'millistream-optionslist-table-th', tr, null, _this.settings.custom_columns[cpos].name);
+                            added_columns++;
+                        }
+                    }
+                }
+                let numcalls = 0;
+                let numputs = 0;
+                let td;
+                let x;
+                for (i = pos; i < m_strikes.length; i++) {
+                    let cellMap;
+                    if (m_strikeprices.indexOf(m_strikes[i].strikeprice) == -1) m_strikeprices.push(m_strikes[i].strikeprice);
+                    if (m_strikes[i].strikedate == m_strikedates[s].strikedate) {
+                        added_columns = 0;
+                        let otr = MillistreamWidgetApi_addElement(_this, 'tr', 'millistream-optionlist-row', tbody);
+                        otr.onclick = function(e) {
+                            if (typeof _this.settings.onRowClick === 'function') {
+                                if (e.srcElement.nodeName == 'TD') {
+                                    if (e.srcElement.cellIndex < _this.settings.fields.length + Object.keys(_this.settings.custom_columns).length) {
+                                        if (e.srcElement.parentNode.getAttribute('call') !== null)
+                                            _this.settings.onRowClick(e.srcElement.parentNode.getAttribute('call'));
+                                    } else
+                                    if (e.srcElement.cellIndex > _this.settings.fields.length + Object.keys(_this.settings.custom_columns).length) {
+                                        if (e.srcElement.parentNode.getAttribute('put') !== null)
+                                            _this.settings.onRowClick(e.srcElement.parentNode.getAttribute('put'));
+                                    }
+                                    return;
+                                }
+                            }
+                        };
+                        if (display == 'none') otr.style.display = 'none';
+                        m_strikes[i].row = otr;
+                        if (m_strikes[i].calls) numcalls++;
+                        for (x = 0; x < _this.settings.fields.length; x++) {
+                            for (cpos in _this.settings.custom_columns) {
+                                if (cpos == added_columns) {
+                                    td = MillistreamWidgetApi_addTableCell2(_this, null, 'millistream-optionslist-call-cell', otr);
+                                    if (m_strikes[i].calls && (typeof _this.settings.custom_columns[cpos].condition !== 'function' || _this.settings.custom_columns[cpos].condition(m_strikes[i].calls))) {
+                                        if (_this.settings.custom_columns[cpos].instruments && -1 != _this.settings.custom_columns[cpos].instruments.indexOf(m_strikes[i].insref)) {
+                                            add_custom_element(_this.settings.custom_columns[cpos].element, _this.settings.custom_columns[cpos].alternate_class, td, _this.settings.custom_columns[cpos].type, _this.settings.custom_columns[cpos].name, _this.settings.custom_columns[cpos].onclick, m_strikes[i].calls.insref);
+                                        } else {
+                                            add_custom_element(_this.settings.custom_columns[cpos].element, _this.settings.custom_columns[cpos].class, td, _this.settings.custom_columns[cpos].type, _this.settings.custom_columns[cpos].name, _this.settings.custom_columns[cpos].onclick, m_strikes[i].calls.insref);
+                                        }
+                                    }
+                                    added_columns++;
+                                }
+                            }
+
+                            info = MillistreamWidgetApi_getColumnInfo(_this, _this.settings.fields[x]);
+                            td = MillistreamWidgetApi_addTableCell2(_this, _this.settings.fields[x], 'millistream-' + info[1] + ' millistream-optionslist-call-cell ' + ' millistream-' + _this.settings.fields[x], otr, m_strikes[i].calls);
+                            if (m_strikes[i].calls) {
+                                otr.setAttribute('call', m_strikes[i].calls.insref);
+                                cellMap = {
+                                    insref: m_strikes[i].calls.insref,
+                                    element: td,
+                                    stylecolumn: _this.settings.stylecolumn,
+                                    controlcolumn: _this.settings.controlcolumn
+                                };
+                                m_cellMap.set(cellMap.insref + ':' + info[0], cellMap);
+                            }
+                            added_columns++;
+                        }
+                        for (cpos in _this.settings.custom_columns) {
+                            if (cpos == added_columns) {
+                                td = MillistreamWidgetApi_addTableCell2(_this, null, 'millistream-optionslist-call-cell', otr);
+                                if (m_strikes[i].calls) {
+                                    if (_this.settings.custom_columns[cpos].instruments && -1 != _this.settings.custom_columns[cpos].instruments.indexOf(m_strikes[i].insref)) {
+                                        add_custom_element(_this.settings.custom_columns[cpos].element, _this.settings.custom_columns[cpos].alternate_class, td, _this.settings.custom_columns[cpos].type, _this.settings.custom_columns[cpos].name, _this.settings.custom_columns[cpos].onclick, m_strikes[i].calls.insref);
+                                    } else {
+                                        add_custom_element(_this.settings.custom_columns[cpos].element, _this.settings.custom_columns[cpos].class, td, _this.settings.custom_columns[cpos].type, _this.settings.custom_columns[cpos].name, _this.settings.custom_columns[cpos].onclick, m_strikes[i].calls.insref);
+                                    }
+                                }
+                                added_columns++;
+                            }
+                        }
+                        // add strike column
+                        td = MillistreamWidgetApi_addElement(_this, 'td', 'millistream-optionslist-yheader millistream-numeric', otr);
+                        td.innerHTML = m_strikes[i].strikeprice == null ? 'Fut | Fwd' : formatNiceNumber(m_strikes[i].strikeprice, _this.settings.thousandseparator, _this.settings.decimalseparator, m_strikepricedecimals);
+
+                        if (m_strikes[i].puts) numputs++;
+                        let field = null;
+                        if (_this.settings.hidePuts == false) {
+                            for (x = _this.settings.fields.length - 1; x >= 0; x--) {
+                                // flip bid and ask for puts
+
+                                field = _this.settings.fields[x];
+                                if (_this.settings.fields[x] == 'bidprice' && _this.settings.fields[x].indexOf('askprice') != 0) {
+                                    info = MillistreamWidgetApi_getColumnInfo(_this, 'askprice');
+                                    field = 'askprice';
+                                } else
+                                if (_this.settings.fields[x] == 'askprice' && _this.settings.fields[x].indexOf('bidprice') != 0) {
+                                    info = MillistreamWidgetApi_getColumnInfo(_this, 'bidprice');
+                                    field = 'bidprice';
+                                } else
+                                    info = MillistreamWidgetApi_getColumnInfo(_this, _this.settings.fields[x]);
+
+                                td = MillistreamWidgetApi_addTableCell2(_this, field, 'millistream-' + info[1] + ' millistream-optionslist-put-cell ' + ' millistream-' + field, otr, m_strikes[i].puts);
+                                if (m_strikes[i].puts) {
+                                    otr.setAttribute('put', m_strikes[i].puts.insref);
+                                    cellMap = {
+                                        insref: m_strikes[i].puts.insref,
+                                        element: td,
+                                        stylecolumn: _this.settings.stylecolumn == null ? null : _this.settings.stylecolumn.map(x => added_columns + _this.settings.fields.length - x + 2),
+                                        controlcolumn: _this.settings.controlcolumn == null ? null : added_columns + _this.settings.fields.length - _this.settings.controlcolumn + 2,
+                                    };
+                                    m_cellMap.set(cellMap.insref + ':' + info[0], cellMap);
+                                }
+                                for (cpos in _this.settings.custom_columns) {
+                                    if (cpos == x + 1) {
+                                        td = MillistreamWidgetApi_addTableCell2(_this, null, 'millistream-optionslist-put-cell', otr);
+                                        if (m_strikes[i].puts && (typeof _this.settings.custom_columns[cpos].condition !== 'function' || _this.settings.custom_columns[cpos].condition(m_strikes[i].puts))) {
+                                            if (_this.settings.custom_columns[cpos].instruments && -1 != _this.settings.custom_columns[cpos].instruments.indexOf(m_strikes[i].insref)) {
+                                                add_custom_element(_this.settings.custom_columns[cpos].element, _this.settings.custom_columns[cpos].alternate_class, td, _this.settings.custom_columns[cpos].type, _this.settings.custom_columns[cpos].name, _this.settings.custom_columns[cpos].onclick, m_strikes[i].puts.insref);
+                                            } else {
+                                                add_custom_element(_this.settings.custom_columns[cpos].element, _this.settings.custom_columns[cpos].class, td, _this.settings.custom_columns[cpos].type, _this.settings.custom_columns[cpos].name, _this.settings.custom_columns[cpos].onclick, m_strikes[i].puts.insref);
+                                            }
+                                        }
+                                        added_columns++;
+                                    }
+                                }
+                            }
+                            for (cpos in _this.settings.custom_columns) {
+                                if (cpos == x + 1) {
+                                    td = MillistreamWidgetApi_addTableCell2(_this, null, 'millistream-optionslist-put-cell', otr);
+                                    if (m_strikes[i].puts && (typeof _this.settings.custom_columns[cpos].condition !== 'function' || _this.settings.custom_columns[cpos].condition(m_strikes[i].puts))) {
+                                        if (_this.settings.custom_columns[cpos].instruments && -1 != _this.settings.custom_columns[cpos].instruments.indexOf(m_strikes[i].insref)) {
+                                            add_custom_element(_this.settings.custom_columns[cpos].element, _this.settings.custom_columns[cpos].alternate_class, td, _this.settings.custom_columns[cpos].type, _this.settings.custom_columns[cpos].name, _this.settings.custom_columns[cpos].onclick, m_strikes[i].puts.insref);
+                                        } else {
+                                            add_custom_element(_this.settings.custom_columns[cpos].element, _this.settings.custom_columns[cpos].class, td, _this.settings.custom_columns[cpos].type, _this.settings.custom_columns[cpos].name, _this.settings.custom_columns[cpos].onclick, m_strikes[i].puts.insref);
+                                        }
+                                    }
+                                    added_columns++;
+                                }
+                            }
+                        }
+                    } else break;
+                }
+                if (_this.settings.strikedateHeader) {
+                    callheader.innerHTML = _this.get_lang_text('calls') + ' · ' + m_strikedates[s].strikedate + ' ' + (m_strikedates[s].expirationtype == '2' ? _this.get_lang_text('weeklytype') : ' ') + ' · ' + m_strikedates[s].dte + ' ' + _this.get_lang_text('dte') + ' · ' + numcalls + ' strikes';
+                    console.log(callheader.innerHTML);
+                    callheader.colSpan = _this.settings.fields.length + 1 + Object.keys(_this.settings.custom_columns).length;
+                    putheader.innerHTML = _this.get_lang_text('puts') + ' · ' + m_strikedates[s].strikedate + ' ' + (m_strikedates[s].expirationtype == '2' ? _this.get_lang_text('weeklytype') : ' ') + ' · ' + m_strikedates[s].dte + ' ' + _this.get_lang_text('dte') + ' · ' + numputs + ' strikes';
+                    putheader.colSpan = _this.settings.fields.length + Object.keys(_this.settings.custom_columns).length;
+                }
+                pos = i;
+            }
+            check_which_strikes_to_show();
+        }
+        if (_this.settings.onreadyCallback) _this.settings.onreadyCallback();
+    }
+
+
+    _this.drawWidget = function() {
+
+        if (MillistreamWidgetApi_isObjectEmpty(_this.unsubscriptions) == false)
+            _this.requestid = _this.settings.streaming.MillistreamWidgetStreamingApi_subscribeInstruments(_this, _this.requestid, []);
+
+        if (_this.settings.target) {
+            _this.settings.target.innerHTML = '';
+        }
+
+        m_strikes = [];
+        m_pushfields = [];
+        m_currentinsrefs = [];
+        m_cellMap = new Map();
+
+        let url = MillistreamWidgetApi_buildQuery(_this, 'optionslist');
+        millistream_data_api.fetch(url, function(data) {
+            buildlist(data);
+        });
+    };
+    if (this.settings.autodraw == true) this.drawWidget();
+
+}
 var milli_data_api_url = 'https://stage.millistream.com/widgets/3.0.4/data/milli_widget_dataapi.php?';
 
 var millistream_data_api = {
@@ -3619,10 +4249,10 @@ function MillistreamWidgetApi_buildQuery(widget, type) {
             }
         }
         if (typeof widget.settings.headerinterval === 'string' && widget.settings.headerinterval == 'instrumenttype') {
-            if (widget.settings.fields.indexOf('instrumenttype') == -1) {
+            if (widget.settings.fields.indexOf('instrumenttype') == -1 && widget.settings.link_field.indexOf('instrumenttype') == -1)    {
                 url += ',instrumenttype';
             }
-            if (widget.settings.fields.indexOf('instrumentsubtype') == -1) {
+            if (widget.settings.fields.indexOf('instrumentsubtype') == -1 && widget.settings.link_field.indexOf('instrumentsubtype') == -1) {
                 url += ',instrumentsubtype';
             }
         }
@@ -3745,7 +4375,7 @@ function MillistreamWidgetApi_buildQuery(widget, type) {
         if (typeof widget.settings.fundcompany !== 'object' && widget.settings.fundcompany !== null) throw new Error(widget.constructor.name + ': fundcompany is not valid');
         url += '&fundcompany=' + widget.settings.fundcompany.join(',');
     }
-    if (typeof widget.settings.expirationtype !== 'undefined') {
+    if (typeof widget.settings.expirationtype !== 'undefined' && widget.settings.expirationtype != null) {
         if (typeof widget.settings.expirationtype !== 'number' && widget.settings.expirationtype !== null) throw new Error(widget.constructor.name + ': expirationtype is not valid');
         url += '&expirationtype=' + widget.settings.expirationtype;
     }
@@ -3796,7 +4426,7 @@ function MillistreamWidgetApi_buildQuery(widget, type) {
     if (typeof widget.settings.xhr !== 'undefined' && widget.settings.xhr == true) {
         url += '&xhr=1';
     }
-
+    console.log(url);
     return url;
 }
 
@@ -4012,8 +4642,11 @@ function MillistreamWidgetApi_flashElement(widget, el, newValue, oldValue) {
 // numeriska funktioner
 function MillistreamWidgetApi_isNumber(widget, testsubject) {
     if (!testsubject) return;
-    var n = testsubject.replace(widget.settings.decimalseparator, '.').split(widget.settings.thousandseparator).join('');
-    return !isNaN(parseFloat(n)) && isFinite(n);
+    if(isNaN(testsubject)) {
+        var n = testsubject.replace(widget.settings.decimalseparator, '.').split(widget.settings.thousandseparator).join('');
+        return !isNaN(parseFloat(n)) && isFinite(n);
+    }
+    return !isNaN(parseFloat(testsubject)) && isFinite(testsubject);
 }
 
 function MillistreamWidgetApi_getNumDecimals(widget, value, current, validfields) {
@@ -4674,6 +5307,9 @@ function MillistreamWidgetApi_getColumnInfo(widget, name) {
         case '703':
         case 'vega':
             return [703, 'numeric', 'right', widget.get_lang_text(name) || name, 0];
+        case '123':
+        case 'vwap':
+            return [123, 'numeric', 'right', widget.get_lang_text(name) || name, 0];
 
             // brokerstats
         case '3000':
@@ -5108,6 +5744,7 @@ function MillistreamWidgetApi_addTableCell2(widget, key, cl, parent, json, decim
     if (cl) td.setAttribute('class', cl);
     if (info[1] == 'numeric' && json && json[key]) {
         var v = 0;
+        if(!isNaN(json[key])) json[key] = json[key].toString();
         var res = parseFloat(json[key].replace(widget.settings.decimalseparator, '.').split(widget.settings.thousandseparator).join(''));
         if (!isNaN(parseFloat(res)) && isFinite(res)) v = res;
         /*if (typeof widget.settings.positiveclass === 'string' && typeof widget.settings.negativeclass) {
@@ -5858,6 +6495,7 @@ function MillistreamWidgetStreamingApi(settings) {
     milli_stream_connect();
 }
 exports.Milli_Chart = Milli_Chart;
+exports.Milli_OptionsList = Milli_OptionsList;
 exports.MillistreamWidgetSettings = MillistreamWidgetSettings;
 exports.formatDate = formatDate;
 exports.MillistreamWidgetStreamingApi = MillistreamWidgetStreamingApi;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@millistream/millistream-widgets",
-  "version": "1.0.24",
+  "version": "1.0.26",
   "description": "Millistream widgets node package",
   "main": "millistream-widgets.js",
   "scripts": {