cafe-grader-web Commit - r631:79a5d1c218ba

cafe-grader-web

Commit `r631:79a5d1c218ba` public

parent | child

Description:

- change testcase data to longtext by limit size - fix bug in new submission

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

r631:79a5d1c218ba - Tue, 24 Jan 2017 01:24:29 - 4 files changed: 30 inserted, 24 deleted

db/migrate/20170123162543_change_testcase_size.rb created 644 ¶ +6

@@ -0,0 +1,6
	1	+ class ChangeTestcaseSize < ActiveRecord::Migration
	2	+ def change
	3	+ change_column :testcases, :input, :text, :limit => 4294967295
	4	+ change_column :testcases, :sol, :text, :limit => 4294967295
	5	+ end
	6	+ end

app/controllers/heartbeat_controller.rb ¶ +6 -6

               class HeartbeatController < ApplicationController
                 before_filter :admin_authorization, :only => ['index']
                 def edit
-            -     @user = User.find_by_login(params[:id])
+            +     #@user = User.find_by_login(params[:id])
-            -     unless @user
+            +     #unless @user
-            -       render text: "LOGIN_NOT_FOUND"
+            +     #  render text: "LOGIN_NOT_FOUND"
-            -       return
+            +     #  return
-            -     end
+            +     #end
                   #hb = HeartBeat.where(user_id: @user.id, ip_address: request.remote_ip).first
                   #puts "status = #{params[:status]}"
                   #if hb
                   #  if params[:status]
                   #    hb.status = params[:status]
                   #    hb.save
                   #  end
                   #  hb.touch
                   #else
                   #  HeartBeat.creae(user_id: @user.id, ip_address: request.remote_ip)
                   #end
-            -     HeartBeat.create(user_id: @user.id, ip_address: request.remote_ip, status: params[:status])
+            +     #HeartBeat.create(user_id: @user.id, ip_address: request.remote_ip, status: params[:status])
                   render text: (GraderConfiguration['right.heartbeat_response'] || 'OK')
                 end
                 def index
                   @hb = HeartBeat.where("updated_at >= ?",Time.zone.now-2.hours).includes(:user).order(:user_id).all
                   @num = HeartBeat.where("updated_at >= ?",Time.zone.now-5.minutes).count(:user_id,distinct: true)
                 end
               end

app/views/submissions/edit.html.haml ¶ +1 -1

                         = label_tag "Task:"
                         = text_field_tag 'asdf', "#{@problem.long_name}", class: 'form-control', disabled: true
                       .form-group
                         = label_tag 'Language'
                         = select_tag 'language_id', options_from_collection_for_select(Language.all, 'id', 'pretty_name', @lang_id || Language.find_by_pretty_name("Python").id || Language.first.id), class: 'form-control select', style: "width: 100px"
                       .form-group
                         = submit_tag 'Submit', class: 'btn btn-success', id: 'live_submit',
                           data: {confirm: "Submitting this source code for task #{@problem.long_name}?"}
                     .panel.panel-info
                       .panel-heading
                         Latest Submission Status
-            -           = link_to "Refresh",get_latest_submission_status_submissions_path(@submission.user,@problem), class: "btn btn-default btn-sm", remote: true
+            +           = link_to "Refresh",get_latest_submission_status_submissions_path(@submission.user,@problem), class: "btn btn-default btn-sm", remote: true if @submission
                       .panel-body
                         - if @submission
                           = render :partial => 'submission_short',
                             :locals => {submission: @submission, problem_name: @problem.name, problem_id: @problem.id }
                 .row
                   .col-md-12
                     %h2 Console
                     %textarea#console{style: 'height: 100%; width: 100%;background-color:#000;color:#fff;font-family: consolas, monaco, "Droid Sans Mono";',rows: 20}
               :javascript
                 $(document).ready(function() {
                   e = ace.edit("editor")

db/schema.rb ¶ +17 -17

               # 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: 20161031063337) do
+            + ActiveRecord::Schema.define(version: 20170123162543) do
                 create_table "announcements", force: :cascade do |t|
                   t.string   "author",       limit: 255
-            -     t.text     "body",         limit: 65535
+            +     t.text     "body",         limit: 16777215
                   t.boolean  "published"
                   t.datetime "created_at",                                    null: false
                   t.datetime "updated_at",                                    null: false
                   t.boolean  "frontpage",                     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"
                 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: 65535
+            +     t.text     "body",       limit: 16777215
                   t.boolean  "markdowned"
                   t.datetime "created_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 "updated_at",                   null: false
-            -     t.text     "description", limit: 65535
+            +     t.text     "description", limit: 16777215
                 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"
                 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: 65535
+            +     t.text     "body",                limit: 16777215
                   t.boolean  "replied"
                   t.datetime "created_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.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: 65535
+            +     t.text     "data",       limit: 16777215
                   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
                 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: 65535
+            +     t.text     "source",                limit: 16777215
                   t.binary   "binary",                limit: 65535
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message",      limit: 65535
+            +     t.text     "compiler_message",      limit: 16777215
                   t.datetime "graded_at"
                   t.integer  "points",                limit: 4
-            -     t.text     "grader_comment",        limit: 65535
+            +     t.text     "grader_comment",        limit: 16777215
                   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
                 create_table "test_pairs", force: :cascade do |t|
                   t.integer  "problem_id", limit: 4
-            -     t.text     "input",      limit: 16777215
+            +     t.text     "input",      limit: 4294967295
-            -     t.text     "solution",   limit: 16777215
+            +     t.text     "solution",   limit: 4294967295
                   t.datetime "created_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 "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message", limit: 65535
+            +     t.text     "compiler_message", limit: 16777215
                   t.datetime "graded_at"
                   t.string   "grader_comment",   limit: 255
                   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: 65535
+            +     t.text     "input",      limit: 4294967295
-            -     t.text     "sol",        limit: 65535
+            +     t.text     "sol",        limit: 4294967295
-            -     t.datetime "created_at"
+            +     t.datetime "created_at",                    null: false
-            -     t.datetime "updated_at"
+            +     t.datetime "updated_at",                    null: false
                 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

r631:79a5d1c218ba - Tue, 24 Jan 2017 01:24:29 - 4 files changed: 30 inserted, 24 deleted

Sign in to your account

Commit r631:79a5d1c218ba public

Author

r631:79a5d1c218ba - Tue, 24 Jan 2017 01:24:29 - 4 files changed: 30 inserted, 24 deleted

Commit `r631:79a5d1c218ba` public