Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/models/poll.rb

@@ -104,7 +104,7 @@ class Poll < ApplicationRecord
       status = 4
     else
       if user.present? && user.student_of_course?(course)
-        ex_time = get_poll_times(user_id,false)
+        ex_time = get_poll_times(user.id,false)
         pb_time = ex_time[:publish_time]
         ed_time = ex_time[:end_time]
         if pb_time.present? && ed_time.present? && pb_time <= Time.now && ed_time > Time.now

app/views/users/homepage_info.json.jbuilder

@@ -1,6 +1,6 @@
 json.id @user.id
 json.name @user.full_name
-json.avatar_url url_to_avatar(@user)
+json.avatar_url image_tag("/" + url_to_avatar(@user))
 json.is_logged_user @user.logged_user?
 json.experience @user.experience
 json.grade @user.grade

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

@@ -992,7 +992,7 @@ class GraduationTaskssettingapp extends Component{
                 }
                 {/*内容*/}
                 {task_type===2?<div className="stud-class-set bor-bottom-greyE pd20 edu-back-white pl30" >
-                    <div className={"xingrequired font-16 color-dark h20 mb20"}>分组设置 <span className={"font-14 color-grey-c"}>（提交作品时需要关联同组成员，组内成员作品共享）</span></div>
+                    <div className={"xingrequired font-16 color-dark h20 mb20"}>分组设置 <span className={"font-14 color-grey-c"}></span></div>
                     <div className={"mb30 h20 ml40"}>
                       <Input className={numtype===true?"noticeTip mr20":"mr20"} style={{ width:"100px" }} value={minnum}  onInput={this.setminnum}  disabled={this.props.isAdmin()===true?flagPageEdit===true?false:true:true}/>
                       <span className="mr20">~</span>

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

@@ -3231,7 +3231,7 @@ class Listofworksstudentone extends Component {
 
 												 <div className="fr mr5 search-newysl" style={{marginBottom: '1px'}}>
 													 {course_is_end===true?"":<span>
-										{teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true?
+										{teacherdata&&teacherdata.update_score===true&&computeTimetype===true?
 											(this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTimet}>
 												查看最新成绩
 											</div>:""):
@@ -3555,9 +3555,13 @@ class Listofworksstudentone extends Component {
 																			{	course_is_end===true?"":teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
 													{computeTimetype===true?
 														(this.props.isNotMember()===false?
-															<div className={"computeTime font-16"} onClick={this.setComputeTime}>
+															(
-																查看最新成绩
+																teacherdata&&teacherdata.update_score===true?
-															</div>
+																	<div className={"computeTime font-16"} onClick={this.setComputeTime}>
+																		查看最新成绩
+																	</div>
+																	:""
+															)
 															:"")
 														:
 														(teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
@@ -3783,9 +3787,15 @@ class Listofworksstudentone extends Component {
 																			<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
 																			{	course_is_end===true?"":teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
 																{computeTimetype===true?
-																	(this.props.isNotMember()===false?<div className={"computeTime font-16"} onClick={this.setComputeTime}>
+
-																		查看最新成绩
+																	(this.props.isNotMember()===false?
-																	</div>:""):
+																		(
+																			teacherdata&&teacherdata.update_score===true?
+																				<div className={"computeTime font-16"} onClick={this.setComputeTime}>
+																					查看最新成绩
+																				</div>:""
+																		)
+																		:""):
 																	teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "":
 																		(this.props.isNotMember()===false?<div className={"computeTimes font-16"}>
 																			查看最新成绩

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

@@ -1699,16 +1699,66 @@ class Trainingjobsetting extends Component {
                 if(this.state.allowreplenishment === false){
                     whethertopays=false;
                 }
-                this.setState({
+                if(this.state.jobsettingsdata!==undefined){
-                    flagPageEditsbox:true,
+                    
-                    flagPageEdit: true,
+                }
-                    whethertopay:whethertopays,
+
-                    flagPageEditstwo:releasetime,
+                try {
-                    flagPageEditsthrees:deadline,
+                    if(this.state.jobsettingsdata&& this.state.jobsettingsdata.data.homework_status[0]==="未发布"){
-                    flagPageEditsfor:endtime,
+                        this.setState({
-                    completionefficiencyscore:true,
+                            flagPageEditsbox:true,
-                    unifiedsetting:this.state.unifiedsetting,
+                            flagPageEdit: true,
-                })
+                            whethertopay:whethertopays,
+                            flagPageEditstwo:releasetime,
+                            flagPageEditsthrees:deadline,
+                            flagPageEditsfor:endtime,
+                            completionefficiencyscore:true,
+                            work_efficiencys:true,
+                            unifiedsetting:this.state.unifiedsetting,
+                            latedeductiontwo:20,
+                        });
+                    }else {
+                        this.setState({
+                            flagPageEditsbox:true,
+                            flagPageEdit: true,
+                            whethertopay:whethertopays,
+                            flagPageEditstwo:releasetime,
+                            flagPageEditsthrees:deadline,
+                            flagPageEditsfor:endtime,
+
+                            unifiedsetting:this.state.unifiedsetting,
+                        });
+                        if(this.state.work_efficiencys===true){
+                            this.setState({
+                                completionefficiencyscore:true,
+                            })
+                        }else{
+                            this.setState({
+                                completionefficiencyscore:false,
+                            })
+                        }
+                    }
+                }catch (e) {
+                    this.setState({
+                        flagPageEditsbox:true,
+                        flagPageEdit: true,
+                        whethertopay:whethertopays,
+                        flagPageEditstwo:releasetime,
+                        flagPageEditsthrees:deadline,
+                        flagPageEditsfor:endtime,
+                        unifiedsetting:this.state.unifiedsetting,
+                    });
+                    if(this.state.work_efficiencys===true){
+                        this.setState({
+                            completionefficiencyscore:true,
+                        })
+                    }else{
+                        this.setState({
+                            completionefficiencyscore:false,
+                        })
+                    }
+                }
+
                if(this.state.proportion === "自定义分值"){
                    this.setState({
                        boolUnitetwoname:"自定义分值",