cafe-grader-web Commit - r297:2abed488d02c

cafe-grader-web

Commit `r297:2abed488d02c` public

parent | child

Description:

lists users in each contest. individual user contest management moved to each contest user list page

Commit status:

[Not Reviewed]

References:

default

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r297:2abed488d02c - Thu, 01 Apr 2010 01:10:29 - 4 files changed: 92 inserted, 19 deleted

app/views/user_admin/contests.html.erb created 644 ¶ +65

@@ -0,0 +1,65
	1	+ <h1>
	2	+ List users in <% if @contest %><%= @contest.title %>
	3	+ <% else %>Users not in any contests<% end %>
	4	+ </h1>
	5	+
	6	+ <div class="submitbox">
	7	+ <%= link_to '[View all users]', :action => 'list' %>
	8	+ <% if Configuration.multicontests? %>
	9	+ <%= link_to '[Manage bulk users in contests]', :action => 'contest_management' %>
	10	+ <br/>
	11	+ View users in:
	12	+ <% @contests.each do \|contest\| %>
	13	+ <%= link_to "[#{contest.name}]", :action => 'contests', :id => contest.id %>
	14	+ <% end %>
	15	+ <%= link_to "[no contest]", :action => 'contests', :id => 'none' %>
	16	+ <% end %>
	17	+ </div>
	18	+
	19	+ <table class="info">
	20	+ <tr class="info-head">
	21	+ <th>Login</th>
	22	+ <th>Full name</th>
	23	+ <th>Email</th>
	24	+ <th>Activated?</th>
	25	+ <th></th>
	26	+ <th></th>
	27	+ <th></th>
	28	+ <% if Configuration.multicontests? %>
	29	+ <th>Contests</th>
	30	+ <th>Other enabled contests</th>
	31	+ <% end %>
	32	+ </tr>
	33	+
	34	+ <% for user in @users %>
	35	+ <tr class="info-<%= cycle("odd","even") %>">
	36	+ <td><%=h user.login %></td>
	37	+ <td><%=h user.full_name %></td>
	38	+ <td><%=h user.email %></td>
	39	+ <td><%=h user.activated %></td>
	40	+ <td><%= link_to 'Show', :action => 'show', :id => user %></td>
	41	+ <td><%= link_to 'Edit', :action => 'edit', :id => user %></td>
	42	+ <td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td>
	43	+ <% if Configuration.multicontests? %>
	44	+ <td>
	45	+ <% user.contests.each do \|contest\| %>
	46	+ <%= contest.name %> [<%= link_to 'x', :action => 'remove_from_contest', :id => user.id, :contest_id => contest.id %>]
	47	+ <% end %>
	48	+ </td>
	49	+ <td>
	50	+ <% @contests.each do \|contest\| %>
	51	+ <% if not user.contests.all.find {\|c\| c.id==contest.id } %>
	52	+ <%= contest.name %> [<%= link_to '+', :action => 'add_to_contest', :id => user.id, :contest_id => contest.id %>]
	53	+ <% end %>
	54	+ <% end %>
	55	+ </td>
	56	+ <% end %>
	57	+ </tr>
	58	+ <% end %>
	59	+ </table>
	60	+
	61	+
	62	+ <br />
	63	+
	64	+ <%= link_to 'New user', :action => 'new' %>
	65	+ <%= link_to 'New list of users', :action => 'new_list' %>

app/controllers/user_admin_controller.rb ¶ +15 -1

               class UserAdminController < ApplicationController
                 include MailHelperMethods
                 before_filter :admin_authorization
                 def index
                   list
                   render :action => 'list'
                 end
                 # GETs should be safe (see http://www.w3.org/2001/tag/doc/whenToUseGet.html)
                 verify :method => :post, :only => [ :destroy,
                                                     :create, :create_from_list,
                                                     :update ],
                        :redirect_to => { :action => :list }
                 def list
                   @users = User.find(:all)
                   @hidden_columns = ['hashed_password', 'salt', 'created_at', 'updated_at']
