cafe-grader-web Commit - r106:695a33fa7e55

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

		@@ -88,4 +88,71
88	88	@scorearray << ustat
89	89	end
90	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	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

app/models/user.rb ¶ +1

                          :order => 'created_at DESC'
                 belongs_to :site
+            +   belongs_to :country
                 validates_presence_of :login
                 validates_presence_of :full_name

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

               - 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

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

               <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">
               <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 %>

db/schema.rb ¶ +10 -1

               #
               # 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.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 "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.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

	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