From 8ce3cdcd6c8bad9f3898c52370e4289b1bce38f2 Mon Sep 17 00:00:00 2001 From: Alator Date: Tue, 2 May 2017 20:57:06 +0300 Subject: [PATCH] Refactoring code and add method --- app/helpers/application_helper.rb | 6 ++++++ .../admin/conferences/_todo_list.html.haml | 18 +++++++++--------- app/views/admin/conferences/show.html.haml | 4 ++-- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c82e6bab..b948281d 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -597,4 +597,10 @@ module ApplicationHelper end concurrent_events end + + def set_hidden_if_conf_is_over(conference) + 'hidden' if Date.today > conference.end_date + end + end + diff --git a/app/views/admin/conferences/_todo_list.html.haml b/app/views/admin/conferences/_todo_list.html.haml index 70b543c5..4b88b814 100644 --- a/app/views/admin/conferences/_todo_list.html.haml +++ b/app/views/admin/conferences/_todo_list.html.haml @@ -1,12 +1,12 @@ .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 Conference progress .progress .progress-bar{ 'role' => 'progressbar', 'aria-valuenow' => "#{conference_progress['process']}", 'aria-valuemin' => '0', 'aria-valuemax' => '100', 'style' => "width: #{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']) } - if can? :update, @conference - if conference.registration_period @@ -15,13 +15,13 @@ = link_to 'Set up registration period', new_admin_conference_registration_period_path(conference_progress['short_title']) - else 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']) } - 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']) - else 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'])} - if can? :update, Venue.new(conference: @conference) - @conference.reload @@ -32,31 +32,31 @@ - else - @conference.reload 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']) } - if @conference.venue && (can? :update, @conference.venue.rooms.build) = link_to 'Add rooms', admin_conference_venue_rooms_path(conference_progress['short_title']) - else 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']) } - if can? :update, @conference.program.tracks.build = link_to 'Add tracks', admin_conference_program_tracks_path(conference_progress['short_title']) - else 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']) } - if can? :update, @conference.program.event_types.build = link_to 'Add event types', admin_conference_program_event_types_path(conference_progress['short_title']) - else 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']) } - if can? :update, @conference.program.difficulty_levels.build = link_to 'Add difficulty levels', admin_conference_program_difficulty_levels_path(conference_progress['short_title']) - else 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']) } - if can? :update, @conference = link_to 'Set up a Splashpage', admin_conference_splashpage_path(conference_progress['short_title']) diff --git a/app/views/admin/conferences/show.html.haml b/app/views/admin/conferences/show.html.haml index d38592a2..d6bebfea 100644 --- a/app/views/admin/conferences/show.html.haml +++ b/app/views/admin/conferences/show.html.haml @@ -101,11 +101,11 @@ .row .col-md-8 %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' } %span.fa.fa-user 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' } %span.fa.fa-file-text Recent Submissions