Description:
merge
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r837:b9faf3362123 - - 7 files changed: 24 inserted, 11 deleted
| @@ -73,7 +73,7 | |||
|
|
73 | 73 | @submission.submitted_at = Time.new.gmtime |
|
|
74 | 74 | @submission.ip_address = request.remote_ip |
|
|
75 | 75 | |
|
|
76 |
- if GraderConfiguration.time_limit_mode? |
|
|
|
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 |
| @@ -19,7 +19,7 | |||
|
|
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 |
| @@ -50,10 +50,12 | |||
|
|
50 | 50 | end |
|
|
51 | 51 | |
|
|
52 | 52 | #users |
|
|
53 |
- @users = if params[:users] == " |
|
|
|
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 |
| @@ -95,7 +95,7 | |||
|
|
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?(' |
|
|
|
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 |
| @@ -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" |
| @@ -39,6 +39,11 | |||
|
|
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" |
| @@ -89,7 +89,7 | |||
|
|
89 | 89 | t.index ["group_id", "problem_id"], name: "index_groups_problems_on_group_id_and_problem_id" |
|
|
90 | 90 | end |
|
|
91 | 91 | |
|
|
92 |
- create_table "groups_users" |
|
|
|
92 | + create_table "groups_users", options: "ENGINE=InnoDB DEFAULT CHARSET=latin1", force: :cascade do |t| | |
|
|
93 | 93 | t.integer "group_id", null: false |
|
|
94 | 94 | t.integer "user_id", null: false |
|
|
95 | 95 | t.index ["user_id", "group_id"], name: "index_groups_users_on_user_id_and_group_id" |
| @@ -116,6 +116,7 | |||
|
|
116 | 116 | t.string "ip_address" |
|
|
117 | 117 | t.datetime "created_at", null: false |
|
|
118 | 118 | t.datetime "updated_at", null: false |
|
|
119 | + t.index ["user_id"], name: "index_logins_on_user_id" | |
|
|
119 | 120 | end |
|
|
120 | 121 | |
|
|
121 | 122 | create_table "messages", id: :integer, options: "ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci", force: :cascade do |t| |
| @@ -215,6 +216,7 | |||
|
|
215 | 216 | t.integer "peak_memory" |
|
|
216 | 217 | t.integer "effective_code_length" |
|
|
217 | 218 | t.string "ip_address" |
|
|
219 | + t.index ["submitted_at"], name: "index_submissions_on_submitted_at" | |
|
|
218 | 220 | t.index ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true |
|
|
219 | 221 | t.index ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id" |
|
|
220 | 222 | end |
You need to be logged in to leave comments.
Login now