[guadec-web-regcfp/develop] View user
- From: Patrick Uiterwijk <puiterwijk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [guadec-web-regcfp/develop] View user
- Date: Sat, 8 Aug 2015 13:12:15 +0000 (UTC)
commit 2cfa430865ba281a25452cd38ac79b8c03deb3e8
Author: Patrick Uiterwijk <puiterwijk redhat com>
Date: Sat Aug 8 15:11:46 2015 +0200
View user
models/user.js | 4 +++-
routes/index.js | 21 ++++++++++++++++-----
views/index/index.hbs | 5 +----
views/index/view_user.hbs | 11 ++++++++++-
4 files changed, 30 insertions(+), 11 deletions(-)
---
diff --git a/models/user.js b/models/user.js
index 5434fac..8bb9006 100644
--- a/models/user.js
+++ b/models/user.js
@@ -3,7 +3,9 @@
module.exports = function(sequelize, DataTypes) {
var User = sequelize.define("User", {
email: DataTypes.STRING,
- name: DataTypes.STRING
+ name: DataTypes.STRING,
+ isInelligbileForRaffle: DataTypes.BOOLEAN,
+ isVolunteer: DataTypes.BOOLEAN
}, {
classMethods: {
associate: function(models) {
diff --git a/routes/index.js b/routes/index.js
index 957ec94..a02a906 100644
--- a/routes/index.js
+++ b/routes/index.js
@@ -30,11 +30,22 @@ router.get('/', function(req, res, next) {
});
router.all('/view_name', utils.require_permission('registration/view_name'));
-router.post('/view_name', function(req, res, next) {
- var userid = req.body.userid;
- User.findOne({where: {id:userid}, include: [Registration]})
- .then(function(user) {
- res.render('index/view_user', { user: user });
+router.get('/view_name', function(req, res, next) {
+ var everyone = req.query.everyone;
+ User.findAll({include: [Registration]})
+ .then(function(users) {
+ var users2 = [];
+ for(var user in users) {
+ user = users[user];
+ if(user.Registration.badge_printed && !user.isInelligbileForRaffle && (everyone ||
user.isVolunteer)) {
+ users2.push(user);
+ }
+ };
+ var name = null;
+ if(req.query.index) {
+ name = users[name].name;
+ }
+ res.render('index/view_name', { count: users2.length, name: name });
});
});
diff --git a/views/index/index.hbs b/views/index/index.hbs
index 3214c90..4db9460 100644
--- a/views/index/index.hbs
+++ b/views/index/index.hbs
@@ -11,10 +11,7 @@ Welcome, {{name}}<br />
{{#has_permission "registration/view_name"}}
-<form action="/view_name" method="post">
- <input type="text" name="userid">
- <input type="submit" name="View name">
-</form>
+<a href="/view_name">view name</a><br />
{{/has_permission}}
{{#has_permission "registration/desk"}}
diff --git a/views/index/view_user.hbs b/views/index/view_user.hbs
index a1e24ab..08471e1 100644
--- a/views/index/view_user.hbs
+++ b/views/index/view_user.hbs
@@ -1 +1,10 @@
-<h1>{{user.name}}</h1>
+{{#if name}}
+<h1>{{name}}</h1>
+<br /><br /><br />
+{{/if}}
+
+Available: 0 - {{count}}<br />
+<form action="/view_user" method="GET">
+ <input type="text" name="index">
+ <input type="submit">
+</form>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]