From a99d7c514537762d25c6a04de1db310f5fed39e8 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Thu, 15 Jan 2015 14:40:17 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=88=86=E7=A6=BB=E5=87=BA=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E9=97=AE=E5=8D=B7=E9=97=AE=E9=A2=98=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=202=E3=80=81=E5=A2=9E=E5=8A=A0=E4=BF=AE=E6=94=B9=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E7=9B=B8=E5=85=B3=E8=B7=AF=E7=94=B1=E5=8F=8Aaction?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/poll_controller.rb  |  7 ++++-
 app/views/poll/_edit_MC.html.erb    | 38 +++++++++---------------
 app/views/poll/_new_MC.html.erb     | 45 +++++++++++++++++++++++++++++
 app/views/poll/_new_MCQ.html.erb    | 33 +++++++++++++++++++++
 app/views/poll/_new_mulit.html.erb  | 18 ++++++++++++
 app/views/poll/_new_single.html.erb | 13 +++++++++
 app/views/poll/_poll_form.html.erb  | 19 +++++++-----
 config/routes.rb                    |  1 +
 8 files changed, 140 insertions(+), 34 deletions(-)
 create mode 100644 app/views/poll/_new_MC.html.erb
 create mode 100644 app/views/poll/_new_MCQ.html.erb
 create mode 100644 app/views/poll/_new_mulit.html.erb
 create mode 100644 app/views/poll/_new_single.html.erb

