cafe-grader-web Commit - r632:b4dd5e5f23ab

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:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r632:b4dd5e5f23ab - Tue, 24 Jan 2017 04:59:16 - 14 files changed: 130 inserted, 71 deleted

app/views/problems/toggle_view_testcase.js.haml created 644 ¶ +2

@@ -0,0 +1,2
	1	+ = render partial: 'toggle_button',
	2	+ locals: {button_id: "#problem-view-testcase-#{@problem.id}",button_on: @problem.view_testcase?}

app/views/testcases/show_problem.html.haml created 644 ¶ +25

@@ -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

db/migrate/20170124024527_add_view_testcase_to_problem.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ class AddViewTestcaseToProblem < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :problems, :view_testcase, :bool
	4	+ end
	5	+ end

app/controllers/application_controller.rb ¶ +10 -5

                     return false
                   end
                 end
                 def testcase_authorization
                   #admin always has privileged
+            +     puts "haha"
                   if @current_user.admin?
                     return true
                   end
-            -     unauthorized_redirect if GraderConfiguration["right.view_testcase"]
+            +     puts "hehe"
+            +     puts GraderConfiguration["right.view_testcase"]
+            +     unauthorized_redirect unless GraderConfiguration["right.view_testcase"]
                 end
                 protected
                 def authenticate
                   unless session[:user_id]
                   end
                   return true
                 end
                 def authorization
                   return false unless authenticate
+            +     puts "haha 1"
                   user = User.find(session[:user_id])
                   unless user.roles.detect { |role|
-            - 	role.rights.detect{ |right|
+            +         role.rights.detect{ |right|
-            - 	  right.controller == self.class.controller_name and
+            +           right.controller == self.class.controller_name and
-            -           (right.action == 'all' or right.action == action_name)
+            +             (right.action == 'all' or right.action == action_name)
-            - 	}
+            +         }
                     }
+            +       puts "haha 2"
                     flash[:notice] = 'You are not authorized to view the page you requested'
                     #request.env['HTTP_REFERER'] ? (redirect_to :back) : (redirect_to :controller => 'login')
                     redirect_to :controller => 'main', :action => 'login'
                     return false
                   end
                 end

app/controllers/problems_controller.rb ¶ +8 -4

                   @problem.update_attributes(test_allowed: !(@problem.test_allowed?) )
                   respond_to do |format|
                     format.js { }
                   end
                 end
+            +   def toggle_view_testcase
+            +     @problem = Problem.find(params[:id])
+            +     @problem.update_attributes(view_testcase: !(@problem.view_testcase?) )
+            +     respond_to do |format|
+            +       format.js { }
+            +     end
+            +   end
+            +
                 def turn_all_off
                   Problem.available.all.each do |problem|
                     problem.available = false
                     problem.save
                   end
                   redirect_to action: :index
                   if problem!=nil and contest!=nil
                     problem.contests.delete(contest)
                   end
                   redirect_to :action => 'manage'
                 end
-            -   def show_testcase
-            -     @problem = Problem.includes(:testcases).find(params[:id])
-            -   end
                 ##################################
                 protected
                 def allow_test_pair_import?
                   if defined? ALLOW_TEST_PAIR_IMPORT
                     return ALLOW_TEST_PAIR_IMPORT

app/controllers/testcases_controller.rb ¶ +8

                 end
                 def download_sol
                   send_data @testcase.sol, type: 'text/plain', filename: "#{@testcase.problem.name}.#{@testcase.num}.sol"
                 end
+            +   def show_problem
+            +     @problem = Problem.includes(:testcases).find(params[:problem_id])
+            +     unless @current_user.admin? or @problem.view_testcase
+            +       flash[:error] = 'You cannot view the testcase of this problem'
+            +       redirect_to :controller => 'main', :action => 'list'
+            +     end
+            +   end
+            +
                 private
                   # Use callbacks to share common setup or constraints between actions.
                   def set_testcase
                     @testcase = Testcase.find(params[:id])
                   end

app/helpers/application_helper.rb ¶ +23

@@ -193,7 +193,30
193		193
194	def markdown(text)	194	def markdown(text)
195	markdown = RDiscount.new(text)	195	markdown = RDiscount.new(text)
196	markdown.to_html.html_safe	196	markdown.to_html.html_safe
197	end	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)
		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	+
