Skip to content

Commit 8237aeb

Browse files
committed
Merge pull request #297 from apinf/feature/overview-chart
added overview chart
2 parents bd8f022 + 5cc0953 commit 8237aeb

File tree

3 files changed

+28
-1
lines changed

3 files changed

+28
-1
lines changed

client/charts/bar/overview.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<template name="overviewChart">
2+
<div id="overview-chart">
3+
</div>
4+
</template>

client/charts/charts.html

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
{{> lineChart}}
88
</div>
99
</div>
10+
<div class="row">
11+
<div class="col-lg-12 col-md-12 col-sm-12">
12+
{{> overviewChart}}
13+
</div>
14+
</div>
1015
<div class="row">
1116
<div class="col-lg-12 col-md-12 col-sm-12">
1217
{{> barChart}}

client/charts/charts.js

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ Template.chartsLayout.created = function () {
5151
d.fields.ymd = dateFormat.parse(timeStamp);
5252
d.fields.itemsCount = +data.hits.total;
5353

54+
5455
});
5556

5657
var timeStampDimension = index.dimension(function(d){ return d.fields.ymd; });
@@ -77,19 +78,36 @@ Template.chartsLayout.created = function () {
7778
var chart = dc.lineChart("#line-chart");
7879
var countryChart = dc.barChart("#bar-chart");
7980
var dataTable = dc.dataTable("#data-table");
81+
var overview = dc.barChart("#overview-chart");
8082

8183
chart
8284
.width(1140)
8385
.height(480)
84-
.elasticX(true)
86+
.transitionDuration(1500)
87+
.elasticY(true)
8588
.x(timeScale)
8689
.dimension(timeStampDimension)
8790
.group(timeStampGroup)
91+
.mouseZoomable(true)
92+
.rangeChart(overview)
8893
.renderArea(true)
8994
.dotRadius(3)
95+
.brushOn(false)
9096
.renderHorizontalGridLines(true)
9197
.renderVerticalGridLines(true);
9298

99+
overview
100+
.width(1140)
101+
.height(40)
102+
.margins({top: 0, right: 50, bottom: 20, left: 40})
103+
.dimension(timeStampDimension)
104+
.group(timeStampGroup)
105+
.centerBar(true)
106+
.gap(1)
107+
.x(d3.time.scale().domain([new Date(2015, 1, 1), new Date()]))
108+
.alwaysUseRounding(true)
109+
.yAxis().ticks(0);
110+
93111
countryChart
94112
.width(1140)
95113
.height(250)

0 commit comments

Comments
 (0)