cafe-grader-web Commit - r649:3cb38436f7f6

cafe-grader-web

Commit `r649:3cb38436f7f6` public

parent | child

Description:

heartbeat response full

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r649:3cb38436f7f6 - Thu, 27 Apr 2017 07:22:27 - 6 files changed: 41 inserted, 3 deleted

db/migrate/20170427070345_add_heart_beat_full.rb created 644 ¶ +9

@@ -0,0 +1,9
	1	+ class AddHeartBeatFull < ActiveRecord::Migration
	2	+ def up
	3	+ GraderConfiguration.create key: 'right.heartbeat_response_full', value_type: 'string', value:'RESTART', description:'Heart beat response text when user got full score (set this value to the empty string to disable this feature)'
	4	+ end
	5	+
	6	+ def down
	7	+
	8	+ end
	9	+ end

app/controllers/heartbeat_controller.rb ¶ +15

               class HeartbeatController < ApplicationController
                 before_filter :admin_authorization, :only => ['index']
                 def edit
                   #@user = User.find_by_login(params[:id])
                   #unless @user
                   #  render text: "LOGIN_NOT_FOUND"
                   #  return
                   #end
                   #hb = HeartBeat.where(user_id: @user.id, ip_address: request.remote_ip).first
                   #puts "status = #{params[:status]}"
                   #if hb
                   #  if params[:status]
                   #    hb.status = params[:status]
                   #    hb.save
                   #  end
                   #  hb.touch
                   #else
                   #  HeartBeat.creae(user_id: @user.id, ip_address: request.remote_ip)
                   #end
                   #HeartBeat.create(user_id: @user.id, ip_address: request.remote_ip, status: params[:status])
+            +     res = GraderConfiguration['right.heartbeat_response']
+            +     res.strip! if res
+            +     full = GraderConfiguration['right.heartbeat_response_full']
+            +     full.strip! if full
+            +
+            +     if full and full != ''
+            +       l = Login.where(ip_address: request.remote_ip).last
+            +       @user = l.user
+            +       if @user.solve_all_available_problems?
+            +         render text: (full || 'OK')
+            +       else
+            +         render text: (res || 'OK')
+            +       end
+            +     else
                     render text: (GraderConfiguration['right.heartbeat_response'] || 'OK')
                   end
+            +   end
                 def index
                   @hb = HeartBeat.where("updated_at >= ?",Time.zone.now-2.hours).includes(:user).order(:user_id).all
                   @num = HeartBeat.where("updated_at >= ?",Time.zone.now-5.minutes).count(:user_id,distinct: true)
                 end
               end

app/models/user.rb ¶ +9

                   return users.find_all { |u| u.contests.length == 0 }
                 end
                 def contest_time_left
                   if GraderConfiguration.contest_mode?
                     return nil if site==nil
                     return site.time_left
                   elsif GraderConfiguration.indv_contest_mode?
                     time_limit = GraderConfiguration.contest_time_limit
                     if time_limit == nil
                       return nil
                     end
                     if contest_stat==nil or contest_stat.started_at==nil
                       return (Time.now.gmtime + time_limit) - Time.now.gmtime
                     else
                       finish_time = contest_stat.started_at + time_limit
                       current_time = Time.now.gmtime
                       if current_time > finish_time
                         return 0
                       else
                         return finish_time - current_time
                       end
                     end
                   else
                     return nil
                   end
                 end
                 def contest_finished?
                   if GraderConfiguration.contest_mode?
                     return false if site==nil
                     return site.finished?
                   elsif GraderConfiguration.indv_contest_mode?
                     return false if self.contest_stat(true)==nil
                     return contest_time_left == 0
                   else
                     return false
                   end
                 end
                 def contest_started?
                   if GraderConfiguration.indv_contest_mode?
                     stat = self.contest_stat
                     return ((stat != nil) and (stat.started_at != nil))
                   elsif GraderConfiguration.contest_mode?
                     return true if site==nil
                     return site.started
                   else
                     return true
                   end
                 end
                 def update_start_time
                   stat = self.contest_stat
                   if stat.nil? or stat.started_at.nil?
                     stat ||= UserContestStat.new(:user => self)
                     stat.started_at = Time.now.gmtime
                     stat.save
                   end
                 end
                 def problem_in_user_contests?(problem)
                   problem_contests = problem.contests.all
                   if problem_contests.length == 0   # this is public contest
                     return true
                   end
                   contests.each do |contest|
                     if problem_contests.find {|c| c.id == contest.id }
                       return true
                     end
                   end
                   return false
                 end
                 def available_problems_group_by_contests
                   contest_problems = []
                   pin = {}
                   contests.enabled.each do |contest|
                     available_problems = contest.problems.available
                     contest_problems << {
                       :contest => contest,
                       :problems => available_problems
                     }
                     available_problems.each {|p| pin[p.id] = true}
                   end
                   other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
                   contest_problems << {
                     :contest => nil,
                     :problems => other_avaiable_problems
                   }
                   return contest_problems
                 end
