\n' +
'
\n' +
@@ -37,13 +37,41 @@ $.fn.bootstrapViewer = function (options) {
} else {
throw "图片不存在"
}
+ $('#bootstrapViewer').on('hidden.bs.modal', function(){
+ $('#bootstrapViewer').remove();
+ });
+ var $moveDiv = $('#bootstrapViewer .modal-dialog');
+ var isMove = false;
+ var div_x = $moveDiv.offset().left;
+ var div_y = $moveDiv.offset().top;
+
+ var mousedownFunc = function (e) {
+ if (isMove) {
+ var left = e.pageX - div_x;
+ var top = e.pageY - div_y;
+ if(left < 0){ left = 0}
+ if(top < 0){ top = 0}
+ $moveDiv.css({"left": left, "top":top});
+ }
+ }
+
+ $moveDiv.mousedown(function (e) {
+ $moveDiv.css({ left: $moveDiv[0].offsetLeft, top: $moveDiv[0].offsetTop, marginTop: 0, position: 'absolute' });
+
+ isMove = true;
+ div_x = e.pageX - $moveDiv.offset().left;
+ div_y = e.pageY - $moveDiv.offset().top;
+ $(document).mousemove(mousedownFunc);
+ }).mouseup(function () {
+ isMove = false;
+ $(document).unbind('mousemove', mousedownFunc);
+ });
})
$(this).on('mouseover', function () {
$(this).css('cursor', 'zoom-in');
})
-
}
$.fn.bootstrapViewer.defaults = {
src: 'src'
diff --git a/app/assets/javascripts/subject_lists.js b/app/assets/javascripts/subject_lists.js
new file mode 100644
index 000000000..dee720fac
--- /dev/null
+++ b/app/assets/javascripts/subject_lists.js
@@ -0,0 +1,2 @@
+// Place all the behaviors and hooks related to the matching controller here.
+// All this logic will automatically be available in application.js.
diff --git a/app/assets/stylesheets/admins/carousels.scss b/app/assets/stylesheets/admins/carousels.scss
new file mode 100644
index 000000000..8e8728aaf
--- /dev/null
+++ b/app/assets/stylesheets/admins/carousels.scss
@@ -0,0 +1,60 @@
+.admins-carousels-index-page {
+ .carousels-card {
+ .custom-carousel-item {
+ & > .drag {
+ cursor: move;
+ background: #fff;
+ box-shadow: 1px 2px 5px 3px #f0f0f0;
+ }
+
+ &-no {
+ font-size: 28px;
+ text-align: center;
+ }
+
+ &-img {
+ cursor: pointer;
+ width: 100%;
+ height: 60px;
+
+ & > img {
+ display: block;
+ width: 100%;
+ height: 60px;
+ background: #F5F5F5;
+ }
+ }
+
+ .not_active {
+ background: #F0F0F0;
+ }
+
+ .delete-btn {
+ font-size: 20px;
+ color: red;
+ cursor: pointer;
+ }
+
+ .save-url-btn {
+ cursor: pointer;
+ }
+
+ .operate-box {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ }
+
+ .online-check-box {
+ font-size: 20px;
+ }
+
+ .name-input {
+ flex: 1;
+ }
+ .link-input {
+ flex: 3;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/admins/laboratories.scss b/app/assets/stylesheets/admins/laboratories.scss
new file mode 100644
index 000000000..ad5c8c5a8
--- /dev/null
+++ b/app/assets/stylesheets/admins/laboratories.scss
@@ -0,0 +1,99 @@
+.admins-laboratories-index-page {
+ .laboratory-list-table {
+ .member-container {
+ .laboratory-user {
+ display: flex;
+ justify-content: center;
+ flex-wrap: wrap;
+
+ .laboratory-user-item {
+ display: flex;
+ align-items: center;
+ height: 22px;
+ line-height: 22px;
+ padding: 2px 5px;
+ margin: 2px 2px;
+ border: 1px solid #91D5FF;
+ background-color: #E6F7FF;
+ color: #91D5FF;
+ border-radius: 4px;
+ }
+ }
+ }
+ }
+}
+.admins-laboratory-settings-show-page, .admins-laboratory-settings-update-page {
+ .edit-laboratory-setting-container {
+ .logo-item {
+ display: flex;
+
+ &-img {
+ display: block;
+ width: 80px;
+ height: 80px;
+ }
+
+ &-upload {
+ cursor: pointer;
+ position: absolute;
+ top: 0;
+ width: 80px;
+ height: 80px;
+ background: #F5F5F5;
+ border: 1px solid #E5E5E5;
+
+ &::before {
+ content: '';
+ position: absolute;
+ top: 27px;
+ left: 39px;
+ width: 2px;
+ height: 26px;
+ background: #E5E5E5;
+ }
+
+ &::after {
+ content: '';
+ position: absolute;
+ top: 39px;
+ left: 27px;
+ width: 26px;
+ height: 2px;
+ background: #E5E5E5;
+ }
+ }
+
+ &-left {
+ position: relative;
+ width: 80px;
+ height: 80px;
+
+ &.has-img {
+ .logo-item-upload {
+ display: none;
+ }
+
+ &:hover {
+ .logo-item-upload {
+ display: block;
+ background: rgba(145, 145, 145, 0.8);
+ }
+ }
+ }
+ }
+
+ &-right {
+ display: flex;
+ flex-direction: column;
+ justify-content: space-between;
+ color: #777777;
+ font-size: 12px;
+ }
+
+ &-title {
+ color: #23272B;
+ font-size: 14px;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/assets/stylesheets/subject_lists.scss b/app/assets/stylesheets/subject_lists.scss
new file mode 100644
index 000000000..bf0f29103
--- /dev/null
+++ b/app/assets/stylesheets/subject_lists.scss
@@ -0,0 +1,3 @@
+// Place all the styles related to the subject_lists controller here.
+// They will automatically be included in application.css.
+// You can use Sass (SCSS) here: http://sass-lang.com/
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 9106d1474..fed6ec280 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -33,7 +33,7 @@ class AccountsController < ApplicationController
uid_logger("start register: verifi_code is #{verifi_code}, code is #{code}, time is #{Time.now.to_i - verifi_code.try(:created_at).to_i}")
# check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
# todo 上线前请删除万能验证码"513231"
- unless code == "513231" && request.subdomain == "pre-newweb"
+ unless code == "513231" && request.subdomain == "test-newweb"
return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
end
diff --git a/app/controllers/admins/carousels_controller.rb b/app/controllers/admins/carousels_controller.rb
new file mode 100644
index 000000000..cd693d2fd
--- /dev/null
+++ b/app/controllers/admins/carousels_controller.rb
@@ -0,0 +1,80 @@
+class Admins::CarouselsController < Admins::BaseController
+ before_action :convert_file!, only: [:create]
+
+ def index
+ @images = PortalImage.order(position: :asc)
+ end
+
+ def create
+ position = PortalImage.count + 1
+
+ ActiveRecord::Base.transaction do
+ image = PortalImage.create!(create_params.merge(position: position))
+
+ file_path = Util::FileManage.disk_filename('PortalImage', image.id)
+ File.delete(file_path) if File.exist?(file_path) # 删除之前的文件
+ Util.write_file(@file, file_path)
+ end
+
+ flash[:success] = '保存成功'
+ redirect_to admins_carousels_path
+ end
+
+ def update
+ current_image.update!(update_params)
+ render_ok
+ end
+
+ def destroy
+ ActiveRecord::Base.transaction do
+ current_image.destroy!
+ # 前移
+ PortalImage.where('position > ?', current_image.position)
+ .update_all('position = position - 1')
+
+ file_path = Util::FileManage.disk_filename('PortalImage', current_image.id)
+ File.delete(file_path) if File.exist?(file_path)
+ end
+ render_delete_success
+ end
+
+ def drag
+ move = PortalImage.find_by(id: params[:move_id])
+ after = PortalImage.find_by(id: params[:after_id])
+
+ Admins::DragPortalImageService.call(move, after)
+ render_ok
+ rescue Admins::DragPortalImageService::Error => e
+ render_error(e.message)
+ end
+
+ private
+
+ def current_image
+ @_current_image ||= PortalImage.find(params[:id])
+ end
+
+ def create_params
+ params.require(:portal_image).permit(:name, :link)
+ end
+
+ def update_params
+ params.permit(:name, :link, :status)
+ end
+
+ def convert_file!
+ max_size = 10 * 1024 * 1024 # 10M
+ file = params.dig('portal_image', 'image')
+ if file.class == ActionDispatch::Http::UploadedFile
+ @file = file
+ render_error('请上传文件') if @file.size.zero?
+ render_error('文件大小超过限制') if @file.size > max_size
+ else
+ file = file.to_s.strip
+ return render_error('请上传正确的图片') if file.blank?
+ @file = Util.convert_base64_image(file, max_size: max_size)
+ end
+ rescue Base64ImageConverter::Error => ex
+ render_error(ex.message)
+ end
+end
diff --git a/app/controllers/admins/laboratories_controller.rb b/app/controllers/admins/laboratories_controller.rb
new file mode 100644
index 000000000..e393c6677
--- /dev/null
+++ b/app/controllers/admins/laboratories_controller.rb
@@ -0,0 +1,32 @@
+class Admins::LaboratoriesController < Admins::BaseController
+ def index
+ params[:sort_by] = params[:sort_by].presence || 'id'
+ params[:sort_direction] = params[:sort_direction].presence || 'desc'
+
+ laboratories = Admins::LaboratoryQuery.call(params)
+ @laboratories = paginate laboratories.preload(:school, :laboratory_users)
+ end
+
+ def create
+ Admins::CreateLaboratoryService.call(create_params)
+ render_ok
+ rescue Admins::CreateLaboratoryService::Error => ex
+ render_error(ex.message)
+ end
+
+ def destroy
+ current_laboratory.destroy!
+
+ render_delete_success
+ end
+
+ private
+
+ def current_laboratory
+ @_current_laboratory ||= Laboratory.find(params[:id])
+ end
+
+ def create_params
+ params.permit(:school_id)
+ end
+end
\ No newline at end of file
diff --git a/app/controllers/admins/laboratory_settings_controller.rb b/app/controllers/admins/laboratory_settings_controller.rb
new file mode 100644
index 000000000..f9676bfd3
--- /dev/null
+++ b/app/controllers/admins/laboratory_settings_controller.rb
@@ -0,0 +1,20 @@
+class Admins::LaboratorySettingsController < Admins::BaseController
+ def show
+ @laboratory = current_laboratory
+ end
+
+ def update
+ Admins::SaveLaboratorySettingService.call(current_laboratory, form_params)
+ render_ok
+ end
+
+ private
+
+ def current_laboratory
+ @_current_laboratory ||= Laboratory.find(params[:laboratory_id])
+ end
+
+ def form_params
+ params.permit(:identifier, :name, :nav_logo, :login_logo, :tab_logo, :footer, navbar: %i[name link hidden])
+ end
+end
\ No newline at end of file
diff --git a/app/controllers/admins/laboratory_users_controller.rb b/app/controllers/admins/laboratory_users_controller.rb
new file mode 100644
index 000000000..36e389a3e
--- /dev/null
+++ b/app/controllers/admins/laboratory_users_controller.rb
@@ -0,0 +1,19 @@
+class Admins::LaboratoryUsersController < Admins::BaseController
+ helper_method :current_laboratory
+
+ def create
+ Admins::AddLaboratoryUserService.call(current_laboratory, params.permit(user_ids: []))
+ current_laboratory.reload
+ end
+
+ def destroy
+ @laboratory_user = current_laboratory.laboratory_users.find_by(user_id: params[:user_id])
+ @laboratory_user.destroy! if @laboratory_user.present?
+ end
+
+ private
+
+ def current_laboratory
+ @_current_laboratory ||= Laboratory.find(params[:laboratory_id])
+ end
+end
\ No newline at end of file
diff --git a/app/controllers/admins/shixun_settings_controller.rb b/app/controllers/admins/shixun_settings_controller.rb
index 0ccd5725d..9202ccce6 100644
--- a/app/controllers/admins/shixun_settings_controller.rb
+++ b/app/controllers/admins/shixun_settings_controller.rb
@@ -92,6 +92,6 @@ class Admins::ShixunSettingsController < Admins::BaseController
end
def setting_params
- params.permit(:use_scope,:excute_time,:close,:status,:can_copy,:webssh,:hidden,:homepage_show,:task_pass,:code_hidden,:id,tag_repertoires:[])
+ params.permit(:use_scope,:excute_time,:close,:status,:can_copy,:webssh,:hidden,:homepage_show,:task_pass,:code_hidden,:page_no, :id,tag_repertoires:[])
end
end
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index f42ed6cce..15ef1b19d 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -7,6 +7,7 @@ class ApplicationController < ActionController::Base
include ControllerRescueHandler
include GitHelper
include LoggerHelper
+ include LaboratoryHelper
include LoginHelper
protect_from_forgery prepend: true, unless: -> { request.format.json? }
@@ -339,7 +340,7 @@ class ApplicationController < ActionController::Base
# type 0 创始内容， 1 最新内容
def game_passed_code(path, myshixun, game_id)
# 如果代码窗口是隐藏的，则不用保存代码
- return if myshixun.shixun.hide_code
+ return if myshixun.shixun.hide_code || myshixun.shixun.vnc
file_content = git_fle_content myshixun.repo_path, path
unless file_content.present?
raise("获取文件代码异常")
diff --git a/app/controllers/concerns/laboratory_helper.rb b/app/controllers/concerns/laboratory_helper.rb
new file mode 100644
index 000000000..fbb18b36d
--- /dev/null
+++ b/app/controllers/concerns/laboratory_helper.rb
@@ -0,0 +1,15 @@
+module LaboratoryHelper
+ extend ActiveSupport::Concern
+
+ included do
+ helper_method :default_setting
+ end
+
+ def current_laboratory
+ @_current_laboratory ||= (Laboratory.find_by_subdomain(request.subdomain) || Laboratory.find(1))
+ end
+
+ def default_setting
+ @_default_setting ||= LaboratorySetting.find_by(laboratory_id: 1)
+ end
+end
\ No newline at end of file
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index d2c9f88d2..0c643d15c 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -12,10 +12,10 @@ class CoursesController < ApplicationController
end
before_action :require_login, except: [:index, :show, :students, :teachers, :board_list, :mine, :all_course_groups,
- :left_banner, :top_banner, :informs, :online_learning]
+ :left_banner, :top_banner, :informs, :online_learning, :course_groups]
before_action :check_account, only: [:new, :create, :apply_to_join_course, :join_excellent_course]
before_action :check_auth, except: [:index, :show, :students, :teachers, :board_list, :mine, :all_course_groups,
- :left_banner, :top_banner, :apply_to_join_course, :exit_course]
+ :left_banner, :top_banner, :apply_to_join_course, :exit_course, :course_groups]
before_action :set_course, only: [:show, :update, :destroy, :settings, :set_invite_code_halt,
:set_public_or_private, :search_teacher_candidate, :teachers, :apply_teachers,
:top_banner, :left_banner, :add_teacher_popup, :add_teacher,
@@ -27,7 +27,8 @@ class CoursesController < ApplicationController
:attahcment_category_list,:export_member_scores_excel, :duplicate_course,
:switch_to_teacher, :switch_to_assistant, :switch_to_student, :exit_course,
:informs, :update_informs, :online_learning, :update_task_position, :tasks_list,
- :join_excellent_course, :export_couser_info, :export_member_act_score, :new_informs, :delete_informs]
+ :join_excellent_course, :export_couser_info, :export_member_act_score, :new_informs,
+ :delete_informs, :change_member_role, :course_groups, :join_course_group]
before_action :user_course_identity, except: [:join_excellent_course, :index, :create, :new, :apply_to_join_course,
:search_course_list, :get_historical_course_students, :mine, :search_slim, :board_list]
before_action :teacher_allowed, only: [:update, :destroy, :settings, :search_teacher_candidate,
@@ -39,7 +40,7 @@ class CoursesController < ApplicationController
:set_course_group, :create_group_by_importing_file,
:update_task_position, :tasks_list]
before_action :teacher_or_admin_allowed, only: [:graduation_group_list, :create_graduation_group, :join_graduation_group,
- :change_course_teacher, :course_group_list,
+ :change_course_teacher, :course_group_list, :change_member_role,
:teacher_application_review, :apply_teachers, :delete_course_teacher]
before_action :validate_course_name, only: [:create, :update]
before_action :find_board, only: :board_list
@@ -269,9 +270,10 @@ class CoursesController < ApplicationController
def online_learning
@subject = @course.subject
- @stages = @course.course_stages
+ @stages = @course.course_stages.includes(:shixuns)
@user = current_user
- @start_learning = @user_course_identity == Course::STUDENT && @course.learning?(current_user.id)
+ @myshixuns = @user.myshixuns.where(shixun_id: @course.course_stage_shixuns.pluck(:shixun_id))
+ @start_learning = @user_course_identity == Course::STUDENT && @myshixuns.present?
end
def search_course_list
@@ -307,8 +309,8 @@ class CoursesController < ApplicationController
def destroy
if @course.is_delete == 0
@course.delete!
- Tiding.create!(user_id: @course.tea_id, trigger_user_id: 0, container_id: @course.id,
- container_type: 'Course', tiding_type: 'Delete', extra: @course.name)
+ Tiding.create!(user_id: current_user.id, trigger_user_id: current_user.id, container_id: @course.id,
+ container_type: 'DeleteCourse', tiding_type: 'System', belong_container: @course, extra: @course.name)
normal_status(0, "成功")
else
normal_status(-1, "课堂已删除，无需重复操作")
@@ -339,8 +341,8 @@ class CoursesController < ApplicationController
@has_graduation_design = @course.course_modules.graduation_module_not_hidden.any?
- sort = params[:sort] || "desc"
- @order = params[:order].to_i
+ sort = params[:sort] || "asc"
+ @order = params[:order] ? params[:order].to_i : 1
if @order.present?
case @order
when 1
@@ -546,6 +548,61 @@ class CoursesController < ApplicationController
end
end
+ # 修改角色
+ def change_member_role
+ tip_exception("请至少选择一个角色") if params[:roles].blank?
+ tip_exception("不能具有老师、助教两种角色") if params[:roles].include?("PROFESSOR") && params[:roles].include?("ASSISTANT_PROFESSOR")
+ tip_exception("管理员不能切换为助教或老师") if params[:user_id].to_i == @course.tea_id &&
+ (params[:roles].include?("PROFESSOR") || params[:roles].include?("ASSISTANT_PROFESSOR"))
+
+ course_members = @course.course_members.where(user_id: params[:user_id])
+ tip_exception("非课堂成员不能修改角色") if course_members.blank?
+
+ ActiveRecord::Base.transaction do
+ # 第一次修改为教师或助教身份时直接创建数据
+ if params[:roles].include?("CREATOR")
+ teacher_member = course_members.where(role: %i[CREATOR]).take
+ elsif (params[:roles].include?("PROFESSOR") || params[:roles].include?("ASSISTANT_PROFESSOR")) && !course_members.exists?(role: %i[PROFESSOR ASSISTANT_PROFESSOR])
+ teacher_member = CourseMember.create!(course_id: @course.id, user_id: params[:user_id], role: params[:roles].include?("PROFESSOR") ? 2 : 3)
+ elsif course_members.exists?(role: %i[PROFESSOR ASSISTANT_PROFESSOR])
+ teacher_member = course_members.where(role: %i[PROFESSOR ASSISTANT_PROFESSOR]).take
+ if params[:roles].include?("PROFESSOR") || params[:roles].include?("ASSISTANT_PROFESSOR")
+ # 如果之前有老师身份且老师身份要调整时，只需要修改role字段
+ if !params[:roles].include?(teacher_member.role) && params[:roles].include?("PROFESSOR")
+ teacher_member.PROFESSOR!
+ elsif !params[:roles].include?(teacher_member.role) && params[:roles].include?("ASSISTANT_PROFESSOR")
+ teacher_member.ASSISTANT_PROFESSOR!
+ end
+ teacher_member.save!
+ else
+ # 不含教师的参数时删除记录
+ teacher_member.destroy!
+ # CourseDeleteStudentNotifyJob.perform_later(@course.id, [teacher_member.user_id], current_user.id)
+ end
+ end
+
+ # 学生身份的处理
+ student_member = course_members.where(role: %i[STUDENT]).take
+ if params[:roles].include?("STUDENT") && student_member.blank?
+ correspond_teacher_exist = CourseMember.exists?(user_id: params[:user_id], is_active: 1, course_id: @course.id, role: %i[CREATOR PROFESSOR ASSISTANT_PROFESSOR])
+ new_student = CourseMember.new(user_id: params[:user_id], course_id: @course.id, role: 4)
+ new_student.is_active = 0 if correspond_teacher_exist
+ new_student.save!
+
+ CourseAddStudentCreateWorksJob.perform_later(@course.id, [params[:user_id]])
+ # StudentJoinCourseNotifyJob.perform_later(current_user.id, course.id)
+ elsif !params[:roles].include?("STUDENT") && student_member.present?
+ # 删除学生身份时激活老师身份
+ teacher_member.update_attributes!(is_active: 1) if student_member.is_active && teacher_member.present?
+ student_member.destroy!
+ CourseDeleteStudentDeleteWorksJob.perform_later(@course.id, [params[:user_id]])
+ # CourseDeleteStudentNotifyJob.perform_later(@course.id, [params[:user_id]], current_user.id)
+ end
+
+ normal_status(0, "修改成功")
+ end
+ end
+
# 教师和助教角色转换的接口
def change_course_teacher
begin
@@ -572,6 +629,10 @@ class CoursesController < ApplicationController
tip_exception("删除失败") if course_member.CREATOR? or course_member.STUDENT?
course_student = CourseMember.find_by(user_id: course_member.user_id, course_id: @course.id, role: %i[STUDENT])
+ # Tiding.create!(user_id: course_member.user_id, trigger_user_id: current_user.id, container_id: @course.id,
+ # container_type: 'DeleteCourseMember', tiding_type: 'System', belong_container: @course, extra: @course.name)
+ CourseDeleteStudentNotifyJob.perform_later(@course.id, [course_member.user_id], current_user.id)
+
course_member.destroy!
course_student.update_attributes(is_active: 1) if course_student.present? && !course_student.is_active
normal_status(0, "删除成功")
@@ -710,8 +771,8 @@ class CoursesController < ApplicationController
# 学生列表(包括各个子分班的学生列表)及搜索
def students
search = params[:search].present? ? params[:search].strip : nil
- order = params[:order].present? ? params[:order].to_i : 0
- sort = params[:sort].present? ? params[:sort] : "desc"
+ order = params[:order].present? ? params[:order].to_i : 1
+ sort = params[:sort].present? ? params[:sort] : "asc"
course_group_id = params[:course_group_id].present? ? params[:course_group_id].to_i : nil
@students = CourseMember.students(@course)
@@ -761,6 +822,26 @@ class CoursesController < ApplicationController
end
end
+ # 分班列表
+ def course_groups
+ @course_groups = @course.course_groups
+ @course_groups = @course_groups.where("name like ?", "%#{params[:search]}%") unless params[:search].blank?
+ @all_group_count = @course_groups.size
+ @teachers = @course.teachers.includes(:user, :teacher_course_groups) if @user_course_identity < Course::NORMAL
+ @current_group_id = @course.students.where(user_id: current_user.id).take&.course_group_id if @user_course_identity == Course::STUDENT
+ end
+
+ # 学生自动加入分班
+ def join_course_group
+ tip_exception("学生才能加入分班") if @user_course_identity != Course::STUDENT
+ course_group = CourseGroup.find_by!(id: params[:course_group_id], course_id: @course.id)
+ member = CourseMember.find_by!(user_id: current_user.id, course_id: @course.id, role: 4)
+ if course_group && member
+ member.update_attributes!(course_group_id: course_group.id)
+ normal_status(0, "加入成功")
+ end
+ end
+
# 将学生批量移动到某个分班
def transfer_to_course_group
ActiveRecord::Base.transaction do
@@ -802,6 +883,7 @@ class CoursesController < ApplicationController
end
end
CourseDeleteStudentDeleteWorksJob.perform_later(@course.id, student_ids) if student_ids.present?
+ CourseDeleteStudentNotifyJob.perform_later(@course.id, student_ids, current_user.id) if student_ids.present?
normal_status(0, "操作成功")
rescue => e
uid_logger(e.message)
@@ -922,14 +1004,16 @@ class CoursesController < ApplicationController
school_name = params[:school_name]
# REDO:Extension
- @users = User.joins(user_extension: :school)
- .where("CONCAT(users.lastname, users.firstname) like ? and schools.name like ?", "%#{name}%", "%#{school_name}%")
+ @users = User.where(status: User::STATUS_ACTIVE)
+ @users = @users.where("concat(users.lastname, users.firstname) like '%#{name}%'") if name.present?
+ # REDO:Extension
+ @users = @users.joins(user_extension: :school).where("schools.name like '%#{school_name}%'") if school_name.present?
@users_count = @users.size
limit = params[:limit] || 20
page = params[:page] || 1
- @users = @users.page(page).per(limit)
+ @users = @users.includes(user_extension: :school).page(page).per(limit)
end
# 申请加入课堂
diff --git a/app/controllers/ecs/course_achievement_methods_controller.rb b/app/controllers/ecs/course_achievement_methods_controller.rb
index 389169258..4a9968fb2 100644
--- a/app/controllers/ecs/course_achievement_methods_controller.rb
+++ b/app/controllers/ecs/course_achievement_methods_controller.rb
@@ -1,17 +1,22 @@
class Ecs::CourseAchievementMethodsController < Ecs::CourseBaseController
def show
- include_associations = { ec_course_achievement_methods: [:ec_course_evaluation, :ec_course_evaluation_subitems] }
+ include_associations = { ec_course_achievement_methods:
+ [:ec_course_evaluation, ec_achievement_evaluation_relates: :ec_course_evaluation_subitem] }
@course_targets = current_course.ec_course_targets.includes(include_associations)
end
def create
- @course_target = Ecs::CreateCourseAchievementMethodsService.call(current_course_target, create_params)
+ Ecs::CreateCourseAchievementMethodsService.call(current_course_target, create_params)
+ render_ok
end
private
def create_params
- params.permit(course_achievement_methods: %i[id course_evaluation_id course_evaluation_subitem_ids score percentage])
+ params.permit(course_achievement_methods: [
+ :id, :course_evaluation_id, :score, :percentage,
+ course_evaluation_relates: %i[:subitem_id position]
+ ])
end
def current_course_target
diff --git a/app/controllers/ecs/course_managers_controller.rb b/app/controllers/ecs/course_managers_controller.rb
index 714dac580..132a212d7 100644
--- a/app/controllers/ecs/course_managers_controller.rb
+++ b/app/controllers/ecs/course_managers_controller.rb
@@ -3,7 +3,8 @@ class Ecs::CourseManagersController < Ecs::CourseBaseController
before_action :check_major_manager_permission!, only: [:create, :destroy]
def create
- @user = Ecs::CreateCourseManagerService.call(current_course, params[:user_id])
+ Ecs::CreateCourseManagerService.call(current_course, params[:user_ids])
+ render_ok
rescue Ecs::CreateCourseManagerService::Error => ex
render_error(ex.message)
end
diff --git a/app/controllers/ecs/course_targets_controller.rb b/app/controllers/ecs/course_targets_controller.rb
index 744840c39..bcd09f64a 100644
--- a/app/controllers/ecs/course_targets_controller.rb
+++ b/app/controllers/ecs/course_targets_controller.rb
@@ -19,7 +19,9 @@ class Ecs::CourseTargetsController < Ecs::CourseBaseController
end
def with_achievement_methods
- @course_targets = current_course.ec_course_targets.includes(:ec_graduation_subitems, :ec_course_achievement_methods)
+ @course_targets = current_course.ec_course_targets
+ .includes(ec_course_achievement_methods:
+ [:ec_course_evaluation, ec_achievement_evaluation_relates: :ec_course_evaluation_subitem])
end
private
diff --git a/app/controllers/ecs/evaluations_controller.rb b/app/controllers/ecs/evaluations_controller.rb
index 18a78e1c9..09151132f 100644
--- a/app/controllers/ecs/evaluations_controller.rb
+++ b/app/controllers/ecs/evaluations_controller.rb
@@ -5,8 +5,9 @@ class Ecs::EvaluationsController < Ecs::CourseBaseController
render_ok(
course_targets: service.course_targets,
course_achievement: service.course_achievement,
+ course_rate: service.course_rate,
graduation_subitem_evaluations: service.graduation_subitem_evaluations,
- score_levels_map: service.score_levels_map
+ score_levels: service.score_levels
)
end
diff --git a/app/controllers/ecs/reach_criteria_controller.rb b/app/controllers/ecs/reach_criteria_controller.rb
index bbfa123cd..0850f3aff 100644
--- a/app/controllers/ecs/reach_criteria_controller.rb
+++ b/app/controllers/ecs/reach_criteria_controller.rb
@@ -1,4 +1,4 @@
-class ReachCriteriaController < Ecs::BaseController
+class Ecs::ReachCriteriaController < Ecs::BaseController
before_action :check_major_manager_permission!, only: [:create]
def create
diff --git a/app/controllers/ecs/reach_evaluations_controller.rb b/app/controllers/ecs/reach_evaluations_controller.rb
index 25ac24656..41ea0d52c 100644
--- a/app/controllers/ecs/reach_evaluations_controller.rb
+++ b/app/controllers/ecs/reach_evaluations_controller.rb
@@ -1,7 +1,7 @@
class Ecs::ReachEvaluationsController < Ecs::BaseController
def show
- preload = { ec_graduation_subitems: { ec_course_support: [:ec_course, :ec_graduation_requirement_calculation] } }
+ preload = { ec_graduation_subitems: { ec_course_supports: [:ec_course, :ec_graduation_requirement_calculation] } }
@graduation_requirements = current_year.ec_graduation_requirements.includes(preload)
respond_to do |format|
diff --git a/app/controllers/ecs/requirement_support_objectives_controller.rb b/app/controllers/ecs/requirement_support_objectives_controller.rb
index 7aeba21bb..1abc5994f 100644
--- a/app/controllers/ecs/requirement_support_objectives_controller.rb
+++ b/app/controllers/ecs/requirement_support_objectives_controller.rb
@@ -19,7 +19,7 @@ class Ecs::RequirementSupportObjectivesController < Ecs::BaseController
end
def create
- record = EcRequirementVsObjective.find_by_or_initialize(permit_params)
+ record = EcRequirementVsObjective.find_or_initialize_by(permit_params)
record.status = true
record.save!
@@ -36,18 +36,20 @@ class Ecs::RequirementSupportObjectivesController < Ecs::BaseController
private
def check_record_exists!
- unless current_year.ec_graduation_requirements.exists?(id: params[:graduation_requirement_id])
+ unless current_year.ec_graduation_requirements.exists?(id: params[:ec_graduation_requirement_id])
render_not_found
return
end
- unless current_year.ec_training_subitems.exists?(id: params[:training_subitem_id])
+ unless current_year.ec_training_subitems.exists?(id: params[:ec_training_subitem_id])
render_not_found
return
end
end
def permit_params
- params.require(%i[graduation_requirement_id training_subitem_id])
+ hash = params.permit(%i[ec_graduation_requirement_id ec_training_subitem_id])
+ hash[:ec_training_objective_id] = hash.delete(:ec_training_subitem_id)
+ hash
end
end
\ No newline at end of file
diff --git a/app/controllers/ecs/subitem_support_standards_controller.rb b/app/controllers/ecs/subitem_support_standards_controller.rb
index 697d5acc4..cb5870892 100644
--- a/app/controllers/ecs/subitem_support_standards_controller.rb
+++ b/app/controllers/ecs/subitem_support_standards_controller.rb
@@ -4,7 +4,7 @@ class Ecs::SubitemSupportStandardsController < Ecs::BaseController
def show
@graduation_standards = EcGraduationStandard.all
- @graduation_subitems = current_year.ec_graduation_subitems
+ @graduation_subitems = current_year.ec_graduation_subitems.includes(:ec_graduation_requirement)
ids = @graduation_subitems.map(&:id)
@subitem_support_standards = EcRequireSubVsStandard.where(ec_graduation_subitem_id: ids, status: true)
@@ -19,7 +19,7 @@ class Ecs::SubitemSupportStandardsController < Ecs::BaseController
end
def create
- record = EcRequireSubVsStandard.find_by_or_initialize(permit_params)
+ record = EcRequireSubVsStandard.find_or_initialize_by(permit_params)
record.status = true
record.save!
@@ -36,18 +36,18 @@ class Ecs::SubitemSupportStandardsController < Ecs::BaseController
private
def check_record_exists!
- unless current_year.ec_graduation_subitems.exists?(id: params[:graduation_subitem_id])
+ unless current_year.ec_graduation_subitems.exists?(id: params[:ec_graduation_subitem_id])
render_not_found
return
end
- unless EcGraduationStandard.exists?(id: params[:graduation_standard_id])
+ unless EcGraduationStandard.exists?(id: params[:ec_graduation_standard_id])
render_not_found
return
end
end
def permit_params
- params.require(%i[graduation_subitem_id graduation_standard_id])
+ params.permit(%i[ec_graduation_subitem_id ec_graduation_standard_id])
end
end
\ No newline at end of file
diff --git a/app/controllers/exercise_answers_controller.rb b/app/controllers/exercise_answers_controller.rb
index 3fc27c8f2..b1e23071b 100644
--- a/app/controllers/exercise_answers_controller.rb
+++ b/app/controllers/exercise_answers_controller.rb
@@ -14,19 +14,15 @@ class ExerciseAnswersController < ApplicationController
else
ea = @exercise_question.exercise_answers.search_answer_users("user_id",current_user.id) #试卷的当前用户的答案
if q_type == Exercise::SINGLE || q_type == Exercise::JUDGMENT #选择题（单选）/判断题
- ea_choice = ea.search_exercise_answer("exercise_choice_id",choice_id).first
- answer_option = {
+ if ea.exists?
+ ea.first.update_attribute(:exercise_choice_id,choice_id )
+ else
+ answer_option = {
:user_id => current_user.id,
:exercise_question_id => @exercise_question.id,
:exercise_choice_id => choice_id,
:answer_text => ""
- }
- if ea_choice.present? #如果当前用户的答案存在，再次点击，即为删除
- ea_choice.destroy
- else
- if @exercise_question.exercise_standard_answers.count <= 1 #单选题的时候
- ea.first.destroy if ea.present?
- end
+ }
ex_a = ExerciseAnswer.new(answer_option)
ex_a.save!
end
@@ -110,7 +106,7 @@ class ExerciseAnswersController < ApplicationController
elsif @exercise_user.commit_status == 1
normal_status(-1,"已提交/已结束的试卷不允许修改！")
else
- if (@exercise_user_status == Exercise::DEADLINE && @exercise_user.commit_status == 0) || (@exercise.time > 0 && @exercise_user.start_at.present? && ((@exercise_user.start_at + (@exercise.time.to_i + 1).minutes) < Time.now))
+ if (@exercise_user_status == Exercise::DEADLINE && @exercise_user.commit_status == 0) || (@exercise.time > 0 && @exercise_user.start_at.present? && ((@exercise_user.start_at + @exercise.time.to_i.minutes) < Time.now))
objective_score = calculate_student_score(@exercise,current_user)[:total_score]
subjective_score = @exercise_user.subjective_score < 0.0 ? 0.0 : @exercise_user.subjective_score
total_score = objective_score + subjective_score
diff --git a/app/controllers/exercise_questions_controller.rb b/app/controllers/exercise_questions_controller.rb
index bb28fff54..9eeba6adc 100644
--- a/app/controllers/exercise_questions_controller.rb
+++ b/app/controllers/exercise_questions_controller.rb
@@ -656,7 +656,17 @@ class ExerciseQuestionsController < ApplicationController
:exercise_answer_id => ex_answer_comment_id
}
@exercise_comments = ExerciseAnswerComment.new(comment_option)
- @exercise_comments.save
+ @exercise_comments.save!
+
+ # 给被评阅人发送消息，同一个教师评阅无需重复发消息
+
+ unless Tiding.where(user_id: @user_id, trigger_user_id: current_user.id, parent_container_id: @exercise.id, parent_container_type: "ExerciseScore").exists?
+ Tiding.create!(user_id: @user_id, trigger_user_id: current_user.id, container_id: @exercise.id,
+ container_type: "Exercise", parent_container_id: @exercise.id,
+ parent_container_type: "ExerciseScore", belong_container_id: @course.id,
+ belong_container_type: 'Course', tiding_type: "Exercise")
+ end
+
end
rescue Exception => e
uid_logger_error(e.message)
diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb
index 3be35345e..191825cc3 100644
--- a/app/controllers/exercises_controller.rb
+++ b/app/controllers/exercises_controller.rb
@@ -25,85 +25,83 @@ class ExercisesController < ApplicationController
include ExercisesHelper
def index
- ActiveRecord::Base.transaction do
- begin
- # 按发布时间或创建时间排序
- @exercises_all = @course.exercises
- member_show_exercises = @exercises_all.is_exercise_published #已发布的或已截止的试卷
- @current_user_ = current_user
-
- # 课堂的学生人数
- @course_all_members = @course.students #当前课堂的全部学生
- @current_student = @course_all_members.course_find_by_ids("user_id",current_user.id) #当前用户是否为课堂的学生
-
- # exercises的不同用户群体的显示
- if @user_course_identity < Course::STUDENT # @is_teacher_or 1为老师/管理员/助教
- @is_teacher_or = 1
- @exercises = @exercises_all #老师能看到全部的试卷，不管是已发布的/未发布的/已截止的/统一设置的/私有设置的（看到内容不同）
- elsif @user_course_identity == Course::STUDENT # 2为课堂成员，能看到统一设置的和自己班级的
- @is_teacher_or = 2
- @member_group_id = @current_student.first.try(:course_group_id).to_i # 成员的分班id，默认为0
- if @member_group_id == 0 #表示是课堂的未分班成员,只能查看统一设置的试卷（已发布的/已截止的）
- @exercises = member_show_exercises.exists? ? member_show_exercises.unified_setting : []
- else #已分班级的成员，可以查看统一设置和单独设置（试卷是发布在该班级）试卷
- # 已发布 当前用户班级分组的 试卷id
- not_exercise_ids = @course.exercise_group_settings.exercise_group_not_published.where("course_group_id = #{@member_group_id}").pluck(:exercise_id)
- @exercises = member_show_exercises.where.not(id: not_exercise_ids)
- end
- else #用户未登陆或不是该课堂成员,仅显示统一设置的（已发布的/已截止的），如有公开，则不显示锁，不公开，则显示锁
- @is_teacher_or = 0
- @exercises = member_show_exercises.unified_setting
+ begin
+ # 按发布时间或创建时间排序
+ @exercises_all = @course.exercises
+ member_show_exercises = @exercises_all.is_exercise_published #已发布的或已截止的试卷
+ @current_user_ = current_user
+
+ # 课堂的学生人数
+ @course_all_members = @course.students #当前课堂的全部学生
+ @current_student = @course_all_members.course_find_by_ids("user_id",current_user.id) #当前用户是否为课堂的学生
+
+ # exercises的不同用户群体的显示
+ if @user_course_identity < Course::STUDENT # @is_teacher_or 1为老师/管理员/助教
+ @is_teacher_or = 1
+ @exercises = @exercises_all #老师能看到全部的试卷，不管是已发布的/未发布的/已截止的/统一设置的/私有设置的（看到内容不同）
+ elsif @user_course_identity == Course::STUDENT # 2为课堂成员，能看到统一设置的和自己班级的
+ @is_teacher_or = 2
+ @member_group_id = @current_student.first.try(:course_group_id).to_i # 成员的分班id，默认为0
+ if @member_group_id == 0 #表示是课堂的未分班成员,只能查看统一设置的试卷（已发布的/已截止的）
+ @exercises = member_show_exercises.exists? ? member_show_exercises.unified_setting : []
+ else #已分班级的成员，可以查看统一设置和单独设置（试卷是发布在该班级）试卷
+ # 已发布 当前用户班级分组的 试卷id
+ publish_exercise_ids = @course.exercise_group_settings.exercise_group_published.where("course_group_id = #{@member_group_id}").pluck(:exercise_id)
+ @exercises = member_show_exercises.unified_setting.or(member_show_exercises.where(id: publish_exercise_ids))
end
+ else #用户未登陆或不是该课堂成员,仅显示统一设置的（已发布的/已截止的），如有公开，则不显示锁，不公开，则显示锁
+ @is_teacher_or = 0
+ @exercises = member_show_exercises.unified_setting
+ end
- if @exercises.size > 0
- if params[:type].present?
- choose_type = params[:type].to_i
- ex_setting_ids = []
- if @is_teacher_or != 2
- @exercises = @exercises.where("exercise_status = #{choose_type}")
- else
- case choose_type
- when 1
- ex_setting_ids = @course.exercise_group_settings.where("course_group_id = #{@member_group_id}").exercise_group_not_published.pluck(:exercise_id)
- when 2
- ex_setting_ids = @course.exercise_group_settings.where("course_group_id = #{@member_group_id}")
- .where("publish_time is not null and publish_time <= ? and end_time > ?",Time.now,Time.now).pluck(:exercise_id)
- when 3
- ex_setting_ids = @course.exercise_group_settings.where("course_group_id = #{@member_group_id}").exercise_group_ended.pluck(:exercise_id)
- end
- unified_setting_ids = @exercises.unified_setting.where("exercise_status = #{choose_type}").pluck(:id)
- ex_ids = (ex_setting_ids + unified_setting_ids).uniq
- @exercises = @exercises.where(id: ex_ids)
+ if @exercises.size > 0
+ if params[:type].present?
+ choose_type = params[:type].to_i
+ ex_setting_ids = []
+ if @is_teacher_or != 2
+ @exercises = @exercises.where("exercise_status = #{choose_type}")
+ else
+ case choose_type
+ when 1
+ ex_setting_ids = @course.exercise_group_settings.where("course_group_id = #{@member_group_id}").exercise_group_not_published.pluck(:exercise_id)
+ when 2
+ ex_setting_ids = @course.exercise_group_settings.where("course_group_id = #{@member_group_id}")
+ .where("publish_time is not null and publish_time <= ? and end_time > ?",Time.now,Time.now).pluck(:exercise_id)
+ when 3
+ ex_setting_ids = @course.exercise_group_settings.where("course_group_id = #{@member_group_id}").exercise_group_ended.pluck(:exercise_id)
end
+ unified_setting_ids = @exercises.unified_setting.where("exercise_status = #{choose_type}").pluck(:id)
+ ex_ids = (ex_setting_ids + unified_setting_ids).uniq
+ @exercises = @exercises.where(id: ex_ids)
end
+ end
- if params[:search].present?
- search_type = params[:search].to_s.strip
- @exercises = @exercises.exercise_search(search_type)
- end
-
- @exercises_select_count = @exercises.size # 全部页面，需返回
- @exercises = @exercises.distinct.order( "IF(ISNULL(publish_time),0,1), publish_time DESC,created_at DESC") #出现错误
-
- # 分页
- @page = params[:page] || 1
- @limit = params[:limit] || 15
- @exercises = @exercises.page(@page).per(@limit)
- @exercises = @exercises&.includes(:published_settings)
- else
- @exercises = []
+ if params[:search].present?
+ search_type = params[:search].to_s.strip
+ @exercises = @exercises.exercise_search(search_type)
end
- @course_all_members_count = @course_all_members.size #当前课堂的学生数
- @exercises_count = @exercises_all.size # 全部页面，需返回
- @exercises_unpublish_counts = @exercises_all.exercise_by_status(1).size #未发布的试卷数
- @exercises_published_counts = @exercises_count - @exercises_unpublish_counts # 已发布的试卷数,包含已截止的
+ @exercises_select_count = @exercises.size # 全部页面，需返回
+ @exercises = @exercises.distinct.order( "IF(ISNULL(publish_time),0,1), publish_time DESC,created_at DESC") #出现错误
- rescue Exception => e
- uid_logger_error(e.message)
- tip_exception(e.message)
- raise ActiveRecord::Rollback
+ # 分页
+ @page = params[:page] || 1
+ @limit = params[:limit] || 15
+ @exercises = @exercises.page(@page).per(@limit)
+ @exercises = @exercises&.includes(:published_settings)
+ else
+ @exercises = []
end
+
+ @course_all_members_count = @course_all_members.size #当前课堂的学生数
+ @exercises_count = @exercises_all.size # 全部页面，需返回
+ @exercises_unpublish_counts = @exercises_all.exercise_by_status(1).size #未发布的试卷数
+ @exercises_published_counts = @exercises_count - @exercises_unpublish_counts # 已发布的试卷数,包含已截止的
+
+ rescue Exception => e
+ uid_logger_error(e.message)
+ tip_exception(e.message)
+ raise ActiveRecord::Rollback
end
end
@@ -685,12 +683,34 @@ class ExercisesController < ApplicationController
end
end
+ # 详情页的立即发布弹框
+ def publish_groups
+ @current_user = current_user
+ # 可立即发布的分班：当前用户管理的分班去除已发布的分班
+ group_ids = @course.charge_group_ids(@current_user) - @exercise.exercise_group_settings.exercise_group_published.pluck(:course_group_id)
+ @course_groups = @course.course_groups.where(id: group_ids)
+ @group_settings = @exercise.exercise_group_settings.where(course_group_id: group_ids)
+ end
+
#首页批量或单独 立即发布,应是跳出弹窗，设置开始时间和截止时间。
def publish
- tip_exception("缺少截止时间参数") if params[:end_time].blank?
- tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
- tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
- @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
+ group_ids = params[:group_ids]&.reject(&:blank?)
+ if params[:detail].blank?
+ tip_exception("缺少截止时间参数") if params[:end_time].blank?
+ tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
+ tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
+ @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
+ else
+ group_end_times = params[:group_end_times].reject(&:blank?).map{|time| time.to_time}
+ tip_exception("缺少截止时间参数") if group_end_times.blank?
+ tip_exception("截止时间和分班参数的个数不一致") if group_end_times.length != group_ids.length
+ group_end_times.each do |time|
+ tip_exception("分班截止时间不能早于当前时间") if time <= Time.now
+ tip_exception("分班截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
+ @course.end_date.present? && time > @course.end_date.end_of_day
+ end
+ end
+
ActiveRecord::Base.transaction do
begin
check_ids = Exercise.where(id: params[:check_ids])
@@ -704,28 +724,30 @@ class ExercisesController < ApplicationController
.exercise_group_not_published.present? ? 1 : 0
end
if ex_status == 1 #如果试卷存在已发布的，或者是已截止的，那么则直接跳过
- g_course = params[:group_ids] #表示是否传入分班参数,如果传入分班的参数，那么试卷的统一设置需修改
+ g_course = group_ids #表示是否传入分班参数,如果传入分班的参数，那么试卷的统一设置需修改
tiding_group_ids = g_course
if g_course
- user_course_groups = @course.charge_group_ids(current_user)
- if g_course.map(&:to_i).sort == user_course_groups.sort # 如果是设置为全部班级，则试卷不用分组，且试卷设定为统一设置,否则则分组设置
+ user_course_groups = @course.course_groups.pluck(:id)
+ if g_course.map(&:to_i).sort == user_course_groups.sort &&
+ ((params[:detail] && group_end_times.min == group_end_times.max) || params[:detail].blank?) # 如果是设置为全部班级，则试卷不用分组，且试卷设定为统一设置,否则则分组设置
exercise.exercise_group_settings.destroy_all
ex_unified = true
- e_time = ex_end_time
+ e_time = params[:detail] ? group_end_times.max : ex_end_time
tiding_group_ids = []
else
ex_unified = false
- g_course.each do |i|
+ g_course.each_with_index do |i, index|
exercise_group_setting = exercise.exercise_group_settings.find_in_exercise_group("course_group_id",i).first #根据课堂分班的id，寻找试卷所在的班级
+ group_end_time = params[:detail] ? group_end_times[index] : ex_end_time
if exercise_group_setting #如果该试卷分组存在，则更新，否则新建
- exercise_group_setting.update_attributes(publish_time:Time.now,end_time:ex_end_time)
+ exercise_group_setting.update_attributes(publish_time: Time.now, end_time: group_end_time)
else
p_course_group = {
:exercise_id => exercise.id,
:course_group_id => i,
:course_id => exercise.course.id,
:publish_time => Time.now,
- :end_time => ex_end_time,
+ :end_time => group_end_time,
}
new_exercise_group = exercise.exercise_group_settings.new p_course_group
new_exercise_group.save
@@ -785,6 +807,7 @@ class ExercisesController < ApplicationController
# 首页批量或单独 立即截止，截止时间为当前时间
def end_exercise
+
ActiveRecord::Base.transaction do
begin
check_ids = Exercise.where(id:params[:check_ids])
@@ -844,23 +867,27 @@ class ExercisesController < ApplicationController
exercise_users = exercise.exercise_users
exercise.update_attributes(:exercise_status => 3, :end_time => Time.now,:unified_setting => true)
end
- exercise_users.each do |user|
- if user.commit_status == 0 && user.start_at.present?
- objective_score = calculate_student_score(exercise,user.user)[:total_score]
- user_sub_score = user.subjective_score
- subjective_score = user_sub_score < 0.0 ? 0.0 : user_sub_score
- total_score = objective_score + subjective_score
- commit_option = {
- :status => 1,
- :commit_status => 1,
- :end_at => Time.now,
- :objective_score => objective_score,
- :score => total_score,
- :subjective_score => user_sub_score
- }
- user.update_attributes(commit_option)
- end
- end
+
+ ex_user_ids = exercise_users.pluck(:id)
+
+ EndExerciseCalculateJob.perform_later(ex_user_ids,exercise)
+ # exercise_users.each do |user|
+ # if user.commit_status == 0 && user.start_at.present?
+ # objective_score = calculate_student_score(exercise,user.user)[:total_score]
+ # user_sub_score = user.subjective_score
+ # subjective_score = user_sub_score < 0.0 ? 0.0 : user_sub_score
+ # total_score = objective_score + subjective_score
+ # commit_option = {
+ # :status => 1,
+ # :commit_status => 1,
+ # :end_at => Time.now,
+ # :objective_score => objective_score,
+ # :score => total_score,
+ # :subjective_score => user_sub_score
+ # }
+ # user.update_attributes(commit_option)
+ # end
+ # end
end
end
normal_status(0, "试卷截止成功！")
@@ -951,7 +978,8 @@ class ExercisesController < ApplicationController
:status => nil,
:commit_status => 0,
:objective_score => 0.0,
- :subjective_score => -1.0
+ :subjective_score => -1.0,
+ :commit_method => 0
}
redo_exercise_users = @exercise_users.exercise_commit_users(user_ids)
redo_exercise_users.update_all(redo_option)
@@ -1074,22 +1102,40 @@ class ExercisesController < ApplicationController
def commit_exercise
ActiveRecord::Base.transaction do
begin
- if @user_course_identity > Course::ASSISTANT_PROFESSOR #为学生时
- objective_score = calculate_student_score(@exercise,current_user)[:total_score]
- subjective_score = @answer_committed_user.subjective_score
- total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
- total_score = objective_score + total_score_subjective_score
- commit_option = {
+ can_commit_exercise = false
+ user_left_time = nil
+ if @user_course_identity > Course::ASSISTANT_PROFESSOR #为学生时
+ if params[:commit_method].to_i == 2 #自动提交时
+ user_left_time = get_exercise_left_time(@exercise,current_user)
+ Rails.logger.info("######__________auto_commit_user_left_time_________################{user_left_time}")
+ if user_left_time.to_i <= 0
+ can_commit_exercise = true
+ end
+ else
+ can_commit_exercise = true
+ end
+ if can_commit_exercise
+ objective_score = calculate_student_score(@exercise,current_user)[:total_score]
+ subjective_score = @answer_committed_user.subjective_score
+ total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
+ total_score = objective_score + total_score_subjective_score
+ commit_option = {
:status => 1,
:commit_status => 1,
:end_at => Time.now,
:objective_score => objective_score,
:score => total_score,
- :subjective_score => subjective_score
- }
- @answer_committed_user.update_attributes(commit_option)
- CommitExercsieNotifyJobJob.perform_later(@exercise.id, current_user.id)
- normal_status(0,"试卷提交成功！")
+ :subjective_score => subjective_score,
+ :commit_method => @answer_committed_user&.commit_method.to_i > 0 ? @answer_committed_user&.commit_method.to_i : params[:commit_method].to_i
+ }
+ @answer_committed_user.update_attributes(commit_option)
+ CommitExercsieNotifyJobJob.perform_later(@exercise.id, current_user.id)
+ normal_status(0,"试卷提交成功！")
+ else
+ normal_status(-2,"#{user_left_time.to_i}")
+ end
+ else
+ normal_status(-1,"提交失败，当前用户不为课堂学生!")
end
rescue Exception => e
uid_logger_error(e.message)
diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb
index be8173b2f..8a3999410 100644
--- a/app/controllers/games_controller.rb
+++ b/app/controllers/games_controller.rb
@@ -657,7 +657,8 @@ class GamesController < ApplicationController
# 高性能取上一关、下一关
prev_game = @game.prev_of_current_game(@shixun.id, @game.myshixun_id, game_challenge.position)
- next_game = @game.next_of_current_game(@shixun.id, @game.myshixun_id, game_challenge.position) if had_passed
+ next_game = @game.next_game(@shixun.id, @game.myshixun_id, game_challenge.position) if had_passed
+ next_game.update_column(:status, 0) if next_game.present? && next_game.status == 3
# 高性能取上一关、下一关
#prev_game = Game.prev_identifier(@shixun.id, @game.myshixun_id, game_challenge.position)
@@ -670,7 +671,7 @@ class GamesController < ApplicationController
choose_correct_num: choose_correct_num,
test_sets: test_sets,
prev_game: prev_game,
- next_game: next_game}
+ next_game: next_game&.identifier}
rescue Exception => e
uid_logger("choose build failed #{e.message}")
@result = [status: -1, contents: "#{e.message}"]
diff --git a/app/controllers/gits_controller.rb b/app/controllers/gits_controller.rb
index b52e75353..e94c197ed 100644
--- a/app/controllers/gits_controller.rb
+++ b/app/controllers/gits_controller.rb
@@ -8,7 +8,11 @@ class GitsController < ApplicationController
# 供 git-workhorse反向调用认证
def auth
# HTTP_AUTHORIZATION: "Basic 这里base64编码的的密码(user:passwd)"
+ decodes = %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)
+ rand_code = decodes.sample(10).join
logger.info("11111112222223333 HTTP_AUTHORIZATION: #{request.env["HTTP_AUTHORIZATION"]}")
+ logger.info("1111111 git auth start: code is #{rand_code}, time is #{Time.now}")
+
# logger.info("#########-----request_env: #{request.env}")
# {"service"=>"git-receive-pack", "controller"=>"gits", "action"=>"auth",
# "url"=>"forge01/cermyt39.git/info/refs"}
@@ -68,6 +72,7 @@ class GitsController < ApplicationController
authenticate_or_request_with_http_basic do |username, password|
result
+ logger.info("1111111 git auth end: code is #{rand_code}, time is #{Time.now}")
end
end
diff --git a/app/controllers/graduation_tasks_controller.rb b/app/controllers/graduation_tasks_controller.rb
index de48f9fdb..864eac3f5 100644
--- a/app/controllers/graduation_tasks_controller.rb
+++ b/app/controllers/graduation_tasks_controller.rb
@@ -1,13 +1,16 @@
class GraduationTasksController < ApplicationController
before_action :require_login, :check_auth, except: [:index]
- before_action :find_course, except: [:edit, :update, :settings, :update_settings, :tasks_list, :show, :show_comment]
- before_action :find_task, only: [:edit, :update, :settings, :update_settings, :tasks_list, :show, :show_comment]
+ before_action :find_course, except: [:edit, :update, :settings, :update_settings, :tasks_list, :show, :show_comment,
+ :cross_comment_setting, :assign_works, :commit_comment_setting]
+ before_action :find_task, only: [:edit, :update, :settings, :update_settings, :tasks_list, :show, :show_comment,
+ :cross_comment_setting, :assign_works, :commit_comment_setting]
before_action :user_course_identity
before_action :task_publish, only: [:show, :show_comment, :tasks_list, :settings]
before_action :teacher_allowed, only: [:new, :create, :edit, :update, :set_public,:multi_destroy, :publish_task, :end_task,
- :update_settings, :add_to_bank]
+ :update_settings, :add_to_bank, :cross_comment_setting, :assign_works, :commit_comment_setting]
before_action :require_id_params, only: [:set_public ,:multi_destroy, :publish_task, :end_task, :add_to_bank]
before_action :valid_params, only: [:update_settings]
+ before_action :allow_cross_comment, only: [:cross_comment_setting, :assign_works, :commit_comment_setting]
include ExportHelper
def index
@@ -104,6 +107,15 @@ class GraduationTasksController < ApplicationController
@work_list = @task.graduation_works.where(id: graduation_work_id)
end
+ # 组员、组长作品的筛选
+ if @task.task_type == 2 && !params[:member_work].blank?
+ if params[:member_work].to_i == 1
+ @work_list = @work_list.where("user_id = commit_user_id")
+ elsif params[:member_work].to_i == 0
+ @work_list = @work_list.where("user_id != commit_user_id")
+ end
+ end
+
# 输入姓名和学号搜索
# TODO user_extension 如果修改 请调整
unless params[:search].blank?
@@ -360,7 +372,7 @@ class GraduationTasksController < ApplicationController
tasks.each do |task|
task.end_time = Time.now
- task.status = task.allow_late ? 2 : 3
+ task.status = 2
task.save!
end
normal_status(0, "更新成功")
@@ -453,22 +465,27 @@ class GraduationTasksController < ApplicationController
tip_exception("评阅时间应当大于截止时间") if @task.cross_comment && params[:comment_time] <= @task.end_time
@task.comment_time = @task.cross_comment ? params[:comment_time] : nil
- @task.comment_num = @task.cross_comment ? params[:comment_num].to_i : 3
- @task.comment_status = @task.cross_comment ? params[:comment_status] : 0
- if @task.cross_comment && params[:comment_status].to_i == 4
- tip_exception("评阅数不能为空") if params[:comment_num].blank?
- tip_exception("评阅数应大于0") if params[:comment_num].to_i < 1
-
- @course.graduation_groups.each_with_index do |group, index|
- ass_group = @task.graduation_task_group_assignations.find_by(graduation_group_id: group.id)
- if ass_group.present? && params[:comment_group][index].present? && params[:comment_group][index] != "0"
- ass_group.update_attributes(assign_graduation_group_id: params[:comment_group][index])
- else
- @task.graduation_task_group_assignations << GraduationTaskGroupAssignation.new(graduation_group_id: group.id,
- assign_graduation_group_id: params[:comment_group][index])
- end
- end
- end
+
+ @task.comment_status = 2 if @task.cross_comment && @task.comment_status == 0
+
+ @task.graduation_work_comment_assignations.destroy_all if !@task.cross_comment
+ # 去掉评阅设置
+ # @task.comment_num = @task.cross_comment ? params[:comment_num].to_i : 3
+ # @task.comment_status = @task.cross_comment ? params[:comment_status] : 0
+ # if @task.cross_comment && params[:comment_status].to_i == 4
+ # tip_exception("评阅数不能为空") if params[:comment_num].blank?
+ # tip_exception("评阅数应大于0") if params[:comment_num].to_i < 1
+ #
+ # @course.graduation_groups.each_with_index do |group, index|
+ # ass_group = @task.graduation_task_group_assignations.find_by(graduation_group_id: group.id)
+ # if ass_group.present? && params[:comment_group][index].present? && params[:comment_group][index] != "0"
+ # ass_group.update_attributes(assign_graduation_group_id: params[:comment_group][index])
+ # else
+ # @task.graduation_task_group_assignations << GraduationTaskGroupAssignation.new(graduation_group_id: group.id,
+ # assign_graduation_group_id: params[:comment_group][index])
+ # end
+ # end
+ # end
end
# 公开设置
@@ -493,6 +510,107 @@ class GraduationTasksController < ApplicationController
end
end
+ def cross_comment_setting
+ @comment_status = params[:comment_status] || (@task.cross_comment ? @task.comment_status : 2)
+ group_ids = @course.charge_group_ids(current_user)
+ @course_groups = @course.course_groups.where(id: group_ids)
+
+ # 如果传了分班id则取合集
+ group_ids = group_ids & params[:group_ids].map(&:to_i) unless params[:group_ids].blank?
+ page = params[:page] ? params[:page].to_i : 1
+ limit = params[:limit] ? params[:limit].to_i : 10
+
+ # 取所有课堂的作品
+ if group_ids.sort == @course.course_groups.pluck(:id).sort
+ @work_list = @task.graduation_works
+ else
+ @work_list = @task.graduation_works.joins("join course_members on graduation_works.user_id=course_members.user_id").
+ where(course_members: {course_group_id: group_ids})
+ end
+ @user_count = @work_list.size
+ @work_list = @work_list.page(page).per(limit).includes(user: [:user_extension])
+ @students = @course.students.where(user_id: @work_list.pluck(:user_id))
+ end
+
+ def assign_works
+ tip_exception("请先选择作品") if params[:work_ids].blank?
+ tip_exception("请指定要分配的老师或答辩组") if params[:user_ids].blank? && params[:graduation_group_ids].blank?
+
+ ActiveRecord::Base.transaction do
+ begin
+ works = @task.graduation_works.where(id: params[:work_ids])
+ # 手动分配：分配给老师
+ if !params[:user_ids].blank?
+ @task.update_attributes(comment_status: 2)
+ works.each do |work|
+ # 之前分配的老师但现在未分配时需要删除
+ work.graduation_work_comment_assignations.where.not(user_id: params[:user_ids]).destroy_all
+ @course.teachers.where(user_id: params[:user_ids]).pluck(:user_id).uniq.each do |user_id|
+ unless work.graduation_work_comment_assignations.exists?(user_id: user_id)
+ GraduationWorkCommentAssignation.create!(graduation_task_id: @task.id, graduation_work_id: work.id,
+ user_id: user_id)
+ end
+ end
+ end
+
+ # 答辩组分配：分配答辩组
+ elsif !params[:graduation_group_ids].blank?
+ @task.update_attributes(comment_status: 4)
+ works.each do |work|
+ work.graduation_task_group_assignations.where.not(graduation_group_id: params[:graduation_group_ids]).destroy_all
+ @course.graduation_groups.where(id: params[:graduation_group_ids]).pluck(:id).uniq.each do |graduation_group_id|
+ unless work.graduation_task_group_assignations.exists?(graduation_group_id: graduation_group_id)
+ GraduationTaskGroupAssignation.create!(graduation_task_id: @task.id, graduation_work_id: work.id,
+ graduation_group_id: graduation_group_id)
+ end
+ end
+ end
+ end
+ normal_status("分配成功")
+ rescue Exception => e
+ uid_logger(e.message)
+ tip_exception(e.message)
+ raise ActiveRecord::Rollback
+ end
+ end
+ end
+
+ def commit_comment_setting
+ tip_exception("type参数有误") if params[:type].blank? || !["commit", "cancel"].include?(params[:type])
+ ActiveRecord::Base.transaction do
+ begin
+ # 提交弹框
+ # if params[:type] == "commit"
+ # tip_exception("comment_status参数有误") if params[:comment_status].blank? || ![2, 4].include?(params[:comment_status].to_i)
+ # @task.update_attributes(comment_status: params[:comment_status])
+ # if params[:comment_status].to_i == 2
+ # @task.temporary_graduation_work_comment_assignations.update_all(temporary: 0) # 临时数据转正
+ # @task.delete_graduation_work_comment_assignations.destroy_all # 删除置了删除位的数据
+ # @task.graduation_task_group_assignations.destroy_all # 删除答辩组分配数据
+ # else
+ # @task.temporary_graduation_task_group_assignations.update_all(temporary: 0)
+ # @task.delete_graduation_task_group_assignations.destroy_all
+ # @task.graduation_work_comment_assignations.destroy_all
+ #
+ # GraduationTaskCrossCommentJob.perform_later(@task.id)
+ # end
+ # else
+ # # 取消时删除临时数据，恢复删除位数据
+ # @task.temporary_graduation_work_comment_assignations.destroy_all # 删除临时数据
+ # @task.delete_graduation_work_comment_assignations.update_all(temporary: 0) # 恢复置了删除位的数据
+ #
+ # @task.temporary_graduation_task_group_assignations.destroy_all # 删除临时数据
+ # @task.delete_graduation_task_group_assignations.update_all(temporary: 0) # 恢复置了删除位的数据
+ # end
+ normal_status("操作成功")
+ rescue Exception => e
+ uid_logger(e.message)
+ tip_exception(e.message)
+ raise ActiveRecord::Rollback
+ end
+ end
+ end
+
private
def find_task
begin
@@ -533,6 +651,11 @@ class GraduationTasksController < ApplicationController
tip_exception("最大人数不能小于最小人数要求") if params[:min_num].to_i > params[:max_num].to_i
end
end
+
+ def allow_cross_comment
+ tip_exception("请先开启交叉评阅再设置") unless @task.cross_comment
+ end
+
#
# def graduation_work_to_xls items
# xls_report = StringIO.new
diff --git a/app/controllers/graduation_works_controller.rb b/app/controllers/graduation_works_controller.rb
index 204e0e5d4..d50885313 100644
--- a/app/controllers/graduation_works_controller.rb
+++ b/app/controllers/graduation_works_controller.rb
@@ -1,18 +1,18 @@
class GraduationWorksController < ApplicationController
before_action :require_login, :check_auth
before_action :find_task, only: [:new, :create, :search_member_list, :check_project, :relate_project,
- :cancel_relate_project]
+ :cancel_relate_project, :delete_work]
before_action :find_work, only: [:show, :edit, :update, :revise_attachment, :supply_attachments, :comment_list,
:add_score, :delete_score, :adjust_score, :assign_teacher]
before_action :user_course_identity
before_action :task_public
before_action :teacher_allowed, only: [:add_score, :adjust_score, :assign_teacher]
before_action :course_student, only: [:new, :create, :edit, :update, :search_member_list, :relate_project,
- :cancel_relate_project]
+ :cancel_relate_project, :delete_work]
before_action :my_work, only: [:edit, :update, :revise_attachment]
before_action :published_task, only: [:new, :create, :edit, :update, :search_member_list, :relate_project,
:cancel_relate_project, :revise_attachment]
- before_action :edit_duration, only: [:edit, :update]
+ before_action :edit_duration, only: [:edit, :update, :delete_work]
before_action :open_work, only: [:show, :supply_attachments, :comment_list]
def new
@@ -47,6 +47,24 @@ class GraduationWorksController < ApplicationController
@members = @members.page(page).per(limit).includes(:course_group, user: :user_extension)
end
+ def delete_work
+ ActiveRecord::Base.transaction do
+ begin
+ work = @task.graduation_works.find_by!(user_id: params[:user_id])
+ tip_exception("只有组长才能删除组员") if work.commit_user_id != current_user.id
+ work.update_attributes(description: nil, project_id: 0, late_penalty: 0, work_status: 0, commit_time: nil,
+ update_time: nil, group_id: 0, commit_user_id: nil, final_score: nil, work_score: nil,
+ teacher_score: nil, teaching_asistant_score: nil, update_user_id: nil)
+ work.attachments.destroy_all
+ work.tidings.destroy_all
+ normal_status("删除成功")
+ rescue Exception => e
+ uid_logger(e.message)
+ tip_exception(e.message)
+ end
+ end
+ end
+
# 判断项目是否已有其他作品关联上了
def check_project
tip_exception("项目id不能为空") if params[:project_id].blank?
@@ -142,6 +160,7 @@ class GraduationWorksController < ApplicationController
graduation_work.commit_time = Time.now
graduation_work.update_time = Time.now
graduation_work.commit_user_id = current_user.id
+ graduation_work.update_user_id = current_user.id
graduation_work.course_id = @course.id
graduation_work.group_id = @task.task_type == 2 ? @task.graduation_works.where("work_status != 0").map(&:group_id).max.to_i + 1 : 0
@@ -162,7 +181,7 @@ class GraduationWorksController < ApplicationController
graduation_task_id: @task.id, project_id: graduation_work.project_id,
late_penalty: graduation_work.late_penalty, work_status: graduation_work.work_status,
commit_time: Time.now, update_time: Time.now, group_id: graduation_work.group_id,
- commit_user_id: current_user.id)
+ commit_user_id: current_user.id, update_user_id: current_user.id)
stu_work.save!
graduation_work.attachments.each do |attachment|
att = attachment.copy
@@ -190,8 +209,9 @@ class GraduationWorksController < ApplicationController
def edit
@task_user = current_user
if @task.task_type == 2
+ @commit_user_id = @work.commit_user_id
@work_members = @course.students.where(user_id: @task.graduation_works.where(group_id: @work.group_id).pluck(:user_id)).
- order("course_members.id=#{@work.user_id} desc").includes(:course_group, user: :user_extension)
+ order("course_members.id=#{@work.commit_user_id} desc").includes(:course_group, user: :user_extension)
end
end
@@ -203,7 +223,8 @@ class GraduationWorksController < ApplicationController
begin
@work.description = params[:description]
@work.update_time = Time.now
- @work.commit_user_id = current_user.id
+ @work.update_user_id = current_user.id
+ # @work.commit_user_id = current_user.id
if @work.save!
Attachment.associate_container(params[:attachment_ids], @work.id, @work.class)
@@ -217,7 +238,7 @@ class GraduationWorksController < ApplicationController
# 原成员更新描述、更新时间以及附件
@task.graduation_works.where(group_id: @work.group_id, user_id: (work_user_ids & params_user_ids)).each do |work|
- work.update_attributes(update_time: Time.now, description: @work.description, commit_user_id: current_user.id)
+ work.update_attributes(update_time: Time.now, description: @work.description, update_user_id: current_user.id)
work.attachments.destroy_all
@work.attachments.each do |attachment|
att = attachment.copy
@@ -237,7 +258,7 @@ class GraduationWorksController < ApplicationController
@task.graduation_works.where(group_id: @work.group_id, user_id: delete_user_ids).
update_all(work_status: 0, description: nil, late_penalty: 0, commit_time: nil, update_time: nil,
final_score: nil, teacher_score: nil, work_score: nil, project_id: 0, group_id: 0,
- commit_user_id: nil)
+ commit_user_id: nil, update_user_id: nil)
# 新增加的成员
(params_user_ids - work_user_ids).each do |user_id|
@@ -246,7 +267,7 @@ class GraduationWorksController < ApplicationController
stu_work.update_attributes(user_id: user_id, description: @work.description, graduation_task_id: @task.id,
project_id: @work.project_id, late_penalty: @work.late_penalty,
work_status: @work.work_status, commit_time: Time.now, update_time: Time.now,
- group_id: @work.group_id, commit_user_id: current_user.id)
+ group_id: @work.group_id, commit_user_id: @work.commit_user_id, update_user_id: current_user.id)
@work.attachments.each do |attachment|
att = attachment.copy
att.author_id = attachment.author_id
@@ -308,7 +329,7 @@ class GraduationWorksController < ApplicationController
end
end
- if @task.status == 3 && @task.graduation_work_comment_assignations.where(graduation_work_id: @work.id, user_id: current_user.id).count > 0
+ if @task.cross_comment && @work.graduation_work_comment_assignations.where(user_id: current_user.id).count > 0
new_score.reviewer_role = 2
else
new_score.reviewer_role = 1
@@ -371,6 +392,11 @@ class GraduationWorksController < ApplicationController
new_score.save!
@work.update_attributes(ultimate_score: 1, work_score: params[:score].to_f)
+ Tiding.create!(user_id: @work.user_id, trigger_user_id: current_user.id, container_id: new_score.id,
+ container_type: "AdjustScore", parent_container_id: @task.id,
+ parent_container_type: "GraduationTask", belong_container_id: @course.id,
+ belong_container_type: 'Course', tiding_type: "GraduationTask")
+
normal_status("调分成功")
rescue Exception => e
uid_logger(e.message)
diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index 665eaa294..2ed82f1b5 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -5,7 +5,7 @@ class HomeController < ApplicationController
images = PortalImage.where(status: true).order("position asc")
@images_url = []
images.each do |image|
- @images_url << {path: image.link, image_url: "/images/avatars/PortalImage/#{image.id}"}
+ @images_url << {path: image.link, image_url: Util::FileManage.disk_file_url('PortalImage', image.id)}
end
# 目录分级
diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index 06ee8feee..5d75604ee 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -201,12 +201,12 @@ class HomeworkCommonsController < ApplicationController
page = params[:page] || 1
limit = params[:limit] || 20
@student_works = @student_works.page(page).per(limit)
- @students = @course.students.where(user_id: @student_works.pluck(:user_id)).preload(:course_group)
if @homework.homework_type == "practice"
@student_works = @student_works.includes(:student_works_scores, user: :user_extension, myshixun: :games)
else
@student_works = @student_works.includes(:student_works_scores, :project, user: :user_extension)
end
+ @students = @course.students.preload(:course_group)
end
if params[:format] == "xlsx"
@@ -1036,6 +1036,7 @@ class HomeworkCommonsController < ApplicationController
# 可立即发布的分班：当前用户管理的分班去除已发布的分班
group_ids = @course.charge_group_ids(@current_user) - @homework.homework_group_settings.group_published.pluck(:course_group_id)
@course_groups = @course.course_groups.where(id: group_ids)
+ @group_settings = @homework.homework_group_settings.where(course_group_id: group_ids)
else
tip_exception("没有可发布的分班")
end
@@ -1043,16 +1044,28 @@ class HomeworkCommonsController < ApplicationController
def publish_homework
tip_exception("请至少选择一个分班") if params[:group_ids].blank? && @course.course_groups.size != 0
- tip_exception("缺少截止时间参数") if params[:end_time].blank?
- tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
- tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
- @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
+ group_ids = params[:group_ids]&.reject(&:blank?)
+ if params[:detail].blank?
+ tip_exception("缺少截止时间参数") if params[:end_time].blank?
+ tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
+ tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
+ @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
+ else
+ group_end_times = params[:group_end_times].reject(&:blank?).map{|time| time.to_time}
+ tip_exception("缺少截止时间参数") if group_end_times.blank?
+ tip_exception("截止时间和分班参数的个数不一致") if group_end_times.length != group_ids.length
+ group_end_times.each do |time|
+ tip_exception("分班截止时间不能早于当前时间") if time <= Time.now
+ tip_exception("分班截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
+ @course.end_date.present? && time > @course.end_date.end_of_day
+ end
+ end
homeworks = @course.homework_commons.where(id: params[:homework_ids])
homeworks = homeworks.includes(:homework_group_settings, :homework_detail_manual)
charge_group_ids = @course.charge_group_ids(current_user)
- publish_groups = charge_group_ids & params[:group_ids] if params[:group_ids]
+ publish_groups = charge_group_ids & group_ids if group_ids
# ActiveRecord::Base.transaction do
begin
@@ -1062,18 +1075,26 @@ class HomeworkCommonsController < ApplicationController
if !params[:group_ids].blank?
# 全选即统一设置，unified_setting为true
- if @course.course_groups.where(id: publish_groups).size == @course.course_groups.size
+ if @course.course_groups.where(id: publish_groups).size == @course.course_groups.size &&
+ ((params[:detail] && group_end_times.min == group_end_times.max) || params[:detail].blank?)
homework.homework_group_settings.destroy_all
homework.unified_setting = true
- homework.end_time = params[:end_time]
+ homework.end_time = params[:detail] ? group_end_times.max : params[:end_time]
else
homework.unified_setting = false
# 创建作业分班设置：homework_group_setting
create_homework_group_settings(homework)
# 选中的分班设置的发布时间改为当前时间，截止时间改为传的截止时间参数
- homework.homework_group_settings.where(course_group_id: publish_groups).update_all(publish_time: Time.now,
- end_time: params[:end_time])
+ if params[:detail]
+ group_ids.each_with_index do |group_id, index|
+ homework.homework_group_settings.find_by(course_group_id: group_id)&.update_attributes!(publish_time: Time.now,
+ end_time: group_end_times[index])
+ end
+ else
+ homework.homework_group_settings.where(course_group_id: publish_groups).update_all(publish_time: Time.now,
+ end_time: params[:end_time])
+ end
# 发消息
tiding_group_ids = publish_groups
end
@@ -1086,7 +1107,7 @@ class HomeworkCommonsController < ApplicationController
# 截止时间的处理
if homework.end_time.nil?
- homework.end_time = params[:end_time]
+ homework.end_time = params[:detail] ? group_end_times.max : params[:end_time]
elsif homework.max_group_end_time
homework.end_time = homework.max_group_end_time
end
@@ -1101,12 +1122,22 @@ class HomeworkCommonsController < ApplicationController
create_homework_group_settings(homework)
none_publish_settings = homework.homework_group_settings.where(course_group_id: publish_groups).none_published
- none_publish_settings.update_all(publish_time: Time.now, end_time: params[:end_time])
+ if params[:detail]
+ group_ids.each_with_index do |group_id, index|
+ none_publish_settings.find_by(course_group_id: group_id)&.update_attributes!(publish_time: Time.now,
+ end_time: group_end_times[index])
+ end
+ else
+ none_publish_settings.update_all(publish_time: Time.now, end_time: params[:end_time])
+ end
+
if homework.max_group_end_time
homework.end_time = homework.max_group_end_time
end
HomeworkCommonPushNotifyJob.perform_later(homework.id, none_publish_settings.pluck(:course_group_id))
end
+
+
if homework.end_time > Time.now && homework.homework_detail_manual.try(:comment_status) > 1
homework.homework_detail_manual.update_attribute("comment_status", 1)
end
diff --git a/app/controllers/library_tags_controller.rb b/app/controllers/library_tags_controller.rb
new file mode 100644
index 000000000..0b11027a5
--- /dev/null
+++ b/app/controllers/library_tags_controller.rb
@@ -0,0 +1,6 @@
+class LibraryTagsController < ApplicationController
+ def index
+ library_tags = LibraryTag.all
+ render_ok(library_tags: library_tags.as_json(only: %i[id name]), count: library_tags.size)
+ end
+end
\ No newline at end of file
diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb
index 88139fe7e..d2c386681 100644
--- a/app/controllers/memos_controller.rb
+++ b/app/controllers/memos_controller.rb
@@ -25,9 +25,9 @@ class MemosController < ApplicationController
!search.blank? ? "forum_id = #{forum_id} and root_id is null and subject like '%#{search}%'" :
"forum_id = #{forum_id} and root_id is null"
elsif !search.blank?
- "forum_id in(3, 5) and root_id is null and subject like '%#{search}%'"
+ "forum_id in(3, 5, 16) and root_id is null and subject like '%#{search}%'"
else
- "forum_id in(3, 5) and root_id is null"
+ "forum_id in(3, 5, 16) and root_id is null"
end
if tag_repertoire_id
diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb
index bf067b389..74f02f1ab 100644
--- a/app/controllers/myshixuns_controller.rb
+++ b/app/controllers/myshixuns_controller.rb
@@ -326,7 +326,7 @@ class MyshixunsController < ApplicationController
if edu_css.present?
css_path = edu_css.split(",")
css_path.each do |path|
- file_content = GitService.file_content(repo_path: @repo_path, path: path)["content"]
+ file_content = git_fle_content(@repo_path, path)["content"]
file_content = tran_base64_decode64(file_content) unless file_content.blank?
@contents = @contents.sub(/EDUCODERCSS/, "")
end
@@ -335,7 +335,7 @@ class MyshixunsController < ApplicationController
if edu_js.present?
js_path = edu_js.split(",")
js_path.each do |path|
- file_content = GitService.file_content(repo_path: @repo_path, path: path)["content"]
+ file_content = git_fle_content(@repo_path, path)["content"]
file_content = tran_base64_decode64(file_content) unless file_content.blank?
@contents = @contents.sub(/EDUCODERJS/, "")
end
diff --git a/app/controllers/polls_controller.rb b/app/controllers/polls_controller.rb
index 6ffe277a3..da5917e1b 100644
--- a/app/controllers/polls_controller.rb
+++ b/app/controllers/polls_controller.rb
@@ -2,10 +2,10 @@ class PollsController < ApplicationController
# before_action :check_poll_status 问卷的发消息和定时任务没有做
before_action :require_login, :check_auth,except: [:index]
before_action :find_course, except: [:show,:poll_setting,:commit_setting,:edit,:update,:start_answer,:commit_poll,
- :commit_result,:poll_lists,:cancel_publish,:cancel_publish_modal,:common_header]
+ :commit_result,:poll_lists,:cancel_publish,:cancel_publish_modal,:common_header,:publish_groups]
before_action :get_poll_and_course, only: [:show,:poll_setting,:commit_setting,:edit,:update,:start_answer,
:commit_poll,:commit_result,:poll_lists,:cancel_publish,
- :cancel_publish_modal,:common_header]
+ :cancel_publish_modal,:common_header, :publish_groups]
before_action :user_course_identity
before_action :is_course_teacher, except: [:index,:start_answer,:poll_setting,:commit_poll,:commit_result,:poll_lists,:common_header] #判断是否为课堂老师
before_action :check_user_status
@@ -242,12 +242,35 @@ class PollsController < ApplicationController
end
end
end
+
+ # 详情页的立即发布弹框
+ def publish_groups
+ @current_user = current_user
+ # 可立即发布的分班：当前用户管理的分班去除已发布的分班
+ group_ids = @course.charge_group_ids(@current_user) - @poll.poll_group_settings.poll_group_published.pluck(:course_group_id)
+ @course_groups = @course.course_groups.where(id: group_ids)
+ @group_settings = @poll.poll_group_settings.where(course_group_id: group_ids)
+ end
+
#首页批量或单独 立即发布,应是跳出弹窗，设置开始时间和截止时间。
def publish
- tip_exception("缺少截止时间参数") if params[:end_time].blank?
- tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
- tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
- @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
+ group_ids = params[:group_ids]&.reject(&:blank?)
+ if params[:detail].blank?
+ tip_exception("缺少截止时间参数") if params[:end_time].blank?
+ tip_exception("截止时间不能早于当前时间") if params[:end_time] <= strf_time(Time.now)
+ tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
+ @course.end_date.present? && params[:end_time] > strf_time(@course.end_date.end_of_day)
+ else
+ group_end_times = params[:group_end_times].reject(&:blank?).map{|time| time.to_time}
+ tip_exception("缺少截止时间参数") if group_end_times.blank?
+ tip_exception("截止时间和分班参数的个数不一致") if group_end_times.length != group_ids.length
+ group_end_times.each do |time|
+ tip_exception("分班截止时间不能早于当前时间") if time <= Time.now
+ tip_exception("分班截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
+ @course.end_date.present? && time > @course.end_date.end_of_day
+ end
+ end
+
ActiveRecord::Base.transaction do
begin
check_ids = Poll.where(id: params[:check_ids])
@@ -259,26 +282,28 @@ class PollsController < ApplicationController
pl_status = poll.poll_group_settings.find_in_poll_group("course_group_id",params[:group_ids]).poll_group_not_published.present? ? 1 : 0 #立即发布针对分组设置的全部未发布的班级才生效
end
if pl_status == 1 #如果问卷存在已发布的，或者是已截止的，那么则直接跳过
- g_course = params[:group_ids] #表示是否传入分班参数,如果传入分班的参数，那么poll的统一设置需修改
+ g_course = group_ids #表示是否传入分班参数,如果传入分班的参数，那么poll的统一设置需修改
if g_course
- user_course_groups = @course.charge_group_ids(current_user)
- if g_course.map(&:to_i).sort == user_course_groups.sort # 如果是设置为全部班级，则问卷不用分组，且问卷设定为统一设置,否则则分组设置
+ user_course_groups = @course.course_groups.pluck(:id)
+ if g_course.map(&:to_i).sort == user_course_groups.sort &&
+ ((params[:detail] && group_end_times.min == group_end_times.max) || params[:detail].blank?) # 如果是设置为全部班级，则问卷不用分组，且问卷设定为统一设置,否则则分组设置
poll.poll_group_settings.destroy_all
poll_unified = true
- e_time = ex_end_time
+ e_time = params[:detail] ? group_end_times.max : ex_end_time
else
poll_unified = false
- g_course.each do |i|
+ g_course.each_with_index do |i, index|
poll_group_setting = poll.poll_group_settings.find_in_poll_group("course_group_id",i).first #根据课堂分班的id，寻找问卷所在的班级
+ group_end_time = params[:detail] ? group_end_times[index] : ex_end_time
if poll_group_setting #如果该问卷分组存在，则更新，否则新建
- poll_group_setting.update_attributes(publish_time:Time.now,end_time:ex_end_time)
+ poll_group_setting.update_attributes(publish_time: Time.now, end_time: group_end_time)
else
p_course_group = {
:poll_id => poll.id,
:course_group_id => i,
:course_id => poll.course.id,
:publish_time => Time.now,
- :end_time => ex_end_time,
+ :end_time => group_end_time,
}
new_poll_group = poll.poll_group_settings.new p_course_group
new_poll_group.save
@@ -692,7 +717,7 @@ class PollsController < ApplicationController
else
unified_setting = @poll.unified_setting
end
- show_result = params[:show_result].to_i
+ show_result = params[:show_result]
un_anonymous = params[:un_anonymous] ? true : false
# 统一设置或者分班为0，则更新问卷，并删除问卷分组
if unified_setting || (course_group_ids.size == 0)
@@ -1318,7 +1343,7 @@ class PollsController < ApplicationController
poll_ques_titles = poll_questions.pluck(:question_title).map {|k| ActionController::Base.helpers.strip_tags(k) if k.present?}
poll_un_anony = poll.un_anonymous
if poll_un_anony #是否匿名，默认为false
- user_info = %w(登陆名 真实姓名 邮箱 学号)
+ user_info = %w(登陆名 真实姓名 邮箱 学号 学员单位)
else
user_info = []
end
@@ -1392,7 +1417,8 @@ class PollsController < ApplicationController
user_login = u_user.login
user_name = u_user.real_name.present? ? u_user.real_name : "--"
user_student_id = u_user.student_id.present? ? u_user.student_id : "--"
- user_cell += [user_login,user_name, u_user.mail, user_student_id]
+ user_school_name = u_user.school_name.present? ? u_user.school_name : "--"
+ user_cell += [user_login,user_name, u_user.mail, user_student_id, user_school_name]
end
all_user_cell = user_cell + user_answer_array
user_commit.push(all_user_cell)
diff --git a/app/controllers/question_banks_controller.rb b/app/controllers/question_banks_controller.rb
index 60b9a807c..7781b5792 100644
--- a/app/controllers/question_banks_controller.rb
+++ b/app/controllers/question_banks_controller.rb
@@ -90,23 +90,25 @@ class QuestionBanksController < ApplicationController
def send_to_course
banks = @object_type.classify.constantize.where(id: params[:object_id])
course = current_user.manage_courses.find_by!(id: params[:course_id])
+ task_ids = []
banks.each do |bank|
case @object_type
when 'HomeworkBank' # 作业
- quote_homework_bank bank, course
+ task = quote_homework_bank bank, course
when 'ExerciseBank'
if bank.container_type == 'Exercise' # 试卷
- quote_exercise_bank bank, course
+ task = quote_exercise_bank bank, course
else # 问卷
- quote_poll_bank bank, course
+ task = quote_poll_bank bank, course
end
when 'GtaskBank'
- quote_gtask_bank bank, course
+ task = quote_gtask_bank bank, course
when 'GtopicBank'
- quote_gtopic_bank bank, course
+ task = quote_gtopic_bank bank, course
end
+ task_ids << task.id if task
end
- normal_status("发送成功")
+ render :json => {task_ids: task_ids, status: 0, message: "发送成功"}
end
def destroy
diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
new file mode 100644
index 000000000..ce5481147
--- /dev/null
+++ b/app/controllers/settings_controller.rb
@@ -0,0 +1,5 @@
+class SettingsController < ApplicationController
+ def show
+ @laboratory = current_laboratory
+ end
+end
\ No newline at end of file
diff --git a/app/controllers/shixun_lists_controller.rb b/app/controllers/shixun_lists_controller.rb
index e92e857ad..b57f0af21 100644
--- a/app/controllers/shixun_lists_controller.rb
+++ b/app/controllers/shixun_lists_controller.rb
@@ -5,6 +5,6 @@ class ShixunListsController < ApplicationController
private
def search_params
- params.permit(:keyword, :type, :page, :limit, :order, :type, :status, :diff)
+ params.permit(:keyword, :type, :page, :limit, :order, :status, :diff)
end
end
\ No newline at end of file
diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb
index 8a120d6bd..d0bd4fb0d 100644
--- a/app/controllers/shixuns_controller.rb
+++ b/app/controllers/shixuns_controller.rb
@@ -2,6 +2,7 @@ class ShixunsController < ApplicationController
include ShixunsHelper
include ApplicationHelper
include ElasticsearchAble
+ include CoursesHelper
before_action :require_login, :check_auth, except: [:download_file, :index, :menus, :show, :show_right, :ranking_list,
:discusses, :collaborators, :fork_list, :propaedeutics]
@@ -890,9 +891,10 @@ class ShixunsController < ApplicationController
user_name = "%#{params[:user_name].to_s.strip}%"
school_name = "%#{params[:school_name].to_s.strip}%"
if user_name.present? || school_name.present?
- @users = User.joins(user_extension: :school).where("users.id not in #{member_ids} AND users.status = 1 AND
- (LOWER(concat(users.lastname, users.firstname)) LIKE ? or users.phone like ?)
- AND LOWER(schools.name) LIKE ?", user_name, user_name, school_name)
+ @users = User.where("users.id not in #{member_ids} AND users.status = 1 AND
+ (LOWER(concat(users.lastname, users.firstname)) LIKE ? or users.phone like ?)",
+ user_name, user_name)
+ @users = @users.joins(user_extension: :school).where("schools.name like '%#{school_name}%'") if params[:school_name].present?
else
@users = User.none
end
diff --git a/app/controllers/stages_controller.rb b/app/controllers/stages_controller.rb
index b0b072f83..0abd3c362 100644
--- a/app/controllers/stages_controller.rb
+++ b/app/controllers/stages_controller.rb
@@ -6,7 +6,8 @@ class StagesController < ApplicationController
def index
@user = current_user
- @stages = @subject.stages
+ @stages = @subject.stages.includes(:shixuns)
+ @myshixuns = @user.myshixuns.where(shixun_id: @subject.stage_shixuns.pluck(:shixun_id))
end
def create
diff --git a/app/controllers/student_works_controller.rb b/app/controllers/student_works_controller.rb
index 2612510c5..b7a6953a5 100644
--- a/app/controllers/student_works_controller.rb
+++ b/app/controllers/student_works_controller.rb
@@ -224,7 +224,7 @@ class StudentWorksController < ApplicationController
raise ActiveRecord::Rollback
end
- SubmitStudentWorkNotifyJob.perform_later(@homework.id, student_ids) if student_ids.present?
+ ResubmitStudentWorkNotifyJob.perform_later(@homework.id, student_ids) if student_ids.present?
end
end
@@ -333,6 +333,11 @@ class StudentWorksController < ApplicationController
@work.update_attributes(update_time: Time.now)
+ # 补交附件时给评阅过作品的教师、助教发消息
+ unless @work.student_works_scores.where.not(score: nil).where(reviewer_role: [1, 2]).pluck(:user_id).uniq.blank?
+ ResubmitStudentWorkNotifyJob.perform_later(@homework.id, [current_user.id])
+ end
+
normal_status(0, "提交成功")
rescue Exception => e
uid_logger(e.message)
@@ -551,6 +556,11 @@ class StudentWorksController < ApplicationController
@work.work_score = params[:score].to_f
@work.save!
+ Tiding.create!(user_id: @work.user_id, trigger_user_id: current_user.id, container_id: new_score.id,
+ container_type: "AdjustScore", parent_container_id: @homework.id,
+ parent_container_type: "HomeworkCommon", belong_container_id: @course.id,
+ belong_container_type: 'Course', tiding_type: "HomeworkCommon")
+
normal_status(0,"调分成功")
rescue Exception => e
uid_logger(e.message)
diff --git a/app/controllers/subject_lists_controller.rb b/app/controllers/subject_lists_controller.rb
new file mode 100644
index 000000000..c8a523d79
--- /dev/null
+++ b/app/controllers/subject_lists_controller.rb
@@ -0,0 +1,10 @@
+class SubjectListsController < ApplicationController
+ def index
+ @results = SubjectSearchService.call(search_params)
+ end
+
+ private
+ def search_params
+ params.permit(:keyword, :type, :page, :limit, :order, :sort)
+ end
+end
diff --git a/app/controllers/templates_controller.rb b/app/controllers/templates_controller.rb
new file mode 100644
index 000000000..efb114bdc
--- /dev/null
+++ b/app/controllers/templates_controller.rb
@@ -0,0 +1,5 @@
+class TemplatesController < ApplicationController
+ def show
+ @template = EcTemplate.find_by_name!(params[:name])
+ end
+end
\ No newline at end of file
diff --git a/app/controllers/users/courses_controller.rb b/app/controllers/users/courses_controller.rb
index c7e957e1a..2c5e29d2b 100644
--- a/app/controllers/users/courses_controller.rb
+++ b/app/controllers/users/courses_controller.rb
@@ -3,7 +3,7 @@ class Users::CoursesController < Users::BaseController
courses = Users::CourseService.new(observed_user, query_params).call
@count = courses.count
- @courses = paginate(courses.includes(teacher: { user_extension: :school }), special: true)
+ @courses = paginate(courses.includes(teacher: { user_extension: :school }), special: observed_user.is_teacher?)
end
private
diff --git a/app/controllers/users/projects_controller.rb b/app/controllers/users/projects_controller.rb
index 07f4d5cac..8ffa8fa85 100644
--- a/app/controllers/users/projects_controller.rb
+++ b/app/controllers/users/projects_controller.rb
@@ -5,7 +5,7 @@ class Users::ProjectsController < Users::BaseController
projects = Users::ProjectService.new(observed_user, query_params).call
@count = projects.count
- @projects = paginate(projects.includes(:project_score, owner: { user_extension: :school }), special: true)
+ @projects = paginate(projects.includes(:project_score, owner: { user_extension: :school }), special: observed_user.is_teacher?)
end
def search
diff --git a/app/controllers/users/shixuns_controller.rb b/app/controllers/users/shixuns_controller.rb
index 7b840a0a1..5d8da9684 100644
--- a/app/controllers/users/shixuns_controller.rb
+++ b/app/controllers/users/shixuns_controller.rb
@@ -3,7 +3,7 @@ class Users::ShixunsController < Users::BaseController
shixuns = Users::ShixunService.new(observed_user, query_params).call
@count = shixuns.count
- @shixuns = paginate(shixuns.includes(:first_tag_repertoire), special: true)
+ @shixuns = paginate(shixuns.includes(:first_tag_repertoire), special: observed_user.is_teacher?)
ids = @shixuns.map(&:id)
@finished_challenges_count_map = Game.joins(:myshixun).where(user_id: observed_user.id, status: 2)
diff --git a/app/controllers/users/subjects_controller.rb b/app/controllers/users/subjects_controller.rb
index 2a4a7975f..2f8f308df 100644
--- a/app/controllers/users/subjects_controller.rb
+++ b/app/controllers/users/subjects_controller.rb
@@ -3,7 +3,7 @@ class Users::SubjectsController < Users::BaseController
subjects = Users::SubjectService.new(observed_user, query_params).call
@count = subjects.count
- @subjects = paginate(subjects.includes(:user, :repertoire), special: true)
+ @subjects = paginate(subjects.includes(:user, :repertoire), special: observed_user.is_teacher?)
end
private
diff --git a/app/controllers/wechats/js_sdk_signatures_controller.rb b/app/controllers/wechats/js_sdk_signatures_controller.rb
index 0b66cc263..4ed1680b0 100644
--- a/app/controllers/wechats/js_sdk_signatures_controller.rb
+++ b/app/controllers/wechats/js_sdk_signatures_controller.rb
@@ -2,10 +2,10 @@ class Wechats::JsSdkSignaturesController < ApplicationController
def create
timestamp = Time.now.to_i
noncestr = ('A'..'z').to_a.sample(8).join
- signature = Util::Wechat.js_sdk_signature(params[:url], noncestr, timestamp)
+ signature = Wechat::OfficialAccount.js_sdk_signature(params[:url], noncestr, timestamp)
- render_ok(appid: Util::Wechat.appid, timestamp: timestamp, noncestr: noncestr, signature: signature)
- rescue Util::Wechat::Error => ex
+ render_ok(appid: Wechat::OfficialAccount.appid, timestamp: timestamp, noncestr: noncestr, signature: signature)
+ rescue Wechat::Error => ex
render_error(ex.message)
end
end
\ No newline at end of file
diff --git a/app/decorators/tiding_decorator.rb b/app/decorators/tiding_decorator.rb
index b4f851e5f..130e7f4b8 100644
--- a/app/decorators/tiding_decorator.rb
+++ b/app/decorators/tiding_decorator.rb
@@ -134,6 +134,15 @@ module TidingDecorator
end
end
+ def delete_course_content
+ I18n.t(locale_format) % belong_container.name
+ end
+
+ def delete_course_member_content
+ name = Course.find_by(id: container_id)&.name
+ I18n.t(locale_format) % [trigger_user&.show_real_name, name]
+ end
+
def shixun_content
I18n.t(locale_format) % container.name
end
@@ -331,13 +340,21 @@ module TidingDecorator
end
def student_work_content
- I18n.t(locale_format(extra.nil?)) % container&.homework_common.try(:name)
+ I18n.t(locale_format) % container&.homework_common.try(:name)
+ end
+
+ def resubmit_student_work_content
+ I18n.t(locale_format) % parent_container.try(:name)
end
def student_works_score_content
I18n.t(locale_format(extra)) % container&.student_work&.homework_common.try(:name)
end
+ def adjust_score_content
+ I18n.t(locale_format) % parent_container.try(:name)
+ end
+
def challenge_work_score_content
I18n.t(locale_format) % container&.comment
end
diff --git a/app/forms/users/apply_authentication_form.rb b/app/forms/users/apply_authentication_form.rb
index 986ba6223..2b984fcaa 100644
--- a/app/forms/users/apply_authentication_form.rb
+++ b/app/forms/users/apply_authentication_form.rb
@@ -4,5 +4,12 @@ class Users::ApplyAuthenticationForm
attr_accessor :name, :id_number, :upload_image
validates :name, presence: true
- validates :id_number, presence: true
+ validate :validate_ID_number
+
+
+ def validate_ID_number
+ unless id_number =~ User::VALID_NUMBER_REGEX
+ raise("身份证格式不对")
+ end
+ end
end
\ No newline at end of file
diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb
index 5ca4eb773..fb7bd1a88 100644
--- a/app/helpers/courses_helper.rb
+++ b/app/helpers/courses_helper.rb
@@ -1,6 +1,18 @@
module CoursesHelper
- # 是否有切换为学生的入口
+ def member_manager group, teachers
+ str = ""
+ members = teachers.select{|teacher| teacher.teacher_course_groups.pluck(:course_group_id).include?(group.id) || teacher.teacher_course_groups.size == 0}
+ str = members.uniq.size == teachers.size ? "全部教师" : members.map{|member| member.user.real_name}.join("、")
+ str
+ # teachers.each do |member|
+ # if member.teacher_course_groups.exists?(course_group_id: group.id) || member.teacher_course_groups.size == 0
+ # str << member.user.real_name
+ # end
+ # end
+ end
+
+ # 是否有切换为学生的入口
def switch_student_role is_teacher, course, user
is_teacher && course.course_members.where(user_id: user.id, role: %i(STUDENT)).exists?
end
@@ -269,8 +281,8 @@ module CoursesHelper
group_info
end
- def last_subject_shixun user_id, course
- myshixun = Myshixun.where(user_id: user_id, shixun_id: course.shixuns).order("updated_at desc").first
+ def last_subject_shixun course, myshixuns
+ myshixun = myshixuns.sort{|x,y| y[:updated_at] <=> x[:updated_at] }.first
return "" unless myshixun
stage_shixun = course.course_stage_shixuns.where(shixun_id: myshixun.shixun_id).take
progress = stage_shixun&.course_stage&.position.to_s + "-" + stage_shixun&.position.to_s + " " + myshixun.shixun&.name
diff --git a/app/helpers/exercises_helper.rb b/app/helpers/exercises_helper.rb
index 98a580ecc..ef9261990 100644
--- a/app/helpers/exercises_helper.rb
+++ b/app/helpers/exercises_helper.rb
@@ -148,7 +148,7 @@ module ExercisesHelper
:choice_position => c.choice_position,
:choice_text => c.choice_text,
:choice_users_count => answer_users_count,
- :choice_percent => answer_percent.round(1).to_s,
+ :choice_percent => answer_percent.round(2).to_s,
:right_answer => right_answer
}
question_answer_infos.push(answer_option)
@@ -174,7 +174,7 @@ module ExercisesHelper
:choice_position => index+1,
:choice_text => s_choice_text,
:choice_users_count => user_count,
- :choice_percent => answer_percent.round(1).to_s,
+ :choice_percent => answer_percent.round(2).to_s,
:right_answer => true
}
question_answer_infos.push(answer_option)
@@ -194,7 +194,7 @@ module ExercisesHelper
:choice_position => (standard_answer_count + 1),
:choice_text => "wrong",
:choice_users_count => user_wrong_count,
- :choice_percent => wrong_percent.round(1).to_s,
+ :choice_percent => wrong_percent.round(2).to_s,
:right_answer => false
}
question_answer_infos.push(wrong_answer_position)
@@ -220,7 +220,7 @@ module ExercisesHelper
:choice_position => index+1,
:choice_text => index+1,
:choice_users_count => s,
- :choice_percent => score_percent.round(1).to_s,
+ :choice_percent => score_percent.round(2).to_s,
:right_answer => right_answer
}
question_answer_infos.push(answer_option)
@@ -246,7 +246,7 @@ module ExercisesHelper
:choice_position => index+1,
:choice_text => index+1,
:choice_users_count => s,
- :choice_percent => score_percent.round(1).to_s,
+ :choice_percent => score_percent.round(2).to_s,
:right_answer => right_answer
}
shixun_chas.push(answer_option)
@@ -256,7 +256,7 @@ module ExercisesHelper
:cha_name => c.challenge.subject,
:cha_position => c.position,
:cha_details => shixun_chas,
- :cha_percent => game_percent.round(1).to_s
+ :cha_percent => game_percent.round(2).to_s
}
question_answer_infos.push(shixun_new_chas)
end
@@ -266,7 +266,7 @@ module ExercisesHelper
:ques_less_title => ques_less_title, #副标题，仅实训题才有
:type => ex.question_type,
:position => ex.question_number,
- :percent => percent.round(1).to_s,
+ :percent => percent.round(2).to_s,
:ques_effictive_counts => effictive_users_count,
:ques_details => question_answer_infos
}
diff --git a/app/helpers/memos_helper.rb b/app/helpers/memos_helper.rb
index 434d9b66a..ea84ec2c1 100644
--- a/app/helpers/memos_helper.rb
+++ b/app/helpers/memos_helper.rb
@@ -1,6 +1,6 @@
module MemosHelper
def forum_list
- [{id: 5, name: "技术分享"}, {id: 3, name: "操作指南"}]
+ [{id: 5, name: "技术分享"}, {id: 3, name: "操作指南"}, {id: 16, name: "通知公告"}]
end
end
diff --git a/app/helpers/stages_helper.rb b/app/helpers/stages_helper.rb
index e0df514e3..93c466c46 100644
--- a/app/helpers/stages_helper.rb
+++ b/app/helpers/stages_helper.rb
@@ -1,8 +1,8 @@
module StagesHelper
# 章节实训的通关情况
- def stage_myshixun_status shixun, user
- myshixun = Myshixun.where(user_id: user.id, shixun_id: shixun.id).take
+ def stage_myshixun_status myshixun
+ # myshixun = Myshixun.where(user_id: user.id, shixun_id: shixun.id).take
myshixun.try(:status) == 1 ? 1 : 0
end
diff --git a/app/helpers/subject_lists_helper.rb b/app/helpers/subject_lists_helper.rb
new file mode 100644
index 000000000..92df21ed8
--- /dev/null
+++ b/app/helpers/subject_lists_helper.rb
@@ -0,0 +1,2 @@
+module SubjectListsHelper
+end
diff --git a/app/jobs/course_delete_student_notify_job.rb b/app/jobs/course_delete_student_notify_job.rb
new file mode 100644
index 000000000..898fc97c9
--- /dev/null
+++ b/app/jobs/course_delete_student_notify_job.rb
@@ -0,0 +1,22 @@
+# 删除课堂用户
+class CourseDeleteStudentNotifyJob < ApplicationJob
+ queue_as :notify
+
+ def perform(course_id, student_ids, trigger_user_id)
+ course = Course.find_by(id: course_id)
+ return if course.blank?
+
+ attrs = %i[user_id trigger_user_id container_id container_type belong_container_id
+ belong_container_type tiding_type created_at updated_at]
+
+ same_attrs = {
+ trigger_user_id: trigger_user_id, container_id: course.id, container_type: 'DeleteCourseMember',
+ belong_container_id: course.id, belong_container_type: 'Course', tiding_type: 'System'
+ }
+ Tiding.bulk_insert(*attrs) do |worker|
+ student_ids.each do |user_id|
+ worker.add same_attrs.merge(user_id: user_id)
+ end
+ end
+ end
+end
diff --git a/app/jobs/create_diff_record_job.rb b/app/jobs/create_diff_record_job.rb
new file mode 100644
index 000000000..fbe8cbff2
--- /dev/null
+++ b/app/jobs/create_diff_record_job.rb
@@ -0,0 +1,12 @@
+class CreateDiffRecordJob < ApplicationJob
+ queue_as :default
+
+ def perform(user_id, obj_id, obj_klass, column_name, before, after)
+ user = User.find_by(id: user_id)
+ obj = obj_klass.constantize.find_by(id: obj_id)
+
+ return if user.blank? || obj.blank?
+
+ CreateDiffRecordService.call(user, obj, column_name, before, after)
+ end
+end
\ No newline at end of file
diff --git a/app/jobs/end_exercise_calculate_job.rb b/app/jobs/end_exercise_calculate_job.rb
new file mode 100644
index 000000000..b6d8e491e
--- /dev/null
+++ b/app/jobs/end_exercise_calculate_job.rb
@@ -0,0 +1,30 @@
+class EndExerciseCalculateJob < ApplicationJob
+
+ include ExercisesHelper
+ include GitHelper
+
+ queue_as :default
+
+ def perform(ex_user_ids,exercise)
+ exercise_users = ExerciseUser.where(id: ex_user_ids)
+ exercise_users.each do |user|
+ if user.commit_status == 0 && user.start_at.present?
+ objective_score = calculate_student_score(exercise,user.user)[:total_score]
+ user_sub_score = user.subjective_score
+ subjective_score = user_sub_score < 0.0 ? 0.0 : user_sub_score
+ total_score = objective_score + subjective_score
+ commit_option = {
+ :status => 1,
+ :commit_status => 1,
+ :end_at => Time.now,
+ :objective_score => objective_score,
+ :score => total_score,
+ :subjective_score => user_sub_score,
+ :commit_method => user&.commit_method.to_i > 0 ? user&.commit_method.to_i : 4
+ }
+ user.update_attributes(commit_option)
+ end
+ end
+ end
+
+end
diff --git a/app/jobs/graduation_task_cross_comment_job.rb b/app/jobs/graduation_task_cross_comment_job.rb
index cf2cb613e..a2d181b50 100644
--- a/app/jobs/graduation_task_cross_comment_job.rb
+++ b/app/jobs/graduation_task_cross_comment_job.rb
@@ -6,31 +6,14 @@ class GraduationTaskCrossCommentJob < ApplicationJob
task = GraduationTask.find_by(id: graduation_task_id)
return if task.blank?
- course = task.course
- task.graduation_task_group_assignations.each do |assignation|
+ task.graduation_task_group_assignations.includes(:graduation_group, :graduation_work).each do |assignation|
graduation_group = assignation.graduation_group
- assign_group = assignation.assign_group
- if graduation_group.present? && assign_group.present?
- course_group_ids = course.teacher_course_groups.where(course_member_id: graduation_group.course_members.pluck(:id)).pluck(:course_group_id)
- graduation_works = task.graduation_works.where(user_id: course.course_members.where(:course_group_id => course_group_ids).map(&:user_id),
- work_status: [1, 2])
- if assign_group.course_members.count <= task.comment_num
- graduation_works.each do |work|
- assign_group.course_members.each do |member|
- work.graduation_work_comment_assignations << GraduationWorkCommentAssignation.new(
- graduation_group_id: assign_group.id, user_id: member.user_id, graduation_task_id: task.id)
- end
- end
- else
- member_user_ids = assign_group.course_members.pluck(:user_id)
- count = 0
- graduation_works.each do |work|
- for i in 1 .. task.comment_num
- assign_user_id = member_user_ids[count % member_user_ids.size]
- work.graduation_work_comment_assignations << GraduationWorkCommentAssignation.new(
- graduation_group_id: assign_group.id, user_id: assign_user_id, graduation_task_id: task.id)
- count += 1
- end
+ work = assignation.graduation_work
+ if graduation_group.present? && work.present?
+ member_ids = graduation_group.course_members.pluck(:user_id).uniq
+ member_ids.each do |user_id|
+ unless work.graduation_work_comment_assignations.exists?(user_id: user_id)
+ work.graduation_work_comment_assignations << GraduationWorkCommentAssignation.new(user_id: user_id, graduation_task_id: task.id)
end
end
end
diff --git a/app/jobs/resubmit_student_work_notify_job.rb b/app/jobs/resubmit_student_work_notify_job.rb
new file mode 100644
index 000000000..1a67aa3ad
--- /dev/null
+++ b/app/jobs/resubmit_student_work_notify_job.rb
@@ -0,0 +1,33 @@
+class ResubmitStudentWorkNotifyJob < ApplicationJob
+ queue_as :notify
+
+ def perform(homework_id, student_ids)
+ homework = HomeworkCommon.find_by(id: homework_id)
+ return if homework.blank? || student_ids.blank?
+ course = homework.course
+
+ attrs = %i[user_id trigger_user_id container_id container_type parent_container_id parent_container_type
+ belong_container_id belong_container_type tiding_type viewed created_at updated_at]
+
+ same_attrs = {
+ container_type: 'ResubmitStudentWork', parent_container_id: homework.id, parent_container_type: 'HomeworkCommon',
+ belong_container_id: course.id, belong_container_type: 'Course', tiding_type: 'HomeworkCommon', viewed: 0
+ }
+ Tiding.bulk_insert(*attrs) do |worker|
+ student_ids.each do |user_id|
+ next unless User.exists?(id: user_id)
+
+ work = homework.student_works.find_by(user_id: user_id)
+ next if work.blank?
+ score_user_ids = work.student_works_scores.where.not(score: nil).where(reviewer_role: [1, 2]).pluck(user_id).uniq
+ next if score_user_ids.blank?
+
+ attrs = same_attrs.merge(trigger_user_id: user_id, container_id: work.id)
+
+ score_user_ids.each do |user_id|
+ worker.add attrs.merge(user_id: user_id)
+ end
+ end
+ end
+ end
+end
diff --git a/app/libs/util.rb b/app/libs/util.rb
index ae2e4b80b..72e728ab9 100644
--- a/app/libs/util.rb
+++ b/app/libs/util.rb
@@ -48,8 +48,8 @@ module Util
return if str.blank?
case type
- when :phone then "#{str[0..2]}***#{str[-4..-1]}"
- when :email then "#{str[0..2]}***#{str[str.rindex('@')..-1]}"
+ when :phone then "#{str[0..2]}***#{str[-3..-1]}"
+ when :email then "#{str[0]}***#{str[(str.rindex('@')-1)..-1]}"
else "#{str[0..2]}***#{str[-3..-1]}"
end
end
diff --git a/app/libs/util/file_manage.rb b/app/libs/util/file_manage.rb
index b6cd79e57..2f87a3e86 100644
--- a/app/libs/util/file_manage.rb
+++ b/app/libs/util/file_manage.rb
@@ -10,24 +10,35 @@ module Util::FileManage
File.join(Rails.root, "public", "images", relative_path)
end
- def disk_filename(source_type, source_id,image_file=nil)
- File.join(storage_path, "#{source_type}", "#{source_id}")
+ def disk_filename(source_type, source_id, suffix=nil)
+ File.join(storage_path, "#{source_type}", "#{source_id}#{suffix}")
end
- def exist?(source_type, source_id)
- File.exist?(disk_filename(source_type, source_id))
+ def source_disk_filename(source, suffix=nil)
+ disk_filename(source.class.name, source.id, suffix)
end
- def exists?(source)
- File.exist?(disk_filename(source.class, source.id))
+ def exist?(source_type, source_id, suffix=nil)
+ File.exist?(disk_filename(source_type, source_id, suffix))
end
- def disk_file_url(source_type, source_id)
- File.join('/images', relative_path, "#{source_type}", "#{source_id}")
+ def exists?(source, suffix=nil)
+ File.exist?(disk_filename(source.class, source.id, suffix))
end
- def source_disk_file_url(source)
- File.join('/images', relative_path, "#{source.class}", "#{source.id}")
+ def disk_file_url(source_type, source_id, suffix = nil)
+ t = ctime(source_type, source_id, suffix)
+ File.join('/images', relative_path, "#{source_type}", "#{source_id}#{suffix}") + "?t=#{t}"
+ end
+
+ def source_disk_file_url(source, suffix=nil)
+ disk_file_url(source.class, source.id, suffix)
+ end
+
+ def ctime(source_type, source_id, suffix)
+ return nil unless exist?(source_type, source_id, suffix)
+
+ File.ctime(disk_filename(source_type, source_id, suffix)).to_i
end
def disk_auth_filename(source_type, source_id, type)
@@ -39,7 +50,7 @@ module Util::FileManage
end
def auth_file_url(source_type, source_id, type)
- File.join('/images', relative_path, source_type, "#{source_id}#{type}")
+ disk_file_url(source_type, source_id, type)
end
def real_name_auth_file_url(source_id)
diff --git a/app/libs/util/wechat.rb b/app/libs/util/wechat.rb
deleted file mode 100644
index 1b064ba94..000000000
--- a/app/libs/util/wechat.rb
+++ /dev/null
@@ -1,75 +0,0 @@
-module Util::Wechat
- BASE_SITE = 'https://api.weixin.qq.com'.freeze
-
- Error = Class.new(StandardError)
-
- class << self
- attr_accessor :appid, :secret
-
- def js_sdk_signature(url, noncestr, timestamp)
- data = { jsapi_ticket: jsapi_ticket, noncestr: noncestr, timestamp: timestamp, url: url }
- str = data.map { |k, v| "#{k}=#{v}" }.join('&')
- Digest::SHA1.hexdigest(str)
- end
-
- def access_token
- # 7200s 有效时间
- Rails.cache.fetch(access_token_cache_key, expires_in: 100.minutes) do
- result = request(:get, '/cgi-bin/token', appid: appid, secret: secret, grant_type: 'client_credential')
- result['access_token']
- end
- end
-
- def refresh_access_token
- Rails.cache.delete(access_token_cache_key)
- access_token
- end
-
- def jsapi_ticket
- # 7200s 有效时间
- Rails.cache.fetch(jsapi_ticket_cache_key, expires_in: 100.minutes) do
- result = request(:get, '/cgi-bin/ticket/getticket', access_token: access_token, type: 'jsapi')
- result['ticket']
- end
- end
-
- def refresh_jsapi_ticket
- Rails.cache.delete(jsapi_ticket_cache_key)
- jsapi_ticket
- end
-
- def access_token_cache_key
- "#{base_cache_key}/access_token"
- end
-
- def jsapi_ticket_cache_key
- "#{base_cache_key}/jsapi_ticket"
- end
-
- def base_cache_key
- "wechat/#{appid}"
- end
-
- private
-
- def request(method, url, **params)
- Rails.logger.error("[wechat] request: #{method} #{url} #{params.inspect}")
-
- client = Faraday.new(url: BASE_SITE)
- response = client.public_send(method, url, params)
- result = JSON.parse(response.body)
-
- Rails.logger.error("[wechat] response:#{response.status} #{result.inspect}")
-
- if response.status != 200
- raise Error, result.inspect
- end
-
- if result['errcode'].present? && result['errcode'].to_i.nonzero?
- raise Error, result.inspect
- end
-
- result
- end
- end
-end
\ No newline at end of file
diff --git a/app/libs/wechat.rb b/app/libs/wechat.rb
new file mode 100644
index 000000000..68e2c06b8
--- /dev/null
+++ b/app/libs/wechat.rb
@@ -0,0 +1,2 @@
+module Wechat
+end
\ No newline at end of file
diff --git a/app/libs/wechat/app.rb b/app/libs/wechat/app.rb
new file mode 100644
index 000000000..54f60fa2a
--- /dev/null
+++ b/app/libs/wechat/app.rb
@@ -0,0 +1,11 @@
+class Wechat::App
+ class << self
+ attr_accessor :appid, :secret
+
+ delegate :access_token, :jscode2session, to: :client
+
+ def client
+ @_client ||= Wechat::Client.new(appid, secret)
+ end
+ end
+end
\ No newline at end of file
diff --git a/app/libs/wechat/client.rb b/app/libs/wechat/client.rb
new file mode 100644
index 000000000..5ac0a28f2
--- /dev/null
+++ b/app/libs/wechat/client.rb
@@ -0,0 +1,74 @@
+class Wechat::Client
+ BASE_SITE = 'https://api.weixin.qq.com'.freeze
+
+ attr_reader :appid, :secret
+
+ def initialize(appid, secret)
+ @appid = appid
+ @secret = secret
+ end
+
+ def access_token
+ # 7200s 有效时间
+ Rails.cache.fetch(access_token_cache_key, expires_in: 100.minutes) do
+ result = request(:get, '/cgi-bin/token', appid: appid, secret: secret, grant_type: 'client_credential')
+ result['access_token']
+ end
+ end
+
+ def refresh_access_token
+ Rails.cache.delete(access_token_cache_key)
+ access_token
+ end
+
+ def jsapi_ticket
+ # 7200s 有效时间
+ Rails.cache.fetch(jsapi_ticket_cache_key, expires_in: 100.minutes) do
+ result = request(:get, '/cgi-bin/ticket/getticket', access_token: access_token, type: 'jsapi')
+ result['ticket']
+ end
+ end
+
+ def refresh_jsapi_ticket
+ Rails.cache.delete(jsapi_ticket_cache_key)
+ jsapi_ticket
+ end
+
+ def jscode2session(code)
+ request(:get, '/sns/jscode2session', appid: appid, secret: secret, js_code: code, grant_type: 'authorization_code')
+ end
+
+ def access_token_cache_key
+ "#{base_cache_key}/access_token"
+ end
+
+ def jsapi_ticket_cache_key
+ "#{base_cache_key}/jsapi_ticket"
+ end
+
+ def base_cache_key
+ "wechat/#{appid}"
+ end
+
+ private
+
+ def request(method, url, **params)
+ Rails.logger.error("[wechat] request: #{method} #{url} #{params.except(:secret).inspect}")
+
+ client = Faraday.new(url: BASE_SITE)
+ response = client.public_send(method, url, params)
+ result = JSON.parse(response.body)
+
+ Rails.logger.error("[wechat] response:#{response.status} #{result.inspect}")
+
+ if response.status != 200
+ raise Wechat::Error.parse(result)
+ end
+
+ if result['errcode'].present? && result['errcode'].to_i.nonzero?
+ raise Wechat::Error.parse(result)
+ end
+
+ result
+ end
+end
\ No newline at end of file
diff --git a/app/libs/wechat/error.rb b/app/libs/wechat/error.rb
new file mode 100644
index 000000000..f693fb41b
--- /dev/null
+++ b/app/libs/wechat/error.rb
@@ -0,0 +1,14 @@
+class Wechat::Error < StandardError
+ attr_reader :code
+
+ def initialize(code, message)
+ super message
+ @code = code
+ end
+
+ class << self
+ def parse(result)
+ new(result['errcode'], result['errmsg'])
+ end
+ end
+end
\ No newline at end of file
diff --git a/app/libs/wechat/official_account.rb b/app/libs/wechat/official_account.rb
new file mode 100644
index 000000000..88208d6f3
--- /dev/null
+++ b/app/libs/wechat/official_account.rb
@@ -0,0 +1,17 @@
+class Wechat::OfficialAccount
+ class << self
+ attr_accessor :appid, :secret
+
+ delegate :access_token, :jsapi_ticket, to: :client
+
+ def js_sdk_signature(url, noncestr, timestamp)
+ data = { jsapi_ticket: jsapi_ticket, noncestr: noncestr, timestamp: timestamp, url: url }
+ str = data.map { |k, v| "#{k}=#{v}" }.join('&')
+ Digest::SHA1.hexdigest(str)
+ end
+
+ def client
+ @_client ||= Wechat::Client.new(appid, secret)
+ end
+ end
+end
\ No newline at end of file
diff --git a/app/models/challenge.rb b/app/models/challenge.rb
index 455fd1b6a..da88b0fca 100644
--- a/app/models/challenge.rb
+++ b/app/models/challenge.rb
@@ -28,6 +28,8 @@ class Challenge < ApplicationRecord
scope :fields_for_list, -> { select([:id, :subject, :st, :score, :position, :shixun_id]) }
+ after_commit :create_diff_record
+
def next_challenge
position = self.position + 1
Challenge.where(:position => position, :shixun_id => self.shixun).first
@@ -126,4 +128,11 @@ class Challenge < ApplicationRecord
end
# 关卡评测文件
+
+ private
+
+ def create_diff_record
+ return unless task_pass_previously_changed?
+ CreateDiffRecordJob.perform_later(User.current.id, id, 'Challenge', 'task_pass', task_pass_before_last_save, task_pass)
+ end
end
diff --git a/app/models/course.rb b/app/models/course.rb
index ba818449e..6dd361733 100644
--- a/app/models/course.rb
+++ b/app/models/course.rb
@@ -354,9 +354,8 @@ class Course < ApplicationRecord
Myshixun.where(user_id: user_id, shixun_id: shixuns).exists?
end
- def my_subject_progress
- my_challenge_count = Game.joins(:challenge).where(user_id: User.current.id, status: 2, challenges: {shixun_id: shixuns.published_closed}).
- pluck(:challenge_id).uniq.size
+ def my_subject_progress myshixuns
+ my_challenge_count = Game.where(myshixun_id: myshixuns.pluck(:id), status: 2).pluck(:challenge_id).uniq.size
course_challeng_count = shixuns.pluck(:challenges_count).sum
count = course_challeng_count == 0 ? 0 : ((my_challenge_count.to_f / course_challeng_count).round(2) * 100).to_i
end
diff --git a/app/models/diff_record.rb b/app/models/diff_record.rb
new file mode 100644
index 000000000..afbb9dd9c
--- /dev/null
+++ b/app/models/diff_record.rb
@@ -0,0 +1,8 @@
+class DiffRecord < ApplicationRecord
+ belongs_to :user
+ belongs_to :container, polymorphic: true
+
+ has_one :diff_record_content, dependent: :destroy
+
+ delegate :content, to: :diff_record_content
+end
\ No newline at end of file
diff --git a/app/models/diff_record_content.rb b/app/models/diff_record_content.rb
new file mode 100644
index 000000000..ce5e1d354
--- /dev/null
+++ b/app/models/diff_record_content.rb
@@ -0,0 +1,3 @@
+class DiffRecordContent < ApplicationRecord
+ belongs_to :diff_record
+end
\ No newline at end of file
diff --git a/app/models/ec_course.rb b/app/models/ec_course.rb
index 6f5480ea8..5aefa2699 100644
--- a/app/models/ec_course.rb
+++ b/app/models/ec_course.rb
@@ -6,7 +6,7 @@ class EcCourse < ApplicationRecord
has_many :ec_graduation_subitem_course_targets, through: :ec_course_targets
# 课程负责教师
has_many :ec_course_users
- has_many :course_managers, through: :ec_course_users, class_name: 'User'
+ has_many :course_managers, through: :ec_course_users, source: :user
# 课程考核标准
has_many :ec_course_evaluations, dependent: :destroy
# 课程等级
@@ -21,7 +21,7 @@ class EcCourse < ApplicationRecord
has_many :courses, through: :ec_major_courses
# 课程目标达成方法
- # has_many :ec_course_achievement_methods
+ has_many :ec_course_achievement_methods
accepts_nested_attributes_for :ec_course_targets, :ec_score_levels, allow_destroy: true
end
diff --git a/app/models/ec_course_evaluation.rb b/app/models/ec_course_evaluation.rb
index 6b778de66..40fd10dfa 100644
--- a/app/models/ec_course_evaluation.rb
+++ b/app/models/ec_course_evaluation.rb
@@ -11,8 +11,28 @@ class EcCourseEvaluation < ApplicationRecord
enum score_type: { detail: 1, average: 2 }, _suffix: :score_type # :detail_score_type?, :average_score_type?
accepts_nested_attributes_for :ec_course_evaluation_subitems, allow_destroy: true
+ alias_attribute :evaluation_count, :evluation_count
def imported?
import_status?
end
+
+ def evaluation_relates
+ # 总成绩支撑只有课程考核标准的名称， 分项成绩支撑是课程考核标准名称与考核分项的笛卡尔积
+ if status == 1
+ return evaluation_count.times.map { |index| { id: -1, name: "#{name}（#{index + 1}）", position: index + 1 } }
+ end
+
+ if is_course_type?
+ ec_course_evaluation_subitems.map.with_index { |item, index| { id: item.id, name: item.name, position: index + 1 } }
+ else
+ data = []
+ ec_course_evaluation_subitems.each do |item|
+ evaluation_count.times do |i|
+ data << { id: item.id, name: "#{name}（#{i + 1}）#{item.name}", position: i + 1 }
+ end
+ end
+ data
+ end
+ end
end
diff --git a/app/models/exercise.rb b/app/models/exercise.rb
index 825f7cd9f..8469d25b6 100644
--- a/app/models/exercise.rb
+++ b/app/models/exercise.rb
@@ -131,7 +131,7 @@ class Exercise < ApplicationRecord
status = 4
else
if user.present? && user.student_of_course?(course) #当为学生的时候,需根据分班来判断试卷状态
- ex_time = get_exercise_times(user_id,false)
+ ex_time = get_exercise_times(user.id,false)
pb_time = ex_time[:publish_time]
ed_time = ex_time[:end_time]
if pb_time.present? && ed_time.present? && pb_time <= Time.now && ed_time > Time.now
diff --git a/app/models/exercise_user.rb b/app/models/exercise_user.rb
index 84f042b25..0f2e8456e 100644
--- a/app/models/exercise_user.rb
+++ b/app/models/exercise_user.rb
@@ -1,4 +1,5 @@
class ExerciseUser < ApplicationRecord
+ # commit_method 0 为默认， 1为学生的手动提交，2为倒计时结束后自动提交，3为试卷定时截止的自动提交, 4为教师手动的立即截止
belongs_to :user
belongs_to :exercise
diff --git a/app/models/forum.rb b/app/models/forum.rb
index 88aafa676..cd9b76a96 100644
--- a/app/models/forum.rb
+++ b/app/models/forum.rb
@@ -1,2 +1,3 @@
class Forum < ApplicationRecord
+ has_many :memos, dependent: :destroy
end
diff --git a/app/models/graduation_task.rb b/app/models/graduation_task.rb
index 17309101d..c9838954a 100644
--- a/app/models/graduation_task.rb
+++ b/app/models/graduation_task.rb
@@ -13,8 +13,15 @@ class GraduationTask < ApplicationRecord
has_many :attachments, as: :container, dependent: :destroy
- has_many :graduation_task_group_assignations, dependent: :destroy
has_many :graduation_work_comment_assignations, dependent: :destroy
+ # has_many :formal_graduation_work_comment_assignations, -> { formal }, class_name: "GraduationWorkCommentAssignation"
+ # has_many :temporary_graduation_work_comment_assignations, -> { temporary }, class_name: "GraduationWorkCommentAssignation"
+ # has_many :delete_graduation_work_comment_assignations, -> { temporary_delete }, class_name: "GraduationWorkCommentAssignation"
+ #
+ has_many :graduation_task_group_assignations, dependent: :destroy
+ # has_many :formal_graduation_task_group_assignations, -> { formal }, class_name: "GraduationTaskGroupAssignation"
+ # has_many :temporary_graduation_task_group_assignations, -> { temporary }, class_name: "GraduationTaskGroupAssignation"
+ # has_many :delete_graduation_task_group_assignations, -> { temporary_delete }, class_name: "GraduationTaskGroupAssignation"
has_many :graduation_works, -> { where("is_delete = 0") }
has_many :score_graduation_works, -> { where("is_delete = 0 and work_status != 0").order("work_score desc") }, class_name: "GraduationWork"
diff --git a/app/models/graduation_task_group_assignation.rb b/app/models/graduation_task_group_assignation.rb
index 52da65191..b7e857c35 100644
--- a/app/models/graduation_task_group_assignation.rb
+++ b/app/models/graduation_task_group_assignation.rb
@@ -1,6 +1,12 @@
class GraduationTaskGroupAssignation < ApplicationRecord
+ # temporary 0: 正式分配 1：临时分配（交叉评阅设置中临时分配的作品，点取消时会删除） 2: 删除标志
belongs_to :graduation_task
belongs_to :graduation_group
- belongs_to :assign_group, class_name: 'GraduationGroup', foreign_key: :assign_graduation_group_id # 分配的互评组
+ belongs_to :assign_group, class_name: 'GraduationGroup', foreign_key: :assign_graduation_group_id, optional: true # 分配的互评组
+ belongs_to :graduation_work, optional: true
+ scope :temporary, -> {where(temporary: 1)}
+ scope :formal, -> {where(temporary: 0)}
+ scope :temporary_delete, -> {where(temporary: 2)}
+ scope :temporary_formal, -> {where(temporary: [0, 1])}
end
diff --git a/app/models/graduation_work.rb b/app/models/graduation_work.rb
index c7420ffef..96dce0c49 100644
--- a/app/models/graduation_work.rb
+++ b/app/models/graduation_work.rb
@@ -6,10 +6,18 @@ class GraduationWork < ApplicationRecord
belongs_to :graduation_task, optional: true
belongs_to :commit_user, class_name: 'User', foreign_key: :commit_user_id, optional: true
+ belongs_to :update_user, class_name: 'User', foreign_key: :update_user_id, optional: true
has_many :attachments, as: :container, dependent: :destroy
has_many :tidings, as: :container, dependent: :destroy
has_many :graduation_work_scores, dependent: :destroy
+
has_many :graduation_work_comment_assignations, dependent: :destroy
+ # has_many :formal_graduation_work_comment_assignations, -> { formal }, class_name: "GraduationWorkCommentAssignation"
+ # has_many :temporary_graduation_work_comment_assignations, -> { temporary }, class_name: "GraduationWorkCommentAssignation"
+
+ has_many :graduation_task_group_assignations, dependent: :destroy
+ # 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 }
@@ -108,11 +116,29 @@ class GraduationWork < ApplicationRecord
end
end
+ # 作品被交叉评阅的次数
def cross_comment_num
graduation_work_scores.where(reviewer_role: 2).group_by(&:user_id).count
end
+ # 作品是否被评阅过
def scored?
- graduation_work_scores.where.not(reviewer_role: 3).exists?
+ graduation_work_scores.where.not(score: nil).exists?
+ end
+
+ def work_cross_teacher_ids
+ graduation_work_comment_assignations.temporary_formal.pluck(:user_id)
+ end
+
+ def work_cross_teachers
+ User.where(id: work_cross_teacher_ids).map(&:real_name).join("、")
+ end
+
+ def work_cross_group_ids
+ graduation_task_group_assignations.temporary_formal.pluck(:graduation_group_id)
+ end
+
+ def work_cross_groups
+ course.graduation_groups.where(id: work_cross_group_ids).pluck(:name).join("、")
end
end
diff --git a/app/models/graduation_work_comment_assignation.rb b/app/models/graduation_work_comment_assignation.rb
index 33f30d2a0..7225dbcbf 100644
--- a/app/models/graduation_work_comment_assignation.rb
+++ b/app/models/graduation_work_comment_assignation.rb
@@ -1,8 +1,13 @@
class GraduationWorkCommentAssignation < ApplicationRecord
+ # temporary 0: 正式分配 1：临时分配（交叉评阅设置中临时分配的作品，点取消时会删除） 2: 删除标志
belongs_to :graduation_work
belongs_to :graduation_task
belongs_to :user
- belongs_to :graduation_group
+ belongs_to :graduation_group, optional: true
+ scope :temporary, -> {where(temporary: 1)}
+ scope :formal, -> {where(temporary: 0)}
+ scope :temporary_delete, -> {where(temporary: 2)}
+ scope :temporary_formal, -> {where(temporary: [0, 1])}
scope :myself, ->(user_id) {where(user_id: user_id)}
end
diff --git a/app/models/graduation_work_score.rb b/app/models/graduation_work_score.rb
index fa978b68f..eaf59ffbd 100644
--- a/app/models/graduation_work_score.rb
+++ b/app/models/graduation_work_score.rb
@@ -1,4 +1,5 @@
class GraduationWorkScore < ApplicationRecord
+ # reviewer_role： 1 老师评分 2 交叉评分
belongs_to :graduation_work
belongs_to :user
belongs_to :graduation_task
diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index 40de5a87c..abe254b28 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -136,7 +136,7 @@ class HomeworkCommon < ApplicationRecord
# 作业查看最新成绩
def update_score identity
- identity < Course::NORMAL && publish_time.present? && publish_time < Time.now && !course.is_end
+ identity < Course::NORMAL && publish_time.present? && publish_time < Time.now && !end_or_late_none_group
end
# 作业能否立即发布
diff --git a/app/models/laboratory.rb b/app/models/laboratory.rb
new file mode 100644
index 000000000..53e66ece0
--- /dev/null
+++ b/app/models/laboratory.rb
@@ -0,0 +1,26 @@
+class Laboratory < ApplicationRecord
+ belongs_to :school, optional: true
+
+ has_many :laboratory_users, dependent: :destroy
+ has_many :users, through: :laboratory_users, source: :user
+
+ has_one :laboratory_setting, dependent: :destroy
+
+ validates :identifier, uniqueness: { case_sensitive: false }, allow_nil: true
+
+ def site
+ rails_env = EduSetting.get('rails_env')
+ suffix = rails_env && rails_env != 'production' ? ".#{rails_env}.educoder.net" : '.educoder.net'
+
+ identifier ? "#{identifier}#{suffix}" : ''
+ end
+
+ def self.find_by_subdomain(subdomain)
+ return if subdomain.blank?
+
+ rails_env = EduSetting.get('rails_env')
+ subdomain = subdomain.slice(0, subdomain.size - rails_env.size - 1) if subdomain.end_with?(rails_env) # winse.dev => winse
+
+ find_by_identifier(subdomain)
+ end
+end
\ No newline at end of file
diff --git a/app/models/laboratory_setting.rb b/app/models/laboratory_setting.rb
new file mode 100644
index 000000000..32848dca2
--- /dev/null
+++ b/app/models/laboratory_setting.rb
@@ -0,0 +1,54 @@
+class LaboratorySetting < ApplicationRecord
+ belongs_to :laboratory
+
+ serialize :config, JSON
+
+ %i[name navbar footer].each do |method_name|
+ define_method method_name do
+ config&.[](method_name.to_s)
+ end
+
+ define_method "#{method_name}=" do |value|
+ self.config ||= {}
+ config.[]=(method_name.to_s, value)
+ end
+ end
+
+ def login_logo_url
+ logo_url('login')
+ end
+
+ def nav_logo_url
+ logo_url('nav')
+ end
+
+ def tab_logo_url
+ logo_url('tab')
+ end
+
+ def default_navbar
+ self.class.default_config[:navbar]
+ end
+
+ private
+
+ def logo_url(type)
+ return nil unless Util::FileManage.exists?(self, type)
+ Util::FileManage.source_disk_file_url(self, type)
+ end
+
+ def self.default_config
+ {
+ name: nil,
+ navbar: [
+ { 'name' => '实践课程', 'link' => '/paths', 'hidden' => false },
+ { 'name' => '翻转课堂', 'link' => '/courses', 'hidden' => false },
+ { 'name' => '实现项目', 'link' => '/shixuns', 'hidden' => false },
+ { 'name' => '在线竞赛', 'link' => '/competitions', 'hidden' => false },
+ { 'name' => '教学案例', 'link' => '/moop_cases', 'hidden' => false },
+ { 'name' => '交流问答', 'link' => '/forums', 'hidden' => false },
+ ],
+ footer: nil
+ }
+ end
+end
\ No newline at end of file
diff --git a/app/models/laboratory_user.rb b/app/models/laboratory_user.rb
new file mode 100644
index 000000000..be6c0c4dd
--- /dev/null
+++ b/app/models/laboratory_user.rb
@@ -0,0 +1,4 @@
+class LaboratoryUser < ApplicationRecord
+ belongs_to :laboratory
+ belongs_to :user
+end
\ No newline at end of file
diff --git a/app/models/mirror_repository.rb b/app/models/mirror_repository.rb
index e29b008ad..96a92e5e7 100644
--- a/app/models/mirror_repository.rb
+++ b/app/models/mirror_repository.rb
@@ -5,7 +5,7 @@ class MirrorRepository < ApplicationRecord
- scope :published_mirror, -> { where(status: 1) }
+ scope :published_mirror, -> { where(status: [1,2,3,5]) }
scope :published_main_mirror, -> { published_mirror.where(main_type: 1) }
scope :published_small_mirror, -> { published_mirror.where(main_type: 0) }
diff --git a/app/models/portal_image.rb b/app/models/portal_image.rb
index 24b9af39d..a3fd71bb5 100644
--- a/app/models/portal_image.rb
+++ b/app/models/portal_image.rb
@@ -1,2 +1,5 @@
class PortalImage < ApplicationRecord
+ def online?
+ status?
+ end
end
diff --git a/app/models/searchable/subject.rb b/app/models/searchable/subject.rb
index a0036c200..64845a566 100644
--- a/app/models/searchable/subject.rb
+++ b/app/models/searchable/subject.rb
@@ -18,7 +18,9 @@ module Searchable::Subject
def search_data
{
name: name,
- description: Util.extract_content(description)[0..Searchable::MAXIMUM_LENGTH]
+ description: Util.extract_content(description)[0..Searchable::MAXIMUM_LENGTH],
+ shixuns_count: shixuns_count,
+ myshixuns_count: member_count,
}.merge!(searchable_user_data)
.merge!(searchable_stages_data)
end
@@ -45,7 +47,8 @@ module Searchable::Subject
visits_count: visits,
stage_count: stages_count,
stage_shixuns_count: stage_shixuns_count,
- shixuns_count: shixuns_count
+ shixuns_count: shixuns_count,
+ myshixuns_count: member_count
}
end
diff --git a/app/models/shixun.rb b/app/models/shixun.rb
index 4912ea15a..0cdb2e82b 100644
--- a/app/models/shixun.rb
+++ b/app/models/shixun.rb
@@ -1,5 +1,6 @@
class Shixun < ApplicationRecord
include Searchable::Shixun
+ attr_accessor :page_no #管理员页面 实训配置更新状态时，需要接受page_no参数
# status: 0：编辑 1：申请发布 2：正式发布 3：关闭 -1：软删除
# hide_code： 隐藏代码窗口
diff --git a/app/models/shixun_info.rb b/app/models/shixun_info.rb
index 542e0222d..74a49412e 100644
--- a/app/models/shixun_info.rb
+++ b/app/models/shixun_info.rb
@@ -2,4 +2,13 @@ class ShixunInfo < ApplicationRecord
belongs_to :shixun
validates_uniqueness_of :shixun_id
validates_presence_of :shixun_id
+
+ after_commit :create_diff_record
+
+ private
+
+ def create_diff_record
+ return unless description_previously_changed?
+ CreateDiffRecordJob.perform_later(User.current.id, id, 'ShixunInfo', 'description', description_before_last_save, description)
+ end
end
diff --git a/app/models/student_work.rb b/app/models/student_work.rb
index b4ad834de..2e7f843ae 100644
--- a/app/models/student_work.rb
+++ b/app/models/student_work.rb
@@ -193,7 +193,7 @@ class StudentWork < ApplicationRecord
end
def scored?
- student_works_scores.where.not(reviewer_role: 3).exists?
+ student_works_scores.where.not(reviewer_role: 3, score: nil).exists?
end
def work_challenge_score game, score
@@ -202,7 +202,7 @@ class StudentWork < ApplicationRecord
if adjust_score.present?
game_score = adjust_score.score
else
- setting = homework_common.homework_group_setting user_id
+ setting = homework_common.homework_group_setting game.user_id
if game.status == 2 && ((game.end_time && game.end_time < setting.end_time) || (homework_common.allow_late && game.end_time && game.end_time < homework_common.late_time))
answer_open_evaluation = homework_common.homework_detail_manual.answer_open_evaluation
game_score = answer_open_evaluation ? score : (game.final_score > 0 ? game.real_score(score) : 0)
diff --git a/app/models/user.rb b/app/models/user.rb
index e55bb8425..92005d142 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,674 +1,692 @@
-class User < ApplicationRecord
- include Watchable
- include Searchable::Dependents::User
-
- # Account statuses
- STATUS_ANONYMOUS = 0
- STATUS_ACTIVE = 1
- STATUS_REGISTERED = 2
- STATUS_LOCKED = 3
-
- # tpi tpm权限控制
- EDU_ADMIN = 1 # 超级管理员
- EDU_BUSINESS = 2 # 运营人员
- EDU_SHIXUN_MANAGER = 3 # 实训管理员
- EDU_SHIXUN_MEMBER = 4 # 实训成员
- EDU_CERTIFICATION_TEACHER = 5 # 平台认证的老师
- EDU_GAME_MANAGER = 6 # TPI的创建者
- EDU_TEACHER = 7 # 平台老师,但是未认证
- EDU_NORMAL = 8 # 普通用户
-
- VALID_EMAIL_REGEX = /^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/i
- VALID_PHONE_REGEX = /^1\d{10}$/
-
- LOGIN_LENGTH_LIMIT = 30
- MAIL_LENGTH_LMIT = 60
-
- MIX_PASSWORD_LIMIT = 8
-
- LOGIN_CHARS = %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).freeze
-
- has_one :user_extension, dependent: :destroy
- accepts_nested_attributes_for :user_extension, update_only: true
-
- has_many :memos, foreign_key: 'author_id'
- has_many :created_shixuns, class_name: 'Shixun'
- has_many :shixun_members, :dependent => :destroy
- has_many :shixuns, :through => :shixun_members
- has_many :myshixuns, :dependent => :destroy
- has_many :study_shixuns, through: :myshixuns, source: :shixun # 已学习的实训
- has_many :course_messages
- has_many :courses, dependent: :destroy
-
- #试卷
- has_many :exercise_banks, :dependent => :destroy
- has_many :exercise_users, :dependent => :destroy
- has_many :exercise_answers, :dependent => :destroy #针对每个题目学生的答案
- has_many :exercise_shixun_answers, :dependent => :destroy #针对每个实训题目学生的答案
- has_many :exercise_answer_comments, :dependent => :destroy
- has_many :exercises, :dependent => :destroy #创建的试卷
-
- has_many :homework_banks, dependent: :destroy
-
- has_many :graduation_works, dependent: :destroy
-
- has_many :students_for_courses, foreign_key: :student_id, dependent: :destroy
- has_one :onclick_time, :dependent => :destroy
-
- # 新版私信
- has_many :private_messages, dependent: :destroy
- has_many :recent_contacts, through: :private_messages, source: :target
- has_many :tidings, :dependent => :destroy
-
- has_many :games, :dependent => :destroy
- has_many :created_subjects, foreign_key: :user_id, class_name: 'Subject'
- has_many :subject_members, :dependent => :destroy
- has_many :subjects, :through => :subject_members
- has_many :grades, :dependent => :destroy
- has_many :experiences, :dependent => :destroy
- has_many :student_works, :dependent => :destroy
- has_many :student_works_scores
- has_many :student_works_evaluation_distributions
-
- # 毕业设计
- has_many :graduation_topics, :dependent => :destroy
- has_many :student_graduation_topics, :dependent => :destroy
-
- # 题库
- has_many :question_banks, :dependent => :destroy
- # 毕设任务题库
- has_many :gtask_banks, dependent: :destroy
- has_many :gtopic_banks, dependent: :destroy
-
- #问卷
- has_many :course_members, :dependent => :destroy
- has_many :poll_votes, :dependent => :destroy
- has_many :poll_users, :dependent => :destroy
-
- has_many :messages,foreign_key: 'author_id',:dependent => :destroy
-
- has_many :journals_for_messages, :as => :jour, :dependent => :destroy
- has_many :teacher_course_groups, :dependent => :destroy
-
- has_many :attachments,foreign_key: :author_id, :dependent => :destroy
-
- # 工程认证
- has_many :ec_school_users,:dependent => :destroy
- has_many :schools, :through => :ec_school_users
-
- has_many :ec_major_school_users, :dependent => :destroy
- has_many :ec_major_schools, :through => :ec_major_school_users
-
- has_many :ec_course_users
-
- has_many :department_members, dependent: :destroy #部门管理员
-
- # 课堂
- has_many :student_course_members, -> { course_students }, class_name: 'CourseMember'
- has_many :as_student_courses, through: :student_course_members, source: :course
- has_many :manage_course_members, -> { teachers_and_admin }, class_name: 'CourseMember'
- has_many :manage_courses, through: :manage_course_members, source: :course
-
- # 关注
- has_many :be_watchers, foreign_key: :user_id, dependent: :destroy # 我的关注
- has_many :be_watcher_users, through: :be_watchers, dependent: :destroy # 我关注的用户
-
- # 认证
- has_many :apply_user_authentication
- has_one :process_real_name_apply, -> { processing.real_name_auth.order(created_at: :desc) }, class_name: 'ApplyUserAuthentication'
- has_one :process_professional_apply, -> { processing.professional_auth.order(created_at: :desc) }, class_name: 'ApplyUserAuthentication'
- has_many :apply_actions, dependent: :destroy
- has_many :trail_auth_apply_actions, -> { where(container_type: 'TrialAuthorization') }, class_name: 'ApplyAction'
-
- has_many :attendances
-
- # 兴趣
- has_many :user_interests, dependent: :delete_all
- has_many :interests, through: :user_interests, source: :repertoire
-
- # 众包
- has_many :project_packages, foreign_key: :creator_id, dependent: :destroy
- has_many :bidding_users, dependent: :destroy
- has_many :bidden_project_packages, through: :bidding_users, source: :project_package
-
- # 项目
- has_many :applied_projects, dependent: :destroy
-
- # 教学案例
- has_many :libraries, dependent: :destroy
-
- # 视频
- has_many :videos, dependent: :destroy
-
- # 客户管理
- belongs_to :partner, optional: true
-
- # Groups and active users
- scope :active, lambda { where(status: STATUS_ACTIVE) }
-
- attr_accessor :password, :password_confirmation
-
- delegate :gender, :department_id, :school_id, :location, :location_city, :technical_title, to: :user_extension, allow_nil: true
-
- before_save :update_hashed_password
-
- #
- # validations
- #
- validates_presence_of :login, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }, case_sensitive: false
- validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, case_sensitive: false
- validates_uniqueness_of :mail, :if => Proc.new { |user| user.mail_changed? && user.mail.present? }, case_sensitive: false
- validates_uniqueness_of :phone, :if => Proc.new { |user| user.phone_changed? && user.phone.present? }, case_sensitive: false
- validates_length_of :login, maximum: LOGIN_LENGTH_LIMIT
- validates_length_of :mail, maximum: MAIL_LENGTH_LMIT
- # validates_format_of :mail, with: VALID_EMAIL_REGEX, multiline: true
- # validates_format_of :phone, with: VALID_PHONE_REGEX, multiline: true
- validate :validate_password_length
-
- # validates :nickname, presence: true, length: { maximum: 10 }
- # validates :lastname, presence: true
-
- # 删除自动登录的token，一旦退出下次会提示需要登录
- def delete_autologin_token(value)
- Token.where(:user_id => id, :action => 'autologin', :value => value).delete_all
- end
-
- def delete_session_token(value)
- Token.where(:user_id => id, :action => 'session', :value => value).delete_all
- end
-
- def git_mail
- mail.blank? ? "#{login}@educoder.net" : mail
- end
-
- # 学号
- def student_id
- self.user_extension.try(:student_id)
- end
-
- # 关注数
- def follow_count
- Watcher.where(user_id: id, watchable_type: %w(Principal User)).count
- # User.watched_by(id).count
- end
-
- # 粉丝数
- def fan_count
- Watcher.where(watchable_type: %w(Principal User), watchable_id: id).count
- # watchers.count
- end
-
- # 判断当前用户是否为老师
- def is_teacher?
- self.user_extension.teacher?
- end
-
- # 平台认证的老师
- def is_certification_teacher
- self.user_extension.teacher? && self.professional_certification
- end
-
- def certification_teacher?
- professional_certification? && user_extension.teacher?
- end
-
- # 判断用户的身份
- def identity
- ue = self.user_extension
- unless ue.blank?
- if ue.teacher?
- ue.technical_title ? ue.technical_title : "老师"
- elsif ue.student?
- "学生"
- else
- ue.technical_title ? ue.technical_title : "专业人士"
- end
- end
- end
-
- # 判断当前用户是否通过职业认证
- def pro_certification?
- professional_certification
- end
-
- # 用户的学校名称
- def school_name
- user_extension&.school&.name || ''
- end
-
- # 用户的学院名称
- def department_name
- user_extension&.department&.name || ''
- end
-
- # 课堂的老师(创建者、老师、助教)
- def teacher_of_course?(course)
- course.course_members.exists?(user_id: id, role: [1,2,3], is_active: 1) || admin? || business?
- end
-
- # 课堂的老师(创建者、老师、助教)，不用考虑当前身份
- def teacher_of_course_non_active?(course)
- course.course_members.exists?(user_id: id, role: [1,2,3])
- end
-
- # 是否是教师，课堂管理员或者超级管理员
- def teacher_or_admin?(course)
- course.course_members.exists?(user_id: id, role: [1,2], is_active: 1) || admin? || business?
- end
-
- # 课堂的创建者(考虑到多重身份的用户)
- def creator_of_course?(course)
- course.course_members.exists?(user_id: id, role: 1, is_active: 1) || admin? || business?
- end
-
- # 课堂的学生
- def student_of_course?(course)
- course.course_members.exists?(user_id: id, role: %i[STUDENT])
- end
-
- # 课堂成员
- def member_of_course?(course)
- course&.course_members.exists?(user_id: id)
- end
-
- # 实训路径管理员
- def creator_of_subject?(subject)
- subject.user_id == id || admin?
- end
-
- # 实训路径：合作者、admin
- def manager_of_subject?(subject)
- subject.subject_members.exists?(user_id: id, role: [1,2]) || admin?
- end
-
- # 实训管理员：实训合作者、admin
- def manager_of_shixun?(shixun)
- shixun.shixun_members.exists?(role: [1,2], user_id: id) || admin? || business?
- end
-
- # 实训管理员
- def creator_of_shixun?(shixun)
- id == shixun.user_id
- end
-
- # 实训的合作者
- def member_of_shixun?(shixun)
- #self.shixun_members.where(:role => 2, :shixun_id => shixun.id).present?
- shixun.shixun_members.exists?(role: 2, user_id: id)
- end
-
- # TPI的创建者
- def creator_of_game?(game)
- id == game.user_id
- end
-
- # 用户账号状态
- def active?
- status == STATUS_ACTIVE
- end
-
- def registered?
- status == STATUS_REGISTERED
- end
-
- def locked?
- status == STATUS_LOCKED
- end
-
- def activate
- self.status = STATUS_ACTIVE
- end
-
- def register
- self.status = STATUS_REGISTERED
- end
-
- def lock
- self.status = STATUS_LOCKED
- end
-
- def activate!
- update_attribute(:status, STATUS_ACTIVE)
- end
-
- def register!
- update_attribute(:status, STATUS_REGISTERED)
- end
-
- def lock!
- update_attribute(:status, STATUS_LOCKED)
- end
-
- # 课程用户身份
- def course_identity(course)
- if !logged?
- Course::Anonymous
- elsif admin?
- Course::ADMIN
- elsif business?
- Course::BUSINESS
- else
- role = course&.course_members&.find_by(user_id: id, is_active: 1)&.role
- case role
- when nil then Course::NORMAL
- when 'CREATOR' then Course::CREATOR
- when 'PROFESSOR' then Course::PROFESSOR
- when 'STUDENT' then Course::STUDENT
- when 'ASSISTANT_PROFESSOR' then Course::ASSISTANT_PROFESSOR
- end
- end
- end
-
- # 实训用户身份
- def shixun_identity(shixun)
- @identity =
- if admin?
- User::EDU_ADMIN
- elsif business?
- User::EDU_BUSINESS
- elsif creator_of_shixun?(shixun)
- User::EDU_SHIXUN_MANAGER
- elsif member_of_shixun?(shixun)
- User::EDU_SHIXUN_MEMBER
- elsif is_certification_teacher
- User::EDU_CERTIFICATION_TEACHER
- elsif is_teacher?
- User::EDU_TEACHER
- else
- User::EDU_NORMAL
- end
- return @identity
- end
-
- # tpi的用户身份
- def game_identity(game)
- shixun = game.myshixun.shixun
- @identity =
- if admin?
- User::EDU_ADMIN
- elsif business?
- User::EDU_BUSINESS
- elsif creator_of_shixun?(shixun)
- User::EDU_SHIXUN_MANAGER
- elsif member_of_shixun?(shixun)
- User::EDU_SHIXUN_MEMBER
- elsif is_certification_teacher
- User::EDU_CERTIFICATION_TEACHER
- elsif creator_of_game?(game)
- User::EDU_GAME_MANAGER
- elsif is_teacher?
- User::EDU_TEACHER
- else
- User::EDU_NORMAL
- end
- return @identity
- end
-
- # 我的实训
- def my_shixuns
- shixun_ids = shixun_members.pluck(:shixun_id) + myshixuns.pluck(:shixun_id)
- Shixun.where(:id => shixun_ids).visible
- end
-
- # 用户是否有权限查看实训
- # 1、实训删除只有管理员能看到
- # 2、实训隐藏了只有管理员、实训合作者能看到
- # 3、如果有限制学校范围，则学校的用户、管理员、实训合作者能看到
- def shixun_permission(shixun)
- case shixun.status
- when -1 # 软删除只有管理员能访问
- admin?
- when 0, 1, 3 # 申请发布或者已关闭的实训，只有实训管理员可以访问
- manager_of_shixun?(shixun)
- when 2
- if shixun.hidden
- manager_of_shixun?(shixun)
- else
- shixun.use_scope == 0 || manager_of_shixun?(shixun) || shixun.shixun_schools.exists?(school_id: school_id)
- end
- end
- end
-
- # 用户在平台名称的显示方式
- def full_name
- return '游客' unless logged?
-
- name = show_realname? ? lastname + firstname : nickname
- name.blank? ? (nickname.blank? ? login : nickname) : name
- end
-
- # 用户的真实姓名（不考虑用户是否隐藏了真实姓名，课堂模块都用真实姓名）
- def real_name
- return '游客' unless logged?
- name = lastname + firstname
- name = name.blank? ? (nickname.blank? ? login : nickname) : name
- name.gsub(/\s+/, '').strip #6.11 -hs
- end
-
- def only_real_name
- "#{lastname}#{firstname}"
- end
-
- # 用户是否选题毕设课题
- def selected_topic?(topic)
- student_graduation_topics.where(graduation_topic_id: topic.id).last.try(:status)
- end
-
- def click_time
- click_time = OnclickTime.find_by(user_id: id) || OnclickTime.create(user_id: id, onclick_time: created_on)
- click_time.onclick_time
- end
-
- def manager_of_memo?(memo)
- id == memo.author_id || admin? || business?
- end
-
- # 是否是项目管理者
- def manager_of_project?(project)
- project.project_members.where(user_id: id).count > 0
- end
-
- def logged?
- true
- end
-
- def active?
- status == STATUS_ACTIVE
- end
-
- def locked?
- status == STATUS_LOCKED
- end
-
- def phone_binded?
- phone.present?
- end
-
- def self.current=(user)
- Thread.current[:current_user] = user
- end
-
- def self.current
- Thread.current[:current_user] ||= User.anonymous
- end
-
- def self.anonymous
- anonymous_user = AnonymousUser.unscoped.take
- if anonymous_user.nil?
- anonymous_user = AnonymousUser.unscoped.create(lastname: 'Anonymous', firstname: '', login: '',
- mail: '358551897@qq.com', phone: '13333333333', status: 0)
- raise "Unable to create the anonymous user： error_info:#{anonymous_user.errors.messages}" if anonymous_user.new_record?
- end
- anonymous_user
- end
-
- # Returns the user who matches the given autologin +key+ or nil
- def self.try_to_autologin(key)
- user = Token.find_active_user('autologin', key)
- user.update(last_login_on: Time.now) if user
- user
- end
-
- def self.hash_password(clear_password)
- Digest::SHA1.hexdigest(clear_password || "")
- end
-
- def check_password?(clear_password)
- # Preventing Timing Attack
- ActiveSupport::SecurityUtils.secure_compare(
- User.hash_password("#{salt}#{User.hash_password clear_password}"),
- hashed_password
- )
- end
-
- # 工程认证的学校
- def ec_school
- school_id = self.ec_school_users.pluck(:school_id).first ||
- self.ec_major_schools.pluck(:school_id).first ||
- (self.ec_course_users.first && self.ec_course_users.first.try(:ec_course).try(:ec_year).try(:ec_major_school).try(:school_id))
- end
-
- # 登录，返回用户名与密码匹配的用户
- def self.try_to_login(login, password)
- login = login.to_s.strip
- password = password.to_s
-
- # Make sure no one can sign in with an empty login or password
- return nil if login.empty? || password.empty?
- if (login =~ VALID_EMAIL_REGEX)
- user = find_by_mail(login)
- elsif (login =~ VALID_PHONE_REGEX)
- user = find_by_phone(login)
- else
- user = find_by_login(login)
- end
-
- user
- rescue => text
- raise text
- end
-
- def show_real_name
- name = lastname + firstname
- if name.blank?
- nickname.blank? ? login : nickname
- else
- name
- end
- end
-
- def update_hashed_password
- if password
- salt_password(password)
- end
- end
-
- def salt_password(clear_password)
- self.salt = User.generate_salt
- self.hashed_password = User.hash_password("#{salt}#{User.hash_password clear_password}")
- end
-
- def self.generate_salt
- Educoder::Utils.random_hex(16)
- end
-
- # 全部已认证
- def all_certified?
- authentication? && professional_certification?
- end
-
- # 是否绑定邮箱
- def email_binded?
- mail.present?
- end
-
- # 学院的url标识
- def college_identifier
- Department.find_by_id(department_members.pluck(:department_id).first)&.identifier
- end
-
- # 是否能申请试用
- def can_apply_trial?
- return false if certification == 1
-
- apply = ApplyAction.order(created_at: :desc).find_by(user_id: id, container_type: 'TrialAuthorization')
-
- apply.present? && !apply.status.zero?
- end
-
- # 是否已经签到
- def attendance_signed?
- attendance = Attendance.find_by(user_id: id)
-
- attendance.present? && Util.days_between(Time.zone.now, attendance.created_at).zero?
- end
-
- # 明日签到金币
- def tomorrow_attendance_gold
- Attendance.find_by(user_id: id)&.next_gold || 60 # 基础50，连续签到+10
- end
-
- def admin_or_business?
- admin? || business?
- end
-
- def self.generate_login(prefix)
- login = prefix + LOGIN_CHARS.sample(8).join('')
- while User.exists?(login: login)
- login = prefix + LOGIN_CHARS.sample(8).join('')
- end
-
- login
- end
-
- protected
- def validate_password_length
- # 管理员的初始密码是5位
- if password.present? && password.size < MIX_PASSWORD_LIMIT && !User.current.admin?
- raise("密码长度不能低于#{MIX_PASSWORD_LIMIT}位")
- end
- end
-end
-
-
-class AnonymousUser < User
- validate :validate_anonymous_uniqueness, :on => :create
-
- def validate_anonymous_uniqueness
- # There should be only one AnonymousUser in the database
- errors.add :base, 'An anonymous user already exists.' if AnonymousUser.exists?
- end
-
- def available_custom_fields
- []
- end
-
- # Overrides a few properties
- def logged?; false end
- def admin; false end
- def name(*args); I18n.t(:label_user_anonymous) end
- # def mail=(*args); nil end
- # def mail; nil end
- def time_zone; nil end
- def rss_key; nil end
-
-
- def membership(*args)
- nil
- end
-
- def member_of?(*args)
- false
- end
-
- # Anonymous user can not be destroyed
- def destroy
- false
- end
-
- protected
-
- def instantiate_email_address
- end
-
-end
+class User < ApplicationRecord
+ include Watchable
+ include Searchable::Dependents::User
+
+ # Account statuses
+ STATUS_ANONYMOUS = 0
+ STATUS_ACTIVE = 1
+ STATUS_REGISTERED = 2
+ STATUS_LOCKED = 3
+
+ # tpi tpm权限控制
+ EDU_ADMIN = 1 # 超级管理员
+ EDU_BUSINESS = 2 # 运营人员
+ EDU_SHIXUN_MANAGER = 3 # 实训管理员
+ EDU_SHIXUN_MEMBER = 4 # 实训成员
+ EDU_CERTIFICATION_TEACHER = 5 # 平台认证的老师
+ EDU_GAME_MANAGER = 6 # TPI的创建者
+ EDU_TEACHER = 7 # 平台老师,但是未认证
+ EDU_NORMAL = 8 # 普通用户
+
+ VALID_EMAIL_REGEX = /^[a-zA-Z0-9]+([.\-_\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/i
+ VALID_PHONE_REGEX = /^1\d{10}$/
+ # 身份证
+ VALID_NUMBER_REGEX = /^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
+
+ LOGIN_LENGTH_LIMIT = 30
+ MAIL_LENGTH_LMIT = 60
+
+ MIX_PASSWORD_LIMIT = 8
+
+ LOGIN_CHARS = %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).freeze
+
+ has_one :user_extension, dependent: :destroy
+ accepts_nested_attributes_for :user_extension, update_only: true
+
+ has_many :memos, foreign_key: 'author_id'
+ has_many :created_shixuns, class_name: 'Shixun'
+ has_many :shixun_members, :dependent => :destroy
+ has_many :shixuns, :through => :shixun_members
+ has_many :myshixuns, :dependent => :destroy
+ has_many :study_shixuns, through: :myshixuns, source: :shixun # 已学习的实训
+ has_many :course_messages
+ has_many :courses, dependent: :destroy
+
+ #试卷
+ has_many :exercise_banks, :dependent => :destroy
+ has_many :exercise_users, :dependent => :destroy
+ has_many :exercise_answers, :dependent => :destroy #针对每个题目学生的答案
+ has_many :exercise_shixun_answers, :dependent => :destroy #针对每个实训题目学生的答案
+ has_many :exercise_answer_comments, :dependent => :destroy
+ has_many :exercises, :dependent => :destroy #创建的试卷
+
+ has_many :homework_banks, dependent: :destroy
+
+ has_many :graduation_works, dependent: :destroy
+
+ has_many :students_for_courses, foreign_key: :student_id, dependent: :destroy
+ has_one :onclick_time, :dependent => :destroy
+
+ # 新版私信
+ has_many :private_messages, dependent: :destroy
+ has_many :recent_contacts, through: :private_messages, source: :target
+ has_many :tidings, :dependent => :destroy
+
+ has_many :games, :dependent => :destroy
+ has_many :created_subjects, foreign_key: :user_id, class_name: 'Subject'
+ has_many :subject_members, :dependent => :destroy
+ has_many :subjects, :through => :subject_members
+ has_many :grades, :dependent => :destroy
+ has_many :experiences, :dependent => :destroy
+ has_many :student_works, :dependent => :destroy
+ has_many :student_works_scores
+ has_many :student_works_evaluation_distributions
+
+ # 毕业设计
+ has_many :graduation_topics, :dependent => :destroy
+ has_many :student_graduation_topics, :dependent => :destroy
+
+ # 题库
+ has_many :question_banks, :dependent => :destroy
+ # 毕设任务题库
+ has_many :gtask_banks, dependent: :destroy
+ has_many :gtopic_banks, dependent: :destroy
+
+ #问卷
+ has_many :course_members, :dependent => :destroy
+ has_many :poll_votes, :dependent => :destroy
+ has_many :poll_users, :dependent => :destroy
+
+ has_many :messages,foreign_key: 'author_id',:dependent => :destroy
+
+ has_many :journals_for_messages, :as => :jour, :dependent => :destroy
+ has_many :teacher_course_groups, :dependent => :destroy
+
+ has_many :attachments,foreign_key: :author_id, :dependent => :destroy
+
+ # 工程认证
+ has_many :ec_school_users,:dependent => :destroy
+ has_many :schools, :through => :ec_school_users
+
+ has_many :ec_major_school_users, :dependent => :destroy
+ has_many :ec_major_schools, :through => :ec_major_school_users
+
+ has_many :ec_course_users
+
+ has_many :department_members, dependent: :destroy #部门管理员
+
+ # 课堂
+ has_many :student_course_members, -> { course_students }, class_name: 'CourseMember'
+ has_many :as_student_courses, through: :student_course_members, source: :course
+ has_many :manage_course_members, -> { teachers_and_admin }, class_name: 'CourseMember'
+ has_many :manage_courses, through: :manage_course_members, source: :course
+
+ # 关注
+ has_many :be_watchers, foreign_key: :user_id, dependent: :destroy # 我的关注
+ has_many :be_watcher_users, through: :be_watchers, dependent: :destroy # 我关注的用户
+
+ # 认证
+ has_many :apply_user_authentication
+ has_one :process_real_name_apply, -> { processing.real_name_auth.order(created_at: :desc) }, class_name: 'ApplyUserAuthentication'
+ has_one :process_professional_apply, -> { processing.professional_auth.order(created_at: :desc) }, class_name: 'ApplyUserAuthentication'
+ has_many :apply_actions, dependent: :destroy
+ has_many :trail_auth_apply_actions, -> { where(container_type: 'TrialAuthorization') }, class_name: 'ApplyAction'
+
+ has_many :attendances
+
+ # 兴趣
+ has_many :user_interests, dependent: :delete_all
+ has_many :interests, through: :user_interests, source: :repertoire
+
+ # 众包
+ has_many :project_packages, foreign_key: :creator_id, dependent: :destroy
+ has_many :bidding_users, dependent: :destroy
+ has_many :bidden_project_packages, through: :bidding_users, source: :project_package
+
+ # 项目
+ has_many :applied_projects, dependent: :destroy
+
+ # 教学案例
+ has_many :libraries, dependent: :destroy
+
+ # 视频
+ has_many :videos, dependent: :destroy
+
+ # 客户管理
+ belongs_to :partner, optional: true
+
+ # Groups and active users
+ scope :active, lambda { where(status: STATUS_ACTIVE) }
+
+ attr_accessor :password, :password_confirmation
+
+ delegate :gender, :department_id, :school_id, :location, :location_city, :technical_title, to: :user_extension, allow_nil: true
+
+ before_save :update_hashed_password
+
+ #
+ # validations
+ #
+ validates_presence_of :login, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }, case_sensitive: false
+ validates_uniqueness_of :login, :if => Proc.new { |user| user.login_changed? && user.login.present? }, case_sensitive: false
+ validates_uniqueness_of :mail, :if => Proc.new { |user| user.mail_changed? && user.mail.present? }, case_sensitive: false
+ validates_uniqueness_of :phone, :if => Proc.new { |user| user.phone_changed? && user.phone.present? }, case_sensitive: false
+ validates_length_of :login, maximum: LOGIN_LENGTH_LIMIT
+ validates_length_of :mail, maximum: MAIL_LENGTH_LMIT
+ # validates_format_of :mail, with: VALID_EMAIL_REGEX, multiline: true
+ # validates_format_of :phone, with: VALID_PHONE_REGEX, multiline: true
+ validate :validate_password_length
+ #validate :validate_ID_number
+ #validates_format_of :ID_number, with: VALID_NUMBER_REGEX, multiline: true, message: "身份证号格式不对"
+ # validates :nickname, presence: true, length: { maximum: 10 }
+ # validates :lastname, presence: true
+
+ # 删除自动登录的token，一旦退出下次会提示需要登录
+ def delete_autologin_token(value)
+ Token.where(:user_id => id, :action => 'autologin', :value => value).delete_all
+ end
+
+ def delete_session_token(value)
+ Token.where(:user_id => id, :action => 'session', :value => value).delete_all
+ end
+
+ def git_mail
+ mail.blank? ? "#{login}@educoder.net" : mail
+ end
+
+ # 学号
+ def student_id
+ self.user_extension.try(:student_id)
+ end
+
+ # 关注数
+ def follow_count
+ Watcher.where(user_id: id, watchable_type: %w(Principal User)).count
+ # User.watched_by(id).count
+ end
+
+ # 粉丝数
+ def fan_count
+ Watcher.where(watchable_type: %w(Principal User), watchable_id: id).count
+ # watchers.count
+ end
+
+ # 判断当前用户是否为老师
+ def is_teacher?
+ self.user_extension.teacher?
+ end
+
+ # 平台认证的老师
+ def is_certification_teacher
+ self.user_extension.teacher? && self.professional_certification
+ end
+
+ def certification_teacher?
+ professional_certification? && user_extension.teacher?
+ end
+
+ # 判断用户的身份
+ def identity
+ ue = self.user_extension
+ unless ue.blank?
+ if ue.teacher?
+ ue.technical_title ? ue.technical_title : "老师"
+ elsif ue.student?
+ "学生"
+ else
+ ue.technical_title ? ue.technical_title : "专业人士"
+ end
+ end
+ end
+
+ # 判断当前用户是否通过职业认证
+ def pro_certification?
+ professional_certification
+ end
+
+ # 用户的学校名称
+ def school_name
+ user_extension&.school&.name || ''
+ end
+
+ # 用户的学院名称
+ def department_name
+ user_extension&.department&.name || ''
+ end
+
+ # 课堂的所有身份
+ def course_role course
+ course.course_members.where(user_id: id).pluck(:role)
+ end
+
+ # 课堂的老师(创建者、老师、助教)
+ def teacher_of_course?(course)
+ course.course_members.exists?(user_id: id, role: [1,2,3], is_active: 1) || admin? || business?
+ end
+
+ # 课堂的老师(创建者、老师、助教)，不用考虑当前身份
+ def teacher_of_course_non_active?(course)
+ course.course_members.exists?(user_id: id, role: [1,2,3])
+ end
+
+ # 是否是教师，课堂管理员或者超级管理员
+ def teacher_or_admin?(course)
+ course.course_members.exists?(user_id: id, role: [1,2], is_active: 1) || admin? || business?
+ end
+
+ # 课堂的创建者(考虑到多重身份的用户)
+ def creator_of_course?(course)
+ course.course_members.exists?(user_id: id, role: 1, is_active: 1) || admin? || business?
+ end
+
+ # 课堂的学生
+ def student_of_course?(course)
+ course.course_members.exists?(user_id: id, role: %i[STUDENT])
+ end
+
+ # 课堂成员
+ def member_of_course?(course)
+ course&.course_members.exists?(user_id: id)
+ end
+
+ # 实训路径管理员
+ def creator_of_subject?(subject)
+ subject.user_id == id || admin?
+ end
+
+ # 实训路径：合作者、admin
+ def manager_of_subject?(subject)
+ subject.subject_members.exists?(user_id: id, role: [1,2]) || admin?
+ end
+
+ # 实训管理员：实训合作者、admin
+ def manager_of_shixun?(shixun)
+ shixun.shixun_members.exists?(role: [1,2], user_id: id) || admin? || business?
+ end
+
+ # 实训管理员
+ def creator_of_shixun?(shixun)
+ id == shixun.user_id
+ end
+
+ # 实训的合作者
+ def member_of_shixun?(shixun)
+ #self.shixun_members.where(:role => 2, :shixun_id => shixun.id).present?
+ shixun.shixun_members.exists?(role: 2, user_id: id)
+ end
+
+ # TPI的创建者
+ def creator_of_game?(game)
+ id == game.user_id
+ end
+
+ # 用户账号状态
+ def active?
+ status == STATUS_ACTIVE
+ end
+
+ def registered?
+ status == STATUS_REGISTERED
+ end
+
+ def locked?
+ status == STATUS_LOCKED
+ end
+
+ def activate
+ self.status = STATUS_ACTIVE
+ end
+
+ def register
+ self.status = STATUS_REGISTERED
+ end
+
+ def lock
+ self.status = STATUS_LOCKED
+ end
+
+ def activate!
+ update_attribute(:status, STATUS_ACTIVE)
+ end
+
+ def register!
+ update_attribute(:status, STATUS_REGISTERED)
+ end
+
+ def lock!
+ update_attribute(:status, STATUS_LOCKED)
+ end
+
+ # 课程用户身份
+ def course_identity(course)
+ if !logged?
+ Course::Anonymous
+ elsif admin?
+ Course::ADMIN
+ elsif business?
+ Course::BUSINESS
+ else
+ role = course&.course_members&.find_by(user_id: id, is_active: 1)&.role
+ case role
+ when nil then Course::NORMAL
+ when 'CREATOR' then Course::CREATOR
+ when 'PROFESSOR' then Course::PROFESSOR
+ when 'STUDENT' then Course::STUDENT
+ when 'ASSISTANT_PROFESSOR' then Course::ASSISTANT_PROFESSOR
+ end
+ end
+ end
+
+ # 实训用户身份
+ def shixun_identity(shixun)
+ @identity =
+ if admin?
+ User::EDU_ADMIN
+ elsif business?
+ User::EDU_BUSINESS
+ elsif creator_of_shixun?(shixun)
+ User::EDU_SHIXUN_MANAGER
+ elsif member_of_shixun?(shixun)
+ User::EDU_SHIXUN_MEMBER
+ elsif is_certification_teacher
+ User::EDU_CERTIFICATION_TEACHER
+ elsif is_teacher?
+ User::EDU_TEACHER
+ else
+ User::EDU_NORMAL
+ end
+ return @identity
+ end
+
+ # tpi的用户身份
+ def game_identity(game)
+ shixun = game.myshixun.shixun
+ @identity =
+ if admin?
+ User::EDU_ADMIN
+ elsif business?
+ User::EDU_BUSINESS
+ elsif creator_of_shixun?(shixun)
+ User::EDU_SHIXUN_MANAGER
+ elsif member_of_shixun?(shixun)
+ User::EDU_SHIXUN_MEMBER
+ elsif is_certification_teacher
+ User::EDU_CERTIFICATION_TEACHER
+ elsif creator_of_game?(game)
+ User::EDU_GAME_MANAGER
+ elsif is_teacher?
+ User::EDU_TEACHER
+ else
+ User::EDU_NORMAL
+ end
+ return @identity
+ end
+
+ # 我的实训
+ def my_shixuns
+ shixun_ids = shixun_members.pluck(:shixun_id) + myshixuns.pluck(:shixun_id)
+ Shixun.where(:id => shixun_ids).visible
+ end
+
+ # 用户是否有权限查看实训
+ # 1、实训删除只有管理员能看到
+ # 2、实训隐藏了只有管理员、实训合作者能看到
+ # 3、如果有限制学校范围，则学校的用户、管理员、实训合作者能看到
+ def shixun_permission(shixun)
+ case shixun.status
+ when -1 # 软删除只有管理员能访问
+ admin?
+ when 0, 1, 3 # 申请发布或者已关闭的实训，只有实训管理员可以访问
+ manager_of_shixun?(shixun)
+ when 2
+ if shixun.hidden
+ manager_of_shixun?(shixun)
+ else
+ shixun.use_scope == 0 || manager_of_shixun?(shixun) || shixun.shixun_schools.exists?(school_id: school_id)
+ end
+ end
+ end
+
+ # 用户在平台名称的显示方式
+ def full_name
+ return '游客' unless logged?
+
+ name = show_realname? ? lastname + firstname : nickname
+ name.blank? ? (nickname.blank? ? login : nickname) : name
+ end
+
+ # 用户的真实姓名（不考虑用户是否隐藏了真实姓名，课堂模块都用真实姓名）
+ def real_name
+ return '游客' unless logged?
+ name = lastname + firstname
+ name = name.blank? ? (nickname.blank? ? login : nickname) : name
+ name.gsub(/\s+/, '').strip #6.11 -hs
+ end
+
+ def only_real_name
+ "#{lastname}#{firstname}"
+ end
+
+ # 用户是否选题毕设课题
+ def selected_topic?(topic)
+ student_graduation_topics.where(graduation_topic_id: topic.id).last.try(:status)
+ end
+
+ def click_time
+ click_time = OnclickTime.find_by(user_id: id) || OnclickTime.create(user_id: id, onclick_time: created_on)
+ click_time.onclick_time
+ end
+
+ def manager_of_memo?(memo)
+ id == memo.author_id || admin? || business?
+ end
+
+ # 是否是项目管理者
+ def manager_of_project?(project)
+ project.project_members.where(user_id: id).count > 0
+ end
+
+ def logged?
+ true
+ end
+
+ def active?
+ status == STATUS_ACTIVE
+ end
+
+ def locked?
+ status == STATUS_LOCKED
+ end
+
+ def phone_binded?
+ phone.present?
+ end
+
+ def self.current=(user)
+ Thread.current[:current_user] = user
+ end
+
+ def self.current
+ Thread.current[:current_user] ||= User.anonymous
+ end
+
+ def self.anonymous
+ anonymous_user = AnonymousUser.unscoped.take
+ if anonymous_user.nil?
+ anonymous_user = AnonymousUser.unscoped.create(lastname: 'Anonymous', firstname: '', login: '',
+ mail: '358551897@qq.com', phone: '13333333333', status: 0)
+ raise "Unable to create the anonymous user： error_info:#{anonymous_user.errors.messages}" if anonymous_user.new_record?
+ end
+ anonymous_user
+ end
+
+ # Returns the user who matches the given autologin +key+ or nil
+ def self.try_to_autologin(key)
+ user = Token.find_active_user('autologin', key)
+ user.update(last_login_on: Time.now) if user
+ user
+ end
+
+ def self.hash_password(clear_password)
+ Digest::SHA1.hexdigest(clear_password || "")
+ end
+
+ def check_password?(clear_password)
+ # Preventing Timing Attack
+ ActiveSupport::SecurityUtils.secure_compare(
+ User.hash_password("#{salt}#{User.hash_password clear_password}"),
+ hashed_password
+ )
+ end
+
+ # 工程认证的学校
+ def ec_school
+ school_id = self.ec_school_users.pluck(:school_id).first ||
+ self.ec_major_schools.pluck(:school_id).first ||
+ (self.ec_course_users.first && self.ec_course_users.first.try(:ec_course).try(:ec_year).try(:ec_major_school).try(:school_id))
+ end
+
+ # 登录，返回用户名与密码匹配的用户
+ def self.try_to_login(login, password)
+ login = login.to_s.strip
+ password = password.to_s
+
+ # Make sure no one can sign in with an empty login or password
+ return nil if login.empty? || password.empty?
+ if (login =~ VALID_EMAIL_REGEX)
+ user = find_by_mail(login)
+ elsif (login =~ VALID_PHONE_REGEX)
+ user = find_by_phone(login)
+ else
+ user = find_by_login(login)
+ end
+
+ user
+ rescue => text
+ raise text
+ end
+
+ def show_real_name
+ name = lastname + firstname
+ if name.blank?
+ nickname.blank? ? login : nickname
+ else
+ name
+ end
+ end
+
+ def update_hashed_password
+ if password
+ salt_password(password)
+ end
+ end
+
+ def salt_password(clear_password)
+ self.salt = User.generate_salt
+ self.hashed_password = User.hash_password("#{salt}#{User.hash_password clear_password}")
+ end
+
+ def self.generate_salt
+ Educoder::Utils.random_hex(16)
+ end
+
+ # 全部已认证
+ def all_certified?
+ authentication? && professional_certification?
+ end
+
+ # 是否绑定邮箱
+ def email_binded?
+ mail.present?
+ end
+
+ # 手机号：123***123
+ def hidden_phone
+ Util.conceal(phone, :phone).to_s
+ end
+
+ # 邮箱：w***l@qq.com
+ def hidden_mail
+ Util.conceal(mail, :email).to_s
+ end
+
+ # 学院的url标识
+ def college_identifier
+ Department.find_by_id(department_members.pluck(:department_id).first)&.identifier
+ end
+
+ # 是否能申请试用
+ def can_apply_trial?
+ return false if certification == 1
+
+ apply = ApplyAction.order(created_at: :desc).find_by(user_id: id, container_type: 'TrialAuthorization')
+
+ apply.present? && !apply.status.zero?
+ end
+
+ # 是否已经签到
+ def attendance_signed?
+ attendance = Attendance.find_by(user_id: id)
+
+ attendance.present? && Util.days_between(Time.zone.now, attendance.created_at).zero?
+ end
+
+ # 明日签到金币
+ def tomorrow_attendance_gold
+ Attendance.find_by(user_id: id)&.next_gold || 60 # 基础50，连续签到+10
+ end
+
+ def admin_or_business?
+ admin? || business?
+ end
+
+ def self.generate_login(prefix)
+ login = prefix + LOGIN_CHARS.sample(8).join('')
+ while User.exists?(login: login)
+ login = prefix + LOGIN_CHARS.sample(8).join('')
+ end
+
+ login
+ end
+
+ protected
+ def validate_password_length
+ # 管理员的初始密码是5位
+ if password.present? && password.size < MIX_PASSWORD_LIMIT && !User.current.admin?
+ raise("密码长度不能低于#{MIX_PASSWORD_LIMIT}位")
+ end
+ end
+end
+
+
+class AnonymousUser < User
+ validate :validate_anonymous_uniqueness, :on => :create
+
+ def validate_anonymous_uniqueness
+ # There should be only one AnonymousUser in the database
+ errors.add :base, 'An anonymous user already exists.' if AnonymousUser.exists?
+ end
+
+ def available_custom_fields
+ []
+ end
+
+ # Overrides a few properties
+ def logged?; false end
+ def admin; false end
+ def name(*args); I18n.t(:label_user_anonymous) end
+ # def mail=(*args); nil end
+ # def mail; nil end
+ def time_zone; nil end
+ def rss_key; nil end
+
+
+ def membership(*args)
+ nil
+ end
+
+ def member_of?(*args)
+ false
+ end
+
+ # Anonymous user can not be destroyed
+ def destroy
+ false
+ end
+
+ protected
+
+ def instantiate_email_address
+ end
+
+end
diff --git a/app/queries/admins/laboratory_query.rb b/app/queries/admins/laboratory_query.rb
new file mode 100644
index 000000000..21020216b
--- /dev/null
+++ b/app/queries/admins/laboratory_query.rb
@@ -0,0 +1,23 @@
+class Admins::LaboratoryQuery < ApplicationQuery
+ include CustomSortable
+
+ attr_reader :params
+
+ sort_columns :id, default_by: :id, default_direction: :desc
+
+ def initialize(params)
+ @params = params
+ end
+
+ def call
+ laboratories = Laboratory.all
+
+ keyword = strip_param(:keyword)
+ if keyword.present?
+ like_sql = 'schools.name LIKE :keyword OR laboratories.identifier LIKE :keyword'
+ laboratories = laboratories.joins(:school).where(like_sql, keyword: "%#{keyword}%")
+ end
+
+ custom_sort laboratories, params[:sort_by], params[:sort_direction]
+ end
+end
\ No newline at end of file
diff --git a/app/services/admins/add_laboratory_user_service.rb b/app/services/admins/add_laboratory_user_service.rb
new file mode 100644
index 000000000..16df30880
--- /dev/null
+++ b/app/services/admins/add_laboratory_user_service.rb
@@ -0,0 +1,19 @@
+class Admins::AddLaboratoryUserService < ApplicationService
+ attr_reader :laboratory, :params
+
+ def initialize(laboratory, params)
+ @laboratory = laboratory
+ @params = params
+ end
+
+ def call
+ columns = %i[]
+ LaboratoryUser.bulk_insert(*columns) do |worker|
+ Array.wrap(params[:user_ids]).compact.each do |user_id|
+ next if laboratory.laboratory_users.exists?(user_id: user_id)
+
+ worker.add(laboratory_id: laboratory.id, user_id: user_id)
+ end
+ end
+ end
+end
\ No newline at end of file
diff --git a/app/services/admins/create_laboratory_service.rb b/app/services/admins/create_laboratory_service.rb
new file mode 100644
index 000000000..98300d5af
--- /dev/null
+++ b/app/services/admins/create_laboratory_service.rb
@@ -0,0 +1,20 @@
+class Admins::CreateLaboratoryService < ApplicationService
+ Error = Class.new(StandardError)
+
+ attr_reader :params
+
+ def initialize(params)
+ @params = params
+ end
+
+ def call
+ raise Error, '单位不能为空' if params[:school_id].blank?
+ raise Error, '该单位已存在' if Laboratory.exists?(school_id: params[:school_id])
+
+ ActiveRecord::Base.transaction do
+ laboratory = Laboratory.create!(school_id: params[:school_id])
+
+ laboratory.create_laboratory_setting!
+ end
+ end
+end
\ No newline at end of file
diff --git a/app/services/admins/drag_portal_image_service.rb b/app/services/admins/drag_portal_image_service.rb
new file mode 100644
index 000000000..9f8adea38
--- /dev/null
+++ b/app/services/admins/drag_portal_image_service.rb
@@ -0,0 +1,35 @@
+class Admins::DragPortalImageService < ApplicationService
+ Error = Class.new(StandardError)
+
+ attr_reader :move, :after
+
+ def initialize(move, after)
+ @move = move
+ @after = after # 移动后下一个位置的元素
+ end
+
+ def call
+ return if move.position + 1 == after&.position # 未移动
+
+ images = PortalImage.all
+
+ ActiveRecord::Base.transaction do
+ if after.blank? || move.id == after.id # 移动至末尾
+ total = images.count
+
+ images.where('position > ?', move.position).update_all('position = position - 1')
+ move.update!(position: total)
+ return
+ end
+
+ if move.position > after.position # 前移
+ images.where('position >= ? AND position < ?', after.position, move.position).update_all('position = position + 1')
+ move.update!(position: after.position)
+ else # 后移
+ images.where('position > ? AND position < ?', move.position, after.position).update_all('position = position - 1')
+ move.update!(position: after.position - 1)
+ end
+ end
+ end
+
+end
\ No newline at end of file
diff --git a/app/services/admins/save_laboratory_setting_service.rb b/app/services/admins/save_laboratory_setting_service.rb
new file mode 100644
index 000000000..00e202cd9
--- /dev/null
+++ b/app/services/admins/save_laboratory_setting_service.rb
@@ -0,0 +1,51 @@
+class Admins::SaveLaboratorySettingService < ApplicationService
+ attr_reader :laboratory, :laboratory_setting, :params
+
+ def initialize(laboratory, params)
+ @params = params
+ @laboratory = laboratory
+ @laboratory_setting = laboratory.laboratory_setting
+ end
+
+ def call
+ ActiveRecord::Base.transaction do
+ laboratory.identifier = strip params[:identifier]
+ laboratory_setting.name = strip params[:name]
+ laboratory_setting.navbar = navbar_config
+ laboratory_setting.footer = strip params[:footer]
+
+ laboratory.save!
+ laboratory_setting.save!
+
+ deal_logo_file
+ end
+
+ laboratory
+ end
+
+ private
+
+ def navbar_config
+ params[:navbar].map do |nav|
+ hash = {}
+ hash[:name] = strip nav[:name]
+ hash[:link] = strip nav[:link]
+ hash[:hidden] = nav[:hidden].to_s == 0
+ hash
+ end
+ end
+
+ def deal_logo_file
+ save_logo_file(params[:nav_logo], 'nav')
+ save_logo_file(params[:login_logo], 'login')
+ save_logo_file(params[:tab_logo], 'tab')
+ end
+
+ def save_logo_file(file, type)
+ return unless file.present? && file.is_a?(ActionDispatch::Http::UploadedFile)
+
+ file_path = Util::FileManage.source_disk_filename(laboratory_setting, type)
+ File.delete(file_path) if File.exist?(file_path) # 删除之前的文件
+ Util.write_file(file, file_path)
+ end
+end
\ No newline at end of file
diff --git a/app/services/admins/update_user_service.rb b/app/services/admins/update_user_service.rb
index c4755a1ae..41b5065d0 100644
--- a/app/services/admins/update_user_service.rb
+++ b/app/services/admins/update_user_service.rb
@@ -10,6 +10,8 @@ class Admins::UpdateUserService < ApplicationService
def call
user.assign_attributes(user_attributes)
+ user.mail = params[:mail].to_s.presence
+ user.phone = params[:phone].to_s.presence
user.firstname = ''
user.password = params[:password] if params[:password].present?
diff --git a/app/services/application_service.rb b/app/services/application_service.rb
index c6f66c098..8b3819017 100644
--- a/app/services/application_service.rb
+++ b/app/services/application_service.rb
@@ -1,3 +1,9 @@
class ApplicationService
include Callable
+
+ private
+
+ def strip(str)
+ str.to_s.strip.presence
+ end
end
\ No newline at end of file
diff --git a/app/services/create_diff_record_service.rb b/app/services/create_diff_record_service.rb
new file mode 100644
index 000000000..8365404e2
--- /dev/null
+++ b/app/services/create_diff_record_service.rb
@@ -0,0 +1,46 @@
+class CreateDiffRecordService < ApplicationService
+ attr_reader :user, :obj, :column_name, :after, :before
+
+ def initialize(user, obj, column_name, before, after)
+ @user = user
+ @obj = obj
+ @before = before
+ @after = after
+ @column_name = column_name
+ end
+
+ def call
+ ActiveRecord::Base.transaction do
+ diff_record = DiffRecord.create!(user: user, container: obj, column_name: column_name)
+ diff_record.create_diff_record_content!(content: diff_content)
+ end
+ end
+
+ private
+
+ def diff_content
+ content = ''
+
+ arr = []
+ index = 0
+ fragment_size = 1
+ Diffy::Diff.new(before, after).each do |line|
+ unless line =~ /^[\+-]/
+ if arr.empty? && index < fragment_size
+ content += line
+ index += 1
+ else
+ index = 0
+ arr << line
+ arr.shift if arr.size > fragment_size
+ end
+ next
+ end
+
+ content += arr.join('') if arr.present?
+ content += line
+ arr.clear
+ end
+ content
+ end
+end
\ No newline at end of file
diff --git a/app/services/ecs/create_course_achievement_method_service.rb b/app/services/ecs/create_course_achievement_method_service.rb
index 01f09ff2b..d71fc9c97 100644
--- a/app/services/ecs/create_course_achievement_method_service.rb
+++ b/app/services/ecs/create_course_achievement_method_service.rb
@@ -31,8 +31,8 @@ class Ecs::CreateCourseAchievementMethodsService < ApplicationService
# 创建新的评价方法时，全部为新建
if item[:id].blank? || course_target.ec_course_achievement_methods.find_by(id: item[:id]).blank?
item[:ec_achievement_evaluation_relates_attributes] =
- Array(*item[:course_evaluation_subitem_ids]).uniq.map do |subitem_id|
- { ec_course_evaluation_subitem_id: subitem_id.to_i }
+ item[:course_evaluation_relates].map do |relate|
+ { ec_course_evaluation_subitem_id: relate[:subitem_id].to_i, position: relate[:position] }
end
return
end
@@ -41,22 +41,22 @@ class Ecs::CreateCourseAchievementMethodsService < ApplicationService
relates = achievement_method.ec_achievement_evaluation_relates
# 获取传入的 subitem id数组和已存在的 subitem id数组
- old_subitem_ids = relates.map(&:ec_course_evaluation_subitem_id).uniq
- new_subitem_ids = Array(*item[:course_evaluation_subitem_ids]).map(&:to_i).uniq
+ old_data = relates.map { |e| [e.ec_course_evaluation_subitem_id, e.position] }
+ new_data = item[:course_evaluation_relates].map { |e| [e[:subitem_id, e[:position]]] }
# 分别得到需要移除的 subitem ID数组和需要创建的 subitem ID数组
- destroy_subitem_ids = old_subitem_ids - new_subitem_ids
- create_subitem_ids = new_subitem_ids - old_subitem_ids
+ destroy_data = old_data - new_data
+ create_data = new_data - old_data
# 生成需要创建关系的 subitem id 数据
- create_attributes = create_subitem_ids.map { |item_id| { ec_course_evaluation_subitem_id: item_id } }
+ create_attributes = create_data.map { |arr| { ec_course_target_id: course_target.id, ec_course_evaluation_subitem_id: arr[0], position: arr[1] } }
# 处理需要更新或者删除的记录
exists_attributes = relates.map do |relate|
- if destroy_subitem_ids.include?(relate.ec_course_evaluation_subitem_id)
+ if destroy_data.include?([relate.ec_course_evaluation_subitem_id, relate.position])
{ id: relate.id, _destroy: true }
else
- relate.as_json(only: %i[id ec_course_evaluation_subitem_id ec_course_achievement_method_id])
+ relate.as_json(only: %i[id ec_course_target_id ec_course_evaluation_subitem_id ec_course_achievement_method_id position])
end
end
diff --git a/app/services/ecs/create_course_manager_service.rb b/app/services/ecs/create_course_manager_service.rb
index 58e803bcf..4d3633bfd 100644
--- a/app/services/ecs/create_course_manager_service.rb
+++ b/app/services/ecs/create_course_manager_service.rb
@@ -3,27 +3,29 @@ class Ecs::CreateCourseManagerService < ApplicationService
COURSE_MANAGER_COUNT_LIMIT = 2 # 课程管理员数量限制
- attr_reader :ec_course, :user_id
+ attr_reader :ec_course, :user_ids
- def initialize(ec_course, user_id)
+ def initialize(ec_course, user_ids)
@ec_course = ec_course
- @user_id = user_id
+ @user_ids = user_ids
end
def call
- user = User.find_by(id: params[:user_id])
- raise Error, '该用户不存在' if user.blank?
+ users_count = User.where(id: user_ids).count
+ raise Error, '用户不存在' if users_count != user_ids.size
- if ec_course.ec_course_users.exists?(user_id: user.id)
- raise Error, '该用户已经是该课程的管理员了'
+ if ec_course.ec_course_users.exists?(user_id: user_ids)
+ raise Error, '用户已经是该课程的管理员'
end
- if ec_course.ec_course_users.count >= COURSE_MANAGER_COUNT_LIMIT
- raise Error, '该课程管理员数量已达上限'
+ if ec_course.ec_course_users.count + user_ids.size > COURSE_MANAGER_COUNT_LIMIT
+ raise Error, "课程管理员数量过多（最多#{COURSE_MANAGER_COUNT_LIMIT}）"
end
- ec_course.ec_course_users.create!(user: user)
-
- user
+ ActiveRecord::Base.transaction do
+ user_ids.each do |user_id|
+ ec_course.ec_course_users.create!(user_id: user_id)
+ end
+ end
end
end
\ No newline at end of file
diff --git a/app/services/ecs/query_course_evaluation_service.rb b/app/services/ecs/query_course_evaluation_service.rb
index 22e0ce1f4..9b3587d78 100644
--- a/app/services/ecs/query_course_evaluation_service.rb
+++ b/app/services/ecs/query_course_evaluation_service.rb
@@ -4,6 +4,7 @@ class Ecs::QueryCourseEvaluationService < ApplicationService
def initialize(ec_course)
@ec_course = ec_course
@_course_achievement = 0
+ @_course_rate = 0
end
def course_targets
@@ -16,6 +17,12 @@ class Ecs::QueryCourseEvaluationService < ApplicationService
@_course_achievement.round(2)
end
+ def course_rate
+ course_targets
+
+ @_course_rate.round(2)
+ end
+
def graduation_subitem_evaluations
student_scores = ec_course.ec_course_student_scores.joins(ec_student_score_targets: :ec_course_target).group(:ec_course_target_id)
student_scores = student_scores.select('AVG(score) as average_score, ec_course_target_id')
@@ -29,7 +36,7 @@ class Ecs::QueryCourseEvaluationService < ApplicationService
support = subitem.ec_course_supports.find_by(ec_course_id: ec_course.id)
- weight = support.weights.to_f
+ weight = support&.weights.to_f
objective_achievement = (weight * ec_course.ec_year.calculation_value.to_f).round(3)
target_total_rates = 0
@@ -58,10 +65,10 @@ class Ecs::QueryCourseEvaluationService < ApplicationService
end
end
- def score_levels_map
- @_score_levels_map ||= begin
+ def score_levels
+ @_score_levels ||= begin
index = 0
- ec_course.ec_score_levels.each_with_object({}) do |level, obj|
+ ec_course.ec_score_levels.map do |level|
hash = level.as_json(only: %i[id position score level])
hash[:description] =
@@ -72,7 +79,7 @@ class Ecs::QueryCourseEvaluationService < ApplicationService
end
index += 1
- obj[level.id.to_s] = hash
+ hash
end
end
end
@@ -96,6 +103,7 @@ class Ecs::QueryCourseEvaluationService < ApplicationService
# 计算总评成绩
@_course_achievement += data[:average_score].to_f * course_target.weight.to_f
+ @_course_rate += course_target.weight.to_f
# 计算学生成绩分布区间
student_count = 0
diff --git a/app/services/subject_search_service.rb b/app/services/subject_search_service.rb
new file mode 100644
index 000000000..f69c56c88
--- /dev/null
+++ b/app/services/subject_search_service.rb
@@ -0,0 +1,42 @@
+class SubjectSearchService < ApplicationService
+ include ElasticsearchAble
+
+ attr_reader :params
+
+ def initialize(params)
+ @params = params
+ end
+
+ def call
+ # 全部实训/我的实训
+ type = params[:type] || "all"
+
+ if type == "mine"
+ @subjects = User.current.subjects.visible.unhidden
+ else
+ @subjects = Subject.visible.unhidden
+ end
+
+ Subject.search(keyword, search_options)
+ end
+
+ private
+
+ def search_options
+ model_options = {
+ includes: [ user: { user_extension: :school } ]
+ }
+ model_options.merge!(where: { id: @subjects.pluck(:id) })
+ model_options.merge!(order: {sort_type => sort_str})
+ model_options.merge!(default_options)
+ model_options
+ end
+
+ def sort_str
+ params[:order] || "desc"
+ end
+
+ def sort_type
+ params[:sort] || "myshixuns_count"
+ end
+end
\ No newline at end of file
diff --git a/app/services/users/apply_authentication_service.rb b/app/services/users/apply_authentication_service.rb
index 9e0901ef4..d6da2d1fb 100644
--- a/app/services/users/apply_authentication_service.rb
+++ b/app/services/users/apply_authentication_service.rb
@@ -25,10 +25,10 @@ class Users::ApplyAuthenticationService < ApplicationService
user.apply_user_authentication.create!(auth_type: 1, status: 0)
move_image_file! unless params[:upload_image].to_s == 'false'
-
- sms_notify_admin
end
+ sms_notify_admin
+
user
end
diff --git a/app/services/users/apply_professional_auth_service.rb b/app/services/users/apply_professional_auth_service.rb
index 74ee08c85..ea9f3e0d1 100644
--- a/app/services/users/apply_professional_auth_service.rb
+++ b/app/services/users/apply_professional_auth_service.rb
@@ -37,13 +37,9 @@ class Users::ApplyProfessionalAuthService < ApplicationService
user.apply_user_authentication.create!(auth_type: 2, status: 0)
move_image_file! unless params[:upload_image].to_s == 'false'
-
- # sms_cache = Rails.cache.read("apply_pro_certification")
- # if sms_cache.nil?
- sms_notify_admin
- # Rails.cache.write("apply_pro_certification", 1)
- # end
end
+
+ sms_notify_admin
end
private
@@ -61,7 +57,11 @@ class Users::ApplyProfessionalAuthService < ApplicationService
end
def sms_notify_admin
- Educoder::Sms.notify_admin(send_type: 'apply_pro_certification')
+ sms_cache = Rails.cache.read('apply_pro_certification')
+ if sms_cache.nil?
+ Educoder::Sms.notify_admin(send_type: 'apply_pro_certification')
+ Rails.cache.write('apply_pro_certification', 1, expires_in: 5.minutes)
+ end
rescue => ex
Util.logger_error(ex)
end
diff --git a/app/services/users/apply_trail_service.rb b/app/services/users/apply_trail_service.rb
index 61563c301..45abd8d1b 100644
--- a/app/services/users/apply_trail_service.rb
+++ b/app/services/users/apply_trail_service.rb
@@ -24,7 +24,11 @@ class Users::ApplyTrailService < ApplicationService
apply.status = 1
else
- send_trial_apply_notify!
+ sms_cache = Rails.cache.read("apply_auth")
+ if sms_cache.nil?
+ send_trial_apply_notify!
+ Rails.cache.write("apply_auth", 1, expires_in: 5.minutes)
+ end
end
apply.save!
end
diff --git a/app/tasks/exercise_publish_task.rb b/app/tasks/exercise_publish_task.rb
index 220512664..a7b533d05 100644
--- a/app/tasks/exercise_publish_task.rb
+++ b/app/tasks/exercise_publish_task.rb
@@ -66,7 +66,8 @@ class ExercisePublishTask
:end_at => Time.now,
:objective_score => s_score,
:score => total_score,
- :subjective_score => subjective_score
+ :subjective_score => subjective_score,
+ :commit_method => exercise_user&.commit_method.to_i > 0 ? exercise_user&.commit_method.to_i : 3
}
exercise_user.update_attributes(commit_option)
end
@@ -108,7 +109,8 @@ class ExercisePublishTask
:end_at => Time.now,
:objective_score => s_score,
:score => total_score,
- :subjective_score => subjective_score
+ :subjective_score => subjective_score,
+ :commit_method => exercise_user&.commit_method.to_i > 0 ? exercise_user&.commit_method.to_i : 3
}
exercise_user.update_attributes(commit_option)
end
diff --git a/app/views/admins/carousels/index.html.erb b/app/views/admins/carousels/index.html.erb
new file mode 100644
index 000000000..89c224784
--- /dev/null
+++ b/app/views/admins/carousels/index.html.erb
@@ -0,0 +1,43 @@
+<%
+ define_admin_breadcrumbs do
+ add_admin_breadcrumb('轮播图')
+ end
+%>
+
+
+
+
+ <% @images.each_with_index do |image, index| %>
+
+
+
<%= index + 1 %>
+
+
 ? Util::FileManage.disk_file_url('PortalImage', image.id) : '' %>)
