cafe-grader-web Commit - r645:a2d233431d60

cafe-grader-web

Commit `r645:a2d233431d60` public

parent | child

Description:

add rejudge button

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

r645:a2d233431d60 - Fri, 10 Mar 2017 11:55:25 - 8 files changed: 64 inserted, 32 deleted

app/views/submissions/rejudge.js.haml created 644 ¶ +2

@@ -0,0 +1,2
	1	+ :plain
	2	+ $("body").prepend("<div class=\"alert alert-info\"> Submission #{@submission.id}'s task status has been chaned to \"#{@task.status_str}\" </div>")

db/migrate/20170310110146_add_index_to_task.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ class AddIndexToTask < ActiveRecord::Migration
	2	+ def change
	3	+ add_index :tasks, :submission_id
	4	+ end
	5	+ end

app/controllers/submissions_controller.rb ¶ +15 -2

               class SubmissionsController < ApplicationController
-            -   before_filter :authenticate
+            +   before_action :authenticate
-            -   before_filter :submission_authorization, only: [:show, :direct_edit_submission, :download, :edit]
+            +   before_action :submission_authorization, only: [:show, :direct_edit_submission, :download, :edit]
+            +   before_action :admin_authorization, only: [:rejudge]
                 # GET /submissions
                 # GET /submissions.json
                 # Show problem selection and user's submission of that problem
                 def index
                   @user = @current_user
                   @problems = @user.available_problems
                   if params[:problem_id]==nil
                     @problem = nil
                     @submissions = nil
                   else
                     @problem = Problem.find_by_id(params[:problem_id])
                     if (@problem == nil) or (not @problem.available)
                       redirect_to main_list_path
                       flash[:notice] = 'Error: submissions for that problem are not viewable.'
                       return
                     end
                     @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id).order(id: :desc)
                   end
                 end
                 # GET /submissions/1
                 # GET /submissions/1.json
                 def show
                   @submission = Submission.find(params[:id])
                   #log the viewing
                   user = User.find(session[:user_id])
                   SubmissionViewLog.create(user_id: session[:user_id],submission_id: @submission.id) unless user.admin?
+            +
+            +     @task = @submission.task
                 end
                 def download
                   @submission = Submission.find(params[:id])
                   send_data(@submission.source, {:filename => @submission.download_filename, :type => 'text/plain'})
                 end
                 def compiler_msg
                   @submission = Submission.find(params[:id])
                   respond_to do |format|
                     format.js
                   end
                 end
                 #on-site new submission on specific problem
                 def direct_edit_problem
                   @problem = Problem.find(params[:problem_id])
                   @source = ''
                   render 'edit'
                 end
                 # GET /submissions/1/edit
                 def edit
                   @submission = Submission.find(params[:id])
                   @source = @submission.source.to_s
                   @problem = @submission.problem
                   @lang_id = @submission.language.id
                 end
                 def get_latest_submission_status
                   @problem = Problem.find(params[:pid])
                   @submission = Submission.find_last_by_user_and_problem(params[:uid],params[:pid])
                   puts User.find(params[:uid]).login
                   puts Problem.find(params[:pid]).name
                   puts 'nil' unless @submission
                   respond_to do |format|
                     format.js
                   end
                 end
+            +   # GET /submissions/:id/rejudge
+            +   def rejudge
+            +     @submission = Submission.find(params[:id])
+            +     @task = @submission.task
+            +     @task.status_inqueue! if @task
+            +     respond_to do |format|
+            +       format.js
+            +     end
+            +   end
+            +
               protected
                 def submission_authorization
                   #admin always has privileged
                   if @current_user.admin?
                     return true
                   end
                   sub = Submission.find(params[:id])
                   if sub.problem.available?
                     puts "sub = #{sub.user.id}, current = #{@current_user.id}"
                     return true if GraderConfiguration["right.user_view_submission"] or sub.user == @current_user
                   end
                   #default to NO
                   unauthorized_redirect
                   return false
                 end
               end

app/helpers/application_helper.rb ¶ -1

               </table>
               </div>
               TITLEBAR
                   result.html_safe
                 end
                 def markdown(text)
                   markdown = RDiscount.new(text)
                   markdown.to_html.html_safe
                 end
                 BOOTSTRAP_FLASH_MSG = {
                   success: 'alert-success',
                   error: 'alert-danger',
                   alert: 'alert-block',
                   notice: 'alert-info'
                 }
                 def bootstrap_class_for(flash_type)
                   BOOTSTRAP_FLASH_MSG.fetch(flash_type.to_sym, flash_type.to_s)
                 end
                 def flash_messages