199	end	222	end

app/views/layouts/application.html.haml ¶ +2 -1

                 = content_for :header
                 = yield :head
               %body
                 = render 'layouts/header'
-            -   = content_tag(:p,flash[:notice],class: 'alert alert-success') if flash[:notice]!=nil
+            +   /= content_tag(:p,flash[:notice],class: 'alert alert-success') if flash[:notice]!=nil
+            +   = flash_messages
                 = yield

app/views/main/_login_box.html.haml ¶ +2

               - if !@hidelogin
                 =t 'login.message'
                 %br/
                 %br/
+            +   - puts flash.inspect
                 - if flash[:notice]
                   %hr/
                   %b= flash[:notice]
+            +     %b= haha
                   %hr/
                 %div{ :style => "border: solid 1px gray; padding: 4px; background: #eeeeff;"}
                   = form_tag login_login_path do
                     %table
                       %tr

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

                     = 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.cmp_msg'}", compiler_msg_submission_path(submission.id), {popup: true,remote: 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'
                 - if GraderConfiguration.show_testcase
-            -     = link_to "testcases", show_testcase_problem_path(problem_id), class: 'btn btn-xs btn-info'
+            +     = link_to "testcases", show_problem_testcases_path(problem_id), class: 'btn btn-xs btn-info'

app/views/problems/index.html.haml ¶ +4

                   %th.text-right Full score
                   %th Date added
                   %th.text-center
                     Avail?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user submits to this problem?' } [?]
                   %th.text-center
+            +       View Data?
+            +       %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user view the testcase of this problem?' } [?]
+            +     %th.text-center
                     Test?
                     %sup{class: 'text-primary',data: {toggle: 'tooltip'}, title: 'Let user uses test interface on this problem?' } [?]
                   - if GraderConfiguration.multicontests?
                     %th Contests
                 - for problem in @problems
                   %tr{:class => "#{(problem.available) ? "success" : "danger"}", :id => "prob-#{problem.id}", :name => "prob-#{problem.id}"}
                     - @problem=problem
                     %td= problem.name #in_place_editor_field :problem, :name, {}, :rows=>1
                     %td= problem.full_name #in_place_editor_field :problem, :full_name, {}, :rows=>1
                     %td.text-right= problem.full_score #in_place_editor_field :problem, :full_score, {}, :rows=>1
                     %td= problem.date_added
                     %td= toggle_button(@problem.available?, toggle_problem_path(@problem), "problem-avail-#{@problem.id}")
+            +       %td= toggle_button(@problem.view_testcase?, toggle_view_testcase_problem_path(@problem), "problem-view-testcase-#{@problem.id}")
                     %td= toggle_button(@problem.test_allowed?, toggle_test_problem_path(@problem), "problem-test-#{@problem.id}")
                     - if GraderConfiguration.multicontests?
                       %td
                         = problem.contests.collect { |c| c.name }.join(', ')
                     %td= link_to 'Stat', {:action => 'stat', :id => problem.id}, class: 'btn btn-info btn-xs btn-block'
                     %td= link_to 'Show', {:action => 'show', :id => problem}, class: 'btn btn-info btn-xs btn-block'

config/routes.rb ¶ +10 -6

                 end
                 resources :problems do
                   member do
                     get 'toggle'
                     get 'toggle_test'
+            +       get 'toggle_view_testcase'
                     get 'stat'
-            -       get 'show_testcase'
                   end
                   collection do
                     get 'turn_all_off'
                     get 'turn_all_on'
                     get 'import'
                     get 'manage'
                   end
-            -     resources :testcases, only: [] do
+            +   end
-            -       member do
-            -         get 'download_input'
+            +   resources :testcases, only: [] do
-            -         get 'download_sol'
+            +     member do
-            -       end
+            +       get 'download_input'
+            +       get 'download_sol'
+            +     end
+            +     collection do
+            +       get 'show_problem/:problem_id(/:test_num)' => 'testcases#show_problem', as: 'show_problem'
                   end
                 end
                 resources :grader_configuration, controller: 'configurations'
                 resources :users do