-            -     @contests = Contest.all(:conditions => {:enabled => true})
+            +     @contests = Contest.enabled
                 end
                 def active
                   sessions = ActiveRecord::SessionStore::Session.find(:all, :conditions => ["updated_at >= ?", 60.minutes.ago])
                   @users = []
                   sessions.each do |session|
                     if session.data[:user_id]
                       @users << User.find(session.data[:user_id])
                     end
                   end
                 end
                 def show
                   @user = User.find(params[:id])
                 end
                 def new
                   @user = User.new
                 end
                 def create
                   @user = User.new(params[:user])
                   @user.activated = true
                   if @user.save
                     flash[:notice] = 'Error importing no file'
                     redirect_to :action => 'list' and return
                   end
                   import_from_file(params[:file])
                 end
                 def random_all_passwords
                   users = User.find(:all)
                   @prefix = params[:prefix] || ''
                   @non_admin_users = User.find_non_admin_with_prefix(@prefix)
                   @changed = false
                   if request.request_method == :post
                     @non_admin_users.each do |user|
                       password = random_password
                       user.password = password
                       user.password_confirmation = password
                       user.save
                     end
                     @changed = true
                   end
                 end
                 # contest management
+            +   def contests
+            +     if params[:id]!='none'
+            +       @contest = Contest.find(params[:id])
+            +     else
+            +       @contest = nil
+            +     end
+            +     if @contest
+            +       @users = @contest.users
+            +     else
+            +       @users = User.find_users_with_no_contest
+            +     end
+            +     @contests = Contest.enabled
+            +   end
+            +
                 def add_to_contest
                   user = User.find(params[:id])
                   contest = Contest.find(params[:contest_id])
                   if user and contest
                     user.contests << contest
                   end
                   redirect_to :action => 'list'
                 end
                 def remove_from_contest
                   user = User.find(params[:id])
                   contest = Contest.find(params[:contest_id])
                   if user and contest
                     user.contests.delete(contest)
                   end
                   redirect_to :action => 'list'
                 end
                 def contest_management
                 end
                 def manage_contest
                   contest = Contest.find(params[:contest][:id])
                   if !contest

app/models/user.rb ¶ +6

                   if self.hashed_password==nil
                     encrypt_new_password
                   end
                   Digest::SHA1.hexdigest(self.hashed_password)[0..7]
                 end
                 def verify_activation_key(key)
                   key == activation_key
                 end
                 def self.random_password(length=5)
                   chars = 'abcdefghjkmnopqrstuvwxyz'
                   password = ''
                   length.times { password << chars[rand(chars.length - 1)] }
                   password
                 end
                 def self.find_non_admin_with_prefix(prefix='')
                   users = User.find(:all)
                   return users.find_all { |u| !(u.admin?) and u.login.index(prefix)==0 }
                 end
                 # Contest information
+            +   def self.find_users_with_no_contest()
+            +     users = User.find(:all)
+            +     return users.find_all { |u| u.contests.length == 0 }
+            +   end
+            +
+            +
                 def contest_time_left
                   if Configuration.contest_mode?
                     return nil if site==nil
                     return site.time_left
                   elsif Configuration.indv_contest_mode?
                     time_limit = Configuration.contest_time_limit
                     if time_limit == nil
                       return nil
                     end
                     if contest_stat==nil or contest_stat.started_at==nil
                       return (Time.now.gmtime + time_limit) - Time.now.gmtime
                     else
                       finish_time = contest_stat.started_at + time_limit
                       current_time = Time.now.gmtime
                       if current_time > finish_time
                         return 0
                       else
                         return finish_time - current_time
                       end
                     end
                   else
                     return nil
                   end
                 end

