cafe-grader-web

Commit r304:a6eab16005af public

parent | child
Description:
shows more login/contest info on result page
Commit status:
[Not Reviewed]
References:
default
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

r304:a6eab16005af - - 2 files changed: 9 inserted, 1 deleted

Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -75,97 +75,97
75 else
75 else
76 password = random_password
76 password = random_password
77 user_alias = (items.length>=4) ? items[3] : login
77 user_alias = (items.length>=4) ? items[3] : login
78 added_random_password = true
78 added_random_password = true
79 end
79 end
80
80
81 user = User.new({:login => login,
81 user = User.new({:login => login,
82 :full_name => full_name,
82 :full_name => full_name,
83 :password => password,
83 :password => password,
84 :password_confirmation => password,
84 :password_confirmation => password,
85 :alias => user_alias})
85 :alias => user_alias})
86 user.activated = true
86 user.activated = true
87 user.save
87 user.save
88
88
89 if added_random_password
89 if added_random_password
90 note << "'#{login}' (+)"
90 note << "'#{login}' (+)"
91 else
91 else
92 note << login
92 note << login
93 end
93 end
94 end
94 end
95 end
95 end
96 flash[:notice] = 'User(s) ' + note.join(', ') +
96 flash[:notice] = 'User(s) ' + note.join(', ') +
97 ' were successfully created. ' +
97 ' were successfully created. ' +
98 '( (+) - created with random passwords.)'
98 '( (+) - created with random passwords.)'
99 redirect_to :action => 'list'
99 redirect_to :action => 'list'
100 end
100 end
101
101
102 def edit
102 def edit
103 @user = User.find(params[:id])
103 @user = User.find(params[:id])
104 end
104 end
105
105
106 def update
106 def update
107 @user = User.find(params[:id])
107 @user = User.find(params[:id])
108 if @user.update_attributes(params[:user])
108 if @user.update_attributes(params[:user])
109 flash[:notice] = 'User was successfully updated.'
109 flash[:notice] = 'User was successfully updated.'
110 redirect_to :action => 'show', :id => @user
110 redirect_to :action => 'show', :id => @user
111 else
111 else
112 render :action => 'edit'
112 render :action => 'edit'
113 end
113 end
114 end
114 end
115
115
116 def destroy
116 def destroy
117 User.find(params[:id]).destroy
117 User.find(params[:id]).destroy
118 redirect_to :action => 'list'
118 redirect_to :action => 'list'
119 end
119 end
120
120
121 def user_stat
121 def user_stat
122 @problems = Problem.find_available_problems
122 @problems = Problem.find_available_problems
123 - @users = User.find(:all)
123 + @users = User.find(:all, :include => [:contests, :contest_stat])
124 @scorearray = Array.new
124 @scorearray = Array.new
125 @users.each do |u|
125 @users.each do |u|
126 ustat = Array.new
126 ustat = Array.new
127 ustat[0] = u
127 ustat[0] = u
128 @problems.each do |p|
128 @problems.each do |p|
129 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
129 sub = Submission.find_last_by_user_and_problem(u.id,p.id)
130 if (sub!=nil) and (sub.points!=nil)
130 if (sub!=nil) and (sub.points!=nil)
131 ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
131 ustat << [(sub.points.to_f*100/p.full_score).round, (sub.points>=p.full_score)]
132 else
132 else
133 ustat << [0,false]
133 ustat << [0,false]
134 end
134 end
135 end
135 end
136 @scorearray << ustat
136 @scorearray << ustat
137 end
137 end
138 end
138 end
139
139
140 def import
140 def import
141 if params[:file]==''
141 if params[:file]==''
142 flash[:notice] = 'Error importing no file'
142 flash[:notice] = 'Error importing no file'
143 redirect_to :action => 'list' and return
143 redirect_to :action => 'list' and return
144 end
144 end
145 import_from_file(params[:file])
145 import_from_file(params[:file])
146 end
146 end
147
147
148 def random_all_passwords
148 def random_all_passwords
149 users = User.find(:all)
149 users = User.find(:all)
150 @prefix = params[:prefix] || ''
150 @prefix = params[:prefix] || ''
151 @non_admin_users = User.find_non_admin_with_prefix(@prefix)
151 @non_admin_users = User.find_non_admin_with_prefix(@prefix)
152 @changed = false
152 @changed = false
153 if request.request_method == :post
153 if request.request_method == :post
154 @non_admin_users.each do |user|
154 @non_admin_users.each do |user|
155 password = random_password
155 password = random_password
156 user.password = password
156 user.password = password
157 user.password_confirmation = password
157 user.password_confirmation = password
158 user.save
158 user.save
159 end
159 end
160 @changed = true
160 @changed = true
161 end
161 end
162 end
162 end
163
163
164 # contest management
164 # contest management
165
165
166 def contests
166 def contests
167 @contest, @users = find_contest_and_user_from_contest_id(params[:id])
167 @contest, @users = find_contest_and_user_from_contest_id(params[:id])
168 @contests = Contest.enabled
168 @contests = Contest.enabled
169 end
169 end
170
170
171 def assign_from_list
171 def assign_from_list
Show file before | Show file after | Raw diff | Download diff | Show whitespace Increase context Show commentsHide comments
@@ -1,35 +1,43
1 <h1>User grading results</h1>
1 <h1>User grading results</h1>
2
2
3 <table class="info">
3 <table class="info">
4 <tr class="info-head">
4 <tr class="info-head">
5 <th>User</th>
5 <th>User</th>
6 <th>Name</th>
6 <th>Name</th>
7 <th>Activated?</th>
7 <th>Activated?</th>
8 + <th>Logged in</th>
9 + <th>Contest(s)</th>
8 <% @problems.each do |p| %>
10 <% @problems.each do |p| %>
9 <th><%= p.name %></th>
11 <th><%= p.name %></th>
10 <% end %>
12 <% end %>
11 <th>Total</th>
13 <th>Total</th>
12 <th>Passed</th>
14 <th>Passed</th>
13 </tr>
15 </tr>
14 <% counter = 0 %>
16 <% counter = 0 %>
15 <% @scorearray.each do |sc| %>
17 <% @scorearray.each do |sc| %>
16 <tr class="<%= (counter %2 ==0) ? "info-even" : "info-odd" %>">
18 <tr class="<%= (counter %2 ==0) ? "info-even" : "info-odd" %>">
17 <% total = 0 %>
19 <% total = 0 %>
18 <% num_passed = 0 %>
20 <% num_passed = 0 %>
19 <% sc.each_index do |i| %>
21 <% sc.each_index do |i| %>
20 <% if i==0 %>
22 <% if i==0 %>
21 <td><%= sc[i].login %></td>
23 <td><%= sc[i].login %></td>
22 <td><%= sc[i].full_name %></td>
24 <td><%= sc[i].full_name %></td>
23 <td><%= sc[i].activated %></td>
25 <td><%= sc[i].activated %></td>
26 + <td>
27 + <%= sc[i].try(:contest_stat).try(:started_at)!=nil ? 'yes' : 'no' %>
28 + </td>
29 + <td>
30 + <%= sc[i].contests.collect {|c| c.name}.join(', ') %>
31 + </td>
24 <% else %>
32 <% else %>
25 <td><%= sc[i][0] %></td>
33 <td><%= sc[i][0] %></td>
26 <% total += sc[i][0] %>
34 <% total += sc[i][0] %>
27 <% num_passed += 1 if sc[i][1] %>
35 <% num_passed += 1 if sc[i][1] %>
28 <% end %>
36 <% end %>
29 <% end %>
37 <% end %>
30 <td><%= total %></td>
38 <td><%= total %></td>
31 <td><%= num_passed %></td>
39 <td><%= num_passed %></td>
32 </tr>
40 </tr>
33 <% counter += 1 %>
41 <% counter += 1 %>
34 <% end %>
42 <% end %>
35 </table>
43 </table>
You need to be logged in to leave comments. Login now