cafe-grader-web Commit - r106:695a33fa7e55

cafe-grader-web

Commit `r106:695a33fa7e55` public

parent | child

Description:

[web] import from site git-svn-id: http://theory.cpe.ku.ac.th/grader/web/trunk@224 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

r106:695a33fa7e55 - Sat, 03 May 2008 17:00:51 - 12 files changed: 141 inserted, 4 deleted

app/models/country.rb created 644 ¶ +5

@@ -0,0 +1,5
	1	+ class Country < ActiveRecord::Base
	2	+
	3	+ has_many :sites
	4	+
	5	+ end

app/views/user_admin/import.html.haml created 644 ¶ +6

@@ -0,0 +1,6
	1	+ return to
	2	+ = link_to '[user list]', :action => 'list'
	3	+
	4	+ %h3 Import log
	5	+
	6	+ = simple_format(@import_log)

db/migrate/034_create_countries.rb created 644 ¶ +12

@@ -0,0 +1,12
	1	+ class CreateCountries < ActiveRecord::Migration
	2	+ def self.up
	3	+ create_table :countries do \|t\|
	4	+ t.column :name, :string
	5	+ t.timestamps
	6	+ end
	7	+ end
	8	+
	9	+ def self.down
	10	+ drop_table :countries
	11	+ end
	12	+ end

db/migrate/035_add_country_to_sites_and_users.rb created 644 ¶ +15

@@ -0,0 +1,15
	1	+ class AddCountryToSitesAndUsers < ActiveRecord::Migration
	2	+ def self.up
	3	+ add_column 'sites', 'country_id', :integer
	4	+ add_column 'sites', 'password', :string
	5	+
	6	+ add_column 'users', 'country_id', :integer
	7	+ end
	8	+
	9	+ def self.down
	10	+ remove_column 'users', 'country_id'
	11	+
	12	+ remove_column 'sites', 'country_id'
	13	+ remove_column 'sites', 'password'
	14	+ end
	15	+ end

test/fixtures/countries.yml created 644 ¶ +7

@@ -0,0 +1,7
	1	+ # Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
	2	+
	3	+ # one:
	4	+ # column: value
	5	+ #
	6	+ # two:
	7	+ # column: value

test/unit/country_test.rb created 644 ¶ +8

@@ -0,0 +1,8
	1	+ require File.dirname(__FILE__) + '/../test_helper'
	2	+
	3	+ class CountryTest < ActiveSupport::TestCase
	4	+ # Replace this with your real tests.
	5	+ def test_truth
	6	+ assert true
	7	+ end
	8	+ end

app/controllers/user_admin_controller.rb ¶ +67

@@ -67,25 +67,92
67	def destroy	67	def destroy
68	User.find(params[:id]).destroy	68	User.find(params[:id]).destroy
69	redirect_to :action => 'list'	69	redirect_to :action => 'list'
70	end	70	end
71		71
72	def user_stat	72	def user_stat
73	@problems = Problem.find_available_problems	73	@problems = Problem.find_available_problems
74	@users = User.find(:all)	74	@users = User.find(:all)
75	@scorearray = Array.new	75	@scorearray = Array.new
76	@users.each do \|u\|	76	@users.each do \|u\|
77	ustat = Array.new	77	ustat = Array.new
78	ustat[0] = u.login	78	ustat[0] = u.login
79	ustat[1] = u.full_name	79	ustat[1] = u.full_name
80	@problems.each do \|p\|	80	@problems.each do \|p\|
81	sub = Submission.find_last_by_user_and_problem(u.id,p.id)	81	sub = Submission.find_last_by_user_and_problem(u.id,p.id)
82	if (sub!=nil) and (sub.points!=nil)	82	if (sub!=nil) and (sub.points!=nil)
83	ustat << [sub.points, (sub.points>=p.full_score)]	83	ustat << [sub.points, (sub.points>=p.full_score)]
84	else	84	else
85	ustat << [0,false]	85	ustat << [0,false]
86	end	86	end
87	end	87	end
88	@scorearray << ustat	88	@scorearray << ustat
89	end	89	end
90	end	90	end
		91	+
		92	+ def import
		93	+ if params[:file]==''
		94	+ flash[:notice] = 'Error importing no file'
		95	+ redirect_to :action => 'list' and return
