cafe-grader-web Commit - r859:d7fa5bf1aeba

cafe-grader-web

Commit `r859:d7fa5bf1aeba` public

parent | child

Description:

fig bugs in login report

Commit status:

[Not Reviewed]

References:

algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r859:d7fa5bf1aeba - Thu, 10 Feb 2022 16:47:16 - 2 files changed: 7 inserted, 6 deleted

app/controllers/application_controller.rb ¶ -2

                 def nav_announcement
                   @nav_announcement = Announcement.where(on_nav_bar: true)
                 end
                 def admin_authorization
                   return false unless check_valid_login
                   user = User.includes(:roles).find(session[:user_id])
                   unless user.admin?
                     unauthorized_redirect
                     return false
                   end
                   return true
                 end
                 #admin always count as every roles
                 def role_authorization(roles)
                   return false unless check_valid_login
                   user = User.find(session[:user_id])
                   return true if user.admin?
                   roles.each do |r|
                     return true if user.has_role?(r)
                   end
                   unauthorized_redirect
                 end
                 def authorization_by_roles(allowed_roles)
                   return false unless check_valid_login
                   unless @current_user.roles.detect { |role| allowed_roles.member?(role.name) }
                     unauthorized_redirect
                     return false
                   end
                 end
                 def testcase_authorization
                   #admin always has privileged
                   if @current_user.admin?
                     return true
                   end
                   unauthorized_redirect unless GraderConfiguration["right.view_testcase"]
                 end
                 def unique_visitor_id
                   unless cookies.encrypted[:uuid]
                     value = SecureRandom.uuid
                     cookies.encrypted[:uuid] = { value: value, expires: 20.year }
                   end
-            -     puts "encrypt " + cookies.encrypted[:uuid]
-            -     puts cookies[:uuid]
                 end
                 protected
                 #redirect to root (and also force logout)
                 #if the user is not logged_in or the system is in "ADMIN ONLY" mode
                 def check_valid_login
                   #check if logged in
                   unless session[:user_id]
                     if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
                       unauthorized_redirect('You need to login but you cannot log in at this time')
                     else
                       unauthorized_redirect('You need to login')
                     end
                     return false
                   end
                   # check if run in single user mode
                   if GraderConfiguration[SINGLE_USER_MODE_CONF_KEY]
                     if @current_user==nil || (!@current_user.admin?)
                       unauthorized_redirect('You cannot log in at this time')
                       return false
                     end
                   end
                   # check if the user is enabled
                   unless @current_user.enabled? || @current_user.admin?
                     unauthorized_redirect 'Your account is disabled'
                     return false
                   end
                   # check if user ip is allowed
                   unless @current_user.admin? || GraderConfiguration[WHITELIST_IGNORE_CONF_KEY]
                     unless is_request_ip_allowed?
                       unauthorized_redirect 'Your IP is not allowed to login at this time.'
                       return false
                     end
                   end
                   if GraderConfiguration.multicontests?
                     return true if @current_user.admin?
                     begin
                       if @current_user.contest_stat(true).forced_logout
                         flash[:notice] = 'You have been automatically logged out.'
                         redirect_to :controller => 'main', :action => 'index'
                       end
                     rescue
                     end

app/controllers/report_controller.rb ¶ +7 -4

                   else
                     #render template: 'user_admin/user_stat'
                     render 'max_score'
                   end
                 end
                 def score
                   if params[:commit] == 'download csv'
                     @problems = Problem.all
                   else
                     @problems = Problem.available_problems
                   end
                   @users = User.includes(:contests, :contest_stat).where(enabled: true)
                   @scorearray = Array.new
                   @users.each do |u|
                     ustat = Array.new
                     ustat[0] = u
                     @problems.each do |p|
                       sub = Submission.find_last_by_user_and_problem(u.id,p.id)
                       if (sub!=nil) and (sub.points!=nil) and p and p.full_score
                         ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
                       else
                         ustat << [0,false]
                       end
                     end
                     @scorearray << ustat
                   end
                   if params[:commit] == 'download csv' then
                     csv = gen_csv_from_scorearray(@scorearray,@problems)
                     send_data csv, filename: 'last_score.csv'
                   else
                     render template: 'user_admin/user_stat'
                   end
                 end
                 def login
                 end
                 def login_summary_query
                   @users = Array.new
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
                     md = params[:since_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)
                     @since_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i)
                   rescue
