问卷单选题

app/controllers/poll_controller.rb

@@ -199,6 +199,21 @@ class PollController < ApplicationController
           @poll_question.poll_answers.new question_option
         end
       end
+      if params[:question_other_answer]
+        question = @poll_question.poll_answers.where("answer_text = ''").first
+        unless question
+          question_option = {
+              :answer_position => params[:question_answer].count + 1,
+              :answer_text => ''
+          }
+          @poll_question.poll_answers.new question_option
+        end
+      else
+        question = @poll_question.poll_answers.where("answer_text = ''").first
+        if question
+          question.destroy
+        end
+      end
     end
     @poll_question.save
     respond_to do |format|

app/views/poll/_edit_MC.html.erb

@@ -17,26 +17,44 @@
       }
     </script>
 
-    <div class="ur_editor radio">
+    <div class="questionEditContainer">
       <div class="ur_editor_title">
         <label>问题：&nbsp;&nbsp;</label>
         <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
-        <input  maxlength="250" class="ur_question_title" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入单选题标题" value="<%= poll_question.question_title%>"/>
+        <input  maxlength="250" class="questionTitle w570" type="text" name="poll_questions_title" id="poll_questions_title_<%=poll_question.id%>" placeholder="请输入单选题题目" value="<%= poll_question.question_title%>"/>
         <input type="checkbox" name="is_necessary" id="is_necessary_<%=poll_question.id%>" value="true" <%= poll_question.is_necessary == 1 ? "checked" : ""%>/>
         <label>必答</label>
       </div>
       <div class="ur_editor_content">
         <ul id="poll_answers_<%=poll_question.id%>">
           <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
-              <li class='ur_item'>
+              <% if poll_answer.answer_text != '' %>
+                  <li class='ur_item new_answer'>
                     <label>选项<span class='ur_index'></span>：&nbsp;&nbsp;&nbsp;</label>
-                <input type='text'  maxlength="200" name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value="<%= poll_answer.answer_text%>"/>
-                <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
+                    <input type='text'  maxlength="200" name='question_answer[<%= poll_answer.id %>]' placeholder='输入选项内容' value="<%= poll_answer.answer_text%>"/>
                     <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
                   </li>
                   <div class='cl'></div>
+              <% else %>
+                  <li class="ur_item new_answer other_answer">
+                    <label>其它<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+                    <input placeholder="由参加问卷的人输入内容" name='question_other_answer' readonly="readonly" class="disabled" type="text">
+                    <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
+                  </li>
+                  <div class="cl"></div>
+              <% end %>
           <% end%>
         </ul>
+        <ul>
+          <li class="ur_item">
+            <div class="dash-block new-question" onclick='add_single_answer($(this));'>新建选项</div>
+          </li>
+          <div class='cl'></div>
+          <li class="ur_item">
+            <a href="javascript:void(0);" class="ml50 fontGrey2" onclick='add_other_answer($(this))'>添加[其他]选项</a>
+          </li>
+          <div class="cl"></div>
+        </ul>
       </div>
       <div class="ur_editor_footer">
         <a class="btn btn_dark btn_submit c_white" data-button="ok" onclick="edit_poll_question($(this),<%= poll_question.id %>);">

app/views/poll/_poll_content.html.erb

@@ -1,26 +1,56 @@
-<% poll.poll_questions.each do |poll_question|%>
+<% mc_question_list = poll.poll_questions.where("question_type=1") %>
+<% mcq_question_list = poll.poll_questions.where("question_type=2") %>
+<% single_question_list = poll.poll_questions.where("question_type=3") %>
+<% multi_question_list = poll.poll_questions.where("question_type=4") %>
+<div class="testStatus" id="mc_question_list" style="display: <%=mc_question_list.count > 0 ? "" : "none" %>">
+  <h3 class="fontGrey3">单选题</h3>
+  <% mc_question_list.each do |poll_question| %>
       <div id="poll_questions_<%= poll_question.id%>">
         <div id="show_poll_questions_<%= poll_question.id %>">
-        <% if poll_question.question_type == 1%>
           <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %>
-        <% elsif poll_question.question_type == 2%>
-            <%= render :partial => 'show_MCQ', :locals => {:poll_question => poll_question} %>
-        <% elsif poll_question.question_type == 3%>
-            <%= render :partial => 'show_single', :locals => {:poll_question => poll_question} %>
-        <% elsif poll_question.question_type == 4%>
-            <%= render :partial => 'show_mulit', :locals => {:poll_question => poll_question} %>
-        <% end%>
         </div>
         <div id="edit_poll_questions_<%= poll_question.id %>" style="display: none;">
