find a son format that works with d3

pull/120/head
Michael Q Larson 2015-02-21 21:45:25 -08:00
parent 74f6fc6763
commit 53bbe90290
2 changed files with 6 additions and 20 deletions

View File

@ -235,20 +235,10 @@ exports.returnUser = function(req, res, next) {
if (user[0]) {
var user = user[0];
Challenge.find({}, null, {sort: {challengeNumber: 1}}, function (err, c) {
var calendarData = Object.keys(user.challengesHash).map(function(key){return user.challengesHash[key]});
calendarData.sort(function(a , b) {
return a - b;
});
calendarData = calendarData.filter(function(elem) {
return elem !== 0;
});
var data = {};
calendarData.pop();
for (i = 0; i < calendarData.length; i++) {
var timestamp = 'timestamp' + i;
data[timestamp] = calendarData[i];
data = {
"1424569155": 1,
"1424519155": 1
};
data = {timestamp0: new Date(2015, 3, 15)}
res.render('account/show', {
title: 'Camper: ',
username: user.profile.username,

View File

@ -1,5 +1,7 @@
extends ../layout
block content
script.
var challengeName = 'Profile View';
.col-xs-12.col-sm-12.col-md-12
.panel.panel-info
.panel-heading.text-center
@ -114,14 +116,8 @@ block content
domain: "month",
subDomain: "day",
data: calendar,
dataType: "json",
range: 10,
start: new Date(2015, 0),
itemName: "",
legend: [5, 10, 15, 20, 25, 30],
legendColors: {
empty: "#ededed",
min: "#40ffd8",
max: "#f20013"
}
legend: [5, 10, 15, 20, 25, 30]
});