cafe-grader-web Commit - r610:0c5b815f0163

cafe-grader-web

Commit `r610:0c5b815f0163` public

parent | child

Description:

- streamline current score report and fix some bug

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r610:0c5b815f0163 - Sun, 23 Oct 2016 14:51:33 - 3 files changed: 12 inserted, 9 deleted

app/controllers/user_admin_controller.rb ¶ +1 -1

                   # import sites
                   sites = {}
                   site_data.each_pair do |id,site|
                     s = Site.find_by_name(site[:name])
                     if s!=nil
                       @import_log << "Found #{site[:name]}\n"
                     else
                       s = Site.new(:name => site[:name])
                       @import_log << "Created #{site[:name]}\n"
                     end
                     s.password = site[:password]
                     s.country = countries[site[:country_id]]
                     s.save
                     sites[id] = s
                   end
                   # import users
                   user_data.each_pair do |id,user|
                     u = User.find_by_login(user[:login])
                     if u!=nil
                       @import_log << "Found #{user[:login]}\n"
                     else
                       u = User.new(:login => user[:login])
                       @import_log << "Created #{user[:login]}\n"
                     end
                     u.full_name = user[:name]
                     u.password = user[:password]
                     u.country = countries[user[:country_id]]
                     u.site = sites[user[:site_id]]
                     u.activated = true
                     u.email = "empty-#{u.login}@none.com"
                     if not u.save
                       @import_log << "Errors\n"
                       u.errors.each { |attr,msg|  @import_log << "#{attr} - #{msg}\n" }
                     end
                   end
                 end
                 def logout_users(users)
                   users.each do |user|
                     contest_stat = user.contest_stat(true)
                     if contest_stat and !contest_stat.forced_logout
                       contest_stat.forced_logout = true
                       contest_stat.save
                     end
                   end
                 end
                 def send_contest_update_notification_email(user, contest)
                   contest_title_name = GraderConfiguration['contest.name']
                   contest_name = contest.name
                   mail_subject = t('contest.notification.email_subject', {
                                      :contest_title_name => contest_title_name,
                                      :contest_name => contest_name })
                   mail_body = t('contest.notification.email_body', {
                                   :full_name => user.full_name,
                                   :contest_title_name => contest_title_name,
                                   :contest_name => contest.name,
                                 })
                   logger.info mail_body
                   send_mail(user.email, mail_subject, mail_body)
                 end
                 def find_contest_and_user_from_contest_id(id)
                   if id!='none'
                     @contest = Contest.find(id)
                   else
                     @contest = nil
                   end
                   if @contest
                     @users = @contest.users
                   else
                     @users = User.find_users_with_no_contest
                   end
                   return [@contest, @users]
                 end
                 def gen_csv_from_scorearray(scorearray,problem)
                   CSV.generate do |csv|
                     #add header
                     header = ['User','Name', 'Activated?', 'Logged in', 'Contest']
                     problem.each { |p| header << p.name }
                     header += ['Total','Passed']
                     csv << header
                     #add data
                     scorearray.each do |sc|
                       total = num_passed = 0
                       row = Array.new
                       sc.each_index do |i|
                         if i == 0
                           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]
                           total += sc[i][0]
                           num_passed += 1 if sc[i][1]
                         end
                       end
                       row << total
                       row << num_passed
                       csv << row
                     end
                   end
                 end
               end