+            +   def solve_all_available_problems?
+            +     available_problems.each do |p|
+            +       u = self
+            +       sub = Submission.find_last_by_user_and_problem(u.id,p.id)
+            +       return false if !p or !sub or sub.points < p.full_score
+            +     end
+            +     return true
+            +   end
+            +
                 def available_problems
                   if not GraderConfiguration.multicontests?
                     return Problem.available_problems
                   else
                     contest_problems = []
                     pin = {}
                     contests.enabled.each do |contest|
                       contest.problems.available.each do |problem|
                         if not pin.has_key? problem.id
                           contest_problems << problem
                         end
                         pin[problem.id] = true
                       end
                     end
                     other_avaiable_problems = Problem.available.find_all {|p| pin[p.id]==nil and p.contests.length==0}
                     return contest_problems + other_avaiable_problems
                   end
                 end
                 def can_view_problem?(problem)
                   if not GraderConfiguration.multicontests?
                     return problem.available
                   else
                     return problem_in_user_contests? problem
                   end
                 end
                 def self.clear_last_login
                   User.update_all(:last_ip => nil)
                 end
                 protected
                   def encrypt_new_password
                     return if password.blank?
                     self.salt = (10+rand(90)).to_s
                     self.hashed_password = User.encrypt(self.password,self.salt)
                   end
                   def assign_default_site
                     # have to catch error when migrating (because self.site is not available).
                     begin
                       if self.site==nil
                         self.site = Site.find_by_name('default')
                         if self.site==nil
                           self.site = Site.find(1)  # when 'default has be renamed'
                         end
                       end
                     rescue
                     end
                   end
                   def assign_default_contest
                     # have to catch error when migrating (because self.site is not available).
                     begin
                       if self.contests.length == 0
                         default_contest = Contest.find_by_name(GraderConfiguration['contest.default_contest_name'])
                         if default_contest
                           self.contests = [default_contest]
                         end
                       end
                     rescue
                     end
                   end
                   def password_required?
                     self.hashed_password.blank? || !self.password.blank?
                   end
                   def self.encrypt(string,salt)
                     Digest::SHA1.hexdigest(salt + string)
                   end
                   def uniqueness_of_email_from_activated_users
                     user = User.activated_users.find_by_email(self.email)
                     if user and (user.login != self.login)
                       self.errors.add(:base,"Email has already been taken")
                     end
                   end
                   def enough_time_interval_between_same_email_registrations
                     return if !self.new_record?
                     return if self.activated
                     open_user = User.find_by_email(self.email,
                                                    :order => 'created_at DESC')
                     if open_user and open_user.created_at and
                         (open_user.created_at > Time.now.gmtime - 5.minutes)
                       self.errors.add(:base,"There are already unactivated registrations with this e-mail address (please wait for 5 minutes)")
                     end
                   end
                   def email_validation?
                     begin
                       return VALIDATE_USER_EMAILS
                     rescue
                       return false
                     end

