cafe-grader-web

Commit r511:d90a3f1b39d0 public

parent | child
Description:
merge
Commit status:
[Not Reviewed]
References:
merge java
Diff options:
Raw Diff | Patch Diff | Download Diff | Show whitespace | Increase context
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Side by Side Unified
Expand All Files Collapse All Files Wide Mode Diff
Add another comment
Browse Files

r511:d90a3f1b39d0 - - 8 files changed: 102 inserted, 35 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -0,0 +1,34
1 + :css
2 + .fix-width {
3 + font-family: "Consolas, Monaco, Droid Sans Mono,Mono, Monospace,Courier"
4 + }
5 +
6 + %h1 Problem stat: #{@problem.name}
7 + %h2 Overview
8 +
9 + %h2 Submissions
10 + - if @submissions and @submissions.count > 0
11 + %table.info#main_table
12 + %thead
13 + %tr.info-head
14 + %th ID
15 + %th Login
16 + %th Name
17 + %th Submitted_at
18 + %th Points
19 + %th comment
20 + %tbody
21 + - row_odd,curr = true,''
22 + - @submissions.each do |sub|
23 + - next unless sub.user
24 + - row_odd,curr = !row_odd, sub.user if curr != sub.user
25 + %tr{class: row_odd ? "info-odd" : "info-even"}
26 + %td= link_to sub.id, controller: 'graders', action: 'submission', id: sub.id
27 + %td= link_to sub.user.login, controller: :users, action: :profile, id: sub.user.id
28 + %td= sub.user.full_name
29 + %td= time_ago_in_words(sub.submitted_at) + " ago"
30 + %td= sub.points
31 + %td.fix-width= sub.grader_comment
32 + - else
33 + No submission
34 +
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -86,97 +86,97
86 86 elsif @description!=nil
87 87 if !@description.update_attributes(params[:description])
88 88 flash[:notice] = 'Error saving description'
89 89 render :action => 'edit' and return
90 90 end
91 91 end
92 92 if @problem.update_attributes(params[:problem])
93 93 flash[:notice] = 'Problem was successfully updated.'
94 94 redirect_to :action => 'show', :id => @problem
95 95 else
96 96 render :action => 'edit'
97 97 end
98 98 end
99 99
100 100 def destroy
101 101 Problem.find(params[:id]).destroy
102 102 redirect_to :action => 'list'
103 103 end
104 104
105 105 def toggle
106 106 @problem = Problem.find(params[:id])
107 107 @problem.available = !(@problem.available)
108 108 @problem.save
109 109 end
110 110
111 111 def turn_all_off
112 112 Problem.find(:all,
113 113 :conditions => "available = 1").each do |problem|
114 114 problem.available = false
115 115 problem.save
116 116 end
117 117 redirect_to :action => 'list'
118 118 end
119 119
120 120 def turn_all_on
121 121 Problem.find(:all,
122 122 :conditions => "available = 0").each do |problem|
123 123 problem.available = true
124 124 problem.save
125 125 end
126 126 redirect_to :action => 'list'
127 127 end
128 128
129 129 def stat
130 130 @problem = Problem.find(params[:id])
131 131 if !@problem.available
132 132 redirect_to :controller => 'main', :action => 'list'
133 133 else
134 - @submissions = Submission.find_all_last_by_problem(params[:id])
134 + @submissions = Submission.includes(:user).where(problem_id: params[:id]).order(:user_id,:id)
135 135 end
136 136 end
137 137
138 138 def manage
139 139 @problems = Problem.find(:all, :order => 'date_added DESC')
140 140 end
141 141
142 142 def do_manage
143 143 if params.has_key? 'change_date_added'
144 144 change_date_added
145 145 else params.has_key? 'add_to_contest'
146 146 add_to_contest
147 147 end
148 148 redirect_to :action => 'manage'
149 149 end
150 150
151 151 def import
152 152 @allow_test_pair_import = allow_test_pair_import?
153 153 end
154 154
155 155 def do_import
156 156 old_problem = Problem.find_by_name(params[:name])
157 157 if !allow_test_pair_import? and params.has_key? :import_to_db
158 158 params.delete :import_to_db
159 159 end
160 160 @problem, import_log = Problem.create_from_import_form_params(params,
161 161 old_problem)
162 162
163 163 if !@problem.errors.empty?
164 164 render :action => 'import' and return
165 165 end
166 166
167 167 if old_problem!=nil
168 168 flash[:notice] = "The test data has been replaced for problem #{@problem.name}"
169 169 end
170 170 @log = import_log
171 171 end
172 172
173 173 def remove_contest
174 174 problem = Problem.find(params[:id])
175 175 contest = Contest.find(params[:contest_id])
176 176 if problem!=nil and contest!=nil
177 177 problem.contests.delete(contest)
178 178 end
179 179 redirect_to :action => 'manage'
180 180 end
181 181
182 182 ##################################
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,50 +1,53
1 + require 'csv'
2 +
1 3 class UserAdminController < ApplicationController
2 4
5 +
3 6 include MailHelperMethods
4 7
5 8 before_filter :admin_authorization
6 9
7 10 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
8 11 verify :method => :post, :only => [ :destroy,
9 12 :create, :create_from_list,
10 13 :update,
11 14 :manage_contest,
12 15 :bulk_mail
13 16 ],
14 17 :redirect_to => { :action => :list }
15 18
16 19 def index
17 20 list
18 21 render :action => 'list'
19 22 end
20 23
21 24 def list
22 25 @user_count = User.count
23 26 if params[:page] == 'all'
24 27 @users = User.all
25 28 @paginated = false
26 29 else
27 30 @users = User.paginate :page => params[:page]
28 31 @paginated = true
29 32 end
30 33 @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
31 34 @contests = Contest.enabled
32 35 end
33 36
34 37 def active
35 38 sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
36 39 @users = []
37 40 sessions.each do |session|
38 41 if session.data[:user_id]
39 42 @users << User.find(session.data[:user_id])
40 43 end
41 44 end
42 45 end
43 46
44 47 def show
45 48 @user = User.find(params[:id])
46 49 end
47 50
48 51 def new
49 52 @user = User.new
50 53 end
@@ -77,136 +80,156
77 80 user_alias = (items.length>=4) ? items[3] : login
78 81 else
79 82 password = random_password
80 83 user_alias = (items.length>=4) ? items[3] : login
81 84 added_random_password = true
82 85 end
83 86
84 87 user = User.new({:login => login,
85 88 :full_name => full_name,
86 89 :password => password,
87 90 :password_confirmation => password,
88 91 :alias => user_alias})
89 92 user.activated = true
90 93 user.save
91 94
92 95 if added_random_password
93 96 note << "'#{login}' (+)"
94 97 else
95 98 note << login
96 99 end
97 100 end
98 101 end
99 102 flash[:notice] = 'User(s) ' + note.join(', ') +
100 103 ' were successfully created. ' +
101 104 '( (+) - created with random passwords.)'
102 105 redirect_to :action => 'list'
103 106 end
104 107
105 108 def edit
106 109 @user = User.find(params[:id])
107 110 end
108 111
109 112 def update
110 113 @user = User.find(params[:id])
111 114 if @user.update_attributes(params[:user])
112 115 flash[:notice] = 'User was successfully updated.'
113 116 redirect_to :action => 'show', :id => @user
114 117 else
115 118 render :action => 'edit'
116 119 end
117 120 end
118 121
119 122 def destroy
120 123 User.find(params[:id]).destroy
121 124 redirect_to :action => 'list'
122 125 end
123 126
124 127 def user_stat
128 + if params[:commit] == 'download csv'
129 + @problems = Problem.all
130 + else
125 131 @problems = Problem.find_available_problems
132 + end
126 133 @users = User.find(:all, :include => [:contests, :contest_stat])
127 134 @scorearray = Array.new
128 135 @users.each do |u|
129 136 ustat = Array.new
130 137 ustat[0] = u
131 138 @problems.each do |p|
132 139 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
133 140 if (sub!=nil) and (sub.points!=nil)
134 141 ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
135 142 else
136 143 ustat << [0,false]
137 144 end
138 145 end
139 146 @scorearray << ustat
140 147 end
148 +
149 + if params[:commit] == 'download csv' then
150 + csv = gen_csv_from_scorearray(@scorearray,@problems)
151 + send_data csv, filename: 'last_score.csv'
152 + else
153 + render template: 'user_admin/user_stat'
154 + end
141 155 end
142 156
143 157 def user_stat_max
158 + if params[:commit] == 'download csv'
159 + @problems = Problem.all
160 + else
144 161 @problems = Problem.find_available_problems
162 + end
145 163 @users = User.find(:all, :include => [:contests, :contest_stat])
146 164 @scorearray = Array.new
147 165 #set up range from param
148 166 since_id = params.fetch(:since_id, 0).to_i
149 167 until_id = params.fetch(:until_id, 0).to_i
150 168 @users.each do |u|
151 169 ustat = Array.new
152 170 ustat[0] = u
153 171 @problems.each do |p|
154 172 max_points = 0
155 173 Submission.find_in_range_by_user_and_problem(u.id,p.id,since_id,until_id).each do |sub|
156 174 max_points = sub.points if sub and sub.points and (sub.points > max_points)
157 175 end
158 176 ustat << [(max_points.to_f*100/p.full_score).round, (max_points>=p.full_score)]
159 177 end
160 178 @scorearray << ustat
161 179 end
162 180
181 + if params[:commit] == 'download csv' then
182 + csv = gen_csv_from_scorearray(@scorearray,@problems)
183 + send_data csv, filename: 'max_score.csv'
184 + else
163 185 render template: 'user_admin/user_stat'
164 186 end
187 + end
165 188
166 189 def import
167 190 if params[:file]==''
168 191 flash[:notice] = 'Error importing no file'
169 192 redirect_to :action => 'list' and return
170 193 end
171 194 import_from_file(params[:file])
172 195 end
173 196
174 197 def random_all_passwords
175 198 users = User.find(:all)
176 199 @prefix = params[:prefix] || ''
177 200 @non_admin_users = User.find_non_admin_with_prefix(@prefix)
178 201 @changed = false
179 202 if request.request_method == 'POST'
180 203 @non_admin_users.each do |user|
181 204 password = random_password
182 205 user.password = password
183 206 user.password_confirmation = password
184 207 user.save
185 208 end
186 209 @changed = true
187 210 end
188 211 end
189 212
190 213 # contest management
191 214
192 215 def contests
193 216 @contest, @users = find_contest_and_user_from_contest_id(params[:id])
194 217 @contests = Contest.enabled
195 218 end
196 219
197 220 def assign_from_list
198 221 contest_id = params[:users_contest_id]
199 222 org_contest, users = find_contest_and_user_from_contest_id(contest_id)
200 223 contest = Contest.find(params[:new_contest][:id])
201 224 if !contest
202 225 flash[:notice] = 'Error: no contest'
203 226 redirect_to :action => 'contests', :id =>contest_id
204 227 end
205 228
206 229 note = []
207 230 users.each do |u|
208 231 u.contests = [contest]
209 232 note << u.login
210 233 end
211 234 flash[:notice] = 'User(s) ' + note.join(', ') +
212 235 " were successfully reassigned to #{contest.title}."
@@ -430,49 +453,80
430 453 u.email = "empty-#{u.login}@none.com"
431 454 if not u.save
432 455 @import_log << "Errors\n"
433 456 u.errors.each { |attr,msg| @import_log << "#{attr} - #{msg}\n" }
434 457 end
435 458 end
436 459
437 460 end
438 461
439 462 def logout_users(users)
440 463 users.each do |user|
441 464 contest_stat = user.contest_stat(true)
442 465 if contest_stat and !contest_stat.forced_logout
443 466 contest_stat.forced_logout = true
444 467 contest_stat.save
445 468 end
446 469 end
447 470 end
448 471
449 472 def send_contest_update_notification_email(user, contest)
450 473 contest_title_name = GraderConfiguration['contest.name']
451 474 contest_name = contest.name
452 475 mail_subject = t('contest.notification.email_subject', {
453 476 :contest_title_name => contest_title_name,
454 477 :contest_name => contest_name })
455 478 mail_body = t('contest.notification.email_body', {
456 479 :full_name => user.full_name,
457 480 :contest_title_name => contest_title_name,
458 481 :contest_name => contest.name,
459 482 })
460 483
461 484 logger.info mail_body
462 485 send_mail(user.email, mail_subject, mail_body)
463 486 end
464 487
465 488 def find_contest_and_user_from_contest_id(id)
466 489 if id!='none'
467 490 @contest = Contest.find(id)
468 491 else
469 492 @contest = nil
470 493 end
471 494 if @contest
472 495 @users = @contest.users
473 496 else
474 497 @users = User.find_users_with_no_contest
475 498 end
476 499 return [@contest, @users]
477 500 end
501 +
502 + def gen_csv_from_scorearray(scorearray,problem)
503 + CSV.generate do |csv|
504 + #add header
505 + header = ['User','Name', 'Activated?', 'Logged in', 'Contest']
506 + problem.each { |p| header << p.name }
507 + header += ['Total','Passed']
508 + csv << header
509 + #add data
510 + scorearray.each do |sc|
511 + total = num_passed = 0
512 + row = Array.new
513 + sc.each_index do |i|
514 + if i == 0
515 + row << sc[i].login
516 + row << sc[i].full_name
517 + row << sc[i].activated
518 + row << (sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no')
519 + row << sc[i].contests.collect {|c| c.name}.join(', ')
520 + else
521 + row << sc[i][0]
522 + total += sc[i][0]
523 + num_passed += 1 if sc[i][1]
478 524 end
525 + end
526 + row << total
527 + row << num_passed
528 + csv << row
529 + end
530 + end
531 + end
532 + end
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,76 +1,76
1 1 class Submission < ActiveRecord::Base
2 2
3 3 belongs_to :language
4 4 belongs_to :problem
5 5 belongs_to :user
6 6
7 7 before_validation :assign_problem
8 8 before_validation :assign_language
9 9
10 10 validates_presence_of :source
11 11 validates_length_of :source, :maximum => 100_000, :allow_blank => true, :message => 'too long'
12 12 validates_length_of :source, :minimum => 1, :allow_blank => true, :message => 'too short'
13 13 validate :must_have_valid_problem
14 14 validate :must_specify_language
15 15
16 16 before_save :assign_latest_number_if_new_recond
17 17
18 18 def self.find_last_by_user_and_problem(user_id, problem_id)
19 19 last_sub = find(:first,
20 20 :conditions => {:user_id => user_id,
21 21 :problem_id => problem_id},
22 22 :order => 'number DESC')
23 23 return last_sub
24 24 end
25 25
26 26 def self.find_all_last_by_problem(problem_id)
27 27 # need to put in SQL command, maybe there's a better way
28 - Submission.find_by_sql("SELECT * FROM submissions " +
28 + Submission.includes(:user).find_by_sql("SELECT * FROM submissions " +
29 29 "WHERE id = " +
30 30 "(SELECT MAX(id) FROM submissions AS subs " +
31 31 "WHERE subs.user_id = submissions.user_id AND " +
32 32 "problem_id = " + problem_id.to_s + " " +
33 33 "GROUP BY user_id) " +
34 34 "ORDER BY user_id")
35 35 end
36 36
37 37 def self.find_in_range_by_user_and_problem(user_id, problem_id,since_id,until_id)
38 38 records = Submission.where(problem_id: problem_id,user_id: user_id)
39 39 records = records.where('id >= ?',since_id) if since_id > 0
40 40 records = records.where('id <= ?',until_id) if until_id > 0
41 41 records.all
42 42 end
43 43
44 44 def self.find_last_for_all_available_problems(user_id)
45 45 submissions = Array.new
46 46 problems = Problem.find_available_problems
47 47 problems.each do |problem|
48 48 sub = Submission.find_last_by_user_and_problem(user_id, problem.id)
49 49 submissions << sub if sub!=nil
50 50 end
51 51 submissions
52 52 end
53 53
54 54 def self.find_by_user_problem_number(user_id, problem_id, number)
55 55 Submission.find(:first,
56 56 :conditions => {
57 57 :user_id => user_id,
58 58 :problem_id => problem_id,
59 59 :number => number
60 60 })
61 61 end
62 62
63 63 def self.find_all_by_user_problem(user_id, problem_id)
64 64 Submission.find(:all,
65 65 :conditions => {
66 66 :user_id => user_id,
67 67 :problem_id => problem_id,
68 68 })
69 69 end
70 70
71 71 def download_filename
72 72 if self.problem.output_only
73 73 return self.source_filename
74 74 else
75 75 timestamp = self.submitted_at.localtime.strftime("%H%M%S")
76 76 return "#{self.problem.name}-#{timestamp}.#{self.language.ext}"
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,18 +1,21
1 1 <tr class="info-<%= (problem_counter%2==0) ? "even" : "odd" %>">
2 2 <td>
3 3 <%= "#{problem_counter+1}" %>
4 4 </td>
5 5 <td>
6 - <%= "(#{problem.name}) #{problem.full_name}" %>
6 + <%= "#{problem.name}"%>
7 + </td>
8 + <td>
9 + <%= "#{problem.full_name}" %>
7 10 <%= link_to_description_if_any "[#{t 'main.problem_desc'}]", problem %>
8 11 </td>
9 12 <td align="center">
10 13 <%= @prob_submissions[problem.id][:count] %>
11 14 </td>
12 15 <td>
13 16 <%= render :partial => 'submission_short',
14 17 :locals => {
15 18 :submission => @prob_submissions[problem.id][:submission],
16 19 :problem_name => problem.name }%>
17 20 </td>
18 21 </tr>
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,51 +1,53
1 1 - content_for :head do
2 2 = javascript_include_tag "announcement_refresh"
3 3
4 4 = user_title_bar(@user)
5 5
6 6 .announcementbox{:style => (@announcements.length==0 ? "display:none" : "")}
7 7 %span{:class => 'title'}
8 8 Announcements
9 9 #announcementbox-body
10 10 = render :partial => 'announcement', :collection => @announcements
11 11
12 12 - if GraderConfiguration.show_submitbox_to?(@user)
13 13 .submitbox
14 14 = error_messages_for 'submission'
15 15 = render :partial => 'submission_box'
16 16
17 17
18 18 %hr/
19 19
20 20 - if (GraderConfiguration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
21 21 %p=t 'main.start_soon'
22 22
23 23 - if GraderConfiguration.show_tasks_to?(@user)
24 24 - if not GraderConfiguration.multicontests?
25 25 %table.info
26 26 %tr.info-head
27 27 %th
28 - %th Tasks
28 + %th Tasks name
29 + %th Full name
29 30 %th # of sub(s)
30 31 %th Results
31 32 = render :partial => 'problem', :collection => @problems
32 33 - else
33 34 - @contest_problems.each do |cp|
34 35 - if cp[:problems].length > 0
35 36 %h2{:class =>'contest-title'}
36 37 = "#{cp[:contest] ? cp[:contest].title : 'Public problems'}"
37 38 %table.info
38 39 %tr.info-head
39 40 %th
40 - %th Tasks
41 + %th Tasks name
42 + %th Full name
41 43 %th # of sub(s)
42 44 %th Results
43 45 = render :partial => 'problem', :collection => cp[:problems]
44 46
45 47
46 48 %hr/
47 49
48 50 %script{:type => 'text/javascript'}
49 51 = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
50 52 Announcement.registerRefreshEventTimer();
51 53
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,56 +1,59
1 1 - content_for :header do
2 2 = javascript_include_tag 'new'
3 3 = stylesheet_link_tag 'tablesorter-theme.cafe'
4 4
5 5 %script{:type=>"text/javascript"}
6 6 $(function () {
7 7 $('#since_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
8 8 $('#until_datetime').datetimepicker({ showButtonPanel: true, dateFormat: "yy-mm-dd", controlType: "slider"} );
9 9 $('#my_table').tablesorter({widgets: ['zebra']});
10 10 });
11 11
12 12 %h1 User grading results
13 13 %h2= params[:action] == 'user_stat' ? "Show scores from latest submission" : "Show max scores in submission range"
14 14
15 15
16 16 - if @problem and @problem.errors
17 17 =error_messages_for 'problem'
18 18
19 19 = render partial: 'submission_range'
20 20
21 21 - if params[:action] == 'user_stat'
22 - = "latest score"
22 + %h3 Latest score
23 + = link_to '[download csv with all problems]', controller: :user_admin, action: :user_stat, commit: 'download csv'
23 24 - else
25 + %h3 Max score
24 26 = link_to '[Show only latest submissions]', controller: :user_admin, action: :user_stat
27 + = link_to '[download csv with all problems]', controller: :user_admin, action: :user_stat_max, commit: 'download csv'
25 28
26 29 %table.tablesorter-cafe#my_table
27 30 %thead
28 31 %tr
29 32 %th User
30 33 %th Name
31 34 %th Activated?
32 35 %th Logged in
33 36 %th Contest(s)
34 37 %th Section
35 38 - @problems.each do |p|
36 39 %th= p.name
37 40 %th Total
38 41 %th Passed
39 42 %tbody
40 43 - @scorearray.each do |sc|
41 44 %tr{class: cycle('info-even','info-odd')}
42 45 - total,num_passed = 0,0
43 46 - sc.each_index do |i|
44 47 - if i == 0
45 48 %td= link_to sc[i].login, controller: 'users', action: 'profile', id: sc[i]
46 49 %td= sc[i].full_name
47 50 %td= sc[i].activated
48 51 %td= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no'
49 52 %td= sc[i].contests.collect {|c| c.name}.join(', ')
50 53 %td= sc[i].section
51 54 - else
52 55 %td= sc[i][0]
53 56 - total += sc[i][0]
54 57 - num_passed += 1 if sc[i][1]
55 58 %td= total
56 59 %td= num_passed
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
deleted file
You need to be logged in to leave comments. Login now