diff --git a/js/tabler-charts.js b/js/tabler-charts.js index 1cada1a26..9a928da4b 100644 --- a/js/tabler-charts.js +++ b/js/tabler-charts.js @@ -169,9 +169,6 @@ if (window.Apex) { yaxis: { show: false, - labels: { - show: false, - }, }, }; } diff --git a/package.json b/package.json index a20f7af26..a066c6185 100644 --- a/package.json +++ b/package.json @@ -77,12 +77,12 @@ "eslint-config-xo": "0.27.2", "eslint-plugin-import": "2.18.2", "eslint-plugin-unicorn": "14.0.1", - "glob": "^7.1.6", + "glob": "7.1.6", "http-server": "0.12.0", "icon-font-generator": "2.1.10", "node-sass": "4.13.0", "node-sass-package-importer": "5.3.2", - "nodemon": "^2.0.1", + "nodemon": "2.0.1", "npm-run-all": "4.1.5", "postcss-cli": "6.1.3", "rollup": "1.27.7", @@ -106,7 +106,7 @@ "@fullcalendar/timegrid": "4.3.0", "apexcharts": "3.10.1", "autosize": "4.0.2", - "bootstrap": "twbs/bootstrap#76fd85b", + "bootstrap": "twbs/bootstrap#dde55d1", "fullcalendar": "3.10.1", "imask": "5.2.1", "jquery": "3.4.1", diff --git a/pages/_data/charts.yml b/pages/_data/charts.yml index b52d9efd8..b4f6ba251 100644 --- a/pages/_data/charts.yml +++ b/pages/_data/charts.yml @@ -1,3 +1,10 @@ +tasks-overview: + type: bar + categories: ['Sprint 1','Sprint 2','Sprint 3','Sprint 4','Sprint 5','Sprint 6','Sprint 7','Sprint 8','Sprint 9','Sprint 10','Sprint 11','Sprint 12','Sprint 13','Sprint 14','Sprint 15','Sprint 16','Sprint 17','Sprint 18','Sprint 19','Sprint 20','Sprint 21','Sprint 22','Sprint 23','Sprint 24'] + series: + - name: A + data: [44, 32, 48, 72, 60, 16, 44, 32, 78, 50, 68, 34, 26, 48, 72, 60, 84, 64, 74, 52, 62, 50, 32, 22] + total-sales: type: donut demo: true diff --git a/pages/_includes/ui/chart.html b/pages/_includes/ui/chart.html index 93965d516..9c30e075d 100644 --- a/pages/_includes/ui/chart.html +++ b/pages/_includes/ui/chart.html @@ -20,121 +20,121 @@ chart: { type: '{{ data.type }}', height: {{ height | times: 16 }}, - {% if data.sparkline %} - sparkline: { - enabled: true - }, - {% endif %} - {% if data.stacked %} - stacked: true, - {% endif %} - }, - - {% if data.type == 'area' %} - fill: { - opacity: .16 - }, - {% endif %} - - {% if data.title %} - title: { - text: '{{ data.title | escape }}' - }, - {% endif %} - - {% if data.dashed-history or data.stroke-curve %} - stroke: { - {% if data.dashed-history %} - width: [2, 1], - dashArray: [0, 3], + {% if data.sparkline %} + sparkline: { + enabled: true + }, {% endif %} - {% if data.stroke-curve %} - curve: '{{ data.stroke-curve }}', + {% if data.stacked %} + stacked: true, {% endif %} - }, - {% endif %} + }, - {% if data.series %} - {% if data.type == 'pie' or data.type == 'donut' or data.type == 'radialBar' %} - series: [{% for serie in data.series %}{{ serie.data }}{% unless forloop.last %}, {% endunless %}{% endfor %}], - labels: [{% for serie in data.series %}"{{ serie.name }}"{% unless forloop.last %},{% endunless %}{% endfor %}], + {% if data.type == 'area' %} + fill: { + opacity: .16 + }, + {% endif %} - {% else %} - series: [{% for serie in data.series %}{ - name: '{{ serie.name }}', + {% if data.title %} + title: { + text: '{{ data.title | escape }}' + }, + {% endif %} + + {% if data.dashed-history or data.stroke-curve %} + stroke: { + {% if data.dashed-history %} + width: [2, 1], + dashArray: [0, 3], + {% endif %} + {% if data.stroke-curve %} + curve: '{{ data.stroke-curve }}', + {% endif %} + }, + {% endif %} + + {% if data.series %} + {% if data.type == 'pie' or data.type == 'donut' or data.type == 'radialBar' %} + series: [{% for serie in data.series %}{{ serie.data }}{% unless forloop.last %}, {% endunless %}{% endfor %}], + labels: [{% for serie in data.series %}"{{ serie.name }}"{% unless forloop.last %},{% endunless %}{% endfor %}], + + {% else %} + series: [{% for serie in data.series %}{ + name: '{{ serie.name }}', data: [{{ serie.data | join: ', '}}] - }{% unless forloop.last %},{% endunless %}{% endfor %}], - {% endif %} - {% endif %} + }{% unless forloop.last %},{% endunless %}{% endfor %}], + {% endif %} + {% endif %} - {% if data.show-grid %} - grid: { - show: true, - }, - {% endif %} + {% if data.show-grid %} + grid: { + show: true, + }, + {% endif %} - {% if data.show-data-labels %} - dataLabels: { - enabled: true, - }, - {% endif %} + {% if data.show-data-labels %} + dataLabels: { + enabled: true, + }, + {% endif %} - {% if data.categories or data.days-labels-count %} - xaxis: { - {% if data.categories %}categories: [{% for category in data.categories %}'{{ category }}'{% unless forloop.last %}, {% endunless %}{% endfor %}],{% endif %} - {% if data.days-labels-count %}type: 'datetime',{% endif %} - }, - {% endif %} + {% if data.categories or data.days-labels-count %} + xaxis: { + {% if data.categories %}categories: [{% for category in data.categories %}'{{ category }}'{% unless forloop.last %}, {% endunless %}{% endfor %}],{% endif %} + {% if data.days-labels-count %}type: 'datetime',{% endif %} + }, + {% endif %} - {% if data.auto-min %} - yaxis: { - min: function(min) { return min }, - }, - {% endif %} + {% if data.auto-min %} + yaxis: { + min: function(min) { return min }, + }, + {% endif %} - {% if data.days-labels-count %} - labels: [...Array({{ data.days-labels-count }}).keys()].map(n => `2019-09-${n+1}`), - {% endif %} + {% if data.days-labels-count %} + labels: [...Array({{ data.days-labels-count }}).keys()].map(n => `2019-09-${n+1}`), + {% endif %} - {% if data.rotated %} - plotOptions: { - bar: { - horizontal: true, - } - }, - {% endif %} + {% if data.rotated %} + plotOptions: { + bar: { + horizontal: true, + } + }, + {% endif %} - {% if data.series %} - colors: [ - {% for serie in data.series %} - {{ serie.color | default: 'blue' | tabler_js_color }}{% unless forloop.last %},{% endunless %}{% endfor %} - ], - {% endif %} + {% if data.series %} + colors: [ + {% for serie in data.series %} + {{ serie.color | default: 'blue' | tabler_js_color }}{% unless forloop.last %},{% endunless %}{% endfor %} + ], + {% endif %} - {% if data.hide-legend %} - legend: { - show: false, //hide legend - }, - {% endif %} + {% if data.hide-legend %} + legend: { + show: false, //hide legend + }, + {% endif %} - {% if data.hide-tooltip %} - tooltip: { - enabled: false - }, - {% endif %} + {% if data.hide-tooltip %} + tooltip: { + enabled: false + }, + {% endif %} - {% if data.hide-points %} - point: { - show: false - }, - {% endif %} + {% if data.hide-points %} + point: { + show: false + }, + {% endif %} - {% if data.show-markers %} - markers: { - size: 2 - }, - {% endif %} - })).render(); + {% if data.show-markers %} + markers: { + size: 2 + }, + {% endif %} + })).render(); }); {% endcapture %} diff --git a/pages/tmp.html b/pages/tmp.html index 5441c9a54..6f19bec71 100644 --- a/pages/tmp.html +++ b/pages/tmp.html @@ -2,12 +2,17 @@ ---