cafe-grader-web Commit - r660:241769f05803

cafe-grader-web

parent | child

Description:

fix various bug (grafted from cb6577a84dff16a5d7ba91166873cc8a2e2a2628)

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r660:241769f05803 - Wed, 19 Oct 2016 11:05:22 - 3 files changed: 4 inserted, 4 deleted

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

                     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 ? 'yes' : 'no')
+            +             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

app/views/main/_announcement.html.haml ¶ +1 -1

               %li.list-group-item
                 %strong
                   = announcement.title
-            -   - if @current_user.admin?
+            +   - if @current_user and @current_user.admin?
                   = link_to 'Edit', edit_announcement_path(announcement), class: 'btn btn-xs btn-default'
                 %small= "(updated #{time_ago_in_words(announcement.updated_at)} ago on #{announcement.updated_at})"
                 %br
                   = markdown(announcement.body)
                 :javascript
                   Announcement.updateRecentId(#{announcement.id});
                 - if (defined? announcement_effect) and announcement_effect
                   :javascript
                     $("announcement-#{announcement.id}").blindDown({duration: 0.2});
                     $("announcement-#{announcement.id}").appear({duration: 0.5, queue: 'end'});

app/views/main/_submission_short.html.haml ¶ +2 -2

               - if submission.nil?
                 = "-"
               - else
-            -   - if submission.graded_at.nil?
+            +   - unless submission.graded_at
                   =t 'main.submitted_at'
                   = format_short_time(submission.submitted_at.localtime)
                 - else
                   %strong= t 'main.graded_at'
                   = "#{format_short_time(submission.graded_at.localtime)} "
                   %br
                   - if GraderConfiguration['ui.show_score']
-            -       %strong= t 'main.score'
+            +       =t 'main.score'
                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
                   %br
                   %strong View:
                   - if GraderConfiguration.show_grading_result
                     = link_to '[detailed result]', :action => 'result', :id => submission.id
                   = link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'}
                 = link_to "#{t 'main.src_link'}",{:action => 'source', :id => submission.id}, class: 'btn btn-xs btn-info'
                 = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info'

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

	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