cafe-grader-web Commit - r621:3b5645cfc80e

cafe-grader-web

Commit `r621:3b5645cfc80e` public

parent | child

Description:

fix compiler message add testing database

Commit status:

[Not Reviewed]

References:

toRails40

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r621:3b5645cfc80e - Mon, 26 Dec 2016 05:09:45 - 9 files changed: 125 inserted, 106 deleted

Gemfile ¶ +2 -1

               gem 'select2-rails'
               # Bundle edge Rails instead:
               # gem 'rails', :git => 'git://github.com/rails/rails.git'
               gem 'mysql2'
+            + gem 'sqlite3'
               # Gems used only for assets and not required
               # in production environments by default.
               group :assets do
                 gem 'sass-rails'
                 gem 'coffee-rails'
               #in-place editor
               gem 'best_in_place', '~> 3.0.1'
               # jquery addition
               gem 'jquery-rails'
-            - gem 'jquery-ui-sass-rails'
+            + gem 'jquery-ui-rails'
               gem 'jquery-timepicker-addon-rails'
               gem 'jquery-tablesorter'
               gem 'jquery-countdown-rails'
               #syntax highlighter
               gem 'rouge'

Gemfile.lock ¶ +3 -5

                     railties (>= 3.2, < 6)
                   jquery-timepicker-addon-rails (1.4.1)
                     railties (>= 3.1)
                   jquery-ui-rails (4.0.3)
                     jquery-rails
                     railties (>= 3.1.0)
-            -     jquery-ui-sass-rails (4.0.3.0)
-            -       jquery-rails
-            -       jquery-ui-rails (= 4.0.3)
-            -       railties (>= 3.1.0)
                   json (1.8.3)
                   loofah (2.0.3)
                     nokogiri (>= 1.5.9)
                   mail (2.6.4)
                     mime-types (>= 1.16, < 4)
                   mime-types (3.1)
                     concurrent-ruby (~> 1.0)
                     rack (> 1, < 3)
                   sprockets-rails (3.2.0)
                     actionpack (>= 4.0)
                     activesupport (>= 4.0)
                     sprockets (>= 3.0.0)
+            +     sqlite3 (1.3.12)
                   test-unit (3.2.3)
                     power_assert
                   thor (0.19.4)
                   thread_safe (0.3.5)
                   tilt (2.0.5)
                   tzinfo (1.2.2)
                 haml-rails
                 in_place_editing
                 jquery-countdown-rails
                 jquery-rails
                 jquery-tablesorter
                 jquery-timepicker-addon-rails
-            -   jquery-ui-sass-rails
+            +   jquery-ui-rails
                 mail
                 momentjs-rails
                 mysql2
                 rails (~> 4.2.0)
                 rails_bootstrap_sortable
                 rdiscount
                 rouge
                 rspec-rails
                 sass-rails
                 select2-rails
+            +   sqlite3
                 test-unit
                 uglifier
                 verification!
                 will_paginate (~> 3.0.7)
               BUNDLED WITH

app/controllers/submissions_controller.rb ¶ +14 -1

               class SubmissionsController < ApplicationController
                 before_filter :authenticate
-            -   before_filter :submission_authorization, only: [:show, :direct_edit_submission]
+            +   before_filter :submission_authorization, only: [:show, :direct_edit_submission, :download]
                 # GET /submissions
                 # GET /submissions.json
                 # Show problem selection and user's submission of that problem
                 def index
                   @user = @current_user
                   #log the viewing
                   user = User.find(session[:user_id])
                   SubmissionViewLog.create(user_id: session[:user_id],submission_id: @submission.id) unless user.admin?
                 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
                     format.js
                   end
                 end
               protected
+            +
                 def submission_authorization
                   #admin always has privileged
                   if @current_user.admin?
                     return true
                   end

app/views/application/_submission_short.html.haml ¶ +10 -10

                 = "-"
               - else
                 - unless submission.graded_at
                   = t 'main.submitted_at'
                   = format_short_time(submission.submitted_at.localtime)
                 - else
