@websy/websy-designs 1.4.22 → 1.4.24

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

@@ -226,7 +226,7 @@ class PGHelper {
               return `${entity ? entity + '.' : ''}${parts[0]} < '${parts[1].replace('<', '')}'`
             }
             else if (parts[1].indexOf('%') !== -1) {
-              return `${entity ? entity + '.' : ''}LOWER(${parts[0]}) LIKE '${parts[1]}'`
+              return `LOWER(${entity ? entity + '.' : ''}${parts[0]}) LIKE '${parts[1]}'`
             }
             else {
               return `${entity ? entity + '.' : ''}${parts[0]} = '${parts[1]}'`

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

@@ -4226,8 +4226,11 @@ class WebsyRouter {
         this.hideView(this.previousPath, group)
       }
     }
-    else {      
+    else if (group === this.options.defaultGroup) {      
       this.hideView(this.previousView, group)
+    } 
+    else {      
+      this.hideView(this.previousPath, group)
     }    
     if (toggle === true && newPath === groupActiveView) {
       return
@@ -6452,7 +6455,7 @@ class WebsyChart {
   constructor (elementId, options) {
     const DEFAULTS = {
       margin: { 
-        top: 10, 
+        top: 20, 
         left: 3, 
         bottom: 3, 
         right: 3, 
@@ -6788,6 +6791,7 @@ this.lineLayer = this.svg.append('g').attr('class', 'line-layer')
 this.barLayer = this.svg.append('g').attr('class', 'bar-layer')
 this.labelLayer = this.svg.append('g').attr('class', 'label-layer')
 this.symbolLayer = this.svg.append('g').attr('class', 'symbol-layer')
+this.refLineLayer = this.svg.append('g').attr('class', 'refline-layer')
 this.trackingLineLayer = this.svg.append('g').attr('class', 'tracking-line-layer')
 this.trackingLineLayer.append('line').attr('class', 'tracking-line')
 this.tooltip = new WebsyDesigns.WebsyChartTooltip(this.svg)
@@ -7046,6 +7050,8 @@ else {
       .attr('transform', `translate(${this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
     this.symbolLayer
       .attr('transform', `translate(${this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
+    this.refLineLayer
+      .attr('transform', `translate(${this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)
     this.trackingLineLayer
       .attr('transform', `translate(${this.options.margin.left + this.options.margin.axisLeft}, ${this.options.margin.top + this.options.margin.axisTop})`)         
     this.eventLayer
@@ -7281,6 +7287,9 @@ else {
       this.renderLabels(series, index)
       this.renderedKeys[series.key] = series.type
     })
+    if (this.options.refLines && this.options.refLines.length > 0) {
+      this.options.refLines.forEach(l => this.renderRefLine(l))
+    }
   }  
 }
 
@@ -7621,6 +7630,45 @@ if (series.showSymbols === true) {
   this.rendersymbol(series, index)
 }
 
+  }
+  renderRefLine (data) {
+    /* global d3 data */
+let xAxis = 'bottom'
+let yAxis = 'left'  
+let that = this
+if (this.options.orientation === 'horizontal') {
+  xAxis = 'left'
+  yAxis = 'bottom'
+}
+this.refLineLayer.selectAll('.reference-line').remove()
+this.refLineLayer.selectAll('.reference-line-label').remove()
+this.refLineLayer
+  .append('line')
+  .attr('y1', this[`${yAxis}Axis`](data.value))
+  .attr('y2', this[`${yAxis}Axis`](data.value))
+  .attr('x2', this.plotWidth)
+  .attr('class', `reference-line`)
+  .style('stroke', data.color)
+  .style('stroke-width', `${data.lineWidth}px`)
+  .style('stroke-dasharray', data.lineStyle)
+if (data.label && data.label !== '') {
+  // show the text on the line
+  this.refLineLayer
+    .append('text')
+    .attr('class', `reference-line-label`)
+    .attr('x', this.plotWidth)
+    .attr('y', this[`${yAxis}Axis`](data.value))
+    .attr('font-size', this.options.fontSize)
+    .attr('fill', data.color)
+    .text(data.label)
+    .attr(
+      'text-anchor', 'end'
+    )
+    .attr(
+      'alignment-baseline', 'text-after-edge'        
+    )
+}
+
   }
   removeline (key) {
     /* global key d3 */

package/dist/websy-designs-es6.js

@@ -4642,8 +4642,10 @@ var WebsyRouter = /*#__PURE__*/function () {
         if (this.previousPath !== '') {
           this.hideView(this.previousPath, group);
         }
-      } else {
+      } else if (group === this.options.defaultGroup) {
         this.hideView(this.previousView, group);
+      } else {
+        this.hideView(this.previousPath, group);
       }
 
       if (toggle === true && newPath === groupActiveView) {
@@ -7098,7 +7100,7 @@ var WebsyChart = /*#__PURE__*/function () {
 
     var DEFAULTS = {
       margin: {
-        top: 10,
+        top: 20,
         left: 3,
         bottom: 3,
         right: 3,
@@ -7484,6 +7486,7 @@ var WebsyChart = /*#__PURE__*/function () {
       this.barLayer = this.svg.append('g').attr('class', 'bar-layer');
       this.labelLayer = this.svg.append('g').attr('class', 'label-layer');
       this.symbolLayer = this.svg.append('g').attr('class', 'symbol-layer');
+      this.refLineLayer = this.svg.append('g').attr('class', 'refline-layer');
       this.trackingLineLayer = this.svg.append('g').attr('class', 'tracking-line-layer');
       this.trackingLineLayer.append('line').attr('class', 'tracking-line');
       this.tooltip = new WebsyDesigns.WebsyChartTooltip(this.svg);
@@ -7772,6 +7775,7 @@ var WebsyChart = /*#__PURE__*/function () {
           this.barLayer.attr('transform', "translate(".concat(this.options.margin.left + this.options.margin.axisLeft, ", ").concat(this.options.margin.top + this.options.margin.axisTop, ")"));
           this.labelLayer.attr('transform', "translate(".concat(this.options.margin.left + this.options.margin.axisLeft, ", ").concat(this.options.margin.top + this.options.margin.axisTop, ")"));
           this.symbolLayer.attr('transform', "translate(".concat(this.options.margin.left + this.options.margin.axisLeft, ", ").concat(this.options.margin.top + this.options.margin.axisTop, ")"));
+          this.refLineLayer.attr('transform', "translate(".concat(this.options.margin.left + this.options.margin.axisLeft, ", ").concat(this.options.margin.top + this.options.margin.axisTop, ")"));
           this.trackingLineLayer.attr('transform', "translate(".concat(this.options.margin.left + this.options.margin.axisLeft, ", ").concat(this.options.margin.top + this.options.margin.axisTop, ")"));
           this.eventLayer.attr('transform', "translate(".concat(this.options.margin.left + this.options.margin.axisLeft, ", ").concat(this.options.margin.top + this.options.margin.axisTop, ")"));
           var that = this;
@@ -7962,6 +7966,12 @@ var WebsyChart = /*#__PURE__*/function () {
 
             _this44.renderedKeys[series.key] = series.type;
           });
+
+          if (this.options.refLines && this.options.refLines.length > 0) {
+            this.options.refLines.forEach(function (l) {
+              return _this44.renderRefLine(l);
+            });
+          }
         }
       }
     }
@@ -8260,6 +8270,28 @@ var WebsyChart = /*#__PURE__*/function () {
         this.rendersymbol(series, index);
       }
     }
+  }, {
+    key: "renderRefLine",
+    value: function renderRefLine(data) {
+      /* global d3 data */
+      var xAxis = 'bottom';
+      var yAxis = 'left';
+      var that = this;
+
+      if (this.options.orientation === 'horizontal') {
+        xAxis = 'left';
+        yAxis = 'bottom';
+      }
+
+      this.refLineLayer.selectAll('.reference-line').remove();
+      this.refLineLayer.selectAll('.reference-line-label').remove();
+      this.refLineLayer.append('line').attr('y1', this["".concat(yAxis, "Axis")](data.value)).attr('y2', this["".concat(yAxis, "Axis")](data.value)).attr('x2', this.plotWidth).attr('class', "reference-line").style('stroke', data.color).style('stroke-width', "".concat(data.lineWidth, "px")).style('stroke-dasharray', data.lineStyle);
+
+      if (data.label && data.label !== '') {
+        // show the text on the line
+        this.refLineLayer.append('text').attr('class', "reference-line-label").attr('x', this.plotWidth).attr('y', this["".concat(yAxis, "Axis")](data.value)).attr('font-size', this.options.fontSize).attr('fill', data.color).text(data.label).attr('text-anchor', 'end').attr('alignment-baseline', 'text-after-edge');
+      }
+    }
   }, {
     key: "removeline",
     value: function removeline(key) {