Merge pull request #64 from fauxparse/waitlist_limit

apply show limits to waitlists
fauxparse · Oct 14, 2018 · b97d1f2 · b97d1f2
2 parents dcbbb9b + e7bf16c
commit b97d1f2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 4 deletions.
diff --git a/app/javascript/controllers/activity_selector_controller.js b/app/javascript/controllers/activity_selector_controller.js
@@ -109,12 +109,28 @@ export default class extends Controller {
     const id = e.target.closest('.activity').getAttribute('data-id')
     const activity = this.activities[id]
     if (activity && !this.addActivity(activity)) {
-      const event =
-        new CustomEvent('activities:limit', { detail: activity, bubbles: true })
-      this.element.dispatchEvent(event)
+      this.limitReached(activity)
     }
   }
 
+  checkWaitlistLimit = e => {
+    const waitlistCount =
+      this.element.querySelectorAll('.join-waitlist:checked').length
+
+    if (this.count + waitlistCount > this.maximum) {
+      const id = e.target.closest('.activity').getAttribute('data-id')
+      const activity = this.activities[id]
+      e.target.checked = false
+      this.limitReached(activity)
+    }
+  }
+
+  limitReached(activity) {
+    const event =
+      new CustomEvent('activities:limit', { detail: activity, bubbles: true })
+    this.element.dispatchEvent(event)
+  }
+
   addActivity(activity) {
     if (this.perSlot === 1) {
       this.preferences[activity.slot] = []

diff --git a/app/views/registrations/_activity.html.haml b/app/views/registrations/_activity.html.haml
@@ -21,7 +21,7 @@
       .button__text= t('.add')
   - unless activity.clash? || activity.compulsory?
     %label.activity__waitlist
-      = check_box_tag "registration[waitlist][]", activity.id, activity.waitlisted?
+      = check_box_tag "registration[waitlist][]", activity.id, activity.waitlisted?, class: 'join-waitlist', data: { action: 'change->activity-selector#checkWaitlistLimit' }
       .button.activity__waitlisted--no
         = icon :waitlist, class: 'button__icon'
         .button__text= t('.add_to_waitlist')