cafe-grader-web Commit - r532:e19c25c6b241

cafe-grader-web

Commit `r532:e19c25c6b241` public

parent | child

Description:

merge with algo-bm

Commit status:

[Not Reviewed]

References:

merge java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r532:e19c25c6b241 - Fri, 11 Sep 2015 10:25:05 - 13 files changed: 122 inserted, 6 deleted

app/models/submission_view_log.rb created 644 ¶ +3

@@ -0,0 +1,3
	1	+ class SubmissionViewLog < ActiveRecord::Base
	2	+ attr_accessible :submission_id, :user_id
	3	+ end

app/views/report/cheat_scruntinize.html.haml created 644 ¶ +82

@@ -0,0 +1,82
	1	+ - content_for :header do
	2	+ = stylesheet_link_tag 'tablesorter-theme.cafe'
	3	+ = javascript_include_tag 'local_jquery'
	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({widthFixed: true, widgets: ['zebra']});
	10	+ $('#my_table2').tablesorter({widthFixed: true, widgets: ['zebra']});
	11	+ $('#sub_table').tablesorter({widthFixed: true, widgets: ['zebra']});
	12	+ });
	13	+
	14	+ %h1 Login status
	15	+
	16	+ =render partial: 'report_menu'
	17	+
	18	+
	19	+ = form_tag({session: :url }) do
	20	+ .submitbox
	21	+ %table
	22	+ %tr
	23	+ %td{colspan: 6, style: 'font-weight: bold'}= 'Query login & submit in the range'
	24	+ %tr
	25	+ %td{style: 'width: 120px; font-weight: bold'}= 'Login date range'
	26	+ %td{align: 'right'} since:
	27	+ %td= text_field_tag 'since_datetime', @since_time
	28	+ %tr
	29	+ %td
	30	+ %td{align: 'right'} until:
	31	+ %td= text_field_tag 'until_datetime', @until_time
	32	+ %tr
	33	+ %td
	34	+ %td
	35	+ %td Blank mean no condition
	36	+ %tr
	37	+ %td{style: 'width: 120px; font-weight: bold'}= "ID"
	38	+ %td{colspan: 2}= text_field_tag 'SID', @sid, size: 40
	39	+ %tr
	40	+ %td
	41	+ %td
	42	+ %td= submit_tag 'query'
	43	+
	44	+
	45	+ %h2 Logs
	46	+
	47	+ - if @sid
	48	+ %table
	49	+ %tbody
	50	+ - @sid.each do \|id\|
	51	+ - user = User.where("login = ?",id).first
	52	+ %tr
	53	+ //%td= link_to id, controller: :user, action: :profile, id: id
	54	+ %td= link_to id, "https://www.nattee.net/java/users/profile/#{user.id}"
	55	+ %td= user.full_name
	56	+
	57	+ //%table.tablesorter-cafe#my_table
	58	+ %table.info
	59	+ %thead
	60	+ %tr.info-head
	61	+ %th Time
	62	+ %th Action
	63	+ %th IP
	64	+ %th login
	65	+ %th name
	66	+ %th problem
	67	+ %th score
	68	+ %tbody
	69	+ - if @logs
	70	+ - @logs.each do \|l\|
	71	+ %tr{class: cycle('info-even','info-odd')}
	72	+ %td= l[:submitted_at].strftime "%Y.%b.%d %H:%M:%S"
	73	+ //%td= l[:id] == -1 ? "LOGIN" : link_to("submit #{l[:id]}", controller: 'graders' , action: 'submission', id: l[:id])
	74	+ %td= l[:id] == -1 ? "LOGIN" : link_to( "submit #{l[:id]}", "https://www.nattee.net/java/graders/submission/#{l[:id]}")
	75	+ %td= l[:ip_address]
	76	+ //%td= link_to l[:login], controller: 'users', action: 'profile', id: l[:id]
	77	+ %td= link_to( l[:login], "https://www.nattee.net/java/users/profile/#{l.user_id}")
	78	+ %td= l[:full_name]
	79	+ %td= l[:id] == -1 ? "" : l.problem.name
	80	+ %td= l[:id] == -1 ? "" : l.points * 100/ l.problem.full_score
	81	+
	82	+

db/migrate/20150827131927_create_submission_view_logs.rb created 644 ¶ +10

@@ -0,0 +1,10
	1	+ class CreateSubmissionViewLogs < ActiveRecord::Migration
	2	+ def change
	3	+ create_table :submission_view_logs do \|t\|
	4	+ t.integer :user_id
	5	+ t.integer :submission_id
	6	+
	7	+ t.timestamps
	8	+ end
	9	+ end
	10	+ end

