cafe-grader-web Commit - r436:cafc387838eb

cafe-grader-web

Commit `r436:cafc387838eb` public

parent | child

Description:

merge from java-bm, fix profile issue and modify application.rb.SAMPLE

Commit status:

[Not Reviewed]

References:

merge algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r436:cafc387838eb - Sat, 13 Sep 2014 09:49:57 - 4 files changed: 34 inserted, 29 deleted

app/views/problems/stat.html.erb ¶ +1

               <% if @submissions!=nil %>
                 <table class="info">
                 <tr class="info-head">
                   <th>login</th>
                   <th>name</th>
                   <th>submitted_at</th>
                   <th>points</th>
                   <th>comment</th>
                 </tr>
                 <% count = 0 %>
                 <% @submissions.each do |sub| %>
+            +     <% next unless sub.user %>
                   <tr class="<%= (count % 2 ==0) ? "info-even" : "info-odd" %>">
                   <td><%= sub.user.login %></td>
                   <td><%= sub.user.full_name if sub.user %></td>
                   <td><%= sub.submitted_at.to_s %></td>
                   <td><%= sub.points %></td>
                   <td><div style="font-family: monospace"><%= sub.grader_comment %></div></td>
                   </tr>
                   <% count += 1 %>
                 <% end %>
                 </table>
               <% else %>
               No submission

app/views/users/profile.html.haml ¶ +7 -1

               - content_for :header do
                 = javascript_include_tag 'new'
               %script{:type=>"text/javascript"}
                 $(function () {
                 $('#submission_table').tablesorter({widgets: ['zebra','filter']});
                 });
+            + :css
+            +   .fix-width {
+            +     font-family: Droid Sans Mono,Consolas, monospace, mono, Courier New, Courier;
+            +   }
+            +
               %h1= @user.full_name + ' Profile'
               %h2 Basic info
               <b>Login:</b> #{@user.login} <br/>
               <b>Full name:</b> #{@user.full_name} <br />
               %h2 Problem Stat
               %h2 Submissions
               %table.tablesorter-cafe#submission_table
                 %thead
                   %tr
                     %th ID
                     %th Problem code
                     %th Problem name
                     %th Language
                     %th Result
                     %th Score
                 %tbody
                   - @submission.each do |s|
+            +       - next unless s.problem
                     %tr
                       %td= link_to "#{s.id}", controller: "graders", action: "submission", id: s.id
                       %td= s.problem.name
                       %td= s.problem.full_name
                       %td= s.language.pretty_name
-            -         %td{style: 'font-family: Droid Sans Mono,Consolas, monospace, mono'}= s.grader_comment
+            +         %td.fix-width= s.grader_comment
                       %td= s.points/s.problem.full_score * 100

config/application.rb.SAMPLE ¶ +1

                   # This will create an empty whitelist of attributes available for mass-assignment for all models
                   # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
                   # parameters by using an attr_accessible or attr_protected declaration.
                   config.active_record.whitelist_attributes = false
                   # Enable the asset pipeline
                   config.assets.enabled = true
                   # Version of your assets, change this if you want to expire all your assets
                   config.assets.version = '1.0'
                   config.assets.precompile += ['announcement_refresh.js','effects.js','site_update.js','graders.css','problems.css']
+            +     config.assets.precompile += ['new.js','tablesorter-theme.cafe.css']
                 end
               end

db/schema.rb ¶ +25 -28

               # Note that this schema.rb definition is the authoritative source for your
               # database schema. If you need to create the application database on another
               # system, you should be using db:schema:load, not running all the migrations
               # from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
               ActiveRecord::Schema.define(:version => 20140826095949) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
-            -     t.text     "body"
+            +     t.text     "body",         :limit => 16777215
                   t.boolean  "published"
-            -     t.datetime "created_at",                      :null => false
+            +     t.datetime "created_at",                                          :null => false
-            -     t.datetime "updated_at",                      :null => false
+            +     t.datetime "updated_at",                                          :null => false
-            -     t.boolean  "frontpage",    :default => false
+            +     t.boolean  "frontpage",                        :default => false
-            -     t.boolean  "contest_only", :default => false
+            +     t.boolean  "contest_only",                     :default => false
                   t.string   "title"
                   t.string   "notes"
                 end
                 create_table "contests", :force => true do |t|
                   t.string   "title"
                   t.boolean  "enabled"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                   t.string   "name"
                 end
                 create_table "contests_users", :id => false, :force => true do |t|
                   t.integer "contest_id"
                   t.integer "user_id"
                 end
                 create_table "countries", :force => true do |t|
                   t.string   "name"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                 end
                 create_table "descriptions", :force => true do |t|
-            -     t.text     "body"
+            +     t.text     "body",       :limit => 16777215
                   t.boolean  "markdowned"
-            -     t.datetime "created_at", :null => false
+            +     t.datetime "created_at",                     :null => false
-            -     t.datetime "updated_at", :null => false
+            +     t.datetime "updated_at",                     :null => false
                 end
                 create_table "grader_configurations", :force => true do |t|
                   t.string   "key"
                   t.string   "value_type"
                   t.string   "value"
