Description:
fix various bug
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r609:4be3eb548e52 - - 3 files changed: 5 inserted, 5 deleted
| @@ -500,39 +500,39 | |||
|
|
500 | 500 | if @contest |
|
|
501 | 501 | @users = @contest.users |
|
|
502 | 502 | else |
|
|
503 | 503 | @users = User.find_users_with_no_contest |
|
|
504 | 504 | end |
|
|
505 | 505 | return [@contest, @users] |
|
|
506 | 506 | end |
|
|
507 | 507 | |
|
|
508 | 508 | def gen_csv_from_scorearray(scorearray,problem) |
|
|
509 | 509 | CSV.generate do |csv| |
|
|
510 | 510 | #add header |
|
|
511 | 511 | header = ['User','Name', 'Activated?', 'Logged in', 'Contest'] |
|
|
512 | 512 | problem.each { |p| header << p.name } |
|
|
513 | 513 | header += ['Total','Passed'] |
|
|
514 | 514 | csv << header |
|
|
515 | 515 | #add data |
|
|
516 | 516 | scorearray.each do |sc| |
|
|
517 | 517 | total = num_passed = 0 |
|
|
518 | 518 | row = Array.new |
|
|
519 | 519 | sc.each_index do |i| |
|
|
520 | 520 | if i == 0 |
|
|
521 | 521 | row << sc[i].login |
|
|
522 | 522 | row << sc[i].full_name |
|
|
523 | 523 | row << sc[i].activated |
|
|
524 |
- row << (sc[i].try(:contest_stat).try(:started_at) |
|
|
|
524 | + row << (sc[i].try(:contest_stat).try(:started_at).nil? 'no' : 'yes') | |
|
|
525 | 525 | row << sc[i].contests.collect {|c| c.name}.join(', ') |
|
|
526 | 526 | else |
|
|
527 | 527 | row << sc[i][0] |
|
|
528 | 528 | total += sc[i][0] |
|
|
529 | 529 | num_passed += 1 if sc[i][1] |
|
|
530 | 530 | end |
|
|
531 | 531 | end |
|
|
532 | 532 | row << total |
|
|
533 | 533 | row << num_passed |
|
|
534 | 534 | csv << row |
|
|
535 | 535 | end |
|
|
536 | 536 | end |
|
|
537 | 537 | end |
|
|
538 | 538 | end |
| @@ -1,15 +1,15 | |||
|
|
1 | 1 | %li.list-group-item |
|
|
2 | 2 | %strong |
|
|
3 | 3 | = announcement.title |
|
|
4 | - - if @current_user.admin? | |
|
|
4 | + - if @current_user and @current_user.admin? | |
|
|
5 | 5 | = link_to 'Edit', edit_announcement_path(announcement), class: 'btn btn-xs btn-default' |
|
|
6 | 6 | %small= "(updated #{time_ago_in_words(announcement.updated_at)} ago on #{announcement.updated_at})" |
|
|
7 | 7 | |
|
|
8 | 8 | %br |
|
|
9 | 9 | = markdown(announcement.body) |
|
|
10 | 10 | :javascript |
|
|
11 | 11 | Announcement.updateRecentId(#{announcement.id}); |
|
|
12 | 12 | - if (defined? announcement_effect) and announcement_effect |
|
|
13 | 13 | :javascript |
|
|
14 | 14 | $("announcement-#{announcement.id}").blindDown({duration: 0.2}); |
|
|
15 | 15 | $("announcement-#{announcement.id}").appear({duration: 0.5, queue: 'end'}); |
| @@ -1,26 +1,26 | |||
|
|
1 | 1 | |
|
|
2 | 2 | - if submission.nil? |
|
|
3 | 3 | = "-" |
|
|
4 | 4 | - else |
|
|
5 |
- - |
|
|
|
6 |
- = |
|
|
|
5 | + - unless submission.graded_at | |
|
|
6 | + =t 'main.submitted_at' | |
|
|
7 | 7 | = format_short_time(submission.submitted_at.localtime) |
|
|
8 | 8 | - else |
|
|
9 | 9 | %strong= t 'main.graded_at' |
|
|
10 | 10 | = "#{format_short_time(submission.graded_at.localtime)} " |
|
|
11 | 11 | %br |
|
|
12 | 12 | - if GraderConfiguration['ui.show_score'] |
|
|
13 |
- |
|
|
|
13 | + =t 'main.score' | |
|
|
14 | 14 | = "#{(submission.points*100/submission.problem.full_score).to_i} " |
|
|
15 | 15 | = " [" |
|
|
16 | 16 | %tt |
|
|
17 | 17 | = submission.grader_comment |
|
|
18 | 18 | = "]" |
|
|
19 | 19 | %br |
|
|
20 | 20 | %strong View: |
|
|
21 | 21 | - if GraderConfiguration.show_grading_result |
|
|
22 | 22 | = link_to '[detailed result]', :action => 'result', :id => submission.id |
|
|
23 | 23 | = link_to "#{t 'main.cmp_msg'}", {:action => 'compiler_msg', :id => submission.id}, {popup: true,class: 'btn btn-xs btn-info'} |
|
|
24 | 24 | = link_to "#{t 'main.src_link'}",{:action => 'source', :id => submission.id}, class: 'btn btn-xs btn-info' |
|
|
25 | 25 | = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info' |
|
|
26 | 26 | |
You need to be logged in to leave comments.
Login now