1.实现文件调查的model、control、view的架构

2.修正完善新增表之间的关系
3.修正代码中单复数不正确的问题

app/controllers/poll_answer_controller.rb

@@ -0,0 +1,2 @@
+class PollAnswerController < ApplicationController
+end

app/controllers/poll_controller.rb

@@ -0,0 +1,2 @@
+class PollController < ApplicationController
+end

app/controllers/poll_question_controller.rb

@@ -0,0 +1,2 @@
+class PollQuestionController < ApplicationController
+end

app/controllers/poll_user_controller.rb

@@ -0,0 +1,2 @@
+class PollUserController < ApplicationController
+end

app/controllers/poll_vote_controller.rb

@@ -0,0 +1,2 @@
+class PollVoteController < ApplicationController
+end

app/models/poll.rb

@@ -0,0 +1,9 @@
+class Poll < ActiveRecord::Base
+  #attr_accessible :closed_at, :polls_group_id, :polls_name, :polls_status, :polls_type, :published_at, :user_id
+  include Redmine::SafeAttributes
+  
+  belongs_to :user
+  has_many :poll_questions, :dependent => :destroy
+  has_many :poll_users, :dependent => :destroy
+  has_many :users, :through => :poll_users #该文件被哪些用户提交答案过
+end

app/models/poll_answer.rb

@@ -0,0 +1,7 @@
+class PollAnswer < ActiveRecord::Base
+  # attr_accessible :answer_position, :answer_text, :poll_questions_id
+  include Redmine::SafeAttributes
+
+  belongs_to :poll_question
+  has_many :poll_votes, :dependent => :destroy
+end

app/models/poll_answers.rb

@@ -1,5 +0,0 @@
-class PollAnswers < ActiveRecord::Base
-  attr_accessible :answer_position, :answer_text, :poll_questions_id
-
-  belongs_to :poll_questions
-end

app/models/poll_question.rb

@@ -0,0 +1,8 @@
+class PollQuestion < ActiveRecord::Base
+  # attr_accessible :is_necessary, :polls_id, :question_title, :question_type
+  include Redmine::SafeAttributes
+
+  belongs_to :poll
+  has_many :poll_answers, :dependent => :destroy
+  has_many :poll_votes, :dependent => :destroy
+end

app/models/poll_questions.rb

@@ -1,5 +0,0 @@
-class PollQuestions < ActiveRecord::Base
-  attr_accessible :is_necessary, :polls_id, :question_title, :question_type
-
-  belongs_to :polls
-end

app/models/poll_user.rb

@@ -1,6 +1,7 @@
 class PollUser < ActiveRecord::Base
-  attr_accessible :poll_id, :user_id
+  # attr_accessible :poll_id, :user_id
+  include Redmine::SafeAttributes
 
-  belongs_to :polls
+  belongs_to :poll
   belongs_to :user
 end

app/models/poll_vote.rb

@@ -0,0 +1,8 @@
+class PollVote < ActiveRecord::Base
+  # attr_accessible :poll_answers_id, :poll_questions_id, :user_id, :vote_text
+  include Redmine::SafeAttributes
+
+  belongs_to :poll_answer
+  belongs_to :poll_question
+  belongs_to :user
+end

app/models/poll_votes.rb

@@ -1,7 +0,0 @@
-class PollVotes < ActiveRecord::Base
-  attr_accessible :poll_answers_id, :poll_questions_id, :user_id, :vote_text
-
-  belongs_to :poll_answers
-  belongs_to :poll_questions
-  belongs_to :user
-end

app/models/polls.rb

@@ -1,5 +0,0 @@
-class Polls < ActiveRecord::Base
-  attr_accessible :closed_at, :polls_group_id, :polls_name, :polls_status, :polls_type, :published_at, :user_id
-
-  belongs_to :user
-end

app/models/user.rb

@@ -77,6 +77,13 @@ class User < Principal
   has_many :homework_attaches, :through => :homework_users
   has_many :homework_evaluations
 
