From e588128f9016ee99881c25e6b380ec21dec6db85 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 6 Sep 2019 18:20:03 +0800
Subject: [PATCH 01/15] sms
---
app/services/users/apply_professional_auth_service.rb | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/app/services/users/apply_professional_auth_service.rb b/app/services/users/apply_professional_auth_service.rb
index 07afe18ae..a920caf55 100644
--- a/app/services/users/apply_professional_auth_service.rb
+++ b/app/services/users/apply_professional_auth_service.rb
@@ -38,7 +38,11 @@ class Users::ApplyProfessionalAuthService < ApplicationService
move_image_file! unless params[:upload_image].to_s == 'false'
- sms_notify_admin
+ sms_cache = Rails.cache.read("apply_pro_certification")
+ if sms_cache.nil?
+ sms_notify_admin
+ Rails.cache.write("apply_pro_certification", 1)
+ end
end
end
From 4005ebf768af6a99e3ea7af522a9238504f5e77f Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 9 Sep 2019 19:08:16 +0800
Subject: [PATCH 02/15] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/services/users/apply_professional_auth_service.rb | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/app/services/users/apply_professional_auth_service.rb b/app/services/users/apply_professional_auth_service.rb
index a920caf55..3ba9fbafd 100644
--- a/app/services/users/apply_professional_auth_service.rb
+++ b/app/services/users/apply_professional_auth_service.rb
@@ -38,11 +38,11 @@ class Users::ApplyProfessionalAuthService < ApplicationService
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
+ # sms_cache = Rails.cache.read("apply_pro_certification")
+ # if sms_cache.nil?
+ # sms_notify_admin
Rails.cache.write("apply_pro_certification", 1)
- end
+ # end
end
end
From 3b4f6c1a271d3b5ee4d7bdb5223e75dfdf115524 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Mon, 9 Sep 2019 19:48:27 +0800
Subject: [PATCH 03/15] =?UTF-8?q?=E5=AE=9E=E8=B7=B5=E8=AF=BE=E7=A8=8B?=
=?UTF-8?q?=E7=9A=84=E5=B7=B2=E5=AD=A6=E5=85=B3=E5=8D=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/subjects_controller.rb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/controllers/subjects_controller.rb b/app/controllers/subjects_controller.rb
index 7c76748b1..952301053 100644
--- a/app/controllers/subjects_controller.rb
+++ b/app/controllers/subjects_controller.rb
@@ -442,7 +442,6 @@ class SubjectsController < ApplicationController
# 用户进展和获取的标签
def user_subject_progress challenge_ids
pass_games = Game.select(:id, :cost_time, :challenge_id).where(status: 2, user_id: current_user.id, challenge_id: challenge_ids) if current_user.logged?
- @all_score = Challenge.where(id: challenge_ids).sum(:score)
# 如果没有通关的，没必要再继续统计了
if pass_games.blank?
@@ -451,6 +450,7 @@ class SubjectsController < ApplicationController
@time = 0
@user_tags = []
else
+ @all_score = Challenge.where(id: challenge_ids).size
pass_challenge_ids = pass_games.map(&:challenge_id).uniq # 按道理是不用去重的，但是历史数据与重复
subject_challenge_count = @subject.shixuns.sum(:challenges_count)
# 用户通关获得的标签
@@ -460,7 +460,7 @@ class SubjectsController < ApplicationController
subject_challenge_count == 0 ? 0 :
((pass_challenge_ids.size.to_f / subject_challenge_count).round(2) * 100).to_i
# 用户通关分数
- @my_score = Challenge.where(id: pass_challenge_ids).pluck(:score).sum
+ @my_score = Challenge.where(id: pass_challenge_ids).size
@time = pass_games.map(&:cost_time).sum
end
From 29f451026c59f6021a71b8ec3edfbcb29a6588ae Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 10 Sep 2019 14:12:52 +0800
Subject: [PATCH 04/15] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8?=
=?UTF-8?q?=E7=9A=84=E5=8D=87=E5=BA=8F=E5=92=8C=E9=99=8D=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/courses_controller.rb | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb
index f6fae91db..d9ddcf2d1 100644
--- a/app/controllers/courses_controller.rb
+++ b/app/controllers/courses_controller.rb
@@ -708,6 +708,7 @@ 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"
course_group_id = params[:course_group_id].present? ? params[:course_group_id].to_i : nil
@students = CourseMember.students(@course)
@@ -719,12 +720,12 @@ class CoursesController < ApplicationController
if order == 1
# REDO:Extension
- @students = @students.includes(user: :user_extension).order("user_extensions.student_id, users.login")
+ @students = @students.includes(user: :user_extension).order("user_extensions.student_id #{sort}, users.login #{sort}")
elsif order == 2
- @students = @students.includes(:course_group).order("course_groups.position, users.login")
+ @students = @students.includes(:course_group).order("course_groups.position #{sort}, users.login #{sort}")
else
# REDO:Extension
- @students = @students.includes(user: :user_extension).order("user_extensions.student_id, users.login")
+ @students = @students.includes(user: :user_extension).order("user_extensions.student_id #{sort}, users.login #{sort}")
end
if course_group_id.present?
From 7574c4fe73ef9f154f01b0a6913fc0b5195305b7 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 10 Sep 2019 14:27:26 +0800
Subject: [PATCH 05/15] =?UTF-8?q?/*=20=E8=A7=A3=E5=86=B3=E9=BC=A0=E6=A0=87?=
=?UTF-8?q?=E6=A1=86=E9=80=89=E6=97=B6=EF=BC=8C=E5=B7=A6=E8=BE=B9=E7=AC=AC?=
=?UTF-8?q?=E4=B8=80=E5=88=97=E6=B2=A1=E9=AB=98=E4=BA=AE=E7=9A=84=E9=97=AE?=
=?UTF-8?q?=E9=A2=98=20*/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/react/src/App.css | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/public/react/src/App.css b/public/react/src/App.css
index 42e40f8c8..f44822049 100644
--- a/public/react/src/App.css
+++ b/public/react/src/App.css
@@ -71,7 +71,10 @@ html, body {
/* 某些情况下，被cm盖住了 */
z-index: 99;
}
-
+/* 解决鼠标框选时，左边第一列没高亮的问题 */
+.CodeMirror .CodeMirror-lines pre.CodeMirror-line, .CodeMirror .CodeMirror-lines pre.CodeMirror-line-like {
+ padding: 0 12px ;
+}
/* antd扩展 */
From baba6aa9e95d959ab445e559889d6ab8074bcc14 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 10 Sep 2019 14:31:59 +0800
Subject: [PATCH 06/15] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E5=9C=A8=E7=BA=BF?=
=?UTF-8?q?=E5=AD=A6=E4=B9=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/models/course_stage.rb | 9 +++++++++
app/models/course_stage_shixun.rb | 5 +++++
db/migrate/20190910061807_create_course_stages.rb | 13 +++++++++++++
.../20190910062710_create_course_stage_shixuns.rb | 12 ++++++++++++
spec/models/course_stage_shixun_spec.rb | 5 +++++
spec/models/course_stage_spec.rb | 5 +++++
6 files changed, 49 insertions(+)
create mode 100644 app/models/course_stage.rb
create mode 100644 app/models/course_stage_shixun.rb
create mode 100644 db/migrate/20190910061807_create_course_stages.rb
create mode 100644 db/migrate/20190910062710_create_course_stage_shixuns.rb
create mode 100644 spec/models/course_stage_shixun_spec.rb
create mode 100644 spec/models/course_stage_spec.rb
diff --git a/app/models/course_stage.rb b/app/models/course_stage.rb
new file mode 100644
index 000000000..27eb9de30
--- /dev/null
+++ b/app/models/course_stage.rb
@@ -0,0 +1,9 @@
+class CourseStage < ApplicationRecord
+ belongs_to :course, counter_cache: true
+
+ has_many :course_stage_shixuns, -> { order("course_stage_shixuns.position ASC") }, dependent: :destroy
+ has_many :shixuns, :through => :course_stage_shixuns
+
+ validates :name, length: { maximum: 60 }
+ validates :description, length: { maximum: 300 }
+end
diff --git a/app/models/course_stage_shixun.rb b/app/models/course_stage_shixun.rb
new file mode 100644
index 000000000..be5a1bb7d
--- /dev/null
+++ b/app/models/course_stage_shixun.rb
@@ -0,0 +1,5 @@
+class CourseStageShixun < ApplicationRecord
+ belongs_to :course, counter_cache: :stages_count, counter_cache: :shixuns_count
+ belongs_to :course_stage
+ belongs_to :shixun, counter_cache: :shixuns_count
+end
diff --git a/db/migrate/20190910061807_create_course_stages.rb b/db/migrate/20190910061807_create_course_stages.rb
new file mode 100644
index 000000000..c664b7f92
--- /dev/null
+++ b/db/migrate/20190910061807_create_course_stages.rb
@@ -0,0 +1,13 @@
+class CreateCourseStages < ActiveRecord::Migration[5.2]
+ def change
+ create_table :course_stages do |t|
+ t.references :course, index: true
+ t.string :name
+ t.text :description
+ t.integer :position
+ t.integer :shixuns_count
+
+ t.timestamps
+ end
+ end
+end
diff --git a/db/migrate/20190910062710_create_course_stage_shixuns.rb b/db/migrate/20190910062710_create_course_stage_shixuns.rb
new file mode 100644
index 000000000..04512c7da
--- /dev/null
+++ b/db/migrate/20190910062710_create_course_stage_shixuns.rb
@@ -0,0 +1,12 @@
+class CreateCourseStageShixuns < ActiveRecord::Migration[5.2]
+ def change
+ create_table :course_stage_shixuns do |t|
+ t.references :course, index: true
+ t.references :course_stage, index: true
+ t.references :shixun, index: true
+ t.integer :position
+
+ t.timestamps
+ end
+ end
+end
diff --git a/spec/models/course_stage_shixun_spec.rb b/spec/models/course_stage_shixun_spec.rb
new file mode 100644
index 000000000..716af2b97
--- /dev/null
+++ b/spec/models/course_stage_shixun_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CourseStageShixun, type: :model do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
diff --git a/spec/models/course_stage_spec.rb b/spec/models/course_stage_spec.rb
new file mode 100644
index 000000000..06c711908
--- /dev/null
+++ b/spec/models/course_stage_spec.rb
@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CourseStage, type: :model do
+ pending "add some examples to (or delete) #{__FILE__}"
+end
From 51a7f8f0834e1f09c14f498841cc104fc149e64b Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Tue, 10 Sep 2019 15:15:30 +0800
Subject: [PATCH 07/15] remove test
---
public/react/public/index.html | 1 -
1 file changed, 1 deletion(-)
diff --git a/public/react/public/index.html b/public/react/public/index.html
index de539ffba..166760eab 100755
--- a/public/react/public/index.html
+++ b/public/react/public/index.html
@@ -22,7 +22,6 @@
-->
EduCoder