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: 64 inserted, 17 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

@@ -216,14 +216,37
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

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

@@ -84,11 +84,16
84	added_random_password = true	84	added_random_password = true
85	end	85	end
86		86
87	- user = User.~~new~~({~~:login~~ => login,	87	+ user = User.find_by_login(login)
88	- :full_name => full_name,	88	+ if user
89	- :password => password,	89	+ user.password = password
90	- :password_confirmation => password,	90	+ else
91	- :alias => user_alias})	91	+ user = User.new({:login => login,
		92	+ :full_name => full_name,
		93	+ :password => password,
		94	+ :password_confirmation => password,
		95	+ :alias => user_alias})
		96	+ end
92	user.activated = true	97	user.activated = true
93	user.save	98	user.save
94		99

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)
+            + #      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

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

@@ -6,6 +6,9
6		6
7	=render partial: 'report_menu'	7	=render partial: 'report_menu'
8		8
		9	+ Checking for all submissions with the currently available problem
		10	+
		11	+ %h2 Users with Multiple IP
9	%table.tablesorter-cafe#my_table	12	%table.tablesorter-cafe#my_table
10	%thead	13	%thead
11	%tr	14	%tr
@@ -13,8 +16,22
13	%th full name	16	%th full name
14	%th IP	17	%th IP
15	%tbody	18	%tbody
16	- - @~~multiple~~.each do \|l\|	19	+ - @users.each do \|l\|
17	%tr{class: cycle('info-even','info-odd')}	20	%tr{class: cycle('info-even','info-odd')}
18	- %td= link_to l[~~:login~~], controller: 'users', action: 'profile', id: l[:id]	21	+ %td= link_to l.user.login, controller: 'users', action: 'profile', id: l[:id]
19	- %td= l[:full_name]	22	+ %td= l.user.full_name
20	%td= l[:ip_address]	23	%td= l[:ip_address]
		24	+
		25	+ %h2 IP with multiple users
		26	+ %table.tablesorter-cafe#my_table
		27	+ %thead
		28	+ %tr
		29	+ %th IP
		30	+ %th login
		31	+ %th full name
		32	+ %tbody
		33	+ - @ip.each do \|l\|
		34	+ %tr{class: cycle('info-even','info-odd')}
		35	+ %td= l[:ip_address]
		36	+ %td= link_to l.user.login, controller: 'users', action: 'profile', id: l[:id]
		37	+ %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