config/routes.rb ¶ -2

               CafeGrader::Application.routes.draw do
                 get "sources/direct_edit"
                 root :to => 'main#login'
                 #logins
                 get 'login/login',  to: 'login#login'
                 resources :contests
                 resources :sites
                 resources :announcements do
                   member do
                     get 'toggle','toggle_front'
                   end
                 end
                 resources :problems do
                   member do
                     get 'toggle'
                     get 'toggle_test'
                     get 'toggle_view_testcase'
                     get 'stat'
                   end
                   collection do
                     get 'turn_all_off'
                     get 'turn_all_on'
                     get 'import'
                     get 'manage'
                   end
                 end
                 resources :testcases, only: [] do
                   member do
                     get 'download_input'
                     get 'download_sol'
                   end
                   collection do
                     get 'show_problem/:problem_id(/:test_num)' => 'testcases#show_problem', as: 'show_problem'
                   end
                 end
                 resources :grader_configuration, controller: 'configurations'
                 resources :users do
                   member do
                     get 'toggle_activate', 'toggle_enable'
                     get 'stat'
                   end
                 end
                 resources :submissions do
                   member do
                     get 'download'
                     get 'compiler_msg'
                     get 'rejudge'
                   end
                   collection do
                     get 'prob/:problem_id', to: 'submissions#index', as: 'problem'
                     get 'direct_edit_problem/:problem_id', to: 'submissions#direct_edit_problem', as: 'direct_edit_problem'
                     get 'get_latest_submission_status/:uid/:pid', to: 'submissions#get_latest_submission_status', as: 'get_latest_submission_status'
                   end
                 end
                 #main
                 get "main/list"
                 get 'main/submission(/:id)', to: 'main#submission', as: 'main_submission'
                 #user admin
                 get 'user_admin/bulk_manage', to: 'user_admin#bulk_manage', as: 'bulk_manage_user_admin'
                 #report
                 get 'report/current_score', to: 'report#current_score', as: 'report_current_score'
                 get 'report/problem_hof(/:id)', to: 'report#problem_hof', as: 'report_problem_hof'
                 get "report/login"
                 get 'report/max_score', to: 'report#max_score', as: 'report_max_score'
                 post 'report/show_max_score', to: 'report#show_max_score', as: 'report_show_max_score'
                 #
                 get 'tasks/view/:file.:ext' => 'tasks#view'
                 get 'tasks/download/:id/:file.:ext' => 'tasks#download'
                 get 'heartbeat/:id/edit' => 'heartbeat#edit'
                 #grader
                 get 'graders/list', to: 'graders#list', as: 'grader_list'
-            -   get '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)', via:  [:get, :post]
               end

db/schema.rb ¶ +1 -1

               # encoding: UTF-8
               # 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 that you check this file into your version control system.
