Registration for Events

app/views/conference_registrations/_form.html.haml

@@ -6,7 +6,7 @@
           Registration for
           = @conference.title
   .row
-    .col-md-6
+    .col-md-8
       - if !current_user
         %legend
           %span

app/views/conference_registrations/_registration_info.html.haml

@@ -1,8 +1,21 @@
 - if @conference.questions.any?
   = render partial: 'conference_registrations/questions', locals: { f: f }
-- if @conference.program.events.workshops.any?
-  =f.inputs 'Pre-registration required for the following:' do
-    = f.input :events, as: :check_boxes, label: false, collection: @conference.program.events.workshops
+- if @conference.program.events.with_registration_open.any? || @registration.events.any?
+  = f.inputs 'Pre-registration required for the following:' do
+
+    - @registration.events_ordered.each do |event|
+      %label
+        = hidden_field_tag "registration[event_ids][]", nil
+        = check_box_tag "registration[event_ids][]", event.id, event.registrations.include?(@registration)
+        = event.title
+        .text-muted
+          = registered_text(event)
+          - if event.scheduled?
+            (Scheduled on: #{event.start_time.to_date})
+      %br
+
+
+
 = f.inputs 'Your Travel Info' do
   = f.input :arrival, as: :string, label: 'Your arrival time', input_html: { value: (f.object.arrival.to_formatted_s(:db_without_seconds) unless f.object.arrival.nil?), id: 'registration-arrival-datepicker',start_date: @conference.start_date,end_date: @conference.end_date,readonly: 'readonly'  }
   = f.input :departure, as: :string, label: 'Your departure time', input_html: { value: (f.object.departure.to_formatted_s(:db_without_seconds) unless f.object.departure.nil?), id: 'registration-departure-datepicker', readonly: 'readonly'  }

app/views/conference_registrations/show.html.haml

@@ -54,18 +54,34 @@
                   = qa.answer.title
               - else
                 You haven't answered
-  - if @workshops.any?
+  - if @registration.events.any?
     .row
       .col-md-12
         %h4
           %span.fa-stack
             %i.fa.fa-square-o.fa-stack-2x
             %i.fa.fa-check.fa-stack-1x
-          Event Registrations
+          Registered to the following event(s)
         %ul
-          - @workshops.each do |workshop|
+          - @registration.events.each do |event|
             %li
-              = link_to workshop.title, conference_program_proposal_path(@conference.short_title, workshop.id)
+              = link_to event.title, conference_program_proposal_path(@conference.short_title, event.id)
+              = '(' + registered_text(event) + ')'
+
+  - if @registration.conference.program.events.remaining_for_registration(@registration).any?
+    .row
+      .col-md-12
+        %h4
+          %span.fa-stack
+            %i.fa.fa-square-o.fa-stack-2x
+            %i.fa.fa-question.fa-stack-1x
+          Events that require registration
+        %ul
+          - @registration.conference.program.events.remaining_for_registration(@registration).each do |event|
+            %li
+              = link_to event.title, conference_program_proposal_path(@conference.short_title, event.id)
+              = '(' + registered_text(event) + ')'
+
   - if @conference.tickets.any?
     .row
       .col-md-12