cafe-grader-web Commit - r280:f8e3b2e72e4a

cafe-grader-web

Commit `r280:f8e3b2e72e4a` public

parent | child

Description:

manages users in contests

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

r280:f8e3b2e72e4a - Wed, 03 Mar 2010 18:46:52 - 7 files changed: 111 inserted, 7 deleted

app/views/user_admin/contest_management.html.haml created 644 ¶ +16

			@@ -0,0 +1,16
		1	+ %h1 Bulk edit users in contests
		2	+
		3	+ - form_tag :action => 'manage_contest' do
		4	+ List users' login below; one per line.
		5	+ %br/
		6	+ = text_area_tag 'login_list', nil, :rows => 25, :cols => 80
		7	+ %br/
		8	+ You want to
		9	+ = select(nil,"operation",[['add users to','add'],['remove users from','remove']])
		10	+ contest
		11	+ = select("contest","id",Contest.all.collect {\|c\| [c.title, c.id]})
		12	+
		13	+ = submit_tag "Perform action", :confirm => 'Are you sure?'
		14	+
		15	+ %hr/
		16	+ = link_to '[go back to index]', :action => 'index'

app/controllers/user_admin_controller.rb ¶ +63

               class UserAdminController < ApplicationController
                 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})
                 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] = 'User was successfully created.'
                     redirect_to :action => 'list'
                   else
                     render :action => 'new'
                   end
                 end
                 def create_from_list
                   lines = params[:user_list]
                   note = []
                   lines.split("\n").each do |line|
                     items = line.chomp.split(',')
                     if items.length>=2
                       login = items[0]
                       full_name = items[1]
                       added_random_password = false
                       if items.length>=3
                         password = items[2]
                         user_alias = (items.length>=4) ? items[3] : login
                       else
                         password = random_password
                 def destroy
                   User.find(params[:id]).destroy
                   redirect_to :action => 'list'
                 end
                 def user_stat
                   @problems = Problem.find_available_problems
                   @users = User.find(:all)
                   @scorearray = Array.new
                   @users.each do |u|
                     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
                 end
                 def import
                   if params[:file]==''
                     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 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
+            +       flash[:notice] = 'You did not choose the contest.'
+            +       redirect_to :action => 'contest_management' and return
+            +     end
+            +
+            +     operation = params[:operation]
+            +
+            +     if operation!='add' and operation!='remove'
+            +       flash[:notice] = 'You did not choose the operation to perform.'
+            +       redirect_to :action => 'contest_management' and return
+            +     end
+            +
+            +     lines = params[:login_list]
+            +     if !lines or lines.blank?
+            +       flash[:notice] = 'You entered an empty list.'
+            +       redirect_to :action => 'contest_management' and return
+            +     end
+            +
+            +     note = []
+            +     lines.split("\n").each do |line|
+            +       puts line
+            +       user = User.find_by_login(line.chomp)
+            +       puts user
+            +       if user
+            +         if operation=='add'
+            +           user.contests << contest
+            +         else
+            +           user.contests.delete(contest)
+            +         end
+            +         note << user.login
+            +       end
+            +     end
+            +     flash[:notice] = 'User(s) ' + note.join(', ') +
+            +       ' were successfully modified.  '
+            +     redirect_to :action => 'contest_management'
+            +   end
+            +
                 # admin management
                 def admin
                   @admins = User.find(:all).find_all {|user| user.admin? }
                 end
                 def grant_admin
                   login = params[:login]
                   user = User.find_by_login(login)
                   if user!=nil
                     admin_role = Role.find_by_name('admin')
                     user.roles << admin_role
                   else
                     flash[:notice] = 'Unknown user'
                   end
                   flash[:notice] = 'User added as admins'
                   redirect_to :action => 'admin'
                 end
                 def revoke_admin
                   user = User.find(params[:id])
                   if user==nil
                     flash[:notice] = 'Unknown user'
                     redirect_to :action => 'admin' and return
                   elsif user.login == 'root'
                     flash[:notice] = 'You cannot revoke admisnistrator permission from root.'
                     redirect_to :action => 'admin' and return
                   end
                   admin_role = Role.find_by_name('admin')
                   user.roles.delete(admin_role)
                   flash[:notice] = 'User permission revoked'
                   redirect_to :action => 'admin'
                 end
                 protected
                 def random_password(length=5)
                   chars = 'abcdefghijkmnopqrstuvwxyz23456789'
                   newpass = ""
                   length.times { newpass << chars[rand(chars.size-1)] }
                   return newpass
                 end
                 def import_from_file(f)
                   data_hash = YAML.load(f)
                   @import_log = ""

