cafe-grader-web Commit - r138:0f4011aaed34

cafe-grader-web

Commit `r138:0f4011aaed34` public

parent | child

Description:

enable user settings, remove APIO header git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@277 6386c4cd-e34a-4fa8-8920-d93eb39b512e

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

r138:0f4011aaed34 - Fri, 10 Oct 2008 06:27:56 - 4 files changed: 7 inserted, 6 deleted

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

                 def create_from_list
                   lines = params[:user_list]
                   lines.split("\n").each do |line|
                     items = line.split(',')
                     if items.length==4
                       user = User.new
                       user.login = items[0]
                       user.full_name = items[1]
                       user.alias = items[2]
                       user.password = items[3]
                       user.password_confirmation = items[3]
                       user.save
                     end
                   end
                   redirect_to :action => 'list'
                 end
                 def edit
                   @user = User.find(params[:id])
                 end
                 def update
                   @user = User.find(params[:id])
                   if @user.update_attributes(params[:user])
                     flash[:notice] = 'User was successfully updated.'
                     redirect_to :action => 'show', :id => @user
                   else
                     render :action => 'edit'
                   end
                 end
                 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.login
                     ustat[1] = u.full_name
                     @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, (sub.points>=p.full_score)]
+            + 	  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
                 protected
                 def import_from_file(f)
                   data_hash = YAML.load(f)
                   @import_log = ""
                   country_data = data_hash[:countries]
                   site_data = data_hash[:sites]
                   user_data = data_hash[:users]
                   # import country
                   countries = {}
                   country_data.each_pair do |id,country|
                     c = Country.find_by_name(country[:name])
                     if c!=nil
                       countries[id] = c
                       @import_log << "Found #{country[:name]}\n"
                     else
                       countries[id] = Country.new(:name => country[:name])
                       countries[id].save
                       @import_log << "Created #{country[:name]}\n"
                     end
                   end
                   # import sites
                   sites = {}
                   site_data.each_pair do |id,site|
                     s = Site.find_by_name(site[:name])
                     if s!=nil
                       @import_log << "Found #{site[:name]}\n"
                     else
                       s = Site.new(:name => site[:name])

app/controllers/users_controller.rb ¶ +4 -3

               class UsersController < ApplicationController
                 before_filter :authenticate
                 verify :method => :post, :only => [:chg_passwd],
                        :redirect_to => { :action => :index }
                 in_place_edit_for :user, :alias_for_editing
                 in_place_edit_for :user, :email_for_editing
                 def index
-            -     # ... disable in this contest ...
+            +     # uncomment below to disable settings
-            -     # @user = User.find(session[:user_id])
+            +     #redirect_to :controller => 'main', :action => 'list'
-            -     redirect_to :controller => 'main', :action => 'list'
+            +     @user = User.find(session[:user_id])
                 end
                 def chg_passwd
                   user = User.find(session[:user_id])
                   user.password = params[:passwd]
                   user.password_confirmation = params[:passwd_verify]
                   if user.save
                     flash[:notice] = 'password changed'
                   else
                     flash[:notice] = 'Error: password changing failed'
                   end
                   redirect_to :action => 'index'
                 end
               end

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

               # Methods added to this helper will be available to all templates in the application.
               module ApplicationHelper
                 SYSTEM_MODE_CONF_KEY = 'system.mode'
                 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, '[Problem admin]', 'problems', 'index'
                     append_to menu_items, '[User admin]', 'user_admin', 'index'
                     append_to menu_items, '[User stat]', 'user_admin', 'user_stat'
                     append_to menu_items, '[Graders]', 'graders', 'list'
                     append_to menu_items, '[Site config]', 'configurations', 'index'
                     menu_items << "<br/>"
                   end
                   # main page
                   append_to menu_items, '[Main]', 'main', 'list'
                   append_to menu_items, '[Messages]', 'messages', 'list'
                   if (user!=nil) and (Configuration.show_tasks_to?(user))
                     append_to menu_items, '[Tasks]', 'tasks', 'list'
                     append_to menu_items, '[Submissions]', 'main', 'submission'
                     append_to menu_items, '[Test]', 'test', 'index'
                   end
                   append_to menu_items, '[Help]', 'main', 'help'
-            -     #append_to menu_items, '[Settings]', 'users', 'index'
+            +     append_to menu_items, '[Settings]', 'users', 'index'
                   append_to menu_items, '[Log out]', 'main', 'login'
                   menu_items
                 end
                 def append_to(option,label, controller, action)
                   option << ' ' if option!=''
                   option << link_to_unless_current(label,
                                                    :controller => controller,
                                                    :action => action)
                 end
                 def format_short_time(time)
                   now = Time.now.gmtime
                   st = ''
                   if (time.yday != now.yday) or
               	(time.year != now.year)
                     st = time.strftime("%x ")
                   end
                   st + time.strftime("%X")
                 end
                 def read_textfile(fname,max_size=2048)
                   begin
                     File.open(fname).read(max_size)
                   rescue
                     nil
                   end
                 end
                 def user_title_bar(user)
                   header = ''
                   time_left = ''
                   #
                   # if the contest is over
                   if Configuration[SYSTEM_MODE_CONF_KEY]=='contest'
                     if user.site!=nil and user.site.finished?
                       header = <<CONTEST_OVER
               <tr><td colspan="2" align="center">
               <span class="contest-over-msg">THE CONTEST IS OVER</span>
               </td></tr>
               CONTEST_OVER
                     end
                     if user.site!=nil
                       time_left = ". Time left: #{Time.at(user.site.time_left).gmtime.strftime("%X")}"
                     end
                   end

app/views/layouts/application.html.erb ¶ +1 -1

               <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
               <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
               <head>
                 <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-            -   <title>APIO'08</title>
+            +   <title>Grader</title>
                 <%= stylesheet_link_tag 'application' %>
                 <%= yield :head %>
               </head>
               <body>
               <div class="userbar">
               <%= user_header %>
               </div>
               <%= content_tag(:p,flash[:notice],:style => "color:green") if flash[:notice]!=nil %>
               <%= yield  %>
               </body>
               </html>

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

r138:0f4011aaed34 - Fri, 10 Oct 2008 06:27:56 - 4 files changed: 7 inserted, 6 deleted

Sign in to your account

Commit r138:0f4011aaed34 public

Author

r138:0f4011aaed34 - Fri, 10 Oct 2008 06:27:56 - 4 files changed: 7 inserted, 6 deleted

Commit `r138:0f4011aaed34` public