+
+
+
+ <%= check_box_tag(:online, 1, image.online?, id: nil, class: 'online-check-box', data: { id: image.id, toggle: 'tooltip', title: '首页展示' }) %>
+ <%= delete_link '删除', admins_carousel_path(image, element: ".custom-carousel-item-#{image.id}", not_refresh: true), class: 'delete-btn' do %>
+
+ <% end %>
+
+
+
+ <% end %>
+
+
+
+
+<%= render partial: 'admins/carousels/shared/add_carousel_modal' %>
+<%= render partial: 'admins/shared/modal/upload_file_modal' %>
\ No newline at end of file
diff --git a/app/views/admins/carousels/shared/_add_carousel_modal.html.erb b/app/views/admins/carousels/shared/_add_carousel_modal.html.erb
new file mode 100644
index 000000000..d1e75e29e
--- /dev/null
+++ b/app/views/admins/carousels/shared/_add_carousel_modal.html.erb
@@ -0,0 +1,36 @@
+
+
+
+
+
+ <%= simple_form_for(PortalImage.new, url: admins_carousels_path, html: { class: 'admin-add-carousel-form', enctype: 'multipart/form-data' }) do |f| %>
+
+
+ <%= f.input :name, label: '名称', placeholder: '请输入名称' %>
+ <%= f.input :link, as: :url, label: '跳转地址', placeholder: '请输入跳转地址' %>
+
+
+ <% end %>
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/admins/laboratories/index.html.erb b/app/views/admins/laboratories/index.html.erb
new file mode 100644
index 000000000..012eed792
--- /dev/null
+++ b/app/views/admins/laboratories/index.html.erb
@@ -0,0 +1,19 @@
+<% define_admin_breadcrumbs do %>
+ <% add_admin_breadcrumb('云上实验室') %>
+<% end %>
+
+
+ <%= form_tag(admins_laboratories_path(unsafe_params), method: :get, class: 'form-inline search-form flex-1', remote: true) do %>
+ <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-6 col-md-4 ml-3', placeholder: '学校名称/二级域名前缀检索') %>
+ <%= submit_tag('搜索', class: 'btn btn-primary ml-3', 'data-disable-with': '搜索中...') %>
+ <% end %>
+
+ <%= javascript_void_link '新建', class: 'btn btn-primary', data: { toggle: 'modal', target: '.admin-create-laboratory-modal' } %>
+
+
+
+ <%= render(partial: 'admins/laboratories/shared/list', locals: { laboratories: @laboratories }) %>
+
+
+<%= render 'admins/laboratories/shared/create_laboratory_modal' %>
+<%= render 'admins/laboratories/shared/add_laboratory_user_modal' %>
\ No newline at end of file
diff --git a/app/views/admins/laboratories/index.js.erb b/app/views/admins/laboratories/index.js.erb
new file mode 100644
index 000000000..dc17c6a6d
--- /dev/null
+++ b/app/views/admins/laboratories/index.js.erb
@@ -0,0 +1 @@
+$('.laboratory-list-container').html("<%= j(render partial: 'admins/laboratories/shared/list', locals: { laboratories: @laboratories }) %>");
\ No newline at end of file
diff --git a/app/views/admins/laboratories/shared/_add_laboratory_user_modal.html.erb b/app/views/admins/laboratories/shared/_add_laboratory_user_modal.html.erb
new file mode 100644
index 000000000..a13565cd6
--- /dev/null
+++ b/app/views/admins/laboratories/shared/_add_laboratory_user_modal.html.erb
@@ -0,0 +1,30 @@
+
\ No newline at end of file
diff --git a/app/views/admins/laboratories/shared/_create_laboratory_modal.html.erb b/app/views/admins/laboratories/shared/_create_laboratory_modal.html.erb
new file mode 100644
index 000000000..0a77477d3
--- /dev/null
+++ b/app/views/admins/laboratories/shared/_create_laboratory_modal.html.erb
@@ -0,0 +1,28 @@
+
\ No newline at end of file
diff --git a/app/views/admins/laboratories/shared/_laboratory_item.html.erb b/app/views/admins/laboratories/shared/_laboratory_item.html.erb
new file mode 100644
index 000000000..5dd97b549
--- /dev/null
+++ b/app/views/admins/laboratories/shared/_laboratory_item.html.erb
@@ -0,0 +1,40 @@
+<% school = laboratory.school %>
+
<%= school&.name || 'EduCoder主站' %> |
+
+ <% if laboratory.identifier %>
+ <%= link_to laboratory.site, "https://#{laboratory.site}", target: '_blank' %>
+ <% else %>
+ --
+ <% end %>
+ |
+
+ <% if school && school.identifier.present? %>
+ <%= link_to school.identifier.to_s, statistics_college_path(school.identifier), target: '_blank' %>
+ <% else %>
+ --
+ <% end %>
+ |
+
+
+ <% laboratory.users.each do |user| %>
+
+ <%= link_to user.real_name, "/users/#{user.login}", target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } %>
+ <%= link_to(admins_laboratory_laboratory_user_path(laboratory, user_id: user.id),
+ method: :delete, remote: true, class: 'ml-1 delete-laboratory-user-action',
+ data: { confirm: '确认删除吗？' }) do %>
+
+ <% end %>
+
+ <% end %>
+
+ |
+
<%= laboratory.created_at.strftime('%Y-%m-%d %H:%M') %> |
+
+ <%= link_to '定制', admins_laboratory_laboratory_setting_path(laboratory) %>
+
+ <% if school.present? && laboratory.id != 1 %>
+ <%= javascript_void_link '添加管理员', class: 'action', data: { laboratory_id: laboratory.id, toggle: 'modal', target: '.admin-add-laboratory-user-modal' } %>
+
+ <%= delete_link '删除', admins_laboratory_path(laboratory, element: ".laboratory-item-#{laboratory.id}"), class: 'delete-laboratory-action' %>
+ <% end %>
+ |
\ No newline at end of file
diff --git a/app/views/admins/laboratories/shared/_list.html.erb b/app/views/admins/laboratories/shared/_list.html.erb
new file mode 100644
index 000000000..33a47eed7
--- /dev/null
+++ b/app/views/admins/laboratories/shared/_list.html.erb
@@ -0,0 +1,25 @@
+
+
+
+ | 单位名称 |
+ 域名 |
+ 统计链接 |
+ 管理员 |
+ <%= sort_tag('创建时间', name: 'id', path: admins_laboratories_path) %> |
+ 操作 |
+
+
+
+ <% if laboratories.present? %>
+ <% laboratories.each do |laboratory| %>
+
+ <%= render 'admins/laboratories/shared/laboratory_item', laboratory: laboratory %>
+
+ <% end %>
+ <% else %>
+ <%= render 'admins/shared/no_data_for_table' %>
+ <% end %>
+
+
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: laboratories } %>
\ No newline at end of file
diff --git a/app/views/admins/laboratory_settings/show.html.erb b/app/views/admins/laboratory_settings/show.html.erb
new file mode 100644
index 000000000..120bba6cb
--- /dev/null
+++ b/app/views/admins/laboratory_settings/show.html.erb
@@ -0,0 +1,131 @@
+<% define_admin_breadcrumbs do %>
+ <% add_admin_breadcrumb('云上实验室', admins_laboratories_path) %>
+ <% add_admin_breadcrumb('单位定制') %>
+<% end %>
+
+
+ <%= simple_form_for(@laboratory, url: admins_laboratory_laboratory_setting_path(@laboratory), method: 'patch', html: { enctype: 'multipart/form-data' }) do |f| %>
+ <% setting = @laboratory.laboratory_setting %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ <%= javascript_void_link '保存', class: 'btn btn-primary mr-3 px-4 submit-btn' %>
+ <%= link_to '取消', admins_laboratories_path, class: 'btn btn-secondary px-4' %>
+
+ <% end %>
+
\ No newline at end of file
diff --git a/app/views/admins/laboratory_users/create.js.erb b/app/views/admins/laboratory_users/create.js.erb
new file mode 100644
index 000000000..f43fd7887
--- /dev/null
+++ b/app/views/admins/laboratory_users/create.js.erb
@@ -0,0 +1,4 @@
+$('.modal.admin-add-laboratory-user-modal').modal('hide');
+$.notify({ message: '操作成功' });
+
+$('.laboratory-list-table .laboratory-item-<%= current_laboratory.id %>').html("<%= j(render partial: 'admins/laboratories/shared/laboratory_item', locals: { laboratory: current_laboratory }) %>")
\ No newline at end of file
diff --git a/app/views/admins/laboratory_users/destroy.js.erb b/app/views/admins/laboratory_users/destroy.js.erb
new file mode 100644
index 000000000..16ef62910
--- /dev/null
+++ b/app/views/admins/laboratory_users/destroy.js.erb
@@ -0,0 +1,2 @@
+$.notify({ message: '操作成功' });
+$('.laboratory-list-container .laboratory-item-<%= current_laboratory.id %> .laboratory-user-item-<%= @laboratory_user.user_id %>').remove();
\ No newline at end of file
diff --git a/app/views/admins/schools/shared/_list.html.erb b/app/views/admins/schools/shared/_list.html.erb
index 74df29cee..b1453f1a1 100644
--- a/app/views/admins/schools/shared/_list.html.erb
+++ b/app/views/admins/schools/shared/_list.html.erb
@@ -7,7 +7,7 @@
单位名称 |
地区 |
城市 |
-
详细地址 |
+
详细地址 |
<%= sort_tag('用户数', name: 'users_count', path: admins_schools_path) %> |
部门数 |
<%= sort_tag('创建时间', name: 'created_at', path: admins_schools_path) %> |
diff --git a/app/views/admins/shared/_sidebar.html.erb b/app/views/admins/shared/_sidebar.html.erb
index 2d9461f45..145910928 100644
--- a/app/views/admins/shared/_sidebar.html.erb
+++ b/app/views/admins/shared/_sidebar.html.erb
@@ -33,23 +33,13 @@
<%= sidebar_item_group('#schools-submenu', '单位管理', icon: 'building') do %>
<%= sidebar_item(admins_schools_path, '单位列表', icon: 'university', controller: 'admins-schools') %>
<%= sidebar_item(admins_departments_path, '部门列表', icon: 'sitemap', controller: 'admins-departments') %>
+
<%= sidebar_item(admins_laboratories_path, '云上实验室', icon: 'cloud', controller: 'admins-laboratories') %>
<% end %>
-
- <%#= sidebar_item_group('#course-submenu', '课堂+', icon: 'mortar-board') do %>
-
-
-
-
- <%# end %>
-
-
<%= sidebar_item_group('#user-submenu', '用户', icon: 'user') do %>
<%= sidebar_item(admins_users_path, '用户列表', icon: 'user', controller: 'admins-users') %>
-
-
<% end %>
@@ -77,7 +67,8 @@
- <%= sidebar_item_group('#helps-submenu', '帮助中心', icon: 'info-circle') do %>
+ <%= sidebar_item_group('#setting-submenu', '网站建设', icon: 'cogs') do %>
+ <%= sidebar_item(admins_carousels_path, '轮播图', icon: 'image', controller: 'admins-carousels') %>
<%= sidebar_item(edit_admins_about_path, '关于我们', icon: 'smile-o', controller: 'admins-abouts') %>
<%= sidebar_item(edit_admins_contact_us_path, '联系我们', icon: 'commenting-o', controller: 'admins-contact_us') %>
<%= sidebar_item(admins_cooperatives_path, '合作伙伴', icon: 'handshake-o', controller: 'admins-cooperatives') %>
diff --git a/app/views/admins/users/edit.html.erb b/app/views/admins/users/edit.html.erb
index 22ac1f18e..abb003cbc 100644
--- a/app/views/admins/users/edit.html.erb
+++ b/app/views/admins/users/edit.html.erb
@@ -74,7 +74,7 @@
<%= f.input :mail, as: :email, label: '邮箱地址', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11' } %>
- <%= f.input :phone, as: :tel, label: '手机号', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11' } %>
+ <%= f.input :phone, as: :tel, label: '手机号', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11', autocomplete: 'off' } %>
@@ -124,8 +124,8 @@
- <%= f.input :password, as: :password, label: '修改密码', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11' } %>
- <%= f.input :password_confirmation, as: :password, label: '确认密码', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11' } %>
+ <%= f.input :password, as: :password, label: '修改密码', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11', autocomplete: 'new-password' } %>
+ <%= f.input :password_confirmation, as: :password, label: '确认密码', wrapper_html: { class: 'col-md-3' }, input_html: { class: 'col-sm-11', autocomplete: 'new-password' } %>
湘公网安备43019002000962号
+ 
}/images/${discussMessage.author.image_url}`})
-