diff options
| -rw-r--r-- | users/grfn/bbbg/src/bbbg/handlers/signup_form.clj | 37 |
1 files changed, 20 insertions, 17 deletions
diff --git a/users/grfn/bbbg/src/bbbg/handlers/signup_form.clj b/users/grfn/bbbg/src/bbbg/handlers/signup_form.clj index f2c405c9ca86..ed1d7644f539 100644 --- a/users/grfn/bbbg/src/bbbg/handlers/signup_form.clj +++ b/users/grfn/bbbg/src/bbbg/handlers/signup_form.clj @@ -70,21 +70,24 @@ (defn signup-form-routes [{:keys [db]}] (context "/signup-forms" [] - (GET "/" request - (if-let [event (db/fetch db (db.event/today))] - (redirect (str "/signup-forms/" (::event/id event))) - (page-response (no-events-page - {:authenticated? (authenticated? request)})))) + (GET "/" request + (if-let [event (db/fetch db (db.event/today))] + (redirect (str "/signup-forms/" (::event/id event))) + (page-response (no-events-page + {:authenticated? (authenticated? request)})))) - (GET "/:event-id" [event-id] - (if-let [event (db/get db :event event-id)] - (let [attendees (db/list db - (-> - (db.attendee/for-event event-id) - (merge-where [:or - [:= :attended nil] - [:not :attended]])))] - (page-response - (signup-page {:event event - :attendees attendees}))) - (event-not-found))))) + (GET "/:event-id" [event-id] + (if-let [event (db/get db :event event-id)] + (let [attendees (db/list db + (-> + (db.attendee/for-event event-id) + (merge-where + [:and + [:or + [:= :attended nil] + [:not :attended]] + :rsvpd_attending])))] + (page-response + (signup-page {:event event + :attendees attendees}))) + (event-not-found))))) |