cafe-grader-web

Commit r540:7fdec87758d5 public

parent | child
Description:
add heart_beat (grafted from baf0af002308b84f920a384166b4265c82124159)
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

r540:7fdec87758d5 - - 6 files changed: 42 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,14
1 + class HeartbeatController < ApplicationController
2 + def edit
3 + render layout: 'empty'
4 + @user = User.find_by_login(params[:id])
5 + return unless @user
6 +
7 + hb = HeartBeat.where(user_id: @user.id, ip_address: request.remote_ip).first
8 + if hb
9 + hb.touch
10 + else
11 + HeartBeat.create(user_id: @user.id, ip_address: request.remote_ip)
12 + end
13 + end
14 + end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,6
1 + class HeartBeat < ActiveRecord::Base
2 + # attr_accessible :title, :body
3 + belongs_to :user
4 +
5 + #attr_accessible :ip_address
6 + end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,1
1 + OK
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,10
1 + class CreateHeartBeats < ActiveRecord::Migration
2 + def change
3 + create_table :heart_beats do |t|
4 + t.column 'user_id',:integer
5 + t.column 'ip_address',:string
6 +
7 + t.timestamps
8 + end
9 + end
10 + end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -43,30 +43,32
43 43 # Sample resource route with more complex sub-resources
44 44 # resources :products do
45 45 # resources :comments
46 46 # resources :sales do
47 47 # get 'recent', :on => :collection
48 48 # end
49 49 # end
50 50
51 51 # Sample resource route within a namespace:
52 52 # namespace :admin do
53 53 # # Directs /admin/products/* to Admin::ProductsController
54 54 # # (app/controllers/admin/products_controller.rb)
55 55 # resources :products
56 56 # end
57 57
58 58 # You can have the root of your site routed with "root"
59 59 # just remember to delete public/index.html.
60 60 # root :to => 'welcome#index'
61 61
62 62 root :to => 'main#login'
63 63
64 64 match 'tasks/view/:file.:ext' => 'tasks#view'
65 65 match 'tasks/download/:id/:file.:ext' => 'tasks#download'
66 66
67 + match 'heartbeat/:id/edit' => 'heartbeat#edit'
68 +
67 69 # See how all your routes lay out with "rake routes"
68 70
69 71 # This is a legacy wild controller route that's not recommended for RESTful applications.
70 72 # Note: This route will make all actions in every controller accessible via GET requests.
71 73 match ':controller(/:action(/:id))(.:format)'
72 74 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,38 +1,38
1 1 # encoding: UTF-8
2 2 # This file is auto-generated from the current state of the database. Instead
3 3 # of editing this file, please use the migrations feature of Active Record to
4 4 # incrementally modify your database, and then regenerate this schema definition.
5 5 #
6 6 # Note that this schema.rb definition is the authoritative source for your
7 7 # database schema. If you need to create the application database on another
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 => 20150827133841) do
14 + ActiveRecord::Schema.define(:version => 20150914090545) 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
21 21 t.datetime "updated_at", :null => false
22 22 t.boolean "frontpage", :default => false
23 23 t.boolean "contest_only", :default => false
24 24 t.string "title"
25 25 t.string "notes"
26 26 end
27 27
28 28 create_table "contests", :force => true do |t|
29 29 t.string "title"
30 30 t.boolean "enabled"
31 31 t.datetime "created_at", :null => false
32 32 t.datetime "updated_at", :null => false
33 33 t.string "name"
34 34 end
35 35
36 36 create_table "contests_problems", :id => false, :force => true do |t|
37 37 t.integer "contest_id"
38 38 t.integer "problem_id"
@@ -58,48 +58,55
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 63 t.datetime "created_at", :null => false
64 64 t.datetime "updated_at", :null => false
65 65 t.text "description"
66 66 end
67 67
68 68 create_table "grader_processes", :force => true do |t|
69 69 t.string "host", :limit => 20
70 70 t.integer "pid"
71 71 t.string "mode"
72 72 t.boolean "active"
73 73 t.datetime "created_at", :null => false
74 74 t.datetime "updated_at", :null => false
75 75 t.integer "task_id"
76 76 t.string "task_type"
77 77 t.boolean "terminated"
78 78 end
79 79
80 80 add_index "grader_processes", ["host", "pid"], :name => "index_grader_processes_on_ip_and_pid"
81 81
82 + create_table "heart_beats", :force => true do |t|
83 + t.integer "user_id"
84 + t.string "ip_address"
85 + t.datetime "created_at", :null => false
86 + t.datetime "updated_at", :null => false
87 + end
88 +
82 89 create_table "languages", :force => true do |t|
83 90 t.string "name", :limit => 10
84 91 t.string "pretty_name"
85 92 t.string "ext", :limit => 10
86 93 t.string "common_ext"
87 94 end
88 95
89 96 create_table "logins", :force => true do |t|
90 97 t.integer "user_id"
91 98 t.string "ip_address"
92 99 t.datetime "created_at", :null => false
93 100 t.datetime "updated_at", :null => false
94 101 end
95 102
96 103 create_table "messages", :force => true do |t|
97 104 t.integer "sender_id"
98 105 t.integer "receiver_id"
99 106 t.integer "replying_message_id"
100 107 t.text "body"
101 108 t.boolean "replied"
102 109 t.datetime "created_at", :null => false
103 110 t.datetime "updated_at", :null => false
104 111 end
105 112
@@ -228,29 +235,30
228 235
229 236 create_table "user_contest_stats", :force => true do |t|
230 237 t.integer "user_id"
231 238 t.datetime "started_at"
232 239 t.datetime "created_at", :null => false
233 240 t.datetime "updated_at", :null => false
234 241 t.boolean "forced_logout"
235 242 end
236 243
237 244 create_table "users", :force => true do |t|
238 245 t.string "login", :limit => 50
239 246 t.string "full_name"
240 247 t.string "hashed_password"
241 248 t.string "salt", :limit => 5
242 249 t.string "alias"
243 250 t.string "email"
244 251 t.integer "site_id"
245 252 t.integer "country_id"
246 253 t.boolean "activated", :default => false
247 254 t.datetime "created_at"
248 255 t.datetime "updated_at"
249 256 t.boolean "enabled", :default => true
250 257 t.string "remark"
251 258 t.string "last_ip"
259 + t.string "section"
252 260 end
253 261
254 262 add_index "users", ["login"], :name => "index_users_on_login", :unique => true
255 263
256 264 end
You need to be logged in to leave comments. Login now