diff --git a/app/controllers/poll_controller.rb b/app/controllers/poll_controller.rb
index 196b3c7ba..a63f9e8f6 100644
--- a/app/controllers/poll_controller.rb
+++ b/app/controllers/poll_controller.rb
@@ -89,7 +89,7 @@ class PollController < ApplicationController
   def create_poll_question
     question_title = params[:poll_questions_title].nil? || params[:poll_questions_title].empty? ? l(:label_enter_single_title) : params[:poll_questions_title]
     option = {
-        :is_necessary => params[:is_necessary] || true,
+        :is_necessary => params[:is_necessary] || 1,
         :question_title => question_title,
         :question_type => params[:question_type] || 1,
         :question_number => @poll.poll_questions.count + 1
@@ -112,6 +112,11 @@ class PollController < ApplicationController
     end
   end
 
+  #修改单选题
+  def update_poll_question
+   a = 1
+  end
+
   private
   def find_poll_and_course
     @poll = Poll.find params[:id]
diff --git a/app/views/poll/_edit_MC.html.erb b/app/views/poll/_edit_MC.html.erb
index 0f031f61c..cc52e7c6b 100644
--- a/app/views/poll/_edit_MC.html.erb
+++ b/app/views/poll/_edit_MC.html.erb
@@ -1,37 +1,25 @@
-<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>
+<%= form_for poll_question,:url =>update_poll_question_poll_path(@poll.id),:remote => true do |f|%>
     <div>
       <!--编辑单选start-->
       <div class="ur_editor radio">
         <div class="ur_editor_title">
           <label>问题：&nbsp;&nbsp;</label>
-          <input type="hidden" name="question_type" value="1"/>
-          <input class="ur_question_title" type="text" name="poll_questions_title" placeholder="请输入单选题标题"/>
-          <input type="checkbox" name="is_necessary" value="true" checked/>
+          <input type="hidden" name="question_type" value="<%= poll_question.question_type%>"/>
+          <input class="ur_question_title" type="text" name="poll_questions_title" placeholder="请输入单选题标题" value="<%= poll_question.question_title%>"/>
+          <input type="checkbox" name="is_necessary" value="true" checked = "<%= poll_question.is_necessary == 1%>"/>
           <label>必答</label>
         </div>
         <div class="ur_editor_content">
           <ul>
-            <li class='ur_item'>
-              <label>选项<span class='ur_index'></span>：</label>
-              <input type='text' name='question_answer[0]' placeholder='新建选项'/>
-              <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
-              <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
-            </li>
-            <div class='cl'></div>
-            <li class='ur_item'>
-              <label>选项<span class='ur_index'></span>：</label>
-              <input type='text' name='question_answer[1]' placeholder='新建选项'/>
-              <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
-              <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
-            </li>
-            <div class='cl'></div>
-            <li class='ur_item'>
-              <label>选项<span class='ur_index'></span>：</label>
-              <input type='text' name='question_answer[2]' placeholder='新建选项'/>
-              <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
-              <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
-            </li>
-            <div class='cl'></div>
+            <% poll_question.poll_answers.reorder("answer_position") do |poll_answer| %>
+                <li class='ur_item'>
+                  <label>选项<span class='ur_index'></span>：</label>
+                  <input type='text' name='question_answer[<%= poll_answer.id %>]' placeholder='新建选项' value="<%= poll_answer.answer_text%>"/>
+                  <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
+                  <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
+                </li>
+                <div class='cl'></div>
+            <% end%>
           </ul>
         </div>
         <div class="ur_editor_footer">
diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb
new file mode 100644
index 000000000..0f031f61c
--- /dev/null
+++ b/app/views/poll/_new_MC.html.erb
@@ -0,0 +1,45 @@
+<%= form_for PollQuestion.new,:url =>create_poll_question_poll_path(@poll.id),:remote => true do |f|%>
+    <div>
+      <!--编辑单选start-->
+      <div class="ur_editor radio">
+        <div class="ur_editor_title">
+          <label>问题：&nbsp;&nbsp;</label>
+          <input type="hidden" name="question_type" value="1"/>
+          <input class="ur_question_title" type="text" name="poll_questions_title" placeholder="请输入单选题标题"/>
+          <input type="checkbox" name="is_necessary" value="true" checked/>
+          <label>必答</label>
+        </div>
+        <div class="ur_editor_content">
+          <ul>
+            <li class='ur_item'>
+              <label>选项<span class='ur_index'></span>：</label>
+              <input type='text' name='question_answer[0]' placeholder='新建选项'/>
+              <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
+              <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
+            </li>
+            <div class='cl'></div>
+            <li class='ur_item'>
+              <label>选项<span class='ur_index'></span>：</label>
+              <input type='text' name='question_answer[1]' placeholder='新建选项'/>
+              <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
+              <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
+            </li>
+            <div class='cl'></div>
+            <li class='ur_item'>
+              <label>选项<span class='ur_index'></span>：</label>
+              <input type='text' name='question_answer[2]' placeholder='新建选项'/>
+              <a class='icon_add' title='向下插入选项' onclick='add_single_answer($(this));'></a>
+              <a class='icon_remove'  title='删除' onclick='remove_single_answer($(this))'></a>
+            </li>
+            <div class='cl'></div>
+          </ul>
+        </div>
+        <div class="ur_editor_footer">
+          <a class="btn btn_dark btn_submit" data-button="ok" onclick="$(this).parent().parent().parent().parent().submit();">确定</a>
+          <a class="btn btn_light btn_cancel" data-button="cancel" onclick="$(this).parent().parent().parent().parent().remove();">取消</a>
+        </div>
+        <div class="cl"></div>
+      </div>
+      <!--编辑单选 end-->
+    </div>
+<% end%>
\ No newline at end of file
diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb
new file mode 100644
index 000000000..cf64e7f3e
--- /dev/null
+++ b/app/views/poll/_new_MCQ.html.erb
@@ -0,0 +1,33 @@
+<div><!--编辑多选start-->
+  <div class="ur_editor checkbox">
+    <div class="ur_editor_title">
+      <label >问题：&nbsp;&nbsp;</label>
+      <input class="ur_question_title" type="text" name="title" placeholder="请输入多选题题标题"/>
+      <input type="checkbox" name="required" value="true" checked=""/>
+      <label >必答</label>
+    </div>
+    <div class="ur_editor_content">
+      <ul>
+        <li class="ur_item">
+          <label>选项 <span class="ur_index">01</span>： </label>
+          <input type="text" name="option" placeholder="新建选项"/>
+          <a class="icon_add" title="向下插入选项"></a>
+          <a class="icon_remove"  title="删除"></a>
+        </li>
+        <div class="cl"></div>
+        <li class="ur_item">
+          <label >选项 <span class="ur_index">01</span>： </label>
+          <input type="text" name="option" placeholder="新建选项"/>
+          <a class="icon_add" title="向下插入选项"></a>
+          <a class="icon_remove"  title="删除"></a>
+        </li>
+        <div class="cl"></div>
+      </ul>
+    </div>
+    <div class="ur_editor_footer">
+      <a class="btn btn_dark btn_submit" data-button="ok">确定</a>
+      <a class="btn btn_light btn_cancel" data-button="cancel">取消</a>
+    </div>
+    <div class="cl"></div>
+  </div>
+</div><!--编辑多选 end-->
\ No newline at end of file
diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb
new file mode 100644
index 000000000..c4a9e0e0f
--- /dev/null
+++ b/app/views/poll/_new_mulit.html.erb
@@ -0,0 +1,18 @@
+<div class="ur_editor textarea"> <!--编辑多行文字start-->
+  <div class="ur_editor_title">
+    <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
+    <input id="ur_question_title" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入多行文字标题"/>
+    <input type="checkbox" name="required" value="true" id="ur_question_require" checked=""/>
+    <label for="ur_question_require">必答</label>
+  </div>
+  <div class="ur_editor_toolbar">
+    <label>尺寸：</label>
+    <label>宽 <input name="cols" type="number" min="1" value="60"> 字</label>,
+    <label>高 <input name="rows" type="number" min="1" value="5"> 行</label>
+  </div>
+  <div class="ur_editor_footer">
+    <a class="btn_submit" data-button="ok">确定</a>
+    <a class="btn_cancel" data-button="cancel">取消</a>
+  </div>
+  <div class="cl"></div>
+</div><!--编辑多行文字end-->
\ No newline at end of file
diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb
new file mode 100644
index 000000000..4e98babe4
--- /dev/null
+++ b/app/views/poll/_new_single.html.erb
@@ -0,0 +1,13 @@
+<div class="ur_editor text "> <!--编辑单行文字start-->
+  <div class="ur_editor_title">
+    <label for="ur_question_title">问题：&nbsp;&nbsp;</label>
+    <input id="ur_question_title_1" class="ur_question_title" contenteditable="true" type="text" name="title" placeholder="请输入单行文字标题"/>
+    <input type="checkbox" name="required" value="true" id="ur_question_require_2" checked=""/>
+    <label for="ur_question_require">必答</label>
+  </div>
+  <div class="ur_editor_footer">
+    <a class="btn_submit" data-button="ok">确定</a>
+    <a class="btn_cancel" data-button="cancel">取消</a>
+  </div>
+  <div class="cl"></div>
+</div><!--编辑单行文字end-->
\ No newline at end of file
diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb
index cc951d07f..d15f5ed0a 100644
--- a/app/views/poll/_poll_form.html.erb
+++ b/app/views/poll/_poll_form.html.erb
@@ -6,10 +6,10 @@
   <%= stylesheet_link_tag  'polls', :media => 'all' %>
 
   <script type="text/javascript">
-      function add_MC(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_MC') %>");}
-      function add_MCQ(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_MCQ') %>");}
-      function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_single') %>");}
-      function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'edit_mulit') %>");}
+      function add_MC(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_MC') %>");}
+      function add_MCQ(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_MCQ') %>");}
+      function add_single(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_single') %>");}
+      function add_mulit(){$("#poll_content").append("<%= escape_javascript(render :partial => 'new_mulit') %>");}
       //问卷头
       function pollsCancel(){$("#polls_head_edit").hide();$("#polls_head_show").show();}
       function pollsEdit(){$("#polls_head_edit").show();$("#polls_head_show").hide();}
@@ -71,11 +71,14 @@
     <%= render :partial => 'edit_head', :locals => {:poll => @poll}%>
   </div>
 
-  <div>
-    <% @poll.poll_questions.each do |poll_question|%>
+  <% @poll.poll_questions.each do |poll_question|%>
+      <div id="show_polls_questions_<%= poll_question.id %>">
         <%= render :partial => 'show_MC', :locals => {:poll_question => poll_question} %>
-    <% end%>
-  </div>
+      </div>
+      <div id="edit_polls_questions_<%= poll_question.id %>" style="display: none;">
+        <%= render :partial => 'edit_MC', :locals => {:poll_question => poll_question} %>
+      </div>
+  <% end%>
   <div id="poll_content">
     <%#= render :partial => 'edit_MC'%>
   </div>
diff --git a/config/routes.rb b/config/routes.rb
index d2d0c73a8..5a533894c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -62,6 +62,7 @@ RedmineApp::Application.routes.draw do
     member do
       get 'statistics_result'
       post 'create_poll_question'
+      post 'update_poll_question'
     end
   end