+  #问卷相关关关系
+  has_many :poll_users, :dependent => :destroy
+  has_many :poll_votes, :dependent => :destroy
+  has_many :poll, :dependent => :destroy #用户创建的问卷
+  has_many :answers, :source => :poll, :through => :poll_users, :dependent => :destroy #用户已经完成问答的问卷
+  # end
+
   has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)},
                                    :after_remove => Proc.new {|user, group| group.user_removed(user)}
   has_many :changesets, :dependent => :nullify

db/migrate/20150108034148_create_polls.rb

@@ -1,5 +1,5 @@
 class CreatePolls < ActiveRecord::Migration
-  def change
+  def up
     create_table :polls do |t|
       t.string :polls_name
       t.string :polls_type
@@ -12,4 +12,8 @@ class CreatePolls < ActiveRecord::Migration
       t.timestamps
     end
   end
+
+  def down
+    drop_table :polls
+  end
 end

db/migrate/20150108034253_create_poll_questions.rb

@@ -1,12 +1,16 @@
 class CreatePollQuestions < ActiveRecord::Migration
-  def change
+  def up
     create_table :poll_questions do |t|
       t.string :question_title
       t.integer :question_type
       t.integer :is_necessary
-      t.integer :polls_id
+      t.integer :poll_id
 
       t.timestamps
     end
   end
+
+  def down
+  	drop_table :poll_questions
+  end
 end

db/migrate/20150108034414_create_poll_answers.rb

@@ -1,11 +1,15 @@
 class CreatePollAnswers < ActiveRecord::Migration
-  def change
+  def up
     create_table :poll_answers do |t|
-      t.integer :poll_questions_id
+      t.integer :poll_question_id
       t.text :answer_text
       t.integer :answer_position
 
       t.timestamps
     end
   end
+
+  def down
+  	drop_table :poll_answers
+  end
 end

db/migrate/20150108035301_create_poll_votes.rb

@@ -1,12 +1,16 @@
 class CreatePollVotes < ActiveRecord::Migration
-  def change
+  def up
     create_table :poll_votes do |t|
       t.integer :user_id
-      t.integer :poll_questions_id
-      t.integer :poll_answers_id
+      t.integer :poll_question_id
+      t.integer :poll_answer_id
       t.text :vote_text
 
       t.timestamps
     end
   end
+
+  def down
+  	drop_table :poll_votes
+  end
 end

db/migrate/20150108035338_create_poll_users.rb

@@ -1,5 +1,5 @@
 class CreatePollUsers < ActiveRecord::Migration
-  def change
+  def up
     create_table :poll_users do |t|
       t.integer :user_id
       t.integer :poll_id
@@ -7,4 +7,8 @@ class CreatePollUsers < ActiveRecord::Migration
       t.timestamps
     end
   end
+
+  def down
+  	drop_table :poll_users
+  end
 end

db/schema.rb

@@ -791,7 +791,7 @@ ActiveRecord::Schema.define(:version => 20150108035338) do
   end
 
   create_table "poll_answers", :force => true do |t|
-    t.integer  "poll_questions_id"
+    t.integer  "poll_question_id"
     t.text     "answer_text"
     t.integer  "answer_position"
     t.datetime "created_at",       :null => false
@@ -802,7 +802,7 @@ ActiveRecord::Schema.define(:version => 20150108035338) do
     t.string   "question_title"
     t.integer  "question_type"
     t.integer  "is_necessary"
-    t.integer  "polls_id"
+    t.integer  "poll_id"
     t.datetime "created_at",     :null => false
     t.datetime "updated_at",     :null => false
   end
@@ -816,8 +816,8 @@ ActiveRecord::Schema.define(:version => 20150108035338) do
 
   create_table "poll_votes", :force => true do |t|
     t.integer  "user_id"
-    t.integer  "poll_questions_id"
-    t.integer  "poll_answers_id"
+    t.integer  "poll_question_id"
+    t.integer  "poll_answer_id"
     t.text     "vote_text"
     t.datetime "created_at",       :null => false
     t.datetime "updated_at",       :null => false