cafe-grader-web Commit - r541:11c20f65a6b8

cafe-grader-web

Commit `r541:11c20f65a6b8` public

parent | child

Description:

more heart beat feature add reset last login ip (grafted from 6efa41a1cfdc5e910b85eec6d8b874ed651776bd)

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

r541:11c20f65a6b8 - Mon, 14 Sep 2015 22:10:42 - 7 files changed: 92 inserted, 33 deleted

app/views/heartbeat/index.html.haml created 644 ¶ +30

@@ -0,0 +1,30
	1	+ - content_for :header do
	2	+ = javascript_include_tag 'local_jquery'
	3	+ = stylesheet_link_tag 'tablesorter-theme.cafe'
	4	+
	5	+ %script{:type=>"text/javascript"}
	6	+ $(function () {
	7	+ $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
	8	+ $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
	9	+ $('#my_table').tablesorter({widgets: ['zebra']});
	10	+ });
	11	+
	12	+ %h1 Heart Beat Count
	13	+ = "Last 5 minutes distinct user count = #{@num}"
	14	+
	15	+ %h1 Heart Beat List
	16	+
	17	+ %table.tablesorter-cafe#my_table
	18	+ %thead
	19	+ %tr
	20	+ %th Login
	21	+ %th Full name
	22	+ %th IP
	23	+ %th Last Update
	24	+ %tbody
	25	+ - @hb.each do \|hb\|
	26	+ %tr{class: cycle('info-even','info-odd')}
	27	+ %td= link_to hb.user.login, controller: :users, :action => 'profile', :id => hb.user.id
	28	+ %td= hb.user.full_name
	29	+ %td= hb.ip_address
	30	+ %td= "#{time_ago_in_words(hb.updated_at)} ago"

db/migrate/20150914155101_add_status_to_heart_beat.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ class AddStatusToHeartBeat < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :heart_beats, :status, :string
	4	+ end
	5	+ end

app/controllers/heartbeat_controller.rb ¶ +19 -4

@@ -1,14 +1,29
1	class HeartbeatController < ApplicationController	1	class HeartbeatController < ApplicationController
		2	+ before_filter :admin_authorization, :only => ['index']
		3	+
2	def edit	4	def edit
3	- render layout: 'empty'
4	@user = User.find_by_login(params[:id])	5	@user = User.find_by_login(params[:id])
5	- ~~return~~ unless @user	6	+ unless @user
6	-	7	+ render text: "LOGIN_NOT_FOUND"
		8	+ return
		9	+ end
		10	+
7	hb = HeartBeat.where(user_id: @user.id, ip_address: request.remote_ip).first	11	hb = HeartBeat.where(user_id: @user.id, ip_address: request.remote_ip).first
		12	+ puts "status = #{params[:status]}"
8	if hb	13	if hb
		14	+ if params[:status]
		15	+ hb.status = params[:status]
		16	+ hb.save
		17	+ end
9	hb.touch	18	hb.touch
10	else	19	else
11	- HeartBeat.create(user_id: @user.id, ip_address: request.remote_ip)	20	+ HeartBeat.creae(user_id: @user.id, ip_address: request.remote_ip)
12	end	21	end
		22	+ render text: "OK"
		23	+ end
		24	+
		25	+ def index
		26	+ @hb = HeartBeat.includes(:user).order(:user_id).all
		27	+ @num = HeartBeat.where("updated_at >= ?",Time.zone.now-5.minutes).count
13	end	28	end
14	end	29	end

app/controllers/user_admin_controller.rb ¶ +8 -1

                     redirect_to :action => 'list'
                   else
                     render :action => 'new'
                   end
                 end
+            +   def clear_last_ip
+            +     @user = User.find(params[:id])
+            +     @user.last_ip = nil
+            +     @user.save
+            +     redirect_to action: 'list', page: params[:page]
+            +   end
+            +
                 def create_from_list
                   lines = params[:user_list]
                   note = []
                   lines.split("\n").each do |line|
                       user.password_confirmation = password
                       user.save
                     end
                     @changed = true
                   end
                 end
+            +
                 # contest management
                 def contests
                   @contest, @users = find_contest_and_user_from_contest_id(params[:id])
                   @contests = Contest.enabled
                 end

app/views/user_admin/list.html.erb ¶ +2

                       <th><%= column.human_name %></th>
                     <% end %>
                   <% end %>
                   <th></th>
                   <th></th>
                   <th></th>
+            +     <th></th>
                 </tr>
               <% for user in @users %>
                 <tr class="info-<%= cycle("odd","even") %>">
                   <td><%= link_to user.login, controller: :users, :action => 'profile', :id => user %></td>
                   <% for column in User.content_columns %>
                     <% if !@hidden_columns.index(column.name) and column.name != 'login' %>
                       <td><%=h user.send(column.name) %></td>
                     <% end %>
                   <% end %>
+            +     <td><%= link_to 'Clear IP', {:action => 'clear_last_ip', :id => user, :page=>params[:page]}, :confirm => 'This will reset last logging in ip of the user, are you sure?' %></td>
                   <td><%= link_to 'Show', :action => 'show', :id => user %></td>
                   <td><%= link_to 'Edit', :action => 'edit', :id => user %></td>
                   <td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td>
                 </tr>
               <% end %>
               </table>

db/schema.rb ¶ +28 -27

               # 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 => 20150914090545) do
