From a62e539a834cf9ca5e5587247cc6ba7c1b5ec1ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Tue, 24 Mar 2020 15:13:46 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=86=E9=A2=91=E6=B7=BB=E5=8A=A0zoom=20?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/Video/Live.js   |  56 ++++++++++++++----
 .../src/modules/courses/Video/LiveNew.js      |   6 +-
 .../src/modules/courses/Video/VideoIndex.js   |   8 ++-
 .../src/modules/courses/Video/images/zoom.png | Bin 0 -> 3403 bytes
 .../question/questioncss/questioncom.css      |   2 +-
 5 files changed, 54 insertions(+), 18 deletions(-)
 create mode 100755 public/react/src/modules/courses/Video/images/zoom.png

diff --git a/public/react/src/modules/courses/Video/Live.js b/public/react/src/modules/courses/Video/Live.js
index d869922fb..a7b7f6890 100644
--- a/public/react/src/modules/courses/Video/Live.js
+++ b/public/react/src/modules/courses/Video/Live.js
@@ -9,6 +9,7 @@ import bilibili from './images/bilibili.png';
 import tencent from './images/tencent.png';
 import WeiBaiTong from './images/WeiBaiTong.png';
 import douyu from './images/douyu.jpg';
+import zoom from './images/zoom.png';
 class Live extends Component{
 
    render(){
@@ -16,32 +17,65 @@ class Live extends Component{
 
       return(
        <div className="livePanel">
+				 <style>
+					 {
+					 	`
+					 	.verticallayout{
+						display: flex;
+						 flex-direction:column;
+						}
+						
+						.myspacearound{
+						display: flex;
+						justify-content: space-around;
+						}
+						.mr0{
+						margin-right: 0px !important;
+						}
+						.mr5{
+						margin-right: 5px !important;
+						}
+						.ml0{
+						margin-left: 0px !important;
+						}
+					 	`
+					 }
+				 </style>
           <p className="mt30 mb10 color-grey-9 pl10">EduCoder支持所有第三方直播平台，特别推荐：</p>
-          <ul className="platform">
-            <li>
+          <ul className="platform myspacearound">
+            <li className="verticallayout mr0">
               <a href="https://ke.qq.com/act/speed_pc/index.html?from=800021837" target="_blank"><img alt="" src={tencent} className="mr8" width="28px"/>
               <label className="color-grey-3 pointer">腾讯课堂</label>
               </a>
-              <a href="https://pub.idqqimg.com/pc/misc/files/20200204/2e4cb765bef54f0c919c0ab8ab79d969.pdf" target="_blank" className="color-blue ml20">(简明手册)</a>
+              <a href="https://pub.idqqimg.com/pc/misc/files/20200204/2e4cb765bef54f0c919c0ab8ab79d969.pdf" target="_blank" className="color-blue ml0">(简明手册)</a>
             </li>
-            <li>
+            <li className="verticallayout mr0">
               <a href="https://live.bilibili.com/liveHime?visit_id=a81rbm7v2kk0" target="_blank"><img alt="" src={bilibili} className="mr8" width="52px"/>
               <label className="color-grey-3 pointer">哔哩哔哩</label>
               </a>
-              <a href="https://www.bilibili.com/blackboard/live/broadcast-intro.html#/" target="_blank" className="color-blue ml20">(简明手册)</a>
+              <a href="https://www.bilibili.com/blackboard/live/broadcast-intro.html#/" target="_blank" className="color-blue ml0">(简明手册)</a>
             </li>
-            <li>
+            <li className="verticallayout mr0">
               <a href="https://www.douyu.com/" target="_blank"><img alt="" src={douyu} className="mr8" width="28px"/>
               <label className="color-grey-3 pointer">斗鱼</label>
               </a>
-              <a href="https://www.douyu.com/special/guide/anchor" target="_blank" className="color-blue ml20">(简明手册)</a>
+              <a href="https://www.douyu.com/special/guide/anchor" target="_blank" className="color-blue ml0">(简明手册)</a>
             </li>
-            <li>
-              <div><img alt="" src={WeiBaiTong} className="mr8" width="28px"/>
+            <li className="verticallayout mr0">
+              <div>
+								<img alt="" src={WeiBaiTong} className="mr8" width="28px"/>
                 <label className="color-grey-3">威佰通</label>
               </div>
-              <a href="https://www.educoder.net/forums/3734" target="_blank" className="color-blue ml20">(简明手册)</a>
+              <a href="https://www.educoder.net/forums/3734" target="_blank" className="color-blue ml0">(简明手册)</a>
             </li>
+						<li className="verticallayout mr0">
+							<a href="https://zoom.com.cn/download" target="_blank"><img alt="" src={zoom} className="mr8" width="63px"/>
+								<label className="color-grey-3" style={{
+									cursor:"pointer"
+								}}>zoom</label>
+							</a>
+							<a href="https://support.zoom.us/hc/zh-cn/articles/201362033-Windows%E5%92%8CMAC%E5%85%A5%E9%97%A8%E6%8C%87%E5%8D%97" target="_blank" className="color-blue ml0">(简明手册)</a>
+						</li>
           </ul>
           {
             lives && lives.length > 0 ?
@@ -79,4 +113,4 @@ class Live extends Component{
      )
    }
 }
-export default Live;
\ No newline at end of file
+export default Live;
diff --git a/public/react/src/modules/courses/Video/LiveNew.js b/public/react/src/modules/courses/Video/LiveNew.js
index e95400ed0..2c10bfe32 100644
--- a/public/react/src/modules/courses/Video/LiveNew.js
+++ b/public/react/src/modules/courses/Video/LiveNew.js
@@ -9,7 +9,7 @@ import axios from 'axios';
 
 const { TextArea } = Input;
 const { Option  } = Select;
-const array=['腾讯课堂','斗鱼直播','Bilibili','威佰通'];
+const array=['腾讯课堂','斗鱼直播','Bilibili','威佰通','zoom'];
 
 function range(start, end) {
   const result = [];
@@ -290,7 +290,7 @@ class LiveNew extends Component{
                   <TextArea rows={4} placeholder="可在此介绍开播具体事项，如开播时间安排等。" />
                 )}
               </Form.Item>
-              
+
             </Form>
             <div className="clearfix mt30 edu-txt-center">
               <a onClick={this.cancelNew} className="task-btn mr30">取消</a>
@@ -303,4 +303,4 @@ class LiveNew extends Component{
   }
 }
 const WrappedLiveNew = Form.create({name: 'LiveNew'})(LiveNew);
-export default WrappedLiveNew;
\ No newline at end of file
+export default WrappedLiveNew;
diff --git a/public/react/src/modules/courses/Video/VideoIndex.js b/public/react/src/modules/courses/Video/VideoIndex.js
index 0815bc8aa..c6d736824 100644
--- a/public/react/src/modules/courses/Video/VideoIndex.js
+++ b/public/react/src/modules/courses/Video/VideoIndex.js
@@ -299,8 +299,7 @@ class VideoIndex extends Component {
 		const flag = parseInt(course_identity) < 5;
 		const newOperation = flag;
 		const new_upload = flag && (is_teacher && this.props.checkIfProfessionalCertification());
-
-
+		let isAdmin = this.props&&this.props.isAdmin();
 
 		return (
 			<React.Fragment>
@@ -404,7 +403,10 @@ class VideoIndex extends Component {
 
 											</React.Fragment>
 											:
-											<WordsBtn style="blue" className="font-16 ml30" onClick={this.liveSetting}>添加直播</WordsBtn>
+											isAdmin===true?
+												<WordsBtn style="blue" className="font-16 ml30" onClick={this.liveSetting}>添加直播</WordsBtn>
+												:
+												""
 									}
 								</li>
 							</div>
diff --git a/public/react/src/modules/courses/Video/images/zoom.png b/public/react/src/modules/courses/Video/images/zoom.png
new file mode 100755
index 0000000000000000000000000000000000000000..67880716191443a1ae96c009d925b30f0ff9ec91
GIT binary patch
literal 3403
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

literal 0
HcmV?d00001

diff --git a/public/react/src/modules/question/questioncss/questioncom.css b/public/react/src/modules/question/questioncss/questioncom.css
index cfe92fdeb..1f4e75f9e 100644
--- a/public/react/src/modules/question/questioncss/questioncom.css
+++ b/public/react/src/modules/question/questioncss/questioncom.css
@@ -428,7 +428,7 @@
     color: #4CACFF;
 }
 .xiaoshou{
-    cursor:pointer !important;
+    cursor:√ !important;
 }
 .xiaoshout{
     cursor:default !important;

From e7fb988db55e226ee0c0aac65d88d98f628e75d2 Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 24 Mar 2020 15:41:03 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=AD=94=E9=A2=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=BE=85=E6=89=B9=E9=98=85?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/exercises_helper.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/helpers/exercises_helper.rb b/app/helpers/exercises_helper.rb
index 1887aee5a..26a9aa9ec 100644
--- a/app/helpers/exercises_helper.rb
+++ b/app/helpers/exercises_helper.rb
@@ -714,9 +714,9 @@ module ExercisesHelper
     end
     teacher_review = ex_user.subjective_score < 0.0 ? false : true
     if (user_status == 0 && commit_status == 1) || (user_status == 1 && ex_user_exercise_status == 3 && commit_status == 1)  #老师都可以看，学生，需在试卷已提交，且已截止的情况下看
-      ex_object_score = ex_user.objective_score < 0.0 ? 0.0 : ex_user.objective_score.round(1).to_s
+      ex_object_score = ex_user.objective_score <= 0.0 ? 0 : ex_user.objective_score.round(1).to_s
       ex_subject_score = ex_user.subjective_score < 0.0 ? nil : ex_user.subjective_score.round(1).to_s
-      score = ex_user.score.present? ? ex_user.score.round(1).to_s : 0.0.to_s
+      score = ex_user.score.present? && ex_user.score > 0.0 ? ex_user.score.round(1).to_s : 0.to_s
     else
       ex_object_score = nil
       ex_subject_score = nil

From ad43667c941b882298111f6a02da97c45f02412e Mon Sep 17 00:00:00 2001
From: cxt <853663049@qq.com>
Date: Tue, 24 Mar 2020 15:48:07 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=AD=94=E9=A2=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=BE=85=E6=89=B9=E9=98=85?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/helpers/exercises_helper.rb b/app/helpers/exercises_helper.rb
index 26a9aa9ec..b57c8525b 100644
--- a/app/helpers/exercises_helper.rb
+++ b/app/helpers/exercises_helper.rb
@@ -715,7 +715,7 @@ module ExercisesHelper
     teacher_review = ex_user.subjective_score < 0.0 ? false : true
     if (user_status == 0 && commit_status == 1) || (user_status == 1 && ex_user_exercise_status == 3 && commit_status == 1)  #老师都可以看，学生，需在试卷已提交，且已截止的情况下看
       ex_object_score = ex_user.objective_score <= 0.0 ? 0 : ex_user.objective_score.round(1).to_s
-      ex_subject_score = ex_user.subjective_score < 0.0 ? nil : ex_user.subjective_score.round(1).to_s
+      ex_subject_score = ex_user.subjective_score < 0.0 ? nil : (ex_user.subjective_score > 0.0 ? ex_user.subjective_score.round(1).to_s : 0)
       score = ex_user.score.present? && ex_user.score > 0.0 ? ex_user.score.round(1).to_s : 0.to_s
     else
       ex_object_score = nil