m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
dev_jupyter
daiao 5 years ago
parent 80a1eadb87 1734ce2267
commit 1fef7f63e2
60 changed files with 252 additions and 117 deletions
Show Stats Download Patch File Download Diff File

10
app/controllers/application_controller.rb
Unescape View File

@ -23,11 +23,11 @@ class ApplicationController < ActionController::Base
# 所有请求必须合法签名
def check_sign
if !Rails.env.development? && EduSetting.get("host_name") != "https://test-newweb.educoder.net"
if !Rails.env.development?
Rails.logger.info("66666 #{params}")
suffix = request.url.split(".").last.split("?").first
suffix_arr = ["xls", "xlsx", "pdf", "zip"] # excel文件先注释
unless suffix_arr.include?(suffix)
# suffix = request.url.split(".").last.split("?").first
# suffix_arr = ["xls", "xlsx", "pdf", "zip"] # excel文件先注释
# unless suffix_arr.include?(suffix)
if params[:client_key].present?
randomcode = params[:randomcode]
# tip_exception(501, "请求不合理") unless (Time.now.to_i - randomcode.to_i).between?(0,5)
@ -38,7 +38,7 @@ class ApplicationController < ActionController::Base
else
tip_exception(501, "请求不合理")
end
end
# end
end
end

14
app/controllers/homework_commons_controller.rb
Unescape View File

