cafe-grader-web

Commit r534:dc7ae6e7079b public

parent | child
Description:
more heart beat feature add reset last login ip
Commit status:
[Not Reviewed]
References:
java
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

r534:dc7ae6e7079b - - 7 files changed: 92 inserted, 33 deleted

Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -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"
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -0,0 +1,5
1 + class AddStatusToHeartBeat < ActiveRecord::Migration
2 + def change
3 + add_column :heart_beats, :status, :string
4 + end
5 + end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -1,14 +1,29
1 1 class HeartbeatController < ApplicationController
2 + before_filter :admin_authorization, :only => ['index']
3 +
2 4 def edit
3 - render layout: 'empty'
4 5 @user = User.find_by_login(params[:id])
5 - return unless @user
6 -
6 + unless @user
7 + render text: "LOGIN_NOT_FOUND"
8 + return
9 + end
10 +
7 11 hb = HeartBeat.where(user_id: @user.id, ip_address: request.remote_ip).first
12 + puts "status = #{params[:status]}"
8 13 if hb
14 + if params[:status]
15 + hb.status = params[:status]
16 + hb.save
17 + end
9 18 hb.touch
10 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 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 28 end
14 29 end
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -62,6 +62,13
62 62 end
63 63 end
64 64
65 + def clear_last_ip
66 + @user = User.find(params[:id])
67 + @user.last_ip = nil
68 + @user.save
69 + redirect_to action: 'list', page: params[:page]
70 + end
71 +
65 72 def create_from_list
66 73 lines = params[:user_list]
67 74
@@ -213,7 +220,7
213 220 @changed = true
214 221 end
215 222 end
216 -
223 +
217 224 # contest management
218 225
219 226 def contests
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -64,6 +64,7
64 64 <th></th>
65 65 <th></th>
66 66 <th></th>
67 + <th></th>
67 68 </tr>
68 69
69 70 <% for user in @users %>
@@ -74,6 +75,7
74 75 <td><%=h user.send(column.name) %></td>
75 76 <% end %>
76 77 <% end %>
78 + <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>
77 79 <td><%= link_to 'Show', :action => 'show', :id => user %></td>
78 80 <td><%= link_to 'Edit', :action => 'edit', :id => user %></td>
79 81 <td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td>
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
@@ -11,16 +11,16
11 11 #
12 12 # It's strongly recommended to check this file into your version control system.
13 13
14 - ActiveRecord::Schema.define(:version => 20150914090545) do
14 + ActiveRecord::Schema.define(:version => 20150914155101) do
15 15
16 16 create_table "announcements", :force => true do |t|
17 17 t.string "author"
18 - t.text "body"
18 + t.text "body", :limit => 16777215
19 19 t.boolean "published"
20 - t.datetime "created_at", :null => false
21 - t.datetime "updated_at", :null => false
22 - t.boolean "frontpage", :default => false
23 - t.boolean "contest_only", :default => false
20 + t.datetime "created_at", :null => false
21 + t.datetime "updated_at", :null => false
22 + t.boolean "frontpage", :default => false
23 + t.boolean "contest_only", :default => false
24 24 t.string "title"
25 25 t.string "notes"
26 26 end
@@ -50,19 +50,19
50 50 end
51 51
52 52 create_table "descriptions", :force => true do |t|
53 - t.text "body"
53 + t.text "body", :limit => 16777215
54 54 t.boolean "markdowned"
55 - t.datetime "created_at", :null => false
56 - t.datetime "updated_at", :null => false
55 + t.datetime "created_at", :null => false
56 + t.datetime "updated_at", :null => false
57 57 end
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 - t.datetime "created_at", :null => false
64 - t.datetime "updated_at", :null => false
65 - t.text "description"
63 + t.datetime "created_at", :null => false
64 + t.datetime "updated_at", :null => false
65 + t.text "description", :limit => 16777215
66 66 end
67 67
68 68 create_table "grader_processes", :force => true do |t|
@@ -84,6 +84,7
84 84 t.string "ip_address"
85 85 t.datetime "created_at", :null => false
86 86 t.datetime "updated_at", :null => false
87 + t.string "status"
87 88 end
88 89
89 90 create_table "languages", :force => true do |t|
@@ -104,10 +105,10
104 105 t.integer "sender_id"
105 106 t.integer "receiver_id"
106 107 t.integer "replying_message_id"
107 - t.text "body"
108 + t.text "body", :limit => 16777215
108 109 t.boolean "replied"
109 - t.datetime "created_at", :null => false
110 - t.datetime "updated_at", :null => false
110 + t.datetime "created_at", :null => false
111 + t.datetime "updated_at", :null => false
111 112 end
112 113
113 114 create_table "problems", :force => true do |t|
@@ -149,7 +150,7
149 150
150 151 create_table "sessions", :force => true do |t|
151 152 t.string "session_id"
152 - t.text "data"
153 + t.text "data", :limit => 16777215
153 154 t.datetime "updated_at"
154 155 end
155 156
@@ -177,14 +178,14
177 178 t.integer "user_id"
178 179 t.integer "problem_id"
179 180 t.integer "language_id"
180 - t.text "source"
181 + t.text "source", :limit => 16777215
181 182 t.binary "binary"
182 183 t.datetime "submitted_at"
183 184 t.datetime "compiled_at"
184 - t.text "compiler_message"
185 + t.text "compiler_message", :limit => 16777215
185 186 t.datetime "graded_at"
186 187 t.integer "points"
187 - t.text "grader_comment"
188 + t.text "grader_comment", :limit => 16777215
188 189 t.integer "number"
189 190 t.string "source_filename"
190 191 t.float "max_runtime"
@@ -205,10 +206,10
205 206
206 207 create_table "test_pairs", :force => true do |t|
207 208 t.integer "problem_id"
208 - t.text "input", :limit => 16777215
209 - t.text "solution", :limit => 16777215
210 - t.datetime "created_at", :null => false
211 - t.datetime "updated_at", :null => false
209 + t.text "input", :limit => 2147483647
210 + t.text "solution", :limit => 2147483647
211 + t.datetime "created_at", :null => false
212 + t.datetime "updated_at", :null => false
212 213 end
213 214
214 215 create_table "test_requests", :force => true do |t|
@@ -219,13 +220,13
219 220 t.string "output_file_name"
220 221 t.string "running_stat"
221 222 t.integer "status"
222 - t.datetime "updated_at", :null => false
223 + t.datetime "updated_at", :null => false
223 224 t.datetime "submitted_at"
224 225 t.datetime "compiled_at"
225 - t.text "compiler_message"
226 + t.text "compiler_message", :limit => 16777215
226 227 t.datetime "graded_at"
227 228 t.string "grader_comment"
228 - t.datetime "created_at", :null => false
229 + t.datetime "created_at", :null => false
229 230 t.float "running_time"
230 231 t.string "exit_status"
231 232 t.integer "memory_usage"
@@ -253,10 +254,10
253 254 t.boolean "activated", :default => false
254 255 t.datetime "created_at"
255 256 t.datetime "updated_at"
257 + t.string "section"
256 258 t.boolean "enabled", :default => true
257 259 t.string "remark"
258 260 t.string "last_ip"
259 - t.string "section"
260 261 end
261 262
262 263 add_index "users", ["login"], :name => "index_users_on_login", :unique => true
Show file before | Show file after | Raw diff | Download diff | Ignore whitespace Increase context Show commentsHide comments
deleted file
You need to be logged in to leave comments. Login now