@websy/websy-designs 1.3.1 → 1.3.2

package/dist/server/helpers/v1/pdfHelper.js

@@ -81,7 +81,7 @@ let convertHTMLToPDF = (html, name, callback, options_in = null, displayHeaderFo
       //   page.on('request', request => request.continue())
       // })
       page.setUserAgent('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/85.0.4183.121 Safari/537.36').then(() => {
-        page.setContent(html, {waitUntil: ['load', 'domcontentloaded', 'networkidle2', 'networkidle0']}).then(() => {
+        page.setContent(html, {waitUntil: process.env.PDF_WAIT_FOR || ['load', 'domcontentloaded', 'networkidle2', 'networkidle0']}).then(() => {
           page.evaluateHandle('document.fonts.ready').then(() => {
             report.pdfPage(page, options).then(pdf => {                        
               browser.close()
@@ -92,9 +92,18 @@ let convertHTMLToPDF = (html, name, callback, options_in = null, displayHeaderFo
               browser.close()
               callback(error)
             })
-          }, err => console.log('error evaluating handle in puppeteer', err))
-        }, err => console.log('error setting content in puppeteer', err))
-      }, err => console.log('error setting user agent in puppeteer', err))
+          }, err => {
+            console.log('error evaluating handle in puppeteer', err)
+            callback(err)
+          })
+        }, err => {
+          console.log('error setting content in puppeteer', err)
+          callback(err)
+        })
+      }, err => {
+        console.log('error setting user agent in puppeteer', err)
+        callback(err)
+      })
       // page.goto(process.env.PDF_PAGE || 'http://localhost:4000', {waitUntil: ['load', 'domcontentloaded', 'networkidle2', 'networkidle0']}).then(gotoResponse => {
       // page.setViewport({width: 1500, height: 2000, deviceScaleFactor: 1}).then(() => {                                
       // options.path = `${process.env.APP_ROOT}/pdf/${pdfId}.pdf`          

package/dist/websy-designs-es6.debug.js

@@ -550,8 +550,9 @@ class WebsyDatePicker {
         let rangeEnd
         if (this.options.mode === 'date') {          
           d = this.floorDate(new Date(this.selectedRangeDates[0].getTime() + (i * this.oneDay)))          
-          d.setUTCHours(12, 0, 0, 0)
+          // d.setUTCHours(12, 0, 0, 0)
           d = d.getTime()
+          // console.log('highlighting', this.selectedRangeDates[0].getTime(), d)
           rangeStart = this.selectedRangeDates[0].getTime()
           rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1].getTime()
         }      
@@ -560,8 +561,10 @@ class WebsyDatePicker {
           rangeStart = this.selectedRangeDates[0]
           rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1]
         }
-        else if (this.options.mode === 'monthyear') {
-          d = new Date(this.selectedRangeDates[0].getTime()).setMonth(this.selectedRangeDates[0].getMonth() + i)          
+        else if (this.options.mode === 'monthyear') {          
+          d = this.floorDate(new Date(this.selectedRangeDates[0].getTime()).setMonth(this.selectedRangeDates[0].getMonth() + i))          
+          d = d.getTime()
+          console.log('highlighting', this.selectedRangeDates[0].getTime(), d)
           rangeStart = this.selectedRangeDates[0].getTime()
           rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1].getTime()
         }
