fix: bar offset in small chart

Author: jkga

lib/cli/gfx/index.js

@@ -56,7 +56,7 @@ exports.historyCountryTracker = (req, res, n, c, tC, d, tD, r, a, cl, cPOM, u, h
             defaultChartStyle = require(`../gfx/layout/${allowedDefaultChartSize.indexOf(chartSize) != -1 ? chartSize: allowedDefaultChartSize[1] }.json`);
 
     // load template with data
-    // serverUtil.loadTemplate(template, {jsonData}, callback)
+    // serverUtil.loadTemplate(template, {jsonStyle}, {jsonData}, callback)
     serverUtil.loadTemplate(template, defaultChartStyle, {
         name,
         cases,

lib/cli/gfx/layout/sm.json

@@ -5,10 +5,11 @@
   },
   "table": {
     "grid": [2, 0, 2, 5],
-    "columnSpacing": 5
+    "columnSpacing": 3
   },
   "bar": {
-    "grid": [4, 0, 3, 3]
+    "grid": [4, 0, 3, 3],
+    "xOffset": 6
   },
   "map": {
     "grid": [0, 2, 2, 3]

lib/cli/gfx/template.js

@@ -22,8 +22,8 @@ exports.load = (grid, data, chartStyle) => {
         , width: '30%'
         , height: '30%'
         , border: {type: "line", fg: "cyan"}
-        , columnSpacing: chartStyle.table.columnSpacing || 10 //in chars
-        , columnWidth: [1,16, 12, 12, 12, 18],
+        , columnSpacing: chartStyle.table.columnSpacing || 10
+        , columnWidth: chartStyle.table.columnWidth || [1, 16, 12, 12, 12, 18],
         style: {
             border: {
                 fg: 'white'
@@ -53,9 +53,9 @@ exports.load = (grid, data, chartStyle) => {
 
     let bar = grid.set(chartStyle.bar.grid[0], chartStyle.bar.grid[1], chartStyle.bar.grid[2], chartStyle.bar.grid[3], contrib.bar,{
         barBgColor: 'red',
-        barWidth: 7,
-        barSpacing: 5,
-        xOffset: 3,
+        barWidth: chartStyle.bar.barWidth || 7,
+        barSpacing: chartStyle.bar.barSpacing || 7,
+        xOffset: chartStyle.bar.xOffset || 3,
         maxHeight: 9,
         style: {
             border: {