app/models/problem.rb ¶ +1 -1

               class Problem < ActiveRecord::Base
                 belongs_to :description
-            -   has_and_belongs_to_many :contests
+            +   has_and_belongs_to_many :contests, :uniq => true
                 has_many :test_pairs, :dependent => :delete_all
                 validates_presence_of :name
                 validates_format_of :name, :with => /^\w+$/
                 validates_presence_of :full_name
                 named_scope :available, :conditions => {:available => true}
                 DEFAULT_TIME_LIMIT = 1
                 DEFAULT_MEMORY_LIMIT = 32
                 def self.find_available_problems
                   Problem.available.all(:order => "date_added DESC")
                 end
                 def self.create_from_import_form_params(params, old_problem=nil)
                   problem = old_problem || Problem.new
                   import_params = Problem.extract_params_and_check(params, problem)
                   if not problem.valid?
                     return problem, 'Error importing'
                   end
                   problem.full_score = 100
                   problem.date_added = Time.new
                   problem.test_allowed = true
                   problem.output_only = false
                   problem.available = false
                   if not problem.save
                     return problem, 'Error importing'
                   end
                   import_to_db = params.has_key? :import_to_db
                   importer = TestdataImporter.new(problem)
                   if not importer.import_from_file(import_params[:file],
                                                    import_params[:time_limit],
                                                    import_params[:memory_limit],
                                                    import_to_db)
                     problem.errors.add_to_base('Import error.')
                   end
                   return problem, importer.log_msg
                 end
                 def self.download_file_basedir

app/models/user.rb ¶ +1 -1

               require 'digest/sha1'
               class User < ActiveRecord::Base
                 has_and_belongs_to_many :roles
                 has_many :test_requests, :order => "submitted_at DESC"
                 has_many :messages,
                          :class_name => "Message",
                          :foreign_key => "sender_id",
                          :order => 'created_at DESC'
                 has_many :replied_messages,
                          :class_name => "Message",
                          :foreign_key => "receiver_id",
                          :order => 'created_at DESC'
                 has_one :contest_stat, :class_name => "UserContestStat", :dependent => :destroy
                 belongs_to :site
                 belongs_to :country
-            -   has_and_belongs_to_many :contests
+            +   has_and_belongs_to_many :contests, :uniq => true
                 named_scope :activated_users, :conditions => {:activated => true}
                 validates_presence_of :login
                 validates_uniqueness_of :login
                 validates_format_of :login, :with => /^[\_A-Za-z0-9]+$/
                 validates_length_of :login, :within => 3..30
                 validates_presence_of :full_name
                 validates_length_of :full_name, :minimum => 1
                 validates_presence_of :password, :if => :password_required?
                 validates_length_of :password, :within => 4..20, :if => :password_required?
                 validates_confirmation_of :password, :if => :password_required?
                 validates_format_of :email,
                                     :with => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/i,
                                     :if => :email_validation?
                 validate :uniqueness_of_email_from_activated_users,
                          :if => :email_validation?
                 validate :enough_time_interval_between_same_email_registrations,
                          :if => :email_validation?
                 # these are for ytopc
                 # disable for now
                 #validates_presence_of :province
                 attr_accessor :password
                 before_save :encrypt_new_password
                 before_save :assign_default_site
                 def self.authenticate(login, password)
                   user = find_by_login(login)
                   return user if user && user.authenticated?(password)
                 end
                 def authenticated?(password)
                   if self.activated
                     hashed_password == User.encrypt(password,self.salt)
                   else
                     false
                   end
                 end
                 def admin?
                   self.roles.detect {|r| r.name == 'admin' }
                 end