+            + ActiveRecord::Schema.define(:version => 20150914155101) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
-            -     t.text     "body"
+            +     t.text     "body",         :limit => 16777215
                   t.boolean  "published"
-            -     t.datetime "created_at",                      :null => false
+            +     t.datetime "created_at",                                          :null => false
-            -     t.datetime "updated_at",                      :null => false
+            +     t.datetime "updated_at",                                          :null => false
-            -     t.boolean  "frontpage",    :default => false
+            +     t.boolean  "frontpage",                        :default => false
-            -     t.boolean  "contest_only", :default => false
+            +     t.boolean  "contest_only",                     :default => false
                   t.string   "title"
                   t.string   "notes"
                 end
                 create_table "contests", :force => true do |t|
                   t.string   "title"
                   t.string   "name"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                 end
                 create_table "descriptions", :force => true do |t|
-            -     t.text     "body"
+            +     t.text     "body",       :limit => 16777215
                   t.boolean  "markdowned"
-            -     t.datetime "created_at", :null => false
+            +     t.datetime "created_at",                     :null => false
-            -     t.datetime "updated_at", :null => false
+            +     t.datetime "updated_at",                     :null => false
                 end
                 create_table "grader_configurations", :force => true do |t|
                   t.string   "key"
                   t.string   "value_type"
                   t.string   "value"
-            -     t.datetime "created_at",  :null => false
+            +     t.datetime "created_at",                      :null => false
-            -     t.datetime "updated_at",  :null => false
+            +     t.datetime "updated_at",                      :null => false
-            -     t.text     "description"
+            +     t.text     "description", :limit => 16777215
                 end
                 create_table "grader_processes", :force => true do |t|
                   t.string   "host",       :limit => 20
                   t.integer  "pid"
                   t.string   "mode"
                 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
+            +     t.string   "status"
                 end
                 create_table "languages", :force => true do |t|
                   t.string "name",        :limit => 10
                   t.string "pretty_name"
                   t.string "ext",         :limit => 10
                 end
                 create_table "messages", :force => true do |t|
                   t.integer  "sender_id"
                   t.integer  "receiver_id"
                   t.integer  "replying_message_id"
-            -     t.text     "body"
+            +     t.text     "body",                :limit => 16777215
                   t.boolean  "replied"
-            -     t.datetime "created_at",          :null => false
+            +     t.datetime "created_at",                              :null => false
-            -     t.datetime "updated_at",          :null => false
+            +     t.datetime "updated_at",                              :null => false
                 end
                 create_table "problems", :force => true do |t|
                   t.string  "name",                 :limit => 30
                   t.string  "full_name"
                   t.integer "full_score"
                 end
                 add_index "roles_users", ["user_id"], :name => "index_roles_users_on_user_id"
                 create_table "sessions", :force => true do |t|
                   t.string   "session_id"
-            -     t.text     "data"
+            +     t.text     "data",       :limit => 16777215
                   t.datetime "updated_at"
                 end
                 add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
                 add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
                 end
                 create_table "submissions", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "language_id"
-            -     t.text     "source"
+            +     t.text     "source",                :limit => 16777215
                   t.binary   "binary"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message"
+            +     t.text     "compiler_message",      :limit => 16777215
                   t.datetime "graded_at"
                   t.integer  "points"
-            -     t.text     "grader_comment"
+            +     t.text     "grader_comment",        :limit => 16777215
                   t.integer  "number"
                   t.string   "source_filename"
                   t.float    "max_runtime"
                   t.integer  "peak_memory"
                   t.integer  "effective_code_length"
                   t.string   "ip_address"
                   t.integer  "status"
                   t.datetime "updated_at"
                 end
                 create_table "test_pairs", :force => true do |t|
                   t.integer  "problem_id"
-            -     t.text     "input",      :limit => 16777215
+            +     t.text     "input",      :limit => 2147483647
-            -     t.text     "solution",   :limit => 16777215
+            +     t.text     "solution",   :limit => 2147483647
-            -     t.datetime "created_at",                     :null => false
+            +     t.datetime "created_at",                       :null => false
-            -     t.datetime "updated_at",                     :null => false
+            +     t.datetime "updated_at",                       :null => false
                 end
                 create_table "test_requests", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "submission_id"
                   t.string   "input_file_name"
                   t.string   "output_file_name"
                   t.string   "running_stat"
                   t.integer  "status"
-            -     t.datetime "updated_at",       :null => false
+            +     t.datetime "updated_at",                           :null => false
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
-            -     t.text     "compiler_message"
+            +     t.text     "compiler_message", :limit => 16777215
                   t.datetime "graded_at"
                   t.string   "grader_comment"
-            -     t.datetime "created_at",       :null => false
+            +     t.datetime "created_at",                           :null => false
                   t.float    "running_time"
                   t.string   "exit_status"
                   t.integer  "memory_usage"
                 end
                 add_index "test_requests", ["user_id", "problem_id"], :name => "index_test_requests_on_user_id_and_problem_id"
                   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.string   "section"
                   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

app/views/heartbeat/edit.html.haml removed ¶ -1

deleted file

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

r541:11c20f65a6b8 - Mon, 14 Sep 2015 22:10:42 - 7 files changed: 92 inserted, 33 deleted

Sign in to your account

Commit r541:11c20f65a6b8 public

Author

r541:11c20f65a6b8 - Mon, 14 Sep 2015 22:10:42 - 7 files changed: 92 inserted, 33 deleted

Commit `r541:11c20f65a6b8` public