建立了学校与用户的关联

课程与用户的学校字段均为学校id而不再是学校名称

页面暂时改了想到的地方= =

app/controllers/my_controller.rb

@@ -87,7 +87,7 @@ class MyController < ApplicationController
          se = UserExtensions.new
          se.user_id = @user.id
           if params[:occupation]
-          se.occupation = params[:occupation] 
+          se.school_id = params[:occupation] 
           end 
          
          se.gender = params[:gender]
@@ -109,7 +109,7 @@ class MyController < ApplicationController
       else
        se = @user.user_extensions
        if params[:occupation]
-        se.occupation = params[:occupation] 
+        se.school_id = params[:occupation] 
        end 
       
        se.gender = params[:gender]

app/controllers/projects_controller.rb

@@ -390,7 +390,7 @@ class ProjectsController < ApplicationController
       # added by bai
       @course.term = params[:term]
       @course.time = params[:time]
-      @course.school_name = params[:occupation]
+      @course.school_id = params[:occupation]
       @course.setup_time = params[:setup_time]
       @course.endup_time = params[:endup_time]
       @course.class_period = params[:class_period]

app/controllers/school_controller.rb

@@ -6,7 +6,7 @@ class SchoolController < ApplicationController
     options = ""
     
     @school.each do |s|
-      options << "<option value=#{s.name}>#{s.name}</option>"
+      options << "<option value=#{s.id}>#{s.name}</option>"
     end
     
     render :text => options

app/models/user_extensions.rb

@@ -8,6 +8,7 @@
 =end
 class UserExtensions < ActiveRecord::Base
   belongs_to :user
+  belongs_to :school, :class_name => 'School', :foreign_key => :school_id
   attr_accessible :user_id,:birthday,:brief_introduction,:gender,:location,:occupation,:work_experience,:zip_code,:identity, :technical_title,:student_id
   TEACHER = 0
   STUDENT = 1

app/views/layouts/base_users.html.erb

@@ -166,7 +166,7 @@
 											<% unless @user.user_extensions.nil? %>
 											<% unless @user.user_extensions.identity == 2 %>
 											<tr>
-												<td style="padding-left: 5px" width="70px"><%= l(:field_occupation) %>：</td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"><%= @user.user_extensions.occupation %></td>
+												<td style="padding-left: 5px" width="70px"><%= l(:field_occupation) %>：</td><td class="font_lighter_sidebar" style="padding-left: 0px" width="170px"><%= @user.user_extensions.school.name %></td>
 											</tr>
 											<% end %>
 											<tr>

app/views/my/account.html.erb

@@ -91,7 +91,7 @@
 		<p style="width:357px;padding-left: 26px;">
 			<%= l(:field_occupation) %>&nbsp;<span class="required">*</span><%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province), :onchange => "get_options(this.value)" %>
 
-			<%= select_tag "occupation", options_for_select([['安徽大学','安徽大学'],['合肥工业大学','合肥工业大学'],['中国科技大学','中国科技大学']])   %>
+			<%= select_tag "occupation"  %>
 		</p>		
 		
 		

app/views/projects/_course_form.html.erb

@@ -289,7 +289,7 @@
 		<strong><%=l(:label_new_course_school)%></strong><span class="required">*</span>&nbsp;&nbsp;&nbsp;
 		<%= select_tag "province", options_from_collection_for_select(School.find_by_sql("select distinct province from schools"), :province, :province), :onclick => "get_options(this.value)" %>
 
-		<%= select_tag "occupation", options_for_select([['安徽大学','安徽大学'],['合肥工业大学','合肥工业大学'],['中国科技大学','中国科技大学']])   %>
+		<%= select_tag "occupation" %>
 	</p>
 		
 	<!-- end -->

db/migrate/20140417085550_rename_courses_column_school_name.rb

@@ -0,0 +1,9 @@
+class RenameCoursesColumnSchoolName < ActiveRecord::Migration
+  def up
+    rename_column :courses, :school_name, :school_id
+  end
+
+  def down
+    rename_column :courses, :school_id, :school_name
+  end
+end

db/migrate/20140417090022_change_courses_column_school_id.rb

@@ -0,0 +1,9 @@
+class ChangeCoursesColumnSchoolId < ActiveRecord::Migration
+  def up
+    change_column :courses, :school_id, :integer
+  end
+
+  def down
+    change_column :courses, :school_id, :string
+  end
+end

db/migrate/20140417091429_add_school_id_to_user_extensions.rb

