Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll

app/controllers/poll_controller.rb

@@ -19,8 +19,8 @@ class PollController < ApplicationController
 
   def show
     @poll = Poll.find params[:id]
-    @poll_questions = @poll.poll_questions
+    poll_questions = @poll.poll_questions
-
+    @poll_questions = paginateHelper poll_questions,3 #分页
     respond_to do |format|
       format.html {render :layout => 'base_courses'}
     end

app/models/poll.rb

@@ -3,7 +3,7 @@ class Poll < ActiveRecord::Base
   include Redmine::SafeAttributes
   
   belongs_to :user
-  has_many :poll_questions, :dependent => :destroy
+  has_many :poll_questions, :dependent => :destroy,:order => "#{PollQuestion.table_name}.question_number"
   has_many :poll_users, :dependent => :destroy
   has_many :users, :through => :poll_users #该文件被哪些用户提交答案过
 end

app/models/poll_question.rb

@@ -3,6 +3,6 @@ class PollQuestion < ActiveRecord::Base
   include Redmine::SafeAttributes
 
   belongs_to :poll
-  has_many :poll_answers, :dependent => :destroy
+  has_many :poll_answers, :order => "#{PollAnswer.table_name}.answer_position",:dependent => :destroy
   has_many :poll_votes, :dependent => :destroy
 end

app/views/poll/show.html.erb

@@ -20,86 +20,105 @@
 
   <div class="ur_card">
     <ol class="ur_questions">
-
+      <% @poll_questions.each do |pq| %>
+         <% if pq.question_type == 1 %>
+          <!-- 单选题 -->
               <li class="ur_question_item radio">
                 <div class="ur_title">
-          <span class="title_index">第1题：</span> 单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题单选题  <span class="ur_required" title="必答">*</span>
+                  <span class="title_index">第<%= pq.question_number %>题：</span>
+                  <%= pq.question_title %>
+                  <% if pq.is_necessary == 1 %>
+                    <span class="ur_required" title="必答">*</span>
+                  <% end %>
                 </div>
+                <div class="cl"></div>
                 <div class="ur_inputs">
                   <table class="ur_table" >
                     <tbody>
+                      <% pq.poll_answers.each do |pa| %>
                         <tr>
                           <td>
-                <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
+                            <label >
-              </td>
+                              <input class="ur_radio" type="radio" value="新建选项" >
-            </tr>
+                                <%= pa.answer_text %>
-            <tr >
+                            </label>
-              <td>
-                <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <label ><input class="ur_radio" type="radio" value="新建选项" > 新建选项</label>
                           </td>
                         </tr>
+                      <% end %>
                     </tbody>
                   </table>
                 </div>
-      </li><!--单选题 end-->
+              </li>
-
+         <% elsif pq.question_type == 2 %>
+          <!-- 多选题 -->
               <li class="ur_question_item checkbox">
                 <div class="ur_title">
-          <span class="title_index">第2题：</span> 多选题  <span class="ur_required" title="必答">*</span>
+                  <span class="title_index">第<%= pq.question_number %>题：</span>
+                  <%= pq.question_title %>
+                  <% if pq.is_necessary == 1 %>
+                      <span class="ur_required" title="必答">*</span>
+                  <% end %>
                 </div>
+                <div class="cl"></div>
                 <div class="ur_inputs">
                   <table class="ur_table" >
                     <tbody>
+                    <% pq.poll_answers.each do |pa| %>
                         <tr>
                           <td>
-                <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
+                            <label >
-              </td>
+                              <input class="ur_checkbox" type="checkbox" value="新建选项" >
-            </tr>
+                              <%= pa.answer_text %>
-            <tr class="ur_tr_even">
+                            </label>
-              <td>
-                <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
-              </td>
-            </tr>
-            <tr>
-              <td>
-                <label ><input class="ur_checkbox" type="checkbox"  value="新建选项" > 新建选项 </label>
                           </td>
                         </tr>
+                    <% end %>
                     </tbody>
                   </table>
                 </div>
-      </li><!--多选题 end-->
+              </li>
-
+          <% elsif pq.question_type == 3 %>
-
+          <!-- 单行文字-->
               <li  class="ur_question_item text">
                 <div class="ur_title">
-          <span class="title_index">第3题：</span> 单行主观
+                  <span class="title_index">第<%= pq.question_number %>题：</span>
+                  <%= pq.question_title %>
+                  <% if pq.is_necessary == 1 %>
+                      <span class="ur_required" title="必答">*</span>
+                  <% end %>
                 </div>
+                <div class="cl"></div>
                 <div class="ur_inputs">
                   <input class="ur_text ur_textbox" type="text" size="" maxlength=""value="">
                 </div>
               </li><!--当行输入 end-->
-
+          <% elsif pq.question_type == 4 %>
+          <!-- 多行文字-->
               <li class="ur_question_item textarea">
                 <div class="ur_preview">
                   <div class="ur_title">
-            <span class="title_index">第4题：</span> 多行主观
+                    <span class="title_index">第<%= pq.question_number %>题：</span>
+                    <%= pq.question_title %>
+                    <% if pq.is_necessary == 1 %>
+                        <span class="ur_required" title="必答">*</span>
+                    <% end %>
                   </div>
+                  <div class="cl"></div>
                   <div class="ur_inputs">
                     <textarea  class="ur_textbox"  rows="5" cols="60"></textarea>
                   </div>
                 </div>
               </li><!--多行输入 end-->
-
+          <% else %>
+          <!-- 未知题型 -->
+         <% end %>
+      <% end %>
     </ol>
-
+    <ul class="wlist">
-    <div class="ur_buttons">
+      <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-      <a href="#" class=" ur_button"  >下一页</a>
+    </ul>
+    <div class="cl"></div>
+    <div class="ur_buttons" style="width: 100px;">
       <a href="#" class="ur_button" >提交</a>
     </div>
     <div class="cl"></div>

db/migrate/20150114022710_add_question_number_to_poll_questions.rb

@@ -0,0 +1,9 @@
+class AddQuestionNumberToPollQuestions < ActiveRecord::Migration
+  def self.up
+    add_column :poll_questions, :question_number, :integer
+  end
+
+  def self.down
+    remove_column :poll_questions, :question_number
+  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 => 20150112024820) do
+ActiveRecord::Schema.define(:version => 20150114022710) do
 
   create_table "activities", :force => true do |t|
     t.integer "act_id",   :null => false
@@ -23,6 +23,18 @@ ActiveRecord::Schema.define(:version => 20150112024820) 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 "api_keys", :force => true do |t|
+    t.string   "access_token"
+    t.datetime "expires_at"
+    t.integer  "user_id"
+    t.boolean  "active",       :default => true
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
+  end
+
+  add_index "api_keys", ["access_token"], :name => "index_api_keys_on_access_token"
+  add_index "api_keys", ["user_id"], :name => "index_api_keys_on_user_id"
+
   create_table "applied_projects", :force => true do |t|
     t.integer "project_id", :null => false
     t.integer "user_id",    :null => false
@@ -805,6 +817,7 @@ ActiveRecord::Schema.define(:version => 20150112024820) do
     t.integer  "poll_id"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
+    t.integer  "question_number"
   end
 
   create_table "poll_users", :force => true do |t|