Merge branch 'master' of https://bdgit.educoder.net/Hjqreturn/educoder

public/react/src/modules/courses/busyWork/CommonWorkList.js

@@ -40,11 +40,15 @@ function getScoreTip(score, dom) {
 }
 function buildColumns(that, student_works) {
   let gotWorkGroup = false;
+  let gotProjectInfo = false;
   if (student_works) {
     student_works.forEach(item => {
       if (item.work_group) {
         gotWorkGroup = true
       }
+      if (item.project_info && item.project_info.name) {
+        gotProjectInfo = true;
+      }
     })
   }
   let courseId= that.props.match.params.coursesId;
@@ -136,6 +140,22 @@ function buildColumns(that, student_works) {
       ),
     })
   }
+  if (gotProjectInfo) {
+    columns.push({
+      width: 72,
+      title: '关联项目',
+      dataIndex: 'project_info',
+      key: 'project_info',
+
+      render: (project_info, record) => (
+        <span>
+          {project_info && project_info.name && <a href={`/projects/${project_info.id}`} target="_blank"  
+              className="overflowHidden1" style={{color:'#4CACFF', width: '80px', margin: '0 auto', display: 'block'}} title={project_info.name}
+          >{project_info.name}</a>}
+        </span>
+      ),
+    })
+  }
   columns = columns.concat([{
     width: 88,
     title: '提交状态',
@@ -176,7 +196,7 @@ function buildColumns(that, student_works) {
   }]) 
   if (!niPingAndIsStudent) {
     columns.push({
-      width: 72,
+      width: 70,
       title: '教师评分',
       key: 'teacher_score',
       dataIndex: 'teacher_score',
@@ -192,7 +212,7 @@ function buildColumns(that, student_works) {
     })
 
     columns.push({
-      width: 72,
+      width: 70,
       title: '助教评分',
       key: 'teaching_asistant_score',
       dataIndex: 'teaching_asistant_score',
@@ -251,7 +271,7 @@ function buildColumns(that, student_works) {
   
   if (that.state.anonymous_appeal) {
     columns.push({
-      width: 72,
+      width: 70,
       title: '匿评申诉',
       key: 'appeal_all_count',
       dataIndex: 'appeal_all_count',
@@ -271,7 +291,7 @@ function buildColumns(that, student_works) {
   }
   if (!niPingAndIsStudent) {
     columns.push({
-      width: 72,
+      width: 70,
       title: '最终成绩',
       key: 'work_score',
       dataIndex: 'work_score',

public/react/src/modules/courses/busyWork/reply/CommonWorkAppraiseReply.js

@@ -205,6 +205,7 @@ class CommonWorkAppraiseReply extends Component{
     const isAdmin = this.props.isAdmin()
 
     const isNiPing = homework_status && homework_status.indexOf('匿评中') != -1
+    const isGroup = this.props.isGroup()
     /**
       isAdmin || 评阅入口：超级管理员、老师和助教显示；  -》 改成admin也不显示
       匿评人：匿评期间显示
@@ -276,6 +277,7 @@ class CommonWorkAppraiseReply extends Component{
               showModulationtype={this.showModulationtype}
               addSuccess={this.addSuccess} ref={this.editorRef} totalCount={comment_scores.length}
               onReply={this.onReply} placeholder={"请在此输入对本作品的评语，最大限制2000个字符"}
+              showSameScore={isGroup}
             ></GraduationTasksappraiseMainEditor> }
           </div>
           {/* ${!!comment_scores.length ? 'bor-bottom-greyE' : ''} */}

public/react/src/modules/courses/common/comments/CCommentItem.js

@@ -329,7 +329,7 @@ class CCommentItem extends Component{
 										<div className="cl"></div>
 									</div>
 								</div>}
-								{!_content && <span className="color656565 mt2 color-grey-9 font-12 mr8">{"暂未写评语"}</span>}
+								{!_content && <span className="color656565 mt2 color-grey-9 font-12 mr8" style={{ display: 'inline-block'}}>{"暂未写评语"}</span>}
 								<div className="mt6">
 									{attachments && attachments.map((attaItem, key)=>{
 										return(

public/react/src/modules/courses/coursesDetail/CoursesBanner.js

@@ -458,7 +458,7 @@ class CoursesBanner extends Component {
 											{
 												`
 												.teachersbox{
-												  margin-right:28px !important;
+												  margin-right:22px !important;
 												}
 												`
 											}

public/react/src/modules/courses/coursesPublic/AccessoryModal.js

@@ -1,5 +1,5 @@
 import React,{ Component } from "react";
-import { Modal,Checkbox,Upload,Button,Icon,message} from "antd";
+import { Modal,Checkbox,Upload,Button,Icon,message,notification} from "antd";
 import { WordsBtn,getUrl, getUploadActionUrl} from 'educoder';
 import axios from 'axios';
 import Modals from '../../modals/Modals';
@@ -110,6 +110,7 @@ class AccessoryModal extends Component{
     this.props.Cancel()
   }
     Saves=()=>{
+
         let id=this.props.categoryid;
         let {fileList,description} =this.state;
 
@@ -131,10 +132,12 @@ class AccessoryModal extends Component{
           description:description,
           attachment_ids:newfileList
         }).then((result)=>{
-          console.log(result)
+
-          if(result !== undefined){
+					if(result.data.status===0){
-            this.props.setupdate()
+						debugger
-            this.props.showNotification('提交成功')
+						this.props.Cancel()
+						this.props.setupdate()
+
             // this.setState({
             //   Modalstype:true,
             //   Modalstopval:result.data.message,
@@ -142,9 +145,16 @@ class AccessoryModal extends Component{
             //   loadtype:true
             // })
 						this.ModalCancelModalCancel()
+
+						notification.open({
+							message: '提示',
+							description:
+								'提交成功'
+						});
 						if(this.props.seeworks!=undefined){
 							this.props.history.push(this.props.seeworks);
 						}
+
           }
         }).catch((error)=>{
 
@@ -170,10 +180,12 @@ class AccessoryModal extends Component{
       description:description,
       attachment_ids:newfileList
     }).then((result)=>{
-      console.log(result)
+
       if(result.data.status===0){
+      	debugger
+				this.props.Cancel()
         this.props.setupdate()
-        this.props.showNotification('提交成功')
+
         // this.setState({
         //   Modalstype:true,
         //   Modalstopval:result.data.message,
@@ -182,9 +194,15 @@ class AccessoryModal extends Component{
         // })
 
         this.ModalCancelModalCancel()
+				notification.open({
+					message: '提示',
+					description:
+						'提交成功'
+				});
         if(this.props.seeworks!=undefined){
           this.props.history.push(this.props.seeworks);
         }
+
       }
     }).catch((error)=>{
 

public/react/src/modules/courses/coursesPublic/AccessoryModal2.js

@@ -119,6 +119,7 @@ class AccessoryModal2 extends Component{
     }
   }
   Saves=()=>{
+  	debugger
     let {fileList,description} =this.state;
     let newfileList=[];
     for(var list of fileList){

public/react/src/modules/courses/exercise/ExerciseListItem.js

@@ -193,9 +193,9 @@ class ExerciseListItem extends Component{
                     {
                         IsStudent &&
                         <div className="homepagePostSetting" style={{"right":"0px","top":"62px","position":"absolute","display":"block"}}>
-                        {item.current_status ===0&&item.exercise_status>1? <li> <Link  className="btn colorblue" to={`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`}>继续答题</Link></li>:
+                        {item.current_status ===0&&item.exercise_status>1? <li> <Link  className="btn colorblue  font-16" to={`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`}>继续答题</Link></li>:
-                          item.current_status ===1&&item.exercise_status>1? <li> <Link  className="btn colorblue" to={`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`}>查看答题</Link></li>:
+                          item.current_status ===1&&item.exercise_status>1? <li> <Link  className="btn colorblue  font-16" to={`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`}>查看答题</Link></li>:
-                            item.current_status ===2&&item.exercise_status>1? <li> <a  className="btn colorblue ml20" onClick={()=>this.setgameexercise(`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`)}>开始答题</a></li>:""}
+                            item.current_status ===2&&item.exercise_status>1? <li> <a  className="btn colorblue ml20  font-16" onClick={()=>this.setgameexercise(`/courses/${coursesId}/exercises/${item.id}/users/${this.props.current_user.login}`)}>开始答题</a></li>:""}
                         </div>
                     }
                 </div>

public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js

@@ -178,6 +178,7 @@ class GraduateTaskItem extends Component{
              funlist={this.props.funlist}
            />:""}
 					{this.state.visibles===true?<AccessoryModal
+						{...this.props}
 						modalname={"补交附件"}
 						visible={this.state.visibles}
 						Cancelname={"取消"}

public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js

@@ -151,6 +151,7 @@ class GraduationTasksappraise extends Component{
 
 
           <AccessoryModal
+						{...this.props}
             modalname={"补交附件"}
             visible={visible}
             Cancelname={"取消"}

public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseMainEditor.js

@@ -26,7 +26,7 @@ class GraduationTasksappraiseMainEditor extends Component{
   onSubmit = () => {
     const { score, same_score } = this.state
     let category_id= this.props.match.params.category_id;    
-    const url = this.props.replyUrl || `/graduation_works/${category_id}/add_score.json` 
+    const url =  `/graduation_works/${category_id}/add_score.json` 
     const attachment_ids = this.state.fileList.map(item => {
       return item.response ? item.response.id : item.id
     })
@@ -153,7 +153,7 @@ class GraduationTasksappraiseMainEditor extends Component{
   }
   render(){
     let { total_count, comments, pageCount, fileList, score, same_score, errorMessage, numberErrorMessage } = this.state
-    const { current_user, memo, task_type, placeholder } = this.props
+    const { current_user, memo, showSameScore, placeholder } = this.props
     const isAdmin = this.props.isAdmin()
     const commentUploadProp = {
       width: 600,
@@ -205,7 +205,7 @@ class GraduationTasksappraiseMainEditor extends Component{
         {this.props.title && <span className="mainEditorTitle color-grey-6">{this.props.title}</span>}
         <TPMMDEditor ref={this.mdRef} mdID={'appraiseEditor'}  placeholder={placeholder || "请在此输入对本作品的评语，最大限制2000个字符"}
           watch={false} height={160} className={errorMessage ? 'editorInputError' : ''}></TPMMDEditor>
-        { task_type == 2 && <div>
+        { showSameScore == true && <div>
           <Checkbox value={same_score} onChange={this.same_score_change}>整组同评</Checkbox>
           <span className={"font-14 color-grey-9"}>(选中，则本次评阅对象指小组全部成员，否则仅评阅此成员1人 )</span>
         </div> }

public/react/src/modules/courses/graduation/tasks/GraduationTasksappraiseReplyChild.js

@@ -77,6 +77,7 @@ class GraduationTasksappraiseReplyChild extends Component{
 
 						{this.props.ultimate===true ? "": isAdmin && <GraduationTasksappraiseMainEditor {...this.props}
 								addSuccess={() => this.props.addSuccess()}
+								showSameScore={true}																																							
 							></GraduationTasksappraiseMainEditor> }
 				</div>
 

public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js

@@ -55,7 +55,7 @@ class GraduationTasksnew extends Component {
 		for (var list of fileList) {
 			listid.push(list.response.id)
 		}
-		if (GraduationTasksnewtype === true) {
+		// if (GraduationTasksnewtype === true) {
 			this.props.form.validateFields((err, values) => {
 				if (!err) {
 					if (values.tasktype === undefined) {
@@ -87,18 +87,20 @@ class GraduationTasksnew extends Component {
 							attachment_ids: listid,
 						}
 					).then((response) => {
-						if (response.status === 200) {
+						// if (response.status === 200) {
-							GraduationTasksnewtype = false;
+							// GraduationTasksnewtype = false;
 							// this.goback();
+						if(response!==undefined){
 							this.props.history.push("/courses/" + this.props.match.params.coursesId + "/graduation_tasks/" + this.props.match.params.category_id + "/" + response.data.task_id + "/setting");
 						}
+						// }
 					}).catch((error) => {
 						console.log(error)
 					})
 				}
 
 			});
-		}
+		// }
 	}
 
 
@@ -392,7 +394,7 @@ class GraduationTasksnew extends Component {
 									>
 										{getFieldDecorator('description', {
 											rules: [{
-												required: true, message: '请输入帖子内容',
+												required: true, message: '请输入内容',
 											}, {
 												max: 5000, message: '最大限制为5000个字符',
 											}],

public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js

@@ -944,6 +944,7 @@ class GraduationTaskssettinglist extends Component{
 					:""}
 
 					{this.state.avisible===true?<AccessoryModal
+						{...this.props}
 						modalname={"补交附件"}
 						visible={this.state.avisible}
 						Cancelname={"取消"}

public/react/src/modules/courses/graduation/tasks/Graduationtaskitem.js

@@ -15,7 +15,7 @@ class Graduationtaskitem extends Component{
 	}
 	render(){
 		let { item }=this.props;
-		const _content = this.parseCommentContent(item.content)
+		const _content = item.content && this.parseCommentContent(item.content)
 		return(
 			<div className="comment_item_cont df clearfix" key={item.id}>
 				<div className="J_Comment_Face fl">
@@ -48,12 +48,14 @@ class Graduationtaskitem extends Component{
 								</div>
 							</div>
 
-							<div className="comment_content  clearfix" id={`reply_content_${item.id}`}>
+							{!!_content && <div className="comment_content  clearfix" id={`reply_content_${item.id}`}>
 								<div className="color-grey-3" id={`reply_content_${item.id}`}>
 									<div  className={"break_word_comments"} dangerouslySetInnerHTML={{__html: _content}}></div>
 									<div className="cl"></div>
 								</div>
-							</div>
+							</div>}
+							{!_content && <span className="color656565 mt2 color-grey-9 font-12 mr8" style={{ display: 'inline-block'}}>{"暂未写评语"}</span>}
+
 							<div className="childrenCommentsView">
 								{(item && item.children && item.children.length) ? <div className="trangle"></div>: ''}
 								{this.renderChildenComments(item)}

public/react/src/modules/courses/shixunHomework/CommitSummary.js

@@ -151,7 +151,8 @@ class CommitSummary extends Component{
                                       <Form labelCol={{span: 5}}layout='vertical' onSubmit={this.handleSubmit}  wrapperCol={{span: 12}}>
                                           <Form.Item
                                           >
-                                              <div style={{ "background": "#fff","padding-bottom":"20px","padding-left":"20px","padding-right":"20px"}}>
+                                              <div style={{ "background": "#fff","padding-bottom":"20px","padding-left":"20px","padding-right":"20px"}}
+                                                   className="mdInForm">
                                                   {getFieldDecorator('description', {
                                                       rules: [{
                                                           required: true, message: '请输入帖子内容',

public/react/src/modules/tpm/SiderBar.js

@@ -106,7 +106,7 @@ class SiderBar extends Component {
                 <span className="inline"><i className="iconfont icon-erweima color-white font-22 fl"></i></span>
                 <p className="scan_ewm" style={{display: 'none', right:' 75px',opacity: '0'}}>
                   <p className="pr padding10">
-                    <img src={getImageUrl("images/edu_user/EWM.jpg")} width="158px" height="158px" />
+                    <img src={getImageUrl("images/educoder/EWM.jpg")} width="158px" height="158px" />
                       <p>微信扫一扫</p>
                       <p>关注公众号</p>
                       <span className="trangle_right"></span>