Description:
merge from java-bm, fix profile issue and modify application.rb.SAMPLE
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r436:cafc387838eb - - 4 files changed: 34 inserted, 29 deleted
| @@ -13,6 +13,7 | |||
|
|
13 | 13 | </tr> |
|
|
14 | 14 | <% count = 0 %> |
|
|
15 | 15 | <% @submissions.each do |sub| %> |
|
|
16 | + <% next unless sub.user %> | |
|
|
16 | 17 | <tr class="<%= (count % 2 ==0) ? "info-even" : "info-odd" %>"> |
|
|
17 | 18 | <td><%= sub.user.login %></td> |
|
|
18 | 19 | <td><%= sub.user.full_name if sub.user %></td> |
| @@ -6,6 +6,11 | |||
|
|
6 | 6 | $('#submission_table').tablesorter({widgets: ['zebra','filter']}); |
|
|
7 | 7 | }); |
|
|
8 | 8 | |
|
|
9 | + :css | |
|
|
10 | + .fix-width { | |
|
|
11 | + font-family: Droid Sans Mono,Consolas, monospace, mono, Courier New, Courier; | |
|
|
12 | + } | |
|
|
13 | + | |
|
|
9 | 14 | %h1= @user.full_name + ' Profile' |
|
|
10 | 15 | |
|
|
11 | 16 | %h2 Basic info |
| @@ -28,12 +33,13 | |||
|
|
28 | 33 | %th Score |
|
|
29 | 34 | %tbody |
|
|
30 | 35 | - @submission.each do |s| |
|
|
36 | + - next unless s.problem | |
|
|
31 | 37 | %tr |
|
|
32 | 38 | %td= link_to "#{s.id}", controller: "graders", action: "submission", id: s.id |
|
|
33 | 39 | %td= s.problem.name |
|
|
34 | 40 | %td= s.problem.full_name |
|
|
35 | 41 | %td= s.language.pretty_name |
|
|
36 | - %td{style: 'font-family: Droid Sans Mono,Consolas, monospace, mono'}= s.grader_comment | |
|
|
42 | + %td.fix-width= s.grader_comment | |
|
|
37 | 43 | %td= s.points/s.problem.full_score * 100 |
|
|
38 | 44 | |
|
|
39 | 45 | |
| @@ -60,5 +60,6 | |||
|
|
60 | 60 | config.assets.version = '1.0' |
|
|
61 | 61 | |
|
|
62 | 62 | config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js','graders.css','problems.css'] |
|
|
63 | + config.assets.precompile += ['new.js','tablesorter-theme.cafe.css'] | |
|
|
63 | 64 | end |
|
|
64 | 65 | end |
| @@ -15,12 +15,12 | |||
|
|
15 | 15 | |
|
|
16 | 16 | create_table "announcements", :force => true do |t| |
|
|
17 | 17 | t.string "author" |
|
|
18 | - t.text "body" | |
|
|
18 | + t.text "body", :limit => 16777215 | |
|
|
19 | 19 | t.boolean "published" |
|
|
20 | - t.datetime "created_at", :null => false | |
|
|
21 | - t.datetime "updated_at", :null => false | |
|
|
22 | - t.boolean "frontpage", :default => false | |
|
|
23 | - t.boolean "contest_only", :default => false | |
|
|
20 | + t.datetime "created_at", :null => false | |
|
|
21 | + t.datetime "updated_at", :null => false | |
|
|
22 | + t.boolean "frontpage", :default => false | |
|
|
23 | + t.boolean "contest_only", :default => false | |
|
|
24 | 24 | t.string "title" |
|
|
25 | 25 | t.string "notes" |
|
|
26 | 26 | end |
| @@ -50,19 +50,19 | |||
|
|
50 | 50 | end |
|
|
51 | 51 | |
|
|
52 | 52 | create_table "descriptions", :force => true do |t| |
|
|
53 | - t.text "body" | |
|
|
53 | + t.text "body", :limit => 16777215 | |
|
|
54 | 54 | t.boolean "markdowned" |
|
|
55 | - t.datetime "created_at", :null => false | |
|
|
56 | - t.datetime "updated_at", :null => false | |
|
|
55 | + t.datetime "created_at", :null => false | |
|
|
56 | + t.datetime "updated_at", :null => false | |
|
|
57 | 57 | end |
|
|
58 | 58 | |
|
|
59 | 59 | create_table "grader_configurations", :force => true do |t| |
|
|
60 | 60 | t.string "key" |
|
|
61 | 61 | t.string "value_type" |
|
|
62 | 62 | t.string "value" |
|
|
63 | - t.datetime "created_at", :null => false | |
|
|
64 | - t.datetime "updated_at", :null => false | |
|
|
65 | - t.text "description" | |
|
|
63 | + t.datetime "created_at", :null => false | |
|
|
64 | + t.datetime "updated_at", :null => false | |
|
|
65 | + t.text "description", :limit => 16777215 | |
|
|
66 | 66 | end |
|
|
67 | 67 | |
|
|
68 | 68 | create_table "grader_processes", :force => true do |t| |
| @@ -97,10 +97,10 | |||
|
|
97 | 97 | t.integer "sender_id" |
|
|
98 | 98 | t.integer "receiver_id" |
|
|
99 | 99 | t.integer "replying_message_id" |
|
|
100 | - t.text "body" | |
|
|
100 | + t.text "body", :limit => 16777215 | |
|
|
101 | 101 | t.boolean "replied" |
|
|
102 | - t.datetime "created_at", :null => false | |
|
|
103 | - t.datetime "updated_at", :null => false | |
|
|
102 | + t.datetime "created_at", :null => false | |
|
|
103 | + t.datetime "updated_at", :null => false | |
|
|
104 | 104 | end |
|
|
105 | 105 | |
|
|
106 | 106 | create_table "problems", :force => true do |t| |
| @@ -142,7 +142,7 | |||
|
|
142 | 142 | |
|
|
143 | 143 | create_table "sessions", :force => true do |t| |
|
|
144 | 144 | t.string "session_id" |
|
|
145 | - t.text "data" | |
|
|
145 | + t.text "data", :limit => 16777215 | |
|
|
146 | 146 | t.datetime "updated_at" |
|
|
147 | 147 | end |
|
|
148 | 148 | |
| @@ -163,19 +163,16 | |||
|
|
163 | 163 | t.integer "user_id" |
|
|
164 | 164 | t.integer "problem_id" |
|
|
165 | 165 | t.integer "language_id" |
|
|
166 | - t.text "source" | |
|
|
166 | + t.text "source", :limit => 16777215 | |
|
|
167 | 167 | t.binary "binary" |
|
|
168 | 168 | t.datetime "submitted_at" |
|
|
169 | 169 | t.datetime "compiled_at" |
|
|
170 | - t.text "compiler_message" | |
|
|
170 | + t.text "compiler_message", :limit => 16777215 | |
|
|
171 | 171 | t.datetime "graded_at" |
|
|
172 | 172 | t.integer "points" |
|
|
173 | - t.text "grader_comment" | |
|
|
173 | + t.text "grader_comment", :limit => 16777215 | |
|
|
174 | 174 | t.integer "number" |
|
|
175 | 175 | t.string "source_filename" |
|
|
176 | - t.float "max_runtime" | |
|
|
177 | - t.integer "peak_memory" | |
|
|
178 | - t.integer "effective_code_length" | |
|
|
179 | 176 | end |
|
|
180 | 177 | |
|
|
181 | 178 | add_index "submissions", ["user_id", "problem_id", "number"], :name => "index_submissions_on_user_id_and_problem_id_and_number", :unique => true |
| @@ -190,10 +187,10 | |||
|
|
190 | 187 | |
|
|
191 | 188 | create_table "test_pairs", :force => true do |t| |
|
|
192 | 189 | t.integer "problem_id" |
|
|
193 |
- t.text "input", :limit => |
|
|
|
194 |
- t.text "solution", :limit => |
|
|
|
195 | - t.datetime "created_at", :null => false | |
|
|
196 | - t.datetime "updated_at", :null => false | |
|
|
190 | + t.text "input", :limit => 2147483647 | |
|
|
191 | + t.text "solution", :limit => 2147483647 | |
|
|
192 | + t.datetime "created_at", :null => false | |
|
|
193 | + t.datetime "updated_at", :null => false | |
|
|
197 | 194 | end |
|
|
198 | 195 | |
|
|
199 | 196 | create_table "test_requests", :force => true do |t| |
| @@ -204,13 +201,13 | |||
|
|
204 | 201 | t.string "output_file_name" |
|
|
205 | 202 | t.string "running_stat" |
|
|
206 | 203 | t.integer "status" |
|
|
207 | - t.datetime "updated_at", :null => false | |
|
|
204 | + t.datetime "updated_at", :null => false | |
|
|
208 | 205 | t.datetime "submitted_at" |
|
|
209 | 206 | t.datetime "compiled_at" |
|
|
210 | - t.text "compiler_message" | |
|
|
207 | + t.text "compiler_message", :limit => 16777215 | |
|
|
211 | 208 | t.datetime "graded_at" |
|
|
212 | 209 | t.string "grader_comment" |
|
|
213 | - t.datetime "created_at", :null => false | |
|
|
210 | + t.datetime "created_at", :null => false | |
|
|
214 | 211 | t.float "running_time" |
|
|
215 | 212 | t.string "exit_status" |
|
|
216 | 213 | t.integer "memory_usage" |
You need to be logged in to leave comments.
Login now