Merge pull request #20 from jceddy/master

Update package.json
gipong · Mar 17, 2020 · b594281 · b594281
2 parents af299e4 + eb9a80c
commit b594281
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 39 deletions.
diff --git a/dist/ctrl.js b/dist/ctrl.js
diff --git a/dist/external/groupedBarChart.js b/dist/external/groupedBarChart.js
@@ -4,8 +4,8 @@ export default class groupedBarChart {
     constructor(opts) {
         this.data = opts.data;
         this.margin = opts.margin;
-        this.width = opts.width;
-        this.height = opts.height;
+        this.width = parseInt(opts.width, 10);
+        this.height = parseInt(opts.height, 10);
         this.showLegend = opts.legend;
         this.legendType = opts.position;
         this.chartType = opts.chartType;
@@ -280,4 +280,4 @@ export default class groupedBarChart {
         this.tips = d3.select(this.element).append('div')
             .attr('class', 'toolTip');
     }
-}
+}
diff --git a/dist/partials/editor.html b/dist/partials/editor.html
@@ -20,6 +20,7 @@ <h5 class="section-heading">Label</h5>
             </div>
         </div>
         <gf-form-switch class="gf-form" label="Show Average Line" label-class="width-11" checked="ctrl.panel.avgLineShow" on-change="ctrl.render()"></gf-form-switch>
+        <gf-form-switch class="gf-form" label="Show Bar Values" label-class="width-11" checked="ctrl.panel.barValuesShow" on-change="ctrl.render()"></gf-form-switch>
         <div class="gf-form">
             <span class="gf-form-label width-11">FontColor</span>
             <span class="gf-form-label">
@@ -58,4 +59,4 @@ <h5 class="section-heading">Layout</h5>
             </div>
         </div>
     </div>
-</div>
+</div>
diff --git a/dist/plugin.json b/dist/plugin.json
@@ -23,12 +23,12 @@
       {"name": "options", "path": "src/img/groupedbarchart-options.png"},
       {"name": "colors", "path": "src/img/groupedbarchart-colors.png"}
     ],
-    "version": "1.0.0",
-    "updated": "2017-12-23"
+    "version": "1.0.3",
+    "updated": "2020-03-16"
   },
 
   "dependencies": {
     "grafanaVersion": "4.6",
     "plugins": [ ]
   }
-}
+}
diff --git a/package.json b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "groupedbarchart-panel",
   "private": true,
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
   "repository": {
     "type": "git",
-    "url": "https://github.com/jceddy/grafana-groupedbarchart-panel.git"
+    "url": "https://github.com/gipong/grafana-groupedbarchart-panel.git"
   },
   "author": "gipong",
   "license": "MIT",

diff --git a/src/ctrl.js b/src/ctrl.js
@@ -14,6 +14,7 @@ const panelDefaults = {
     labelOrientation: 'horizontal',
     orientation: 'vertical',
     avgLineShow: true,
+    barValuesShow: true,
     labelSpace: 40,
     links: [],
     datasource: null,
@@ -120,6 +121,7 @@ export class GroupedBarChartCtrl extends MetricsPanelCtrl {
                 this.fontColor = opts.fontColor;
                 this.labelOrientation = opts.labelOrientation;
                 this.avgLineShow = opts.avgLineShow;
+                this.barValuesShow = opts.barValuesShow;
                 this.axesConfig = [];
                 this.element = elem.find(opts.element)[0];
                 this.options = [];
@@ -337,20 +339,22 @@ export class GroupedBarChartCtrl extends MetricsPanelCtrl {
                         break;
                 }
 
-                (this.chartType === 'bar chart') && this.barC.append('text')
-                    .attr('x', d => { 
-                        return (this.orientation === 'horizontal') 
-                        ? this.x(d.value) +5
-                        : this.x1(d.name) + this.x1.rangeBand()/4 + this.margin.left;  
-                    })
-                    .attr('y', d => { 
-                        return (this.orientation === 'horizontal')
-                        ? this.y1(d.name) +(this.y1.rangeBand()/2)
-                        : this.y(d.value) - this.height -8; 
-                    })
-                    .attr('dy', '.35em')
-                    .style('fill', `${this.fontColor}`)
-                    .text(d => { return d.value ? d.value : ''; });
+                if(this.barValuesShow) {
+                    (this.chartType === 'bar chart') && this.barC.append('text')
+                        .attr('x', d => { 
+                            return (this.orientation === 'horizontal') 
+                            ? this.x(d.value) +5
+                            : this.x1(d.name) + this.x1.rangeBand()/4 + this.margin.left;  
+                        })
+                        .attr('y', d => { 
+                            return (this.orientation === 'horizontal')
+                            ? this.y1(d.name) +(this.y1.rangeBand()/2)
+                            : this.y(d.value) - this.height -8; 
+                        })
+                        .attr('dy', '.35em')
+                        .style('fill', `${this.fontColor}`)
+                        .text(d => { return d.value ? d.value : ''; });
+                }
 
                 this.bar.on('mouseover', d => {
                     this.tips.style('left', `${10}px`);
@@ -443,6 +447,7 @@ export class GroupedBarChartCtrl extends MetricsPanelCtrl {
                 labelOrientation: ctrl.panel.labelOrientation,
                 labelSpace: ctrl.panel.labelSpace,
                 avgLineShow: ctrl.panel.avgLineShow,
+                barValuesShow: ctrl.panel.barValuesShow,
                 color: ctrl.panel.colorSch
             });
 

diff --git a/src/partials/editor.html b/src/partials/editor.html
@@ -20,6 +20,7 @@ <h5 class="section-heading">Label</h5>
             </div>
         </div>
         <gf-form-switch class="gf-form" label="Show Average Line" label-class="width-11" checked="ctrl.panel.avgLineShow" on-change="ctrl.render()"></gf-form-switch>
+        <gf-form-switch class="gf-form" label="Show Bar Values" label-class="width-11" checked="ctrl.panel.barValuesShow" on-change="ctrl.render()"></gf-form-switch>
         <div class="gf-form">
             <span class="gf-form-label width-11">FontColor</span>
             <span class="gf-form-label">
@@ -58,4 +59,4 @@ <h5 class="section-heading">Layout</h5>
             </div>
         </div>
     </div>
-</div>
+</div>
diff --git a/src/plugin.json b/src/plugin.json
@@ -23,12 +23,12 @@
       {"name": "options", "path": "src/img/groupedbarchart-options.png"},
       {"name": "colors", "path": "src/img/groupedbarchart-colors.png"}
     ],
-    "version": "1.0.0",
-    "updated": "2017-12-23"
+    "version": "1.0.3",
+    "updated": "2020-03-16"
   },
 
   "dependencies": {
     "grafanaVersion": "4.6",
     "plugins": [ ]
   }
-}
+}