91	end	96	end
		97	+ import_from_file(params[:file])
		98	+ end
		99	+
		100	+ protected
		101	+
		102	+ def import_from_file(f)
		103	+ data_hash = YAML.load(f)
		104	+ @import_log = ""
		105	+
		106	+ country_data = data_hash[:countries]
		107	+ site_data = data_hash[:sites]
		108	+ user_data = data_hash[:users]
		109	+
		110	+ # import country
		111	+ countries = {}
		112	+ country_data.each_pair do \|id,country\|
		113	+ c = Country.find_by_name(country[:name])
		114	+ if c!=nil
		115	+ countries[id] = c
		116	+ @import_log << "Found #{country[:name]}\n"
		117	+ else
		118	+ countries[id] = Country.new(:name => country[:name])
		119	+ countries[id].save
		120	+ @import_log << "Created #{country[:name]}\n"
		121	+ end
		122	+ end
		123	+
		124	+ # import sites
		125	+ sites = {}
		126	+ site_data.each_pair do \|id,site\|
		127	+ s = Site.find_by_name(site[:name])
		128	+ if s!=nil
		129	+ @import_log << "Found #{site[:name]}\n"
		130	+ else
		131	+ s = Site.new(:name => site[:name])
		132	+ @import_log << "Created #{site[:name]}\n"
		133	+ end
		134	+ s.password = site[:password]
		135	+ s.country = countries[site[:country_id]]
		136	+ s.save
		137	+ sites[id] = s
		138	+ end
		139	+
		140	+ # import users
		141	+ user_data.each_pair do \|id,user\|
		142	+ u = User.find_by_login(user[:login])
		143	+ if u!=nil
		144	+ @import_log << "Found #{user[:login]}\n"
		145	+ else
		146	+ u = User.new(:login => user[:login])
		147	+ @import_log << "Created #{user[:login]}\n"
		148	+ end
		149	+ u.full_name = user[:name]
		150	+ u.password = user[:password]
		151	+ u.country = countries[user[:country_id]]
		152	+ u.site = sites[user[:site_id]]
		153	+ u.save
		154	+ end
		155	+
		156	+ end
		157	+
		158	+ end

app/models/site.rb ¶ +3

               class Site < ActiveRecord::Base
+            +   belongs_to :country
+            +   has_many :users
+            +
                 def clear_start_time_if_not_started
                   if !self.started
                     self.start_time = nil
                   end
                 end
                 def finished?
                   if !self.started
                     return false
                   end
                   contest_time = Configuration['contest.time_limit']
                   if tmatch = /(\d+):(\d+)/.match(contest_time)
                     h = tmatch[1].to_i
                     m = tmatch[2].to_i
                     return Time.now > (self.start_time + h.hour + m.minute)
                   else
                     false
                   end
                 end
               end

app/models/user.rb ¶ +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'
                 belongs_to :site
+            +   belongs_to :country
                 validates_presence_of :login
                 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?
                 attr_accessor :password
                 before_save :encrypt_new_password
                 def self.authenticate(login, password)
                   user = find_by_login(login)
                   return user if user && user.authenticated?(password)
                 end
                 def authenticated?(password)
                   hashed_password == User.encrypt(password,self.salt)
                 end
                 def admin?
                   self.roles.detect {|r| r.name == 'admin' }

app/views/messages/list.html.haml ¶ +1 -1

               = user_title_bar(@user)
               %h3 Your Messages
               - form_for 'message', nil, :url => { :action => 'create'} do |f|
                 %p
-            -     %b New message
+            +     %b New clarification request
                   = submit_tag "Post"
                   %br/
                   = f.text_area :body, :rows => 5, :cols => 100
               %hr/
               = render :partial => 'message', :collection => @messages, :locals => {:reply => false}

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

               <% content_for :head do %>
                 <%= stylesheet_link_tag 'scaffold' %>
               <% end %>
               <h1>Listing users</h1>
-            - <div style="border: solid 1px; margin: 2px">
+            + <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_alias">Alias</label></td>
                 <td><label for="user_password">Password</label></td>
                 <td><label for="user_password_confirmation">confirm</label></td>
                 </tr>
                 <tr>
                 <td><%= text_field 'user', 'login', :size => 10  %></td>
                 <td><%= text_field 'user', 'full_name', :size => 30  %></td>
                 <td><%= text_field 'user', 'alias', :size => 10  %></td>
                 <td><%= password_field 'user', 'password', :size => 10  %></td>
                 <td><%= password_field 'user', 'password_confirmation', :size => 10 %></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 %>
               </div>
               <table>
                 <tr>
                 <% for column in User.content_columns %>
                   <th><%= column.human_name %></th>
                 <% end %>
                 </tr>
               <% for user in @users %>
                 <tr>
                 <% for column in User.content_columns %>
                   <td><%=h user.send(column.name) %></td>
                 <% 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>
                 </tr>
               <% end %>
               </table>
               <br />
               <%= link_to 'New user', :action => 'new' %>
               <%= link_to 'New list of users', :action => 'new_list' %>

