[guadec-web-regcfp/develop] Make it possible to print two badges at once
- From: Patrick Uiterwijk <puiterwijk src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [guadec-web-regcfp/develop] Make it possible to print two badges at once
- Date: Fri, 7 Aug 2015 00:19:23 +0000 (UTC)
commit cabb7e179dd293302096c08e37088ea50c5fa569
Author: Patrick Uiterwijk <puiterwijk redhat com>
Date: Fri Aug 7 02:19:15 2015 +0200
Make it possible to print two badges at once
routes/desk.js | 14 ++++++++++++--
views/desk/finish.hbs | 9 ++++++++-
views/desk/main.hbs | 7 +++++++
3 files changed, 27 insertions(+), 3 deletions(-)
---
diff --git a/routes/desk.js b/routes/desk.js
index f3611e7..e893fa5 100644
--- a/routes/desk.js
+++ b/routes/desk.js
@@ -24,6 +24,7 @@ var fs = require('fs');
router.all('/', utils.require_user);
router.all('/', utils.require_permission('registration/desk'));
router.get('/', function(req, res, next) {
+ printed = null;
message = null;
if(req.query.new_id) {
message = "Registration " + req.query.new_id + " was added";
@@ -39,6 +40,10 @@ router.get('/', function(req, res, next) {
}
else if(req.query.printed) {
message = "Registration " + req.query.printed + " was finished!";
+ if(!req.query.previous) {
+ message += " Please finish a second one to print badges!";
+ printed = req.query.printed;
+ }
}
Registration
@@ -46,7 +51,7 @@ router.get('/', function(req, res, next) {
include: [User, RegistrationPayment]
})
.complete(function(err, registrations) {
- res.render('desk/main', { registrations: registrations, message: message });
+ res.render('desk/main', { registrations: registrations, message: message, printed: printed });
});
});
@@ -111,7 +116,12 @@ router.post('/finish', function(req, res, next) {
registration.badge_printed = true;
registration.save();
- res.render('desk/finish', { registration: registration} );
+ var previous = null;
+ if(req.body.printed) {
+ previous = req.body.printed;
+ }
+
+ res.render('desk/finish', { registration: registration, previous: previous } );
});
});
diff --git a/views/desk/finish.hbs b/views/desk/finish.hbs
index aa4bbf9..88d5e8c 100644
--- a/views/desk/finish.hbs
+++ b/views/desk/finish.hbs
@@ -8,9 +8,16 @@ You have finished the registration of {{registration.User.name}}!<br />
{{/if}}
<br />
-<b>Badge: <a href="/desk/badge?regida={{registration.id}}" target="_blank">Click here to print
badge</a></b><br />
+{{#if previous}}
+ <b>Badge: <a href="/desk/badge?regida={{registration.id}}®idb={{previous}}" target="_blank">Click
here to print badge</a></b><br />
+{{else}}
+ <b>SINGLE</b> Badge: <a href="/desk/badge?regida={{registration.id}}" target="_blank">Click here to
print <b>SINGLE</b> badge</a><br />
+{{/if}}
<br />
<form action="/desk">
<input type="hidden" name="printed" value="{{registration.id}}">
+ {{#if previous}}
+ <input type="hidden" name="previous" value="{{previous}}">
+ {{/if}}
<input type="submit" value="Return to desk">
</form>
diff --git a/views/desk/main.hbs b/views/desk/main.hbs
index 09e1bd1..d500e51 100644
--- a/views/desk/main.hbs
+++ b/views/desk/main.hbs
@@ -2,6 +2,10 @@
<h2>{{message}}</h2>
{{/if}}
+{{#if printed}}
+ <h3>Or click <a href="/desk/badge?regida={{printed}}">here</a> to print badge now</h3>
+{{/if}}
+
{{!--
<h2>Donations:</h2>
@@ -61,6 +65,9 @@
data-message="Really finish registration for '{{this.User.name}}' and print badge?"
data-needed="{{this.needed_for_receipt}}"
data-receipteligible="{{this.eligible_for_receipt}}">
+ {{#if ../../../printed}}
+ <input type="hidden" name="printed" value="{{../../../../printed}}">
+ {{/if}}
<input type="hidden" name="regid" value="{{this.id}}">
<input type="submit" value="Print badge">
</form>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]