Merge branches 'dev_aliyun' and 'jingsai01ysl' of https://bdgit.educoder.net/Hjqreturn/educoder into jingsai01ysl

app/helpers/courses_helper.rb

@@ -63,6 +63,8 @@ module CoursesHelper
       "/courses/#{course.id}/boards/#{course_board.id}"
     when "course_group"
       "/courses/#{course.id}/course_groups"
+    when "statistics"
+      "/courses/#{course.id}/statistics"
     end
   end
 

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

@@ -1017,7 +1017,6 @@ class Coursesleftnav extends Component{
                     return(
                         <div key={key} 	>
                             <a>
-															{item.type != "statistics" ?
 																<li title={item.name.length<7?"":item.name} onClick={(e)=>this.showsandians(e,key,item.category_url,1,item.id,item.type)} className={this.props.mainurl===item.category_url&&this.props.location.pathname===item.category_url?"liactive":"clearfix active"} onMouseLeave={(e)=>this.hidesandian(e,key)} onMouseEnter={(e)=>this.showsandian(e,key)}>
 																	<a onClick={(e)=>this.showsandians(e,key,item.category_url,1,item.id,item.type)} className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}>
 																		{
@@ -1051,7 +1050,7 @@ class Coursesleftnav extends Component{
 
 																		</Popover>:""}
 																	</a>
-																</li> : ""}
+																</li>
 
                             {/*下拉列表*/}
 
@@ -1154,8 +1153,8 @@ class Coursesleftnav extends Component{
                return(
                  <div key={key}>
                    {/*<Tooltip placement="bottom" title={"点击空白处展开二级菜单，点击模块名字跳转到对应模块"}>*/}
-                   <a >
-										 {item.type != "statistics" ?
+                   <a>
+
 											 <li className={this.props.mainurl===item.category_url&&this.props.location.pathname===item.category_url?"liactive":"clearfix active"}
 													 onClick={(e)=>this.setnavid(e,key,item.id,item.type,item.category_url)} onMouseEnter={(e)=>this.showsandian(e,key)}
 													 title={item.name.length<7?"":item.name}
@@ -1172,14 +1171,15 @@ class Coursesleftnav extends Component{
 																					 item.type==="poll"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-wenjuan mr10 fl":"iconfont icon-wenjuan mr10 fl"}></i>:
 																						 item.type==="attachment"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-ziyuan mr10 fl":"iconfont icon-ziyuan mr10 fl"}  ></i>:
 																							 item.type==="board"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-taolun mr10 fl":"iconfont icon-taolun mr10 fl"}  ></i>:
-																								 item.type==="course_group"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenban mr10 fl":"iconfont icon-fenban mr10 fl"}  ></i>:""
+																								 item.type==="course_group"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenban mr10 fl":"iconfont icon-fenban mr10 fl"}  ></i>:
+														 												item.type==="statistics"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-tongji mr10 fl":"iconfont icon-tongji mr10 fl"}  ></i>:""
 													 }
 
 													 <span className={this.props.location.pathname===item.category_url?"color-blue task-hide activity-left-name":"task-hide activity-left-name"} onClick={(e)=>this.selectnavid(e,key,item.id,item.type,item.category_url)}>{item.name}</span>
 													 <span className={this.props.location.pathname===item.category_url?"color-blue fr mr20 font-14":"fr mr20 color999 font-14"}>{item.task_count===0?"":item.task_count}</span>
 
 												 </a>
-											 </li> : ""}
+											 </li>
                    </a>
 
                    <ul style={{display:key===this.props.indexs?"":"none"}} class="droppableul">

public/react/src/modules/courses/new/CoursesNew.js

@@ -881,6 +881,7 @@ class CoursesNew extends Component {
                                             <Checkbox value={"attachment"} className="fl">资源</Checkbox>
                                             <Checkbox value={"board"} className="fl">讨论</Checkbox>
                                             <Checkbox value={"course_group"} className="fl">分班</Checkbox>
+																						<Checkbox value={"statistics"} className="fl">统计</Checkbox>
                                             </Checkbox.Group>
                                         )}
                                     </Form.Item>

public/react/src/modules/courses/new/Goldsubject.js

@@ -1002,6 +1002,7 @@ class Goldsubject extends Component {
 												<Checkbox value={"attachment"} className="fl">资源</Checkbox>
 												<Checkbox value={"board"} className="fl">讨论</Checkbox>
 												<Checkbox value={"course_group"} className="fl">分班</Checkbox>
+												<Checkbox value={"statistics"} className="fl">统计</Checkbox>
 											</Checkbox.Group>
 										)}
 									</Form.Item>

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

@@ -704,6 +704,7 @@ class Trainingjobsetting extends Component {
 				shixun_evaluation: this.state.proportion === "均分比例" ? 0 : this.state.proportion === "经验值比例" ? 1 : this.state.proportion === "自定义分值" ? 2 : 0,
 				challenge_settings: array,
 				score_open: this.state.publicwork,
+				total_score:this.state.CalculateMax
 			}
 		} else {
 			// //非统一配置
@@ -734,6 +735,8 @@ class Trainingjobsetting extends Component {
 				shixun_evaluation: this.state.proportion === "均分比例" ? 0 : this.state.proportion === "经验值比例" ? 1 : this.state.proportion === "自定义分值" ? 2 : 0,
 				challenge_settings: array,
 				score_open: this.state.publicwork,
+				total_score:this.state.CalculateMax
+
 			}
 		}
 

public/react/src/modules/courses/statistics/Statistics.js

@@ -281,14 +281,39 @@ class Statistics extends Component{
 			},
 		];
 