db/schema.rb ¶ +10 -1

               # This file is auto-generated from the current state of the database. Instead of editing this file,
               # please use the migrations feature of ActiveRecord to incrementally modify your database, and
               # then regenerate this schema definition.
               #
               # Note that this schema.rb definition is the authoritative source for your database schema. If you need
               # to create the application database on another system, you should be using db:schema:load, not running
               # all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
               # you'll amass, the slower it'll run and the greater likelihood for issues).
               #
               # It's strongly recommended to check this file into your version control system.
-            - ActiveRecord::Schema.define(:version => 33) do
+            + ActiveRecord::Schema.define(:version => 35) do
                 create_table "announcements", :force => true do |t|
                   t.string   "author"
                   t.text     "body"
                   t.boolean  "published"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "configurations", :force => true do |t|
                   t.string   "key"
                   t.string   "value_type"
                   t.string   "value"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
+            +   create_table "countries", :force => true do |t|
+            +     t.string   "name"
+            +     t.datetime "created_at"
+            +     t.datetime "updated_at"
+            +   end
+            +
                 create_table "descriptions", :force => true do |t|
                   t.text     "body"
                   t.boolean  "markdowned"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                 end
                 create_table "grader_processes", :force => true do |t|
                   t.string   "host",       :limit => 20
                   t.integer  "pid"
                   t.string   "mode"
                   t.boolean  "active"
                   t.datetime "created_at"
                   t.datetime "updated_at"
                   t.integer  "task_id"
                   t.string   "task_type"
                 end
                 add_index "grader_processes", ["host", "pid"], :name => "index_grader_processes_on_ip_and_pid"
                 create_table "languages", :force => true do |t|
                   t.string "name",        :limit => 10
                   t.string "pretty_name"
                   t.string "ext",         :limit => 10
                 end
                 create_table "roles_users", :id => false, :force => true do |t|
                   t.integer "role_id"
                   t.integer "user_id"
                 end
                 add_index "roles_users", ["user_id"], :name => "index_roles_users_on_user_id"
                 create_table "sessions", :force => true do |t|
                   t.string   "session_id"
                   t.text     "data"
                   t.datetime "updated_at"
                 end
                 add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
                 add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
                 create_table "sites", :force => true do |t|
                   t.string   "name"
                   t.boolean  "started"
                   t.datetime "start_time"
                   t.datetime "created_at"
                   t.datetime "updated_at"
+            +     t.integer  "country_id"
+            +     t.string   "password"
                 end
                 create_table "submissions", :force => true do |t|
                   t.integer  "user_id"
                   t.integer  "problem_id"
                   t.integer  "language_id"
                   t.text     "source"
                   t.binary   "binary"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.integer  "points"
                   t.text     "grader_comment"
                   t.integer  "number"
                   t.string   "source_filename"
                 end
                 add_index "submissions", ["user_id", "problem_id", "number"], :name => "index_submissions_on_user_id_and_problem_id_and_number", :unique => true
                 add_index "submissions", ["user_id", "problem_id"], :name => "index_submissions_on_user_id_and_problem_id"
                 create_table "tasks", :force => true do |t|
                   t.integer  "submission_id"
                   t.datetime "created_at"
                   t.string   "running_stat"
                   t.integer  "status"
                   t.datetime "updated_at"
                   t.datetime "submitted_at"
                   t.datetime "compiled_at"
                   t.text     "compiler_message"
                   t.datetime "graded_at"
                   t.string   "grader_comment"
                   t.datetime "created_at"
                   t.float    "running_time"
                   t.string   "exit_status"
                   t.integer  "memory_usage"
                 end
                 add_index "test_requests", ["user_id", "problem_id"], :name => "index_test_requests_on_user_id_and_problem_id"
                 create_table "users", :force => true do |t|
                   t.string  "login",           :limit => 10
                   t.string  "full_name"
                   t.string  "hashed_password"
                   t.string  "salt",            :limit => 5
                   t.string  "alias"
                   t.string  "email"
                   t.integer "site_id"
+            +     t.integer "country_id"
                 end
                 add_index "users", ["login"], :name => "index_users_on_login", :unique => true
               end

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

r106:695a33fa7e55 - Sat, 03 May 2008 17:00:51 - 12 files changed: 141 inserted, 4 deleted

Sign in to your account

Commit r106:695a33fa7e55 public

Author

r106:695a33fa7e55 - Sat, 03 May 2008 17:00:51 - 12 files changed: 141 inserted, 4 deleted

Commit `r106:695a33fa7e55` public