Major fix: Filtering on events by shifts now works. #145
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,91 +1,111 @@ | ||
| <h3 class="pre-title"><%= @event.name %></h3> | ||
| <h1><%=h @audience.to_s %> Attendance</h1> | ||
|
|
||
| <table class="attendees"> | ||
| <thead> | ||
|
There was a problem hiding this comment. @kritinvij Could you please go through these lines and change the spaces back to tabs, to keep the diff a little smaller? There was a problem hiding this comment. Yes. I will get back home and do it today. Kritin Vij On Tue, Jun 23, 2015 at 11:57 PM, Mitchell Harper [email protected]
There was a problem hiding this comment. Hi, Thanks Kritin Vij On Wed, Jun 24, 2015 at 10:20 AM, Kritin Vij [email protected] wrote:
|
||
| <tr> | ||
| <th>Attendee</th> | ||
| <%= content_tag(:th, "High School") if @audience.to_s.downcase == "participant" || @audience.to_s.downcase == "student" %> | ||
| <th>Program(s)</th> | ||
| <th>Phone</th> | ||
| <th>Shift</th> | ||
| <%= "<th class='centered'>Trained?</th>" if @event.training_required?(@audience.to_s) %> | ||
| <th class="centered">RSVP'd? | ||
| <%= link_to "E-mail", | ||
| "mailto:#{@event.attendees.rsvpd(@audience).collect{|a| a.email rescue nil }.compact.join(",")}", | ||
| :class => 'email button', | ||
| :id => 'attending_email_link' %> | ||
| </th> | ||
| <th class="centered">Attended? | ||
| <%= link_to "E-mail", | ||
| "mailto:#{@event.attendees.attended(@audience).collect{|a| a.email rescue nil }.compact.join(",")}", | ||
| :class => 'email button', | ||
| :id => 'attended_email_link' %> | ||
| </th> | ||
| <th>Functions</th> | ||
| </tr> | ||
| </thead> | ||
|
|
||
| <tbody> | ||
| <%= render :partial => 'event_attendance', :collection => @event.attendees.audience(@audience).select{|a| a.rsvp? || a.attended? || a.admin? }, :locals => { :audience => @audience } %> | ||
|
|
||
| <%- if @event.attendees.empty? -%> | ||
| <tr class="empty"> | ||
| <td colspan=10>No event attendees yet.</td> | ||
| </tr> | ||
| <% end -%> | ||
| </tbody> | ||
| </table> | ||
|
|
||
| <div id="sidebar"> | ||
| <p><%= link_to "Back to Event", event_path(@event), :class => 'back button' %></p> | ||
| <p><%= link_to "Take Attendnace", checkin_event_event_attendances_path(@event, :audience => @audience), :class => "edit button" %></p> | ||
| <%- form_tag({}, :method => :get) do -%> | ||
| <p><%= label_tag :audience, "View Attendance For:" %> | ||
| <%= select_tag :audience, | ||
| options_for_select(%w[Participant Student Mentor Volunteer].collect{|a| ["#{a} (#{@event.rsvpd_count(a)})", a]}, | ||
| @audience.to_s.classify), | ||
| :onchange => "this.form.submit()" %> | ||
| <%= submit_tag "Go" %> | ||
| </p> | ||
| <% end -%> | ||
|
|
||
| <%- if @event.has_shifts?(@audience.to_s.classify) %> | ||
| <h3>Filter by Shift</h3> | ||
| <div id="event_shift_selectors"> | ||
| <%- for event_shift in @event.shifts.for(@audience.to_s.classify) -%> | ||
| <label for="event_shift_selector_<%= event_shift.id %>"> | ||
| <input type="checkbox" id="event_shift_selector_<%= event_shift.id %>" data-shift-id="<%= event_shift.id %>" checked onChange="updateShiftSelections(this);"> | ||
| <%= truncate(event_shift.title) %> | ||
| </label><br> | ||
| <% end -%> | ||
| <small class="light">Filtering the list will also update the email buttons above.</small> | ||
| </div> | ||
| <% end -%> | ||
| </div> | ||
|
|
||
| <script type="text/javascript"> | ||
|
|
||
| function updateShiftSelections(elem) { | ||
| // get the data shift id for the filter | ||
| var shiftid = elem.getAttribute("data-shift-id"); | ||
|
|
||
| // get all rows that correspond to that shift id | ||
| var rows = $("tr.event_attendance[data-shift-id='" + shiftid + "']"); | ||
|
|
||
| if (elem.checked) { | ||
| rows.show(); | ||
| } else { | ||
| rows.hide(); | ||
| } | ||
| updateEmailLinks(); | ||
| } | ||
|
|
||
| function updateEmailLinks() { | ||
| // get rows which are visible and corresponding attributes are true | ||
| var attending_rows = $("tr.event_attendance[data-attending='true']:visible"); | ||
| var attended_rows = $("tr.event_attendance[data-attended='true']:visible"); | ||
|
|
||
| // create an email list of those people attending | ||
| var emailsAttending = []; | ||
| attending_rows.each(function(key, value) { | ||
| emailsAttending.push(value.getAttribute('data-email')); | ||
| }); | ||
|
There was a problem hiding this comment. For these 4 lines, you might consider jQuery's map function with a |
||
|
|
||
| // make the array into string and then set that as a value to the email link | ||
| emailsAttending = emailsAttending.join(','); | ||
| $('#attending_email_link').attr("href", "mailto:" + emailsAttending); | ||
|
|
||
| // similarly for the Attended emails | ||
| var emailsAttended = []; | ||
| attended_rows.each(function(key, value) { | ||
| mailsAttended.push(value.getAttribute('data-email')); | ||
| }); | ||
| emailsAttended = emailsAttended.join(','); | ||
| $('#attended_email_link').attr("href", "mailto:" + emailsAttended); | ||
| } | ||
|
|
||
| </script> | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Watch what your editor is using for tab spacing, these were all tabs originally. @mattharris5 we should probably come up with a style guide to differentiate spacing between views and models, and to standardize method/variable names