From cd865a5a89875dddc1533fcfbcdd7a55077a2008 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, 20 Mar 2020 13:20:03 +0800
Subject: [PATCH 1/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

---
 public/react/src/common/util/ShareUtil.js                 | 2 +-
 public/react/src/modules/courses/poll/PollNewQuestbank.js | 2 +-
 public/react/src/modules/message/js/MessagSub.js          | 4 ++--
 public/react/src/modules/tpm/NewHeader.js                 | 6 +++---
 public/react/src/modules/tpm/component/TPMRightSection.js | 2 +-
 public/react/src/modules/user/usersInfo/Infos.js          | 2 +-
 public/react/src/modules/user/usersInfo/InfosBanner.js    | 2 +-
 public/react/src/modules/user/usersInfo/banner_out.js     | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/public/react/src/common/util/ShareUtil.js b/public/react/src/common/util/ShareUtil.js
index a85c37c4a..f0ce13996 100644
--- a/public/react/src/common/util/ShareUtil.js
+++ b/public/react/src/common/util/ShareUtil.js
@@ -110,7 +110,7 @@ export function configShareForCourses () {
         var shareData = {
             title: 'EduCoder - 教学课堂',
             desc: '自动评测实训任务，支持技能统计，提供教学活动分析报告，减轻教师和助教的辅导压力，免去作业发布和批改的困扰，实时了解学生学习情况，全面提升教师施教效率和水平。',
-            link: `${host}/courses`,
+            link: `${host}/classrooms`,
             imgUrl: window.__testImageUrl
                 || host + '/react/build/images/share_logo_icon.jpg'
         };
diff --git a/public/react/src/modules/courses/poll/PollNewQuestbank.js b/public/react/src/modules/courses/poll/PollNewQuestbank.js
index 58aa916c4..a1476125c 100644
--- a/public/react/src/modules/courses/poll/PollNewQuestbank.js
+++ b/public/react/src/modules/courses/poll/PollNewQuestbank.js
@@ -2763,7 +2763,7 @@ class PollNewQuestbank extends Component {
 		//
 		// let courseId=this.props.match.params.coursesId;
 		// if(courseId===undefined){
-		// 	this.props.history.push("/courses");
+		// 	this.props.history.push("/classrooms");
 		// }else{
 		// 	this.props.history.push(this.props.current_user.first_category_url);
 		// }
diff --git a/public/react/src/modules/message/js/MessagSub.js b/public/react/src/modules/message/js/MessagSub.js
index 822f7b8fe..e87dcac3d 100644
--- a/public/react/src/modules/message/js/MessagSub.js
+++ b/public/react/src/modules/message/js/MessagSub.js
@@ -272,13 +272,13 @@ class MessagSub extends Component {
 				return window.open(`/forums/`);
 			case "Watcher" :
 				// 用户个人中心页 :id = item.trigger_user.login
-				return window.open(`/users/${item.trigger_user.login}/courses`)
+				return window.open(`/users/${item.trigger_user.login}/classrooms`)
 			case "PraiseTread" :
 				// 这块太复杂 不好处理
 				return '';
 			case "Grade" :
 				//个人中心页 :id = item.trigger_user.login
-				// return window.open(`/users/${item.trigger_user.login}/courses`;
+				// return window.open(`/users/${item.trigger_user.login}/classrooms`;
 				return "";
 			case "JoinProject" :
 				//项目详情-申请加入项目审核页 :id = container_id
diff --git a/public/react/src/modules/tpm/NewHeader.js b/public/react/src/modules/tpm/NewHeader.js
index 0d3f1d392..1678703d6 100644
--- a/public/react/src/modules/tpm/NewHeader.js
+++ b/public/react/src/modules/tpm/NewHeader.js
@@ -1123,15 +1123,15 @@ class NewHeader extends Component {
             <a href={"/register"} className="mr5 color-white">注册</a>
           </span> :
             <div className="fr edu-menu-panel mr25" style={{ height: '60px' }}>
-              <a href={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`} className="fl ml15">
+              <a href={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/classrooms`} className="fl ml15">
                 <img alt="头像" className="radius mt13" height="34" id="nh_user_logo" name="avatar_image"
                   src={getImageUrl(`images/` + user.image_url)} width="34">
                 </img>
               </a>
               <ul className="edu-menu-list" style={{ top: '60px' }}>
                 {/*<span className="bor-bottom-greyE currentName task-hide">{user.username}</span>*/}
-                <li><Link to={`/users/${this.props.current_user.login}/courses`}>我的个人主页</Link></li>
-                {coursestypes === true ? "" : <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/courses`}>{this.props.user && this.props.user.main_site === false ? "我的课堂" : "我的教学课堂"}</Link></li>}
+                <li><Link to={`/users/${this.props.current_user.login}/classrooms`}>我的个人主页</Link></li>
+                {coursestypes === true ? "" : <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/classrooms`}>{this.props.user && this.props.user.main_site === false ? "我的课堂" : "我的教学课堂"}</Link></li>}
                 {/* p 老师  l 学生 */}
                 {shixuntype === true ? "" : <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/shixuns`}>我的实训项目</Link></li>}
                 {pathstype === true ? "" : <li><Link to={`/users/${this.props.current_user === undefined ? "" : this.props.current_user.login}/paths`}>{this.props.user && this.props.user.main_site === false ? "我的课程" : "我的实践课程"}</Link></li>}
diff --git a/public/react/src/modules/tpm/component/TPMRightSection.js b/public/react/src/modules/tpm/component/TPMRightSection.js
index 6b25635c8..8267a9645 100644
--- a/public/react/src/modules/tpm/component/TPMRightSection.js
+++ b/public/react/src/modules/tpm/component/TPMRightSection.js
@@ -86,7 +86,7 @@ class TPMRightSection extends Component {
                 <p className="font-16 mb20"><i className={"iconfont icon-chuangjianzhe1 audit_situationactive font-14"}></i>  创建者</p>
                 <div className="df">
                   <a
-                    href={TPMRightSectionData === undefined ? "" : TPMRightSectionData.creator === undefined ? "" : `/users/${TPMRightSectionData.creator.login}/courses`}>
+                    href={TPMRightSectionData === undefined ? "" : TPMRightSectionData.creator === undefined ? "" : `/users/${TPMRightSectionData.creator.login}/classrooms`}>
                     <img alt="头像" className="radius mr10" height="36"
                          src={getImageUrl(TPMRightSectionData === undefined ? "" : TPMRightSectionData.creator === undefined ? "" : 'images/' + TPMRightSectionData.creator.image_url + "?1532489442")}
                          width="36"/>
diff --git a/public/react/src/modules/user/usersInfo/Infos.js b/public/react/src/modules/user/usersInfo/Infos.js
index dc999d228..376721d8b 100644
--- a/public/react/src/modules/user/usersInfo/Infos.js
+++ b/public/react/src/modules/user/usersInfo/Infos.js
@@ -274,7 +274,7 @@ class Infos extends Component{
 
             {/* 课堂 */}
             {/* http://localhost:3007/courses/1309/homework/9300/setting */}
-          <Route exact path="/users/:username/courses"
+          <Route exact path="/users/:username/classrooms"
                  render={
                 (props) => (<InfosCourse {...this.props} {...props} {...this.state} {..._commonProps}/>)
               }
diff --git a/public/react/src/modules/user/usersInfo/InfosBanner.js b/public/react/src/modules/user/usersInfo/InfosBanner.js
index e7d695d71..049974810 100644
--- a/public/react/src/modules/user/usersInfo/InfosBanner.js
+++ b/public/react/src/modules/user/usersInfo/InfosBanner.js
@@ -120,7 +120,7 @@ class InfosBanner extends Component{
 						{coursestypes===true?"":<li className={`${moduleName == 'classrooms' ||moduleName == undefined ? 'active' : '' }`}>
               <Link
                 onClick={() => this.setState({moduleName: 'classrooms'})}
-                to={`/users/${username}/courses`}>教学课堂</Link>
+                to={`/users/${username}/classrooms`}>教学课堂</Link>
             </li>}
 						{shixuntype===true?"":<li className={`${moduleName == 'shixuns' ? 'active' : '' }`}>
               <Link
diff --git a/public/react/src/modules/user/usersInfo/banner_out.js b/public/react/src/modules/user/usersInfo/banner_out.js
index 33a34ede8..72b36420f 100644
--- a/public/react/src/modules/user/usersInfo/banner_out.js
+++ b/public/react/src/modules/user/usersInfo/banner_out.js
@@ -153,7 +153,7 @@ class banner_out extends Component{
                   <li className={`${moduleName == 'classrooms' ||moduleName == undefined ? 'active' : '' }`}>
                     <Link
                       onClick={() => this.setState({moduleName: 'classrooms'})}
-                      to={`/users/${username}/courses`}>课堂</Link>
+                      to={`/users/${username}/classrooms`}>课堂</Link>
                   </li>
                   <li className={`${moduleName == 'shixuns' ? 'active' : '' }`}>
                     <Link

From ae93f94e2cb46a88fd5d1c52015372ade0bf2c42 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, 20 Mar 2020 13:58:56 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AD=A6=E7=94=9F?=
 =?UTF-8?q?=E7=AD=BE=E5=88=B0=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/signin/component/Teacherentry.js  | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/courses/signin/component/Teacherentry.js b/public/react/src/modules/courses/signin/component/Teacherentry.js
index 070fa6bb7..b8f2cf526 100644
--- a/public/react/src/modules/courses/signin/component/Teacherentry.js
+++ b/public/react/src/modules/courses/signin/component/Teacherentry.js
@@ -125,6 +125,15 @@ class Teacherentry extends Component {
 								</div>
 							</div>
 
+							<style>
+								{
+									`
+									.initials{
+									cursor: initial !important;
+									}
+									`
+								}
+							</style>
 							<div className="ws20s sortinxdirection">
 								{
 									isAdmin === true ?
@@ -158,9 +167,12 @@ class Teacherentry extends Component {
 																	<div className="qiandaobutton xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.Signin(item.mode,item.id,item.attendance_code)}}>
 																		签到
 																	</div>
-																	:
-																	item.attendance_status==="NORMAL"?
-																		<div className="qiandaobutton" >
+																	: item.attendance_status === "LEAVE" ?
+																	<div className="qjqiandao initials">
+																		请假
+																	</div>
+																	: item.attendance_status==="NORMAL"?
+																		<div className="zcqiandao initials">
 																			正常签到
 																		</div>
 																		:""
@@ -175,15 +187,15 @@ class Teacherentry extends Component {
 													{
 														item.attendance_status?
 															item.attendance_status === "NORMAL" ?
-																<div className="zcqiandao xiaoshou">
+																<div className="zcqiandao initials">
 																	正常签到
 																</div>
 																: item.attendance_status === "LEAVE" ?
-																<div className="qjqiandao xiaoshou">
+																<div className="qjqiandao initials">
 																	请假
 																</div>
 																: item.attendance_status === "ABSENCE" ?
-																	<div className="kkqiandao xiaoshou">
+																	<div className="kkqiandao initials">
 																		旷课
 																	</div>
 																	:

From b8c6913f5d497feafe5782f199684c077075933f 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, 20 Mar 2020 16:26:42 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AD=BE=E5=88=B0?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/signin/component/Teacherentry.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/signin/component/Teacherentry.js b/public/react/src/modules/courses/signin/component/Teacherentry.js
index b8f2cf526..228e25334 100644
--- a/public/react/src/modules/courses/signin/component/Teacherentry.js
+++ b/public/react/src/modules/courses/signin/component/Teacherentry.js
@@ -163,7 +163,7 @@ class Teacherentry extends Component {
 													{
 														item.attendance_status?
 															(
-																item.attendance_status==="ABSENCE"?
+																item.attendance_status==="ABSENCE"&&item.attendance_mode!="TEACHER"?
 																	<div className="qiandaobutton xiaoshou" onClick={(e)=>{e.stopPropagation();this.props.Signin(item.mode,item.id,item.attendance_code)}}>
 																		签到
 																	</div>