cafe-grader-web Commit - r717:6d7ccf388baa

cafe-grader-web

Commit `r717:6d7ccf388baa` public

parent | child

Description:

Merge pull request #19 from nattee/master upstream merge from nattee/cafe-grader-web

Commit status:

[Not Reviewed]

References:

merge default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r717:6d7ccf388baa - Tue, 05 Sep 2017 09:49:37 - 10 files changed: 12 inserted, 12 deleted

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

                                         .select(:ip_address).uniq
                                }
                   end
                 end
                 def submission_stat
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
                     @since_time = DateTime.strptime(params[:since_datetime],date_and_time)
                   rescue
                     @since_time = DateTime.new(1000,1,1)
                   end
                   begin
                     @until_time = DateTime.strptime(params[:until_datetime],date_and_time)
                   rescue
                     @until_time = DateTime.new(3000,1,1)
                   end
                   @submissions = {}
                   User.find_each do |user|
                     @submissions[user.id] = { login: user.login, full_name: user.full_name, count: 0, sub: { } }
                   end
                   Submission.where("submitted_at >= ? AND submitted_at <= ?",@since_time,@until_time).find_each do |s|
                     if @submissions[s.user_id]
                       if not @submissions[s.user_id][:sub].has_key?(s.problem_id)
                         a = Problem.find_by_id(s.problem_id)
                         @submissions[s.user_id][:sub][s.problem_id] =
                           { prob_name: (a ? a.full_name : '(NULL)'),
                             sub_ids: [s.id] }
                       else
                         @submissions[s.user_id][:sub][s.problem_id][:sub_ids] << s.id
                       end
                       @submissions[s.user_id][:count] += 1
                     end
                   end
                 end
                 def problem_hof
                   # gen problem list
                   @user = User.find(session[:user_id])
                   @problems = @user.available_problems
                   # get selected problems or the default
                   if params[:id]
                     begin
                       @problem = Problem.available.find(params[:id])
                     rescue
                       redirect_to action: :problem_hof
                       flash[:notice] = 'Error: submissions for that problem are not viewable.'
                       return
                     end
                   end
                   return unless @problem
                   @by_lang = {} #aggregrate by language
                   range =65
                   @histogram = { data: Array.new(range,0), summary: {} }
                   @summary = {count: 0, solve: 0, attempt: 0}
                   user = Hash.new(0)
                   Submission.where(problem_id: @problem.id).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
                     next unless sub.points
                     @summary[:count] += 1
                     user[sub.user_id] = [user[sub.user_id], (sub.points >= @problem.full_score) ? 1 : 0].max
                     lang = Language.find_by_id(sub.language_id)
                     next unless lang
                     next unless sub.points >= @problem.full_score
                     #initialize
                     unless @by_lang.has_key?(lang.pretty_name)
                       @by_lang[lang.pretty_name] = {
                         runtime: { avail: false, value: 2**30-1 },
                         memory: { avail: false, value: 2**30-1 },
                         length: { avail: false, value: 2**30-1 },
                         first: { avail: false, value: DateTime.new(3000,1,1) }
                       }
                     end
                     if sub.max_runtime and sub.max_runtime < @by_lang[lang.pretty_name][:runtime][:value]
                       @by_lang[lang.pretty_name][:runtime] = { avail: true, user_id: sub.user_id, value: sub.max_runtime, sub_id: sub.id }
                     end
                     if sub.peak_memory and sub.peak_memory < @by_lang[lang.pretty_name][:memory][:value]
                       @by_lang[lang.pretty_name][:memory] = { avail: true, user_id: sub.user_id, value: sub.peak_memory, sub_id: sub.id }
                     end
