cafe-grader-web Commit - r521:5a22064770a9

cafe-grader-web

Commit `r521:5a22064770a9` public

parent | child

Description:

finalize multiple_login, change default menu of report to multiple login

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

r521:5a22064770a9 - Tue, 17 Feb 2015 12:17:44 - 7 files changed: 64 inserted, 17 deleted

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

                 def turn_all_on
                   Problem.find(:all,
                                :conditions => "available = 0").each do |problem|
                     problem.available = true
                     problem.save
                   end
                   redirect_to :action => 'list'
                 end
                 def stat
                   @problem = Problem.find(params[:id])
                   unless @problem.available or session[:admin]
                     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.points >= @problem.full_score) ? 1 : 0].max
+            +       user[sub.user_id] = [user[sub.user_id], (sub.try(:points) >= @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
                   if params.has_key? 'change_date_added'
                     change_date_added
                   elsif params.has_key? 'add_to_contest'
                     add_to_contest
                   elsif params.has_key? 'enable_problem'
                     set_available(true)
                   elsif params.has_key? 'disable_problem'
                     set_available(false)
                   end
                   redirect_to :action => 'manage'
                 end

app/controllers/report_controller.rb ¶ +25 -2

                   tries = 0
                   @struggle = Array.new
                   record = {}
                   Submission.includes(:problem,:user).order(:problem_id,:user_id).find_each do |sub|
                     next unless sub.user and sub.problem
                     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
-            -     @multiple = []
+            +     first = 0
+            +     @users = []
                   raw.each do |r|
                     if last != r.user.login
                       count = 1
+            +         last = r.user.login
+            +         first = r
                     else
-            -         @multiple << r
+            +         @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
+            +         count = 1
+            +         last = r.ip_address
+            +         first = r
+            +       else
+            +         @ip << first if count == 1
+            +         @ip << r
+            +         count += 1
                     end
                   end
                 end
               end

app/controllers/user_admin_controller.rb ¶ +10 -5

                   end
                 end
                 def create_from_list
                   lines = params[:user_list]
                   note = []
                   lines.split("\n").each do |line|
                     items = line.chomp.split(',')
                     if items.length>=2
                       login = items[0]
                       full_name = items[1]
                       added_random_password = false
                       if items.length>=3
                         password = items[2].chomp(" ")
                         user_alias = (items.length>=4) ? items[3] : login
                       else
                         password = random_password
                         user_alias = (items.length>=4) ? items[3] : login
                         added_random_password = true
                       end
-            -         user = User.new({:login => login,
+            +         user = User.find_by_login(login)
-            -                           :full_name => full_name,
+            +         if user
-            -                           :password => password,
+            +           user.password = password
-            -                           :password_confirmation => password,
+            +         else
-            -                           :alias => user_alias})
+            +           user = User.new({:login => login,
+            +                             :full_name => full_name,
+            +                             :password => password,
+            +                             :password_confirmation => password,
+            +                             :alias => user_alias})
+            +         end
                       user.activated = true
                       user.save
                       if added_random_password
                         note << "'#{login}' (+)"
                       else
                         note << login
                       end
                     end
                   end
                   flash[:notice] = 'User(s) ' + note.join(', ') +
                     ' were successfully created.  ' +
                     '( (+) - created with random passwords.)'
                   redirect_to :action => 'list'
                 end
                 def edit
                   @user = User.find(params[:id])
                 end
                 def update
                   @user = User.find(params[:id])
                   if @user.update_attributes(params[:user])
                     flash[:notice] = 'User was successfully updated.'

app/helpers/application_helper.rb ¶ +1 -1

               # Methods added to this helper will be available to all templates in the application.
               module ApplicationHelper
                 def user_header
                   menu_items = ''
                   user = User.find(session[:user_id])
                   if (user!=nil) and (session[:admin])
                     # admin menu
                     menu_items << "<b>Administrative task:</b> "
                     append_to menu_items, '[Announcements]', 'announcements', 'index'
                     append_to menu_items, '[Msg console]', 'messages', 'console'
                     append_to menu_items, '[Problems]', 'problems', 'index'
                     append_to menu_items, '[Users]', 'user_admin', 'index'
                     append_to menu_items, '[Results]', 'user_admin', 'user_stat'
-            -       append_to menu_items, '[Report]', 'report', 'login_stat'
+            +       append_to menu_items, '[Report]', 'report', 'multiple_login'
                     append_to menu_items, '[Graders]', 'graders', 'list'
                     append_to menu_items, '[Contests]', 'contest_management', 'index'
                     append_to menu_items, '[Sites]', 'sites', 'index'
                     append_to menu_items, '[System config]', 'configurations', 'index'
                     menu_items << "<br/>"
                   end
                   # main page
                   append_to menu_items, "[#{I18n.t 'menu.main'}]", 'main', 'list'
                   append_to menu_items, "[#{I18n.t 'menu.messages'}]", 'messages', 'list'
                   if (user!=nil) and (GraderConfiguration.show_tasks_to?(user))
                     append_to menu_items, "[#{I18n.t 'menu.tasks'}]", 'tasks', 'list'
                     append_to menu_items, "[#{I18n.t 'menu.submissions'}]", 'main', 'submission'
                     append_to menu_items, "[#{I18n.t 'menu.test'}]", 'test', 'index'
                   end
                   if GraderConfiguration['right.user_hall_of_fame']
                     append_to menu_items, "[#{I18n.t 'menu.hall_of_fame'}]", 'report', 'problem_hof'
                   end
                   append_to menu_items, "[#{I18n.t 'menu.help'}]", 'main', 'help'
                   if GraderConfiguration['system.user_setting_enabled']
                     append_to menu_items, "[#{I18n.t 'menu.settings'}]", 'users', 'index'

app/models/user.rb ¶ +5 -5

                                     :if => :email_validation?
                 validate :uniqueness_of_email_from_activated_users,
                          :if => :email_validation?
                 validate :enough_time_interval_between_same_email_registrations,
                          :if => :email_validation?
                 # these are for ytopc
                 # disable for now
                 #validates_presence_of :province
                 attr_accessor :password
                 before_save :encrypt_new_password
                 before_save :assign_default_site
                 before_save :assign_default_contest
                 # this is for will_paginate
                 cattr_reader :per_page
                 @@per_page = 50
                 def self.authenticate(login, password)
                   user = find_by_login(login)
                   if user
                     return user if user.authenticated?(password)
-            -       if user.authenticated_by_cucas?(password) or user.authenticated_by_pop3?(password)
+            + #      if user.authenticated_by_cucas?(password) or user.authenticated_by_pop3?(password)
-            -         user.password = password
+            + #        user.password = password
-            -         user.save
+            + #        user.save
-            -         return user
+            + #        return user
-            -       end
+            + #      end
                   end
                 end
                 def authenticated?(password)
                   if self.activated
                     hashed_password == User.encrypt(password,self.salt)
                   else
                     false
                   end
                 end
                 def authenticated_by_pop3?(password)
                   Net::POP3.enable_ssl
                   pop = Net::POP3.new('pops.it.chula.ac.th')
                   authen = true
                   begin
                     pop.start(login, password)
                     pop.finish
                     return true
                   rescue
                     return false
                   end
                 end

app/views/problems/stat.html.haml ¶ +2

                     %th Stat
                     %th Value
                 %tbody
                   %tr{class: cycle('info-even','info-odd')}
                     %td Submissions
                     %td= @submissions.count
                   %tr{class: cycle('info-even','info-odd')}
                     %td Solved/Attempted User
                     %td #{@summary[:solve]}/#{@summary[:attempt]} (#{(@summary[:solve]*100.0/@summary[:attempt]).round(1)}%)
               %h2 Submissions Count
               = render partial: 'application/bar_graph', locals: { histogram: @histogram }
               %h2 Submissions
               - if @submissions and @submissions.count > 0
                 %table.info#main_table
                   %thead
                     %tr.info-head
                       %th ID
                       %th Login
                       %th Name
                       %th Submitted_at
                       %th Points
                       %th comment
+            +         %th IP
                   %tbody
                     - row_odd,curr = true,''
                     - @submissions.each do |sub|
                       - next unless sub.user
                       - row_odd,curr = !row_odd, sub.user if curr != sub.user
                       %tr{class: row_odd ? "info-odd" : "info-even"}
                         %td= link_to sub.id, controller: 'graders', action: 'submission', id: sub.id
                         %td= link_to sub.user.login, controller: :users, action: :profile, id: sub.user.id
                         %td= sub.user.full_name
                         %td= time_ago_in_words(sub.submitted_at) + " ago"
                         %td= sub.points
                         %td.fix-width= sub.grader_comment
+            +           %td= sub.ip_address
               - else
                 No submission

app/views/report/multiple_login.html.haml ¶ +20 -3

               - content_for :header do
                 = stylesheet_link_tag 'tablesorter-theme.cafe'
                 = javascript_include_tag 'local_jquery'
               %h1 Login status
               =render partial: 'report_menu'
+            + Checking for all submissions with the currently available problem
+            +
+            + %h2 Users with Multiple IP
               %table.tablesorter-cafe#my_table
                 %thead
                   %tr
                     %th login
                     %th full name
                     %th IP
                 %tbody
-            -     - @multiple.each do |l|
+            +     - @users.each do |l|
                     %tr{class: cycle('info-even','info-odd')}
-            -         %td= link_to l[:login], controller: 'users', action: 'profile', id: l[:id]
+            +         %td= link_to l.user.login, controller: 'users', action: 'profile', id: l[:id]
-            -         %td= l[:full_name]
+            +         %td= l.user.full_name
                       %td= l[:ip_address]
+            +
+            + %h2 IP with multiple users
+            + %table.tablesorter-cafe#my_table
+            +   %thead
+            +     %tr
+            +       %th IP
+            +       %th login
+            +       %th full name
+            +   %tbody
+            +     - @ip.each do |l|
+            +       %tr{class: cycle('info-even','info-odd')}
+            +         %td= l[:ip_address]
+            +         %td= link_to l.user.login, controller: 'users', action: 'profile', id: l[:id]
+            +         %td= l.user.full_name

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

r521:5a22064770a9 - Tue, 17 Feb 2015 12:17:44 - 7 files changed: 64 inserted, 17 deleted

Sign in to your account

Commit r521:5a22064770a9 public

Author

r521:5a22064770a9 - Tue, 17 Feb 2015 12:17:44 - 7 files changed: 64 inserted, 17 deleted

Commit `r521:5a22064770a9` public