diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 7c0ad24bb..5695a9037 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -586,7 +586,7 @@ class AccountController < ApplicationController def apply_trail apply_action = ApplyAction.where(:user_id => User.current.id, :container_type => "TrialAuthorization", :status => 0).first - if User.current.user_extensions.identity == 1 && !User.current.user_extensions.student_id.nil? && User.current.user_extensions.student_id != "" && !User.current.user_extensions.school.nil? + if User.current.user_extensions.identity == 1 && !User.current.user_extensions.student_id.nil? && User.current.user_extensions.student_id != "" && !User.current.user_extensions.school.nil? && [1579, 2438, 1587, 117].include?(User.current.user_extensions.school_id) User.current.update_attributes(:certification => 1) @tip = "申请成功，我们将在一分钟内完成审核" if apply_action.blank? diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 42f1241bc..d23bd4e0f 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -220,6 +220,16 @@ class CoursesController < ApplicationController join = cs.join_course_roles params,@user @state = join[:state] @course = join[:course] + if @state == 6 + # 给课堂老师发留言 + if params[:role].include?("7") || params[:role].include?("9") + notes = @user.show_real_name.to_s + " 申请以#{params[:role].include?('7') ? '教辅' : '教师'}的身份加入班级：#{@course.name}" + @course.course_teachers.each do |mem| + user = mem.user + user.journals_for_messages << JournalsForMessage.new(:user_id => @user.id, :notes => notes, :private => 1, :reply_id => 0) + end + end + end else @state = 5 #未登录 end @@ -992,6 +1002,7 @@ class CoursesController < ApplicationController @curr_page = '成员管理' respond_to do |format| + format.js format.html { render :layout => 'base_edu_course' } format.api { render_validation_errors(@course) } end diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index f0a1b84a7..218fd4562 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -335,11 +335,11 @@ class HomeworkCommonController < ApplicationController if @homework.homework_type == 4 if @homework_detail_manual.answer_open_evaluation != params[:answer_open_evaluation].to_i @homework_detail_manual.answer_open_evaluation = params[:answer_open_evaluation].to_i - if @homework.end_time < Time.now - @homework.student_works.each do |student_work| - set_shixun_final_score @homework, student_work, @homework_detail_manual.answer_open_evaluation - end - end + # if @homework.end_time < Time.now + # @homework.student_works.each do |student_work| + # set_shixun_final_score @homework, student_work, @homework_detail_manual.answer_open_evaluation + # end + # end end @homework.score_open = params[:homework_score_open] ? 1 : 0 else diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 8918d5e46..ccc118f54 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -406,7 +406,11 @@ class MessagesController < ApplicationController def sticky_topic (render_403; return false) unless (User.current.admin? || User.current.allowed_to?(:as_teacher, @course)) @topic.update_attributes(:sticky => @topic.sticky == 1 ? 0 : 1) - redirect_to board_message_path(@topic.board_id, @topic) + if params[:is_board] + redirect_to course_boards_path(@course) + else + redirect_to board_message_path(@topic.board_id, @topic) + end end def quote diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 518ac6587..7f21c0544 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -142,10 +142,12 @@ class ShixunsController < ApplicationController @mail = User.current.mail.blank? @shixun_all_count = Shixun.where(:hidden => 0).count @shixuns = Shixun.where("name like ? and hidden = 0", "%#{search}%") - @shixuns.each do |shixun| - shixun[:myshixunCount] = shixun.myshixuns.count - end - @shixuns = @shixuns.sort{|x, y| y[:myshixunCount] <=> x[:myshixunCount]} + # @shixuns.each do |shixun| + # shixun[:myshixunCount] = shixun.myshixuns.count + # end + # @shixuns = @shixuns.sort{|x, y| y[:myshixunCount] <=> x[:myshixunCount]} + @shixuns = @shixuns.select("shixuns.*, (select count(myshixuns.id) from myshixuns where myshixuns.shixun_id = shixuns.id group by shixuns.id) AS myshixunCount").reorder("status = 2 desc, myshixunCount desc") + @shixun_my_score = Experience.find_by_sql("SELECT sum(score) as score FROM `experiences` where user_id=#{User.current.id}").first.try(:score).to_i @current_user_had_passed = Myshixun.find_by_sql("select count(*) as had_passed from myshixuns where status =1 and user_id=#{User.current.id} and shixun_id in (SELECT id FROM `shixuns` where status > 1)").first.try(:had_passed).to_i @@ -243,7 +245,7 @@ class ShixunsController < ApplicationController bsort = params[:sort] || "desc" @sort = bsort == "desc" ? "asc" : "desc" if @order == "updated_at" - order_str = "#{Shixun.table_name}.updated_at #{@sort}" + order_str = "#{Shixun.table_name}.updated_at #{bsort}" else order_str = "myshixun_count #{bsort}, #{Shixun.table_name}.updated_at #{bsort}" end @@ -303,14 +305,16 @@ class ShixunsController < ApplicationController @shixuns =@shixuns.reorder(order_str) else # 最热排序 - @shixuns.each do |shixun| - shixun[:myshixunCount] = shixun.myshixuns.count - end - if bsort == "desc" - @shixuns = @shixuns.sort{|x, y| y[:myshixunCount] <=> x[:myshixunCount]} - else - @shixuns = @shixuns.sort{|x, y| x[:myshixunCount] <=> y[:myshixunCount]} - end + # @shixuns.each do |shixun| + # shixun[:myshixunCount] = shixun.myshixuns.count + # end + @shixuns = @shixuns.select("shixuns.*, (select count(myshixuns.id) from myshixuns where myshixuns.shixun_id = shixuns.id group by shixuns.id) AS myshixunCount").reorder("status = 2 desc, myshixunCount #{bsort}") + #@shixuns = @shixuns.reorder("status = 2 #{bsort}, myshixunCount #{bsort}") + # if bsort == "desc" + # @shixuns = @shixuns.sort{|x, y| y[:myshixunCount] <=> x[:myshixunCount]} + # else + # @shixuns = @shixuns.sort{|x, y| x[:myshixunCount] <=> y[:myshixunCount]} + # end end # @shixuns = Shixun.where(:authentication => 1).reorder(order) @shixuns_count = @shixuns.count diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index 5a1366d2f..75c51dde5 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -359,8 +359,10 @@ class StudentWorkController < ApplicationController end end ################################################################################################################## - if @homework.homework_type == 4 && @homework.homework_detail_manual.comment_status > 0 && (@homework.publish_time > Time.now || (@homework.publish_time <= Time.now && @homework.allow_late)) - update_shixun_work_status @homework + if params[:order].nil? && params[:sort].nil? && params[:name].nil? && params[:group].nil? && params[:comment].nil? && params[:status].nil? + if @homework.homework_type == 4 && @homework.homework_detail_manual.comment_status > 0 && @homework.homework_detail_manual.comment_status != 6 && (@homework.end_time > Time.now || (@homework.end_time <= Time.now && @homework.allow_late)) + update_shixun_work_status @homework + end end @order,@b_sort,@name,@group,@comment,@status = params[:order] || "updated_at",params[:sort] || "desc",params[:name].to_s.strip || "",params[:group], params[:comment], params[:status] @homework_commons = @course.homework_commons.where("publish_time <= ?",Time.now).order("created_at desc") diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb index f14ec8017..45575406f 100644 --- a/app/controllers/subjects_controller.rb +++ b/app/controllers/subjects_controller.rb @@ -8,12 +8,17 @@ class SubjectsController < ApplicationController include ApplicationHelper def index - @order = params[:order] || "updated_at" - bsort = params[:sort] || "asc" + @order = params[:order] || "myshixun_count" + bsort = params[:sort] || "desc" @sort = bsort == "desc" ? "asc" : "desc" search = params[:search] #ids = Subject.find_by_sql("select group_concat(id) as allId from subjects where id in (SELECT distinct(subject_id) FROM `stages`)") - @subjects = Subject.where("hidden = 0").reorder("#{@order} #{bsort}") + if @order == "myshixun_count" + #@shixuns = @shixuns.select("shixuns.*, (select count(myshixuns.id) from myshixuns where myshixuns.shixun_id = shixuns.id group by shixuns.id) AS myshixunCount").reorder("status = 2 desc, myshixunCount desc") + @subjects = Subject.where("hidden = 0").select("subjects.*, (select count(myshixuns.id) from myshixuns, stage_shixuns where myshixuns.shixun_id = stage_shixuns.shixun_id and stage_shixuns.subject_id = subjects.id group by subjects.id) AS myshixunCount").reorder("status = 2 desc, myshixunCount #{bsort}") + else + @subjects = Subject.where("hidden = 0").reorder("#{@order} #{bsort}") + end @subject_created_count = Subject.where(:user_id => User.current.id).count @subjects_all_count = @subjects.count #@subjects = Subject.where("name like ?", "%#{search}%").reorder("#{@order} #{@sort}") diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 075e897f3..3e5a0c0a3 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -790,14 +790,22 @@ class UsersController < ApplicationController if integer_ids.include?(9) cs = CoursesService.new c = Course.find(@msg.course_id) - cs.send_wechat_join_class_notice apply_user,c,9,0 + #cs.send_wechat_join_class_notice apply_user,c,9,0 else cs = CoursesService.new c = Course.find(@msg.course_id) - cs.send_wechat_join_class_notice apply_user,c,7,0 + #cs.send_wechat_join_class_notice apply_user,c,7,0 end end + apply_user = User.find @msg.course_message_id + notes = User.current.show_real_name.to_s + " 批准#{apply_user.show_real_name}以#{integer_ids.include?(7) ? '教辅' : '教师'}的身份加入班级：#{c.name}" + c.course_teachers.each do |mem| + user = mem.user + if user != User.current + user.journals_for_messages << JournalsForMessage.new(:user_id => User.current.id, :notes => notes, :private => 1, :reply_id => 0) + end + end when 'N' CourseMessage.create(:user_id => @msg.course_message_id, :course_id => @msg.course_id, :viewed => false,:course_message_id=>User.current.id,:content=>@msg.content,:course_message_type=>'CourseRequestDealResult',:status=>2) @msg.update_attributes(:status=>2,:viewed=>1) @@ -2058,14 +2066,16 @@ class UsersController < ApplicationController @user_fanlist_count = fan_query.count() @user_fanlist = fan_query.order("#{Watcher.table_name}.id desc").limit(12) + show_all = @user == User.current || User.current.admin? + # 我创建的实训数 - @create_num = (@user == User.current ? Shixun.where(:user_id => @user).count : Shixun.where(:user_id => @user).visible.count) + @create_num = (show_all ? Shixun.where(:user_id => @user).count : Shixun.where(:user_id => @user).visible.count) # 我合作的实训数 coop_id = Shixun.find_by_sql("select shixun_id from shixun_members where user_id=#{@user.id} and role = 2").map(&:shixun_id) # 合作者的实训id - @cooperative_num = (@user == User.current ? Shixun.where(:id => coop_id).count : Shixun.where(:id => coop_id).visible.count) + @cooperative_num = (show_all ? Shixun.where(:id => coop_id).count : Shixun.where(:id => coop_id).visible.count) # 我挑战的实训数 ch_id = Shixun.find_by_sql("select id from shixuns where id in (select shixun_id from myshixuns where user_id = #{@user.id})") - @challenge_num = (@user == User.current ? Shixun.where(:id => ch_id).count : Shixun.where(:id => ch_id).visible.count) + @challenge_num = (show_all ? Shixun.where(:id => ch_id).count : Shixun.where(:id => ch_id).visible.count) # 我的所有课程数 @all_courses_count = @user.courses.not_deleted_not_end.count # 我创建的课程数 @@ -2081,7 +2091,7 @@ class UsersController < ApplicationController ids2 = ids2.map{|shixun| shixun.id} unless ids2.blank? id = ids + ids2 id = id.uniq - if @user == User.current + if show_all @shixuns = Shixun.where(:id => id).order("updated_at desc") else @shixuns = Shixun.where(:status => [2, 3], :id => id).order("updated_at desc") @@ -2243,13 +2253,13 @@ class UsersController < ApplicationController if params[:filter] == "challenge" # 已挑战过 id = Shixun.find_by_sql("select id from shixuns where id in (select shixun_id from myshixuns where user_id = #{@user.id})") - if @user == User.current + if @user == User.current || User.current.admin? @shixuns = Shixun.where(:id => id).order("updated_at desc") else @shixuns = Shixun.where(:id => id).visible.order("updated_at desc") end elsif params[:filter] == "create" - if @user == User.current + if @user == User.current || User.current.admin? @shixuns = Shixun.where(:user_id => @user).order("updated_at desc") else @shixuns = Shixun.where(:user_id => @user).visible.order("updated_at desc") @@ -2257,7 +2267,7 @@ class UsersController < ApplicationController elsif params[:filter] == "cooperative" # 合作者的实训id id = Shixun.find_by_sql("select shixun_id from shixun_members where user_id=#{@user.id} and role = 2").map(&:shixun_id) - if @user == User.current + if @user == User.current || User.current.admin? @shixuns = Shixun.where(:id => id).order("updated_at desc") else @shixuns = Shixun.where(:id => id).visible.order("updated_at desc") @@ -2271,7 +2281,7 @@ class UsersController < ApplicationController ids2 = ids2.map{|shixun| shixun.id} unless ids2.blank? id = ids + ids2 id = id.uniq - if @user == User.current + if @user == User.current || User.current.admin? @shixuns = Shixun.where(:id => id).order("updated_at desc") else @shixuns = Shixun.where(:id => id).visible.order("updated_at desc") @@ -2323,7 +2333,7 @@ class UsersController < ApplicationController end def user_experience - @user_experiences = @user.experiences.reorder("created_at desc") + @user_experiences = @user.experiences.where("score > 0").reorder("created_at desc") @limit = 20 @is_remote = true @experiences_count = @user_experiences.count diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index c1ccda04a..e13cf05b8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -3885,7 +3885,7 @@ module ApplicationHelper if User.current.logged? if User.current.member_of_course?(homework.course) if is_teacher #老师显示作品数量 - link_to "作品(#{count})", student_work_index_url_in_org(homework.id, 2), :class => "c_blue homepagePostSubmit" + link_to "作品 (#{count})".html_safe, student_work_index_url_in_org(homework.id, 2), :class => "c_blue homepagePostSubmit" else #学生显示提交作品、修改作品等按钮 work = cur_user_works_for_homework homework project = cur_user_projects_for_homework homework @@ -3930,10 +3930,10 @@ module ApplicationHelper end end else - link_to "作品(#{count})", "javascript:void(0)", :class => "c_blue homepagePostSubmit", :onclick => "notice_sure_box('您不是班级成员，不能提交作品
请先从老师处获取邀请码后加入班级，再提交作品')" + link_to "作品 (#{count})".html_safe, "javascript:void(0)", :class => "c_blue homepagePostSubmit", :onclick => "notice_sure_box('您不是班级成员，不能提交作品
请先从老师处获取邀请码后加入班级，再提交作品')" end else - link_to "作品(#{count})", "javascript:void(0)", :class => "c_blue homepagePostSubmit", :onclick => "login_notice_box('#{signin_url_without_domain}');" + link_to "作品 (#{count})".html_safe, "javascript:void(0)", :class => "c_blue homepagePostSubmit", :onclick => "login_notice_box('#{signin_url_without_domain}');" end end diff --git a/app/helpers/owner_type_helper.rb b/app/helpers/owner_type_helper.rb index 9124a4f98..3239d9d8e 100644 --- a/app/helpers/owner_type_helper.rb +++ b/app/helpers/owner_type_helper.rb @@ -15,4 +15,5 @@ module OwnerTypeHelper HOMEWORKREFERENCEANSWER = 14 STUDENTWORK = 15 HOMEWORKBANK = 16 + SUBJECT = 17 end \ No newline at end of file diff --git a/app/helpers/student_work_helper.rb b/app/helpers/student_work_helper.rb index 993e4d9eb..b016bbf61 100644 --- a/app/helpers/student_work_helper.rb +++ b/app/helpers/student_work_helper.rb @@ -3,11 +3,14 @@ include UserScoreHelper module StudentWorkHelper def update_shixun_work_status homework - homework.student_works.where(:work_status => 0).each do |work| - myshixun = Myshixun.where(:shixun_id => homework.homework_commons_shixuns.shixun_id, :user_id => work.user_id).first - if myshixun - work.update_attributes(:work_status => myshixun.created_at <= homework.end_time ? 1 : 2, :late_penalty => myshixun.created_at <= homework.end_time ? 0 : homework.late_penalty, :commit_time => myshixun.created_at, :myshixun_id => myshixun.id) + homework.student_works.each do |work| + if work.work_status == 0 + myshixun = Myshixun.where(:shixun_id => homework.homework_commons_shixuns.shixun_id, :user_id => work.user_id).first + if myshixun + work.update_attributes(:work_status => myshixun.created_at <= homework.end_time ? 1 : 2, :late_penalty => myshixun.created_at <= homework.end_time ? 0 : homework.late_penalty, :commit_time => myshixun.created_at, :myshixun_id => myshixun.id) + end end + set_shixun_final_score homework, work, homework.homework_detail_manual.answer_open_evaluation end end @@ -88,9 +91,9 @@ module StudentWorkHelper when 0 str = "未提交" when 1 - str = "按时提交" + str = "按时提交" when 2 - str = "延时提交" + str = "延时提交" end end @@ -130,16 +133,19 @@ module StudentWorkHelper link_to "继续实战", 'javascript:void(0);', :onclick => "sure_box_redirect('#{myshixun_reset_myshixun_path(myshixun)}', '实训已经更新啦，系统正在为您重置');", :class => "white-btn orange-btn fr mr10 mt8" end else - work_ids = "(" + homework.student_works.has_committed.map(&:id).join(",") + ")" - if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3 && User.current.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count > 0 #匿评作业，且作业状态不是在开启匿评之前 - link_to "匿评作品", student_work_index_url_in_org(homework.id, 2), :class => 'white-btn orange-btn fr mr10 mt8', :title => "开启匿评后不可修改作品" - elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status > 3 - link_to "查看作品", student_work_path(work), :class => 'white-btn orange-btn fr mr10 mt8', :title => "匿评已结束" - elsif homework.end_time >= Time.now && work.user_id == User.current.id + if homework.end_time >= Time.now && work.user_id == User.current.id link_to "修改作品", edit_student_work_url_without_domain(work.id),:class => 'white-btn orange-btn fr mr10 mt8' - else - link_to "查看作品", student_work_path(work), :class => 'white-btn orange-btn fr mr10 mt8', :title => "作业截止后不可修改作品" end + # work_ids = "(" + homework.student_works.has_committed.map(&:id).join(",") + ")" + # if homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3 && User.current.student_works_evaluation_distributions.where("student_work_id IN #{work_ids}").count > 0 #匿评作业，且作业状态不是在开启匿评之前 + # link_to "匿评作品", student_work_index_url_in_org(homework.id, 2), :class => 'white-btn orange-btn fr mr10 mt8', :title => "开启匿评后不可修改作品" + # elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status > 3 + # link_to "查看作品", student_work_path(work), :class => 'white-btn orange-btn fr mr10 mt8', :title => "匿评已结束" + # elsif homework.end_time >= Time.now && work.user_id == User.current.id + # link_to "修改作品", edit_student_work_url_without_domain(work.id),:class => 'white-btn orange-btn fr mr10 mt8' + # else + # link_to "查看作品", student_work_path(work), :class => 'white-btn orange-btn fr mr10 mt8', :title => "作业截止后不可修改作品" + # end end end end @@ -179,9 +185,9 @@ module StudentWorkHelper #传入分数，获取对应颜色 def score_color score if score - color = score >= 90 ? "c_red" : "c_green" + color = score >= 90 ? "color-red-light" : "color-light-green" else - color = "c_grey" + color = "color-grey" end color end diff --git a/app/models/course.rb b/app/models/course.rb index 534325464..5a169be09 100644 --- a/app/models/course.rb +++ b/app/models/course.rb @@ -244,6 +244,11 @@ class Course < ActiveRecord::Base self.status == STATUS_ARCHIVED end + # 课堂的老师不包括助教 + def course_teachers + self.members.select{|m| m.roles.to_s.include?("Manager") || m.roles.to_s.include?("Teacher")} + end + def self.visible_condition(user, options={}) allowed_to_condition(user, :view_course, options) end diff --git a/app/models/students_for_course.rb b/app/models/students_for_course.rb index b501db674..95157f2da 100644 --- a/app/models/students_for_course.rb +++ b/app/models/students_for_course.rb @@ -39,16 +39,16 @@ class StudentsForCourse < ActiveRecord::Base if str != "" str += "," end - if hw.homework_type == 4 - myshixun = Myshixun.where(:shixun_id => hw.homework_commons_shixuns.shixun_id, :user_id => self.student_id).first - if myshixun - str += "('#{hw.name}的作品提交',#{hw.id},#{self.student_id}, 1, #{myshixun.id}, '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}')" - else - str += "('#{hw.name}的作品提交',#{hw.id},#{self.student_id}, 0, null, null, '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}')" - end - else + #if hw.homework_type == 4 + #myshixun = Myshixun.where(:shixun_id => hw.homework_commons_shixuns.shixun_id, :user_id => self.student_id).first + # if myshixun + # str += "('#{hw.name}的作品提交',#{hw.id},#{self.student_id}, 1, #{myshixun.id}, '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}')" + # else + # str += "('#{hw.name}的作品提交',#{hw.id},#{self.student_id}, 0, null, null, '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}')" + # end + #else str += "('#{hw.name}的作品提交',#{hw.id},#{self.student_id}, 0, null, null, '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}', '#{Time.now.strftime('%Y-%m-%d %H:%M:%S')}')" - end + #end end end if str != "" diff --git a/app/models/subject.rb b/app/models/subject.rb index 7eb102bf5..fc4fa393c 100644 --- a/app/models/subject.rb +++ b/app/models/subject.rb @@ -35,6 +35,15 @@ class Subject < ActiveRecord::Base count end + def subject_users + count = 0 + self.stage_shixuns.each do |stage_shixun| + shixun = stage_shixun.shixun + count += shixun.myshixuns.count + end + count + end + def subject_score score = 0 self.stage_shixuns.each do |stage_shixun| diff --git a/app/services/courses_service.rb b/app/services/courses_service.rb index 745f0e938..dce1176f2 100644 --- a/app/services/courses_service.rb +++ b/app/services/courses_service.rb @@ -682,18 +682,18 @@ class CoursesService #----------------微信通知---------------------- - if role_ids.include?("7") || role_ids.include?("9") - tea_user = User.find(course.tea_id) - count = ShieldWechatMessage.where("container_type='User' and container_id=#{tea_user.id} and shield_type='Course' and shield_id=#{course.id}").count - if count == 0 - - rolename = role_ids.include?("7") ? "助教" : "教师" - content = current_user.show_name + "申请以"+rolename+"身份加入班级，等待您的审批。" - name = course.course_list.nil? ? course.name : course.course_list_name+" • "+course.name - ws = WechatService.new - ws.class_notice tea_user.id, "review_class_member", course.id, "班级成员审批通知。", name, tea_user.show_name, format_time(Time.now), content, "点击查看申请详情。",current_user.id - end - end + # if role_ids.include?("7") || role_ids.include?("9") + # tea_user = User.find(course.tea_id) + # count = ShieldWechatMessage.where("container_type='User' and container_id=#{tea_user.id} and shield_type='Course' and shield_id=#{course.id}").count + # if count == 0 + # + # rolename = role_ids.include?("7") ? "助教" : "教师" + # content = current_user.show_name + "申请以"+rolename+"身份加入班级，等待您的审批。" + # name = course.course_list.nil? ? course.name : course.course_list_name+" • "+course.name + # ws = WechatService.new + # ws.class_notice tea_user.id, "review_class_member", course.id, "班级成员审批通知。", name, tea_user.show_name, format_time(Time.now), content, "点击查看申请详情。",current_user.id + # end + # end #-------------------------------------------- if is_stu diff --git a/app/views/boards/_course_new.html.erb b/app/views/boards/_course_new.html.erb index 56014f062..91bb5c852 100644 --- a/app/views/boards/_course_new.html.erb +++ b/app/views/boards/_course_new.html.erb @@ -87,7 +87,7 @@ //paramsHeight = params.kindutil.removeUnit(this.height); edit.iframe.height(150); this.resize(null, Math.max((params.kindutil.IE ? body.scrollHeight : body.offsetHeight) , 150)); - elocalStorage(message_content_editor,'topic_course_<%=course.id %>'); + elocalStorage(message_content_editor,'topic_course_<%=course.id %>','des'); } }).loadPlugin('paste'); return editor; @@ -154,8 +154,8 @@

-

-

+

+

diff --git a/app/views/challenges/_choose_tab.html.erb b/app/views/challenges/_choose_tab.html.erb index fb5015d25..3787f5985 100644 --- a/app/views/challenges/_choose_tab.html.erb +++ b/app/views/challenges/_choose_tab.html.erb @@ -2,9 +2,9 @@ 本关任务 <% @challenge.challenge_chooses.each_with_index do |choose, index| %> -
  • "> +
  • " style="<%= @index == index ? "width:110px" : "flex:1" %>"> <%= (index + 1).to_s + (choose.category == 1 ? ".单选题" : ".多选题") %>
    • -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/challenges/_choose_type.html.erb b/app/views/challenges/_choose_type.html.erb index 085a1e3e3..6bce64f2d 100644 --- a/app/views/challenges/_choose_type.html.erb +++ b/app/views/challenges/_choose_type.html.erb @@ -1,10 +1,12 @@
    -