-            -       if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and
+            +       if sub.submitted_at and sub.submitted_at < @by_lang[lang.pretty_name][:first][:value] and sub.user and
                         !sub.user.admin?
                       @by_lang[lang.pretty_name][:first] = { avail: true, user_id: sub.user_id, value: sub.submitted_at, sub_id: sub.id }
                     end
                     if @by_lang[lang.pretty_name][:length][:value] > sub.effective_code_length
                       @by_lang[lang.pretty_name][:length] = { avail: true, user_id: sub.user_id, value: sub.effective_code_length, sub_id: sub.id }
                     end
                   end
                   #process user_id
                   @by_lang.each do |lang,prop|
                     prop.each do |k,v|
                       v[:user] = User.exists?(v[:user_id]) ? User.find(v[:user_id]).full_name : "(NULL)"
                     end
                   end
                   #sum into best
                   if @by_lang and @by_lang.first
                     @best = @by_lang.first[1].clone
                     @by_lang.each do |lang,prop|
                       if @best[:runtime][:value] >= prop[:runtime][:value]
                         @best[:runtime] = prop[:runtime]
                         @best[:runtime][:lang] = lang
                       end
                       if @best[:memory][:value] >= prop[:memory][:value]
                         @best[:memory] = prop[:memory]
                         @best[:memory][:lang] = lang
                       end
                       if @best[:length][:value] >= prop[:length][:value]
                         @best[:length] = prop[:length]
                         @best[:length][:lang] = lang
                       end
                       if @best[:first][:value] >= prop[:first][:value]
                         @best[:first] = prop[:first]
                         @best[:first][:lang] = lang
                       end
                     end
                   end
                   @histogram[:summary][:max] = [@histogram[:data].max,1].max
                   @summary[:attempt] = user.count
                   user.each_value { |v| @summary[:solve] += 1 if v == 1 }
                 end
                 def stuck #report struggling user,problem
                   # init
                   user,problem = nil
                   solve = true
                   tries = 0
                   @struggle = Array.new
                   record = {}
                   Submission.includes(:problem,:user).order(:problem_id,:user_id).find_each do |sub|
                     next unless sub.problem and sub.user
                     if user != sub.user_id or problem != sub.problem_id
                       @struggle << { user: record[:user], problem: record[:problem], tries: tries } unless solve
                       record = {user: sub.user, problem: sub.problem}
                       user,problem = sub.user_id, sub.problem_id
                       solve = false
                       tries = 0
                     end
                     if sub.points >= sub.problem.full_score
                       solve = true
                     else
                       tries += 1
                     end
                   end
                   @struggle.sort!{|a,b| b[:tries] <=> a[:tries] }
                   @struggle = @struggle[0..50]
                 end
                 def multiple_login
                   #user with multiple IP
                   raw = Submission.joins(:user).joins(:problem).where("problems.available != 0").group("login,ip_address").order(:login)
                   last,count = 0,0
                   first = 0
                   @users = []
                   raw.each do |r|
                     if last != r.user.login
                       count = 1
                       last = r.user.login
                       first = r
                     else
                       @users << first if count == 1
                       @users << r
                       count += 1
                     end
                   end
                   #IP with multiple user
                   raw = Submission.joins(:user).joins(:problem).where("problems.available != 0").group("login,ip_address").order(:ip_address)
                   last,count = 0,0
                   first = 0
                   @ip = []
                   raw.each do |r|
                     if last != r.ip_address

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

                 verify :method => :post, :only => [:chg_passwd],
                        :redirect_to => { :action => :index }
                 #in_place_edit_for :user, :alias_for_editing
                 #in_place_edit_for :user, :email_for_editing
                 def index
                   if !GraderConfiguration['system.user_setting_enabled']
                     redirect_to :controller => 'main', :action => 'list'
                   else
                     @user = User.find(session[:user_id])
                   end
                 end
                 def chg_passwd
                   user = User.find(session[:user_id])
                   user.password = params[:passwd]
                   user.password_confirmation = params[:passwd_verify]
                   if user.save
                     flash[:notice] = 'password changed'
                   else
                     flash[:notice] = 'Error: password changing failed'
                   end
                   redirect_to :action => 'index'
                 end
                 def new
                   @user = User.new
                   render :action => 'new', :layout => 'empty'
                 end
                 def register
                   if(params[:cancel])
                     redirect_to :controller => 'main', :action => 'login'
                     return
                   end
                   @user = User.new(user_params)
                   @user.password_confirmation = @user.password = User.random_password
                   @user.activated = false
                   if (@user.valid?) and (@user.save)
                     if send_confirmation_email(@user)
                       render :action => 'new_splash', :layout => 'empty'
                     else
                       @admin_email = GraderConfiguration['system.admin_email']
                       render :action => 'email_error', :layout => 'empty'
                     end
                   else
                     @user.errors.add(:base,"Email cannot be blank") if @user.email==''
                     render :action => 'new', :layout => 'empty'
                   end
                 end
                 def confirm
                   login = params[:login]
                   key = params[:activation]
                   @user = User.find_by_login(login)
                   if (@user) and (@user.verify_activation_key(key))
                     if @user.valid?  # check uniquenss of email
                       @user.activated = true
                       @user.save
                       @result = :successful
                     else
                       @result = :email_used
                     end
                   else
                     @result = :failed
                   end
                   render :action => 'confirm', :layout => 'empty'
                 end
                 def forget
                   render :action => 'forget', :layout => 'empty'
                 end
                 def retrieve_password
                   email = params[:email]
                   user = User.find_by_email(email)
                   if user
                     last_updated_time = user.updated_at || user.created_at || (Time.now.gmtime - 1.hour)
                     if last_updated_time > Time.now.gmtime - 5.minutes
                       flash[:notice] = 'The account has recently created or new password has recently been requested.  Please wait for 5 minutes'
                     else
                       user.password = user.password_confirmation = User.random_password
                       user.save
                       send_new_password_email(user)
                       flash[:notice] = 'New password has been mailed to you.'
                     end
                   else
                     flash[:notice] = I18n.t 'registration.password_retrieval.no_email'
                   end
                   redirect_to :action => 'forget'
                 end
                 def stat
                   @user = User.find(params[:id])
