diff --git a/client/src/app/admin/panel/dashboard/admin-panel-stats-chart.js b/client/src/app/admin/panel/dashboard/admin-panel-stats-chart.js index 6f36e39c..b5582017 100644 --- a/client/src/app/admin/panel/dashboard/admin-panel-stats-chart.js +++ b/client/src/app/admin/panel/dashboard/admin-panel-stats-chart.js @@ -25,14 +25,6 @@ class StatsChart extends React.Component { ); } - shouldBeDeleted(min, max, num, type) { - var rtn = []; - while (rtn.length < num) { - rtn.push(Math.floor((Math.random() * (max - min)) + min + ((Math.random() > 0.1) ? type * 3 : 0))); - } - return rtn; - } - getChartData() { let labels = this.getLabels(); @@ -47,7 +39,6 @@ class StatsChart extends React.Component { for (let i = 0; i < this.props.strokes.length; i++) { let stroke = this.props.strokes[i]; - console.log(color[stroke.name]); let dataset = { label: i18n('CHART_' + stroke.name), @@ -77,10 +68,6 @@ class StatsChart extends React.Component { let labels = []; for (let i = 0; i < this.props.display; i++) { - if(i % 2 == 0 && this.props.display > 20){ - labels.push(''); - continue; - } let firstList = this.props.strokes[0]; let idx = firstList.values[i].date.slice(4, 6) - 1; labels.push( firstList.values[i].date.slice(6, 8) + ' ' + months[idx]); @@ -89,8 +76,7 @@ class StatsChart extends React.Component { return labels; } - hitRadius(name) { - /// SHOULD AJUSTAR THIS VALUES + hitRadius() { if (this.props.display === 7) return 20; if (this.props.display === 30) return 15; if (this.props.display === 90) return 10; diff --git a/client/src/app/admin/panel/dashboard/admin-panel-stats.js b/client/src/app/admin/panel/dashboard/admin-panel-stats.js index 2feb50f7..a7ae93dc 100644 --- a/client/src/app/admin/panel/dashboard/admin-panel-stats.js +++ b/client/src/app/admin/panel/dashboard/admin-panel-stats.js @@ -4,6 +4,8 @@ import i18n from 'lib-app/i18n'; import Header from 'core-components/header'; import DropDown from 'core-components/drop-down'; +import ToggleList from 'core-components/toggle-list'; + import StatsChart from 'app/admin/panel/dashboard/admin-panel-stats-chart'; class AdminPanelStats extends React.Component { @@ -13,11 +15,31 @@ class AdminPanelStats extends React.Component {
+
); } + getToggleListProps() { + return { + items: [ + { + content:
+ }, + { + content:
+ }, + { + content:
+ }, + { + content:
+ } + ] + }; + } + getDropDownProps() { return { items: [ @@ -51,15 +73,15 @@ class AdminPanelStats extends React.Component { values: [ { date: "20160420", - value: 71 + value: 17 }, { date: "20160421", - value: 21 + value: 15 }, { date: "20160422", - value: 4 + value: 12 }, { date: "20160423", @@ -67,49 +89,15 @@ class AdminPanelStats extends React.Component { }, { date: "20160424", - value: 12 + value: 10 }, { date: "20160425", - value: 14 + value: 7 }, { date: "20160426", - value: 22 - } - ] - }, - { - name: 'CLOSE', - show: true, - values: [ - { - date: "20160420", - value: 20 - }, - { - date: "20160421", - value: 15 - }, - { - date: "20160422", - value: 13 - }, - { - date: "20160423", - value: 15 - }, - { - date: "20160424", - value: 12 - }, - { - date: "20160425", - value: 19 - }, - { - date: "20160426", - value: 23 + value: 5 } ] }, @@ -146,6 +134,40 @@ class AdminPanelStats extends React.Component { value: 6 } ] + }, + { + name: 'CLOSE', + show: true, + values: [ + { + date: "20160420", + value: 4 + }, + { + date: "20160421", + value: 7 + }, + { + date: "20160422", + value: 4 + }, + { + date: "20160423", + value: 7 + }, + { + date: "20160424", + value: 9 + }, + { + date: "20160425", + value: 11 + }, + { + date: "20160426", + value: 13 + } + ] } ] }