cafe-grader-web

Commit r834:825a2986c8ea public

parent | child
Description:
merge
Commit status:
[Not Reviewed]
References:
merge algo
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

r834:825a2986c8ea - - 20 files changed: 150 inserted, 99 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,8
1 + = render partial: 'toggle_button',
2 + locals: {button_id: "#group-enabled-#{@group.id}",button_on: @group.enabled }
3 + :plain
4 + r = $("#group-#{@group.id}");
5 + r.removeClass('success');
6 + r.removeClass('danger');
7 + r.addClass("#{@group.enabled? ? 'success' : 'danger'}");
8 +
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,5
1 + class AddEnabledToGroup < ActiveRecord::Migration[5.2]
2 + def change
3 + add_column :groups, :enabled, :boolean, default: true
4 + end
5 + end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -143,25 +143,26
143 143 return true if user==nil || user.site == nil
144 144 if user.contest_finished?
145 145 flash[:notice] = 'Error: the contest you are participating is over.'
146 146 redirect_to :back
147 147 return false
148 148 end
149 149 return true
150 150 end
151 151
152 152 def is_request_ip_allowed?
153 153 unless GraderConfiguration[WHITELIST_IGNORE_CONF_KEY]
154 154 user_ip = IPAddr.new(request.remote_ip)
155 + allowed = GraderConfiguration[WHITELIST_IP_CONF_KEY] || ''
155 156
156 - GraderConfiguration[WHITELIST_IP_CONF_KEY].delete(' ').split(',').each do |ips|
157 + allowed.delete(' ').split(',').each do |ips|
157 158 allow_ips = IPAddr.new(ips)
158 159 if allow_ips.include?(user_ip)
159 160 return true
160 161 end
161 162 end
162 163 return false
163 164 end
164 165 return true
165 166 end
166 167
167 168 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,16 +1,17
1 1 class GroupsController < ApplicationController
2 2 before_action :set_group, only: [:show, :edit, :update, :destroy,
3 3 :add_user, :remove_user,:remove_all_user,
4 4 :add_problem, :remove_problem,:remove_all_problem,
5 + :toggle,
5 6 ]
6 7 before_action :admin_authorization
7 8
8 9 # GET /groups
9 10 def index
10 11 @groups = Group.all
11 12 end
12 13
13 14 # GET /groups/1
14 15 def show
15 16 end
16 17
@@ -40,24 +41,29
40 41 redirect_to @group, notice: 'Group was successfully updated.'
41 42 else
42 43 render :edit
43 44 end
44 45 end
45 46
46 47 # DELETE /groups/1
47 48 def destroy
48 49 @group.destroy
49 50 redirect_to groups_url, notice: 'Group was successfully destroyed.'
50 51 end
51 52
53 + def toggle
54 + @group.enabled = @group.enabled? ? false : true
55 + @group.save
56 + end
57 +
52 58 def remove_user
53 59 user = User.find(params[:user_id])
54 60 @group.users.delete(user)
55 61 redirect_to group_path(@group), flash: {success: "User #{user.login} was removed from the group #{@group.name}"}
56 62 end
57 63
58 64 def remove_all_user
59 65 @group.users.clear
60 66 redirect_to group_path(@group), alert: 'All users removed'
61 67 end
62 68
63 69 def remove_all_problem
@@ -90,15 +96,15
90 96 redirect_to group_path(@group), alert: e.message
91 97 end
92 98 end
93 99
94 100 private
95 101 # Use callbacks to share common setup or constraints between actions.
96 102 def set_group
97 103 @group = Group.find(params[:id])
98 104 end
99 105
100 106 # Only allow a trusted parameter "white list" through.
101 107 def group_params
102 - params.require(:group).permit(:name, :description)
108 + params.require(:group).permit(:name, :description, :enabled)
103 109 end
104 110 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -179,25 +179,25
179 179 end
180 180
181 181 def confirm_contest_start
182 182 user = User.find(session[:user_id])
183 183 if request.method == 'POST'
184 184 user.update_start_time
185 185 redirect_to :action => 'list'
186 186 else
187 187 @contests = user.contests
188 188 @user = user
189 189 end
190 190 end
191 -
191 +
192 192 protected
193 193
194 194 def prepare_announcements(recent=nil)
195 195 if GraderConfiguration.show_tasks_to?(@user)
196 196 @announcements = Announcement.published(true)
197 197 else
198 198 @announcements = Announcement.published
199 199 end
200 200 if recent!=nil
201 201 recent_id = recent.to_i
202 202 @announcements = @announcements.find_all { |a| a.id > recent_id }
203 203 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -7,26 +7,26
7 7 # GET /submissions.json
8 8 # Show problem selection and user's submission of that problem
9 9 def index
10 10 @user = @current_user
11 11 @problems = @user.available_problems
12 12
13 13 if params[:problem_id]==nil
14 14 @problem = nil
15 15 @submissions = nil
16 16 else
17 17 @problem = Problem.find_by_id(params[:problem_id])
18 18 if (@problem == nil) or (not @problem.available)
19 - redirect_to main_list_path
20 - flash[:notice] = 'Error: submissions for that problem are not viewable.'
19 + redirect_to list_main_path
20 + flash[:error] = 'Authorization error: You have no right to view submissions for this problem'
21 21 return
22 22 end
23 23 @submissions = Submission.find_all_by_user_problem(@user.id, @problem.id).order(id: :desc)
24 24 end
25 25 end
26 26
27 27 # GET /submissions/1
28 28 # GET /submissions/1.json
29 29 def show
30 30 @submission = Submission.find(params[:id])
31 31
32 32 #log the viewing
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -18,35 +18,37
18 18
19 19 if !FileTest.exists?(filename)
20 20 redirect_to :action => 'index' and return
21 21 end
22 22
23 23 send_file_to_user(filename, base_filename)
24 24 end
25 25
26 26 # this has problem-level access control
27 27 def download
28 28 problem = Problem.find(params[:id])
29 29 unless @current_user.can_view_problem? problem
30 - flash[:notice] = 'You are not authorized to access this file'
31 - redirect_to :action => 'index' and return
30 + flash[:error] = 'You are not authorized to access this file'
31 + redirect_to list_main_path
32 + return
32 33 end
33 34
34 35 base_name = params[:file]
35 36 base_filename = File.basename("#{base_name}.#{params[:ext]}")
36 37 filename = "#{Problem.download_file_basedir}/#{params[:id]}/#{base_filename}"
37 38
38 39 if !FileTest.exists?(filename)
39 40 flash[:notice] = 'File does not exists'
40 - redirect_to :action => 'index' and return
41 + redirect_to list_main_path
42 + return
41 43 end
42 44
43 45 send_file_to_user(filename, base_filename)
44 46 end
45 47
46 48 protected
47 49
48 50 def send_file_to_user(filename, base_filename)
49 51 if defined?(USE_APACHE_XSENDFILE) and USE_APACHE_XSENDFILE
50 52 response.headers['Content-Type'] = "application/force-download"
51 53 response.headers['Content-Disposition'] = "attachment; filename=\"#{File.basename(filename)}\""
52 54 response.headers["X-Sendfile"] = filename
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -56,55 +56,65
56 56 redirect_to action: 'index', page: params[:page]
57 57 end
58 58
59 59 def create_from_list
60 60 lines = params[:user_list]
61 61
62 62 note = []
63 63 error_note = []
64 64 error_msg = nil
65 65 ok_user = []
66 66
67 67 lines.split("\n").each do |line|
68 - items = line.chomp.split(',')
68 + #split with large limit, this will cause consecutive ',' to be result in a blank
69 + items = line.chomp.split(',',1000)
69 70 if items.length>=2
70 71 login = items[0]
71 72 full_name = items[1]
72 73 remark =''
73 74 user_alias = ''
74 75
75 76 added_random_password = false
76 - if items.length >= 3 and items[2].chomp(" ").length > 0;
77 - password = items[2].chomp(" ")
77 + added_password = false
78 + if items.length >= 3
79 + if items[2].chomp(" ").length > 0
80 + password = items[2].chomp(" ")
81 + added_password = true
82 + end
78 83 else
79 84 password = random_password
80 85 added_random_password=true;
81 86 end
82 87
83 88 if items.length>= 4 and items[3].chomp(" ").length > 0;
84 89 user_alias = items[3].chomp(" ")
85 90 else
86 91 user_alias = login
87 92 end
88 93
94 +
95 + has_remark = false
89 96 if items.length>=5
90 97 remark = items[4].strip;
98 + has_remark = true
91 99 end
92 100
93 101 user = User.find_by_login(login)
94 102 if (user)
95 103 user.full_name = full_name
96 - user.password = password
97 - user.remark = remark
104 + user.remark = remark if has_remark
105 + user.password = password if added_password || added_random_password
98 106 else
107 + #create a random password if none are given
108 + password = random_password unless password
99 109 user = User.new({:login => login,
100 110 :full_name => full_name,
101 111 :password => password,
102 112 :password_confirmation => password,
103 113 :alias => user_alias,
104 114 :remark => remark})
105 115 end
106 116 user.activated = true
107 117
108 118 if user.save
109 119 if added_random_password
110 120 note << "'#{login}' (+)"
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -104,26 +104,27
104 104 end
105 105
106 106 def read_textfile(fname,max_size=2048)
107 107 begin
108 108 File.open(fname).read(max_size)
109 109 rescue
110 110 nil
111 111 end
112 112 end
113 113
114 114 def toggle_button(on,toggle_url,id, option={})
115 115 btn_size = option[:size] || 'btn-xs'
116 + btn_block = option[:block] || 'btn-block'
116 117 link_to (on ? "Yes" : "No"), toggle_url,
117 - {class: "btn btn-block #{btn_size} btn-#{on ? 'success' : 'default'} ajax-toggle",
118 + {class: "btn #{btn_block} #{btn_size} btn-#{on ? 'success' : 'default'} ajax-toggle",
118 119 id: id,
119 120 data: {remote: true, method: 'get'}}
120 121 end
121 122
122 123 def get_ace_mode(language)
123 124 # return ace mode string from Language
124 125
125 126 case language.pretty_name
126 127 when 'Pascal'
127 128 'ace/mode/pascal'
128 129 when 'C++','C'
129 130 'ace/mode/c_cpp'
@@ -172,27 +173,24
172 173 end
173 174
174 175 contest_name = GraderConfiguration['contest.name']
175 176
176 177 #
177 178 # build real title bar
178 179 result = <<TITLEBAR
179 180 <div class="title">
180 181 <table>
181 182 #{header}
182 183 <tr>
183 184 <td class="left-col">
184 - #{user.full_name}<br/>
185 - #{t 'title_bar.current_time'} #{format_short_time(Time.zone.now)}
186 - #{time_left}
187 185 <br/>
188 186 </td>
189 187 <td class="right-col">#{contest_name}</td>
190 188 </tr>
191 189 </table>
192 190 </div>
193 191 TITLEBAR
194 192 result.html_safe
195 193 end
196 194
197 195 def markdown(text)
198 196 markdown = RDiscount.new(text)
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,20 +1,14
1 1 module MainHelper
2 2
3 - def link_to_description_if_any(name, problem, options={})
3 + def link_to_description_if_any(name, problem)
4 4 if !problem.url.blank?
5 - return link_to name, problem.url, options
5 + return link_to name, problem.url
6 6 elsif !problem.description_filename.blank?
7 - #build a link to a problem (via task controller)
8 7 basename, ext = problem.description_filename.split('.')
9 - options[:controller] = 'tasks'
10 - options[:action] = 'download'
11 - options[:id] = problem.id
12 - options[:file] = basename
13 - options[:ext] = ext
14 - return link_to name, options
8 + return link_to name, download_task_path(problem.id,basename,ext), target: '_blank'
15 9 else
16 10 return ''
17 11 end
18 12 end
19 13
20 14 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -145,24 +145,24
145 145 end
146 146 end
147 147
148 148 def must_have_valid_problem
149 149 return if self.source==nil
150 150 if self.problem==nil
151 151 errors.add('problem',"must be specified.")
152 152 else
153 153 #admin always have right
154 154 return if self.user.admin?
155 155
156 156 #check if user has the right to submit the problem
157 - errors.add('problem',"must be valid.") if (!self.user.available_problems.include?(self.problem)) and (self.new_record?)
157 + errors[:base] << "Authorization error: you have no right to submit to this problem" if (!self.user.available_problems.include?(self.problem)) and (self.new_record?)
158 158 end
159 159 end
160 160
161 161 # callbacks
162 162 def assign_latest_number_if_new_recond
163 163 return if !self.new_record?
164 164 latest = Submission.find_last_by_user_and_problem(self.user_id, self.problem_id)
165 165 self.number = (latest==nil) ? 1 : latest.number + 1;
166 166 end
167 167
168 168 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -307,47 +307,50
307 307 contest.problems.available.each do |problem|
308 308 if not pin.has_key? problem.id
309 309 contest_problems << problem
310 310 end
311 311 pin[problem.id] = true
312 312 end
313 313 end
314 314 other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
315 315 return contest_problems + other_avaiable_problems
316 316 end
317 317 end
318 318
319 + # new feature, get list of available problem in all enabled group that the user belongs to
319 320 def available_problems_in_group
320 321 problem = []
321 - self.groups.each do |group|
322 + self.groups.where(enabled: true).each do |group|
322 323 group.problems.where(available: true).each { |p| problem << p }
323 324 end
324 325 problem.uniq!
325 326 if problem
326 327 problem.sort! do |a,b|
327 328 case
328 329 when a.date_added < b.date_added
329 330 1
330 331 when a.date_added > b.date_added
331 332 -1
332 333 else
333 334 a.name <=> b.name
334 335 end
335 336 end
336 337 return problem
337 338 else
338 339 return []
339 340 end
340 341 end
341 342
343 + #check if the user has the right to view that problem
344 + #this also consider group based problem policy
342 345 def can_view_problem?(problem)
343 346 return true if admin?
344 347 return available_problems.include? problem
345 348 end
346 349
347 350 def self.clear_last_login
348 351 User.update_all(:last_ip => nil)
349 352 end
350 353
351 354 protected
352 355 def encrypt_new_password
353 356 return if password.blank?
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,25 +1,25
1 1
2 2 %tr
3 3 %td{:align => "center"}
4 4 = submission.number
5 5 %td.text-right
6 6 = link_to "##{submission.id}", submission_path(submission.id)
7 7 %td
8 8 = l submission.submitted_at, format: :long
9 9 = "( #{time_ago_in_words(submission.submitted_at)} ago)"
10 10 %td
11 11 = submission.source_filename
12 12 = " (#{submission.language.pretty_name}) "
13 - = link_to('[load]',{:action => 'source', :id => submission.id})
13 + = link_to '[load]', download_submission_path(submission)
14 14 %td
15 15 - if submission.graded_at
16 16 = "Graded at #{format_short_time(submission.graded_at)}."
17 17 %br/
18 18 = "Score: #{(submission.points*100/submission.problem.full_score).to_i} " if GraderConfiguration['ui.show_score']
19 19 = " ["
20 20 %tt
21 21 = submission.grader_comment
22 22 = "]"
23 23 %td
24 24 = render :partial => 'compiler_message', :locals => {:compiler_message => submission.compiler_message }
25 25 %td
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,16 +1,27
1 1 = form_for @group do |f|
2 2 - if @group.errors.any?
3 3 #error_explanation
4 4 %h2= "#{pluralize(@group.errors.count, "error")} prohibited this group from being saved:"
5 5 %ul
6 6 - @group.errors.full_messages.each do |msg|
7 7 %li= msg
8 -
9 - .form-group.field
10 - = f.label :name
11 - = f.text_field :name, class: 'form-control'
12 - .form-group.field
13 - = f.label :description
14 - = f.text_field :description, class: 'form-control'
15 - .form-group.actions
16 - = f.submit 'Save', class: 'btn btn-primary'
8 + .row
9 + .col-md-6
10 + .form-group.field
11 + = f.label :name
12 + = f.text_field :name, class: 'form-control'
13 + .row
14 + .col-md-6
15 + .form-group.field
16 + = f.label :description
17 + = f.text_field :description, class: 'form-control'
18 + .row
19 + .col-md-6
20 + .checkbox
21 + = f.label :enabled do
22 + = f.check_box :enabled
23 + Enabled
24 + .row
25 + .col-md-6
26 + .form-group.actions
27 + = f.submit 'Save', class: 'btn btn-primary'
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,22 +1,24
1 1 %h1 Groups
2 2
3 3 %p
4 4 = link_to 'New Group', new_group_path, class: 'btn btn-primary'
5 5 %table.table.table-hover
6 6 %thead
7 7 %tr
8 8 %th Name
9 9 %th Description
10 + %th Enabled?
10 11 %th
11 12 %th
12 13
13 14 %tbody
14 15 - @groups.each do |group|
15 - %tr
16 + %tr{:class => "#{(group.enabled?) ? "success" : "danger"}", id: "group-#{group.id}"}
16 17 %td= group.name
17 18 %td= group.description
19 + %td= toggle_button(group.enabled?, toggle_group_path(group), "group-enabled-#{group.id}", size: ' ', block: ' ')
18 20 %td= link_to 'View', group, class: 'btn btn-default'
19 21 %td= link_to 'Destroy', group, :method => :delete, :data => { :confirm => 'Are you sure?' }, class: 'btn btn-danger'
20 22
21 23 %br
22 24
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -34,14 +34,14
34 34 %td{:width => '300px'}
35 35 %tt <tt>/*<br/>LANG: C++<br/>TASK: mobiles<br/>*/</tt>
36 36
37 37 %p
38 38 =raw t 'help.example_pas'
39 39
40 40 %table{:border => '1'}
41 41 %tr
42 42 %td{:width => '300px'}
43 43 %tt <tt>{<br/>LANG: Pascal<br/>TASK: mobiles<br/>}</tt>
44 44
45 45 %p
46 - = raw(t('help.ask_questions_at_messages',:message_link_name => (t 'menu.messages'),:url => url_for(:controller => 'messages', :action => 'list')))
46 + = raw(t('help.ask_questions_at_messages',:message_link_name => (t 'menu.messages'),url: messages_path ))
47 47
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -33,24 +33,25
33 33 - if @submission.user
34 34 = link_to "#{@submission.user.login}", stat_user_path(@submission.user)
35 35 = @submission.user.full_name
36 36 - else
37 37 = "(n/a)"
38 38 %tr
39 39 %td.text-right
40 40 %strong Task
41 41 %td
42 42 - if @submission.problem!=nil
43 43 = link_to "[#{@submission.problem.name}]", stat_problem_path(@submission.problem)
44 44 = @submission.problem.full_name
45 + = link_to_description_if_any "[download] <span class='glyphicon glyphicon-file'></span>".html_safe, @submission.problem
45 46 - else
46 47 = "(n/a)"
47 48 %tr
48 49 %td.text-right
49 50 %strong Tries
50 51 %td= @submission.number
51 52 %tr
52 53 %td.text-right
53 54 %strong Language
54 55 %td= @submission.language.pretty_name
55 56 %tr
56 57 %td.text-right
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -17,24 +17,33
17 17 %tt passwd, alias
18 18 and
19 19 %tt remark
20 20 is optional.
21 21 %li
22 22 When
23 23 %tt passwd
24 24 or
25 25 %tt alias
26 26 is empty, the original value will be used instead.
27 27 %li
28 28 If the users with the same user_id already exists, existing information will be overwritten.
29 + Example:
30 + %ol
31 + %li
32 + %pre user1,Somchai Jaidee
33 + will create (or update) a user with login "user1" and setting the fullname to "Somchai Jaidee", also setting a random password.
34 + %li
35 + %pre user1,Somchai Jaidee,
36 + will create (or update) a user with login "user1" and and setting the fullname "Somchai Jaidee". No change is made to the password unless this is a new user. If this is a new user, a random password will be generated.
37 +
29 38
30 39 .row
31 40 .col-md-6
32 41 = form_tag :action => 'create_from_list' do
33 42 .form-group
34 43 = submit_tag 'Create following users',class: 'btn btn-success'
35 44 .form-group
36 45 .div.checkbox
37 46 %label
38 47 = check_box_tag :add_to_group
39 48 Also add these users to the following group
40 49 = select_tag "group_id", options_from_collection_for_select( Group.all, 'id','name',params[:group_name]), id: 'group_name',class: 'select2'
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -45,24 +45,25
45 45 post 'do_import'
46 46 end
47 47 end
48 48
49 49 resources :groups do
50 50 member do
51 51 post 'add_user', to: 'groups#add_user', as: 'add_user'
52 52 delete 'remove_user/:user_id', to: 'groups#remove_user', as: 'remove_user'
53 53 delete 'remove_all_user', to: 'groups#remove_all_user', as: 'remove_all_user'
54 54 post 'add_problem', to: 'groups#add_problem', as: 'add_problem'
55 55 delete 'remove_problem/:problem_id', to: 'groups#remove_problem', as: 'remove_problem'
56 56 delete 'remove_all_problem', to: 'groups#remove_all_problem', as: 'remove_all_problem'
57 + get 'toggle'
57 58 end
58 59 collection do
59 60
60 61 end
61 62 end
62 63
63 64 resources :testcases, only: [] do
64 65 member do
65 66 get 'download_input'
66 67 get 'download_sol'
67 68 end
68 69 collection do
@@ -83,25 +84,24
83 84 end
84 85 collection do
85 86 get 'profile'
86 87 post 'chg_passwd'
87 88 end
88 89 end
89 90
90 91 resources :submissions do
91 92 member do
92 93 get 'download'
93 94 get 'compiler_msg'
94 95 get 'rejudge'
95 - get 'source'
96 96 end
97 97 collection do
98 98 get 'prob/:problem_id', to: 'submissions#index', as: 'problem'
99 99 get 'direct_edit_problem/:problem_id(/:user_id)', to: 'submissions#direct_edit_problem', as: 'direct_edit_problem'
100 100 get 'get_latest_submission_status/:uid/:pid', to: 'submissions#get_latest_submission_status', as: 'get_latest_submission_status'
101 101 end
102 102 end
103 103
104 104
105 105 #user admin
106 106 resources :user_admin do
107 107 collection do
@@ -168,25 +168,25
168 168 get 'help'
169 169 post 'submit'
170 170 end
171 171 #main
172 172 #get "main/list"
173 173 #get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
174 174 #post 'main/submit', to: 'main#submit'
175 175 #get 'main/announcements', to: 'main#announcements'
176 176
177 177
178 178 #
179 179 get 'tasks/view/:file.:ext' => 'tasks#view'
180 - get 'tasks/download/:id/:file.:ext' => 'tasks#download'
180 + get 'tasks/download/:id/:file.:ext' => 'tasks#download', as: 'download_task'
181 181 get 'heartbeat/:id/edit' => 'heartbeat#edit'
182 182
183 183 #grader
184 184 get 'graders/list', to: 'graders#list', as: 'grader_list'
185 185 namespace :graders do
186 186 get 'task/:id/:type', action: 'task', as: 'task'
187 187 get 'view/:id/:type', action: 'view', as: 'view'
188 188 get 'clear/:id', action: 'clear', as: 'clear'
189 189 get 'stop'
190 190 get 'stop_all'
191 191 get 'clear_all'
192 192 get 'clear_terminated'
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,211 +1,212
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: 2018_06_12_102327) do
13 + ActiveRecord::Schema.define(version: 2020_08_13_083020) do
14 14
15 - create_table "announcements", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
15 + create_table "announcements", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
16 16 t.string "author"
17 17 t.text "body"
18 18 t.boolean "published"
19 - t.datetime "created_at"
20 - t.datetime "updated_at"
19 + t.datetime "created_at", null: false
20 + t.datetime "updated_at", null: false
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=latin1", force: :cascade do |t|
27 + create_table "contests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
28 28 t.string "title"
29 29 t.boolean "enabled"
30 - t.datetime "created_at"
31 - t.datetime "updated_at"
30 + t.datetime "created_at", null: false
31 + t.datetime "updated_at", null: false
32 32 t.string "name"
33 33 end
34 34
35 - create_table "contests_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
35 + create_table "contests_problems", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", 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=latin1", force: :cascade do |t|
40 + create_table "contests_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", 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=latin1", force: :cascade do |t|
45 + create_table "countries", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
46 46 t.string "name"
47 - t.datetime "created_at"
48 - t.datetime "updated_at"
47 + t.datetime "created_at", null: false
48 + t.datetime "updated_at", null: false
49 49 end
50 50
51 - create_table "descriptions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
51 + create_table "descriptions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
52 52 t.text "body"
53 53 t.boolean "markdowned"
54 - t.datetime "created_at"
55 - t.datetime "updated_at"
54 + t.datetime "created_at", null: false
55 + t.datetime "updated_at", null: false
56 56 end
57 57
58 - create_table "grader_configurations", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
58 + create_table "grader_configurations", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", 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"
63 - t.datetime "updated_at"
62 + t.datetime "created_at", null: false
63 + t.datetime "updated_at", null: false
64 64 t.text "description"
65 65 end
66 66
67 - create_table "grader_processes", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
67 + create_table "grader_processes", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", 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"
73 - t.datetime "updated_at"
72 + t.datetime "created_at", null: false
73 + t.datetime "updated_at", null: false
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_host_and_pid"
77 + t.index ["host", "pid"], name: "index_grader_processes_on_ip_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", id: false, 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 - create_table "heart_beats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
98 + create_table "heart_beats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
98 99 t.integer "user_id"
99 100 t.string "ip_address"
100 - t.datetime "created_at"
101 - t.datetime "updated_at"
101 + t.datetime "created_at", null: false
102 + t.datetime "updated_at", null: false
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=latin1", force: :cascade do |t|
107 + create_table "languages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", 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 - create_table "logins", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
114 + create_table "logins", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
114 115 t.integer "user_id"
115 116 t.string "ip_address"
116 - t.datetime "created_at"
117 - t.datetime "updated_at"
117 + t.datetime "created_at", null: false
118 + t.datetime "updated_at", null: false
118 119 end
119 120
120 - create_table "messages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
121 + create_table "messages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
121 122 t.integer "sender_id"
122 123 t.integer "receiver_id"
123 124 t.integer "replying_message_id"
124 125 t.text "body"
125 126 t.boolean "replied"
126 - t.datetime "created_at"
127 - t.datetime "updated_at"
127 + t.datetime "created_at", null: false
128 + t.datetime "updated_at", null: false
128 129 end
129 130
130 - create_table "problems", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
131 + create_table "problems", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
131 132 t.string "name", limit: 30
132 133 t.string "full_name"
133 134 t.integer "full_score"
134 135 t.date "date_added"
135 136 t.boolean "available"
136 137 t.string "url"
137 138 t.integer "description_id"
138 139 t.boolean "test_allowed"
139 140 t.boolean "output_only"
140 141 t.string "description_filename"
141 142 t.boolean "view_testcase"
142 143 end
143 144
144 145 create_table "problems_tags", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
145 146 t.integer "problem_id"
146 147 t.integer "tag_id"
147 148 t.index ["problem_id", "tag_id"], name: "index_problems_tags_on_problem_id_and_tag_id", unique: true
148 149 t.index ["problem_id"], name: "index_problems_tags_on_problem_id"
149 150 t.index ["tag_id"], name: "index_problems_tags_on_tag_id"
150 151 end
151 152
152 - create_table "rights", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
153 + create_table "rights", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
153 154 t.string "name"
154 155 t.string "controller"
155 156 t.string "action"
156 157 end
157 158
158 - create_table "rights_roles", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
159 + create_table "rights_roles", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
159 160 t.integer "right_id"
160 161 t.integer "role_id"
161 162 t.index ["role_id"], name: "index_rights_roles_on_role_id"
162 163 end
163 164
164 - create_table "roles", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
165 + create_table "roles", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
165 166 t.string "name"
166 167 end
167 168
168 - create_table "roles_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
169 + create_table "roles_users", id: false, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
169 170 t.integer "role_id"
170 171 t.integer "user_id"
171 172 t.index ["user_id"], name: "index_roles_users_on_user_id"
172 173 end
173 174
174 - create_table "sessions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
175 + create_table "sessions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
175 176 t.string "session_id"
176 177 t.text "data"
177 178 t.datetime "updated_at"
178 179 t.index ["session_id"], name: "index_sessions_on_session_id"
179 180 t.index ["updated_at"], name: "index_sessions_on_updated_at"
180 181 end
181 182
182 - create_table "sites", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
183 + create_table "sites", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
183 184 t.string "name"
184 185 t.boolean "started"
185 186 t.datetime "start_time"
186 - t.datetime "created_at"
187 - t.datetime "updated_at"
187 + t.datetime "created_at", null: false
188 + t.datetime "updated_at", null: false
188 189 t.integer "country_id"
189 190 t.string "password"
190 191 end
191 192
192 - create_table "submission_view_logs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
193 + create_table "submission_view_logs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
193 194 t.integer "user_id"
194 195 t.integer "submission_id"
195 - t.datetime "created_at"
196 - t.datetime "updated_at"
196 + t.datetime "created_at", null: false
197 + t.datetime "updated_at", null: false
197 198 end
198 199
199 - create_table "submissions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
200 + create_table "submissions", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
200 201 t.integer "user_id"
201 202 t.integer "problem_id"
202 203 t.integer "language_id"
203 204 t.text "source", limit: 16777215
204 205 t.binary "binary"
205 206 t.datetime "submitted_at"
206 207 t.datetime "compiled_at"
207 208 t.text "compiler_message"
208 209 t.datetime "graded_at"
209 210 t.integer "points"
210 211 t.text "grader_comment"
211 212 t.integer "number"
@@ -217,91 +218,91
217 218 t.index ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true
218 219 t.index ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id"
219 220 end
220 221
221 222 create_table "tags", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
222 223 t.string "name", null: false
223 224 t.text "description"
224 225 t.boolean "public"
225 226 t.datetime "created_at", null: false
226 227 t.datetime "updated_at", null: false
227 228 end
228 229
229 - create_table "tasks", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
230 + create_table "tasks", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
230 231 t.integer "submission_id"
231 232 t.datetime "created_at"
232 233 t.integer "status"
233 234 t.datetime "updated_at"
234 235 t.index ["submission_id"], name: "index_tasks_on_submission_id"
235 236 end
236 237
237 - create_table "test_pairs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
238 + create_table "test_pairs", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
238 239 t.integer "problem_id"
239 240 t.text "input", limit: 16777215
240 241 t.text "solution", limit: 16777215
241 - t.datetime "created_at"
242 - t.datetime "updated_at"
242 + t.datetime "created_at", null: false
243 + t.datetime "updated_at", null: false
243 244 end
244 245
245 - create_table "test_requests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
246 + create_table "test_requests", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
246 247 t.integer "user_id"
247 248 t.integer "problem_id"
248 249 t.integer "submission_id"
249 250 t.string "input_file_name"
250 251 t.string "output_file_name"
251 252 t.string "running_stat"
252 253 t.integer "status"
253 - t.datetime "updated_at"
254 + t.datetime "updated_at", null: false
254 255 t.datetime "submitted_at"
255 256 t.datetime "compiled_at"
256 257 t.text "compiler_message"
257 258 t.datetime "graded_at"
258 259 t.string "grader_comment"
259 - t.datetime "created_at"
260 + t.datetime "created_at", null: false
260 261 t.float "running_time"
261 262 t.string "exit_status"
262 263 t.integer "memory_usage"
263 264 t.index ["user_id", "problem_id"], name: "index_test_requests_on_user_id_and_problem_id"
264 265 end
265 266
266 267 create_table "testcases", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
267 268 t.integer "problem_id"
268 269 t.integer "num"
269 270 t.integer "group"
270 271 t.integer "score"
271 272 t.text "input", limit: 4294967295
272 273 t.text "sol", limit: 4294967295
273 274 t.datetime "created_at"
274 275 t.datetime "updated_at"
275 276 t.index ["problem_id"], name: "index_testcases_on_problem_id"
276 277 end
277 278
278 - create_table "user_contest_stats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
279 + create_table "user_contest_stats", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
279 280 t.integer "user_id"
280 281 t.datetime "started_at"
281 - t.datetime "created_at"
282 - t.datetime "updated_at"
282 + t.datetime "created_at", null: false
283 + t.datetime "updated_at", null: false
283 284 t.boolean "forced_logout"
284 285 end
285 286
286 - create_table "users", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t|
287 + create_table "users", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t|
287 288 t.string "login", limit: 50
288 289 t.string "full_name"
289 290 t.string "hashed_password"
290 291 t.string "salt", limit: 5
291 292 t.string "alias"
292 293 t.string "email"
293 294 t.integer "site_id"
294 295 t.integer "country_id"
295 296 t.boolean "activated", default: false
296 297 t.datetime "created_at"
297 298 t.datetime "updated_at"
298 - t.string "section"
299 299 t.boolean "enabled", default: true
300 300 t.string "remark"
301 301 t.string "last_ip"
302 + t.string "section"
302 303 t.index ["login"], name: "index_users_on_login", unique: true
303 304 end
304 305
305 306 add_foreign_key "problems_tags", "problems"
306 307 add_foreign_key "problems_tags", "tags"
307 308 end
You need to be logged in to leave comments. Login now