db/schema.rb ¶ +30 -29

               # system, you should be using db:schema:load, not running all the migrations
               # from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended that you check this file into your version control system.
-            - ActiveRecord::Schema.define(version: 20170123162543) do
+            + ActiveRecord::Schema.define(version: 20170124024527) do
                 create_table "announcements", force: :cascade do |t|
                   t.string   "author",       limit: 255
-            -     t.text     "body",         limit: 16777215
+            +     t.text     "body",         limit: 65535
                   t.boolean  "published"
-            -     t.datetime "created_at",                                    null: false
+            +     t.datetime "created_at",                                 null: false
-            -     t.datetime "updated_at",                                    null: false
+            +     t.datetime "updated_at",                                 null: false
-            -     t.boolean  "frontpage",                     default: false
+            +     t.boolean  "frontpage",                  default: false
-            -     t.boolean  "contest_only",                  default: false
+            +     t.boolean  "contest_only",               default: false
                   t.string   "title",        limit: 255
                   t.string   "notes",        limit: 255
                 end
                 create_table "contests", force: :cascade do |t|
                   t.string   "title",      limit: 255
                   t.string   "name",       limit: 255
                   t.datetime "created_at",             null: false
                   t.datetime "updated_at",             null: false
                 end
                 create_table "descriptions", force: :cascade do |t|
-            -     t.text     "body",       limit: 16777215
+            +     t.text     "body",       limit: 65535
                   t.boolean  "markdowned"
-            -     t.datetime "created_at",                  null: false
+            +     t.datetime "created_at",               null: false
-            -     t.datetime "updated_at",                  null: false
+            +     t.datetime "updated_at",               null: false
                 end
                 create_table "grader_configurations", force: :cascade do |t|
                   t.string   "key",         limit: 255
                   t.string   "value_type",  limit: 255
                   t.string   "value",       limit: 255
-            -     t.datetime "created_at",                   null: false
+            +     t.datetime "created_at",                null: false
-            -     t.datetime "updated_at",                   null: false
+            +     t.datetime "updated_at",                null: false
-            -     t.text     "description", limit: 16777215
+            +     t.text     "description", limit: 65535
                 end
                 create_table "grader_processes", force: :cascade do |t|
                   t.string   "host",       limit: 255
                   t.integer  "pid",        limit: 4
                   t.string   "mode",       limit: 255
                 end
                 create_table "messages", force: :cascade do |t|
                   t.integer  "sender_id",           limit: 4
                   t.integer  "receiver_id",         limit: 4
                   t.integer  "replying_message_id", limit: 4
-            -     t.text     "body",                limit: 16777215
+            +     t.text     "body",                limit: 65535
                   t.boolean  "replied"
-            -     t.datetime "created_at",                           null: false
+            +     t.datetime "created_at",                        null: false
-            -     t.datetime "updated_at",                           null: false
+            +     t.datetime "updated_at",                        null: false
                 end
                 create_table "problems", force: :cascade do |t|
                   t.string  "name",                 limit: 30
                   t.string  "full_name",            limit: 255
                   t.integer "full_score",           limit: 4
                   t.boolean "available"
                   t.string  "url",                  limit: 255
                   t.integer "description_id",       limit: 4
                   t.boolean "test_allowed"
                   t.boolean "output_only"
                   t.string  "description_filename", limit: 255
+            +     t.boolean "view_testcase"
                 end
                 create_table "rights", force: :cascade do |t|
                   t.string "name",       limit: 255
                   t.string "controller", limit: 255
                   t.string "action",     limit: 255
                 end
                 add_index "roles_users", ["user_id"], name: "index_roles_users_on_user_id", using: :btree
                 create_table "sessions", force: :cascade do |t|
                   t.string   "session_id", limit: 255
-            -     t.text     "data",       limit: 16777215
+            +     t.text     "data",       limit: 65535
                   t.datetime "updated_at"
                 end
                 add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", using: :btree
                 add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree
                 end
                 create_table "submissions", force: :cascade do |t|
                   t.integer  "user_id",               limit: 4
                   t.integer  "problem_id",            limit: 4
                   t.integer  "language_id",           limit: 4
