From 5467fe75d0bc1977d334bdb7c7f9c69930e29a03 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 25 Oct 2019 15:45:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=9E=E8=B5=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admins/competition_settings/index.js      | 101 ++++++++++++++----
 .../admins/competition_stages_controller.rb   |   8 +-
 .../competition_stage_create_service.rb       |   2 -
 .../competition_settings/index.html.erb       |  25 ++++-
 4 files changed, 103 insertions(+), 33 deletions(-)

diff --git a/app/assets/javascripts/admins/competition_settings/index.js b/app/assets/javascripts/admins/competition_settings/index.js
index 9eb53d529..2dbd65299 100644
--- a/app/assets/javascripts/admins/competition_settings/index.js
+++ b/app/assets/javascripts/admins/competition_settings/index.js
@@ -291,7 +291,7 @@ $(function () {
         }
     });
 
-    $('form.stage-update-form').on('click', ".update-stage", function () {
+    $('.competition-chart-setting').on('click', ".update-stage", function () {
         var updateForm = $(this).parents("form");
         $(this).attr('disabled', 'disabled');
         updateForm.find('.error').html('');
@@ -450,24 +450,83 @@ function  Del_tab(item) {
     $(item).parents(".large_panel_part").remove();
 }
 //新增tab
-function addNewTab() {
-    var count = parseInt($("#large_panel").find(".large_panel_part").length)+1;
-    var html = '<div class="large_panel_part" attr_line="'+count+'"><div class="row d-flex mt-3">\n' +
-        '          <span class="col-1 mt-2">tab标题</span>\n' +
-        '          <div class="col-2 no_padding">\n' +
-        '            <input type="text" class="form-control" name="stage_name"/>\n' +
-        '          </div>\n' +
-        '          <span class="col-1 text-right mt-2 no_padding">总排行榜占比:</span>\n' +
-        '          <div class="col-1 no_padding">\n' +
-        '            <input type="number" class="form-control" name="score_rate" value="100"/>\n' +
-        '          </div><span class=" mt-2">%</span>\n' +
-        '          <div class="flex-1">\n' +
-        '            <a href="javascript:void(0)"class="btn btn-outline-primary export-action ml20 add_task_sub" onclick="add_task_sub(this)">新增子阶段</a>\n' +
-        '          </div>\n' +
-        '          <a href="javascript:void(0)" class="btn btn-default ml20" onclick="Del_tab(this)">删除</a>\n' +
-        '          <a href="javascript:void(0)" class="btn btn-outline-primary export-action ml20">保存</a>\n' +
-        '        </div>\n' +
-        '        <div id="small_panel_'+count+'" class="small_panel"></div></div>';
-    $("#large_panel").append(html);
-
+function addNewTab(competition_id) {
+    if($(".new-stage-form").length > 0){
+        alert("请先保存上一个tab");
+    } else {
+        var count = parseInt($("#large_panel").find(".large_panel_part").length)+1;
+        var html = '<form class="stage-update-form new-stage-form flex-1" action="/admins/competitions/'+competition_id+'/competition_stages" accept-charset="UTF-8" data-remote="true" method="post">' +
+            '<div class="large_panel_part" attr_line="'+count+'"><div class="row d-flex mt-3">\n' +
+            '          <span class="col-1 mt-2">tab标题</span>\n' +
+            '          <div class="col-2 no_padding">\n' +
+            '            <input type="text" class="form-control" name="stage_name"/>\n' +
+            '          </div>\n' +
+            '          <span class="col-1 text-right mt-2 no_padding">总排行榜占比:</span>\n' +
+            '          <div class="col-1 no_padding">\n' +
+            '            <input type="number" class="form-control" name="score_rate" value="100"/>\n' +
+            '          </div><span class=" mt-2">%</span>\n' +
+            '          <div class="flex-1">\n' +
+            '            <a href="javascript:void(0)"class="btn btn-outline-primary export-action ml20 add_task_sub" onclick="add_task_sub(this)">新增子阶段</a>\n' +
+            '          </div>\n' +
+            '          <a href="javascript:void(0)" class="btn btn-default ml20" onclick="Del_tab(this)">删除</a>\n' +
+            '          <a href="javascript:void(0)" class="btn btn-outline-primary update-stage export-action ml20">保存</a>\n' +
+            '        </div>\n' +
+            '        <div id="small_panel_'+count+'" class="small_panel">\n' +
+            '                <div class="row d-flex small_panel_item" attr_line="sub_new_new" count="1">\n' +
+            '                  <span class="col-1 mt-2 subName">第1阶段</span>\n' +
+            '                  <div class="flex-1">\n' +
+            '                    <div class="row">\n' +
+            '                      <span class="mt-2 ml20">有效时间:</span>\n' +
+            '                      <div class="col-2 no_padding input_middle">\n' +
+            '                        <input type="text" name="stage[][start_time]" id="stage__start_time" value="" autocomplete="off" class="section-start-time form-control" placeholder="有效开始时间">\n' +
+            '                      </div>\n' +
+            '                      <span class="mt-2">~</span>\n' +
+            '                      <div class="col-2 no_padding input_middle">\n' +
+            '                        <input type="text" name="stage[][end_time]" id="stage__end_time" value="" autocomplete="off" class="section-end-time form-control" placeholder="有效结束时间">\n' +
+            '                      </div>\n' +
+            '                      <span class="col-2 text-right mt-2 no_padding">任务完成要求:</span>\n' +
+            '                      <div class="col-1 no_padding input_small">\n' +
+            '                        <input type="number" class="form-control" name="stage[][mission_count]" value="1">\n' +
+            '                      </div>\n' +
+            '                      <span class="mt-2 ml10 mr10">/</span>\n' +
+            '                      <div class="col-1 no_padding input_small">\n' +
+            '                        <input type="number" class="form-control task_all" onchange="change_total(this)" value="3" name="stage[][entry]">\n' +
+            '                      </div>\n' +
+            '                      <span class=" mt-2">(总任务)</span>\n' +
+            '                      <span class="col-1 text-right mt-2 no_padding">成绩来源:</span>\n' +
+            '                      <div class="col-2 no_padding input_middle">\n' +
+            '                        <select class="form-control" name="stage[][score_source]">\n' +
+            '                          <option value="0">经验值</option>\n' +
+            '                          <option value="1">预测准确率</option>\n' +
+            '                        </select>\n' +
+            '                      </div>\n' +
+            '                    </div>\n' +
+            '                    <div class="row mt-2" id="task_Input_sub_new_new">\n' +
+            '                      <div class="col-4 row task_Input_div">\n' +
+            '                        <span class="col-3 text-center mt-3">任务1</span>\n' +
+            '                        <div class="col-8">\n' +
+            '                          <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">\n' +
+            '                        </div>\n' +
+            '                      </div>\n' +
+            '                      <div class="col-4 row task_Input_div">\n' +
+            '                        <span class="col-3 text-center mt-3">任务2</span>\n' +
+            '                        <div class="col-8">\n' +
+            '                          <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">\n' +
+            '                        </div>\n' +
+            '                      </div>\n' +
+            '                      <div class="col-4 row task_Input_div">\n' +
+            '                        <span class="col-3 text-center mt-3">任务3</span>\n' +
+            '                        <div class="col-8">\n' +
+            '                          <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">\n' +
+            '                        </div>\n' +
+            '                      </div>\n' +
+            '                    </div>\n' +
+            '                  </div>\n' +
+            '                  <span>\n' +
+            '              <a href="javascript:void(0)" class="btn btn-default ml20 small_panel_item_del">删除</a>\n' +
+            '            </span>\n' +
+            '                </div>\n' +
+            '</div></div></form>';
+        $("#large_panel").append(html);
+    }
 }
\ No newline at end of file
diff --git a/app/controllers/admins/competition_stages_controller.rb b/app/controllers/admins/competition_stages_controller.rb
index 5445d59a9..63e2429e3 100644
--- a/app/controllers/admins/competition_stages_controller.rb
+++ b/app/controllers/admins/competition_stages_controller.rb
@@ -1,14 +1,8 @@
 class Admins::CompetitionStagesController < Admins::BaseController
 
   def create
-    Admins::CompetitionStageUpdateService.call(current_competition, update_form_params)
+    Admins::CompetitionStageCreateService.call(current_competition, update_form_params)
     render_ok
-    if current_competition.competition_stages.exists?(name: params[:stage_name])
-      render_error "已存在同名的阶段"
-    else
-      current_competition.competition_stages << CompetitionStage.new(name: params[:stage_name])
-      render_ok
-    end
   end
 
   def update
diff --git a/app/services/admins/competition_stage_create_service.rb b/app/services/admins/competition_stage_create_service.rb
index d11276ef3..4389a727d 100644
--- a/app/services/admins/competition_stage_create_service.rb
+++ b/app/services/admins/competition_stage_create_service.rb
@@ -10,8 +10,6 @@ class Admins::CompetitionStageCreateService < ApplicationService
     ActiveRecord::Base.transaction do
       stage = CompetitionStage.create!(competition_id: competition.id, name: params[:stage_name], score_rate: (params[:score_rate].to_i / 100).round(2))
 
-      stage.competition_stage_sections.destroy_all
-
       params[:stage].each do |section|
         stage_section = CompetitionStageSection.create!(competition_id: competition.id, competition_stage_id: stage.id,
                                                         start_time: section["start_time"], end_time: section["end_time"],
diff --git a/app/views/admins/competition_settings/index.html.erb b/app/views/admins/competition_settings/index.html.erb
index 44e3da7ee..66904fc48 100644
--- a/app/views/admins/competition_settings/index.html.erb
+++ b/app/views/admins/competition_settings/index.html.erb
@@ -333,7 +333,7 @@
   <div class="card mb-5">
     <div class="card-header d-flex justify-content-between align-items-center">
       <span>排行榜设置</span>
-      <a href="javascript:void(0)" class="btn btn-primary btn-custom waves-effect waves-light ml20" onclick="addNewTab();">+ 新增tab</a>
+      <a href="javascript:void(0)" class="btn btn-primary btn-custom waves-effect waves-light ml20" onclick="addNewTab(<%= @competition.id %>);">+ 新增tab</a>
 
       <span class="flex-1 text-right color-orange">实训ID填写示例：实训地址为https://www.educoder.net/shixuns/u5plmgka/challenges，则填写“u5plmgka”</span>
     </div>
@@ -430,7 +430,7 @@
                   <a href="javascript:void(0)"class="btn btn-outline-primary export-action ml20 add_task_sub" onclick="add_task_sub(this)">新增子阶段</a>
                 </div>
                 <a href="javascript:void(0)" class="btn btn-default ml20" onclick="Del_tab(this)">删除</a>
-                <a href="javascript:void(0)" class="btn btn-outline-primary export-action ml20">保存</a>
+                <a href="javascript:void(0)" class="btn btn-outline-primary update-stage export-action ml20">保存</a>
               </div>
               <div id="small_panel_1" class="small_panel">
                 <div class="row d-flex small_panel_item" attr_line="sub_new_new" count="1">
@@ -462,7 +462,26 @@
                         </select>
                       </div>
                     </div>
-                    <div class="row mt-2" id="task_Input_sub_new_new"></div>
+                    <div class="row mt-2" id="task_Input_sub_new_new">
+                      <div class="col-4 row task_Input_div">
+                        <span class="col-3 text-center mt-3">任务1</span>
+                        <div class="col-8">
+                          <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">
+                        </div>
+                      </div>
+                      <div class="col-4 row task_Input_div">
+                        <span class="col-3 text-center mt-3">任务2</span>
+                        <div class="col-8">
+                          <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">
+                        </div>
+                      </div>
+                      <div class="col-4 row task_Input_div">
+                        <span class="col-3 text-center mt-3">任务3</span>
+                        <div class="col-8">
+                          <input type="text" class="form-control mt-2" name="stage[][identifiers][]" placeholder="请填写实训ID">
+                        </div>
+                      </div>
+                    </div>
                   </div>
                   <span>
               <a href="javascript:void(0)" class="btn btn-default ml20 small_panel_item_del">删除</a>