-            -     = t 'main.graded_at'
+            +     %strong= t 'main.graded_at'
-            -     = "#{format_short_time(submission.graded_at.localtime)}, "
+            +     = "#{format_short_time(submission.graded_at.localtime)} "
+            +     %br
                   - if GraderConfiguration['ui.show_score']
-            -       = t 'main.score'
+            +       %strong=t 'main.score'
                     = "#{(submission.points*100/submission.problem.full_score).to_i} "
                   = " ["
                   %tt
                     = submission.grader_comment
                   = "]"
+            +     %br
+            +     %strong View:
                   - if GraderConfiguration.show_grading_result
-            -       = " | "
                     = 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'}]", {:action => 'compiler_msg', :id => submission.id}, {:popup => true})
+            +   = link_to "#{t 'main.src_link'}", download_submission_path(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'
-            -   = link_to("[#{t 'main.src_link'}]",{:action => 'source', :id => submission.id})
-            -   //= " | "
-            -   //= link_to "[#{t 'main.submissions_link'}]", main_submission_path(submission.problem.id)

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

                     = submission.grader_comment
                   = "]"
                   %br
                   %strong View:
                   - if GraderConfiguration.show_grading_result
                     = 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'}", {: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'

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

                       .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
                       .panel-body
                         - if @submission
                           = render :partial => 'submission_short',
-            -               :locals => {:submission => @submission, :problem_name => @problem.name }
+            +               :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

app/views/submissions/show.html.haml ¶ +7 -6

                       %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}
+            +
               .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= @submission.compiler_message
+            +         %pre#compiler_msg= @submission.compiler_message
                     .modal-footer
                       %button.btn.btn-default{type: 'button', data: {dismiss: 'modal'}} Close
-            -         - if session[:admin]
-            -           %tr
-            -             %td.text-right
-            -               %strong IP
-            -             %td #{@submission.ip_address}

config/routes.rb ¶ +4

                     get 'toggle_activate', 'toggle_enable'
                     get 'stat'
                   end
                 end
                 resources :submissions do
+            +     member do
+            +       get 'download'
+            +       get 'compiler_msg'
+            +     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

db/schema.rb ¶ +81 -81

               # 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 to check this file into your version control system.
+            + # It's strongly recommended that you check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 20161031063337) do
+            + ActiveRecord::Schema.define(version: 20161031063337) do
-            -   create_table "announcements", :force => true do |t|
+            +   create_table "announcements", force: :cascade do |t|
                   t.string   "author"
                   t.text     "body"
                   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"
                   t.string   "notes"
                 end
-            -   create_table "contests", :force => true do |t|
+            +   create_table "contests", force: :cascade do |t|
                   t.string   "title"
                   t.boolean  "enabled"
-            -     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.string   "name"
                 end
-            -   create_table "contests_problems", :id => false, :force => true do |t|
+            +   create_table "contests_problems", id: false, force: :cascade do |t|
                   t.integer "contest_id"
                   t.integer "problem_id"
                 end
-            -   create_table "contests_users", :id => false, :force => true do |t|
+            +   create_table "contests_users", id: false, force: :cascade do |t|
                   t.integer "contest_id"
                   t.integer "user_id"
                 end
-            -   create_table "countries", :force => true do |t|
+            +   create_table "countries", force: :cascade do |t|
                   t.string   "name"
-            -     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 "descriptions", :force => true do |t|
+            +   create_table "descriptions", force: :cascade do |t|
                   t.text     "body"
                   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 => true do |t|
+            +   create_table "grader_configurations", force: :cascade do |t|
                   t.string   "key"
                   t.string   "value_type"
                   t.string   "value"
-            -     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"
                 end
-            -   create_table "grader_processes", :force => true do |t|
+            +   create_table "grader_processes", force: :cascade do |t|
                   t.string   "host"
                   t.integer  "pid"
                   t.string   "mode"
                   t.boolean  "active"
-            -     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.integer  "task_id"
                   t.string   "task_type"
                   t.boolean  "terminated"
                 end
