Description:
Merge pull request #23 from nattee/master
some bug fix
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r768:f22301d0d070 - - 7 files changed: 12 inserted, 5 deleted
| @@ -0,0 +1,5 | |||
|
|
1 | + class ChangeSubmissionSourceSize < ActiveRecord::Migration | |
|
|
2 | + def change | |
|
|
3 | + change_column :submissions, :source, :text, :limit => 1.megabyte | |
|
|
4 | + end | |
|
|
5 | + end | |
| @@ -166,49 +166,49 | |||
|
|
166 | 166 | return |
|
|
167 | 167 | end |
|
|
168 | 168 | @submissions = Submission.includes(:user).includes(:language).where(problem_id: params[:id]).order(:user_id,:id) |
|
|
169 | 169 | |
|
|
170 | 170 | #stat summary |
|
|
171 | 171 | range =65 |
|
|
172 | 172 | @histogram = { data: Array.new(range,0), summary: {} } |
|
|
173 | 173 | user = Hash.new(0) |
|
|
174 | 174 | @submissions.find_each do |sub| |
|
|
175 | 175 | d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60 |
|
|
176 | 176 | @histogram[:data][d.to_i] += 1 if d < range |
|
|
177 | 177 | user[sub.user_id] = [user[sub.user_id], ((sub.try(:points) || 0) >= @problem.full_score) ? 1 : 0].max |
|
|
178 | 178 | end |
|
|
179 | 179 | @histogram[:summary][:max] = [@histogram[:data].max,1].max |
|
|
180 | 180 | |
|
|
181 | 181 | @summary = { attempt: user.count, solve: 0 } |
|
|
182 | 182 | user.each_value { |v| @summary[:solve] += 1 if v == 1 } |
|
|
183 | 183 | end |
|
|
184 | 184 | |
|
|
185 | 185 | def manage |
|
|
186 | 186 | @problems = Problem.order(date_added: :desc) |
|
|
187 | 187 | end |
|
|
188 | 188 | |
|
|
189 | 189 | def do_manage |
|
|
190 | - if params.has_key? 'change_date_added' | |
|
|
190 | + if params.has_key? 'change_date_added' and params[:date_added].strip.empty? == false | |
|
|
191 | 191 | change_date_added |
|
|
192 | 192 | elsif params.has_key? 'add_to_contest' |
|
|
193 | 193 | add_to_contest |
|
|
194 | 194 | elsif params.has_key? 'enable_problem' |
|
|
195 | 195 | set_available(true) |
|
|
196 | 196 | elsif params.has_key? 'disable_problem' |
|
|
197 | 197 | set_available(false) |
|
|
198 | 198 | elsif params.has_key? 'add_group' |
|
|
199 | 199 | group = Group.find(params[:group_id]) |
|
|
200 | 200 | ok = [] |
|
|
201 | 201 | failed = [] |
|
|
202 | 202 | get_problems_from_params.each do |p| |
|
|
203 | 203 | begin |
|
|
204 | 204 | group.problems << p |
|
|
205 | 205 | ok << p.full_name |
|
|
206 | 206 | rescue => e |
|
|
207 | 207 | failed << p.full_name |
|
|
208 | 208 | end |
|
|
209 | 209 | end |
|
|
210 | 210 | flash[:success] = "The following problems are added to the group #{group.name}: " + ok.join(', ') if ok.count > 0 |
|
|
211 | 211 | flash[:alert] = "The following problems are already in the group #{group.name}: " + failed.join(', ') if failed.count > 0 |
|
|
212 | 212 | elsif params.has_key? 'add_tags' |
|
|
213 | 213 | get_problems_from_params.each do |p| |
|
|
214 | 214 | p.tag_ids += params[:tag_ids] |
| @@ -22,49 +22,49 | |||
|
|
22 | 22 | |
|
|
23 | 23 | #rencer accordingly |
|
|
24 | 24 | if params[:button] == 'download' then |
|
|
25 | 25 | csv = gen_csv_from_scorearray(@scorearray,@problems) |
|
|
26 | 26 | send_data csv, filename: 'max_score.csv' |
|
|
27 | 27 | else |
|
|
28 | 28 | #render template: 'user_admin/user_stat' |
|
|
29 | 29 | render 'current_score' |
|
|
30 | 30 | end |
|
|
31 | 31 | end |
|
|
32 | 32 | |
|
|
33 | 33 | def show_max_score |
|
|
34 | 34 | #process parameters |
|
|
35 | 35 | #problems |
|
|
36 | 36 | @problems = [] |
|
|
37 | 37 | if params[:problem_id] |
|
|
38 | 38 | params[:problem_id].each do |id| |
|
|
39 | 39 | next unless id.strip != "" |
|
|
40 | 40 | pid = Problem.find_by_id(id.to_i) |
|
|
41 | 41 | @problems << pid if pid |
|
|
42 | 42 | end |
|
|
43 | 43 | end |
|
|
44 | 44 | |
|
|
45 | 45 | #users |
|
|
46 | - @users = if params[:user] == "all" then | |
|
|
46 | + @users = if params[:users] == "all" then | |
|
|
47 | 47 | User.includes(:contests).includes(:contest_stat) |
|
|
48 | 48 | else |
|
|
49 | 49 | User.includes(:contests).includes(:contest_stat).where(enabled: true) |
|
|
50 | 50 | end |
|
|
51 | 51 | |
|
|
52 | 52 | #set up range from param |
|
|
53 | 53 | @since_id = params.fetch(:from_id, 0).to_i |
|
|
54 | 54 | @until_id = params.fetch(:to_id, 0).to_i |
|
|
55 | 55 | @since_id = nil if @since_id == 0 |
|
|
56 | 56 | @until_id = nil if @until_id == 0 |
|
|
57 | 57 | |
|
|
58 | 58 | #calculate the routine |
|
|
59 | 59 | @scorearray = calculate_max_score(@problems, @users, @since_id, @until_id) |
|
|
60 | 60 | |
|
|
61 | 61 | #rencer accordingly |
|
|
62 | 62 | if params[:button] == 'download' then |
|
|
63 | 63 | csv = gen_csv_from_scorearray(@scorearray,@problems) |
|
|
64 | 64 | send_data csv, filename: 'max_score.csv' |
|
|
65 | 65 | else |
|
|
66 | 66 | #render template: 'user_admin/user_stat' |
|
|
67 | 67 | render 'max_score' |
|
|
68 | 68 | end |
|
|
69 | 69 | |
|
|
70 | 70 | end |
| @@ -1,35 +1,35 | |||
|
|
1 | 1 | class Submission < ActiveRecord::Base |
|
|
2 | 2 | |
|
|
3 | 3 | belongs_to :language |
|
|
4 | 4 | belongs_to :problem |
|
|
5 | 5 | belongs_to :user |
|
|
6 | 6 | |
|
|
7 | 7 | before_validation :assign_problem |
|
|
8 | 8 | before_validation :assign_language |
|
|
9 | 9 | |
|
|
10 | 10 | validates_presence_of :source |
|
|
11 | - validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'too long' | |
|
|
11 | + validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'code too long, the limit is 100,000 bytes' | |
|
|
12 | 12 | validates_length_of :source, :minimum => 1, :allow_blank => true, :message => 'too short' |
|
|
13 | 13 | validate :must_have_valid_problem |
|
|
14 | 14 | validate :must_specify_language |
|
|
15 | 15 | |
|
|
16 | 16 | has_one :task |
|
|
17 | 17 | |
|
|
18 | 18 | before_save :assign_latest_number_if_new_recond |
|
|
19 | 19 | |
|
|
20 | 20 | def self.find_last_by_user_and_problem(user_id, problem_id) |
|
|
21 | 21 | where("user_id = ? AND problem_id = ?",user_id,problem_id).last |
|
|
22 | 22 | end |
|
|
23 | 23 | |
|
|
24 | 24 | def self.find_all_last_by_problem(problem_id) |
|
|
25 | 25 | # need to put in SQL command, maybe there's a better way |
|
|
26 | 26 | Submission.includes(:user).find_by_sql("SELECT * FROM submissions " + |
|
|
27 | 27 | "WHERE id = " + |
|
|
28 | 28 | "(SELECT MAX(id) FROM submissions AS subs " + |
|
|
29 | 29 | "WHERE subs.user_id = submissions.user_id AND " + |
|
|
30 | 30 | "problem_id = " + problem_id.to_s + " " + |
|
|
31 | 31 | "GROUP BY user_id) " + |
|
|
32 | 32 | "ORDER BY user_id") |
|
|
33 | 33 | end |
|
|
34 | 34 | |
|
|
35 | 35 | def self.find_in_range_by_user_and_problem(user_id, problem_id,since_id,until_id) |
| @@ -89,30 +89,31 | |||
|
|
89 | 89 | %th Contests |
|
|
90 | 90 | |
|
|
91 | 91 | %tbody |
|
|
92 | 92 | - num = 0 |
|
|
93 | 93 | - for problem in @problems |
|
|
94 | 94 | - num += 1 |
|
|
95 | 95 | %tr{:id => "row-prob-#{problem.id}", :name=> "prob-#{problem.id}"} |
|
|
96 | 96 | %td= check_box_tag "prob-#{problem.id}-#{num}" |
|
|
97 | 97 | %td= problem.name |
|
|
98 | 98 | %td= problem.full_name |
|
|
99 | 99 | %td |
|
|
100 | 100 | - problem.tags.each do |t| |
|
|
101 | 101 | %span.label.label-default= t.name |
|
|
102 | 102 | %td= problem.available |
|
|
103 | 103 | %td= problem.date_added |
|
|
104 | 104 | - if GraderConfiguration.multicontests? |
|
|
105 | 105 | %td |
|
|
106 | 106 | - problem.contests.each do |contest| |
|
|
107 | 107 | = "(#{contest.name} [#{link_to 'x', :action => 'remove_contest', :id => problem.id, :contest_id => contest.id }])" |
|
|
108 | 108 | |
|
|
109 | 109 | :javascript |
|
|
110 | 110 | $('.input-group.date').datetimepicker({ |
|
|
111 | 111 | format: 'DD/MMM/YYYY', |
|
|
112 | 112 | showTodayButton: true, |
|
|
113 | + locale: 'en', | |
|
|
113 | 114 | widgetPositioning: {horizontal: 'auto', vertical: 'bottom'}, |
|
|
114 | 115 | |
|
|
115 | 116 | }); |
|
|
116 | 117 | $('.datatable').DataTable({ |
|
|
117 | 118 | paging: false |
|
|
118 | 119 | }); |
| @@ -10,27 +10,28 | |||
|
|
10 | 10 | = f.label :password, "Password" |
|
|
11 | 11 | = f.text_field :password, class: 'form-control' |
|
|
12 | 12 | .form-group.field |
|
|
13 | 13 | = f.label :started, "Started" |
|
|
14 | 14 | = f.check_box :started, class: 'form-control' |
|
|
15 | 15 | .form-group.field |
|
|
16 | 16 | = f.label :start_time, "Start time" |
|
|
17 | 17 | -# = f.datetime_select :start_time, :include_blank => true |
|
|
18 | 18 | .input-group.date |
|
|
19 | 19 | = f.text_field :start_time, class:'form-control' , value: (@site.start_time ? @site.start_time.strftime('%d/%b/%Y %H:%M') : '') |
|
|
20 | 20 | %span.input-group-addon |
|
|
21 | 21 | %span.glyphicon.glyphicon-calendar |
|
|
22 | 22 | .actions |
|
|
23 | 23 | = f.submit "Update", class: 'btn btn-primary' |
|
|
24 | 24 | .col-md-8 |
|
|
25 | 25 | |
|
|
26 | 26 | = link_to 'Show', @site |
|
|
27 | 27 | | |
|
|
28 | 28 | = link_to 'Back', sites_path |
|
|
29 | 29 | |
|
|
30 | 30 | |
|
|
31 | 31 | :javascript |
|
|
32 | 32 | $('.input-group.date').datetimepicker({ |
|
|
33 | 33 | format: 'DD/MMM/YYYY HH:mm', |
|
|
34 | + locale: 'en', | |
|
|
34 | 35 | showTodayButton: true, |
|
|
35 | 36 | }); |
|
|
36 | 37 | |
| @@ -1,38 +1,38 | |||
|
|
1 | 1 | # encoding: UTF-8 |
|
|
2 | 2 | # This file is auto-generated from the current state of the database. Instead |
|
|
3 | 3 | # of editing this file, please use the migrations feature of Active Record to |
|
|
4 | 4 | # incrementally modify your database, and then regenerate this schema definition. |
|
|
5 | 5 | # |
|
|
6 | 6 | # Note that this schema.rb definition is the authoritative source for your |
|
|
7 | 7 | # database schema. If you need to create the application database on another |
|
|
8 | 8 | # system, you should be using db:schema:load, not running all the migrations |
|
|
9 | 9 | # from scratch. The latter is a flawed and unsustainable approach (the more migrations |
|
|
10 | 10 | # you'll amass, the slower it'll run and the greater likelihood for issues). |
|
|
11 | 11 | # |
|
|
12 | 12 | # It's strongly recommended that you check this file into your version control system. |
|
|
13 | 13 | |
|
|
14 |
- ActiveRecord::Schema.define(version: 201 |
|
|
|
14 | + ActiveRecord::Schema.define(version: 20180612102327) do | |
|
|
15 | 15 | |
|
|
16 | 16 | create_table "announcements", force: :cascade do |t| |
|
|
17 | 17 | t.string "author", limit: 255 |
|
|
18 | 18 | t.text "body", limit: 65535 |
|
|
19 | 19 | t.boolean "published" |
|
|
20 | 20 | t.datetime "created_at", null: false |
|
|
21 | 21 | t.datetime "updated_at", null: false |
|
|
22 | 22 | t.boolean "frontpage", default: false |
|
|
23 | 23 | t.boolean "contest_only", default: false |
|
|
24 | 24 | t.string "title", limit: 255 |
|
|
25 | 25 | t.string "notes", limit: 255 |
|
|
26 | 26 | end |
|
|
27 | 27 | |
|
|
28 | 28 | create_table "contests", force: :cascade do |t| |
|
|
29 | 29 | t.string "title", limit: 255 |
|
|
30 | 30 | t.boolean "enabled" |
|
|
31 | 31 | t.datetime "created_at", null: false |
|
|
32 | 32 | t.datetime "updated_at", null: false |
|
|
33 | 33 | t.string "name", limit: 255 |
|
|
34 | 34 | end |
|
|
35 | 35 | |
|
|
36 | 36 | create_table "contests_problems", id: false, force: :cascade do |t| |
|
|
37 | 37 | t.integer "contest_id", limit: 4 |
|
|
38 | 38 | t.integer "problem_id", limit: 4 |
| @@ -188,49 +188,49 | |||
|
|
188 | 188 | add_index "sessions", ["session_id"], name: "index_sessions_on_session_id", using: :btree |
|
|
189 | 189 | add_index "sessions", ["updated_at"], name: "index_sessions_on_updated_at", using: :btree |
|
|
190 | 190 | |
|
|
191 | 191 | create_table "sites", force: :cascade do |t| |
|
|
192 | 192 | t.string "name", limit: 255 |
|
|
193 | 193 | t.boolean "started" |
|
|
194 | 194 | t.datetime "start_time" |
|
|
195 | 195 | t.datetime "created_at", null: false |
|
|
196 | 196 | t.datetime "updated_at", null: false |
|
|
197 | 197 | t.integer "country_id", limit: 4 |
|
|
198 | 198 | t.string "password", limit: 255 |
|
|
199 | 199 | end |
|
|
200 | 200 | |
|
|
201 | 201 | create_table "submission_view_logs", force: :cascade do |t| |
|
|
202 | 202 | t.integer "user_id", limit: 4 |
|
|
203 | 203 | t.integer "submission_id", limit: 4 |
|
|
204 | 204 | t.datetime "created_at", null: false |
|
|
205 | 205 | t.datetime "updated_at", null: false |
|
|
206 | 206 | end |
|
|
207 | 207 | |
|
|
208 | 208 | create_table "submissions", force: :cascade do |t| |
|
|
209 | 209 | t.integer "user_id", limit: 4 |
|
|
210 | 210 | t.integer "problem_id", limit: 4 |
|
|
211 | 211 | t.integer "language_id", limit: 4 |
|
|
212 |
- t.text "source", limit: |
|
|
|
212 | + t.text "source", limit: 16777215 | |
|
|
213 | 213 | t.binary "binary", limit: 65535 |
|
|
214 | 214 | t.datetime "submitted_at" |
|
|
215 | 215 | t.datetime "compiled_at" |
|
|
216 | 216 | t.text "compiler_message", limit: 65535 |
|
|
217 | 217 | t.datetime "graded_at" |
|
|
218 | 218 | t.integer "points", limit: 4 |
|
|
219 | 219 | t.text "grader_comment", limit: 65535 |
|
|
220 | 220 | t.integer "number", limit: 4 |
|
|
221 | 221 | t.string "source_filename", limit: 255 |
|
|
222 | 222 | t.float "max_runtime", limit: 24 |
|
|
223 | 223 | t.integer "peak_memory", limit: 4 |
|
|
224 | 224 | t.integer "effective_code_length", limit: 4 |
|
|
225 | 225 | t.string "ip_address", limit: 255 |
|
|
226 | 226 | end |
|
|
227 | 227 | |
|
|
228 | 228 | add_index "submissions", ["user_id", "problem_id", "number"], name: "index_submissions_on_user_id_and_problem_id_and_number", unique: true, using: :btree |
|
|
229 | 229 | add_index "submissions", ["user_id", "problem_id"], name: "index_submissions_on_user_id_and_problem_id", using: :btree |
|
|
230 | 230 | |
|
|
231 | 231 | create_table "tags", force: :cascade do |t| |
|
|
232 | 232 | t.string "name", limit: 255, null: false |
|
|
233 | 233 | t.text "description", limit: 65535 |
|
|
234 | 234 | t.boolean "public" |
|
|
235 | 235 | t.datetime "created_at", null: false |
|
|
236 | 236 | t.datetime "updated_at", null: false |
You need to be logged in to leave comments.
Login now