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 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                | 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]

From ccc3942f0c359aebab7cc82e2dcc2a6923e48ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 15 Nov 2019 09:43:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/exercise/Exercisesetting.js   | 1 -
 .../src/modules/courses/poll/PollDetailTabForthRules.js     | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Exercisesetting.js b/public/react/src/modules/courses/exercise/Exercisesetting.js
index fc1bea135..2190ac001 100644
--- a/public/react/src/modules/courses/exercise/Exercisesetting.js
+++ b/public/react/src/modules/courses/exercise/Exercisesetting.js
@@ -368,7 +368,6 @@ class Exercisesetting extends Component{
 			if(result.validate==false){
 				return;
 			}
-
 			this.commitSetting((result)=>{
 				console.log(result)
 				if(result.status==200){
diff --git a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
index f85198c1d..f7a1e111a 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
@@ -244,13 +244,13 @@ class PollDetailTabForthRules extends Component{
     for(var i=0;i<myRules.length;i++){
       let arr=Object.assign({}, myRules[parseInt(i)]);
       if(arr.poll_status < 2){
-        if(arr.course_group_id==undefined || arr.course_group_id.length==0){
+        if(arr.course_group_id===undefined || arr.course_group_id.length==0){
           arr.class_flag="请选择分班"
           flag1=false;
         }else{
           flag1=true;
         }
-        if(arr.publish_time==undefined){
+        if(arr.publish_time===undefined||arr.publish_time===null||arr.publish_time===""){
           arr.publish_flag="请选择发布时间"
           flag1=false;
         }
@@ -258,7 +258,7 @@ class PollDetailTabForthRules extends Component{
           arr.publish_flag="发布时间不能早于当前时间"
           flag1=false;
         }
-        if(arr.end_time==undefined){
+        if(arr.end_time===undefined||arr.end_time===null||arr.end_time===""){
           arr.end_flag="请选择截止时间"
           flag1=false;
         }

From e3078ae69bae2d5743483d8c3d36cb91bd2461a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 15 Nov 2019 09:47:56 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/poll/PollDetailTabForthRules.js   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
index f7a1e111a..056c59983 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
@@ -293,7 +293,7 @@ class PollDetailTabForthRules extends Component{
 		for(var i=0;i<myRules.length;i++){
 		let arr=Object.assign({}, this.state.rules[parseInt(i)]);
 				if(arr.poll_status < 2){
-						if(arr.course_group_id==undefined || arr.course_group_id.length==0){
+						if(arr.course_group_id===undefined || arr.course_group_id.length===0){
 								arr.class_flag="请选择分班"
 								flag=false;
 						}else{
@@ -301,7 +301,7 @@ class PollDetailTabForthRules extends Component{
 						}
 
 
-						if(arr.publish_time==undefined){
+						if(arr.publish_time==undefined||arr.publish_time===null||arr.publish_time===""){
 								arr.publish_flag="请选择发布时间"
 								flag1=false;
 						}
@@ -309,7 +309,7 @@ class PollDetailTabForthRules extends Component{
 								arr.publish_flag="发布时间不能早于当前时间"
 								flag1=false;
 						}
-						if(arr.end_time==undefined){
+						if(arr.end_time===undefined||arr.end_time===null||arr.end_time===""){
 								arr.end_flag="请选择截止时间"
 								flag2=false;
 						}
@@ -325,7 +325,7 @@ class PollDetailTabForthRules extends Component{
 					myRules[i]=arr
 				}
 		}
-		if(flag==false ||flag1==false ||flag2==false){
+		if(flag===false ||flag1===false ||flag2===false){
 			return {
 				validate: false,
 				rules: myRules