cafe-grader-web

Commit r476:4ff0dd0be8a1 public

parent | child
Description:
add remark and enable for user
Commit status:
[Not Reviewed]
References:
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

r476:4ff0dd0be8a1 - - 3 files changed: 11 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,6
1 + class AddMoreToUsers < ActiveRecord::Migration
2 + def change
3 + add_column :users, :enabled, :boolean, default: 1
4 + add_column :users, :remark, :string
5 + end
6 + end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -34,6 +34,7
34 %th Activated?
34 %th Activated?
35 %th Logged in
35 %th Logged in
36 %th Contest(s)
36 %th Contest(s)
37 + %th Remark
37 - @problems.each do |p|
38 - @problems.each do |p|
38 %th= p.name
39 %th= p.name
39 %th Total
40 %th Total
@@ -49,6 +50,7
49 %td= sc[i].activated
50 %td= sc[i].activated
50 %td= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no'
51 %td= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no'
51 %td= sc[i].contests.collect {|c| c.name}.join(', ')
52 %td= sc[i].contests.collect {|c| c.name}.join(', ')
53 + %td= sc[i].remark
52 - else
54 - else
53 %td= sc[i][0]
55 %td= sc[i][0]
54 - total += sc[i][0]
56 - total += sc[i][0]
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -11,7 +11,7
11 #
11 #
12 # It's strongly recommended to check this file into your version control system.
12 # It's strongly recommended to check this file into your version control system.
13
13
14 - ActiveRecord::Schema.define(:version => 20140917150629) do
14 + ActiveRecord::Schema.define(:version => 20150203153534) do
15
15
16 create_table "announcements", :force => true do |t|
16 create_table "announcements", :force => true do |t|
17 t.string "author"
17 t.string "author"
@@ -239,6 +239,8
239 t.boolean "activated", :default => false
239 t.boolean "activated", :default => false
240 t.datetime "created_at"
240 t.datetime "created_at"
241 t.datetime "updated_at"
241 t.datetime "updated_at"
242 + t.boolean "enabled", :default => true
243 + t.string "remark"
242 end
244 end
243
245
244 add_index "users", ["login"], :name => "index_users_on_login", :unique => true
246 add_index "users", ["login"], :name => "index_users_on_login", :unique => true
You need to be logged in to leave comments. Login now