From a67f4ca0f7d172ba92beac7dcc40ca9151b9c8b9 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Thu, 14 Sep 2017 19:41:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=8D=95=E9=80=89=E5=A4=9A?=
 =?UTF-8?q?=E9=80=89=E9=A2=98TPM=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/challenges_controller.rb        |  6 ++++--
 app/views/challenges/_choose_tab.html.erb       | 10 ++++++++++
 app/views/challenges/_choose_type.html.erb      | 17 +++++------------
 .../_single_or_multiple_question.html.erb       | 17 +++--------------
 .../_single_or_multiple_question_show.html.erb  |  2 +-
 app/views/challenges/choose_type_show.js.erb    |  3 ++-
 app/views/challenges/edit.html.erb              |  2 +-
 .../challenges/edit_choose_question.js.erb      |  3 ++-
 app/views/challenges/new_choose_question.js.erb |  3 ++-
 .../challenges/update_choose_question.js.erb    |  3 ++-
 10 files changed, 32 insertions(+), 34 deletions(-)
 create mode 100644 app/views/challenges/_choose_tab.html.erb

diff --git a/app/controllers/challenges_controller.rb b/app/controllers/challenges_controller.rb
index c18c23480..95cfeec76 100644
--- a/app/controllers/challenges_controller.rb
+++ b/app/controllers/challenges_controller.rb
@@ -131,7 +131,7 @@ class ChallengesController < ApplicationController
               end
             end
         end
-
+        @index = params[:position].to_i
         respond_to do |format|
           format.js
         end
@@ -164,6 +164,7 @@ class ChallengesController < ApplicationController
           end
         end
         @challenge_choose = ChallengeChoose.where(:id => params[:choose_id]).first
+        @index = params[:index].to_i
         respond_to do |format|
           format.js
         end
@@ -179,6 +180,7 @@ class ChallengesController < ApplicationController
     @challenge_choose = ChallengeChoose.where(:id => params[:choose_id]).first
     @category = @challenge_choose.category
     @position = @challenge_choose.position.to_i
+    @index = params[:index].to_i
     respond_to do |format|
       format.js
     end
@@ -186,7 +188,7 @@ class ChallengesController < ApplicationController
 
   def choose_type_show
     @challenge_choose = ChallengeChoose.where(:id => params[:choose_id]).first
-
+    @index = params[:index].to_i
     respond_to do |format|
       format.js
     end
diff --git a/app/views/challenges/_choose_tab.html.erb b/app/views/challenges/_choose_tab.html.erb
new file mode 100644
index 000000000..fb5015d25
--- /dev/null
+++ b/app/views/challenges/_choose_tab.html.erb
@@ -0,0 +1,10 @@
+<li class="fl <%= @index.nil? ? "check_nav" : "" %>">
+  <a href="<%= edit_shixun_challenge_path(@challenge, :shixun_id => @shixun) %>" class="color-black">本关任务</a>
+</li>
+<% @challenge.challenge_chooses.each_with_index do |choose, index| %>
+    <li class="fl <%= @index == index ? "check_nav" : "" %>">
+      <a href="<%= choose_type_show_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => choose.id, :index => index) %>" class="color-black" data-remote="true">
+        <%= (index + 1).to_s + (choose.category == 1 ? ".单选题" : ".多选题") %>
+      </a>
+    </li>
+<% end %>
\ No newline at end of file
diff --git a/app/views/challenges/_choose_type.html.erb b/app/views/challenges/_choose_type.html.erb
index bd24fddd6..7a1b496f6 100644
--- a/app/views/challenges/_choose_type.html.erb
+++ b/app/views/challenges/_choose_type.html.erb
@@ -1,15 +1,8 @@
-<div class="stage-part-2 mt20">
+<div class="stage-part-2 mt20" id="">
   <ul class="nav_check_item border-bottom-orange clearfix">
-    <li class="fl check_nav">
-      <a href="<%= edit_shixun_challenge_path(@challenge, :shixun_id => @shixun) %>" class="color-black">本关任务</a>
-    </li>
-    <% @challenge.challenge_chooses.each_with_index do |choose, index| %>
-        <li class="fl">
-          <a href="<%= choose_type_show_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => choose.id) %>" class="color-black" data-remote="true">
-            <%= (index + 1).to_s + (choose.category == 1 ? ".单选题" : ".多选题") %>
-          </a>
-        </li>
-    <% end %>
+    <div id="challenge_choose_tab">
+      <%= render :partial => "challenges/choose_tab" %>
+    </div>
     <a href="javascript:void(0)" class="fr white-btn green-btn white_bg addoption-btn">+&nbsp;多选题</a>
     <a href="javascript:void(0)" class="fr mr10 white-btn green-btn white_bg addoption-btn">+&nbsp;单选题</a>
   </ul>
@@ -41,7 +34,7 @@
     </div>
   </div>
 
-  <div id="set_content" class="task-pm-box mh550 user_bg_shadow undis">
+<div id="set_content" class="task-pm-box mh550 user_bg_shadow undis">
     <%#= render :partial => "single_or_multiple_question" %>
   </div>
 
diff --git a/app/views/challenges/_single_or_multiple_question.html.erb b/app/views/challenges/_single_or_multiple_question.html.erb
index 2934a4fb7..38e3e6d7f 100644
--- a/app/views/challenges/_single_or_multiple_question.html.erb
+++ b/app/views/challenges/_single_or_multiple_question.html.erb
@@ -149,17 +149,6 @@
     </li>
 <% end %>
 <script>
