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
@@ -31,12 +31,13
31 31 %tr
32 32 %th User
33 33 %th Name
34 34 %th Activated?
35 35 %th Logged in
36 36 %th Contest(s)
37 + %th Remark
37 38 - @problems.each do |p|
38 39 %th= p.name
39 40 %th Total
40 41 %th Passed
41 42 %tbody
42 43 - @scorearray.each do |sc|
@@ -46,12 +47,13
46 47 - if i == 0
47 48 %td= link_to sc[i].login, controller: 'users', action: 'profile', id: sc[i]
48 49 %td= sc[i].full_name
49 50 %td= sc[i].activated
50 51 %td= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no'
51 52 %td= sc[i].contests.collect {|c| c.name}.join(', ')
53 + %td= sc[i].remark
52 54 - else
53 55 %td= sc[i][0]
54 56 - total += sc[i][0]
55 57 - num_passed += 1 if sc[i][1]
56 58 %td= total
57 59 %td= num_passed
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -8,13 +8,13
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 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 16 create_table "announcements", :force => true do |t|
17 17 t.string "author"
18 18 t.text "body"
19 19 t.boolean "published"
20 20 t.datetime "created_at", :null => false
@@ -236,11 +236,13
236 236 t.string "email"
237 237 t.integer "site_id"
238 238 t.integer "country_id"
239 239 t.boolean "activated", :default => false
240 240 t.datetime "created_at"
241 241 t.datetime "updated_at"
242 + t.boolean "enabled", :default => true
243 + t.string "remark"
242 244 end
243 245
244 246 add_index "users", ["login"], :name => "index_users_on_login", :unique => true
245 247
246 248 end
You need to be logged in to leave comments. Login now