diff --git a/app/controllers/user_admin_controller.rb b/app/controllers/user_admin_controller.rb --- a/app/controllers/user_admin_controller.rb +++ b/app/controllers/user_admin_controller.rb @@ -521,7 +521,7 @@ row << sc[i].login row << sc[i].full_name row << sc[i].activated - row << (sc[i].try(:contest_stat).try(:started_at).nil? 'no' : 'yes') + row << (sc[i].try(:contest_stat).try(:started_at).nil? ? 'no' : 'yes') row << sc[i].contests.collect {|c| c.name}.join(', ') else row << sc[i][0] diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -32,6 +32,7 @@ $("#countdown").countdown({until: "+#{@current_user.contest_time_left.to_i}s", layout: 'Time left: {hnn}:{mnn}:{snn}'}); / admin section - if (@current_user!=nil) and (session[:admin]) + / management %li.dropdown %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'}, aria: {haspopup:"true", expanded:"false"}, role: "button"} Manage @@ -47,12 +48,14 @@ %li.divider{role: 'separator'} = add_menu( 'Sites', 'sites', 'index') = add_menu( 'Contests', 'contest_management', 'index') + / report %li.dropdown %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'}, aria: {haspopup:"true", expanded:"false"}, role: "button"} Report %span.caret %ul.dropdown-menu - = add_menu( 'Results', 'report', 'current_score') + = add_menu( 'Current Score', 'report', 'current_score') + = add_menu( 'Score Report', 'report', 'max_score') = add_menu( 'Report', 'report', 'multiple_login') - if (ungraded = Submission.where('graded_at is null').where('submitted_at < ?', 1.minutes.ago).count) > 0 =link_to "#{ungraded} backlogs!", diff --git a/app/views/report/_score_table.html.haml b/app/views/report/_score_table.html.haml --- a/app/views/report/_score_table.html.haml +++ b/app/views/report/_score_table.html.haml @@ -3,12 +3,12 @@ %tr %th Login %th Name - %th Activated? - %th Logged_in - %th Contest(s) + / %th Activated? + / %th Logged_in + / %th Contest(s) %th Remark - @problems.each do |p| - %th.text-right= p.name + %th.text-right= p.name.gsub('_',' ') %th.text-right Total %th.text-right Passed %tbody @@ -19,9 +19,9 @@ - if i == 0 %td= link_to sc[i].login, controller: 'users', action: 'profile', id: sc[i] %td= sc[i].full_name - %td= sc[i].activated - %td= sc[i].try(:contest_stat).try(:started_at) ? 'yes' : 'no' - %td= sc[i].contests.collect {|c| c.name}.join(', ') + / %td= sc[i].activated + / %td= sc[i].try(:contest_stat).try(:started_at) ? 'yes' : 'no' + / %td= sc[i].contests.collect {|c| c.name}.join(', ') %td= sc[i].remark - else %td.text-right= sc[i][0]