From 1e93f7b6fcfaa276055944b0f08ebe3f83603ad4 Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Mon, 13 Jan 2020 18:18:23 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A1=AB=E7=A9=BA?= =?UTF-8?q?=E9=A2=98=E7=9A=84=E6=A0=87=E5=87=86=E7=AD=94=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/exercises_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/exercises_helper.rb b/app/helpers/exercises_helper.rb index eaeb458a3..f8fba93f5 100644 --- a/app/helpers/exercises_helper.rb +++ b/app/helpers/exercises_helper.rb @@ -188,7 +188,7 @@ module ExercisesHelper if ex_ordered all_user_answers = effictive_users.pluck(:answer_text) null_stand_choice.each_with_index do |s,index| - s_choice_text = null_stand_text[index] + s_choice_text = null_stand_text[index].to_s.strip.downcase user_count = 0 # user_count = user_count + effictive_users.where("exercise_choice_id = ? and answer_text = ?",s,s_choice_text).pluck(:user_id).uniq.size user_count = user_count + effictive_users.select{|answer| answer.exercise_choice_id == s && answer.answer_text == s_choice_text}.size From b1aa24c5068de92fdfb7458ebbc910c7adce26ac Mon Sep 17 00:00:00 2001 From: "sylor_huang@126.com" Date: Mon, 13 Jan 2020 18:27:53 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A1=AB=E7=A9=BA?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/exercises_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/exercises_helper.rb b/app/helpers/exercises_helper.rb index f8fba93f5..513f980d8 100644 --- a/app/helpers/exercises_helper.rb +++ b/app/helpers/exercises_helper.rb @@ -188,7 +188,7 @@ module ExercisesHelper if ex_ordered all_user_answers = effictive_users.pluck(:answer_text) null_stand_choice.each_with_index do |s,index| - s_choice_text = null_stand_text[index].to_s.strip.downcase + s_choice_text = null_stand_text[index].to_s.strip user_count = 0 # user_count = user_count + effictive_users.where("exercise_choice_id = ? and answer_text = ?",s,s_choice_text).pluck(:user_id).uniq.size user_count = user_count + effictive_users.select{|answer| answer.exercise_choice_id == s && answer.answer_text == s_choice_text}.size From 5a107ad34e0b2b7f8f4a0b55c3b211e261e0f4d1 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 14 Jan 2020 14:14:57 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/shixun_search_service.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/services/shixun_search_service.rb b/app/services/shixun_search_service.rb index 710910100..32488a7c3 100644 --- a/app/services/shixun_search_service.rb +++ b/app/services/shixun_search_service.rb @@ -23,10 +23,9 @@ class ShixunSearchService < ApplicationService if User.current.admin? || User.current.business? || !User.current.school_id @shixuns = @shixuns.where(hidden: 0) else - shixun_ids = ShixunSchool.where(school_id: User.current.school_id).pluck(:shixun_id) - shixun_ids = shixun_ids.reject(&:blank?).length == 0 ? -1 : shixun_ids.join(",") + none_shixun_ids = ShixunSchool.where("school_id != #{User.current.school_id}").pluck(:shixun_id) - @shixuns = @shixuns.where("use_scope = 1 or id in (#{shixun_ids})").unhidden.published.or(@shixuns.where(id: User.current.shixuns)) + @shixuns = @shixuns.where.not(id: none_shixun_ids).where(hidden: 0, status: 2, public: 2).or(@shixuns.where(id: User.current.shixuns)) end end From ed84abf94def11844bb62b9b952fb8a515fe428e Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 14 Jan 2020 15:01:44 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=88=86=E7=8F=AD=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9A=84=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...00114062353_migrate_coures_member_group.rb | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 db/migrate/20200114062353_migrate_coures_member_group.rb diff --git a/db/migrate/20200114062353_migrate_coures_member_group.rb b/db/migrate/20200114062353_migrate_coures_member_group.rb new file mode 100644 index 000000000..4255bbe9b --- /dev/null +++ b/db/migrate/20200114062353_migrate_coures_member_group.rb @@ -0,0 +1,25 @@ +class MigrateCouresMemberGroup < ActiveRecord::Migration[5.2] + def change + course_ids = [377, 657, 715, 777, 973, 1093, 1131, 1180, 1309, 1920, 2037, 2346, 2354, 2493, 2752, 2920, 3000, + 3141, 3240, 3350, 3351, 3353, 3387, 3533, 3796] + + courses = Course.where(id: course_ids) + + courses.each do |course| + group_ids = course.course_groups.pluck(:id) + [0] + course.course_members.where.not(course_group_id: group_ids).each do |member| + if CourseGroup.where(course_id: course.id, name: member.course_group_name).exists? + new_group = CourseGroup.where(course_id: course.id, name: member.course_group_name).first + else + position = CourseGroup.where(course_id: course.id).order("position desc").first&.position.to_i + 1 + new_group = course.course_groups.create!(name: member.course_group_name, position: position) + course.exercise_group_settings.where(course_group_id: member.course_group_id).update_all(course_group_id: new_group.id) + course.attachment_group_settings.where(course_group_id: member.course_group_id).update_all(course_group_id: new_group.id) + HomeworkGroupReview.where(homework_common_id: course.homework_commons.pluck(:id)).where(course_group_id: member.course_group_id).update_all(course_group_id: new_group.id) + course.homework_group_settings.where(course_group_id: member.course_group_id).update_all(course_group_id: new_group.id) + end + member.update!(course_group_id: new_group.id) + end + end + end +end From 52ab6eb9e7bd01dc8419fc75a40e88d38abe6b52 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 14 Jan 2020 15:22:41 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=88=86=E7=8F=AD=E7=9A=84position?= =?UTF-8?q?=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../20200114062353_migrate_coures_member_group.rb | 4 ++-- ...0114071420_migrate_course_group_member_count.rb | 4 ++++ .../20200114071917_migrate_coure_group_position.rb | 14 ++++++++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20200114071420_migrate_course_group_member_count.rb create mode 100644 db/migrate/20200114071917_migrate_coure_group_position.rb diff --git a/db/migrate/20200114062353_migrate_coures_member_group.rb b/db/migrate/20200114062353_migrate_coures_member_group.rb index 4255bbe9b..b9992cb50 100644 --- a/db/migrate/20200114062353_migrate_coures_member_group.rb +++ b/db/migrate/20200114062353_migrate_coures_member_group.rb @@ -11,8 +11,8 @@ class MigrateCouresMemberGroup < ActiveRecord::Migration[5.2] if CourseGroup.where(course_id: course.id, name: member.course_group_name).exists? new_group = CourseGroup.where(course_id: course.id, name: member.course_group_name).first else - position = CourseGroup.where(course_id: course.id).order("position desc").first&.position.to_i + 1 - new_group = course.course_groups.create!(name: member.course_group_name, position: position) + # position = CourseGroup.where(course_id: course.id).order("position desc").first&.position.to_i + 1 + new_group = course.course_groups.create!(name: member.course_group_name) course.exercise_group_settings.where(course_group_id: member.course_group_id).update_all(course_group_id: new_group.id) course.attachment_group_settings.where(course_group_id: member.course_group_id).update_all(course_group_id: new_group.id) HomeworkGroupReview.where(homework_common_id: course.homework_commons.pluck(:id)).where(course_group_id: member.course_group_id).update_all(course_group_id: new_group.id) diff --git a/db/migrate/20200114071420_migrate_course_group_member_count.rb b/db/migrate/20200114071420_migrate_course_group_member_count.rb new file mode 100644 index 000000000..aad9dcc9c --- /dev/null +++ b/db/migrate/20200114071420_migrate_course_group_member_count.rb @@ -0,0 +1,4 @@ +class MigrateCourseGroupMemberCount < ActiveRecord::Migration[5.2] + def change + end +end diff --git a/db/migrate/20200114071917_migrate_coure_group_position.rb b/db/migrate/20200114071917_migrate_coure_group_position.rb new file mode 100644 index 000000000..0061eaad3 --- /dev/null +++ b/db/migrate/20200114071917_migrate_coure_group_position.rb @@ -0,0 +1,14 @@ +class MigrateCoureGroupPosition < ActiveRecord::Migration[5.2] + def change + course_ids = [377, 657, 715, 777, 973, 1093, 1131, 1180, 1309, 1920, 2037, 2346, 2354, 2493, 2752, 2920, 3000, + 3141, 3240, 3350, 3351, 3353, 3387, 3533, 3796] + + courses = Course.where(id: course_ids) + + courses.each do |course| + CourseGroup.where(coures_id: course.id).reorder("position ASC, CONVERT(course_groups.name USING gbk) COLLATE gbk_chinese_ci ASC").each_with_index do |group, index| + group.update!(position: index+1) + end + end + end +end From 34c5c550fa5e537b2f24306cb0627d3d11628a83 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 14 Jan 2020 15:23:33 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=88=86=E7=8F=AD=E7=9A=84position?= =?UTF-8?q?=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20200114071917_migrate_coure_group_position.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/migrate/20200114071917_migrate_coure_group_position.rb b/db/migrate/20200114071917_migrate_coure_group_position.rb index 0061eaad3..fc04e1bcb 100644 --- a/db/migrate/20200114071917_migrate_coure_group_position.rb +++ b/db/migrate/20200114071917_migrate_coure_group_position.rb @@ -6,7 +6,7 @@ class MigrateCoureGroupPosition < ActiveRecord::Migration[5.2] courses = Course.where(id: course_ids) courses.each do |course| - CourseGroup.where(coures_id: course.id).reorder("position ASC, CONVERT(course_groups.name USING gbk) COLLATE gbk_chinese_ci ASC").each_with_index do |group, index| + CourseGroup.where(course_id: course.id).reorder("position ASC, CONVERT(course_groups.name USING gbk) COLLATE gbk_chinese_ci ASC").each_with_index do |group, index| group.update!(position: index+1) end end