cafe-grader-web Commit - r13:a663af8c2813

cafe-grader-web

Commit `r13:a663af8c2813` public

parent | child

Description:

added user settings git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@37 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

r13:a663af8c2813 - Fri, 08 Feb 2008 03:54:46 - 15 files changed: 163 inserted, 108 deleted

app/views/layouts/login.html.erb created 644 ¶ +15

@@ -0,0 +1,15
	1	+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
	2	+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	3	+
	4	+ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
	5	+ <head>
	6	+ <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
	7	+ <title>Grader!</title>
	8	+ <%= stylesheet_link_tag 'application' %>
	9	+ </head>
	10	+ <body>
	11	+
	12	+ <%= yield %>
	13	+
	14	+ </body>
	15	+ </html>

db/schema.rb created 644 ¶ +92

@@ -0,0 +1,92
	1	+ # This file is auto-generated from the current state of the database. Instead of editing this file,
	2	+ # please use the migrations feature of ActiveRecord to incrementally modify your database, and
	3	+ # then regenerate this schema definition.
	4	+ #
	5	+ # Note that this schema.rb definition is the authoritative source for your database schema. If you need
	6	+ # to create the application database on another system, you should be using db:schema:load, not running
	7	+ # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
	8	+ # you'll amass, the slower it'll run and the greater likelihood for issues).
	9	+ #
	10	+ # It's strongly recommended to check this file into your version control system.
	11	+
	12	+ ActiveRecord::Schema.define(:version => 11) do
	13	+
	14	+ create_table "languages", :force => true do \|t\|
	15	+ t.string "name", :limit => 10
	16	+ t.string "pretty_name"
	17	+ t.string "ext", :limit => 10
	18	+ end
	19	+
	20	+ create_table "problems", :force => true do \|t\|
	21	+ t.string "name", :limit => 30
	22	+ t.string "full_name"
	23	+ t.integer "full_score"
	24	+ t.date "date_added"
	25	+ t.boolean "available"
	26	+ end
	27	+
	28	+ create_table "rights", :force => true do \|t\|
	29	+ t.string "name"
	30	+ t.string "controller"
	31	+ t.string "action"
	32	+ end
	33	+
	34	+ create_table "rights_roles", :id => false, :force => true do \|t\|
	35	+ t.integer "right_id"
	36	+ t.integer "role_id"
	37	+ end
	38	+
	39	+ add_index "rights_roles", ["role_id"], :name => "index_rights_roles_on_role_id"
	40	+
	41	+ create_table "roles", :force => true do \|t\|
	42	+ t.string "name"
	43	+ end
	44	+
	45	+ create_table "roles_users", :id => false, :force => true do \|t\|
	46	+ t.integer "role_id"
	47	+ t.integer "user_id"
	48	+ end
	49	+
	50	+ add_index "roles_users", ["user_id"], :name => "index_roles_users_on_user_id"
	51	+
	52	+ create_table "sessions", :force => true do \|t\|
	53	+ t.string "session_id"
	54	+ t.text "data"
	55	+ t.datetime "updated_at"
	56	+ end
	57	+
	58	+ add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
	59	+ add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
	60	+
	61	+ create_table "submissions", :force => true do \|t\|
	62	+ t.integer "user_id"
	63	+ t.integer "problem_id"
	64	+ t.integer "language_id"
	65	+ t.text "source"
	66	+ t.binary "binary"
	67	+ t.datetime "submitted_at"
	68	+ t.datetime "compiled_at"
	69	+ t.text "compiler_message"
	70	+ t.datetime "graded_at"
	71	+ t.integer "points"
	72	+ t.text "grader_comment"
	73	+ end
	74	+
	75	+ add_index "submissions", ["user_id", "problem_id"], :name => "index_submissions_on_user_id_and_problem_id"
	76	+
	77	+ create_table "tasks", :force => true do \|t\|
	78	+ t.integer "submission_id"
	79	+ t.datetime "created_at"
	80	+ end
	81	+
	82	+ create_table "users", :force => true do \|t\|
	83	+ t.string "login", :limit => 10
	84	+ t.string "full_name"
	85	+ t.string "hashed_password"
	86	+ t.string "salt", :limit => 5
	87	+ t.string "alias"
	88	+ end
	89	+
	90	+ add_index "users", ["login"], :name => "index_users_on_login", :unique => true
	91	+
	92	+ end

vendor/plugins/haml/init.rb created 644 ¶ +2

@@ -0,0 +1,2
	1	+ require 'haml'
	2	+ Haml.init_rails(binding)

app/controllers/main_controller.rb ¶ +1

               class MainController < ApplicationController
                 before_filter :authenticate, :except => [:index, :login]
                 verify :method => :post, :only => [:submit],
                        :redirect_to => { :action => :index }
                 def index
                   redirect_to :action => 'login'
                 end
                 def login
+            +     MainController.layout 'login'
                   reset_session
                 end
                 def list
                   @problems = Problem.find_available_problems
                   @prob_submissions = Array.new
                   @user = User.find(session[:user_id])
                   @problems.each do |p|
                     c, sub = Submission.find_by_user_and_problem(@user.id,p.id)
                     @prob_submissions << [c,sub]
                   end
                 end
                 def submit
                   submission = Submission.new(params[:submission])
                   submission.user_id = session[:user_id]
                   submission.language_id = 0
                   source = params['file'].read
                   if source.length > 100_000
                     flash[:notice] = 'Error: file too long'
                   elsif (lang = Submission.find_language_in_source(source))==nil
                     flash[:notice] = 'Error: cannot determine language used'
                   elsif ((submission.problem_id==-1) and
               	   !(problem=Submission.find_problem_in_source(source)))

app/controllers/users_controller.rb ¶ +25