-/*    //参考答案的编辑器
-    editormd.loadKaTeX(function() {
-        var answerMD = editormd.markdownToHTML("tpm_answer_show", {
-            htmlDecode: "style,script,iframe",  // you can filter tags decode
-            taskList: true,
-            tex: true,  // 默认不解析
-            flowChart: true,  // 默认不解析
-            sequenceDiagram: true // 默认不解析
-        });
-    });*/
-
     subject_editormd =  editormd("challenge_choose_subject", {
         width   : "89.6%",
         height  : 400,
@@ -458,7 +447,7 @@
                         });
                     }else{
                         $.ajax({
-                            url: "<%= update_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => @challenge_choose.try(:id)) %>",
+                            url: "<%= update_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => @challenge_choose.try(:id), :index => @position ) %>",
                             data: $("#challenge_choose_update").serialize(),
                             type: 'POST',
                             dataType: "script",
@@ -486,7 +475,7 @@
                         });
                     }else{
                         $.ajax({
-                            url: "<%= update_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => @challenge_choose.try(:id)) %>",
+                            url: "<%= update_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => @challenge_choose.try(:id), :index => @position) %>",
                             data: $("#challenge_choose_update").serialize(),
                             type: 'POST',
                             dataType: "script",
@@ -507,7 +496,7 @@
                     });
                 }else{
                     $.ajax({
-                        url: "<%= update_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => @challenge_choose.try(:id)) %>",
+                        url: "<%= update_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => @challenge_choose.try(:id), :index => @position) %>",
                         data: $("#challenge_choose_update").serialize(),
                         type: 'POST',
                         dataType: "script",
diff --git a/app/views/challenges/_single_or_multiple_question_show.html.erb b/app/views/challenges/_single_or_multiple_question_show.html.erb
index 832ed17b3..c1ccb6a32 100644
--- a/app/views/challenges/_single_or_multiple_question_show.html.erb
+++ b/app/views/challenges/_single_or_multiple_question_show.html.erb
@@ -1,7 +1,7 @@
 <div class="white_bg">
     <div class="panel-form">
       <li class="clearfix pr30">
-        <a href="<%= edit_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => @challenge_choose.id) %>" data-remote="true" class="task-btn task-btn-green fr">编辑</a>
+        <a href="<%= edit_choose_question_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => @challenge_choose.id, :index => @index) %>" data-remote="true" class="task-btn task-btn-green fr">编辑</a>
         <a href="<%= destroy_challenge_choose_shixun_challenge_path(@challenge, :shixun_id => @shixun, :choose_id => @challenge_choose.id) %>" data-method="delete" class="task-btn fr mr10 deloption-btn">删除</a>
       </li>
       <li class="clearfix">
diff --git a/app/views/challenges/choose_type_show.js.erb b/app/views/challenges/choose_type_show.js.erb
index b5c714994..e589ae71b 100644
--- a/app/views/challenges/choose_type_show.js.erb
+++ b/app/views/challenges/choose_type_show.js.erb
@@ -1 +1,2 @@
-$("#task_content").html("<%= j(render :partial => 'single_or_multiple_question_show')%>");
\ No newline at end of file
+$("#task_content").html("<%= j(render :partial => 'single_or_multiple_question_show')%>");
+$("#challenge_choose_tab").html("<%= j(render :partial => "challenges/choose_tab") %>");
\ No newline at end of file
diff --git a/app/views/challenges/edit.html.erb b/app/views/challenges/edit.html.erb
index 820019f86..217212a8e 100644
--- a/app/views/challenges/edit.html.erb
+++ b/app/views/challenges/edit.html.erb
@@ -83,7 +83,7 @@
         </div>
       </div>
   <% else %>
-    <%= render :partial => "choose_type" %>
+      <%= render :partial => "choose_type" %>
   <% end %>
 </div>
 <div class="save-tip">
diff --git a/app/views/challenges/edit_choose_question.js.erb b/app/views/challenges/edit_choose_question.js.erb
index 55a88fe8d..d1ce84abd 100644
--- a/app/views/challenges/edit_choose_question.js.erb
+++ b/app/views/challenges/edit_choose_question.js.erb
@@ -1 +1,2 @@
-$("#task_content").html("<%= j(render :partial => "single_or_multiple_question") %>");
\ No newline at end of file
+$("#task_content").html("<%= j(render :partial => "single_or_multiple_question") %>");
+$("#challenge_choose_tab").html("<%= j(render :partial => "challenges/choose_tab") %>");
\ No newline at end of file
diff --git a/app/views/challenges/new_choose_question.js.erb b/app/views/challenges/new_choose_question.js.erb
index b5c714994..e589ae71b 100644
--- a/app/views/challenges/new_choose_question.js.erb
+++ b/app/views/challenges/new_choose_question.js.erb
@@ -1 +1,2 @@
-$("#task_content").html("<%= j(render :partial => 'single_or_multiple_question_show')%>");
\ No newline at end of file
+$("#task_content").html("<%= j(render :partial => 'single_or_multiple_question_show')%>");
+$("#challenge_choose_tab").html("<%= j(render :partial => "challenges/choose_tab") %>");
\ No newline at end of file
diff --git a/app/views/challenges/update_choose_question.js.erb b/app/views/challenges/update_choose_question.js.erb
index b5c714994..e589ae71b 100644
--- a/app/views/challenges/update_choose_question.js.erb
+++ b/app/views/challenges/update_choose_question.js.erb
@@ -1 +1,2 @@
-$("#task_content").html("<%= j(render :partial => 'single_or_multiple_question_show')%>");
\ No newline at end of file
+$("#task_content").html("<%= j(render :partial => 'single_or_multiple_question_show')%>");
+$("#challenge_choose_tab").html("<%= j(render :partial => "challenges/choose_tab") %>");
\ No newline at end of file