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: 42 inserted, 4 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 ¶ +16 -1

               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])
-            -     render text: (GraderConfiguration['right.heartbeat_response'] || 'OK')
+            +     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

                     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

config/routes.rb ¶ -2

                 #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

db/seeds.rb ¶ +7

                  },
                  {
                    :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'

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: 42 inserted, 4 deleted

Sign in to your account

Commit r649:3cb38436f7f6 public

Author

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

Commit `r649:3cb38436f7f6` public