-            -     puts "flahs size = #{flash.count}"
                   flash.each do |msg_type, message|
                     concat(content_tag(:div, message, class: "alert #{bootstrap_class_for(msg_type)} fade in") do
                             concat content_tag(:button, 'x', class: "close", data: { dismiss: 'alert' })
                             concat message
                           end)
                   end
                   nil
                 end
               end

app/models/submission.rb ¶ +2

               class Submission < ActiveRecord::Base
                 belongs_to :language
                 belongs_to :problem
                 belongs_to :user
                 before_validation :assign_problem
                 before_validation :assign_language
                 validates_presence_of :source
                 validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'too long'
                 validates_length_of :source, :minimum => 1, :allow_blank => true, :message => 'too short'
                 validate :must_have_valid_problem
                 validate :must_specify_language
+            +   has_one :task
+            +
                 before_save :assign_latest_number_if_new_recond
                 def self.find_last_by_user_and_problem(user_id, problem_id)
                   where("user_id = ? AND problem_id = ?",user_id,problem_id).last
                 end
                 def self.find_all_last_by_problem(problem_id)
                   # need to put in SQL command, maybe there's a better way
                   Submission.includes(:user).find_by_sql("SELECT * FROM submissions " +
               			   "WHERE id = " +
               			   "(SELECT MAX(id) FROM submissions AS subs " +
               			   "WHERE subs.user_id = submissions.user_id AND " +
                                          "problem_id = " + problem_id.to_s + " " +
               			   "GROUP BY user_id) " +
                                          "ORDER BY user_id")
                 end
                 def self.find_in_range_by_user_and_problem(user_id, problem_id,since_id,until_id)
                   records = Submission.where(problem_id: problem_id,user_id: user_id)
                   records = records.where('id >= ?',since_id) if since_id > 0
                   records = records.where('id <= ?',until_id) if until_id > 0
                   records.all
                 end

app/views/submissions/show.html.haml ¶ +8

                         %td #{@submission.points}/#{@submission.problem.full_score}
                       %tr
                         %td.text-right
                           %strong Comment
                         %td #{@submission.grader_comment}
                       %tr
                         %td.text-right
                           %strong Runtime (s)
                         %td #{@submission.max_runtime}
                       %tr
                         %td.text-right
                           %strong Memory (kb)
                         %td #{@submission.peak_memory}
                       %tr
                         %td.text-right
                           %strong Compiler result
                         %td
                           %button.btn.btn-info.btn-xs{type: 'button', data: {toggle: 'modal', target: '#compiler'}}
                             view
                       - if session[:admin]
                         %tr
                           %td.text-right
                             %strong IP
                           %td #{@submission.ip_address}
+            +         %tr
+            +           %td.text-right
+            +             %strong Grading Task Status
+            +           %td
+            +             = @task.status_str if @task
+            +             - if session[:admin]
+            +               = link_to "rejudge", rejudge_submission_path, data: {remote: true}, class: 'btn btn-info btn-xs'
+            +
               .modal.fade#compiler{tabindex: -1,role: 'dialog'}
                 .modal-dialog.modal-lg{role:'document'}
                   .modal-content
                     .modal-header
                       %button.close{type: 'button', data: {dismissed: :modal}, aria: {label: 'close'}}
                         %span{aria: {hidden: 'true'}, data: {dismiss: 'modal'}} &times;
                       %h4 Compiler message
                     .modal-body
                       %pre#compiler_msg= @submission.compiler_message
                     .modal-footer
                       %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close

config/routes.rb ¶ +1

                 resources :testcases, only: [] do
                   member do
                     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
                   member do
                     get 'toggle_activate', 'toggle_enable'
                     get 'stat'
                   end
                 end
                 resources :submissions do
                   member do
                     get 'download'
                     get 'compiler_msg'
+            +       get 'rejudge'
                   end
                   collection do
                     get 'prob/:problem_id', to: 'submissions#index', as: 'problem'
                     get 'direct_edit_problem/:problem_id', to: 'submissions#direct_edit_problem', as: 'direct_edit_problem'
                     get 'get_latest_submission_status/:uid/:pid', to: 'submissions#get_latest_submission_status', as: 'get_latest_submission_status'
                   end
                 end
                 #main
                 get "main/list"
                 get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
                 #user admin
                 get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin'
                 #report
                 get 'report/current_score', to: 'report#current_score', as: 'report_current_score'
                 get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
                 get "report/login"
                 get 'report/max_score', to: 'report#max_score', as: 'report_max_score'
                 post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score'

