+
-
@@ -260,14 +263,14 @@
Demo
return rounded;
}
- var aggregates = [ { name: "Performances", reducer: reduceDistinct(function(d) { return d.register_id; }) },
- { name: "Receipts", reducer: reduceSum(function(d) { return d.sold * d.price; }), unit: "l." },
- { name: "Sales", reducer: reduceSum(function(d) { return d.sold; }), checked: true } ];
+ var aggregates = [ { name: "Représentation", reducer: reduceDistinct(function(d) { return d.register_id; }), checked: true },
+ { name: "Recettes", reducer: reduceSum(function(d) { return d.sold * d.price; }), unit: "l." },
+ { name: "Billets vendus", reducer: reduceSum(function(d) { return d.sold; }) } ];
- var granularities = [ { name: "Decade", group: decade, ticks: [d3.time.year, 10] },
- { name: "Year", group: d3.time.year, ticks: [d3.time.year, 5], checked: true },
- { name: "Month", group: d3.time.month, ticks: [d3.time.month, 4] },
- { name: "Week", group: d3.time.week, ticks: [d3.time.month, 1] } ];
+ var granularities = [ { name: "Décennie", group: decade, ticks: [d3.time.year, 10] },
+ { name: "Anée", group: d3.time.year, ticks: [d3.time.year, 5], checked: true },
+ { name: "Mois", group: d3.time.month, ticks: [d3.time.month, 4] },
+ { name: "Semaine", group: d3.time.week, ticks: [d3.time.month, 1] } ];
// set up crossfilter visualization
@@ -324,10 +327,13 @@ Demo
genreAgg = genre.group(),
section = sale.dimension(function(d) { return d.section; }),
- sectionAgg = section.group();
+ sectionAgg = section.group(),
+
+ weekday = sale.dimension(function(d) { return d.weekday; }),
+ weekdayAgg = weekday.group();
var updateMeasure = function(agg) {
- [authorAgg, genreAgg, sectionAgg].concat(timelineAggs).forEach(function (grp) {
+ [authorAgg, genreAgg, sectionAgg, weekdayAgg].concat(timelineAggs).forEach(function (grp) {
grp.reduce(agg.reducer.add, agg.reducer.remove, agg.reducer.init).order(function (d) { return d.final(); });
});
};
@@ -353,7 +359,18 @@ Demo
sparseChart()
.dimension(section)
- .group(sectionAgg),
+ .group(sectionAgg)
+ .width(130),
+
+ sparseChart()
+ .dimension(weekday)
+ .group(weekdayAgg)
+ .order(function (a, b) {
+ // not clear why weekdayFormat.parse always returns mondays, and mangles other aspects...
+ var keyWD = { Lundi: 1, Mardi: 2, Mercredi: 3, Jeudi: 4, Vendredi: 5, Samedi: 6, Dimanche: 7 };
+ return keyWD[a] - keyWD[b];
+ })
+ .width(110),
timelineChart()
.dimension(date)
@@ -370,7 +387,7 @@ Demo
var agg = timelineAggs[agg_index];
var round = granularities[agg_index].group;
var tickInfo = granularities[agg_index].ticks;
- var timeline = charts[3];
+ var timeline = charts[4];
timeline.group(agg).x(d3.time.scale()
.domain(d3.extent(sales, function(d) { return d.date; }))
.rangeRound([0, d3.max([14 * agg.size(), 900])]))
@@ -442,7 +459,7 @@ Demo
function sparseChart() {
if (!sparseChart.id) sparseChart.id = 0;
- var margin = {top: 10, right: 30, bottom: 20, left: 0},
+ var margin = {top: 10, right: 10, bottom: 10, left: 0},
barHeight = 12,
textHeight = 12,
height = 200,
@@ -453,6 +470,7 @@ Demo
group,
preview = false,
pinned = d3.set(),
+ order,
alphaNum = false,
event_ = d3.dispatch("brush", "brushend");
@@ -477,7 +495,16 @@ Demo
// a hairy way to resort the results so the pinned items rise to the top
var pins_seen = 0,
- raw_data = alphaNum ? group.all() : group.top(group.size());
+ raw_data;
+
+ if (order) {
+ raw_data = group.all().sort(function(a, b) { return order(a.key, b.key); });
+ } else if (alphaNum) {
+ raw_data = group.all();
+ } else {
+ raw_data = group.top(group.size());
+ }
+
raw_data.forEach(function (d, i) {
if (pinned.has(d.key)) {
data[pins_seen] = d;
@@ -490,9 +517,11 @@ Demo
// Create initial chart
if (g.empty()) {
- var $mode = div.select(".title").append("span")
- .attr("class", "mode")
- .on("click", function () { alphaNum = !alphaNum; chart(component); });
+ if (!order) {
+ div.select(".title").append("span")
+ .attr("class", "mode")
+ .on("click", function () { alphaNum = !alphaNum; chart(component); });
+ }
/*
// set up the pinned / selected list
@@ -579,7 +608,7 @@ Demo
};
function measure_info(d) {
- if (x(d.value.final()) - 4 > 30) {
+ if (x(d.value.final()) - 4 > 35) {
return { offset: x(d.value.final()) - 4, anchor: "end" };
} else {
return { offset: x(d.value.final()) + 4, anchor: "start" };
@@ -587,7 +616,9 @@ Demo
}
// adjust for live values
- div.select(".mode").text(alphaNum ? "a-z" : "1-9");
+ if (!order) {
+ div.select(".mode").text(alphaNum ? "a-z" : "1-9");
+ }
/*
// pinned area
@@ -631,6 +662,19 @@ Demo