app/views/layouts/_header.html.haml ¶ +4 -1

               %header.navbar.navbar-default.navbar-fixed-top
                 %nav
                   .container-fluid
                     .navbar-header
                       %a.navbar-brand{href: main_list_path}
                         %span.glyphicon.glyphicon-home
                         MAIN
                     .collapse.navbar-collapse
                       %ul.nav.navbar-nav
                         - if (@current_user!=nil) and (GraderConfiguration.show_tasks_to?(@current_user))
                           //= add_menu("#{I18n.t 'menu.tasks'}", 'tasks', 'list')
                           %li.dropdown
                             %a.dropdown-toggle{href: '#', data: {toggle:'dropdown'},  aria: {haspopup:"true", expanded:"false"}, role: "button"}
                               = "#{I18n.t 'menu.submissions'}"
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu("View", 'main', 'submission')
                               = add_menu("Self Test", 'test', 'index')
                         - if GraderConfiguration['right.user_hall_of_fame']
                           = add_menu("#{I18n.t 'menu.hall_of_fame'}", 'report', 'problem_hof')
                         / display MODE button (with countdown in contest mode)
                         - if GraderConfiguration.analysis_mode?
                           %div.navbar-btn.btn.btn-success#countdown= "ANALYSIS MODE"
                         - elsif GraderConfiguration.time_limit_mode?
                           - if @current_user.contest_finished?
                             %div.navbar-btn.btn.btn-danger#countdown= "Contest is over"
                           - elsif !@current_user.contest_started?
                             %div.navbar-btn.btn.btn-primary#countdown= (t 'title_bar.contest_not_started')
                           - else
                             %div.navbar-btn.btn.btn-primary#countdown asdf
                             :javascript
                               $("#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
                               %span.caret
                             %ul.dropdown-menu
                               = add_menu( 'Announcements', 'announcements', 'index')
                               = add_menu( 'Problems', 'problems', 'index')
                               = add_menu( 'Users', 'user_admin', 'index')
                               = add_menu( 'Graders', 'graders', 'list')
                               = add_menu( 'Message ', 'messages', 'console')
                               %li.divider{role: 'separator'}
                               = add_menu( 'System config', 'configurations', 'index')
                               %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!",
                               grader_list_path,
                               class: 'navbar-btn btn btn-default btn-warning', data: {toggle: 'tooltip'},title: 'Number of ungraded submission'
                       %ul.nav.navbar-nav.navbar-right
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-question-sign')}".html_safe, 'main', 'help')
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-comment')}".html_safe, 'messages', 'list', {title: I18n.t('menu.messages'), data: {toggle: 'tooltip'}})
                         - if GraderConfiguration['system.user_setting_enabled']
                           = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-cog')}".html_safe, 'users', 'index', {title: I18n.t('menu.settings'), data: {toggle: 'tooltip'}})
                         = add_menu("#{content_tag(:span,'',class: 'glyphicon glyphicon-log-out')} #{@current_user.full_name}".html_safe, 'main', 'login', {title: I18n.t('menu.log_out'), data: {toggle: 'tooltip'}})
               /
                 - if (@current_user!=nil) and (session[:admin])
                   %nav.navbar.navbar-fixed-top.navbar-inverse.secondnavbar
                     .container-fluid
                       .collapse.navbar-collapse
                         %ul.nav.navbar-nav
                           = add_menu( '[Announcements]', 'announcements', 'index')
                           = add_menu( '[Msg console]', 'messages', 'console')
                           = add_menu( '[Problems]', 'problems', 'index')
                           = add_menu( '[Users]', 'user_admin', 'index')
                           = add_menu( '[Results]', 'user_admin', 'user_stat')
                           = add_menu( '[Report]', 'report', 'multiple_login')
                           = add_menu( '[Graders]', 'graders', 'list')
                           = add_menu( '[Contests]', 'contest_management', 'index')
                           = add_menu( '[Sites]', 'sites', 'index')
                           = add_menu( '[System config]', 'configurations', 'index')

app/views/report/_score_table.html.haml ¶ +7 -7

               %table.table.sortable.table-striped.table-bordered.table-condensed
                 %thead
                   %tr
                     %th Login
                     %th Name
-            -       %th Activated?
+            +       / %th Activated?
-            -       %th Logged_in
+            +       / %th Logged_in
-            -       %th Contest(s)
+            +       / %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
                   - @scorearray.each do |sc|
                     %tr
                       - total,num_passed = 0,0
                       - sc.each_index do |i|
                         - 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].activated
-            -             %td= sc[i].try(:contest_stat).try(:started_at) ? 'yes' : 'no'
+            +             / %td= sc[i].try(:contest_stat).try(:started_at) ? 'yes' : 'no'
-            -             %td= sc[i].contests.collect {|c| c.name}.join(', ')
+            +             / %td= sc[i].contests.collect {|c| c.name}.join(', ')
                           %td= sc[i].remark
                         - else
                           %td.text-right= sc[i][0]
                           - total += sc[i][0]
                           - num_passed += 1 if sc[i][1]
                       %td.text-right= total
                       %td.text-right= num_passed
               :javascript
                 $.bootstrapSortable(true,'reversed')

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r610:0c5b815f0163 - Sun, 23 Oct 2016 14:51:33 - 3 files changed: 12 inserted, 9 deleted

Sign in to your account

Commit r610:0c5b815f0163 public

Author

r610:0c5b815f0163 - Sun, 23 Oct 2016 14:51:33 - 3 files changed: 12 inserted, 9 deleted

Commit `r610:0c5b815f0163` public