From a7af3f4a6d89e2bd5966ba01e2d6c5661f1e20e6 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 14 Nov 2019 20:15:14 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/weapps/courses_controller.rb | 13 +++++++++++-- app/views/weapps/courses/show.json.jbuilder | 4 ++++ config/routes.rb | 2 +- 3 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 app/views/weapps/courses/show.json.jbuilder diff --git a/app/controllers/weapps/courses_controller.rb b/app/controllers/weapps/courses_controller.rb index 38f1b99f9..1d510a863 100644 --- a/app/controllers/weapps/courses_controller.rb +++ b/app/controllers/weapps/courses_controller.rb @@ -1,6 +1,6 @@ class Weapps::CoursesController < Weapps::BaseController # before_action :require_wechat_login! - before_action :teacher_allowed, except: [:create] + before_action :teacher_allowed, except: [:create, :show] def create return render_error("只有老师身份才能创建课堂") unless current_user.is_teacher? @@ -17,16 +17,25 @@ class Weapps::CoursesController < Weapps::BaseController end def update - Weapps::UpdateCourseService.call(current_course, course_params) + Weapps::UpdateCourseService.call(current_course, update_course_params) render_ok end + def show + @course = current_course + @current_user = current_user + end + private def course_params params.permit(:name, :course_list_name, :credit, course_module_types: []) end + def update_course_params + params.permit(:name, :course_list_name, :credit) + end + def current_course @_current_course = Course.find params[:id] end diff --git a/app/views/weapps/courses/show.json.jbuilder b/app/views/weapps/courses/show.json.jbuilder new file mode 100644 index 000000000..45cd1c040 --- /dev/null +++ b/app/views/weapps/courses/show.json.jbuilder @@ -0,0 +1,4 @@ +json.(@course, :id, :name, :course_members_count, :credit) +json.teachers_count @course.teachers.count +json.students_count @course.students.count +json.course_identity @current_user.course_identity(@course) \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 6b9c83bc8..d663e7cfb 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -880,7 +880,7 @@ Rails.application.routes.draw do post :cancel_sticky, on: :collection end - resources :courses, only: [:create, :update, :edit] + resources :courses, only: [:create, :update, :edit, :show] end resources :users_for_partners, only: [:index] From 28f88b258e8bf4bcf62da310a8e92da79cab1e11 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Thu, 14 Nov 2019 20:19:31 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E7=9A=84=E6=8A=A5=E9=94=99=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercises_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb index 32cfb7bdd..6180f807e 100644 --- a/app/controllers/exercises_controller.rb +++ b/app/controllers/exercises_controller.rb @@ -601,7 +601,7 @@ class ExercisesController < ApplicationController end rescue Exception => e uid_logger_error(e.message) - tip_exception("试卷提交失败") + tip_exception(e.message) raise ActiveRecord::Rollback end end From 39d3312f8d022cd33855f6bde45e9f8e5ea547e8 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 15 Nov 2019 09:39:25 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/weapps/courses_controller.rb | 6 +++++- .../weapps/courses/shixun_homework_category.json.jbuilder | 3 +++ config/routes.rb | 6 +++++- 3 files changed, 13 insertions(+), 2 deletions(-) create mode 100644 app/views/weapps/courses/shixun_homework_category.json.jbuilder diff --git a/app/controllers/weapps/courses_controller.rb b/app/controllers/weapps/courses_controller.rb index 1d510a863..f1edc191c 100644 --- a/app/controllers/weapps/courses_controller.rb +++ b/app/controllers/weapps/courses_controller.rb @@ -1,6 +1,6 @@ class Weapps::CoursesController < Weapps::BaseController # before_action :require_wechat_login! - before_action :teacher_allowed, except: [:create, :show] + before_action :teacher_allowed, except: [:create, :show, :shixun_homework_category] def create return render_error("只有老师身份才能创建课堂") unless current_user.is_teacher? @@ -26,6 +26,10 @@ class Weapps::CoursesController < Weapps::BaseController @current_user = current_user end + def shixun_homework_category + @categories = current_course.shixun_course_modules.first&.course_second_categories + end + private def course_params diff --git a/app/views/weapps/courses/shixun_homework_category.json.jbuilder b/app/views/weapps/courses/shixun_homework_category.json.jbuilder new file mode 100644 index 000000000..b38748597 --- /dev/null +++ b/app/views/weapps/courses/shixun_homework_category.json.jbuilder @@ -0,0 +1,3 @@ +json.categories @categories.each do |category| + json.(category, :id, :name) +end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index d663e7cfb..245e984c6 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -880,7 +880,11 @@ Rails.application.routes.draw do post :cancel_sticky, on: :collection end - resources :courses, only: [:create, :update, :edit, :show] + resources :courses, only: [:create, :update, :edit, :show] do + member do + get :shixun_homework_category + end + end end resources :users_for_partners, only: [:index]