From 2ef4b4bfabb015f79fc2ed22a1b91e1c251ca8dc Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Fri, 15 Nov 2019 20:06:57 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=9A=84=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/homework_commons_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/homework_commons_controller.rb b/app/controllers/homework_commons_controller.rb
index a09db6308..94ced56fd 100644
--- a/app/controllers/homework_commons_controller.rb
+++ b/app/controllers/homework_commons_controller.rb
@@ -532,7 +532,7 @@ class HomeworkCommonsController < ApplicationController
               # 如果该发布规则 没有已发布的分班则需判断发布时间
               tip_exception("发布时间不能早于等于当前时间") if setting[:publish_time] <= strf_time(Time.now) && group_settings.group_published.count == 0
 
-              tip_exception("截止时间不能早于等于当前时间") if setting[:end_time] <= strf_time(Time.now)
+              tip_exception("截止时间不能早于等于当前时间") if setting[:end_time] <= strf_time(Time.now) && group_settings.none_end.count > 0
               tip_exception("截止时间不能早于发布时间") if setting[:publish_time] > setting[:end_time]
               tip_exception("截止时间不能晚于课堂结束时间（#{@course.end_date.end_of_day.strftime("%Y-%m-%d %H:%M")}）") if
                 @course.end_date.present? && setting[:end_time] > strf_time(@course.end_date.end_of_day)

From e8cc292b6dd36b627da5121ccc62c5e3dc5c2647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 15 Nov 2019 20:09:04 +0800
Subject: [PATCH 2/4] =?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/common/comments/CCommentItem.js     | 2 +-
 public/react/src/modules/tpm/SiderBar.js                    | 6 +++---
 public/react/src/modules/tpm/TPMIndexHOC.js                 | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/common/comments/CCommentItem.js b/public/react/src/modules/courses/common/comments/CCommentItem.js