-            - ActiveRecord::Schema.define(version: 20170310110146) do
+            + ActiveRecord::Schema.define(version: 20170427070345) do
                 create_table "announcements", force: :cascade do |t|
                   t.string   "author",       limit: 255
                   t.text     "body",         limit: 65535
                   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",        limit: 255
                   t.string   "notes",        limit: 255
                 end
                 create_table "contests", force: :cascade do |t|
                   t.string   "title",      limit: 255
                   t.boolean  "enabled"
                   t.datetime "created_at",             null: false
                   t.datetime "updated_at",             null: false
                   t.string   "name",       limit: 255
                 end
                 create_table "contests_problems", id: false, force: :cascade do |t|
                   t.integer "contest_id", limit: 4
                   t.integer "problem_id", limit: 4
                 end
                 create_table "contests_users", id: false, force: :cascade do |t|
                   t.integer "contest_id", limit: 4
                   t.integer "user_id",    limit: 4
                 end
                 create_table "countries", force: :cascade do |t|
                   t.string   "name",       limit: 255
                   t.datetime "created_at",             null: false
                   t.datetime "updated_at",             null: false
                 end
                 create_table "descriptions", force: :cascade do |t|
                   t.text     "body",       limit: 65535
                   t.boolean  "markdowned"
                   t.datetime "created_at",               null: false
                   t.datetime "updated_at",               null: false
                 end
                 create_table "grader_configurations", force: :cascade do |t|
                   t.string   "key",         limit: 255
                   t.string   "value_type",  limit: 255
                   t.string   "value",       limit: 255
                   t.datetime "created_at",                null: false
                   t.datetime "updated_at",                null: false
                   t.text     "description", limit: 65535
                 end
                 create_table "grader_processes", force: :cascade do |t|
                   t.string   "host",       limit: 255
                   t.integer  "pid",        limit: 4
                   t.string   "mode",       limit: 255
                   t.boolean  "active"
                   t.datetime "created_at",             null: false
                   t.datetime "updated_at",             null: false
                   t.integer  "task_id",    limit: 4
                   t.string   "task_type",  limit: 255
                   t.boolean  "terminated"
                 end
                 add_index "grader_processes", ["host", "pid"], name: "index_grader_processes_on_ip_and_pid", using: :btree
                 create_table "heart_beats", force: :cascade do |t|
                   t.integer  "user_id",    limit: 4
                   t.string   "ip_address", limit: 255
                   t.datetime "created_at",             null: false
                   t.datetime "updated_at",             null: false
                   t.string   "status",     limit: 255
                 end
                 add_index "heart_beats", ["updated_at"], name: "index_heart_beats_on_updated_at", using: :btree
                 create_table "languages", force: :cascade do |t|
                   t.string "name",        limit: 10
                   t.string "pretty_name", limit: 255
                   t.string "ext",         limit: 10
                   t.string "common_ext",  limit: 255
                 end
                 create_table "logins", force: :cascade do |t|
                   t.integer  "user_id",    limit: 4
                   t.string   "ip_address", limit: 255
                   t.datetime "created_at",             null: false
                   t.datetime "updated_at",             null: false
                 end
                 create_table "messages", force: :cascade do |t|
                   t.integer  "sender_id",           limit: 4
                   t.integer  "receiver_id",         limit: 4
                   t.integer  "replying_message_id", limit: 4
                   t.text     "body",                limit: 65535

