Description:
- fix link to user stat from user admin
- add compiler message to submission view
- fix some bugs
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r611:5599f91f430d - - 4 files changed: 26 inserted, 7 deleted
| @@ -54,8 +54,8 | |||||
|
|
54 | - @submission.each do |sub| |
|
54 | - @submission.each do |sub| |
|
|
55 | %tr.inactive |
|
55 | %tr.inactive |
|
|
56 | %td= link_to sub.id, submission_path(sub.id) |
|
56 | %td= link_to sub.id, submission_path(sub.id) |
|
|
57 |
- %td= ("" unless sub.user) || link_to |
|
57 | + %td= ("" unless sub.user) || link_to(sub.try(:user).try(:full_name), stat_user_path(sub.user.id)) |
|
|
58 |
- %td= ("" unless sub.problem) || link_to |
|
58 | + %td= ("" unless sub.problem) || link_to(sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id)) |
|
|
59 | %td= "#{time_ago_in_words(sub.submitted_at)} ago" |
|
59 | %td= "#{time_ago_in_words(sub.submitted_at)} ago" |
|
|
60 | %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " " |
|
60 | %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " " |
|
|
61 | %td= sub.grader_comment |
|
61 | %td= sub.grader_comment |
| @@ -72,8 +72,8 | |||||
|
|
72 | - @backlog_submission.each do |sub| |
|
72 | - @backlog_submission.each do |sub| |
|
|
73 | %tr.inactive |
|
73 | %tr.inactive |
|
|
74 | %td= link_to sub.id, submission_path(sub.id) |
|
74 | %td= link_to sub.id, submission_path(sub.id) |
|
|
75 | - %td= ("" unless sub.user) || link_to sub.try(:user).try(:full_name), stat_user_path(sub.user.id) |
|
75 | + %td= ("" unless sub.user) || link_to( sub.try(:user).try(:full_name), stat_user_path(sub.user.id)) |
|
|
76 | - %td= ("" unless sub.problem) || link_to sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id) |
|
76 | + %td= ("" unless sub.problem) || link_to( sub.try(:problem).try(:full_name), stat_problem_path(sub.problem.id)) |
|
|
77 | %td= "#{time_ago_in_words(sub.submitted_at)} ago" |
|
77 | %td= "#{time_ago_in_words(sub.submitted_at)} ago" |
|
|
78 | %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " " |
|
78 | %td= sub.graded_at ? "#{time_ago_in_words(sub.graded_at)} ago" : " " |
|
|
79 | %td= sub.grader_comment |
|
79 | %td= sub.grader_comment |
| @@ -2,10 +2,15 | |||||
|
|
2 | %nav |
|
2 | %nav |
|
|
3 | .container-fluid |
|
3 | .container-fluid |
|
|
4 | .navbar-header |
|
4 | .navbar-header |
|
|
|
5 | + %button.navbar-toggle.collapsed{ data: {toggle: 'collapse', target: '#navbar-collapse'} } | ||
|
|
|
6 | + %span.sr-only Togggle Navigation | ||
|
|
|
7 | + %span.icon-bar | ||
|
|
|
8 | + %span.icon-bar | ||
|
|
|
9 | + %span.icon-bar | ||
|
|
5 | %a.navbar-brand{href: main_list_path} |
|
10 | %a.navbar-brand{href: main_list_path} |
|
|
6 | %span.glyphicon.glyphicon-home |
|
11 | %span.glyphicon.glyphicon-home |
|
|
7 | MAIN |
|
12 | MAIN |
|
|
8 | - .collapse.navbar-collapse |
|
13 | + .collapse.navbar-collapse#navbar-collapse |
|
|
9 | %ul.nav.navbar-nav |
|
14 | %ul.nav.navbar-nav |
|
|
10 | - if (@current_user!=nil) and (GraderConfiguration.show_tasks_to?(@current_user)) |
|
15 | - if (@current_user!=nil) and (GraderConfiguration.show_tasks_to?(@current_user)) |
|
|
11 | //= add_menu("#{I18n.t 'menu.tasks'}", 'tasks', 'list') |
|
16 | //= add_menu("#{I18n.t 'menu.tasks'}", 'tasks', 'list') |
| @@ -6,6 +6,8 | |||||
|
|
6 |
|
6 | ||
|
|
7 | //%div.highlight{:style => "border: 1px solid black;"} |
|
7 | //%div.highlight{:style => "border: 1px solid black;"} |
|
|
8 | //=@formatted_code.html_safe |
|
8 | //=@formatted_code.html_safe |
|
|
|
9 | + | ||
|
|
|
10 | + | ||
|
|
9 | .containter |
|
11 | .containter |
|
|
10 | .row |
|
12 | .row |
|
|
11 | .col-md-7 |
|
13 | .col-md-7 |
| @@ -81,7 +83,19 | |||||
|
|
81 | %td.text-right |
|
83 | %td.text-right |
|
|
82 | %strong Compiler result |
|
84 | %strong Compiler result |
|
|
83 | %td |
|
85 | %td |
|
|
84 | - %pre= @submission.compiler_message |
|
86 | + %button.btn.btn-info.btn-xs{type: 'button', data: {toggle: 'modal', target: '#compiler'}} |
|
|
|
87 | + view | ||
|
|
|
88 | + .modal.fade#compiler{tabindex: -1,role: 'dialog'} | ||
|
|
|
89 | + .modal-dialog.modal-lg{role:'document'} | ||
|
|
|
90 | + .modal-content | ||
|
|
|
91 | + .modal-header | ||
|
|
|
92 | + %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}} | ||
|
|
|
93 | + %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} × | ||
|
|
|
94 | + %h4 Compiler message | ||
|
|
|
95 | + .modal-body | ||
|
|
|
96 | + %pre= @submission.compiler_message | ||
|
|
|
97 | + .modal-footer | ||
|
|
|
98 | + %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close | ||
|
|
85 | - if session[:admin] |
|
99 | - if session[:admin] |
|
|
86 | %tr |
|
100 | %tr |
|
|
87 | %td.text-right |
|
101 | %td.text-right |
| @@ -84,7 +84,7 | |||||
|
|
84 | %th |
|
84 | %th |
|
|
85 | - for user in @users |
|
85 | - for user in @users |
|
|
86 | %tr |
|
86 | %tr |
|
|
87 |
- %td= link_to user.login, |
|
87 | + %td= link_to user.login, stat_user_path(user) |
|
|
88 | %td= user.full_name |
|
88 | %td= user.full_name |
|
|
89 | %td= user.email |
|
89 | %td= user.email |
|
|
90 | %td= user.remark |
|
90 | %td= user.remark |
You need to be logged in to leave comments.
Login now