index d17837411..ea98747cc 100644
--- a/public/react/src/modules/courses/common/comments/CCommentItem.js
+++ b/public/react/src/modules/courses/common/comments/CCommentItem.js
@@ -174,7 +174,7 @@ class CCommentItem extends Component{
 			// <div>{item.content} {item.user_info.user_name}</div>
 								
 			// src={getImageUrl(`images/${item.image_url}`)}
-			const imgSrc = (!item.user_info.user_image_url || item.user_info.user_image_url === '--') ? `${getUrl()}/images/edu_user/anony.png` : item.user_info.user_image_url;
+			const imgSrc = (!item.user_info.user_image_url || item.user_info.user_image_url === '--') ? `edu_user/anony.png` : item.user_info.user_image_url;
 			return (
 				<div className="comment_item_cont appraise df clearfix" key={item.id}>
 					<div className="J_Comment_Face fl">
diff --git a/public/react/src/modules/tpm/SiderBar.js b/public/react/src/modules/tpm/SiderBar.js
index 7cee11cf2..0ec01ba75 100644
--- a/public/react/src/modules/tpm/SiderBar.js
+++ b/public/react/src/modules/tpm/SiderBar.js
@@ -87,7 +87,7 @@ class SiderBar extends Component {
 
     render() {
         return (
-            <div className="-task-sidebar">
+					{this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?<div className="-task-sidebar">
                 <div className="gotop"  tooltips="返回顶部">
                     <a>
                         <i className="iconfont icon-shangjiantou color-white"></i>
@@ -129,8 +129,8 @@ class SiderBar extends Component {
                     </a>
                 </div>
 
-            </div>
-            );
+            </div>:""}
+				);
     }
 }
 
diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index 7b665ba0a..ef54b0ada 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -677,7 +677,10 @@ export function TPMIndexHOC(WrappedComponent) {
               {...this.state}
               {...this.dialogObj}
             />:""}
-            <SiderBar Headertop={Headertop}/>
+            <SiderBar
+							{...this.props}
+							{...this.state}
+							Headertop={Headertop}/>
             {/* 注释掉了1440 影响到了手机屏幕的展示 */}
 						<style>{
 							`

From 139ba4f5e3a2e8242d25a3219f86b75bb1cfdec1 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 20:13:06 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/exercise/Exercisesetting.js       |  1 +
 .../exercise/Testpapersettinghomepage.js      |  4 ++--
 .../courses/poll/PollDetailTabForthRules.js   | 19 ++++++++++++++++++-
 .../shixunHomework/ShixunHomeworkPage.js      |  2 +-
 .../shixunHomework/Trainingjobsetting.js      |  1 +
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Exercisesetting.js b/public/react/src/modules/courses/exercise/Exercisesetting.js
index 2190ac001..c7333824d 100644
--- a/public/react/src/modules/courses/exercise/Exercisesetting.js
+++ b/public/react/src/modules/courses/exercise/Exercisesetting.js
@@ -713,6 +713,7 @@ class Exercisesetting extends Component{
                                             course_group={course_group}
                                             flagPageEdit={flagPageEdit}
                                             rulesCheckInfo={(info)=>this.rulesCheckInfo(info)}
+																					Commonheadofthetestpaper
                                         ></PollDetailTabForthRules>
                                 }
                             </div>
diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index 1398e18c1..c848e8bb0 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -475,7 +475,7 @@ class Testpapersettinghomepage extends Component{
                     }
                     {
 
-                        parseInt(tab[0])==3 ? <WrappedExercisesetting {...this.props} {...this.state} triggerRef={this.bindRef}></WrappedExercisesetting>:""
+                        parseInt(tab[0])==3 ? <WrappedExercisesetting  Commonheadofthetestpaper={this.state.Commonheadofthetestpaper} {...this.props} {...this.state} triggerRef={this.bindRef}></WrappedExercisesetting>:""
                     }
                 </div>
             </div>
@@ -483,4 +483,4 @@ class Testpapersettinghomepage extends Component{
     }
 }
 
-export default Testpapersettinghomepage;
\ No newline at end of file
+export default Testpapersettinghomepage;
diff --git a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
index df3b06f99..90ec27cce 100644
--- a/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
+++ b/public/react/src/modules/courses/poll/PollDetailTabForthRules.js
@@ -478,7 +478,24 @@ class PollDetailTabForthRules extends Component{
                   {rule.p_timeflag===undefined?r > 0&&rule.publish_time===null?<Tooltip title="删除">
                       <a className="mr20" onClick={()=>this.removeRules(`${r}`)}><i className="iconfont icon-shanchu color-grey-9 font-18"></i></a>
                     </Tooltip>
-                    :"":
+                    :(
+											this.props.Commonheadofthetestpaper?
+												(this.props.Commonheadofthetestpaper.exercise_status===1&&r > 0?
+													<Tooltip title="删除">
+														<a className="mr20" onClick={()=>this.removeRules(`${r}`)}><i className="iconfont icon-shanchu color-grey-9 font-18"></i></a>
+													</Tooltip>
+													:"")
+												:this.props.teacherdatapage?
+												(
+													this.props.teacherdatapage.homework_status[0]==="未发布"&&r > 0?
+														<Tooltip title="删除">
+															<a className="mr20" onClick={()=>this.removeRules(`${r}`)}><i className="iconfont icon-shanchu color-grey-9 font-18"></i></a>
+														</Tooltip>
+														:""
+												):
+
+												""
+										):
 										r > 0 && rule.p_timeflag == false ?
                     <Tooltip title="删除">
                       <a className="mr20" onClick={()=>this.removeRules(`${r}`)}><i className="iconfont icon-shanchu color-grey-9 font-18"></i></a>
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
index d8440ed45..5073a6e9c 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
@@ -354,7 +354,7 @@ class ShixunHomeworkPage extends Component {
 						{parseInt(tab) === 0 ?<Listofworksstudentone    triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Listofworksstudentone>:""}
 						{parseInt(tab) === 1 ?<Workquestionandanswer  triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)} Showupdateinstructionsboolfalse={(i)=>this.Showupdateinstructionsboolfalse(i)}></Workquestionandanswer>:""}
 						{parseInt(tab) === 2 ?<ShixunStudentWork   triggerRef={this.bindRef} {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></ShixunStudentWork>:""}
-						{parseInt(tab) === 3 ?<Trainingjobsetting   triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>:""}
+						{parseInt(tab) === 3 ?<Trainingjobsetting  teacherdatapage={this.state.teacherdatapage}  triggerRef={this.bindRef}  {...this.props} {...this.state} Getdataback={(jobsettingsdata, teacherdata) => this.Getdataback(jobsettingsdata, teacherdata)}></Trainingjobsetting>:""}
 					</Spin>
 				</div>
 			</div>
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 1c218b734..0a76ae339 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -2503,6 +2503,7 @@ class Trainingjobsetting extends Component {
 											<PollDetailTabForthRules
 												{...this.props}
 												{...this.state}
+												teacherdatapage={this.props.teacherdatapage}
 												rules={rules}
 												moduleName={"作业"}
 												course_group={rulest}

From 51ca2bc59ae6fb97adc0ec4db4ec44bcba4e9fd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 15 Nov 2019 20:14:32 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/tpm/SiderBar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/tpm/SiderBar.js b/public/react/src/modules/tpm/SiderBar.js
index 0ec01ba75..3960e5805 100644
--- a/public/react/src/modules/tpm/SiderBar.js
+++ b/public/react/src/modules/tpm/SiderBar.js
@@ -87,7 +87,7 @@ class SiderBar extends Component {
 
     render() {
         return (
-					{this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?<div className="-task-sidebar">
+					this.props.mygetHelmetapi&&this.props.mygetHelmetapi.main_site===true?<div className="-task-sidebar">
                 <div className="gotop"  tooltips="返回顶部">
                     <a>
                         <i className="iconfont icon-shangjiantou color-white"></i>
@@ -129,7 +129,7 @@ class SiderBar extends Component {
                     </a>
                 </div>
 
-            </div>:""}
+            </div>:""
 				);
     }
 }