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

                   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

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

@@ -213,19 +213,42
213	@struggle.sort!{\|a,b\| b[:tries] <=> a[:tries] }	213	@struggle.sort!{\|a,b\| b[:tries] <=> a[:tries] }
214	@struggle = @struggle[0..50]	214	@struggle = @struggle[0..50]
215	end	215	end
216		216
217		217
218	def multiple_login	218	def multiple_login
		219	+ #user with multiple IP
219	raw = Submission.joins(:user).joins(:problem).where("problems.available != 0").group("login,ip_address").order(:login)	220	raw = Submission.joins(:user).joins(:problem).where("problems.available != 0").group("login,ip_address").order(:login)
220	last,count = 0,0	221	last,count = 0,0
221	- @multiple = []	222	+ first = 0
		223	+ @users = []
222	raw.each do \|r\|	224	raw.each do \|r\|
223	if last != r.user.login	225	if last != r.user.login
224	count = 1	226	count = 1
		227	+ last = r.user.login
		228	+ first = r
225	else	229	else
226	- @multiple << r	230	+ @users << first if count == 1
		231	+ @users << r
		232	+ count += 1
		233	+ end
		234	+ end
		235	+
		236	+ #IP with multiple user
		237	+ raw = Submission.joins(:user).joins(:problem).where("problems.available != 0").group("login,ip_address").order(:ip_address)
		238	+ last,count = 0,0
		239	+ first = 0
		240	+ @ip = []
		241	+ raw.each do \|r\|
		242	+ if last != r.ip_address
		243	+ count = 1
		244	+ last = r.ip_address
		245	+ first = r
		246	+ else
		247	+ @ip << first if count == 1
		248	+ @ip << r
		249	+ count += 1
227	end	250	end
228	end	251	end
229	end	252	end
230		253
231	end	254	end

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

                       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

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

                     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

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

                 @@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)

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

                       %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

                 = 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