@ -306,7 +306,7 @@ class HomeworkCommonsController < ApplicationController
def alter_name
tip_exception("作业名称不能为空") if params[:name].blank?
@homework.update_attributes(name: params[:name].strip)
@homework.update_attributes!(name: params[:name].strip)
normal_status("更新成功")
end
@ -348,7 +348,7 @@ class HomeworkCommonsController < ApplicationController
end
def update_explanation
@homework.update_attributes(explanation: params[:explanation])
@homework.update_attributes!(explanation: params[:explanation])
normal_status(0, "更新成功")
end
@ -416,7 +416,7 @@ class HomeworkCommonsController < ApplicationController
ActiveRecord::Base.transaction do
begin
@homework.update_attributes(homework_params)
@homework.update_attributes!(homework_params)
if @homework.homework_type == "group"
homework_detail_group = @homework.homework_detail_group
@ -521,7 +521,7 @@ class HomeworkCommonsController < ApplicationController
score = challenge[:challenge_score]
if setting && setting.score != score
score_change = true
setting.update_attributes(score: score)
setting.update_attributes!(score: score)
elsif setting.blank?
score_change = true
HomeworkChallengeSetting.create!(homework_common_id: @homework.id, challenge_id: challenge[:challenge_id],
@ -1159,11 +1159,11 @@ class HomeworkCommonsController < ApplicationController
if homework_bank.present?
# 如果作业加入过题库则更新参数
if homework_bank.homework_type == 1
homework_bank.update_attributes(name: homework.name, description: homework.description,
homework_bank.update_attributes!(name: homework.name, description: homework.description,
reference_answer: homework.reference_answer, course_list_id: @course.course_list_id)
elsif homework_bank.homework_type == 3
homework_detail_group = homework.homework_detail_group
homework_bank.update_attributes(name: homework.name, description: homework.description,
homework_bank.update_attributes!(name: homework.name, description: homework.description,
reference_answer: homework.reference_answer, course_list_id: @course.course_list_id,
min_num: homework_detail_group.min_num, max_num: homework_detail_group.max_num,
base_on_project: homework_detail_group.base_on_project)
@ -1449,7 +1449,7 @@ class HomeworkCommonsController < ApplicationController
# 如果用户已有查重记录则更新相似度 否则新建一条记录
user_review = homework.homework_review_results.find_by(:user_id => user)
if user_review.present?
user_review.update_attributes(:code_rate => user_rate)
user_review.update_attributes!(:code_rate => user_rate)
else
homework.homework_review_results.create(:user_id => user, :code_rate => user_rate)
end

2
app/controllers/poll_votes_controller.rb
Unescape View File

@ -57,6 +57,8 @@ class PollVotesController < ApplicationController
:vote_text => question_answer_text
}
PollVote.create(answer_option)
# 重新取一次poll_votes
user_votes = @poll_question.poll_votes.find_current_vote("user_id",current_user.id)
end
# if current_vote_text.present? #已有其他输入文字的选项
# current_vote_text.update_attribute("vote_text", question_answer_text)

2
app/forms/examination_banks/save_exam_form.rb
Unescape View File

@ -6,7 +6,7 @@ class ExaminationBanks::SaveExamForm
validates :discipline_id, presence: true
validates :sub_discipline_id, presence: true
validates :difficulty, presence: true, inclusion: {in: 1..3}, numericality: { only_integer: true }
validates :name, presence: true, length: { maximum: 60, too_long: "名称不能超过60个字符" }
validates :name, presence: true, length: { maximum: 60, too_long: "不能超过60个字符" }
validate :validate_duration
def validate_duration

6
app/forms/item_banks/save_item_form.rb
Unescape View File

@ -7,8 +7,8 @@ class ItemBanks::SaveItemForm
validates :sub_discipline_id, presence: true
validates :item_type, presence: true, inclusion: {in: %W(SINGLE MULTIPLE JUDGMENT COMPLETION SUBJECTIVE PRACTICAL PROGRAM)}
validates :difficulty, presence: true, inclusion: {in: 1..3}, numericality: { only_integer: true }
validates :name, presence: true, length: { maximum: 1000, too_long: "题干不能超过1000个字符" }
validates :analysis, length: { maximum: 1000, too_long: "解析不能超过1000个字符" }
validates :name, presence: true, length: { maximum: 1000, too_long: "不能超过1000个字符" }
validates :analysis, length: { maximum: 1000, too_long: "不能超过1000个字符" }
def validate!
super
@ -27,7 +27,7 @@ class ItemBanks::SaveItemForm
attr_accessor :choice_text, :is_answer
validates :choice_text, presence: true, length: { maximum: 500, too_long: "选项不能超过500个字符" }
validates :choice_text, presence: true, length: { maximum: 500, too_long: "不能超过500个字符" }
validates :is_answer, presence: true, inclusion: {in: 0..1}, numericality: { only_integer: true }
end
end

2
app/forms/validate/user.rb
Unescape View File

@ -4,7 +4,7 @@ module Validate
attr_accessor :nickname, :lastname
validates :nickname, presence: true, length: { maximum: 10, too_long: "昵称不能超过10个字符" }
validates :nickname, presence: true, length: { maximum: 10, too_long: "不能超过10个字符" }
validates :lastname, presence: true
end
end

2
app/models/attachment.rb
Unescape View File

@ -25,7 +25,7 @@ class Attachment < ApplicationRecord
scope :search_by_container, -> (ids) {where(container_id: ids)}
scope :unified_setting, -> {where("unified_setting = ? ", 1)}
validates_length_of :description, maximum: 100, message: "资源描述不能超过100个字符"
validates_length_of :description, maximum: 100, message: "不能超过100个字符"
DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)

2
app/models/challenge.rb
Unescape View File

@ -28,7 +28,7 @@ class Challenge < ApplicationRecord
scope :fields_for_list, -> { select([:id, :subject, :st, :score, :position, :shixun_id]) }
validates :task_pass, length: { maximum: 10000, too_long: "过关任务不能超过10000个字符" }
validates :task_pass, length: { maximum: 10000, too_long: "不能超过10000个字符" }
after_commit :create_diff_record

2
app/models/challenge_answer.rb
Unescape View File

@ -3,7 +3,7 @@ class ChallengeAnswer < ApplicationRecord
belongs_to :challenge
has_many :game_answers, :dependent => :destroy
validates :contents, length: { maximum: 5000 , too_long: "答案内容不能超过5000个字符"}
validates :contents, length: { maximum: 5000 , too_long: "不能超过5000个字符"}
def view_answer_time(user_id)
game_answers.where(user_id: user_id).last&.view_time

2
app/models/challenge_choose.rb
Unescape View File

@ -4,6 +4,6 @@ class ChallengeChoose < ApplicationRecord
has_many :challenge_tags, :dependent => :destroy
has_many :challenge_questions, dependent: :destroy
validates :subject, length: { maximum: 1000, too_long: "题干不能超过1000个字符" }
validates :subject, length: { maximum: 1000, too_long: "不能超过1000个字符" }
end

2
app/models/challenge_question.rb
Unescape View File

@ -1,6 +1,6 @@
class ChallengeQuestion < ApplicationRecord
belongs_to :challenge_choose
validates :option_name, length: { maximum: 500, too_long: "选项不能超过500个字符" }
validates :option_name, length: { maximum: 500, too_long: "不能超过500个字符" }
end

2
app/models/challenge_work_score.rb
Unescape View File

@ -4,6 +4,8 @@ class ChallengeWorkScore < ApplicationRecord
belongs_to :challenge
has_many :tidings, as: :container, dependent: :destroy
validates :comment, length: { maximum: 500, too_long: "不能超过500个字符" }
def create_tiding trigger_user_id
tidings << Tiding.new(user_id: student_work.user_id, trigger_user_id: trigger_user_id, container_id: id,
container_type: "ChallengeWorkScore", parent_container_id: student_work_id,

2
app/models/chart_rule.rb
Unescape View File

@ -2,5 +2,5 @@ class ChartRule < ApplicationRecord
belongs_to :competition
belongs_to :competition_stage, optional: true
validates :content, length: { maximum: 1000, too_long: "内容不能超过1000个字符" }
validates :content, length: { maximum: 1000, too_long: "不能超过1000个字符" }
end

2
app/models/competition.rb
Unescape View File

@ -33,7 +33,7 @@ class Competition < ApplicationRecord
has_many :competition_prizes, dependent: :destroy
has_many :competition_prize_users, dependent: :destroy
validates :introduction, length: { maximum: 500, too_long: "简介不能超过500个字符" }
validates :introduction, length: { maximum: 500, too_long: "不能超过500个字符" }
before_save :set_laboratory
after_create :create_competition_modules

2
app/models/competition_module_md_content.rb
Unescape View File

@ -5,6 +5,6 @@ class CompetitionModuleMdContent < ApplicationRecord
# validates :name, presence: true
validates :content, presence: true
validates :content, length: { maximum: 10000 , too_long: "内容不能超过10000个字符"}
validates :content, length: { maximum: 10000 , too_long: "不能超过10000个字符"}
end

2
app/models/course.rb
Unescape View File

@ -108,7 +108,7 @@ class Course < ApplicationRecord
NORMAL = 6 # 普通用户
Anonymous = 7 # 普未登录
validates :name, presence: true, length: { maximum: 60, too_long: "课堂名称不能超过60个字符" }
validates :name, presence: true, length: { maximum: 60, too_long: "不能超过60个字符" }
before_save :set_laboratory
after_create :create_board_sync, :act_as_course_activity, :send_tiding

2
app/models/course_group.rb
Unescape View File

@ -9,7 +9,7 @@ class CourseGroup < ApplicationRecord
has_many :homework_group_settings, :dependent => :destroy
scope :by_group_ids, lambda { |ids| where(id: ids)}
validates :name, length: { maximum: 60, too_long: "分班名称不能超过60个字符" }
validates :name, length: { maximum: 60, too_long: "不能超过60个字符" }
validates_uniqueness_of :name, scope: :course_id, message: "不能创建相同名称的分班"
after_create :generate_invite_code

2
app/models/course_module.rb
Unescape View File

@ -5,7 +5,7 @@ class CourseModule < ApplicationRecord
# 二级目录
has_many :course_second_categories
validates :module_name, length: { maximum: 20, too_long: "目录名称不能超过20个字符" }
validates :module_name, length: { maximum: 20, too_long: "不能超过20个字符" }
scope :not_hidden, -> { where(hidden: 0) }
scope :graduation_module, -> { where(module_type: "graduation") }

2
app/models/course_second_category.rb
Unescape View File

@ -5,7 +5,7 @@ class CourseSecondCategory < ApplicationRecord
belongs_to :course_module
has_many :homework_commons
validates :name, length: { maximum: 60, too_long: "名称不能超过60个字符" }
validates :name, length: { maximum: 60, too_long: "不能超过60个字符" }
def category_type_str
category_type == "graduation" && name == "毕设选题" ? "graduation_topics" : (

4
app/models/course_stage.rb
Unescape View File

@ -4,6 +4,6 @@ class CourseStage < ApplicationRecord
has_many :course_stage_shixuns, -> { order("course_stage_shixuns.position ASC") }, dependent: :destroy
has_many :shixuns, :through => :course_stage_shixuns
validates :name, length: { maximum: 60 , too_long: "章节名称不能超过60个字符"}
validates :description, length: { maximum: 1000, too_long: "章节描述不能超过1000个字符" }
validates :name, length: { maximum: 60 , too_long: "不能超过60个字符"}
validates :description, length: { maximum: 1000, too_long: "不能超过1000个字符" }
end

4
app/models/exercise.rb
Unescape View File

@ -19,8 +19,8 @@ class Exercise < ApplicationRecord
scope :exercise_search, lambda { |keywords|
where("exercise_name LIKE ?", "%#{keywords}%") unless keywords.blank?}
validates :exercise_name, length: { maximum: 60, too_long: "试卷名称不能超过60个字符" }
validates :exercise_description, length: { maximum: 100, too_long: "试卷须知不能超过100个字符" }
validates :exercise_name, length: { maximum: 60, too_long: "不能超过60个字符" }
validates :exercise_description, length: { maximum: 100, too_long: "不能超过100个字符" }
after_create :create_exercise_list

2
app/models/exercise_answer.rb
Unescape View File

@ -11,6 +11,6 @@ class ExerciseAnswer < ApplicationRecord
scope :exercise_answer_is_right, -> {where("score > ?",0.0)} #判断答案是否正确，根据分数总和大于0
scope :score_reviewed, lambda {where("score >= ?",0.0)} #是否评分,用于判断主观题的
validates :answer_text, length: { maximum: 5000, too_long: "答案不能超过5000个字符" }
validates :answer_text, length: { maximum: 5000, too_long: "不能超过5000个字符" }
end

2
app/models/exercise_answer_comment.rb
Unescape View File

@ -7,5 +7,5 @@ class ExerciseAnswerComment < ApplicationRecord
scope :search_answer_comments, lambda {|name,ids| where("#{name}":ids)}
validates :comment, length: { maximum: 100, too_long: "评语不能超过100个字符" }
validates :comment, length: { maximum: 100, too_long: "不能超过100个字符" }
end

4
app/models/exercise_bank.rb
Unescape View File

@ -18,7 +18,7 @@ class ExerciseBank < ApplicationRecord
scope :exercise_bank_search, lambda { |keywords|
where("name LIKE ?", "%#{keywords}%") unless keywords.blank?}
validates :name, length: { maximum: 60, too_long: "试卷名称不能超过60个字符" }
validates :description, length: { maximum: 100, too_long: "试卷须知不能超过100个字符" }
validates :name, length: { maximum: 60, too_long: "不能超过60个字符" }
validates :description, length: { maximum: 100, too_long: "不能超过100个字符" }
end

2
app/models/exercise_bank_choice.rb
Unescape View File

@ -5,6 +5,6 @@ class ExerciseBankChoice < ApplicationRecord
scope :find_choice_custom, lambda {|k,v| where("#{k} = ?",v)} #根据传入的参数查找问题
scope :left_choice_choose, lambda {|k,v| where("#{k} > ?",v)} #根据传入的参数查找问题
validates :choice_text, length: { maximum: 500, too_long: "选项不能超过500个字符" }
validates :choice_text, length: { maximum: 500, too_long: "不能超过500个字符" }
end

2
app/models/exercise_bank_question.rb
Unescape View File

@ -11,7 +11,7 @@ class ExerciseBankQuestion < ApplicationRecord
scope :left_question_choose, lambda {|k,v| where("#{k} > ?",v)} #根据传入的参数查找问题
scope :find_objective_questions, -> {where("question_type != ?",4)} #查找全部客观题
validates :question_title, length: { maximum: 1000, too_long: "题干不能超过1000个字符" }
validates :question_title, length: { maximum: 1000, too_long: "不能超过1000个字符" }
def question_type_name
case self.question_type

2
app/models/exercise_bank_standard_answer.rb
Unescape View File

@ -4,6 +4,6 @@ class ExerciseBankStandardAnswer < ApplicationRecord
#attr_accessible :answer_text
scope :standard_by_ids, lambda { |s| where(exercise_bank_choice_id: s) }
validates :answer_text, length: { maximum: 5000, too_long: "参考答案不能超过5000个字符" }
validates :answer_text, length: { maximum: 5000, too_long: "不能超过5000个字符" }
end

2
app/models/exercise_choice.rb
Unescape View File

@ -7,6 +7,6 @@ class ExerciseChoice < ApplicationRecord
scope :find_choice_custom, lambda {|k,v| where("#{k} = ?",v)} #根据传入的参数查找问题
scope :left_choice_choose, lambda {|k,v| where("#{k} > ?",v)} #根据传入的参数查找问题
validates :choice_text, length: { maximum: 500, too_long: "选项不能超过500个字符" }
validates :choice_text, length: { maximum: 500, too_long: "不能超过500个字符" }
end

2
app/models/exercise_question.rb
Unescape View File

@ -16,7 +16,7 @@ class ExerciseQuestion < ApplicationRecord
scope :left_question_choose, lambda {|k,v| where("#{k} > ?",v)} #根据传入的参数查找问题
scope :find_objective_questions, -> {where("question_type != ?",4)} #查找全部客观题
validates :question_title, length: { maximum: 1000, too_long: "题干不能超过1000个字符" }
validates :question_title, length: { maximum: 1000, too_long: "不能超过1000个字符" }
def question_type_name

2
app/models/exercise_standard_answer.rb
Unescape View File

@ -6,5 +6,5 @@ class ExerciseStandardAnswer < ApplicationRecord
scope :find_standard_answer_custom, lambda {|k,v| where("#{k} = ?",v)} #根据传入的参数查找问题
scope :standard_by_ids, lambda { |s| where(exercise_choice_id: s) }
validates :answer_text, length: { maximum: 5000, too_long: "参考答案不能超过5000个字符" }
validates :answer_text, length: { maximum: 5000, too_long: "不能超过5000个字符" }
end

4
app/models/graduation_task.rb
Unescape View File

@ -29,8 +29,8 @@ class GraduationTask < ApplicationRecord
belongs_to :gtask_bank, optional: true
validates :name, length: { maximum: 60, too_long: "任务名称不能超过60个字符" }
validates :description, length: { maximum: 5000, too_long: "任务描述不能超过5000个字符" }
validates :name, length: { maximum: 60, too_long: "不能超过60个字符" }
validates :description, length: { maximum: 5000, too_long: "不能超过5000个字符" }
# 未提交
scope :unfinished, -> {where(status: 0)}

4
app/models/graduation_topic.rb
Unescape View File

@ -19,8 +19,8 @@ class GraduationTopic < ApplicationRecord
#after_create :act_as_course_activity
# 课题名称和描述字段长度限制
validates :name, length: { maximum: 60, too_long: "选题名称不能超过60个字符" }
validates :description, length: { maximum: 5000, too_long: "选题描述不能超过5000个字符" }
validates :name, length: { maximum: 60, too_long: "不能超过60个字符" }
validates :description, length: { maximum: 5000, too_long: "不能超过5000个字符" }
def status_name
case self.status

2
app/models/graduation_work.rb
Unescape View File

@ -19,7 +19,7 @@ class GraduationWork < ApplicationRecord
# has_many :formal_graduation_task_group_assignations, -> { formal }, class_name: "GraduationTaskGroupAssignation"
# has_many :temporary_graduation_task_group_assignations, -> { temporary }, class_name: "GraduationTaskGroupAssignation"
validates :description, length: { maximum: 5000, too_long: "作品描述不能超过5000个字符" }
validates :description, length: { maximum: 5000, too_long: "不能超过5000个字符" }
scope :has_committed, lambda { where("work_status != 0") }

2
app/models/graduation_work_score.rb
Unescape View File

@ -5,5 +5,5 @@ class GraduationWorkScore < ApplicationRecord
belongs_to :graduation_task
has_many :attachments, as: :container, dependent: :destroy
validates :comment, length: { maximum: 1000, too_long: "评语不能超过1000个字符" }
validates :comment, length: { maximum: 1000, too_long: "不能超过1000个字符" }
end

4
app/models/gtask_bank.rb
Unescape View File

@ -9,6 +9,6 @@ class GtaskBank < ApplicationRecord
scope :myself, ->(user_id) { where(user_id: user_id)}
scope :is_public, -> { where(:is_public => true) }
validates :name, length: { maximum: 60, too_long: "任务名称不能超过60个字符" }
validates :description, length: { maximum: 5000, too_long: "任务描述不能超过5000个字符" }
validates :name, length: { maximum: 60, too_long: "不能超过60个字符" }
validates :description, length: { maximum: 5000, too_long: "不能超过5000个字符" }
end

4
app/models/gtopic_bank.rb
Unescape View File

@ -10,6 +10,6 @@ class GtopicBank < ApplicationRecord
# 课题名称和描述字段长度限制
validates :name, length: { maximum: 60, too_long: "选题名称不能超过60个字符" }
validates :description, length: { maximum: 5000, too_long: "选题描述不能超过5000个字符" }
validates :name, length: { maximum: 60, too_long: "不能超过60个字符" }
validates :description, length: { maximum: 5000, too_long: "不能超过5000个字符" }
end

4
app/models/hack.rb
Unescape View File

@ -2,8 +2,8 @@ class Hack < ApplicationRecord
# status: 0 未发布； 1已发布
# diffcult: 难度 1：简单；2：中等； 3：困难
# 编程题
validates_length_of :name, maximum: 60, message: "名称不能超过60个字符"
validates_length_of :description, maximum: 5000, message: "描述不能超过5000个字符"
validates_length_of :name, maximum: 60, message: "不能超过60个字符"
validates_length_of :description, maximum: 5000, message: "不能超过5000个字符"
validates :description, presence: { message: "描述不能为空" }
validates :name, presence: { message: "名称不能为空" }
# 测试集

4
app/models/hack_set.rb
Unescape View File

@ -1,6 +1,6 @@
class HackSet < ApplicationRecord
validates_length_of :input, maximum: 1000, message: "测试集输入不能超过5000个字符"
validates_length_of :output, maximum: 1000, message: "测试集输出不能超过5000个字符"
validates_length_of :input, maximum: 1000, message: "不能超过5000个字符"
validates_length_of :output, maximum: 1000, message: "不能超过5000个字符"
validates :input, presence: { message: "测试集输入不能为空" }
validates :output, presence: { message: "测试集输出不能为空" }
validates_uniqueness_of :input, scope: [:hack_id, :input], message: "多个测试集的输入不能相同"

2
app/models/hack_user_lastest_code.rb
Unescape View File

@ -12,6 +12,6 @@ class HackUserLastestCode < ApplicationRecord
scope :mine_hack, ->(author_id){ where(user_id: author_id) }
scope :passed, -> {where(status: 1)}
validates_length_of :notes, maximum: 5000, message: "笔记不能超过5000个字"
validates_length_of :notes, maximum: 5000, message: "不能超过5000个字"
end

6
app/models/homework_bank.rb
Unescape View File

@ -10,7 +10,7 @@ class HomeworkBank < ApplicationRecord
scope :is_public, -> { where(is_public: true)}
scope :myself, ->(user_id) { where(user_id: user_id)}
validates :name, length: { maximum: 60, too_long: "作业名称不能超过60个字符" }
validates :description, length: { maximum: 15000, too_long: "作业描述不能超过15000个字符" }
validates :reference_answer, length: { maximum: 15000, too_long: "参考答案不能超过15000个字符" }
validates :name, length: { maximum: 60, too_long: "不能超过60个字符" }
validates :description, length: { maximum: 15000, too_long: "不能超过15000个字符" }
validates :reference_answer, length: { maximum: 15000, too_long: "不能超过15000个字符" }
end

8
app/models/homework_common.rb
Unescape View File

@ -35,10 +35,10 @@ class HomeworkCommon < ApplicationRecord
# 学生的查重情况
has_many :homework_review_results, :dependent => :destroy
validates :name, length: { maximum: 60, too_long: "作业名称不能超过60个字符" }
validates :description, length: { maximum: 15000, too_long: "作业描述不能超过15000个字符" }
validates :explanation, length: { maximum: 5000, too_long: "说明不能超过5000个字符" }
validates :reference_answer, length: { maximum: 15000, too_long: "参考答案不能超过15000个字符" }
validates :name, length: { maximum: 60, too_long: "不能超过60个字符" }
validates :description, length: { maximum: 15000, too_long: "不能超过15000个字符" }
validates :explanation, length: { maximum: 5000, too_long: "不能超过5000个字符" }
validates :reference_answer, length: { maximum: 15000, too_long: "不能超过15000个字符" }
# after_update :update_activity
before_destroy :update_homework_bank_quotes

4
app/models/inform.rb
Unescape View File

@ -1,8 +1,8 @@
class Inform < ApplicationRecord
belongs_to :container, polymorphic: true, optional: true
validates :name, length: { maximum: 60, too_long: "名称不能超过60个字符" }
validates :description, length: { maximum: 5000, too_long: "内容不能超过5000个字符" }
validates :name, length: { maximum: 60, too_long: "不能超过60个字符" }
validates :description, length: { maximum: 5000, too_long: "不能超过5000个字符" }
has_many :attachments, as: :container, dependent: :destroy

2
app/models/library.rb
Unescape View File

@ -13,7 +13,7 @@ class Library < ApplicationRecord
has_one :praise_tread_cache, foreign_key: :object_id
has_many :praise_treads, as: :praise_tread_object, dependent: :destroy
validates :content, length: { maximum: 5000, too_long: "内容不能超过5000个字符" }
validates :content, length: { maximum: 5000, too_long: "不能超过5000个字符" }
validates :uuid, presence: true, uniqueness: true

2
app/models/memo.rb
Unescape View File

@ -27,7 +27,7 @@ class Memo < ApplicationRecord
scope :hot, -> { order("all_replies_count desc, updated_at desc") }
scope :posts, -> { where(root_id: nil, forum_id: [3, 5]) }
validates :content, length: { maximum: 10000, too_long: "帖子内容不能超过10000个字符" }
validates :content, length: { maximum: 10000, too_long: "不能超过10000个字符" }
after_create :send_tiding

2
app/models/message.rb
Unescape View File

@ -33,7 +33,7 @@ class Message < ApplicationRecord
#转发表
# has_many :forwards, as: :from, dependent: :destroy
validates :subject, length: { maximum: 255, too_long: "标题不能超过255个字符" }
validates :subject, length: { maximum: 255, too_long: "不能超过255个字符" }
def update_content(content)
message_detail.update_attributes(content: content)

4
app/models/poll.rb
Unescape View File

@ -24,8 +24,8 @@ class Poll < ApplicationRecord
scope :poll_search, lambda { |keywords|
where("polls_name LIKE ?", "%#{keywords}%") unless keywords.blank?}
validates :polls_name, length: { maximum: 60, too_long: "问卷名称不能超过60个字符" }
validates :polls_description, length: { maximum: 100, too_long: "问卷须知不能超过100个字符" }
validates :polls_name, length: { maximum: 60, too_long: "不能超过60个字符" }
validates :polls_description, length: { maximum: 100, too_long: "不能超过100个字符" }
after_create :create_polls_list

2
app/models/poll_answer.rb
Unescape View File

@ -8,6 +8,6 @@ class PollAnswer < ApplicationRecord
scope :find_answer_by_custom, lambda {|k,v| where("#{k}":v)} #根据传入的参数查找问题
scope :left_answer_choose, lambda {|k,v| where("#{k} > ?",v)} #根据传入的参数查找问题
validates :answer_text, length: { maximum: 500, too_long: "选项不能超过500个字符" }
validates :answer_text, length: { maximum: 500, too_long: "不能超过500个字符" }
end

2
app/models/poll_question.rb
Unescape View File

@ -9,7 +9,7 @@ class PollQuestion < ApplicationRecord
scope :ques_necessary, -> {where("is_necessary = ?",1)}
scope :insert_question, lambda {|k| where("question_number > ?",k)}
validates :question_title, length: { maximum: 1000, too_long: "题干不能超过1000个字符" }
validates :question_title, length: { maximum: 1000, too_long: "不能超过1000个字符" }
def question_type_name
case self.question_type

2
app/models/poll_vote.rb
Unescape View File

@ -9,6 +9,6 @@ class PollVote < ApplicationRecord
scope :find_current_vote,lambda {|k,v| where("#{k}": v)}
scope :find_vote_text,-> {where("vote_text IS NOT NULL")}
validates :vote_text, length: { maximum: 5000, too_long: "内容不能超过5000个字符" }
validates :vote_text, length: { maximum: 5000, too_long: "不能超过5000个字符" }
end

4
app/models/shixun_info.rb
Unescape View File

@ -1,10 +1,10 @@
class ShixunInfo < ApplicationRecord
belongs_to :shixun
validates_uniqueness_of :shixun_id
validates_length_of :fork_reason, maximum: 60, message: "fork原因不能超过60个字符"
validates_length_of :fork_reason, maximum: 60, message: "不能超过60个字符"
after_commit :create_diff_record
validates :description, length: { maximum: 5000, too_long: "简介不能超过5000个字符" }
validates :description, length: { maximum: 5000, too_long: "不能超过5000个字符" }
private

4
app/models/shixun_work_comment.rb
Unescape View File

@ -2,6 +2,6 @@ class ShixunWorkComment < ApplicationRecord
belongs_to :student_work
belongs_to :user
belongs_to :challenge, optional: true
validates :comment, length: { maximum: 500, too_long: "评语不能超过500个字符" }
validates :hidden_comment, length: { maximum: 500, too_long: "隐藏评语不能超过500个字符" }
validates :comment, length: { maximum: 500, too_long: "不能超过500个字符" }
validates :hidden_comment, length: { maximum: 500, too_long: "不能超过500个字符" }
end

4
app/models/stage.rb
Unescape View File

@ -6,6 +6,6 @@ class Stage < ApplicationRecord
has_many :stage_shixuns, -> { order("stage_shixuns.position ASC") }, dependent: :destroy
has_many :shixuns, :through => :stage_shixuns
validates :name, length: { maximum: 60 , too_long: "章节名称不能超过60个字符" }
validates :description, length: { maximum: 1000, too_long: "章节描述不能超过1000个字符" }
validates :name, length: { maximum: 60 , too_long: "不能超过60个字符" }
validates :description, length: { maximum: 1000, too_long: "不能超过1000个字符" }
end

2
app/models/student_work.rb
Unescape View File

@ -19,7 +19,7 @@ class StudentWork < ApplicationRecord
before_save :set_work_score
validates :description, length: { maximum: 5000, too_long: "描述不能超过5000个字符" }
validates :description, length: { maximum: 5000, too_long: "不能超过5000个字符" }
scope :has_committed, lambda { where("work_status != 0") }
# 未提交

2
app/models/student_works_score.rb
Unescape View File

@ -7,7 +7,7 @@ class StudentWorksScore < ApplicationRecord
has_many :tidings, as: :container, dependent: :destroy
has_many :attachments, as: :container, dependent: :destroy
validates :comment, length: { maximum: 1000, too_long: "评语不能超过1000个字符" }
validates :comment, length: { maximum: 1000, too_long: "不能超过1000个字符" }
scope :shixun_comment, lambda { where(is_ultimate: 0) }

6
app/models/subject.rb
Unescape View File

@ -31,9 +31,9 @@ class Subject < ApplicationRecord
has_many :subject_shixun_infos, dependent: :destroy
has_many :subject_user_infos, dependent: :destroy
validates :name, length: { maximum: 60, too_long: "实践课程名称不能超过60个字符" }
validates :description, length: { maximum: 8000, too_long: "实践课程简介不能超过8000个字符" }
validates :learning_notes, length: { maximum: 2000, too_long: "实践课程须知不能超过2000个字符" }
validates :name, length: { maximum: 60, too_long: "不能超过60个字符" }
validates :description, length: { maximum: 8000, too_long: "不能超过8000个字符" }
validates :learning_notes, length: { maximum: 2000, too_long: "不能超过2000个字符" }
scope :visible, lambda{where(status: 2)}
scope :published, lambda{where(status: 1)}

4
app/models/test_set.rb
Unescape View File

@ -1,7 +1,7 @@
class TestSet < ApplicationRecord
# match_rule: 匹配规则： full： 完全匹配， last： 末尾匹配
#
validates :input, length: { maximum: 5000, too_long: "输入不能超过5000个字符" }
validates :output, length: { maximum: 5000, too_long: "输出不能超过5000个字符" }
validates :input, length: { maximum: 5000, too_long: "不能超过5000个字符" }
validates :output, length: { maximum: 5000, too_long: "不能超过5000个字符" }
end

2
app/models/trustie_hack.rb
Unescape View File

@ -1,5 +1,5 @@
class TrustieHack < ApplicationRecord
validates_length_of :description, maximum: 500, message: "描述不能超过500个字符"
validates_length_of :description, maximum: 500, message: "不能超过500个字符"
has_many :hack_users, :dependent => :destroy
belongs_to :trustie_hackathon, counter_cache: true

145
config/locales/zh-CN.yml
Unescape View File

@ -20,7 +20,150 @@ zh-CN:
user:
login: '登录名'
lastname: '姓名'
nickname: '昵称'
discuss:
content: '内容'
journals_for_message:
notes: '内容'
notes: '内容'
subject:
name: '课程名称'
description: '课程简介'
learning_notes: '学习须知'
stage:
name: '章节名称'
description: '章节描述'
shixun_info:
description: '简介'
fork_reason: 'fork原因'
challenge:
task_pass: '过关任务'
test_set:
input: '输入'
output: '输出'
challenge_question:
option_name: '选项'
challenge_choose:
subject: '题干'
challenge_answer:
contents: '答案内容'
memo:
content: '帖子内容'
course:
name: '课堂名称'
course_group:
name: '分班名称'
course_module:
module_name: '目录名称'
course_second_category:
name: '目录名称'
inform:
name: '标题'
description: '内容'
course_stage:
name: '章节名称'
description: '章节描述'
attachment:
description: '资源描述'
message:
subject: '标题'
message_detail:
content: '内容'
homework_common:
name: '标题'
description: '内容'
explanation: '内容'
reference_answer: '参考答案'
student_work:
description: '内容'
student_work_score:
comment: '评语'
challenge_work_score:
comment: '评语'
shixun_work_comment:
comment: '评语'
hidden_comment: '隐藏评语'
graduation_topic:
name: '选题名称'
description: '选题简介'
graduation_task:
name: '任务标题'
description: '内容'
graduation_work:
description: '作品内容'
graduation_work_score:
comment: '评语'
poll:
polls_name: '问卷标题'
polls_description: '问卷须知'
poll_question:
question_title: '题干'
poll_answer:
answer_text: '选项'
poll_vote:
vote_text: '内容'
exercise:
exercise_name: '试卷标题'
exercise_description: '试卷须知'
exercise_question:
question_title: '题干'
exercise_choice:
choice_text: '选项'
exercise_answer:
answer_text: '答案'
exercise_standard_answer:
answer_text: '参考答案'
exercise_answer_comment:
comment: '评语'
homework_bank:
name: '标题'
description: '内容'
reference_answer: '参考答案'
gtask_bank:
name: '任务标题'
description: '内容'
gtopic_bank:
name: '选题名称'
description: '选题简介'
exercise_bank:
name: '试卷标题'
description: '试卷须知'
exercise_bank_question:
question_title: '题干'
exerise_bank_choice:
choice_text: '选项'
exercise_bank_standard_answer:
answer_text: '参考答案'
library:
title: '标题'
content: '内容'
author_name: '作者姓名'
author_school_name: '作者单位名称'
competition:
introduction: '简介'
competition_module_md_content:
content: '内容'
chart_rule:
content: '内容'
project_package:
title: '标题'
examination_bank:
name: '试卷名称'
item_bank:
name: '题干'
item_analysis:
analysis: '解析'
item_choice:
choice_text: '选项'
hack:
name: '任务名称'
description: '描述'
hack_set:
input: '测试集输入'
output: '测试集输出'
hack_user_lastest_code:
notes: '笔记'
trustie_hack:
description: '描述'

6
lib/tasks/sync_trustie_program_question.rake
Unescape View File

@ -7,7 +7,7 @@ namespace :sync_program do
unless Hack.where(name: program.name).exists?
strip_des = strip_html(program.description, 5000)
description = strip_des.present? ? strip_des : program.name
hack_params = {name: program.name[0..59], description: description, difficult: 1, open_or_not: 1, score: 200, sub_discipline_id: program.oj_sub_discipline_id}
hack_params = {name: program.name[0..59], description: description, difficult: 1, open_or_not: 1, score: 200, status:0, time_limit: 3, sub_discipline_id: program.oj_sub_discipline_id}
puts "language::::#{program.language}"
puts "program_bank::::#{program.id}"
hack = Hack.new(hack_params)
@ -24,11 +24,11 @@ namespace :sync_program do
end
end
# 新建知识点
hack_code_params = {code: program.standard_code, language: program.oj_language}
hack_code_params = {code: program.standard_code.blank? ? nil : Base64.encode64(program.standard_code), language: program.oj_language}
hack_codes = hack.hack_codes.new(hack_code_params)
hack_codes.modify_time = Time.now
hack_codes.save!
new_item_params = {name: program.name, sub_discipline_id: program.oj_sub_discipline_id, container: hack, item_type: 'PROGRAM', public: 1, difficulty: 1, user_id: 1}
new_item_params = {name: program.name, sub_discipline_id: program.oj_sub_discipline_id, container: hack, item_type: 'PROGRAM', public: 0, difficulty: 1, user_id: 1}
ItemBank.create!(new_item_params)
end
puts hack.id

36
public/react/src/common/quillForEditor/index.js
Unescape View File

@ -4,7 +4,7 @@
* @Github:
* @Date: 2019-12-18 08:49:30
* @LastEditors : tangjiang
* @LastEditTime : 2020-01-10 15:05:27
* @LastEditTime : 2020-01-11 13:43:31
*/
import './index.scss';
import 'quill/dist/quill.core.css'; // 核心样式
@ -18,7 +18,7 @@ import deepEqual from './deepEqual.js'
import { fetchUploadImage } from '../../services/ojService.js';
import { getImageUrl } from 'educoder'
import ImageBlot from './ImageBlot';
import FillBlot from './FillBlot';
// import FillBlot from './FillBlot';
const Size = Quill.import('attributors/style/size');
const Font = Quill.import('formats/font');
// const Color = Quill.import('attributes/style/color');
@ -31,9 +31,9 @@ Quill.register(ImageBlot);
Quill.register(Size);
Quill.register(Font, true);
// Quill.register({'modules/toolbar': Toolbar});
Quill.register({
'formats/fill': FillBlot
});
// Quill.register({
// 'formats/fill': FillBlot
// });
// Quill.register(Color);
@ -87,12 +87,6 @@ function QuillForEditor ({
console.log('调用了tab=====>>>>');
}
},
enter: {
key: 'Enter',
handler: function () {
console.log('enter====>>>>>>');
}
},
backspace: {
key: 'Backspace',
/**
@ -103,7 +97,7 @@ function QuillForEditor ({
* @param {*} context 上下文
*/
handler: function (range, context) {
console.log('调用了删除按钮', range, context);
// console.log('调用了删除按钮', range, context);
/**
* 1. 根据range中的index及length值获取删除的起始位置
* length === 0 -> start = index - 1;
@ -112,13 +106,13 @@ function QuillForEditor ({
* ctx = this.quill.getText(start, length === 0 ? 1 : length);
* 3. 判断当前删除的下划线是第几个
*/
const {index, length} = range;
const _start = length === 0 ? index - 1 : index;
const _length = length || 1;
let delCtx = this.quill.getText(_start, _length);
// const {index, length} = range;
// const _start = length === 0 ? index - 1 : index;
// const _length = length || 1;
// let delCtx = this.quill.getText(_start, _length);
// aa
console.log(delCtx.match(/▁/g));
console.log('删除的文本信息=====>>>>', delCtx);
// console.log(delCtx.match(/▁/g));
// console.log('删除的文本信息=====>>>>', delCtx);
// const r = window.confirm('确定要删除吗?')
// if (r) {
// // 调用传入的删除事件
@ -153,12 +147,6 @@ function QuillForEditor ({
editorRef.current.appendChild(quillNode);
const _quill = new Quill(editorRef.current, quillOption);
// _quill.keyboard.addBinding({
// key: 'tab'
// }, function (range, context) {
// console.log('点击了键盘的删除按钮: ', range, context);
// });
setQuill(_quill);
// 处理图片上传功能
_quill.getModule('toolbar').addHandler('image', (e) => {

Write Preview
Loading…
Cancel
Save