@@ -1,2 +1,27
1	class UsersController < ApplicationController	1	class UsersController < ApplicationController
		2	+
		3	+ before_filter :authenticate
		4	+
		5	+ verify :method => :post, :only => [:chg_passwd],
		6	+ :redirect_to => { :action => :index }
		7	+
		8	+ in_place_edit_for :user, :full_name
		9	+ in_place_edit_for :user, :alias
		10	+
		11	+ def index
		12	+ @user = User.find(session[:user_id])
2	end	13	end
		14	+
		15	+ def chg_passwd
		16	+ user = User.find(session[:user_id])
		17	+ user.password = params[:passwd]
		18	+ user.password_confirmation = params[:passwd_verify]
		19	+ if user.save
		20	+ flash[:notice] = 'password changed'
		21	+ else
		22	+ flash[:notice] = 'Error: password changing failed'
		23	+ end
		24	+ redirect_to :action => 'index'
		25	+ end
		26	+
		27	+ end

app/helpers/application_helper.rb ¶ +21

@@ -1,3 +1,24
1	# Methods added to this helper will be available to all templates in the application.	1	# Methods added to this helper will be available to all templates in the application.
2	module ApplicationHelper	2	module ApplicationHelper
		3	+
		4	+ def user_options
		5	+ options = ''
		6	+ user = User.find(session[:user_id])
		7	+ if user.admin?
		8	+ options = options + ' ' +
		9	+ (link_to_unless_current '[Problem admin]',
		10	+ :controller => 'problems', :action => 'index')
		11	+ options = options + ' ' +
		12	+ (link_to_unless_current '[User admin]',
		13	+ :controller => 'user_admin', :action => 'index')
3	end	14	end
		15	+ options += link_to_unless_current '[Main]',
		16	+ :controller => 'main', :action => 'list'
		17	+ options += link_to_unless_current '[Settings]',
		18	+ :controller => 'users', :action => 'index'
		19	+ options = options + ' ' +
		20	+ link_to('[Log out]', {:controller => 'main', :action => 'login'})
		21	+ options
		22	+ end
		23	+
		24	+ end

app/helpers/main_helper.rb ¶ -16

               module MainHelper
-            -   def user_options
-            -     options = ''
-            -     user = User.find(session[:user_id])
-            -     if user.admin?
-            -       options = options + ' ' +
-            - 	link_to('[Problem admin]',
-            - 		{:controller => 'problems', :action => 'index'})
-            -       options = options + ' ' +
-            - 	link_to('[User admin]',
-            - 		{:controller => 'user_admin', :action => 'index'})
-            -     end
-            -     options = options + ' ' +
-            -       link_to('[Log out]', {:controller => 'main', :action => 'login'})
-            -     options
-            -   end
                 def format_short_time(time)
                   now = Time.now
                   st = ''
                   if (time.yday != now.yday) or
               	(time.year != now.year)
                     st = time.strftime("%x")
                   end
                   st + time.strftime("%X")
                 end
                 def format_compiler_msg(sub)
                   <<cmpmsg
               <div>
               <div><a href="#" onClick="n = this.parentNode.parentNode.lastChild;
               if(n.style.display == 'none') { n.style.display = 'block'; }
               else {n.style.display ='none'; } return false;">
               Compiler message</a> (click to see)</div>
               <div style="display: none">
               <div class="compilermsgbody" style="border: thin solid grey; margin: 2px">
               #{h(sub.compiler_message).gsub(/\n/,'<br/>')}
               </div>
               </div></div>
               cmpmsg
                 end

app/views/layouts/application.rhtml ¶ +7

               <!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>Grader!</title>
                 <%= stylesheet_link_tag 'application' %>
+            +   <%= javascript_include_tag :defaults %>
               </head>
               <body>
+            + <div class="usermenu">
+            + <%= user_options %>
+            + </div>
+            +
+            + <p style="color: green"><%= flash[:notice] %></p>
+            +
               <%= yield  %>
               </body>
               </html>

app/views/main/list.rhtml ¶ -4

               <h1>Hello <%=h @user.full_name %></h1>
               (<%= Time.new %>)
-            - <div class="usermenu">
-            - <%= user_options %>
-            - </div>
               <div class="submitbox">
               <% form_tag({:action => 'submit'}, :multipart => true) do %>
               Problem: <%= select 'submission', 'problem_id',
                            	[['Specified in header','-1']] +
               		@problems.collect {|p| [p.full_name, p.id]},
               		:selected => '-1' %>
               File: <%= file_field_tag 'file' %>
               <%= submit_tag 'Submit' %>
               <% end %>
               </div>
               <hr/>
               <p style="color: red"><%= flash[:notice] %></p>
               <div class="problist">
               <% i = 0 %>
               <% @problems.each do |p| %>
                 <div class="problist-each">
                 <div class="probname">
                   <%= "#{i+1}: #{p.full_name} (#{p.name})" %>
                 </div>
                 <div class="subinfo">
                   <%= format_submission(@prob_submissions[i][1],

app/views/layouts/users.rhtml removed ¶ -17

deleted file

app/views/users/_form.rhtml removed ¶ -19

deleted file

app/views/users/edit.rhtml removed ¶ -9

deleted file

app/views/users/list.rhtml removed ¶ -27

deleted file

app/views/users/new.rhtml removed ¶ -8

deleted file

app/views/users/show.rhtml removed ¶ -8

deleted file

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

r13:a663af8c2813 - Fri, 08 Feb 2008 03:54:46 - 15 files changed: 163 inserted, 108 deleted

Sign in to your account

Commit r13:a663af8c2813 public

Author

r13:a663af8c2813 - Fri, 08 Feb 2008 03:54:46 - 15 files changed: 163 inserted, 108 deleted

Commit `r13:a663af8c2813` public