app/views/main/list.html.haml ¶ +1

               - content_for :head do
                 = javascript_include_tag :defaults
                 = javascript_include_tag 'announcement_refresh.js'
               = user_title_bar(@user)
               .announcementbox{:style => (@announcements.length==0 ? "display:none" : "")}
                 %span{:class => 'title'}
                   Announcements
                 #announcementbox-body
                   = render :partial => 'announcement', :collection => @announcements
               - if Configuration.show_submitbox_to?(@user)
                 .submitbox
                   = error_messages_for 'submission'
                   = render :partial => 'submission_box'
               %hr/
               - if (Configuration.contest_mode?) and (@user.site!=nil) and (@user.site.started!=true)
                 %p=t 'main.start_soon'
               - if Configuration.show_tasks_to?(@user)
                 - if not Configuration.multicontests?
                   %table.info
                     %tr.info-head
                       %th
                       %th Tasks
                       %th # of sub(s)
                       %th Results
                     = render :partial => 'problem', :collection => @problems
                 - else
                   - @contest_problems.each do |cp|
+            +       - if cp[:problems].length > 0
                     %h2{:class =>'contest-title'}
                       = "#{cp[:contest] ? cp[:contest].title : 'Public problems'}"
                     %table.info
                       %tr.info-head
                         %th
                         %th Tasks
                         %th # of sub(s)
                         %th Results
                       = render :partial => 'problem', :collection => cp[:problems]
               %hr/
               %script{:type => 'text/javascript'}
                 = "Announcement.refreshUrl = '#{url_for :controller => 'main', :action => 'announcements'}';"
                 Announcement.registerRefreshEventTimer();

app/views/user_admin/admin.html.haml ¶ +2 -2

               %h1 Administrators
-            - %table
-            -   %tr
+            + %table{:class => 'info'}
+            +   %tr{:class => 'info-head'}
                   %th #
                   %th Login
                   %th Full name
                   %th
                 - @admins.each_with_index do |user, i|
                   %tr
                     %td= i+1
                     %td= user.login
                     %td= user.full_name
                     %td
                       - if user.login!='root'
                         = link_to '[revoke]', :action => 'revoke_admin', :id => user.id
               %hr
               - form_tag :action => 'grant_admin' do
                 Grant admin permission to:
                 = text_field_tag 'login'
                 = submit_tag 'Grant'
               %hr/
               = link_to '[go back to index]', :action => 'index'

app/views/user_admin/list.rhtml ¶ +27 -3

               <h1>Listing users</h1>
               <div class="submitbox">
                 <b>Quick add</b>
                 <% form_tag :action => 'create' do %>
                   <table border="0">
                     <tr>
               	<td><label for="user_login">Login</label></td>
               	<td><label for="user_full_name">Full name</label></td>
               	<td><label for="user_password">Password</label></td>
               	<td><label for="user_password_confirmation">Confirm</label></td>
               	<td><label for="user_email">Email</label></td>
                     </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? %>
+            +     <%= link_to '[Manage bulk users in contests]', :action => 'contest_management' %>
+            +   <% end %>
               </div>
-            - <table>
-            -   <tr>
+            + <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>
+            +   <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

r280:f8e3b2e72e4a - Wed, 03 Mar 2010 18:46:52 - 7 files changed: 111 inserted, 7 deleted

Sign in to your account

Commit r280:f8e3b2e72e4a public

Author

r280:f8e3b2e72e4a - Wed, 03 Mar 2010 18:46:52 - 7 files changed: 111 inserted, 7 deleted

Commit `r280:f8e3b2e72e4a` public