@millistream/millistream-widgets 0.0.14 → 0.0.15

package/millistream-widgets.js

@@ -1,3 +1,5 @@
+'use strict';
+
 function Milli_Chart(settings) {
     var _this = this;
     _this.mdf_fields = [];
@@ -580,7 +582,7 @@ function Milli_Chart(settings) {
         m_ctx.strokeStyle = m_gridHorizontalCss.color;
         m_ctx.font = m_yLegendCss['font-weight'] + ' ' + m_yLegendCss['font-size'] + ' ' + m_yLegendCss['font-family'];
         m_ctx.fillStyle = m_yLegendCss.color;
-        if (_this.settings.chartlen == '1d' || _this.settings.chartlen == '0d') firstvalue = _this.instruments[0].closeprice1d;
+        //if (_this.settings.chartlen == '1d' || _this.settings.chartlen == '0d') firstvalue = _this.instruments[0].closeprice1d;
 
         if (0 == calcHighLow()) {
             // console.log('no data to draw on');
@@ -1108,6 +1110,14 @@ function Milli_Chart(settings) {
         return datetime.toTimeString().substring(0, 8);
     }
 
+    function calcTimeSpanInDays(startdate, enddate) {
+        console.log(startdate, enddate)
+        var s = Math.ceil(startdate / 86400000) * 86400000;
+        var e = Math.ceil(enddate / 86400000) * 86400000;
+        console.log(e - s / 86400000);
+
+    }
+
     function drawXAxisTick(starttime, endtime) {
         m_ctx.save();
         m_ctx.font = m_xLegendCss['font-weight'] + ' ' + m_xLegendCss['font-size'] + ' ' + m_xLegendCss['font-family'];
@@ -1180,12 +1190,14 @@ function Milli_Chart(settings) {
         else
             maxHourLegends = Math.floor((legendItems[1].x - legendItems[0].x - getMaxTimeWidth()) / (getMaxTimeWidth() * 3));
         var tickSize;
-        if (m_zoom.isZooming) {
-            console.log(starttime, endtime);
-            tickSize = new Date(endtime - starttime);
-            console.log(tickSize.getTime());
-        } else
-            tickSize = new Date(new Date(currentDate.toISOString().substring(0, 10) + 'T' + _this.instruments[0].marketclose + 'Z') - new Date(currentDate.toISOString().substring(0, 10) + 'T' + _this.instruments[0].marketopen + 'Z'));
+        calcTimeSpanInDays(starttime, endtime);
+
+        //if (m_zoom.isZooming) {
+        console.log(starttime, endtime);
+        tickSize = new Date(endtime - starttime);
+        console.log(tickSize.getTime());
+        //} else
+        //  tickSize = new Date(new Date(currentDate.toISOString().substring(0, 10) + 'T' + _this.instruments[0].marketclose + 'Z') - new Date(currentDate.toISOString().substring(0, 10) + 'T' + _this.instruments[0].marketopen + 'Z'));
         var interval;
         var modularvalue = 3600000;
         if (tickSize.getTime() < 3600000) {
@@ -1209,7 +1221,7 @@ function Milli_Chart(settings) {
         lastx = 0;
         var closeTime = new Date(currentDate.toISOString().substring(0, 10) + 'T' + _this.instruments[0].marketclose + 'Z');
         var workDate = new Date(currentDate);
-        var currentDate = new Date(startdate);
+        currentDate = new Date(starttime);
         if (currentDate.getTime() % modularvalue != 0) // if not full hour, move up to next full hour
             currentDate = new Date(currentDate.getTime() - currentDate.getTime() % modularvalue + modularvalue); // START om full hour (if modulo == 0 then + 3600000 kanske)
 
@@ -1868,8 +1880,8 @@ function Milli_Chart(settings) {
 
     function setTimeSpanData() {
         if (typeof _this.settings.timespanelement === 'undefined' || _this.settings.timespanelement == null) return;
-        startdate = new Date(_this.scaleinfoX.startTimeStamp);
-        enddate = new Date(_this.scaleinfoX.endTimeStamp);
+        var startdate = new Date(_this.scaleinfoX.startTimeStamp);
+        var enddate = new Date(_this.scaleinfoX.endTimeStamp);
         if (startdate.getTime() - (startdate.getTime() % 86400000) == enddate.getTime() - (enddate.getTime() % 86400000)) {
             _this.settings.timespanelement.innerHTML = startdate.toTimeString().substring(0, 8) + ' - ' + enddate.toTimeString().substring(0, 8);
         } else {

package/package.json

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