Show the individual User schedule

Show the current user favourites events for both schedule and all events.

Unsed css removed.
This commit is contained in:
Ana 2016-08-13 02:26:02 +02:00 committed by Ana María Martínez Gómez
parent 9154f1883d
commit f54df5922e
8 changed files with 32 additions and 31 deletions

View file

@ -30,6 +30,7 @@
.room.elipsis.break-words{ style: "-webkit-line-clamp: #{ room_lines(@rooms) }; height: #{ room_height(@rooms) }px;" }
= room.name
- event_schedules = room.event_schedules.select{ |e| (e.schedule_id == @conference.program.selected_schedule.id) && (e.end_time > start_time) && (e.start_time <= (start_time + hrs_per_slide.hour)) }
- event_schedules = event_schedules.select{ |e| e.event.favourite_users.exists?(current_user.id) } if current_user && @favourites
- (1..intervals).each do |i|
- if span > 1
- span -= 1

View file

@ -7,15 +7,14 @@
= canceled_replacement_event_label(event, event_schedule, 'schedule-label')
- if current_user
= link_to('#', onClick: 'starClicked();') do
%span#star{ class: "fa fa-lg #{ event.favourite_users.exists?(current_user.id) ? 'fa-star' : 'fa-star-o' }", |
"aria-hidden" =>"true", |
"data-url" => conference_program_proposal_path(@conference.short_title, event.id), |
"data-user" => current_user.id }
= event.title
- if current_user
= link_to('#', onClick: 'starClicked();') do
%span#star{ class: "fa fa-lg #{ event.favourite_users.exists?(current_user.id) ? 'fa-star' : 'fa-star-o' }", |
"aria-hidden" =>"true", |
"data-url" => conference_program_proposal_path(@conference.short_title, event.id), |
"data-user" => current_user.id }
- if speaker = event.speakers.first
= image_tag speaker.gravatar_url, :class => "img-circle pull-right speaker-pic", |
:alt => speaker.name, |

View file

@ -2,6 +2,6 @@
/ Nav tabs
%ul.nav.nav-tabs{ role: "tablist" }
%li{ class: "schedule #{ 'active' if active == 'schedule' }", role: "presentation" }
= link_to('Schedule', conference_schedule_path(@conference.short_title))
= link_to('Schedule', conference_schedule_path(@conference.short_title, favourites: @favourites))
%li{ class: "program #{ 'active' if active == 'program' }", role: "presentation" }
= link_to('All events', events_conference_schedule_path(@conference.short_title))
= link_to('All events', events_conference_schedule_path(@conference.short_title, favourites: @favourites))

View file

@ -5,6 +5,13 @@
%h1.text-center
Program for
= @conference.title
- if current_user
.row
.col-md-12.text-center
= button_to (@favourites ? 'All events' : 'Only favourites events'),
events_conference_schedule_path(@conference.short_title),
params: { favourites: !@favourites },
method: :get, class: 'btn btn-success'
.dropdown.program-dropdown
%button{ type: "button", class: "btn btn-default dropdown-toggle", 'data-toggle' => "dropdown" }
Dates

View file

@ -5,6 +5,13 @@
%h1.text-center
Schedule for
= @conference.title
- if current_user
.row
.col-md-12.text-center
= button_to (@favourites ? 'All events' : 'Only favourites events'),
conference_schedule_path(@conference.short_title),
params: { favourites: !@favourites },
method: :get, class: 'btn btn-success'
.dropdown.schedule-dropdown
%button{ type: "button", class: "btn btn-default dropdown-toggle", 'data-toggle' => "dropdown" }
= @day