cafe-grader-web Commit - r540:7fdec87758d5

cafe-grader-web

Commit `r540:7fdec87758d5` public

parent | child

Description:

add heart_beat (grafted from baf0af002308b84f920a384166b4265c82124159)

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

r540:7fdec87758d5 - Mon, 14 Sep 2015 10:29:39 - 6 files changed: 42 inserted, 1 deleted

app/controllers/heartbeat_controller.rb created 644 ¶ +14

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

app/models/heart_beat.rb created 644 ¶ +6

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

app/views/heartbeat/edit.html.haml created 644 ¶ +1

	@@ -0,0 +1,1
				1	+ OK

db/migrate/20150914090545_create_heart_beats.rb created 644 ¶ +10

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

config/routes.rb ¶ +2

                 #     resources :products
                 #   end
                 # You can have the root of your site routed with "root"
                 # just remember to delete public/index.html.
                 # root :to => 'welcome#index'
                 root :to => 'main#login'
                 match 'tasks/view/:file.:ext' => 'tasks#view'
                 match 'tasks/download/:id/:file.:ext' => 'tasks#download'
+            +   match 'heartbeat/:id/edit' => 'heartbeat#edit'
+            +
                 # See how all your routes lay out with "rake routes"
                 # This is a legacy wild controller route that's not recommended for RESTful applications.
                 # Note: This route will make all actions in every controller accessible via GET requests.
                 match ':controller(/:action(/:id))(.:format)'
               end

db/schema.rb ¶ +9 -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 => 20150827133841) do
+            + ActiveRecord::Schema.define(:version => 20150914090545) 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
                   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"
                 end
                 add_index "grader_processes", ["host", "pid"], :name => "index_grader_processes_on_ip_and_pid"
+            +   create_table "heart_beats", :force => true do |t|
+            +     t.integer  "user_id"
+            +     t.string   "ip_address"
+            +     t.datetime "created_at", :null => false
+            +     t.datetime "updated_at", :null => false
+            +   end
+            +
                 create_table "languages", :force => true do |t|
                   t.string "name",        :limit => 10
                   t.string "pretty_name"
                   t.string "ext",         :limit => 10
                   t.string "common_ext"
                 end
                 create_table "logins", :force => true do |t|
                   t.integer  "user_id"
                   t.string   "ip_address"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                   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"
                   t.string   "last_ip"
+            +     t.string   "section"
                 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

r540:7fdec87758d5 - Mon, 14 Sep 2015 10:29:39 - 6 files changed: 42 inserted, 1 deleted

Sign in to your account

Commit r540:7fdec87758d5 public

Author

r540:7fdec87758d5 - Mon, 14 Sep 2015 10:29:39 - 6 files changed: 42 inserted, 1 deleted

Commit `r540:7fdec87758d5` public