cafe-grader-web Commit - r502:b0abb7bd35dd

cafe-grader-web

Commit `r502:b0abb7bd35dd` public

parent | child

Description:

merge check multiple login from master (which grafts from java-bm)

Commit status:

[Not Reviewed]

References:

merge algo

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r502:b0abb7bd35dd - Thu, 19 Feb 2015 15:17:35 - 6 files changed: 84 inserted, 1 deleted

app/views/report/multiple_login.html.haml created 644 ¶ +37

@@ -0,0 +1,37
	1	+ - content_for :header do
	2	+ = stylesheet_link_tag 'tablesorter-theme.cafe'
	3	+ = javascript_include_tag 'local_jquery'
	4	+
	5	+ %h1 Login status
	6	+
	7	+ =render partial: 'report_menu'
	8	+
	9	+ Checking for all submissions with the currently available problem
	10	+
	11	+ %h2 Users with Multiple IP
	12	+ %table.tablesorter-cafe#my_table
	13	+ %thead
	14	+ %tr
	15	+ %th login
	16	+ %th full name
	17	+ %th IP
	18	+ %tbody
	19	+ - @users.each do \|l\|
	20	+ %tr{class: cycle('info-even','info-odd')}
	21	+ %td= link_to l.user.login, controller: 'users', action: 'profile', id: l[:id]
	22	+ %td= l.user.full_name
	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

app/controllers/report_controller.rb ¶ +37

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

app/controllers/user_admin_controller.rb ¶ +6

                     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)
                         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 user_stat_max
                   if params[:commit] == 'download csv'
                     @problems = Problem.all
                   else
                     @problems = Problem.find_available_problems
                   end
                   @users = User.find(:all, :include => [:contests, :contest_stat])
                   @scorearray = Array.new
                   #set up range from param
                   since_id = params.fetch(:since_id, 0).to_i

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

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

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

               %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/_report_menu.html.haml ¶ +1

               .task-menu
                 Reports
                 %br/
                 = link_to '[Hall of Fame]', :action => 'problem_hof'
                 = link_to '[Struggle]', :action => 'stuck'
                 = link_to '[Login]', :action => 'login_stat'
+            +   = link_to '[Multiple Login]', :action => 'multiple_login'

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

r502:b0abb7bd35dd - Thu, 19 Feb 2015 15:17:35 - 6 files changed: 84 inserted, 1 deleted

Sign in to your account

Commit r502:b0abb7bd35dd public

Author

r502:b0abb7bd35dd - Thu, 19 Feb 2015 15:17:35 - 6 files changed: 84 inserted, 1 deleted

Commit `r502:b0abb7bd35dd` public