app/views/user_admin/list.rhtml ¶ +6 -18

                     </tr>
                     <tr>
               	<td><%= text_field 'user', 'login', :size => 10  %></td>
               	<td><%= text_field 'user', 'full_name', :size => 30  %></td>
               	<td><%= password_field 'user', 'password', :size => 10  %></td>
               	<td><%= password_field 'user', 'password_confirmation', :size => 10 %></td>
               	<td><%= text_field 'user', 'email', :size => 15 %></td>
               	<td><%= submit_tag "Create" %></td>
                   </tr>
                   </table>
                 <% end %>
                 <br/>
                 <b>Import from site management</b>
                 <% form_tag({:action => 'import'}, :multipart => true) do %>
                   File: <%= file_field_tag 'file' %> <%= submit_tag 'Import' %>
                 <% end %>
                 <br/>
                 <b>What else: </b>
                 <%= link_to '[New user]', :action => 'new' %>
                 <%= link_to '[New list of users]', :action => 'new_list' %>
                 <%= link_to '[View administrators]', :action => 'admin' %>
                 <%= link_to '[Random passwords]', :action => 'random_all_passwords' %>
                 <%= link_to '[View active users]', :action => 'active' %>
                 <% if Configuration.multicontests? %>
+            +     <br/><b>Multi-contest:</b>
                   <%= link_to '[Manage bulk users in contests]', :action => 'contest_management' %>
+            +     View users in:
+            +     <% @contests.each do |contest| %>
+            +       <%= link_to "[#{contest.name}]", :action => 'contests', :id => contest.id %>
+            +     <% end %>
+            +     <%= link_to "[no contest]", :action => 'contests', :id => 'none' %>
                 <% end %>
               </div>
               <table class="info">
                 <tr class="info-head">
                   <% for column in User.content_columns %>
                     <% if !@hidden_columns.index(column.name) %>
                       <th><%= column.human_name %></th>
                     <% end %>
                   <% end %>
                   <th></th>
                   <th></th>
                   <th></th>
-            -     <% if Configuration.multicontests? %>
-            -       <th>Contests</th>
-            -       <th>Other enabled contests</th>
-            -     <% end %>
                 </tr>
               <% for user in @users %>
                 <tr class="info-<%= cycle("odd","even") %>">
                   <% for column in User.content_columns %>
                     <% if !@hidden_columns.index(column.name) %>
                       <td><%=h user.send(column.name) %></td>
                     <% end %>
                   <% end %>
                   <td><%= link_to 'Show', :action => 'show', :id => user %></td>
                   <td><%= link_to 'Edit', :action => 'edit', :id => user %></td>
                   <td><%= link_to 'Destroy', { :action => 'destroy', :id => user }, :confirm => 'Are you sure?', :method => :post %></td>
-            -     <% if Configuration.multicontests? %>
-            -       <td>
-            -         <% user.contests.each do |contest| %>
-            - 	  <%= contest.name %> [<%= link_to 'x', :action => 'remove_from_contest', :id => user.id, :contest_id => contest.id %>]
-            -         <% end %>
-            -       </td>
-            -       <td>
-            - 	<% @contests.each do |contest| %>
-            - 	  <% if not user.contests.all.find {|c| c.id==contest.id } %>
-            -   	    <%= contest.name %> [<%= link_to '+', :action => 'add_to_contest', :id => user.id, :contest_id => contest.id %>]
-            -           <% end %>
-            - 	<% end %>
-            -       </td>
-            -     <% end %>
                 </tr>
               <% end %>
               </table>
               <br />
               <%= link_to 'New user', :action => 'new' %>
               <%= link_to 'New list of users', :action => 'new_list' %>

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

r297:2abed488d02c - Thu, 01 Apr 2010 01:10:29 - 4 files changed: 92 inserted, 19 deleted

Sign in to your account

Commit r297:2abed488d02c public

Author

r297:2abed488d02c - Thu, 01 Apr 2010 01:10:29 - 4 files changed: 92 inserted, 19 deleted

Commit `r297:2abed488d02c` public