cafe-grader-web Commit - r476:4ff0dd0be8a1

cafe-grader-web

Commit `r476:4ff0dd0be8a1` public

parent | child

Description:

add remark and enable for user

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r476:4ff0dd0be8a1 - Wed, 04 Feb 2015 09:41:05 - 3 files changed: 11 inserted, 1 deleted

db/migrate/20150203153534_add_more_to_users.rb created 644 ¶ +6

@@ -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

app/views/user_admin/user_stat.html.haml ¶ +2

                 %h3 Max score
                 = link_to '[Show only latest submissions]', controller: :user_admin, action: :user_stat
                 = link_to '[download csv with all problems]', controller: :user_admin, action: :user_stat_max, commit: 'download csv'
               %table.tablesorter-cafe#my_table
                 %thead
                   %tr
                     %th User
                     %th Name
                     %th Activated?
                     %th Logged in
                     %th Contest(s)
+            +       %th Remark
                     - @problems.each do |p|
                       %th= p.name
                     %th Total
                     %th Passed
                 %tbody
                   - @scorearray.each do |sc|
                     %tr{class: cycle('info-even','info-odd')}
                       - total,num_passed = 0,0
                       - sc.each_index do |i|
                         - if i == 0
                           %td= link_to sc[i].login, controller: 'users', action: 'profile', id: sc[i]
                           %td= sc[i].full_name
                           %td= sc[i].activated
                           %td= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no'
                           %td= sc[i].contests.collect {|c| c.name}.join(', ')
+            +             %td= sc[i].remark
                         - else
                           %td= sc[i][0]
                           - total += sc[i][0]
                           - num_passed += 1 if sc[i][1]
                       %td= total
                       %td= num_passed

db/schema.rb ¶ +3 -1

               # This file is auto-generated from the current state of the database. Instead
               # of editing this file, please use the migrations feature of Active Record to
               # incrementally modify your database, and then regenerate this schema definition.
               #
               # 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 => 20140917150629) do
+            + ActiveRecord::Schema.define(:version => 20150203153534) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at",                      :null => false
                   t.datetime "updated_at",                      :null => false
                   t.boolean  "frontpage",    :default => false
                   t.boolean  "contest_only", :default => false
                   t.string   "title"
                   t.string   "notes"
                 end
                 create_table "users", :force => true do |t|
                   t.string   "login",           :limit => 50
                   t.string   "full_name"
                   t.string   "hashed_password"
                   t.string   "salt",            :limit => 5
                   t.string   "alias"
                   t.string   "email"
                   t.integer  "site_id"
                   t.integer  "country_id"
                   t.boolean  "activated",                     :default => false
                   t.datetime "created_at"
                   t.datetime "updated_at"
+            +     t.boolean  "enabled",                       :default => true
+            +     t.string   "remark"
                 end
                 add_index "users", ["login"], :name => "index_users_on_login", :unique => true
               end

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

r476:4ff0dd0be8a1 - Wed, 04 Feb 2015 09:41:05 - 3 files changed: 11 inserted, 1 deleted

Sign in to your account

Commit r476:4ff0dd0be8a1 public

Author

r476:4ff0dd0be8a1 - Wed, 04 Feb 2015 09:41:05 - 3 files changed: 11 inserted, 1 deleted

Commit `r476:4ff0dd0be8a1` public