-        <% if poll_question.question_type == 1%>
           <%= render :partial => 'edit_MC', :locals => {:poll_question => poll_question} %>
-        <% elsif poll_question.question_type == 2%>
+        </div>
+      </div>
+  <% end %>
+</div>
+<div class="testStatus" id="mcq_question_list" style="display: <%=mcq_question_list.count > 0 ? "" : "none" %>">
+  <h3 class="fontGrey3">多选题</h3>
+  <% mcq_question_list.each do |poll_question| %>
+      <div id="poll_questions_<%= poll_question.id%>">
+        <div id="show_poll_questions_<%= poll_question.id %>">
+          <%= render :partial => 'show_MCQ', :locals => {:poll_question => poll_question} %>
+        </div>
+        <div id="edit_poll_questions_<%= poll_question.id %>" style="display: none;">
           <%= render :partial => 'edit_MCQ', :locals => {:poll_question => poll_question} %>
-        <% elsif poll_question.question_type == 3%>
+        </div>
+      </div>
+  <% end %>
+</div>
+<div class="testStatus" id="single_question_list" style="display: <%=single_question_list.count > 0 ? "" : "none" %>">
+  <h3 class="fontGrey3">单行主观题</h3>
+  <% single_question_list.each do |poll_question| %>
+      <div id="poll_questions_<%= poll_question.id%>">
+        <div id="show_poll_questions_<%= poll_question.id %>">
+          <%= render :partial => 'show_single', :locals => {:poll_question => poll_question} %>
+        </div>
+        <div id="edit_poll_questions_<%= poll_question.id %>" style="display: none;">
           <%= render :partial => 'edit_single', :locals => {:poll_question => poll_question} %>
-        <% elsif poll_question.question_type == 4%>
+        </div>
+      </div>
+  <% end %>
+</div>
+<div class="testStatus" id="single_question_list" style="display: <%=multi_question_list.count > 0 ? "" : "none" %>">
+  <h3 class="fontGrey3">多行主观题</h3>
+  <% multi_question_list.each do |poll_question| %>
+      <div id="poll_questions_<%= poll_question.id%>">
+        <div id="show_poll_questions_<%= poll_question.id %>">
+          <%= render :partial => 'show_mulit', :locals => {:poll_question => poll_question} %>
+        </div>
+        <div id="edit_poll_questions_<%= poll_question.id %>" style="display: none;">
           <%= render :partial => 'edit_mulit', :locals => {:poll_question => poll_question} %>
-        <% end%>
         </div>
       </div>
-<% end %>
+  <% end %>
+</div>

app/views/poll/_show_MC.html.erb

@@ -1,15 +1,12 @@
 <script>
 
 </script>
-<div class="ur_question_item radio ur_editor02">
-  <div class="ur_title">
-    <span class="title_index">
+<div>
+  <div class="testEditTitle">
     第<%= poll_question.question_number%>题：
-    </span>
     <%= poll_question.question_title %>
-    <span class="title_index">[单选题]</span>
     <%if poll_question.is_necessary == 1%>
-        <span class="ur_required" title="必答">*</span>
+        <span class="c_red ml5" title="必答">*</span>
     <%end%>
   </div>
 
@@ -19,15 +16,22 @@
   <a class='ur_icon_add' title='向下插入' id="add_mc_<%=poll_question.id%>" onclick="chooseQuestionType('mc',<%=poll_question.id%>);"></a>
   <div class="cl"></div>
   <div class="ur_inputs">
-    <table class="ur_table" >
+    <table class="ur_table" style="width:675px;">
       <tbody>
       <% poll_question.poll_answers.reorder("answer_position").each do |poll_answer| %>
           <tr>
             <td>
+              <% if poll_answer.answer_text != '' %>
                   <label>
                     <input class="ur_radio" type="radio" name="<%= poll_question %>" value="<%= poll_answer.answer_text%>" >
                     <%= poll_answer.answer_text%>
                   </label>
+              <% else %>
+                  <label>
+                    <input class="ur_radio" name="<%= poll_question %>" value="" type="checkbox">
+                  </label>
+                  <input placeholder="其它" readonly="readonly" class="disabled questionnaire-input w300" type="text">
+              <% end %>
             </td>
           </tr>
       <% end %>

public/stylesheets/css/common.css

@@ -263,6 +263,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
 .w520{ width:520px;}
 .w543{ width:543px;}
 .w557{ width:557px;}
+.w570 {width:570px !important;}
 .w576{ width:576px;}
 .w607 {width:607px;}
 .w664{ width:664px;}