db/migrate/20150827133841_add_last_ip_to_user.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ class AddLastIpToUser < ActiveRecord::Migration
	2	+ def change
	3	+ add_column :users, :last_ip, :string
	4	+ end
	5	+ end

spec/models/submission_view_logs_spec.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ require 'spec_helper'
	2	+
	3	+ describe SubmissionViewLogs do
	4	+ pending "add some examples to (or delete) #{__FILE__}"
	5	+ end

Gemfile.lock ¶ +1 -1

                     jquery-rails
                     railties (>= 3.1.0)
                   jquery-ui-sass-rails (4.0.3.0)
                     jquery-rails
                     jquery-ui-rails (= 4.0.3)
                     railties (>= 3.1.0)
                   json (1.8.2)
                   mail (2.5.4)
                     mime-types (~> 1.16)
                     treetop (~> 1.4.8)
                   mime-types (1.25.1)
                   multi_json (1.10.1)
-            -     mysql2 (0.3.19)
+            +     mysql2 (0.3.20)
                   polyglot (0.3.5)
                   power_assert (0.2.2)
                   prototype-rails (3.2.1)
                     rails (~> 3.2)
                   rack (1.4.5)
                   rack-cache (1.2)
                     rack (>= 0.4)
                   rack-ssl (1.3.4)
                     rack
                   rack-test (0.6.3)
                     rack (>= 1.0)
                   rails (3.2.21)

app/controllers/configurations_controller.rb ¶ +1 -1

                 def index
                   @configurations = GraderConfiguration.find(:all,
                                                        :order => '`key`')
                 end
                 def reload
                   GraderConfiguration.reload
                   redirect_to :action => 'index'
                 end
                 def update
                   @config = GraderConfiguration.find(params[:id])
-            -     User.clear_last_login if @config.key = 'multiple_ip_login' and @config.value == 'true' and params[:grader_configuration][:value] == 'false'
+            +     User.clear_last_login if @config.key == GraderConfiguration::MULTIPLE_IP_LOGIN_KEY and @config.value == 'true' and params[:grader_configuration][:value] == 'false'
                   respond_to do |format|
                     if @config.update_attributes(params[:grader_configuration])
                       format.json { head :ok }
                     else
                       format.json { respond_with_bip(@config) }
                     end
                   end
                 end
               end

app/controllers/graders_controller.rb ¶ +3

                   lexer = case @submission.language.name
                     when "c"      then Rouge::Lexers::C.new
                     when "cpp"    then Rouge::Lexers::Cpp.new
                     when "pas"    then Rouge::Lexers::Pas.new
                     when "ruby"   then Rouge::Lexers::Ruby.new
                     when "python" then Rouge::Lexers::Python.new
                     when "java"   then Rouge::Lexers::Java.new
                     when "php"    then Rouge::Lexers::PHP.new
                   end
                   @formatted_code = formatter.format(lexer.lex(@submission.source))
                   @css_style = Rouge::Themes::ThankfulEyes.render(scope: '.highlight')
+            +     user = User.find(session[:user_id])
+            +     SubmissionViewLog.create(user_id: session[:user_id],submission_id: @submission.id) unless user.admin?
+            +
                 end
                 # various grader controls
                 def stop
                   grader_proc = GraderProcess.find(params[:id])
                   GraderScript.stop_grader(grader_proc.pid)
                   flash[:notice] = 'Grader stopped.  It may not disappear now, but it should disappear shortly.'
                   redirect_to :action => 'list'
                 end
                 def stop_all

app/controllers/problems_controller.rb ¶ +1 -1

                     redirect_to :controller => 'main', :action => 'list'
                     return
                   end
                   @submissions = Submission.includes(:user).where(problem_id: params[:id]).order(:user_id,:id)
                   #stat summary
                   range =65
                   @histogram = { data: Array.new(range,0), summary: {} }
                   user = Hash.new(0)
                   @submissions.find_each do |sub|
                     d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
                     @histogram[:data][d.to_i] += 1 if d < range
-            -       user[sub.user_id] = [user[sub.user_id], (sub.try(:points) >= @problem.full_score) ? 1 : 0].max
+            +       user[sub.user_id] = [user[sub.user_id], ((sub.try(:points) || 0) >= @problem.full_score) ? 1 : 0].max
                   end
                   @histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @summary = { attempt: user.count, solve: 0 }
                   user.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end
                 def manage
                   @problems = Problem.find(:all, :order => 'date_added DESC')
                 end
                 def do_manage