db/schema.rb ¶ +31 -29

               # encoding: UTF-8
               # This file is auto-generated from the current state of the database. Instead
               # of editing this file, please use the migrations feature of Active Record to
               # incrementally modify your database, and then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your
               # database schema. If you need to create the application database on another
               # 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: 20170124024527) do
+            + ActiveRecord::Schema.define(version: 20170310110146) 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.boolean  "enabled"
                   t.datetime "created_at",             null: false
                   t.datetime "updated_at",             null: false
                   t.string   "name",       limit: 255
                 end
                 create_table "contests_problems", id: false, force: :cascade do |t|
                   t.integer "contest_id", limit: 4
                   t.integer "problem_id", limit: 4
                 end
                 create_table "contests_users", id: false, force: :cascade do |t|
                   t.integer "contest_id", limit: 4
                   t.integer "user_id",    limit: 4
                 end
                 create_table "countries", force: :cascade do |t|
                   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
                   t.boolean  "active"
                   t.datetime "created_at",             null: false
                   t.datetime "updated_at",             null: false
                   t.integer  "task_id",    limit: 4
                   t.string   "task_type",  limit: 255
                   t.boolean  "terminated"
                 end
                 add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_ip_and_pid", using: :btree
                 create_table "heart_beats", force: :cascade do |t|
                   t.integer  "user_id",    limit: 4
                   t.string   "ip_address", limit: 255
                   t.datetime "created_at",             null: false
                   t.datetime "updated_at",             null: false
                   t.string   "status",     limit: 255
                 end
                 add_index "heart_beats", ["updated_at"], name: "index_heart_beats_on_updated_at", using: :btree
                 create_table "languages", force: :cascade do |t|
                   t.string "name",        limit: 10
                   t.string "pretty_name", limit: 255
                   t.string "ext",         limit: 10
                   t.string "common_ext",  limit: 255
                 end
                 create_table "logins", force: :cascade do |t|
                   t.integer  "user_id",    limit: 4
                   t.string   "ip_address", limit: 255
                   t.datetime "created_at",             null: false
                   t.datetime "updated_at",             null: false
                 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.date    "date_added"
                   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
                 create_table "rights_roles", id: false, force: :cascade do |t|
                   t.integer "right_id", limit: 4
                   t.integer "role_id",  limit: 4
                 end
                 add_index "rights_roles", ["role_id"], name: "index_rights_roles_on_role_id", using: :btree
                 create_table "roles", force: :cascade do |t|
                   t.string "name", limit: 255
                 end
                 create_table "roles_users", id: false, force: :cascade do |t|
                   t.integer "role_id", limit: 4
                   t.integer "user_id", limit: 4
                 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
                 create_table "sites", force: :cascade do |t|
                   t.string   "name",       limit: 255
                   t.boolean  "started"
                   t.datetime "start_time"
                   t.datetime "created_at",             null: false
                   t.datetime "updated_at",             null: false
                   t.integer  "country_id", limit: 4
                   t.string   "password",   limit: 255
                 end
                 create_table "submission_view_logs", force: :cascade do |t|
                   t.integer  "user_id",       limit: 4
                   t.integer  "submission_id", limit: 4
                   t.datetime "created_at",              null: false
                   t.datetime "updated_at",              null: false
                 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
                 end
                 add_index "submissions", ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true, using: :btree
                 add_index "submissions", ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id", using: :btree
                 create_table "tasks", force: :cascade do |t|
                   t.integer  "submission_id", limit: 4
                   t.datetime "created_at"
                   t.integer  "status",        limit: 4
                   t.datetime "updated_at"
                 end
+            +   add_index "tasks", ["submission_id"], name: "index_tasks_on_submission_id", using: :btree
+            +
                 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
                 create_table "testcases", force: :cascade do |t|
                   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.datetime "started_at"
                   t.datetime "created_at",              null: false
                   t.datetime "updated_at",              null: false
                   t.boolean  "forced_logout"
                 end
                 create_table "users", force: :cascade do |t|
                   t.string   "login",           limit: 50
                   t.string   "full_name",       limit: 255
                   t.string   "hashed_password", limit: 255
                   t.string   "salt",            limit: 5
                   t.string   "alias",           limit: 255
                   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

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

r645:a2d233431d60 - Fri, 10 Mar 2017 11:55:25 - 8 files changed: 64 inserted, 32 deleted

Sign in to your account

Commit r645:a2d233431d60 public

Author

r645:a2d233431d60 - Fri, 10 Mar 2017 11:55:25 - 8 files changed: 64 inserted, 32 deleted

Commit `r645:a2d233431d60` public