Refactoring code and add method

This commit is contained in:
Alator 2017-05-02 20:57:06 +03:00
parent b53b7b2eb3
commit 8ce3cdcd6c
3 changed files with 17 additions and 11 deletions

View file

@ -597,4 +597,10 @@ module ApplicationHelper
end end
concurrent_events concurrent_events
end end
def set_hidden_if_conf_is_over(conference)
'hidden' if Date.today > conference.end_date
end end
end

View file

@ -1,12 +1,12 @@
.list-group .list-group
%li{ 'class' => "list-group-item #{ 'hidden' if Date.today >= conference.end_date }" } %li{ 'class' => "list-group-item #{set_hidden_if_conf_is_over(conference)}" }
%h4 %h4
Conference progress Conference progress
.progress .progress
.progress-bar{ 'role' => 'progressbar', 'aria-valuenow' => "#{conference_progress['process']}", 'aria-valuemin' => '0', .progress-bar{ 'role' => 'progressbar', 'aria-valuenow' => "#{conference_progress['process']}", 'aria-valuemin' => '0',
'aria-valuemax' => '100', 'style' => "width: #{conference_progress['process']}%;" } 'aria-valuemax' => '100', 'style' => "width: #{conference_progress['process']}%;" }
= conference_progress['process'] + '%' = conference_progress['process'] + '%'
%li{ 'class' => "list-group-item #{ 'hidden' if Date.today >= conference.end_date } #{class_for_todo(conference_progress['registration'])}" } %li{ 'class' => "list-group-item #{set_hidden_if_conf_is_over(conference)} #{class_for_todo(conference_progress['registration'])}" }
%span{ 'class' => icon_for_todo(conference_progress['registration']) } %span{ 'class' => icon_for_todo(conference_progress['registration']) }
- if can? :update, @conference - if can? :update, @conference
- if conference.registration_period - if conference.registration_period
@ -15,13 +15,13 @@
= link_to 'Set up registration period', new_admin_conference_registration_period_path(conference_progress['short_title']) = link_to 'Set up registration period', new_admin_conference_registration_period_path(conference_progress['short_title'])
- else - else
Set up registration period Set up registration period
%li{ 'class' => "list-group-item #{ 'hidden' if Date.today > conference.end_date } #{class_for_todo(conference_progress['cfp'])}" } %li{ 'class' => "list-group-item #{set_hidden_if_conf_is_over(conference)} #{class_for_todo(conference_progress['cfp'])}" }
%span{ 'class' => icon_for_todo(conference_progress['cfp']) } %span{ 'class' => icon_for_todo(conference_progress['cfp']) }
- if can? :update, Cfp.new(program_id: @program.id) - if can? :update, Cfp.new(program_id: @program.id)
= link_to 'Set up call for papers', admin_conference_program_cfp_path(conference_progress['short_title']) = link_to 'Set up call for papers', admin_conference_program_cfp_path(conference_progress['short_title'])
- else - else
Set up call for papers Set up call for papers
%li{'class'=>"list-group-item #{ 'hidden' if Date.today >= conference.end_date } #{class_for_todo(conference_progress['venue'])}"} %li{'class'=>"list-group-item #{set_hidden_if_conf_is_over(conference)} #{class_for_todo(conference_progress['venue'])}"}
%span{'class'=>icon_for_todo(conference_progress['venue'])} %span{'class'=>icon_for_todo(conference_progress['venue'])}
- if can? :update, Venue.new(conference: @conference) - if can? :update, Venue.new(conference: @conference)
- @conference.reload - @conference.reload
@ -32,31 +32,31 @@
- else - else
- @conference.reload - @conference.reload
Add venue Add venue
%li{ 'class' => "list-group-item #{ 'hidden' if Date.today > conference.end_date } #{class_for_todo(conference_progress['rooms'])}" } %li{ 'class' => "list-group-item #{set_hidden_if_conf_is_over(conference)} #{class_for_todo(conference_progress['rooms'])}" }
%span{ 'class' => icon_for_todo(conference_progress['rooms']) } %span{ 'class' => icon_for_todo(conference_progress['rooms']) }
- if @conference.venue && (can? :update, @conference.venue.rooms.build) - if @conference.venue && (can? :update, @conference.venue.rooms.build)
= link_to 'Add rooms', admin_conference_venue_rooms_path(conference_progress['short_title']) = link_to 'Add rooms', admin_conference_venue_rooms_path(conference_progress['short_title'])
- else - else
Add rooms Add rooms
%li{ 'class' => "list-group-item #{ 'hidden' if Date.today > conference.end_date } #{class_for_todo(conference_progress['tracks'])}" } %li{ 'class' => "list-group-item #{set_hidden_if_conf_is_over(conference)} #{class_for_todo(conference_progress['tracks'])}" }
%span{ 'class' => icon_for_todo(conference_progress['tracks']) } %span{ 'class' => icon_for_todo(conference_progress['tracks']) }
- if can? :update, @conference.program.tracks.build - if can? :update, @conference.program.tracks.build
= link_to 'Add tracks', admin_conference_program_tracks_path(conference_progress['short_title']) = link_to 'Add tracks', admin_conference_program_tracks_path(conference_progress['short_title'])
- else - else
Add tracks Add tracks
%li{ 'class' => "list-group-item #{ 'hidden' if Date.today > conference.end_date } #{class_for_todo(conference_progress['event_types'])}" } %li{ 'class' => "list-group-item #{set_hidden_if_conf_is_over(conference)} #{class_for_todo(conference_progress['event_types'])}" }
%span{ 'class' => icon_for_todo(conference_progress['event_types']) } %span{ 'class' => icon_for_todo(conference_progress['event_types']) }
- if can? :update, @conference.program.event_types.build - if can? :update, @conference.program.event_types.build
= link_to 'Add event types', admin_conference_program_event_types_path(conference_progress['short_title']) = link_to 'Add event types', admin_conference_program_event_types_path(conference_progress['short_title'])
- else - else
Add event types Add event types
%li{ 'class' => "list-group-item #{ 'hidden' if Date.today > conference.end_date } #{class_for_todo(conference_progress['difficulty_levels'])}" } %li{ 'class' => "list-group-item #{set_hidden_if_conf_is_over(conference)} #{class_for_todo(conference_progress['difficulty_levels'])}" }
%span{ 'class' => icon_for_todo(conference_progress['difficulty_levels']) } %span{ 'class' => icon_for_todo(conference_progress['difficulty_levels']) }
- if can? :update, @conference.program.difficulty_levels.build - if can? :update, @conference.program.difficulty_levels.build
= link_to 'Add difficulty levels', admin_conference_program_difficulty_levels_path(conference_progress['short_title']) = link_to 'Add difficulty levels', admin_conference_program_difficulty_levels_path(conference_progress['short_title'])
- else - else
Add difficulty levels Add difficulty levels
%li{ class: "list-group-item #{ 'hidden' if Date.today > conference.end_date } #{class_for_todo(conference_progress['splashpage'])}" } %li{ class: "list-group-item #{set_hidden_if_conf_is_over(conference)} #{class_for_todo(conference_progress['splashpage'])}" }
%span{ 'class' => icon_for_todo(conference_progress['splashpage']) } %span{ 'class' => icon_for_todo(conference_progress['splashpage']) }
- if can? :update, @conference - if can? :update, @conference
= link_to 'Set up a Splashpage', admin_conference_splashpage_path(conference_progress['short_title']) = link_to 'Set up a Splashpage', admin_conference_splashpage_path(conference_progress['short_title'])

View file

@ -101,11 +101,11 @@
.row .row
.col-md-8 .col-md-8
%ul.nav.nav-tabs#recentTable %ul.nav.nav-tabs#recentTable
%li{ 'class' => "active #{ 'hidden' if Date.today > @conference.end_date }" } %li{ 'class' => "active #{set_hidden_if_conf_is_over(@conference)}" }
%a{ href: '#recent_reg', 'data-toggle' => 'tab' } %a{ href: '#recent_reg', 'data-toggle' => 'tab' }
%span.fa.fa-user %span.fa.fa-user
Recent Registrations Recent Registrations
%li{ 'class' => "#{ 'hidden' if Date.today > @conference.end_date }" } %li{ 'class' => "#{set_hidden_if_conf_is_over(@conference)}" }
%a{ href: '#recent_submissions', 'data-toggle' => 'tab' } %a{ href: '#recent_submissions', 'data-toggle' => 'tab' }
%span.fa.fa-file-text %span.fa.fa-file-text
Recent Submissions Recent Submissions