Description:
allow ta to set model submission
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r856:9a927c70d5aa - - 4 files changed: 13 inserted, 10 deleted
| @@ -123,25 +123,25 | |||
|
|
123 | 123 | puts e |
|
|
124 | 124 | puts e.message |
|
|
125 | 125 | return false |
|
|
126 | 126 | end |
|
|
127 | 127 | return false |
|
|
128 | 128 | end |
|
|
129 | 129 | |
|
|
130 | 130 | def admin? |
|
|
131 | 131 | has_role?('admin') |
|
|
132 | 132 | end |
|
|
133 | 133 | |
|
|
134 | 134 | def has_role?(role) |
|
|
135 | - self.roles.where(name: role).count > 0 | |
|
|
135 | + self.roles.where(name: [role,'admin']).count > 0 | |
|
|
136 | 136 | end |
|
|
137 | 137 | |
|
|
138 | 138 | def email_for_editing |
|
|
139 | 139 | if self.email==nil |
|
|
140 | 140 | "(unknown)" |
|
|
141 | 141 | elsif self.email=='' |
|
|
142 | 142 | "(blank)" |
|
|
143 | 143 | else |
|
|
144 | 144 | self.email |
|
|
145 | 145 | end |
|
|
146 | 146 | end |
|
|
147 | 147 | |
| @@ -45,30 +45,32 | |||
|
|
45 | 45 | .col-sm-6 |
|
|
46 | 46 | Solved/Attempted User |
|
|
47 | 47 | .col-sm-6 |
|
|
48 | 48 | #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%) |
|
|
49 | 49 | .row |
|
|
50 | 50 | .col-md-4 |
|
|
51 | 51 | .card |
|
|
52 | 52 | .card-body |
|
|
53 | 53 | %h2.card-title Model submission |
|
|
54 | 54 | %table.table.table-hover |
|
|
55 | 55 | %thead |
|
|
56 | 56 | %tr |
|
|
57 | - %th #Sub | |
|
|
57 | + %th #Sub (lang) | |
|
|
58 | 58 | %th Author |
|
|
59 | 59 | %tbody |
|
|
60 | 60 | - @model_subs.each do |sub| |
|
|
61 | 61 | %tr |
|
|
62 | - %td= link_to "##{sub.id}", submission_path(sub) | |
|
|
62 | + %td | |
|
|
63 | + = link_to "##{sub.id}", submission_path(sub) | |
|
|
64 | + = "(#{sub.language.pretty_name})" | |
|
|
63 | 65 | %td= sub.user.full_name |
|
|
64 | 66 | .col-md-8 |
|
|
65 | 67 | - if @best |
|
|
66 | 68 | .card |
|
|
67 | 69 | .card-body |
|
|
68 | 70 | %h2.card-title Top Submissions |
|
|
69 | 71 | %table.table.table-hover |
|
|
70 | 72 | %thead |
|
|
71 | 73 | %tr |
|
|
72 | 74 | %th Language |
|
|
73 | 75 | %th Best runtime (ms) |
|
|
74 | 76 | %th Best memory (kbytes) |
| @@ -13,17 +13,18 | |||
|
|
13 | 13 | = select 'report', |
|
|
14 | 14 | 'problem_id', |
|
|
15 | 15 | @problems.collect {|p| ["[#{p.name}] #{p.full_name}", problem_hof_report_path(p)]}, |
|
|
16 | 16 | {:selected => problem_hof_report_path(@problem)}, |
|
|
17 | 17 | { class: 'select2 form-control' } |
|
|
18 | 18 | %button.btn.btn-primary.btn-sm.go-button#problem_go{data: {source: "#report_problem_id"}} Go |
|
|
19 | 19 | |
|
|
20 | 20 | |
|
|
21 | 21 | - unless params[:id] |
|
|
22 | 22 | /=render partial: 'all_time_hof' |
|
|
23 | 23 | Please select a problem. |
|
|
24 | 24 | - else |
|
|
25 | - %h1 [#{Problem.find(params[:id]).name}] #{Problem.find(params[:id]).full_name} | |
|
|
26 | - -# %h2 Submission History | |
|
|
27 | - -# =render partial: 'application/bar_graph', locals: { histogram: @histogram } | |
|
|
25 | + %h1 | |
|
|
26 | + [#{Problem.find(params[:id]).name}] #{Problem.find(params[:id]).full_name} | |
|
|
27 | + - if @current_user.has_role?('ta') | |
|
|
28 | + %a{href:stat_problem_path(@problem)} (stat) | |
|
|
28 | 29 | =render partial: 'task_hof' |
|
|
29 | 30 | |
| @@ -85,42 +85,42 | |||
|
|
85 | 85 | %td #{@submission.peak_memory} |
|
|
86 | 86 | %tr |
|
|
87 | 87 | %td.text-right |
|
|
88 | 88 | %strong Compiler result |
|
|
89 | 89 | %td |
|
|
90 | 90 | %button.btn.btn-info.btn-xs{type: 'button', data: {toggle: 'modal', target: '#compiler'}} |
|
|
91 | 91 | view |
|
|
92 | 92 | %tr |
|
|
93 | 93 | %td.text-right |
|
|
94 | 94 | %strong Grading Task Status |
|
|
95 | 95 | %td |
|
|
96 | 96 | = @task.status_str if @task |
|
|
97 |
- - if |
|
|
|
97 | + - if @current_user.admin? | |
|
|
98 | 98 | = link_to "rejudge", rejudge_submission_path, data: {remote: true}, class: 'btn btn-info btn-xs' |
|
|
99 | - - if session[:admin] | |
|
|
99 | + - if @current_user.has_role?('ta') | |
|
|
100 | 100 | %tr |
|
|
101 | 101 | %td.text-right |
|
|
102 | 102 | %strong IP |
|
|
103 | 103 | %td #{@submission.ip_address} |
|
|
104 | 104 | %tr |
|
|
105 | 105 | %td.text-right |
|
|
106 | 106 | %strong Model solution |
|
|
107 | 107 | %td |
|
|
108 | 108 | - if @submission.tag_model? |
|
|
109 | 109 | YES |
|
|
110 |
- - if |
|
|
|
110 | + - if @current_user.has_role?('ta') | |
|
|
111 | 111 | = link_to "remove model status", set_tag_submission_path(@submission, tag: :default), class: 'btn btn-warning btn-xs' |
|
|
112 | 112 | - else |
|
|
113 | 113 | No |
|
|
114 |
- - if |
|
|
|
114 | + - if @current_user.has_role?('ta') | |
|
|
115 | 115 | = link_to "set as model solution", set_tag_submission_path(@submission, tag: :model), class: 'btn btn-success btn-xs' |
|
|
116 | 116 | |
|
|
117 | 117 | |
|
|
118 | 118 | .modal.fade#compiler{tabindex: -1,role: 'dialog'} |
|
|
119 | 119 | .modal-dialog.modal-lg{role:'document'} |
|
|
120 | 120 | .modal-content |
|
|
121 | 121 | .modal-header |
|
|
122 | 122 | %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}} |
|
|
123 | 123 | %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} × |
|
|
124 | 124 | %h4 Compiler message |
|
|
125 | 125 | .modal-body |
|
|
126 | 126 | %pre#compiler_msg= @submission.compiler_message |
You need to be logged in to leave comments.
Login now