gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1621 from namangupta01/master

Browse source 
Speaker is asked to register only when registration_period is set
This commit is contained in:
James Mason 2017-11-03 08:48:35 -07:00 • committed by GitHub
commit f0016cb6b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

13
app/views/proposals/_tooltip.html.haml
View file

@ -1,11 +1,12 @@
- progress_status = event.progress_status - progress_status = event.progress_status
%ul.list-unstyled %ul.list-unstyled
%li{'class'=>class_for_todo(progress_status['registered'])} - if can? :create, @conference.registrations.new
%span{'class'=>icon_for_todo(progress_status['registered'])} %li{'class'=>class_for_todo(progress_status['registered'])}
- if progress_status['registered'] %span{'class'=>icon_for_todo(progress_status['registered'])}
Speaker(s) registered to the conference - if progress_status['registered']
- else Speaker(s) registered to the conference
= link_to 'Speaker(s) not registered to the conference', new_conference_conference_registration_path(event.program.conference.short_title) - else
= link_to 'Speaker(s) not registered to the conference', new_conference_conference_registration_path(event.program.conference.short_title)
%li{'class'=>class_for_todo(progress_status['biographies'])} %li{'class'=>class_for_todo(progress_status['biographies'])}
%span{'class'=>icon_for_todo(progress_status['biographies'])} %span{'class'=>icon_for_todo(progress_status['biographies'])}
- if progress_status['biographies'] - if progress_status['biographies']

35
app/views/proposals/index.html.haml
View file

@ -48,12 +48,12 @@
The more information you add to your proposal, the more likely it is that the conference organizers accept your proposal. The more information you add to your proposal, the more likely it is that the conference organizers accept your proposal.
%br %br
It will also be more likely that visitors find your proposal interesting enough to attend. It will also be more likely that visitors find your proposal interesting enough to attend.
- if can? :create, @conference.registrations.new
%p %p
%strong %strong
Why do I need to register to the conference? Why do I need to register to the conference?
%p %p
Knowing the number of visitors for the conference helps the organizers plan better. Knowing the number of visitors for the conference helps the organizers plan better.
%table.table.table-striped#events %table.table.table-striped#events
- @events.each do |event| - @events.each do |event|
@ -67,20 +67,27 @@
%small.text-muted %small.text-muted
= event.event_type.title = event.event_type.title
= "(#{event.event_type.length} min)" = "(#{event.event_type.length} min)"
= "in #{event.track.name}" if event.track = "in #{event.traistck.name}" if event.track
- if event.require_registration - if event.require_registration
%br %br
= link_to registered_text(event), registrations_conference_program_proposal_path(@conference.short_title, event), class: 'btn btn-xs btn-danger' = link_to registered_text(event), registrations_conference_program_proposal_path(@conference.short_title, event), class: 'btn btn-xs btn-danger'
%td.col-md-2{style: "padding:20px 8px 20px 8px;"} %td.col-md-2{style: "padding:20px 8px 20px 8px;"}
= link_to 'Complete your proposal', 'javascript: void(0)', "type"=>"button", "data-trigger"=>"focus", "data-toggle"=>"popover", "title"=>"Your todo list", "data-content"=>"#{render partial: 'tooltip', locals: { event: event} }" = link_to 'Complete your proposal', 'javascript: void(0)', "type"=>"button", "data-trigger"=>"focus", "data-toggle"=>"popover", "title"=>"Your todo list", "data-content"=>"#{render partial: 'tooltip', locals: { event: event} }"
- if can? :create, @conference.registrations.new
- progress_percentage = event.calculate_progress - progress_percentage = event.calculate_progress
.progress .progress
%div{class: "progress-bar #{event_progress_color(progress_percentage)}", style: "width:#{progress_percentage}%;"} %div{class: "progress-bar #{event_progress_color(progress_percentage)}", style: "width:#{progress_percentage}%;"}
= event.progress_status.reject{ |_key, value| value || value.nil? }.length = event.progress_status.reject{ |_key, value| value || value.nil? }.length
left left
- else
:ruby
progress_list = event.progress_status
progress_percentage = (100 * progress_list.values.count(true) / (progress_list.values.compact.count-1)).to_s
.progress
%div{class: "progress-bar #{event_progress_color(progress_percentage)}", style: "width:#{progress_percentage}%;"}
= event.progress_status.reject{ |_key, value| value || value.nil? }.length-1
left
%td.col-md-3{style: "padding:20px 0px 20px 0px;"} %td.col-md-3{style: "padding:20px 0px 20px 0px;"}
.pull-right .pull-right
- if event.transition_possible? :confirm - if event.transition_possible? :confirm