-            -       @since_time = DateTime.new(1000,1,1)
+            +       @since_time = Time.zone.now
                   end
+            +     puts @since_time
                   begin
                     md = params[:until_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)
                     @until_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i)
                   rescue
                     @until_time = DateTime.new(3000,1,1)
                   end
                   record = User
                     .left_outer_joins(:logins).group('users.id')
                     .where("logins.created_at >= ? AND logins.created_at <= ?",@since_time, @until_time)
                   case params[:users]
                   when 'enabled'
                     record = record.where(enabled: true)
                   when 'group'
                     record = record.joins(:groups).where(groups: {id: params[:groups]}) if params[:groups]
                   end
                   record = record.pluck("users.id,users.login,users.full_name,count(logins.created_at),min(logins.created_at),max(logins.created_at)")
                   record.each do |user|
                     x = Login.where("user_id = ? AND created_at >= ? AND created_at <= ?",
                                                     user[0],@since_time,@until_time)
                       .pluck(:ip_address).uniq
+            +       puts user[4]
+            +       puts user[5]
                     @users << { id: user[0],
                                  login: user[1],
                                  full_name: user[2],
                                  count: user[3],
-            -                    min: user[4],
+            +                    min: user[4].in_time_zone,
-            -                    max: user[5],
+            +                    max: user[5].in_time_zone,
                                  ip: x
                                }
                   end
                 end
                 def login_detail_query
                   @logins = Array.new
                   date_and_time = '%Y-%m-%d %H:%M'
                   begin
                     md = params[:since_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)
                     @since_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i)
                   rescue
-            -       @since_time = DateTime.new(1000,1,1)
+            +       @since_time = Time.zone.now
                   end
                   begin
                     md = params[:until_datetime].match(/(\d+)-(\d+)-(\d+) (\d+):(\d+)/)
                     @until_time = Time.zone.local(md[1].to_i,md[2].to_i,md[3].to_i,md[4].to_i,md[5].to_i)
                   rescue
                     @until_time = DateTime.new(3000,1,1)
                   end
                   @logins = Login.includes(:user).where("logins.created_at >= ? AND logins.created_at <= ?",@since_time, @until_time)
                   case params[:users]
                   when 'enabled'
                     @logins = @logins.where(users: {enabled: true})
                   when 'group'
                     @logins = @logins.joins(user: :groups).where(user: {groups: {id: params[:groups]}}) if params[:groups]
                   end
                 end
                 def submission
                 end
                 def submission_query
                   @submissions = Submission
                     .includes(:problem).includes(:user).includes(:language)
                   case params[:users]
                   when 'enabled'
                     @submissions = @submissions.where(users: {enabled: true})
                   when 'group'
                     @submissions = @submissions.joins(user: :groups).where(user: {groups: {id: params[:groups]}}) if params[:groups]
                   end
                   case params[:problems]
                   when 'enabled'
                     @submissions = @submissions.where(problems: {available: true})
                   when 'selected'
                     @submissions = @submissions.where(problem_id: params[:problem_id])
                   end
                   #set default
                   params[:since_datetime] = Date.today.to_s if params[:since_datetime].blank?
                   @submissions, @recordsTotal, @recordsFiltered = process_query_record( @submissions,
                     global_search: ['user.login','user.full_name','problem.name','problem.full_name','points'],
                     date_filter: 'submitted_at',
                     date_param_since: 'since_datetime',
                     date_param_until: 'until_datetime',
                     hard_limit: 100_000
                   )

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

r859:d7fa5bf1aeba - Thu, 10 Feb 2022 16:47:16 - 2 files changed: 7 inserted, 6 deleted

Sign in to your account

Commit r859:d7fa5bf1aeba public

Author

r859:d7fa5bf1aeba - Thu, 10 Feb 2022 16:47:16 - 2 files changed: 7 inserted, 6 deleted

Commit `r859:d7fa5bf1aeba` public