cafe-grader-web Commit - r521:5a22064770a9

cafe-grader-web

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: 59 inserted, 12 deleted

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

                   @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

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

                 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

app/controllers/user_admin_controller.rb ¶ +5

                         added_random_password = true
                       end
+            +         user = User.find_by_login(login)
+            +         if user
+            +           user.password = password
+            +         else
                       user = User.new({:login => login,
                                         :full_name => full_name,
                                         :password => password,
                                         :password_confirmation => password,
                                         :alias => user_alias})
+            +         end
                       user.activated = true
                       user.save

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

                     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'

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

                   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)
-            -         user.password = password
-            -         user.save
-            -         return user
-            -       end
+            + #      if user.authenticated_by_cucas?(password) or user.authenticated_by_pop3?(password)
+            + #        user.password = password
+            + #        user.save
+            + #        return user
+            + #      end
                   end
                 end

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

                       %th Submitted_at
                       %th Points
                       %th comment
+            +         %th IP
                   %tbody
                     - row_odd,curr = true,''
                     - @submissions.each do |sub|
                         %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

               =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 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= l[:full_name]
+            +         %td= link_to l.user.login, controller: 'users', action: 'profile', id: l[:id]
+            +         %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

You need to be logged in to leave comments. Login now

	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