AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replace timeserie axis to category axis

Browse Source
This commit is contained in:
Frederic Guillot
2015-07-10 19:43:26 -04:00
parent 1ee4594c56
commit 7e94d0ca23
2 changed files with 62 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
assets/js/app.js
View File

File diff suppressed because one or more lines are too long

63
assets/js/src/analytic.js
View File

@@ -6,6 +6,9 @@
var metrics = $("#chart").data("metrics"); var metrics = $("#chart").data("metrics");
var columns = []; var columns = [];
var groups = []; var groups = [];
var categories = [];
var inputFormat = d3.time.format("%Y-%m-%d");
var outputFormat = d3.time.format($("#chart").data("date-format"));
for (var i = 0; i < metrics.length; i++) { for (var i = 0; i < metrics.length; i++) {
@@ -19,7 +22,12 @@
} }
} }
else { else {
columns[j].push(metrics[i][j]); columns[j].push(metrics[i][j]);
if (j == 0) {
categories.push(outputFormat(inputFormat.parse(metrics[i][j])));
}
} }
} }
} }
@@ -27,16 +35,13 @@
c3.generate({ c3.generate({
data: { data: {
columns: columns, columns: columns,
x: metrics[0][0],
type: 'area-spline', type: 'area-spline',
groups: [groups] groups: [groups]
}, },
axis: { axis: {
x: { x: {
type: 'timeseries', type: 'category',
tick: { categories: categories
format: $("#chart").data("date-format")
}
} }
} }
}); });
@@ -47,6 +52,9 @@
{ {
var metrics = $("#chart").data("metrics"); var metrics = $("#chart").data("metrics");
var columns = [[$("#chart").data("label-total")]]; var columns = [[$("#chart").data("label-total")]];
var categories = [];
var inputFormat = d3.time.format("%Y-%m-%d");
var outputFormat = d3.time.format($("#chart").data("date-format"));
for (var i = 0; i < metrics.length; i++) { for (var i = 0; i < metrics.length; i++) {
@@ -66,21 +74,22 @@
columns[0][i] += metrics[i][j]; columns[0][i] += metrics[i][j];
} }
if (j == 0) {
categories.push(outputFormat(inputFormat.parse(metrics[i][j])));
}
} }
} }
} }
c3.generate({ c3.generate({
data: { data: {
columns: columns, columns: columns
x: metrics[0][0]
}, },
axis: { axis: {
x: { x: {
type: 'timeseries', type: 'category',
tick: { categories: categories
format: $("#chart").data("date-format")
}
} }
} }
}); });
@@ -125,11 +134,13 @@
// Draw budget chart // Draw budget chart
function drawBudget() function drawBudget()
{ {
var categories = [];
var metrics = $("#chart").data("metrics"); var metrics = $("#chart").data("metrics");
var labels = $("#chart").data("labels"); var labels = $("#chart").data("labels");
var inputFormat = d3.time.format("%Y-%m-%d");
var outputFormat = d3.time.format($("#chart").data("date-format"));
var columns = [ var columns = [
[labels["date"]],
[labels["in"]], [labels["in"]],
[labels["left"]], [labels["left"]],
[labels["out"]] [labels["out"]]
@@ -141,25 +152,35 @@
colors[labels["out"]] = '#DF3A01'; colors[labels["out"]] = '#DF3A01';
for (var i = 0; i < metrics.length; i++) { for (var i = 0; i < metrics.length; i++) {
columns[0].push(metrics[i]["date"]); categories.push(outputFormat(inputFormat.parse(metrics[i]["date"])));
columns[1].push(metrics[i]["in"]); columns[0].push(metrics[i]["in"]);
columns[2].push(metrics[i]["left"]); columns[1].push(metrics[i]["left"]);
columns[3].push(metrics[i]["out"]); columns[2].push(metrics[i]["out"]);
} }
c3.generate({ c3.generate({
data: { data: {
x: columns[0][0],
columns: columns, columns: columns,
colors: colors, colors: colors,
type : 'bar' type : 'bar'
}, },
bar: {
width: {
ratio: 0.25
}
},
grid: {
x: {
show: true
},
y: {
show: true
}
},
axis: { axis: {
x: { x: {
type: 'timeseries', type: 'category',
tick: { categories: categories
format: $("#chart").data("date-format")
}
} }
} }
}); });