cafe-grader-web

Commit r802:d7e158996222 public

parent | child
Description:
update max_score / current_score to property use group filter
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff | Ignore whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r802:d7e158996222 - - 8 files changed: 88 inserted, 79 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -105,50 +105,48
105 105 tilt
106 106 haml-rails (1.0.0)
107 107 actionpack (>= 4.0.1)
108 108 activesupport (>= 4.0.1)
109 109 haml (>= 4.0.6, < 6.0)
110 110 html2haml (>= 1.0.1)
111 111 railties (>= 4.0.1)
112 112 html2haml (2.2.0)
113 113 erubis (~> 2.7.0)
114 114 haml (>= 4.0, < 6)
115 115 nokogiri (>= 1.6.0)
116 116 ruby_parser (~> 3.5)
117 117 i18n (1.8.2)
118 118 concurrent-ruby (~> 1.0)
119 119 in_place_editing (1.2.0)
120 120 jbuilder (2.10.0)
121 121 activesupport (>= 5.0.0)
122 122 jquery-countdown-rails (2.0.2)
123 123 jquery-rails (4.3.3)
124 124 rails-dom-testing (>= 1, < 3)
125 125 railties (>= 4.2.0)
126 126 thor (>= 0.14, < 2.0)
127 127 jquery-tablesorter (1.26.1)
128 128 railties (>= 3.2, < 6)
129 - jquery-timepicker-addon-rails (1.4.1)
130 - railties (>= 3.1)
131 129 jquery-ui-rails (6.0.1)
132 130 railties (>= 3.2.16)
133 131 listen (3.1.5)
134 132 rb-fsevent (~> 0.9, >= 0.9.4)
135 133 rb-inotify (~> 0.9, >= 0.9.7)
136 134 ruby_dep (~> 1.2)
137 135 loofah (2.4.0)
138 136 crass (~> 1.0.2)
139 137 nokogiri (>= 1.5.9)
140 138 mail (2.7.1)
141 139 mini_mime (>= 0.1.1)
142 140 marcel (0.3.3)
143 141 mimemagic (~> 0.3.2)
144 142 method_source (1.0.0)
145 143 mimemagic (0.3.4)
146 144 mini_mime (1.0.2)
147 145 mini_portile2 (2.4.0)
148 146 minitest (5.14.0)
149 147 minitest-reporters (1.3.6)
150 148 ansi
151 149 builder
152 150 minitest (>= 5.0)
153 151 ruby-progressbar
154 152 momentjs-rails (2.20.1)
@@ -264,49 +262,48
264 262 ruby
265 263
266 264 DEPENDENCIES
267 265 ace-rails-ap
268 266 activerecord-session_store
269 267 autoprefixer-rails
270 268 best_in_place (~> 3.0.1)
271 269 bootsnap (>= 1.1.0)
272 270 bootstrap-sass (~> 3.4.1)
273 271 bootstrap-switch-rails
274 272 bootstrap-toggle-rails
275 273 bootstrap3-datetimepicker-rails (~> 4.17.47)
276 274 byebug
277 275 capybara (>= 2.15)
278 276 coffee-rails
279 277 dynamic_form
280 278 fuzzy-string-match
281 279 haml
282 280 haml-rails
283 281 in_place_editing
284 282 jbuilder (~> 2.5)
285 283 jquery-countdown-rails
286 284 jquery-rails
287 285 jquery-tablesorter
288 - jquery-timepicker-addon-rails
289 286 jquery-ui-rails
290 287 listen (>= 3.0.5, < 3.2)
291 288 mail
292 289 minitest-reporters
293 290 momentjs-rails (>= 2.9.0)
294 291 mysql2
295 292 puma
296 293 rails (~> 5.2)
297 294 rails-controller-testing
298 295 rails_bootstrap_sortable
299 296 rdiscount
300 297 rouge
301 298 sassc-rails
302 299 select2-rails
303 300 selenium-webdriver
304 301 simple_form
305 302 spring
306 303 spring-watcher-listen (~> 2.0.0)
307 304 sqlite3
308 305 uglifier
309 306 web-console (>= 3.3.0)
310 307 webdriver
311 308 yaml_db
312 309
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -52,49 +52,49
52 52
53 53 def submit
54 54 user = User.find(session[:user_id])
55 55
56 56 @submission = Submission.new
57 57 @submission.problem_id = params[:submission][:problem_id]
58 58 @submission.user = user
59 59 @submission.language_id = 0
60 60 if (params['file']) and (params['file']!='')
61 61 @submission.source = File.open(params['file'].path,'r:UTF-8',&:read)
62 62 @submission.source.encode!('UTF-8','UTF-8',invalid: :replace, replace: '')
63 63 @submission.source_filename = params['file'].original_filename
64 64 end
65 65
66 66 if (params[:editor_text])
67 67 language = Language.find_by_id(params[:language_id])
68 68 @submission.source = params[:editor_text]
69 69 @submission.source_filename = "live_edit.#{language.ext}"
70 70 @submission.language = language
71 71 end
72 72
73 73 @submission.submitted_at = Time.new.gmtime
74 74 @submission.ip_address = request.remote_ip
75 75
76 - if GraderConfiguration.time_limit_mode? and user.contest_finished?
76 + if @current_user.admin? == false && GraderConfiguration.time_limit_mode? && @current_user.contest_finished?
77 77 @submission.errors.add(:base,"The contest is over.")
78 78 prepare_list_information
79 79 render :action => 'list' and return
80 80 end
81 81
82 82 if @submission.valid?(@current_user)
83 83 if @submission.save == false
84 84 flash[:notice] = 'Error saving your submission'
85 85 elsif Task.create(:submission_id => @submission.id,
86 86 :status => Task::STATUS_INQUEUE) == false
87 87 flash[:notice] = 'Error adding your submission to task queue'
88 88 end
89 89 else
90 90 prepare_list_information
91 91 render :action => 'list' and return
92 92 end
93 93 redirect_to edit_submission_path(@submission)
94 94 end
95 95
96 96 def source
97 97 submission = Submission.find(params[:id])
98 98 if ((submission.user_id == session[:user_id]) and
99 99 (submission.problem != nil) and
100 100 (submission.problem.available))
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,80 +1,82
1 1 require 'csv'
2 2
3 3 class ReportController < ApplicationController
4 4
5 5 before_action :check_valid_login
6 6
7 7 before_action :admin_authorization, only: [:login_stat,:submission, :submission_query,
8 8 :login, :login_detail_query, :login_summary_query,
9 9 :stuck, :cheat_report, :cheat_scrutinize, :show_max_score, :current_score]
10 10
11 11 before_action(only: [:problem_hof]) { |c|
12 12 return false unless check_valid_login
13 13
14 14 admin_authorization unless GraderConfiguration["right.user_view_submission"]
15 15 }
16 16
17 17 def max_score
18 18 end
19 19
20 20 def current_score
21 21 @problems = Problem.available_problems
22 - if params[:group_id]
22 + if params[:group_id] && params[:users] == 'group'
23 23 @group = Group.find(params[:group_id])
24 24 @users = @group.users.where(enabled: true)
25 25 else
26 26 @users = User.includes(:contests).includes(:contest_stat).where(enabled: true)
27 27 end
28 28 @scorearray = calculate_max_score(@problems, @users,0,0,true)
29 29
30 30 #rencer accordingly
31 31 if params[:button] == 'download' then
32 32 csv = gen_csv_from_scorearray(@scorearray,@problems)
33 33 send_data csv, filename: 'max_score.csv'
34 34 else
35 35 #render template: 'user_admin/user_stat'
36 36 render 'current_score'
37 37 end
38 38 end
39 39
40 40 def show_max_score
41 41 #process parameters
42 42 #problems
43 43 @problems = []
44 44 if params[:problem_id]
45 45 params[:problem_id].each do |id|
46 46 next unless id.strip != ""
47 47 pid = Problem.find_by_id(id.to_i)
48 48 @problems << pid if pid
49 49 end
50 50 end
51 51
52 52 #users
53 - @users = if params[:users] == "all" then
53 + @users = if params[:users] == "group" then
54 + Group.find(params[:group_id]).users.all
55 + elsif params[:users] == 'enabled'
56 + User.includes(:contests).includes(:contest_stat).where(enabled: true)
57 + else
54 58 User.includes(:contests).includes(:contest_stat)
55 - else
56 - User.includes(:contests).includes(:contest_stat).where(enabled: true)
57 59 end
58 60
59 61 #set up range from param
60 62 @since_id = params.fetch(:from_id, 0).to_i
61 63 @until_id = params.fetch(:to_id, 0).to_i
62 64 @since_id = nil if @since_id == 0
63 65 @until_id = nil if @until_id == 0
64 66
65 67 #calculate the routine
66 68 @scorearray = calculate_max_score(@problems, @users, @since_id, @until_id)
67 69
68 70 #rencer accordingly
69 71 if params[:button] == 'download' then
70 72 csv = gen_csv_from_scorearray(@scorearray,@problems)
71 73 send_data csv, filename: 'max_score.csv'
72 74 else
73 75 #render template: 'user_admin/user_stat'
74 76 render 'max_score'
75 77 end
76 78
77 79 end
78 80
79 81 def score
80 82 if params[:commit] == 'download csv'
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -74,38 +74,38
74 74
75 75 def get_latest_submission_status
76 76 @problem = Problem.find(params[:pid])
77 77 @submission = Submission.find_last_by_user_and_problem(params[:uid],params[:pid])
78 78 respond_to do |format|
79 79 format.js
80 80 end
81 81 end
82 82
83 83 # GET /submissions/:id/rejudge
84 84 def rejudge
85 85 @submission = Submission.find(params[:id])
86 86 @task = @submission.task
87 87 @task.status_inqueue! if @task
88 88 respond_to do |format|
89 89 format.js
90 90 end
91 91 end
92 92
93 93 protected
94 94
95 95 def submission_authorization
96 96 #admin always has privileged
97 97 return true if @current_user.admin?
98 - return true if @current_user.has_role?('TA') && (['show','download'].include? action_name)
98 + return true if @current_user.has_role?('ta') && (['show','download'].include? action_name)
99 99
100 100 sub = Submission.find(params[:id])
101 101 if @current_user.available_problems.include? sub.problem
102 102 return true if GraderConfiguration["right.user_view_submission"] or sub.user == @current_user
103 103 end
104 104
105 105 #default to NO
106 106 unauthorized_redirect
107 107 return false
108 108 end
109 109
110 110
111 111 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,11 +1,15
1 1 .container-fluid
2 2 %h1 Current Score
3 3 = form_tag current_score_report_path, method: 'get' do
4 - Show only users from this group
4 + .radio-inline
5 + = radio_button_tag 'users', 'all', (params[:users] == 'all')
6 + = label_tag(:users_all,'Show all users')
7 + %br
8 + .radio-inline
9 + = radio_button_tag 'users', 'group', (params[:users] == 'group')
10 + = label_tag(:users_group, 'Show only users from this group')
5 11 = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_id]), id: 'group_name',class: 'select2', style: 'width: 20em';
6 12 = submit_tag 'Apply',class: 'btn btn-default'
7 13
8 14 %br
9 -
10 -
11 15 = render "score_table"
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -18,32 +18,37
18 18 .panel-heading
19 19 Submission range
20 20 .panel-body
21 21 %p
22 22 Input minimum and maximum range of submission ID that should be included. A blank value for min and max means -1 and infinity, respectively.
23 23 .form-group
24 24 = label_tag :from, "Min"
25 25 = text_field_tag 'from_id', @since_id, class: "form-control"
26 26 .form-group
27 27 = label_tag :from, "Max"
28 28 = text_field_tag 'to_id', @until_id, class: "form-control"
29 29 .col-md-4
30 30 .panel.panel-primary
31 31 .panel-heading
32 32 Users
33 33 .panel-body
34 34 .radio
35 35 %label
36 36 = radio_button_tag 'users', 'all', (params[:users] == "all")
37 37 All users
38 38 .radio
39 39 %label
40 40 = radio_button_tag 'users', 'enabled', (params[:users] == "enabled")
41 41 Only enabled users
42 + .radio
43 + %label
44 + = radio_button_tag 'users', 'group', (params[:users] == "group")
45 + Only users from this group
46 + = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_id]), id: 'group_name',class: 'select2', style: 'width: 20em';
42 47 .row
43 48 .col-md-12
44 49 = button_tag 'Show', class: "btn btn-primary btn-large", value: "show"
45 50 = button_tag 'Download CSV', class: "btn btn-primary btn-large", value: "download"
46 51
47 52 - if @scorearray
48 53 %h2 Result
49 54 =render "score_table"
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,309 +1,310
1 1 # This file is auto-generated from the current state of the database. Instead
2 2 # of editing this file, please use the migrations feature of Active Record to
3 3 # incrementally modify your database, and then regenerate this schema definition.
4 4 #
5 5 # Note that this schema.rb definition is the authoritative source for your
6 6 # database schema. If you need to create the application database on another
7 7 # system, you should be using db:schema:load, not running all the migrations
8 8 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
9 9 # you'll amass, the slower it'll run and the greater likelihood for issues).
10 10 #
11 11 # It's strongly recommended that you check this file into your version control system.
12 12
13 - ActiveRecord::Schema.define(version: 2020_04_05_112919) do
13 + ActiveRecord::Schema.define(version: 2020_08_13_083020) do
14 14
15 - create_table "announcements", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
15 + create_table "announcements", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
16 16 t.string "author"
17 - t.text "body", limit: 16777215
17 + t.text "body"
18 18 t.boolean "published"
19 - t.datetime "created_at", null: false
20 - t.datetime "updated_at", null: false
19 + t.datetime "created_at"
20 + t.datetime "updated_at"
21 21 t.boolean "frontpage", default: false
22 22 t.boolean "contest_only", default: false
23 23 t.string "title"
24 24 t.string "notes"
25 25 end
26 26
27 - create_table "contests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
27 + create_table "contests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
28 28 t.string "title"
29 29 t.boolean "enabled"
30 - t.datetime "created_at", null: false
31 - t.datetime "updated_at", null: false
30 + t.datetime "created_at"
31 + t.datetime "updated_at"
32 32 t.string "name"
33 33 end
34 34
35 - create_table "contests_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
35 + create_table "contests_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
36 36 t.integer "contest_id"
37 37 t.integer "problem_id"
38 38 end
39 39
40 - create_table "contests_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
40 + create_table "contests_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
41 41 t.integer "contest_id"
42 42 t.integer "user_id"
43 43 end
44 44
45 - create_table "countries", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
45 + create_table "countries", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
46 46 t.string "name"
47 - t.datetime "created_at", null: false
48 - t.datetime "updated_at", null: false
47 + t.datetime "created_at"
48 + t.datetime "updated_at"
49 49 end
50 50
51 - create_table "descriptions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
52 - t.text "body", limit: 16777215
51 + create_table "descriptions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
52 + t.text "body"
53 53 t.boolean "markdowned"
54 - t.datetime "created_at", null: false
55 - t.datetime "updated_at", null: false
54 + t.datetime "created_at"
55 + t.datetime "updated_at"
56 56 end
57 57
58 - create_table "grader_configurations", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
58 + create_table "grader_configurations", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
59 59 t.string "key"
60 60 t.string "value_type"
61 61 t.string "value"
62 - t.datetime "created_at", null: false
63 - t.datetime "updated_at", null: false
64 - t.text "description", limit: 16777215
62 + t.datetime "created_at"
63 + t.datetime "updated_at"
64 + t.text "description"
65 65 end
66 66
67 - create_table "grader_processes", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
67 + create_table "grader_processes", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
68 68 t.string "host"
69 69 t.integer "pid"
70 70 t.string "mode"
71 71 t.boolean "active"
72 - t.datetime "created_at", null: false
73 - t.datetime "updated_at", null: false
72 + t.datetime "created_at"
73 + t.datetime "updated_at"
74 74 t.integer "task_id"
75 75 t.string "task_type"
76 76 t.boolean "terminated"
77 - t.index ["host", "pid"], name: "index_grader_processes_on_ip_and_pid"
77 + t.index ["host", "pid"], name: "index_grader_processes_on_host_and_pid"
78 78 end
79 79
80 80 create_table "groups", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
81 81 t.string "name"
82 82 t.string "description"
83 + t.boolean "enabled", default: true
83 84 end
84 85
85 86 create_table "groups_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
86 87 t.integer "problem_id", null: false
87 88 t.integer "group_id", null: false
88 89 t.index ["group_id", "problem_id"], name: "index_groups_problems_on_group_id_and_problem_id"
89 90 end
90 91
91 92 create_table "groups_users", options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
92 93 t.integer "group_id", null: false
93 94 t.integer "user_id", null: false
94 95 t.index ["user_id", "group_id"], name: "index_groups_users_on_user_id_and_group_id"
95 96 end
96 97
97 98 create_table "heart_beats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
98 99 t.integer "user_id"
99 100 t.string "ip_address"
100 - t.datetime "created_at", null: false
101 - t.datetime "updated_at", null: false
101 + t.datetime "created_at"
102 + t.datetime "updated_at"
102 103 t.string "status"
103 104 t.index ["updated_at"], name: "index_heart_beats_on_updated_at"
104 105 end
105 106
106 - create_table "languages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
107 + create_table "languages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
107 108 t.string "name", limit: 10
108 109 t.string "pretty_name"
109 110 t.string "ext", limit: 10
110 111 t.string "common_ext"
111 112 end
112 113
113 114 create_table "logins", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
114 115 t.integer "user_id"
115 116 t.string "ip_address"
116 - t.datetime "created_at", null: false
117 - t.datetime "updated_at", null: false
117 + t.datetime "created_at"
118 + t.datetime "updated_at"
118 119 t.index ["user_id"], name: "index_logins_on_user_id"
119 120 end
120 121
121 - create_table "messages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
122 + create_table "messages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
122 123 t.integer "sender_id"
123 124 t.integer "receiver_id"
124 125 t.integer "replying_message_id"
125 - t.text "body", limit: 16777215
126 + t.text "body"
126 127 t.boolean "replied"
127 - t.datetime "created_at", null: false
128 - t.datetime "updated_at", null: false
128 + t.datetime "created_at"
129 + t.datetime "updated_at"
129 130 end
130 131
131 - create_table "problems", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
132 - t.string "name", limit: 100
132 + create_table "problems", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
133 + t.string "name", limit: 30
133 134 t.string "full_name"
134 135 t.integer "full_score"
135 136 t.date "date_added"
136 137 t.boolean "available"
137 138 t.string "url"
138 139 t.integer "description_id"
139 140 t.boolean "test_allowed"
140 141 t.boolean "output_only"
141 142 t.string "description_filename"
142 143 t.boolean "view_testcase"
143 144 end
144 145
145 146 create_table "problems_tags", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
146 147 t.integer "problem_id"
147 148 t.integer "tag_id"
148 149 t.index ["problem_id", "tag_id"], name: "index_problems_tags_on_problem_id_and_tag_id", unique: true
149 150 t.index ["problem_id"], name: "index_problems_tags_on_problem_id"
150 151 t.index ["tag_id"], name: "index_problems_tags_on_tag_id"
151 152 end
152 153
153 - create_table "rights", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
154 + create_table "rights", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
154 155 t.string "name"
155 156 t.string "controller"
156 157 t.string "action"
157 158 end
158 159
159 - create_table "rights_roles", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
160 + create_table "rights_roles", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
160 161 t.integer "right_id"
161 162 t.integer "role_id"
162 163 t.index ["role_id"], name: "index_rights_roles_on_role_id"
163 164 end
164 165
165 - create_table "roles", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
166 + create_table "roles", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
166 167 t.string "name"
167 168 end
168 169
169 - create_table "roles_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
170 + create_table "roles_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
170 171 t.integer "role_id"
171 172 t.integer "user_id"
172 173 t.index ["user_id"], name: "index_roles_users_on_user_id"
173 174 end
174 175
175 - create_table "sessions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
176 + create_table "sessions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
176 177 t.string "session_id"
177 - t.text "data", limit: 16777215
178 + t.text "data"
178 179 t.datetime "updated_at"
179 180 t.index ["session_id"], name: "index_sessions_on_session_id"
180 181 t.index ["updated_at"], name: "index_sessions_on_updated_at"
181 182 end
182 183
183 - create_table "sites", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
184 + create_table "sites", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
184 185 t.string "name"
185 186 t.boolean "started"
186 187 t.datetime "start_time"
187 - t.datetime "created_at", null: false
188 - t.datetime "updated_at", null: false
188 + t.datetime "created_at"
189 + t.datetime "updated_at"
189 190 t.integer "country_id"
190 191 t.string "password"
191 192 end
192 193
193 194 create_table "submission_view_logs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
194 195 t.integer "user_id"
195 196 t.integer "submission_id"
196 - t.datetime "created_at", null: false
197 - t.datetime "updated_at", null: false
197 + t.datetime "created_at"
198 + t.datetime "updated_at"
198 199 end
199 200
200 - create_table "submissions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
201 + create_table "submissions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
201 202 t.integer "user_id"
202 203 t.integer "problem_id"
203 204 t.integer "language_id"
204 205 t.text "source", limit: 16777215
205 206 t.binary "binary"
206 207 t.datetime "submitted_at"
207 208 t.datetime "compiled_at"
208 - t.text "compiler_message", limit: 16777215
209 + t.text "compiler_message"
209 210 t.datetime "graded_at"
210 211 t.integer "points"
211 - t.text "grader_comment", limit: 16777215
212 + t.text "grader_comment"
212 213 t.integer "number"
213 214 t.string "source_filename"
214 215 t.float "max_runtime"
215 216 t.integer "peak_memory"
216 217 t.integer "effective_code_length"
217 218 t.string "ip_address"
218 219 t.index ["submitted_at"], name: "index_submissions_on_submitted_at"
219 220 t.index ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true
220 221 t.index ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id"
221 222 end
222 223
223 224 create_table "tags", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
224 225 t.string "name", null: false
225 226 t.text "description"
226 227 t.boolean "public"
227 228 t.datetime "created_at", null: false
228 229 t.datetime "updated_at", null: false
229 230 end
230 231
231 - create_table "tasks", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
232 + create_table "tasks", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
232 233 t.integer "submission_id"
233 234 t.datetime "created_at"
234 235 t.integer "status"
235 236 t.datetime "updated_at"
236 237 t.index ["submission_id"], name: "index_tasks_on_submission_id"
237 238 end
238 239
239 - create_table "test_pairs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
240 + create_table "test_pairs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
240 241 t.integer "problem_id"
241 - t.text "input", limit: 4294967295
242 - t.text "solution", limit: 4294967295
243 - t.datetime "created_at", null: false
244 - t.datetime "updated_at", null: false
242 + t.text "input", limit: 16777215
243 + t.text "solution", limit: 16777215
244 + t.datetime "created_at"
245 + t.datetime "updated_at"
245 246 end
246 247
247 - create_table "test_requests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
248 + create_table "test_requests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
248 249 t.integer "user_id"
249 250 t.integer "problem_id"
250 251 t.integer "submission_id"
251 252 t.string "input_file_name"
252 253 t.string "output_file_name"
253 254 t.string "running_stat"
254 255 t.integer "status"
255 - t.datetime "updated_at", null: false
256 + t.datetime "updated_at"
256 257 t.datetime "submitted_at"
257 258 t.datetime "compiled_at"
258 - t.text "compiler_message", limit: 16777215
259 + t.text "compiler_message"
259 260 t.datetime "graded_at"
260 261 t.string "grader_comment"
261 - t.datetime "created_at", null: false
262 + t.datetime "created_at"
262 263 t.float "running_time"
263 264 t.string "exit_status"
264 265 t.integer "memory_usage"
265 266 t.index ["user_id", "problem_id"], name: "index_test_requests_on_user_id_and_problem_id"
266 267 end
267 268
268 269 create_table "testcases", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
269 270 t.integer "problem_id"
270 271 t.integer "num"
271 272 t.integer "group"
272 273 t.integer "score"
273 274 t.text "input", limit: 4294967295
274 275 t.text "sol", limit: 4294967295
275 - t.datetime "created_at", null: false
276 - t.datetime "updated_at", null: false
276 + t.datetime "created_at"
277 + t.datetime "updated_at"
277 278 t.index ["problem_id"], name: "index_testcases_on_problem_id"
278 279 end
279 280
280 - create_table "user_contest_stats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
281 + create_table "user_contest_stats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
281 282 t.integer "user_id"
282 283 t.datetime "started_at"
283 - t.datetime "created_at", null: false
284 - t.datetime "updated_at", null: false
284 + t.datetime "created_at"
285 + t.datetime "updated_at"
285 286 t.boolean "forced_logout"
286 287 end
287 288
288 - create_table "users", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8", force: :cascade do |t|
289 + create_table "users", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
289 290 t.string "login", limit: 50
290 291 t.string "full_name"
291 292 t.string "hashed_password"
292 293 t.string "salt", limit: 5
293 294 t.string "alias"
294 295 t.string "email"
295 296 t.integer "site_id"
296 297 t.integer "country_id"
297 298 t.boolean "activated", default: false
298 299 t.datetime "created_at"
299 300 t.datetime "updated_at"
300 301 t.string "section"
301 302 t.boolean "enabled", default: true
302 303 t.string "remark"
303 304 t.string "last_ip"
304 305 t.index ["login"], name: "index_users_on_login", unique: true
305 306 end
306 307
307 308 add_foreign_key "problems_tags", "problems"
308 309 add_foreign_key "problems_tags", "tags"
309 310 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -204,49 +204,49
204 204 description='')
205 205 conf = (GraderConfiguration.find_by_key(key) ||
206 206 GraderConfiguration.new(:key => key,
207 207 :value_type => value_type,
208 208 :value => default_value))
209 209 conf.description = description
210 210 conf.save
211 211 end
212 212
213 213 def seed_config
214 214 CONFIGURATIONS.each do |conf|
215 215 if conf.has_key? :description
216 216 desc = conf[:description]
217 217 else
218 218 desc = ''
219 219 end
220 220 create_configuration_key(conf[:key],
221 221 conf[:value_type],
222 222 conf[:default_value],
223 223 desc)
224 224 end
225 225 end
226 226
227 227 def seed_roles
228 - Role.find_or_create_by(name: 'TA')
228 + Role.find_or_create_by(name: 'ta')
229 229 return if Role.find_by_name('admin')
230 230
231 231 role = Role.create(:name => 'admin')
232 232 user_admin_right = Right.create(:name => 'user_admin',
233 233 :controller => 'user_admin',
234 234 :action => 'all')
235 235 problem_admin_right = Right.create(:name=> 'problem_admin',
236 236 :controller => 'problems',
237 237 :action => 'all')
238 238
239 239 graders_right = Right.create(:name => 'graders_admin',
240 240 :controller => 'graders',
241 241 :action => 'all')
242 242
243 243 role.rights << user_admin_right;
244 244 role.rights << problem_admin_right;
245 245 role.rights << graders_right;
246 246 role.save
247 247 end
248 248
249 249 def seed_root
250 250 return if User.find_by_login('root')
251 251
252 252 root = User.new(:login => 'root',
You need to be logged in to leave comments. Login now