db/seeds.rb ¶ +7

               CONFIGURATIONS =
                 [
                  {
                    :key => 'system.single_user_mode',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'Only admins can log in to the system when running under single user mode.'
                  },
                  {
                    :key => 'ui.front.title',
                    :value_type => 'string',
                    :default_value => 'Grader'
                  },
                  {
                    :key => 'ui.front.welcome_message',
                    :value_type => 'string',
                    :default_value => 'Welcome!'
                  },
                  {
                    :key => 'ui.show_score',
                    :value_type => 'boolean',
                    :default_value => 'true'
                  },
                  {
                    :key => 'contest.time_limit',
                    :value_type => 'string',
                    :default_value => 'unlimited',
                    :description => 'Time limit in format hh:mm, or "unlimited" for contests with no time limits.  This config is CACHED.  Restart the server before the change can take effect.'
                  },
                  {
                    :key => 'system.mode',
                    :value_type => 'string',
                    :default_value => 'standard',
                    :description => 'Current modes are "standard", "contest", "indv-contest", and "analysis".'
                  },
                  {
                    :key => 'contest.name',
                    :value_type => 'string',
                    :default_value => 'Grader',
                    :description => 'This name will be shown on the user header bar.'
                  },
                  {
                    :key => 'contest.multisites',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'If the server is in contest mode and this option is true, on the log in of the admin a menu for site selections is shown.'
                  },
                  #---------------------------- right --------------------------------
                  {
                    :key => 'right.user_hall_of_fame',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'If true, any user can access hall of fame page.'
                  },
                  {
                    :key => 'right.multiple_ip_login',
                    :value_type => 'boolean',
                    :default_value => 'true',
                    :description => 'When change from true to false, a user can login from the first IP they logged into afterward.'
                  },
                  {
                    :key => 'right.user_view_submission',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'If true, any user can view submissions of every one.'
                  },
                  {
                    :key => 'right.bypass_agreement',
                    :value_type => 'boolean',
                    :default_value => 'true',
                    :description => 'When false, a user must accept usage agreement before login'
                  },
                  {
                    :key => 'right.heartbeat_response',
                    :value_type => 'string',
                    :default_value => 'OK',
                    :description => 'Heart beat response text'
                  },
                  {
+            +      :key => 'right.heartbeat_response_full',
+            +      :value_type => 'string',
+            +      :default_value => 'OK',
+            +      :description => 'Heart beat response text when user got full score (set this value to the empty string to disable this feature)'
+            +    },
+            +
+            +    {
                    :key => 'right.view_testcase',
                    :value_type => 'boolean',
                    :default_value => 'false',
                    :description => 'When true, any user can view/download test data'
                  },
                  # If Configuration['system.online_registration'] is true, the
                  # system allows online registration, and will use these
                  # information for sending confirmation emails.
                  {
                    :key => 'system.online_registration.smtp',
                    :value_type => 'string',
                    :default_value => 'smtp.somehost.com'
                  },
                  {
                    :key => 'system.online_registration.from',
                    :value_type => 'string',
                    :default_value => 'your.email@address'
                  },
                  {
                    :key => 'system.admin_email',
                    :value_type => 'string',
                    :default_value => 'admin@admin.email'
                  },
                  {
                    :key => 'system.user_setting_enabled',
                    :value_type => 'boolean',
                    :default_value => 'true',
                    :description => 'If this option is true, users can change their settings'
                  },
                  {
                    :key => 'system.user_setting_enabled',
                    :value_type => 'boolean',
                    :default_value => 'true',
                    :description => 'If this option is true, users can change their settings'
                  },
                  # If Configuration['contest.test_request.early_timeout'] is true
                  # the user will not be able to use test request at 30 minutes
                  # before the contest ends.
                  {
                    :key => 'contest.test_request.early_timeout',
                    :value_type => 'boolean',
                    :default_value => 'false'
                  },
                  {
                    :key => 'system.multicontests',
                    :value_type => 'boolean',
                    :default_value => 'false'
                  },
                  {
                    :key => 'contest.confirm_indv_contest_start',
                    :value_type => 'boolean',
                    :default_value => 'false'
                  },
                  {
                    :key => 'contest.default_contest_name',
                    :value_type => 'string',
                    :default_value => 'none',
                    :description => "New user will be assigned to this contest automatically, if it exists.  Set to 'none' if there is no default contest."
                  }
                 ]
               def create_configuration_key(key,
                                            value_type,
                                            default_value,
                                            description='')
                 conf = (GraderConfiguration.find_by_key(key) ||
                         GraderConfiguration.new(:key => key,
                                           :value_type => value_type,
                                           :value => default_value))
                 conf.description = description
                 conf.save
               end
               def seed_config
                 CONFIGURATIONS.each do |conf|
                   if conf.has_key? :description
                     desc = conf[:description]
                   else
                     desc = ''
                   end
                   create_configuration_key(conf[:key],
                                            conf[:value_type],
                                            conf[:default_value],
                                            desc)
                 end
               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

r649:3cb38436f7f6 - Thu, 27 Apr 2017 07:22:27 - 6 files changed: 41 inserted, 3 deleted

Sign in to your account

Commit r649:3cb38436f7f6 public

Author

r649:3cb38436f7f6 - Thu, 27 Apr 2017 07:22:27 - 6 files changed: 41 inserted, 3 deleted

Commit `r649:3cb38436f7f6` public