@@ -0,0 +1,5 @@
+class AddSchoolIdToUserExtensions < ActiveRecord::Migration
+  def change
+    add_column :user_extensions, :school_id, :integer
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140415090829) do
+ActiveRecord::Schema.define(:version => 20140417091429) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -23,6 +23,15 @@ ActiveRecord::Schema.define(:version => 20140415090829) do
   add_index "activities", ["user_id", "act_type"], :name => "index_activities_on_user_id_and_act_type"
   add_index "activities", ["user_id"], :name => "index_activities_on_user_id"
 
+  create_table "apply_project_masters", :force => true do |t|
+    t.integer  "user_id"
+    t.string   "apply_type"
+    t.integer  "apply_id"
+    t.integer  "status"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
+  end
+
   create_table "attachments", :force => true do |t|
     t.integer  "container_id"
     t.string   "container_type", :limit => 30
@@ -62,6 +71,20 @@ ActiveRecord::Schema.define(:version => 20140415090829) do
 
   add_index "auth_sources", ["id", "type"], :name => "index_auth_sources_on_id_and_type"
 
+  create_table "bak_mentioned", :primary_key => "Id", :force => true do |t|
+    t.string  "this_real_name",  :limit => 1000
+    t.integer "is_mentioned_in"
+    t.string  "context",         :limit => 2000
+  end
+
+  add_index "bak_mentioned", ["this_real_name", "is_mentioned_in"], :name => "name_mention", :length => {"this_real_name"=>900, "is_mentioned_in"=>nil}
+  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name"
+  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name_2"
+  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name_3", :length => {"this_real_name"=>900}
+  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name_4"
+  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name_5"
+  add_index "bak_mentioned", ["this_real_name"], :name => "this_real_name_6"
+
   create_table "biding_projects", :force => true do |t|
     t.integer  "project_id"
     t.integer  "bid_id"
@@ -101,6 +124,11 @@ ActiveRecord::Schema.define(:version => 20140415090829) do
   add_index "boards", ["last_message_id"], :name => "index_boards_on_last_message_id"
   add_index "boards", ["project_id"], :name => "boards_project_id"
 
+  create_table "categories", :primary_key => "Id", :force => true do |t|
+    t.integer "proj_id",         :default => 0, :null => false
+    t.text    "proj_categories"
+  end
+
   create_table "changes", :force => true do |t|
     t.integer "changeset_id",                               :null => false
     t.string  "action",        :limit => 1, :default => "", :null => false
@@ -157,38 +185,6 @@ ActiveRecord::Schema.define(:version => 20140415090829) do
   add_index "comments", ["author_id"], :name => "index_comments_on_author_id"
   add_index "comments", ["commented_id", "commented_type"], :name => "index_comments_on_commented_id_and_commented_type"
 
-  create_table "contesting_projects", :force => true do |t|
-    t.integer  "project_id"
-    t.string   "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",  :null => false
-    t.datetime "updated_at",  :null => false
-    t.string   "reward"
-  end
-
-  create_table "contesting_softapplications", :force => true do |t|
-    t.integer  "softapplication_id"
-    t.integer  "contest_id"
-    t.integer  "user_id"
-    t.string   "description"
-    t.datetime "created_at",         :null => false
-    t.datetime "updated_at",         :null => false
-    t.string   "reward"
-  end
-
-  create_table "contests", :force => true do |t|
-    t.string   "name"
-    t.integer  "budget"
-    t.integer  "author_id"
-    t.date     "deadline"
-    t.string   "description"
-    t.integer  "commit"
-    t.string   "password"
-    t.datetime "created_on",  :null => false
-    t.datetime "updated_on",  :null => false
-  end
-
   create_table "courses", :force => true do |t|
     t.integer  "tea_id"
     t.string   "name"
@@ -205,7 +201,7 @@ ActiveRecord::Schema.define(:version => 20140415090829) do
     t.string   "setup_time"
     t.string   "endup_time"
     t.string   "class_period"
-    t.string   "school_name"
+    t.integer  "school_id"
   end
 
   create_table "custom_fields", :force => true do |t|
@@ -265,6 +261,14 @@ ActiveRecord::Schema.define(:version => 20140415090829) do
   add_index "documents", ["created_on"], :name => "index_documents_on_created_on"
   add_index "documents", ["project_id"], :name => "documents_project_id"
 
