Merge branch 'dev_item_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_item_bank

app/controllers/examination_banks_controller.rb

@@ -2,7 +2,7 @@ class ExaminationBanksController < ApplicationController
   include PaginateHelper
   before_action :require_login
   before_action :find_exam, except: [:index, :create]
-  before_action :edit_auth, only: [:update, :destroy, :set_public]
+  before_action :edit_auth, only: [:update, :destroy, :set_public, :revoke_item]
 
   def index
     exams = ExaminationBankQuery.call(params)
@@ -62,6 +62,15 @@ class ExaminationBanksController < ApplicationController
     render_ok
   end
 
+  def revoke_item
+    item = @exam.examination_items.find_by!(item_bank_id: params[:item_id])
+    ActiveRecord::Base.transaction do
+      @exam.examination_items.where(item_type: item.item_type).where("position > #{item.position}").update_all("position = position -1")
+      item.destroy!
+    end
+    render_ok
+  end
+
   private
 
   def form_params

app/controllers/item_banks_controller.rb

@@ -8,7 +8,8 @@ class ItemBanksController < ApplicationController
     items = ItemBankQuery.call(params)
     @items_count = items.size
     @items = paginate items.includes(:item_analysis, :user, :container)
-    @item_basket_ids = current_user.item_baskets.pluck(:item_bank_id)
+    exam = ExaminationBank.find_by(id: params[:exam_id]) if params[:exam_id].present?
+    @item_basket_ids = exam ? exam.examination_items.pluck(:item_bank_id) : current_user.item_baskets.pluck(:item_bank_id)
   end
 
   def create

app/controllers/tag_disciplines_controller.rb

@@ -2,7 +2,10 @@ class TagDisciplinesController < ApplicationController
   before_action :require_login
 
   def create
+    tip_exception("请输入知识点") if params[:name].blank?
+    tip_exception("输入字符长度限制在15个以内") if params[:name].length > 15
     sub_discipline = SubDiscipline.find_by!(id: params[:sub_discipline_id])
+    tip_exception("重复的知识点") if sub_discipline.tag_disciplines.exists?(name: params[:name].to_s.strip)
     tag_discipline = TagDiscipline.create!(name: params[:name].to_s.strip, sub_discipline: sub_discipline, user_id: current_user.id)
     render_ok({tag_discipline_id: tag_discipline.id})
   end

app/forms/item_banks/save_item_form.rb

@@ -27,7 +27,7 @@ class ItemBanks::SaveItemForm
 
     attr_accessor :choice_text, :is_answer
 
-    validates :choice_text, presence: true, length: { maximum: 100 }
+    validates :choice_text, presence: true, length: { maximum: 300 }
     validates :is_answer, presence: true, inclusion: {in: 0..1}, numericality: { only_integer: true }
   end
 end

config/routes.rb

@@ -80,6 +80,7 @@ Rails.application.routes.draw do
     resources :examination_banks do
       member do
         post :set_public
+        delete :revoke_item
       end
     end