+
+		let shixun_homeworktype=false;
+		let common_homeworktype=false;
+		let group_homeworktype=false;
+		let graduationtype=false;
+		let exercisetype=false;
 		let course_grouptype=false;
 		if(this.props&&this.props.course_modules!=undefined){
 			{this.props&&this.props.course_modules.map((item,key)=>{
 				if(item.type==="course_group"){
 					course_grouptype=true
 				}
+
+				if(item.type==="shixun_homework"){
+					shixun_homeworktype=true
+				}
+				if(item.type==="common_homework"){
+					common_homeworktype=true
+				}
+				if(item.type==="group_homework"){
+					group_homeworktype=true
+				}		if(item.type==="graduation"){
+					graduationtype=true
+				}
+
+				if(item.type==="exercise"){
+					exercisetype=true
+				}
+
 			})}
 		}
+
+
     if(course_grouptype===false){
 			columns.some((item,key)=> {
 					if (item.title === "分班") {
@@ -298,25 +323,66 @@ class Statistics extends Component{
 				}
 			)
 		}
+
+		if(shixun_homeworktype===false){
+			columns.some((item,key)=> {
+					if (item.title === "实训作业") {
+						columns.splice(key, 1)
+						return true
+					}
+				}
+			)
+		}
+
+		if(common_homeworktype===false){
+			columns.some((item,key)=> {
+					if (item.title === "普通作业") {
+						columns.splice(key, 1)
+						return true
+					}
+				}
+			)
+		}
+
+		if(group_homeworktype===false){
+			columns.some((item,key)=> {
+					if (item.title === "分组作业") {
+						columns.splice(key, 1)
+						return true
+					}
+				}
+			)
+		}
+
+		if(graduationtype===false){
+			columns.some((item,key)=> {
+					if (item.title === "毕设任务") {
+						columns.splice(key, 1)
+						return true
+					}
+				}
+			)
+		}
+
+		if(exercisetype===false){
+			columns.some((item,key)=> {
+					if (item.title === "试卷") {
+						columns.splice(key, 1)
+						return true
+					}
+				}
+			)
+		}
+
 		// console.log(this.props.isAdmin)
 
 
-		// "user_login": "p94602358",
-		// 	"user_name": "卿前程",
-		// 	"course_group": "电气工程1805", // 分班
-		// 	"common_score": 0.0, // 普通作业
-		// 	"group_score": 0.0, // 分组作业
-		// 	"practice_score": 747.1000061035156, // 实训作业
-		// 	"exercise_score": 0.0, // 试卷成绩
-		// 	"graduation_score": 0.0, // 毕设成绩
-		// 	"total_score": 747.1000061035156, // 总成绩
-		// 	"rank": 1  // 排名，学生身份才传
 		const operations = <React.Fragment>
-			<Dropdownbox
+			{course_grouptype===false||this.state.course_groups.length===0?"":<Dropdownbox
 				{...this.props}
 				{...this.state}
 				postwork_scoredata={(group_idss)=>this.getwork_scoredata(1,group_idss,'desc')}
-			/>
+			/>}
 			<a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`)}>导出</a>
 		</React.Fragment>;
 		return(