-            -   add_index "grader_processes", ["host", "pid"], :name => "index_grader_processes_on_ip_and_pid"
+            +   add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_ip_and_pid"
-            -   create_table "heart_beats", :force => true do |t|
+            +   create_table "heart_beats", force: :cascade do |t|
                   t.integer  "user_id"
                   t.string   "ip_address"
-            -     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.string   "status"
                 end
-            -   add_index "heart_beats", ["updated_at"], :name => "index_heart_beats_on_updated_at"
+            +   add_index "heart_beats", ["updated_at"], name: "index_heart_beats_on_updated_at"
-            -   create_table "languages", :force => true do |t|
+            +   create_table "languages", force: :cascade do |t|
-            -     t.string "name",        :limit => 10
+            +     t.string "name",        limit: 10
                   t.string "pretty_name"
-            -     t.string "ext",         :limit => 10
+            +     t.string "ext",         limit: 10
                   t.string "common_ext"
                 end
-            -   create_table "logins", :force => true do |t|
+            +   create_table "logins", force: :cascade do |t|
                   t.integer  "user_id"
                   t.string   "ip_address"
-            -     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 "messages", :force => true do |t|
+            +   create_table "messages", force: :cascade do |t|
                   t.integer  "sender_id"
                   t.integer  "receiver_id"
                   t.integer  "replying_message_id"
                   t.text     "body"
                   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 => true do |t|
+            +   create_table "problems", force: :cascade do |t|
-            -     t.string  "name",                 :limit => 30
+            +     t.string  "name",                 limit: 30
                   t.string  "full_name"
                   t.integer "full_score"
                   t.date    "date_added"
                   t.boolean "available"
                   t.string  "url"
                   t.integer "description_id"
                   t.boolean "test_allowed"
                   t.boolean "output_only"
                   t.string  "description_filename"
                 end
-            -   create_table "rights", :force => true do |t|
+            +   create_table "rights", force: :cascade do |t|
                   t.string "name"
                   t.string "controller"
                   t.string "action"
                 end
-            -   create_table "rights_roles", :id => false, :force => true do |t|
+            +   create_table "rights_roles", id: false, force: :cascade do |t|
                   t.integer "right_id"
                   t.integer "role_id"
                 end
-            -   add_index "rights_roles", ["role_id"], :name => "index_rights_roles_on_role_id"
+            +   add_index "rights_roles", ["role_id"], name: "index_rights_roles_on_role_id"
-            -   create_table "roles", :force => true do |t|
+            +   create_table "roles", force: :cascade do |t|
                   t.string "name"
                 end
-            -   create_table "roles_users", :id => false, :force => true do |t|
+            +   create_table "roles_users", id: false, force: :cascade do |t|
                   t.integer "role_id"
                   t.integer "user_id"
                 end
-            -   add_index "roles_users", ["user_id"], :name => "index_roles_users_on_user_id"
+            +   add_index "roles_users", ["user_id"], name: "index_roles_users_on_user_id"
-            -   create_table "sessions", :force => true do |t|
+            +   create_table "sessions", force: :cascade do |t|
                   t.string   "session_id"
                   t.text     "data"
                   t.datetime "updated_at"
                 end
-            -   add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
+            +   add_index "sessions", ["session_id"], name: "index_sessions_on_session_id"
-            -   add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
+            +   add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at"
-            -   create_table "sites", :force => true do |t|
+            +   create_table "sites", force: :cascade do |t|
                   t.string   "name"
                   t.boolean  "started"
                   t.datetime "start_time"
-            -     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.integer  "country_id"
                   t.string   "password"
                 end
-            -   create_table "submission_view_logs", :force => true do |t|
+            +   create_table "submission_view_logs", force: :cascade do |t|
                   t.integer  "user_id"
                   t.integer  "submission_id"
-            -     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 "submissions", :force => true do |t|
+            +   create_table "submissions", force: :cascade do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "language_id"
                   t.text     "source"
                   t.binary   "binary"
                   t.datetime "submitted_at"
                   t.float    "max_runtime"
                   t.integer  "peak_memory"
                   t.integer  "effective_code_length"
                   t.string   "ip_address"
                 end