+  create_table "eco_projects", :force => true do |t|
+    t.integer  "proj_id",        :default => 0, :null => false
+    t.integer  "eco_proj_id"
+    t.datetime "date_collected"
+  end
+
+  add_index "eco_projects", ["proj_id"], :name => "proj_id"
+
   create_table "enabled_modules", :force => true do |t|
     t.integer "project_id"
     t.string  "name",       :null => false
@@ -286,6 +290,137 @@ ActiveRecord::Schema.define(:version => 20140415090829) do
   add_index "enumerations", ["id", "type"], :name => "index_enumerations_on_id_and_type"
   add_index "enumerations", ["project_id"], :name => "index_enumerations_on_project_id"
 
+  create_table "events", :primary_key => "event_id", :force => true do |t|
+    t.string   "job_name"
+    t.datetime "event_time"
+    t.string   "event_type", :limit => 20
+  end
+
+  create_table "fm_article", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "article_title",  :limit => 16777215
+    t.text     "article_link",   :limit => 16777215
+    t.text     "article_time",   :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_article", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_bugtracker_link", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "description",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_bugtracker_link", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_datametric_link", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "description",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_datametric_link", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_dependency_link", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "description",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_dependency_link", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_download_link", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "download_link",  :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_download_link", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_heartbeat", :force => true do |t|
+    t.integer  "proj_id",                        :default => 0, :null => false
+    t.float    "popularity_score", :limit => 12
+    t.float    "vitality_score",   :limit => 12
+    t.integer  "subscription"
+    t.integer  "voting_score"
+    t.integer  "voting_count"
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_heartbeat", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_license", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "description",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_license", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_mailinglist_link", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "description",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_mailinglist_link", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_operating_system", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "description",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_operating_system", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_programming_language", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "description",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_programming_language", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_project_spotlight", :force => true do |t|
+    t.integer  "proj_id",                                    :default => 0, :null => false
+    t.text     "description",            :limit => 16777215
+    t.text     "project_name",           :limit => 16777215
+    t.text     "project_spotlight_link", :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_project_spotlight", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_release", :force => true do |t|
+    t.integer  "proj_id",                             :default => 0, :null => false
+    t.text     "description",     :limit => 16777215
+    t.text     "release_version", :limit => 16777215
+    t.text     "release_time",    :limit => 16777215
+    t.text     "release_tag",     :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_release", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_submit", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "submitter",      :limit => 16777215
+    t.text     "submitter_link", :limit => 16777215
+    t.text     "submit_time",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_submit", ["proj_id"], :name => "proj_id"
+
+  create_table "fm_summary", :force => true do |t|
+    t.integer  "proj_id",                            :default => 0, :null => false
+    t.text     "description",    :limit => 16777215
+    t.datetime "date_collected"
+  end
+
+  add_index "fm_summary", ["proj_id"], :name => "proj_id"
+
   create_table "forums", :force => true do |t|
     t.string   "name",                         :null => false
     t.string   "description",  :default => ""
@@ -386,13 +521,6 @@ ActiveRecord::Schema.define(:version => 20140415090829) do
   add_index "issues", ["status_id"], :name => "index_issues_on_status_id"
   add_index "issues", ["tracker_id"], :name => "index_issues_on_tracker_id"
 
-  create_table "join_in_competitions", :force => true do |t|
-    t.integer  "user_id"
-    t.integer  "competition_id"
-    t.datetime "created_at",     :null => false
-    t.datetime "updated_at",     :null => false
-  end
-
   create_table "join_in_contests", :force => true do |t|
     t.integer  "user_id"
     t.integer  "bid_id"
@@ -518,6 +646,22 @@ ActiveRecord::Schema.define(:version => 20140415090829) do
   add_index "news", ["created_on"], :name => "index_news_on_created_on"
   add_index "news", ["project_id"], :name => "news_project_id"
 
+  create_table "no_uses", :force => true do |t|
+    t.integer  "user_id",     :null => false
+    t.string   "no_use_type"
+    t.integer  "no_use_id"
+    t.datetime "created_at",  :null => false
+    t.datetime "updated_at",  :null => false
+  end
+
+  create_table "ohloh_tagged", :force => true do |t|
+    t.integer  "proj_id",                       :default => 0, :null => false
+    t.string   "description",    :limit => 100,                :null => false
+    t.datetime "date_collected"
+  end
+
+  add_index "ohloh_tagged", ["proj_id"], :name => "proj_id"
+
   create_table "open_id_authentication_associations", :force => true do |t|
     t.integer "issued"
     t.integer "lifetime"