@@ -6771,15 +6774,20 @@ if (this.options.showLabels === true || series.showLabels === true) {
     .text(d => d.y.label || d.y.value)
     .each(function (d, i) {      
       if (that.options.orientation === 'horizontal') {
-        if (that.options.grouping === 'stacked') {
+        if (that.options.grouping === 'stacked' && series.labelPosition !== 'outside') {
           this.setAttribute('text-anchor', 'middle')
         }
         else if (that.plotWidth - getLabelX.call(that, d) < this.getComputedTextLength()) {
           this.setAttribute('text-anchor', 'end')
-          this.setAttribute('x', +(this.getAttribute('x')) - 8)        
+          this.setAttribute('x', +(this.getAttribute('x')) - 8)                  
           this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color))
         }    
-        else {        
+        else if (series.labelPosition === 'outside') {
+          this.setAttribute('text-anchor', 'start')
+          this.setAttribute('x', +(this.getAttribute('x')) + 8)                  
+          this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark('#ffffff'))
+        }
+        else {                  
           this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark('#ffffff'))
         }
       }
@@ -6803,15 +6811,20 @@ if (this.options.showLabels === true || series.showLabels === true) {
     .text(d => d.y.label || d.y.value)
     .each(function (d, i) {      
       if (that.options.orientation === 'horizontal') {
-        if (that.options.grouping === 'stacked') {
+        if (that.options.grouping === 'stacked' && series.labelPosition !== 'outside') {
           this.setAttribute('text-anchor', 'middle')
         }
         else if (that.plotWidth - getLabelX.call(that, d) < this.getComputedTextLength()) {
           this.setAttribute('text-anchor', 'end')
-          this.setAttribute('x', +(this.getAttribute('x')) - 8)        
+          this.setAttribute('x', +(this.getAttribute('x')) - 8)                  
           this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color))
         }    
-        else {        
+        else if (series.labelPosition === 'outside') {
+          this.setAttribute('text-anchor', 'start')
+          this.setAttribute('x', +(this.getAttribute('x')) + 8)                  
+          this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark('#ffffff'))
+        }
+        else {                  
           this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark('#ffffff'))
         }
       }
@@ -6823,10 +6836,10 @@ if (this.options.showLabels === true || series.showLabels === true) {
     })
 }
 