-            -   add_index "submissions", ["user_id", "problem_id", "number"], :name => "index_submissions_on_user_id_and_problem_id_and_number", :unique => true
+            +   add_index "submissions", ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true
-            -   add_index "submissions", ["user_id", "problem_id"], :name => "index_submissions_on_user_id_and_problem_id"
+            +   add_index "submissions", ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id"
-            -   create_table "tasks", :force => true do |t|
+            +   create_table "tasks", force: :cascade do |t|
                   t.integer  "submission_id"
                   t.datetime "created_at"
                   t.integer  "status"
                   t.datetime "updated_at"
                 end
-            -   create_table "test_pairs", :force => true do |t|
+            +   create_table "test_pairs", force: :cascade do |t|
                   t.integer  "problem_id"
-            -     t.text     "input",      :limit => 16777215
+            +     t.text     "input",      limit: 16777215
-            -     t.text     "solution",   :limit => 16777215
+            +     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 => true do |t|
+            +   create_table "test_requests", force: :cascade do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "submission_id"
                   t.string   "input_file_name"
                   t.string   "output_file_name"
                   t.string   "running_stat"
                   t.integer  "status"
-            -     t.datetime "updated_at",       :null => false
+            +     t.datetime "updated_at",       null: false
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.string   "grader_comment"
-            -     t.datetime "created_at",       :null => false
+            +     t.datetime "created_at",       null: false
                   t.float    "running_time"
                   t.string   "exit_status"
                   t.integer  "memory_usage"
                 end
-            -   add_index "test_requests", ["user_id", "problem_id"], :name => "index_test_requests_on_user_id_and_problem_id"
+            +   add_index "test_requests", ["user_id", "problem_id"], name: "index_test_requests_on_user_id_and_problem_id"
-            -   create_table "testcases", :force => true do |t|
+            +   create_table "testcases", force: :cascade do |t|
                   t.integer  "problem_id"
                   t.integer  "num"
                   t.integer  "group"
                   t.integer  "score"
                   t.text     "input"
                   t.text     "sol"
-            -     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
-            -   add_index "testcases", ["problem_id"], :name => "index_testcases_on_problem_id"
+            +   add_index "testcases", ["problem_id"], name: "index_testcases_on_problem_id"
-            -   create_table "user_contest_stats", :force => true do |t|
+            +   create_table "user_contest_stats", force: :cascade do |t|
                   t.integer  "user_id"
                   t.datetime "started_at"
-            -     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  "forced_logout"
                 end
-            -   create_table "users", :force => true do |t|
+            +   create_table "users", force: :cascade do |t|
-            -     t.string   "login",           :limit => 50
+            +     t.string   "login",           limit: 50
                   t.string   "full_name"
                   t.string   "hashed_password"
-            -     t.string   "salt",            :limit => 5
+            +     t.string   "salt",            limit: 5
                   t.string   "alias"
                   t.string   "email"
                   t.integer  "site_id"
                   t.integer  "country_id"
-            -     t.boolean  "activated",                     :default => false
+            +     t.boolean  "activated",                  default: false
                   t.datetime "created_at"
                   t.datetime "updated_at"
-            -     t.boolean  "enabled",                       :default => true
+            +     t.boolean  "enabled",                    default: true
                   t.string   "remark"
                   t.string   "last_ip"
                   t.string   "section"
                 end
-            -   add_index "users", ["login"], :name => "index_users_on_login", :unique => true
+            +   add_index "users", ["login"], name: "index_users_on_login", unique: true
               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

r621:3b5645cfc80e - Mon, 26 Dec 2016 05:09:45 - 9 files changed: 125 inserted, 106 deleted

Sign in to your account

Commit r621:3b5645cfc80e public

Author

r621:3b5645cfc80e - Mon, 26 Dec 2016 05:09:45 - 9 files changed: 125 inserted, 106 deleted

Commit `r621:3b5645cfc80e` public