app/controllers/users_controller.rb ¶ +1 -1

                   range = 120
                   @histogram = { data: Array.new(range,0), summary: {} }
                   @summary = {count: 0, solve: 0, attempt: 0}
                   problem = Hash.new(0)
                   @submission.find_each do |sub|
                     #histogram
                     d = (DateTime.now.in_time_zone - sub.submitted_at) / 24 / 60 / 60
                     @histogram[:data][d.to_i] += 1 if d < range
                     @summary[:count] += 1
                     next unless sub.problem
-            -       problem[sub.problem] = [problem[sub.problem], (sub.points >= sub.problem.full_score) ? 1 : 0].max
+            +       problem[sub.problem] = [problem[sub.problem], ( (sub.try(:points) || 0) >= sub.problem.full_score) ? 1 : 0].max
                   end
                   @histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @summary[:attempt] = problem.count
                   problem.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end
                 protected
                 def verify_online_registration
                   if !GraderConfiguration['system.online_registration']
                     redirect_to :controller => 'main', :action => 'login'

app/models/grader_configuration.rb ¶ +1

               require 'yaml'
               #
               # This class also contains various login of the system.
               #
               class GraderConfiguration < ActiveRecord::Base
                 SYSTEM_MODE_CONF_KEY = 'system.mode'
                 TEST_REQUEST_EARLY_TIMEOUT_KEY = 'contest.test_request.early_timeout'
                 MULTICONTESTS_KEY = 'system.multicontests'
                 CONTEST_TIME_LIMIT_KEY = 'contest.time_limit'
+            +   MULTIPLE_IP_LOGIN_KEY = 'right.multiple_ip_login'
                 cattr_accessor :config_cache
                 cattr_accessor :task_grading_info_cache
                 cattr_accessor :contest_time_str
                 cattr_accessor :contest_time
                 GraderConfiguration.config_cache = nil
                 GraderConfiguration.task_grading_info_cache = nil
                 def self.config_cached?
                   (defined? CONFIGURATION_CACHE_ENABLED) and (CONFIGURATION_CACHE_ENABLED)
                 end

app/views/users/profile.html.haml ¶ +1 -1

                     - if session[:admin]
                       %th IP
                 %tbody
                   - @submission.each do |s|
                     - next unless s.problem
                     %tr
                       %td= link_to "#{s.id}", controller: "graders", action: "submission", id: s.id
                       %td= link_to s.problem.name, controller: "problems", action: "stat", id: s.problem
                       %td= s.problem.full_name
                       %td= s.language.pretty_name
                       %td  #{s.submitted_at.strftime('%Y-%m-%d %H:%M')} (#{time_ago_in_words(s.submitted_at)} ago)
                       %td.fix-width= s.grader_comment
-            -         %td= (s.points*100)/s.problem.full_score
+            +         %td= ( s.try(:points) ? (s.points*100/s.problem.full_score)  : '' )
                       - if session[:admin]
                         %td= s.ip_address

db/schema.rb ¶ +8 -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 => 20150618085823) do
+            + ActiveRecord::Schema.define(:version => 20150827133841) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body",         :limit => 16777215
                   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
                 add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
                 create_table "sites", :force => true do |t|
                   t.string   "name"
                   t.boolean  "started"
                   t.datetime "start_time"
                   t.datetime "created_at", :null => false
                   t.datetime "updated_at", :null => false
                   t.integer  "country_id"
                   t.string   "password"
                 end
+            +   create_table "submission_view_logs", :force => true do |t|
+            +     t.integer  "user_id"
+            +     t.integer  "submission_id"
+            +     t.datetime "created_at",    :null => false
+            +     t.datetime "updated_at",    :null => false
+            +   end
+            +
                 create_table "submissions", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "language_id"
                   t.text     "source",                :limit => 16777215
                   t.binary   "binary"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message",      :limit => 16777215
                   t.datetime "graded_at"
                   t.integer  "points"
                   t.text     "grader_comment",        :limit => 16777215

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

r532:e19c25c6b241 - Fri, 11 Sep 2015 10:25:05 - 13 files changed: 122 inserted, 6 deleted

Sign in to your account

Commit r532:e19c25c6b241 public

Author

r532:e19c25c6b241 - Fri, 11 Sep 2015 10:25:05 - 13 files changed: 122 inserted, 6 deleted

Commit `r532:e19c25c6b241` public