cafe-grader-web

Commit r632:b4dd5e5f23ab public

parent | child
Description:
- add view testcase toggle for each problem - refactor: move view testcase to testcase_controller - change flash rendering
Commit status:
[Not Reviewed]
References:
java
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r632:b4dd5e5f23ab - - 14 files changed: 107 inserted, 48 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -0,0 +1,2
1 + = render partial: 'toggle_button',
2 + locals: {button_id: "#problem-view-testcase-#{@problem.id}",button_on: @problem.view_testcase?}
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -0,0 +1,25
1 + %h1 Test cases
2 + %h2= @problem.long_name
3 +
4 + /navbar
5 + %ul.nav.nav-pills{role: :tablist}
6 + - @problem.testcases.each.with_index do |tc,id|
7 + %li{role: :presentation, class: ('active' if id == 0)}
8 + %a{href:"#tc#{tc.id}", role: 'tab', data: {toggle: 'tab'}}= tc.num
9 +
10 + /actual data
11 + .tab-content
12 + - @problem.testcases.each.with_index do |tc,id|
13 + .tab-pane{id: "tc#{tc.id}",class: ('active' if id == 0)}
14 + .row
15 + .col-md-6
16 + %h3 Input
17 + = link_to "Download",download_input_testcase_path(tc),class: 'btn btn-info btn-sm'
18 + .col-md-6
19 + %h3 Output
20 + = link_to "Download",download_sol_testcase_path(tc),class: 'btn btn-info btn-sm'
21 + .row
22 + .col-md-6
23 + %textarea{ rows: 25,readonly: true,style: "width:100%;resize=none;overflow-y: scroll;"}= tc.input
24 + .col-md-6
25 + %textarea{ rows: 25,readonly: true,style: "width:100%;resize=none;overflow-y: scroll;"}= tc.sol
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -0,0 +1,5
1 + class AddViewTestcaseToProblem < ActiveRecord::Migration
2 + def change
3 + add_column :problems, :view_testcase, :bool
4 + end
5 + end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -36,17 +36,20
36 36 return false
37 37 end
38 38 end
39 39
40 40 def testcase_authorization
41 41 #admin always has privileged
42 + puts "haha"
42 43 if @current_user.admin?
43 44 return true
44 45 end
45 46
46 - unauthorized_redirect if GraderConfiguration["right.view_testcase"]
47 + puts "hehe"
48 + puts GraderConfiguration["right.view_testcase"]
49 + unauthorized_redirect unless GraderConfiguration["right.view_testcase"]
47 50 end
48 51
49 52 protected
50 53
51 54 def authenticate
52 55 unless session[:user_id]
@@ -105,19 +108,21
105 108 end
106 109 return true
107 110 end
108 111
109 112 def authorization
110 113 return false unless authenticate
114 + puts "haha 1"
111 115 user = User.find(session[:user_id])
112 116 unless user.roles.detect { |role|
113 117 role.rights.detect{ |right|
114 118 right.controller == self.class.controller_name and
115 119 (right.action == 'all' or right.action == action_name)
116 120 }
117 121 }
122 + puts "haha 2"
118 123 flash[:notice] = 'You are not authorized to view the page you requested'
119 124 #request.env['HTTP_REFERER'] ? (redirect_to :back) : (redirect_to :controller => 'login')
120 125 redirect_to :controller => 'main', :action => 'login'
121 126 return false
122 127 end
123 128 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -132,12 +132,20
132 132 @problem.update_attributes(test_allowed: !(@problem.test_allowed?) )
133 133 respond_to do |format|
134 134 format.js { }
135 135 end
136 136 end
137 137
138 + def toggle_view_testcase
139 + @problem = Problem.find(params[:id])
140 + @problem.update_attributes(view_testcase: !(@problem.view_testcase?) )
141 + respond_to do |format|
142 + format.js { }
143 + end
144 + end
145 +
138 146 def turn_all_off
139 147 Problem.available.all.each do |problem|
140 148 problem.available = false
141 149 problem.save
142 150 end
143 151 redirect_to action: :index
@@ -219,16 +227,12
219 227 if problem!=nil and contest!=nil
220 228 problem.contests.delete(contest)
221 229 end
222 230 redirect_to :action => 'manage'
223 231 end
224 232
225 - def show_testcase
226 - @problem = Problem.includes(:testcases).find(params[:id])
227 - end
228 -
229 233 ##################################
230 234 protected
231 235
232 236 def allow_test_pair_import?
233 237 if defined? ALLOW_TEST_PAIR_IMPORT
234 238 return ALLOW_TEST_PAIR_IMPORT
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -7,12 +7,20
7 7 end
8 8
9 9 def download_sol
10 10 send_data @testcase.sol, type: 'text/plain', filename: "#{@testcase.problem.name}.#{@testcase.num}.sol"
11 11 end
12 12
13 + def show_problem
14 + @problem = Problem.includes(:testcases).find(params[:problem_id])
15 + unless @current_user.admin? or @problem.view_testcase
16 + flash[:error] = 'You cannot view the testcase of this problem'
17 + redirect_to :controller => 'main', :action => 'list'
18 + end
19 + end
20 +
13 21
14 22 private
15 23 # Use callbacks to share common setup or constraints between actions.
16 24 def set_testcase
17 25 @testcase = Testcase.find(params[:id])
18 26 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -193,7 +193,30
193 193
194 194 def markdown(text)
195 195 markdown = RDiscount.new(text)
196 196 markdown.to_html.html_safe
197 197 end
198 198
199 +
200 + BOOTSTRAP_FLASH_MSG = {
201 + success: 'alert-success',
202 + error: 'alert-danger',
203 + alert: 'alert-block',
204 + notice: 'alert-info'
205 + }
206 +
207 + def bootstrap_class_for(flash_type)
208 + BOOTSTRAP_FLASH_MSG.fetch(flash_type.to_sym, flash_type.to_s)
199 209 end
210 +
211 + def flash_messages
212 + puts "flahs size = #{flash.count}"
213 + flash.each do |msg_type, message|
214 + concat(content_tag(:div, message, class: "alert #{bootstrap_class_for(msg_type)} fade in") do
215 + concat content_tag(:button, 'x', class: "close", data: { dismiss: 'alert' })
216 + concat message
217 + end)
218 + end
219 + nil
220 + end
221 +
222 + end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -8,8 +8,9
8 8 = content_for :header
9 9 = yield :head
10 10
11 11 %body
12 12 = render 'layouts/header'
13 13
14 - = content_tag(:p,flash[:notice],class: 'alert alert-success') if flash[:notice]!=nil
14 + /= content_tag(:p,flash[:notice],class: 'alert alert-success') if flash[:notice]!=nil
15 + = flash_messages
15 16 = yield
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -3,15 +3,17
3 3
4 4 - if !@hidelogin
5 5 =t 'login.message'
6 6 %br/
7 7 %br/
8 8
9 + - puts flash.inspect
9 10 - if flash[:notice]
10 11 %hr/
11 12 %b= flash[:notice]
13 + %b= haha
12 14 %hr/
13 15
14 16 %div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"}
15 17 = form_tag login_login_path do
16 18 %table
17 19 %tr
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -22,8 +22,8
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.cmp_msg'}", compiler_msg_submission_path(submission.id), {popup: true,remote: true,class: 'btn btn-xs btn-info'}
25 25 = link_to "#{t 'main.src_link'}",{:action => 'source', :id => submission.id}, class: 'btn btn-xs btn-info'
26 26 = link_to "#{t 'main.submissions_link'}", problem_submissions_path(problem_id), class: 'btn btn-xs btn-info'
27 27 - if GraderConfiguration.show_testcase
28 - = link_to "testcases", show_testcase_problem_path(problem_id), class: 'btn btn-xs btn-info'
28 + = link_to "testcases", show_problem_testcases_path(problem_id), class: 'btn btn-xs btn-info'
29 29
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -23,24 +23,28
23 23 %th.text-right Full score
24 24 %th Date added
25 25 %th.text-center
26 26 Avail?
27 27 %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user submits to this problem?' } [?]
28 28 %th.text-center
29 + View Data?
30 + %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user view the testcase of this problem?' } [?]
31 + %th.text-center
29 32 Test?
30 33 %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user uses test interface on this problem?' } [?]
31 34 - if GraderConfiguration.multicontests?
32 35 %th Contests
33 36 - for problem in @problems
34 37 %tr{:class => "#{(problem.available) ? "success" : "danger"}", :id => "prob-#{problem.id}", :name => "prob-#{problem.id}"}
35 38 - @problem=problem
36 39 %td= problem.name #in_place_editor_field :problem, :name, {}, :rows=>1
37 40 %td= problem.full_name #in_place_editor_field :problem, :full_name, {}, :rows=>1
38 41 %td.text-right= problem.full_score #in_place_editor_field :problem, :full_score, {}, :rows=>1
39 42 %td= problem.date_added
40 43 %td= toggle_button(@problem.available?, toggle_problem_path(@problem), "problem-avail-#{@problem.id}")
44 + %td= toggle_button(@problem.view_testcase?, toggle_view_testcase_problem_path(@problem), "problem-view-testcase-#{@problem.id}")
41 45 %td= toggle_button(@problem.test_allowed?, toggle_test_problem_path(@problem), "problem-test-#{@problem.id}")
42 46 - if GraderConfiguration.multicontests?
43 47 %td
44 48 = problem.contests.collect { |c| c.name }.join(', ')
45 49 %td= link_to 'Stat', {:action => 'stat', :id => problem.id}, class: 'btn btn-info btn-xs btn-block'
46 50 %td= link_to 'Show', {:action => 'show', :id => problem}, class: 'btn btn-info btn-xs btn-block'
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -17,27 +17,31
17 17 end
18 18
19 19 resources :problems do
20 20 member do
21 21 get 'toggle'
22 22 get 'toggle_test'
23 + get 'toggle_view_testcase'
23 24 get 'stat'
24 - get 'show_testcase'
25 25 end
26 26 collection do
27 27 get 'turn_all_off'
28 28 get 'turn_all_on'
29 29 get 'import'
30 30 get 'manage'
31 31 end
32 32
33 + end
34 +
33 35 resources :testcases, only: [] do
34 36 member do
35 37 get 'download_input'
36 38 get 'download_sol'
37 39 end
40 + collection do
41 + get 'show_problem/:problem_id(/:test_num)' => 'testcases#show_problem', as: 'show_problem'
38 42 end
39 43 end
40 44
41 45 resources :grader_configuration, controller: 'configurations'
42 46
43 47 resources :users do
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -8,17 +8,17
8 8 # system, you should be using db:schema:load, not running all the migrations
9 9 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
10 10 # you'll amass, the slower it'll run and the greater likelihood for issues).
11 11 #
12 12 # It's strongly recommended that you check this file into your version control system.
13 13
14 - ActiveRecord::Schema.define(version: 20170123162543) do
14 + ActiveRecord::Schema.define(version: 20170124024527) do
15 15
16 16 create_table "announcements", force: :cascade do |t|
17 17 t.string "author", limit: 255
18 - t.text "body", limit: 16777215
18 + t.text "body", limit: 65535
19 19 t.boolean "published"
20 20 t.datetime "created_at", null: false
21 21 t.datetime "updated_at", null: false
22 22 t.boolean "frontpage", default: false
23 23 t.boolean "contest_only", default: false
24 24 t.string "title", limit: 255
@@ -47,25 +47,25
47 47 t.string "name", limit: 255
48 48 t.datetime "created_at", null: false
49 49 t.datetime "updated_at", null: false
50 50 end
51 51
52 52 create_table "descriptions", force: :cascade do |t|
53 - t.text "body", limit: 16777215
53 + t.text "body", limit: 65535
54 54 t.boolean "markdowned"
55 55 t.datetime "created_at", null: false
56 56 t.datetime "updated_at", null: false
57 57 end
58 58
59 59 create_table "grader_configurations", force: :cascade do |t|
60 60 t.string "key", limit: 255
61 61 t.string "value_type", limit: 255
62 62 t.string "value", limit: 255
63 63 t.datetime "created_at", null: false
64 64 t.datetime "updated_at", null: false
65 - t.text "description", limit: 16777215
65 + t.text "description", limit: 65535
66 66 end
67 67
68 68 create_table "grader_processes", force: :cascade do |t|
69 69 t.string "host", limit: 255
70 70 t.integer "pid", limit: 4
71 71 t.string "mode", limit: 255
@@ -104,13 +104,13
104 104 end
105 105
106 106 create_table "messages", force: :cascade do |t|
107 107 t.integer "sender_id", limit: 4
108 108 t.integer "receiver_id", limit: 4
109 109 t.integer "replying_message_id", limit: 4
110 - t.text "body", limit: 16777215
110 + t.text "body", limit: 65535
111 111 t.boolean "replied"
112 112 t.datetime "created_at", null: false
113 113 t.datetime "updated_at", null: false
114 114 end
115 115
116 116 create_table "problems", force: :cascade do |t|
@@ -121,12 +121,13
121 121 t.boolean "available"
122 122 t.string "url", limit: 255
123 123 t.integer "description_id", limit: 4
124 124 t.boolean "test_allowed"
125 125 t.boolean "output_only"
126 126 t.string "description_filename", limit: 255
127 + t.boolean "view_testcase"
127 128 end
128 129
129 130 create_table "rights", force: :cascade do |t|
130 131 t.string "name", limit: 255
131 132 t.string "controller", limit: 255
132 133 t.string "action", limit: 255
@@ -149,13 +150,13
149 150 end
150 151
151 152 add_index "roles_users", ["user_id"], name: "index_roles_users_on_user_id", using: :btree
152 153
153 154 create_table "sessions", force: :cascade do |t|
154 155 t.string "session_id", limit: 255
155 - t.text "data", limit: 16777215
156 + t.text "data", limit: 65535
156 157 t.datetime "updated_at"
157 158 end
158 159
159 160 add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", using: :btree
160 161 add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree
161 162
@@ -177,20 +178,20
177 178 end
178 179
179 180 create_table "submissions", force: :cascade do |t|
180 181 t.integer "user_id", limit: 4
181 182 t.integer "problem_id", limit: 4
182 183 t.integer "language_id", limit: 4
183 - t.text "source", limit: 16777215
184 + t.text "source", limit: 65535
184 185 t.binary "binary", limit: 65535
185 186 t.datetime "submitted_at"
186 187 t.datetime "compiled_at"
187 - t.text "compiler_message", limit: 16777215
188 + t.text "compiler_message", limit: 65535
188 189 t.datetime "graded_at"
189 190 t.integer "points", limit: 4
190 - t.text "grader_comment", limit: 16777215
191 + t.text "grader_comment", limit: 65535
191 192 t.integer "number", limit: 4
192 193 t.string "source_filename", limit: 255
193 194 t.float "max_runtime", limit: 24
194 195 t.integer "peak_memory", limit: 4
195 196 t.integer "effective_code_length", limit: 4
196 197 t.string "ip_address", limit: 255
@@ -205,14 +206,14
205 206 t.integer "status", limit: 4
206 207 t.datetime "updated_at"
207 208 end
208 209
209 210 create_table "test_pairs", force: :cascade do |t|
210 211 t.integer "problem_id", limit: 4
211 - t.text "input", limit: 4294967295
212 - t.text "solution", limit: 4294967295
212 + t.text "input", limit: 16777215
213 + t.text "solution", limit: 16777215
213 214 t.datetime "created_at", null: false
214 215 t.datetime "updated_at", null: false
215 216 end
216 217
217 218 create_table "test_requests", force: :cascade do |t|
218 219 t.integer "user_id", limit: 4
@@ -222,13 +223,13
222 223 t.string "output_file_name", limit: 255
223 224 t.string "running_stat", limit: 255
224 225 t.integer "status", limit: 4
225 226 t.datetime "updated_at", null: false
226 227 t.datetime "submitted_at"
227 228 t.datetime "compiled_at"
228 - t.text "compiler_message", limit: 16777215
229 + t.text "compiler_message", limit: 65535
229 230 t.datetime "graded_at"
230 231 t.string "grader_comment", limit: 255
231 232 t.datetime "created_at", null: false
232 233 t.float "running_time", limit: 24
233 234 t.string "exit_status", limit: 255
234 235 t.integer "memory_usage", limit: 4
@@ -240,14 +241,14
240 241 t.integer "problem_id", limit: 4
241 242 t.integer "num", limit: 4
242 243 t.integer "group", limit: 4
243 244 t.integer "score", limit: 4
244 245 t.text "input", limit: 4294967295
245 246 t.text "sol", limit: 4294967295
246 - t.datetime "created_at", null: false
247 - t.datetime "updated_at", null: false
247 + t.datetime "created_at"
248 + t.datetime "updated_at"
248 249 end
249 250
250 251 add_index "testcases", ["problem_id"], name: "index_testcases_on_problem_id", using: :btree
251 252
252 253 create_table "user_contest_stats", force: :cascade do |t|
253 254 t.integer "user_id", limit: 4
@@ -266,15 +267,15
266 267 t.string "email", limit: 255
267 268 t.integer "site_id", limit: 4
268 269 t.integer "country_id", limit: 4
269 270 t.boolean "activated", default: false
270 271 t.datetime "created_at"
271 272 t.datetime "updated_at"
272 - t.string "section", limit: 255
273 273 t.boolean "enabled", default: true
274 274 t.string "remark", limit: 255
275 275 t.string "last_ip", limit: 255
276 + t.string "section", limit: 255
276 277 end
277 278
278 279 add_index "users", ["login"], name: "index_users_on_login", unique: true, using: :btree
279 280
280 281 end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
deleted file
You need to be logged in to leave comments. Login now