-            -     t.datetime "created_at",  :null => false
+            +     t.datetime "created_at",                      :null => false
-            -     t.datetime "updated_at",  :null => false
+            +     t.datetime "updated_at",                      :null => false
-            -     t.text     "description"
+            +     t.text     "description", :limit => 16777215
                 end
                 create_table "grader_processes", :force => true do |t|
                   t.string   "host",       :limit => 20
                   t.integer  "pid"
                   t.string   "mode"
                   t.boolean  "active"
                   t.datetime "created_at",               :null => false
                   t.datetime "updated_at",               :null => false
                   t.integer  "task_id"
                   t.string   "task_type"
                   t.boolean  "terminated"
                 create_table "logins", :force => true do |t|
                   t.string   "user_id"
                   t.string   "ip_address"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                 end
                 create_table "messages", :force => true do |t|
                   t.integer  "sender_id"
                   t.integer  "receiver_id"
                   t.integer  "replying_message_id"
-            -     t.text     "body"
+            +     t.text     "body",                :limit => 16777215
                   t.boolean  "replied"
-            -     t.datetime "created_at",          :null => false
+            +     t.datetime "created_at",                              :null => false
-            -     t.datetime "updated_at",          :null => false
+            +     t.datetime "updated_at",                              :null => false
                 end
                 create_table "problems", :force => true do |t|
                   t.string  "name",                 :limit => 30
                   t.string  "full_name"
                   t.integer "full_score"
                   t.date    "date_added"
                   t.boolean "available"
                   t.string  "url"
                   t.integer "description_id"
                   t.boolean "test_allowed"
                   t.boolean "output_only"
                   t.string "name"
                 end
                 create_table "roles_users", :id => false, :force => true do |t|
                   t.integer "role_id"
                   t.integer "user_id"
                 end
                 add_index "roles_users", ["user_id"], :name => "index_roles_users_on_user_id"
                 create_table "sessions", :force => true do |t|
                   t.string   "session_id"
-            -     t.text     "data"
+            +     t.text     "data",       :limit => 16777215
                   t.datetime "updated_at"
                 end
                 add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
                 add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
                 create_table "sites", :force => true do |t|
                   t.string   "name"
                   t.boolean  "started"
                   t.datetime "start_time"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                   t.integer  "country_id"
                   t.string   "password"
                 end
                 create_table "submissions", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "language_id"
-            -     t.text     "source"
+            +     t.text     "source",           :limit => 16777215
                   t.binary   "binary"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message"
+            +     t.text     "compiler_message", :limit => 16777215
                   t.datetime "graded_at"
                   t.integer  "points"
-            -     t.text     "grader_comment"
+            +     t.text     "grader_comment",   :limit => 16777215
                   t.integer  "number"
                   t.string   "source_filename"
-            -     t.float    "max_runtime"
-            -     t.integer  "peak_memory"
-            -     t.integer  "effective_code_length"
                 end
                 add_index "submissions", ["user_id", "problem_id", "number"], :name => "index_submissions_on_user_id_and_problem_id_and_number", :unique => true
                 add_index "submissions", ["user_id", "problem_id"], :name => "index_submissions_on_user_id_and_problem_id"
                 create_table "tasks", :force => true do |t|
                   t.integer  "submission_id"
                   t.datetime "created_at"
                   t.integer  "status"
                   t.datetime "updated_at"
                 end
                 create_table "test_pairs", :force => true do |t|
                   t.integer  "problem_id"
-            -     t.text     "input",      :limit => 16777215
+            +     t.text     "input",      :limit => 2147483647
-            -     t.text     "solution",   :limit => 16777215
+            +     t.text     "solution",   :limit => 2147483647
-            -     t.datetime "created_at",                     :null => false
+            +     t.datetime "created_at",                       :null => false
-            -     t.datetime "updated_at",                     :null => false
+            +     t.datetime "updated_at",                       :null => false
                 end
                 create_table "test_requests", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "submission_id"
                   t.string   "input_file_name"
                   t.string   "output_file_name"
                   t.string   "running_stat"
                   t.integer  "status"
-            -     t.datetime "updated_at",       :null => false
+            +     t.datetime "updated_at",                           :null => false
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message"
+            +     t.text     "compiler_message", :limit => 16777215
                   t.datetime "graded_at"
                   t.string   "grader_comment"
-            -     t.datetime "created_at",       :null => false
+            +     t.datetime "created_at",                           :null => false
                   t.float    "running_time"
                   t.string   "exit_status"
                   t.integer  "memory_usage"
                 end
                 add_index "test_requests", ["user_id", "problem_id"], :name => "index_test_requests_on_user_id_and_problem_id"
                 create_table "user_contest_stats", :force => true do |t|
                   t.integer  "user_id"
                   t.datetime "started_at"
                   t.datetime "created_at",    :null => false
                   t.datetime "updated_at",    :null => false

Write
Preview

You need to be logged in to leave comments. Login now

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings

Sign in to your account

Author

r436:cafc387838eb - Sat, 13 Sep 2014 09:49:57 - 4 files changed: 34 inserted, 29 deleted

Sign in to your account

Commit r436:cafc387838eb public

Author

r436:cafc387838eb - Sat, 13 Sep 2014 09:49:57 - 4 files changed: 34 inserted, 29 deleted

Commit `r436:cafc387838eb` public