forked from GitHub/dbot
fix the poll views
This commit is contained in:
parent
faaee59116
commit
68e13e7bcd
@ -1,4 +1,5 @@
|
|||||||
var _ = require('underscore')._;
|
var _ = require('underscore')._,
|
||||||
|
async = require('async');
|
||||||
|
|
||||||
var pages = function(dbot) {
|
var pages = function(dbot) {
|
||||||
var pages = {
|
var pages = {
|
||||||
@ -7,30 +8,29 @@ var pages = function(dbot) {
|
|||||||
var key = req.params.key.toLowerCase();
|
var key = req.params.key.toLowerCase();
|
||||||
this.db.read('poll', key, function(err, poll) {
|
this.db.read('poll', key, function(err, poll) {
|
||||||
if(!err) {
|
if(!err) {
|
||||||
|
console.log(poll);
|
||||||
var totalVotes = _.reduce(poll.votes, function(memo, option) {
|
var totalVotes = _.reduce(poll.votes, function(memo, option) {
|
||||||
return memo += option;
|
return memo += option;
|
||||||
}, 0);
|
}, 0);
|
||||||
|
|
||||||
var voterNicks = [];
|
var voterNicks = [];
|
||||||
/* TODO: Fix stupid fucking async issue bullshit
|
async.each(_.keys(poll.votees), function(id, done) {
|
||||||
var voterNicks = _.map(poll.votees, function(vote, id) {
|
|
||||||
dbot.api.users.getUser(id, function(user) {
|
dbot.api.users.getUser(id, function(user) {
|
||||||
return user.primaryNick;
|
voterNicks.push(user.primaryNick);
|
||||||
|
done();
|
||||||
});
|
});
|
||||||
});*/
|
}, function() {
|
||||||
|
|
||||||
process.nextTick(function() {
|
|
||||||
console.log(voterNicks);
|
|
||||||
res.render('polls', {
|
res.render('polls', {
|
||||||
'name': dbot.config.name,
|
'name': dbot.config.name,
|
||||||
'description': poll.description,
|
'description': poll.description,
|
||||||
'votees': voterNicks,
|
'votees': voterNicks,
|
||||||
'options': poll.votes,
|
'options': poll.votes,
|
||||||
|
'totalVotes': totalVotes,
|
||||||
locals: {
|
locals: {
|
||||||
'totalVotes': totalVotes,
|
|
||||||
'url_regex': RegExp.prototype.url_regex()
|
'url_regex': RegExp.prototype.url_regex()
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
res.render('error', {
|
res.render('error', {
|
||||||
|
@ -4,7 +4,7 @@ block content
|
|||||||
div#backlink
|
div#backlink
|
||||||
a(href='/poll/') « Poll list
|
a(href='/poll/') « Poll list
|
||||||
h2 #{description}
|
h2 #{description}
|
||||||
p Voters (#{locals.totalVotes}):
|
p Voters (#{votees.length}):
|
||||||
-each voter in votees
|
-each voter in votees
|
||||||
| #{voter}
|
| #{voter}
|
||||||
ul#votelist
|
ul#votelist
|
||||||
|
Loading…
Reference in New Issue
Block a user