-            -     @submission = Submission.includes(:problem).where(user_id: params[:id])
+            +     @submission = Submission.joins(:problem).where(user_id: params[:id])
+            +     @submission = @submission.where('problems.available = true') unless current_user.admin?
                   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.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
                 def toggle_activate
                   @user = User.find(params[:id])
                   @user.update_attributes( activated:  !@user.activated? )
                   respond_to do |format|
                     format.js { render partial: 'toggle_button',
                                 locals: {button_id: "#toggle_activate_user_#{@user.id}",button_on: @user.activated? } }
                   end
                 end
                 def toggle_enable
                   @user = User.find(params[:id])
                   @user.update_attributes( enabled:  !@user.enabled? )
                   respond_to do |format|
                     format.js { render partial: 'toggle_button',
                                 locals: {button_id: "#toggle_enable_user_#{@user.id}",button_on: @user.enabled? } }
                   end
                 end
                 protected
                 def verify_online_registration
                   if !GraderConfiguration['system.online_registration']
                     redirect_to :controller => 'main', :action => 'login'
                   end
                 end
                 def send_confirmation_email(user)
                   contest_name = GraderConfiguration['contest.name']
                   activation_url = url_for(:action => 'confirm',
                                            :login => user.login,
                                            :activation => user.activation_key)
                   home_url = url_for(:controller => 'main', :action => 'index')
                   mail_subject = "[#{contest_name}] Confirmation"
                   mail_body = t('registration.email_body', {
                                   :full_name => user.full_name,
                                   :contest_name => contest_name,
                                   :login => user.login,
                                   :password => user.password,
                                   :activation_url => activation_url,
                                   :admin_email => GraderConfiguration['system.admin_email']
                                 })
                   logger.info mail_body
                   send_mail(user.email, mail_subject, mail_body)
                 end
                 def send_new_password_email(user)
                   contest_name = GraderConfiguration['contest.name']
                   mail_subject = "[#{contest_name}] Password recovery"
                   mail_body = t('registration.password_retrieval.email_body', {
                                   :full_name => user.full_name,
                                   :contest_name => contest_name,
                                   :login => user.login,
                                   :password => user.password,
                                   :admin_email => GraderConfiguration['system.admin_email']
                                 })
                   logger.info mail_body
                   send_mail(user.email, mail_subject, mail_body)
                 end
                 # allow viewing of regular user profile only when options allow so
                 # only admins can view admins profile
                 def profile_authorization
                   #if view admins' profile, allow only admin
                   return false unless(params[:id])
                   user = User.find(params[:id])
                   return false unless user
                   return admin_authorization if user.admin?
                   return true if GraderConfiguration["right.user_view_submission"]
                   #finally, we allow only admin
                   admin_authorization

db/migrate/011_add_language_ext.rb ¶ +1 -1

               class AddLanguageExt < ActiveRecord::Migration
                 def self.up
                   add_column :languages, :ext, :string, :limit => 10
                   Language.reset_column_information
-            -     langs = Language.find(:all)
+            +     langs = Language.all
                   langs.each do |l|
                     l.ext = l.name
                     l.save
                   end
                 end
                 def self.down
                   remove_column :languages, :ext
                 end
               end

db/migrate/015_add_status_to_tasks.rb ¶ +1 -1

               class AddStatusToTasks < ActiveRecord::Migration
                 def self.up
                   add_column :tasks, :status, :integer
                   add_column :tasks, :updated_at, :datetime
                   Task.reset_column_information
-            -     Task.find(:all).each do |task|
+            +     Task.all.each do |task|
                     task.status_complete
                     task.save
                   end
                 end
                 def self.down
                   remove_column :tasks, :updated_at
                   remove_column :tasks, :status
                 end
               end

db/migrate/018_add_number_to_submissions.rb ¶ +1 -2

               class AddNumberToSubmissions < ActiveRecord::Migration
                 def self.up
                   add_column :submissions, :number, :integer
                   # add number field for all records
                   Submission.reset_column_information
                   last_user_id = nil
                   last_problem_id = nil
                   current_number = 0