-            -     t.text     "source",                limit: 16777215
+            +     t.text     "source",                limit: 65535
                   t.binary   "binary",                limit: 65535
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message",      limit: 16777215
+            +     t.text     "compiler_message",      limit: 65535
                   t.datetime "graded_at"
                   t.integer  "points",                limit: 4
-            -     t.text     "grader_comment",        limit: 16777215
+            +     t.text     "grader_comment",        limit: 65535
                   t.integer  "number",                limit: 4
                   t.string   "source_filename",       limit: 255
                   t.float    "max_runtime",           limit: 24
                   t.integer  "peak_memory",           limit: 4
                   t.integer  "effective_code_length", limit: 4
                   t.string   "ip_address",            limit: 255
                   t.integer  "status",        limit: 4
                   t.datetime "updated_at"
                 end
                 create_table "test_pairs", force: :cascade do |t|
                   t.integer  "problem_id", limit: 4
-            -     t.text     "input",      limit: 4294967295
+            +     t.text     "input",      limit: 16777215
-            -     t.text     "solution",   limit: 4294967295
+            +     t.text     "solution",   limit: 16777215
-            -     t.datetime "created_at",                    null: false
+            +     t.datetime "created_at",                  null: false
-            -     t.datetime "updated_at",                    null: false
+            +     t.datetime "updated_at",                  null: false
                 end
                 create_table "test_requests", force: :cascade do |t|
                   t.integer  "user_id",          limit: 4
                   t.integer  "problem_id",       limit: 4
                   t.integer  "submission_id",    limit: 4
                   t.string   "input_file_name",  limit: 255
                   t.string   "output_file_name", limit: 255
                   t.string   "running_stat",     limit: 255
                   t.integer  "status",           limit: 4
-            -     t.datetime "updated_at",                        null: false
+            +     t.datetime "updated_at",                     null: false
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message", limit: 16777215
+            +     t.text     "compiler_message", limit: 65535
                   t.datetime "graded_at"
                   t.string   "grader_comment",   limit: 255
-            -     t.datetime "created_at",                        null: false
+            +     t.datetime "created_at",                     null: false
                   t.float    "running_time",     limit: 24
                   t.string   "exit_status",      limit: 255
                   t.integer  "memory_usage",     limit: 4
                 end
                 add_index "test_requests", ["user_id", "problem_id"], name: "index_test_requests_on_user_id_and_problem_id", using: :btree
                   t.integer  "problem_id", limit: 4
                   t.integer  "num",        limit: 4
                   t.integer  "group",      limit: 4
                   t.integer  "score",      limit: 4
                   t.text     "input",      limit: 4294967295
                   t.text     "sol",        limit: 4294967295
-            -     t.datetime "created_at",                    null: false
+            +     t.datetime "created_at"
-            -     t.datetime "updated_at",                    null: false
+            +     t.datetime "updated_at"
                 end
                 add_index "testcases", ["problem_id"], name: "index_testcases_on_problem_id", using: :btree
                 create_table "user_contest_stats", force: :cascade do |t|
                   t.integer  "user_id",       limit: 4
                   t.string   "email",           limit: 255
                   t.integer  "site_id",         limit: 4
                   t.integer  "country_id",      limit: 4
                   t.boolean  "activated",                   default: false
                   t.datetime "created_at"
                   t.datetime "updated_at"
-            -     t.string   "section",         limit: 255
                   t.boolean  "enabled",                     default: true
                   t.string   "remark",          limit: 255
                   t.string   "last_ip",         limit: 255
+            +     t.string   "section",         limit: 255
                 end
                 add_index "users", ["login"], name: "index_users_on_login", unique: true, using: :btree
               end

app/views/problems/show_testcase.html.haml removed ¶ -25

deleted file

Write
Preview

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

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	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

Sign in to your account

Author

r632:b4dd5e5f23ab - Tue, 24 Jan 2017 04:59:16 - 14 files changed: 130 inserted, 71 deleted

Sign in to your account

Commit r632:b4dd5e5f23ab public

Author

r632:b4dd5e5f23ab - Tue, 24 Jan 2017 04:59:16 - 14 files changed: 130 inserted, 71 deleted

Commit `r632:b4dd5e5f23ab` public