@@ -533,6 +677,19 @@ ActiveRecord::Schema.define(:version => 20140415090829) do
     t.string  "salt",       :null => false
   end
 
+  create_table "open_source_projects", :force => true do |t|
+    t.string   "name"
+    t.text     "description"
+    t.integer  "commit_count",     :default => 0
+    t.integer  "code_line",        :default => 0
+    t.integer  "users_count",      :default => 0
+    t.date     "last_commit_time"
+    t.string   "url"
+    t.date     "date_collected"
+    t.datetime "created_at",                      :null => false
+    t.datetime "updated_at",                      :null => false
+  end
+
   create_table "praise_tread_caches", :force => true do |t|
     t.integer  "object_id",   :null => false
     t.string   "object_type"
@@ -612,6 +769,23 @@ ActiveRecord::Schema.define(:version => 20140415090829) do
   add_index "queries", ["project_id"], :name => "index_queries_on_project_id"
   add_index "queries", ["user_id"], :name => "index_queries_on_user_id"
 
+  create_table "relative_memos", :force => true do |t|
+    t.integer  "osp_id",                                :null => false
+    t.integer  "parent_id"
+    t.string   "subject",                               :null => false
+    t.text     "content",                               :null => false
+    t.integer  "author_id"
+    t.integer  "replies_count",      :default => 0
+    t.integer  "last_reply_id"
+    t.boolean  "lock",               :default => false
+    t.boolean  "sticky",             :default => false
+    t.boolean  "is_quote",           :default => false
+    t.datetime "created_at",                            :null => false
+    t.datetime "updated_at",                            :null => false
+    t.integer  "viewed_count_crawl", :default => 0
+    t.integer  "viewed_count_local", :default => 0
+  end
+
   create_table "repositories", :force => true do |t|
     t.integer "project_id",                  :default => 0,     :null => false
     t.string  "url",                         :default => "",    :null => false
@@ -684,21 +858,6 @@ ActiveRecord::Schema.define(:version => 20140415090829) do
     t.string   "description"
   end
 
-  create_table "softapplications", :force => true do |t|
-    t.string   "name"
-    t.string   "description"
-    t.integer  "app_type_id"
-    t.string   "app_type_name"
-    t.string   "android_min_version_available"
-    t.integer  "user_id"
-    t.datetime "created_at",                    :null => false
-    t.datetime "updated_at",                    :null => false
-    t.integer  "contest_id"
-    t.integer  "softapplication_id"
-    t.integer  "is_public"
-    t.string   "application_developers"
-  end
-
   create_table "students_for_courses", :force => true do |t|
     t.integer  "student_id"
     t.integer  "course_id"
@@ -764,6 +923,22 @@ ActiveRecord::Schema.define(:version => 20140415090829) do
   add_index "tokens", ["user_id"], :name => "index_tokens_on_user_id"
   add_index "tokens", ["value"], :name => "tokens_value", :unique => true
 
+  create_table "tprojects", :force => true do |t|
+    t.string   "name",             :limit => 1000,     :default => "0"
+    t.text     "description",      :limit => 16777215
+    t.string   "commit_count",     :limit => 100,      :default => "0"
+    t.string   "code_line",        :limit => 100
+    t.string   "last_commit_time", :limit => 100
+    t.string   "url",              :limit => 1000
+    t.datetime "date_collected"
+    t.string   "created_at",       :limit => 100
+    t.string   "updated_at",       :limit => 100
+    t.integer  "proj_id",                                               :null => false
+    t.string   "user_count",       :limit => 100
+  end
+
+  add_index "tprojects", ["proj_id"], :name => "proj_id"
+
   create_table "trackers", :force => true do |t|
     t.string  "name",          :limit => 30, :default => "",    :null => false
     t.boolean "is_in_chlog",                 :default => false, :null => false
@@ -789,6 +964,7 @@ ActiveRecord::Schema.define(:version => 20140415090829) do
     t.string   "teacher_realname"
     t.string   "student_realname"
     t.string   "location_city"
+    t.integer  "school_id"
   end
 
   create_table "user_grades", :force => true do |t|
@@ -820,6 +996,9 @@ ActiveRecord::Schema.define(:version => 20140415090829) do
     t.integer  "active"
     t.datetime "created_at",    :null => false
     t.datetime "updated_at",    :null => false
+    t.integer  "level"
+    t.integer  "file"
+    t.integer  "issue"
   end
 
   create_table "user_statuses", :force => true do |t|