-            -     Submission.find(:all,
+            +     Submission.order('user_id, problem_id, submitted_at').each do |submission|
-            -                     :order => 'user_id, problem_id, submitted_at').each do |submission|
                     if submission.user_id==last_user_id and submission.problem_id==last_problem_id
                       current_number += 1
                     else
                       current_number = 1
                     end
                     submission.number = current_number
                     submission.save
                     last_user_id = submission.user_id
                     last_problem_id = submission.problem_id
                   end
                   add_index :submissions, [:user_id, :problem_id, :number], :unique => true
                 end
                 def self.down
                   remove_index :submissions, :column => [:user_id, :problem_id, :number]
                   remove_column :submissions, :number
                 end
               end

db/migrate/025_add_site_to_user_and_add_default_site.rb ¶ +1 -1

               class AddSiteToUserAndAddDefaultSite < ActiveRecord::Migration
                 def self.up
                   default_site = Site.new({:name => 'default',
                                             :started => false})
                   default_site.save!
                   add_column :users, :site_id, :integer
                   User.reset_column_information
-            -     User.find(:all).each do |user|
+            +     User.all.each do |user|
                     class << user
                       def valid?
                         true
                       end
                     end
                     user.site_id = default_site.id
                     user.save
                   end
                 end
                 def self.down
                   remove_column :users, :site_id
                   default_site = Site.find_by_name('default')
                   default_site.destroy if default_site
                 end
               end

db/migrate/028_refactor_problem_body_to_description.rb ¶ +2 -2

               class RefactorProblemBodyToDescription < ActiveRecord::Migration
                 def self.up
                   add_column :problems, :description_id, :integer
                   Problem.reset_column_information
-            -     Problem.find(:all).each do |problem|
+            +     Problem.all.each do |problem|
                     if problem.body!=nil
                       description = Description.new
                       description.body = problem.body
                       description.markdowned = false
                       description.save
                       problem.description_id = description.id
                       problem.save
                     end
                   end
                   remove_column :problems, :body
                 end
                 def self.down
                   add_column :problems, :body, :text
                   Problem.reset_column_information
-            -     Problem.find(:all).each do |problem|
+            +     Problem.all.each do |problem|
                     if problem.description_id != nil
                       problem.body = Description.find(problem.description_id).body
                       problem.save
                     end
                   end
                   remove_column :problems, :description_id
                 end
               end

db/migrate/029_add_test_allowed_to_problems.rb ¶ +1 -1

               class AddTestAllowedToProblems < ActiveRecord::Migration
                 def self.up
                   add_column :problems, :test_allowed, :boolean
                   Problem.reset_column_information
-            -     Problem.find(:all).each do |problem|
+            +     Problem.all.each do |problem|
                     problem.test_allowed = true
                     problem.save
                   end
                 end
                 def self.down
                   remove_column :problems, :test_allowed
                 end
               end

db/migrate/20081204122651_add_activated_to_users.rb ¶ +1 -1

               class AddActivatedToUsers < ActiveRecord::Migration
                 def self.up
                   add_column :users, :activated, :boolean, :default => 0
                   User.reset_column_information
-            -     User.find(:all).each do |user|
+            +     User.all.each do |user|
                     # disable validation
                     class <<user
                       def valid?
                         return true
                       end
                     end
                     user.activated = true
                     user.save
                   end
                 end
                 def self.down
                   remove_column :users, :activated
                 end
               end

db/migrate/20090416235658_add_common_ext_to_languages.rb ¶ +1 -1

               class AddCommonExtToLanguages < ActiveRecord::Migration
                 def self.up
                   # language.common_ext is a comma-separated list of common file
                   # extensions.
                   add_column :languages, :common_ext, :string
                   # updating table information
                   Language.reset_column_information
                   common_ext = {
                     'c' => 'c',
                     'cpp' => 'cpp,cc',
                     'pas' => 'pas'
                   }
-            -     Language.find(:all).each do |lang|
+            +     Language.all.each do |lang|
                     lang.common_ext = common_ext[lang.name]
                     lang.save
                   end
                 end
                 def self.down
                   remove_column :languages, :common_ext
                 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

r717:6d7ccf388baa - Tue, 05 Sep 2017 09:49:37 - 10 files changed: 12 inserted, 12 deleted

Sign in to your account

Commit r717:6d7ccf388baa public

Author

r717:6d7ccf388baa - Tue, 05 Sep 2017 09:49:37 - 10 files changed: 12 inserted, 12 deleted

Commit `r717:6d7ccf388baa` public