-function getLabelX (d) {
+function getLabelX (d, labelPosition = 'inside') {
   if (this.options.orientation === 'horizontal') {
     if (this.options.grouping === 'stacked') {
-      return this[yAxis](d.y.accumulative) + (this[yAxis](d.y.value) / 2)
+      return this[yAxis](d.y.accumulative) + (this[yAxis](d.y.value) / (labelPosition === 'inside' ? 2 : 1))
     }
     else {
       return this[yAxis](isNaN(d.y.value) ? 0 : d.y.value) + 4
@@ -6836,13 +6849,13 @@ function getLabelX (d) {
     return this[xAxis](this.parseX(d.x.value)) + (this[xAxis].bandwidth() / 2)
   }
 }
-function getLabelY (d) {
+function getLabelY (d, labelPosition = 'inside') {
   if (this.options.orientation === 'horizontal') {    
     return this[xAxis](this.parseX(d.x.value)) + (this[xAxis].bandwidth() / 2)
   }
   else {
     if (this.options.grouping === 'stacked') {
-      // 
+      return this[yAxis](d.y.accumulative) + (this[yAxis](d.y.value) / (labelPosition === 'inside' ? 2 : 1))
     }
     else {
       return this[yAxis](isNaN(d.y.value) ? 0 : d.y.value) - 4

package/dist/websy-designs-es6.js

@@ -614,9 +614,10 @@ var WebsyDatePicker = /*#__PURE__*/function () {
           var rangeEnd = void 0;
 
           if (this.options.mode === 'date') {
-            d = this.floorDate(new Date(this.selectedRangeDates[0].getTime() + _i * this.oneDay));
-            d.setUTCHours(12, 0, 0, 0);
-            d = d.getTime();
+            d = this.floorDate(new Date(this.selectedRangeDates[0].getTime() + _i * this.oneDay)); // d.setUTCHours(12, 0, 0, 0)
+
+            d = d.getTime(); // console.log('highlighting', this.selectedRangeDates[0].getTime(), d)
+
             rangeStart = this.selectedRangeDates[0].getTime();
             rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1].getTime();
           } else if (this.options.mode === 'year') {
@@ -624,7 +625,9 @@ var WebsyDatePicker = /*#__PURE__*/function () {
             rangeStart = this.selectedRangeDates[0];
             rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1];
           } else if (this.options.mode === 'monthyear') {
-            d = new Date(this.selectedRangeDates[0].getTime()).setMonth(this.selectedRangeDates[0].getMonth() + _i);
+            d = this.floorDate(new Date(this.selectedRangeDates[0].getTime()).setMonth(this.selectedRangeDates[0].getMonth() + _i));
+            d = d.getTime();
+            console.log('highlighting', this.selectedRangeDates[0].getTime(), d);
             rangeStart = this.selectedRangeDates[0].getTime();
             rangeEnd = this.selectedRangeDates[this.selectedRangeDates.length - 1].getTime();
           } else if (this.options.mode === 'hour') {
@@ -7431,12 +7434,16 @@ var WebsyChart = /*#__PURE__*/function () {
           return d.y.label || d.y.value;
         }).each(function (d, i) {
           if (that.options.orientation === 'horizontal') {
-            if (that.options.grouping === 'stacked') {
+            if (that.options.grouping === 'stacked' && series.labelPosition !== 'outside') {
               this.setAttribute('text-anchor', 'middle');
             } else if (that.plotWidth - getLabelX.call(that, d) < this.getComputedTextLength()) {
               this.setAttribute('text-anchor', 'end');
               this.setAttribute('x', +this.getAttribute('x') - 8);
               this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color));
+            } else if (series.labelPosition === 'outside') {
+              this.setAttribute('text-anchor', 'start');
+              this.setAttribute('x', +this.getAttribute('x') + 8);
+              this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark('#ffffff'));
             } else {
               this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark('#ffffff'));
             }
@@ -7452,12 +7459,16 @@ var WebsyChart = /*#__PURE__*/function () {
           return d.y.label || d.y.value;
         }).each(function (d, i) {
           if (that.options.orientation === 'horizontal') {
-            if (that.options.grouping === 'stacked') {
+            if (that.options.grouping === 'stacked' && series.labelPosition !== 'outside') {
               this.setAttribute('text-anchor', 'middle');
             } else if (that.plotWidth - getLabelX.call(that, d) < this.getComputedTextLength()) {
               this.setAttribute('text-anchor', 'end');
               this.setAttribute('x', +this.getAttribute('x') - 8);
               this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark(d.y.color || d.color || series.color));
+            } else if (series.labelPosition === 'outside') {
+              this.setAttribute('text-anchor', 'start');
+              this.setAttribute('x', +this.getAttribute('x') + 8);
+              this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark('#ffffff'));
             } else {
               this.setAttribute('fill', that.options.labelColor || WebsyDesigns.WebsyUtils.getLightDark('#ffffff'));
             }
@@ -7470,9 +7481,11 @@ var WebsyChart = /*#__PURE__*/function () {
       }
 
       function getLabelX(d) {
+        var labelPosition = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'inside';
+
         if (this.options.orientation === 'horizontal') {
           if (this.options.grouping === 'stacked') {
-            return this[yAxis](d.y.accumulative) + this[yAxis](d.y.value) / 2;
+            return this[yAxis](d.y.accumulative) + this[yAxis](d.y.value) / (labelPosition === 'inside' ? 2 : 1);
           } else {
             return this[yAxis](isNaN(d.y.value) ? 0 : d.y.value) + 4;
           }
@@ -7482,10 +7495,13 @@ var WebsyChart = /*#__PURE__*/function () {
       }
 
       function getLabelY(d) {
+        var labelPosition = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'inside';
+
         if (this.options.orientation === 'horizontal') {
           return this[xAxis](this.parseX(d.x.value)) + this[xAxis].bandwidth() / 2;
         } else {
-          if (this.options.grouping === 'stacked') {// 
+          if (this.options.grouping === 'stacked') {
+            return this[yAxis](d.y.accumulative) + this[yAxis](d.y.value) / (labelPosition === 'inside' ? 2 : 1);
           } else {
             return this[yAxis](isNaN(d.y.value) ? 0 : d.y.value) - 4;
           }