From f51b6a7f772b07ac71b7bc1b91bab785ff3d0877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Tue, 29 Oct 2019 15:23:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=A8=A1=E5=9D=97=EF=BC=8C?=
 =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E6=9D=83=E9=99=90=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Competitimain/CompetitionsIndex.js        |  19 +-
 .../modules/courses/statistics/Statistics.js  | 226 ++++++++++++------
 2 files changed, 160 insertions(+), 85 deletions(-)

diff --git a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
index e72926fcd..39eb647de 100644
--- a/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
+++ b/public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js
@@ -53,14 +53,6 @@ class CompetitionsIndex extends Component{
 		this.getdata(e.key,page)
 	};
 
-	setcompetitonurl=(url)=>{
-
-		if(url!=null){
-			// this.props.history.push(url);
-			window.location.href=url;
-		}
-	}
-
 	PaginationCourse=(pageNumber)=>{
 		let {category}=this.state;
 		this.setState({
@@ -68,6 +60,7 @@ class CompetitionsIndex extends Component{
 		})
 		this.getdata(category,pageNumber);
 	}
+
 	render() {
 		let {datas,page,count}=this.state;
 
@@ -124,14 +117,14 @@ class CompetitionsIndex extends Component{
 									size="large"
 									dataSource={datas&&datas}
 									renderItem={(item,key) => (
-										<a target="_blank" href={item.competition_status==="ended"?`/competitions/${item.identifier}/common_header`:item.competition_status==="nearly_published"?	this.props.current_user&&this.props.current_user.business===true?`/competitions/${item.identifier}/common_header`:this.props.current_user&&this.props.current_user.admin===true?`/competitions/${item.identifier}/common_header`:null:item.competition_status==="progressing"?`/competitions/${item.identifier}/common_header`:null}
+										<a target="_blank" href={item.competition_status==="ended"?`/competitions/${item.identifier}/common_header`:item.competition_status==="nearly_published"?item.permission.editable==true?`/competitions/${item.identifier}/common_header`:null:item.competition_status==="progressing"?`/competitions/${item.identifier}/common_header`:null}
 											className={item.competition_status==="ended"?"competitionstitlesshou":item.competition_status==="nearly_published"?
-												this.props.current_user&&this.props.current_user.admin===true?"competitionstitlesshou":this.props.current_user&&this.props.current_user.business===true?"competitionstitlesshou":"endedfont":"competitionstitlesshou"}
+												 item.permission.editable==true?"competitionstitlesshou":"endedfont":"competitionstitlesshou"}
 										  >
 
 											<div className={"CompetitionsList"} >
 												{item.competition_status==="nearly_published"?
-													this.props.current_user&&this.props.current_user.admin===true?"":this.props.current_user&&this.props.current_user.business===true?"":<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div>:""}
+													item.permission.editable==true?"":<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div>:""}
 												{/*<div className={"CompetitionsListzhezhao"}>即将发布 敬请期待</div>*/}
 											{/*{item.description===null||item.description===undefined||item.description===""?<style>*/}
 												{/*{*/}
@@ -180,9 +173,9 @@ class CompetitionsIndex extends Component{
 											>
 												<List.Item.Meta
 													title={<a className={item.competition_status==="ended"?"competitionstitlesshou":item.competition_status==="nearly_published"?
-														this.props.current_user&&this.props.current_user.admin===true?"competitionstitlesshou":this.props.current_user&&this.props.current_user.business===true?"competitionstitlesshou":"endedfont":"competitionstitlesshou"}>
+														item.permission.editable==true?"competitionstitlesshou":"endedfont":"competitionstitlesshou"}>
 														<a target="_blank"  className={"competitionstitles"}
-																					href={item.competition_status==="ended"?`/competitions/${item.identifier}/common_header`:item.competition_status==="nearly_published"?	this.props.current_user&&this.props.current_user.business===true?`/competitions/${item.identifier}/common_header`:this.props.current_user&&this.props.current_user.admin===true?`/competitions/${item.identifier}/common_header`:null:item.competition_status==="progressing"?`/competitions/${item.identifier}/common_header`:null}
+																					href={item.competition_status==="ended"?`/competitions/${item.identifier}/common_header`:item.competition_status==="nearly_published"?	item.permission.editable==true?`/competitions/${item.identifier}/common_header`:null:item.competition_status==="progressing"?`/competitions/${item.identifier}/common_header`:null}
 													>{item.name}{item.sub_title===null?"":`——${item.sub_title}`}</a>
 														{/*<span>{item.sub_title===null?"":*/}
 															{/*<Tag className="competitionsrelative" color="#87d068">{item.sub_title}</Tag>}*/}
diff --git a/public/react/src/modules/courses/statistics/Statistics.js b/public/react/src/modules/courses/statistics/Statistics.js
index 955cb70e5..9f53b14b2 100644
--- a/public/react/src/modules/courses/statistics/Statistics.js
+++ b/public/react/src/modules/courses/statistics/Statistics.js
@@ -1,6 +1,6 @@
 import React,{ Component } from "react";
 import {Table, Pagination,Tooltip,Spin, Row, Col ,Tabs} from "antd";
-import { WordsBtn,on, off, trigger } from 'educoder';
+import { WordsBtn,on, off, trigger ,getImageUrl} from 'educoder';
 import {BrowserRouter as Router,Route,Switch,Link} from 'react-router-dom';
 import axios from'axios';
 import './Statistics.css';
@@ -11,14 +11,28 @@ class Statistics extends Component{
 		this.state={
 			nd1:60,
 			nd2:40,
-			nd3:20
+			nd3:20,
+			data:undefined
 		}
 	}
 
 	componentDidMount() {
 		this.setState({
 			isSpin:true,
-
+		})
+		let courseId=this.props.match.params.coursesId;
+		let url=`/courses/${courseId}/statistics.json`;
+		axios.get(url).then((result) => {
+			if (result) {
+       this.setState({
+				 data:result.data.top_scores
+			 })
+			}
+		}).catch((error) => {
+			console.log(error);
+			this.setState({
+				isSpins:false,
+			})
 		})
 
 	}
@@ -28,7 +42,7 @@ class Statistics extends Component{
 	 }
 
 	render(){
-		let {nd1,nd2,nd3}=this.state;
+		let {nd1,nd2,nd3,data}=this.state;
 
 		return(
 			<React.Fragment  >
@@ -42,80 +56,148 @@ class Statistics extends Component{
 							</Row>
 
 							<Row type="flex" justify="center" align="bottom">
-								<Col span={3}>
-									<li className="pr rankingss">
-										<a href="https://test-newweb.educoder.net/users/cao_jl" className="color-dark">
-											<img src="https://test-newweb.educoder.net/images/avatars/User/g"/>
-										</a>
-									</li>
-								</Col>
-
-								<Col  span={5}>
-									<li className="pr rankingss">
-										<a href="https://test-newweb.educoder.net/users/cao_jl" className="color-dark">
-											<img src="https://test-newweb.educoder.net/images/avatars/User/g" className={"mb10"}/>
-										</a>
-									</li>
-									<Col className={`height-${nd2}`}>
-
-									</Col>
-								</Col>
-
-								<Col  span={5} className={"relatives"}>
-									<li className="pr rankingss">
-										<img src="https://test-newweb.educoder.net/images/educoder/huangguan.png" className="huangguans mb5" />
-										<a href="https://test-newweb.educoder.net/users/cao_jl" className="color-dark">
-											<img src="https://test-newweb.educoder.net/images/avatars/User/g" className={"mb10"}/>
-										</a>
-									</li>
-									<Col className={`height-${nd1}`}>
-
-									</Col>
-								</Col>
-
-								<Col span={5}>
-									<li className="pr rankingss">
-										<a href="https://test-newweb.educoder.net/users/cao_jl" className="color-dark">
-											<img src="https://test-newweb.educoder.net/images/avatars/User/g" className={"mb10"}/>
-										</a>
-									</li>
-									<Col className={`height-${nd3}`}>
+								{data&&data.map((item,key)=>{
+  								if(key===3){
+										return(
+											<Col span={3}>
+												<li className="pr rankingss">
+													<a href={`/users/${item.user_login}`} className="color-dark">
+														<img src={getImageUrl(`images/${item.avatar_url}`)}/>
+													</a>
+												</li>
+											</Col>
+										)
+									}
+
+								})}
+								{data&&data.map((item,key)=>{
+									if(key===1){
+										return(
+											<Col  span={5}>
+												<li className="pr rankingss">
+													<a href={`/users/${item.user_login}`} className="color-dark">
+														<img src={getImageUrl(`images/${item.avatar_url}`)} className={"mb10"}/>
+													</a>
+												</li>
+												<Col className={`height-${nd2}`}>
+
+												</Col>
+											</Col>
+										)
+									}
+
+								})}
+
+								{data&&data.map((item,key)=>{
+									if(key===0){
+										return(
+											<Col  span={5} className={"relatives"}>
+												<li className="pr rankingss">
+													<img src="https://test-newweb.educoder.net/images/educoder/huangguan.png" className="huangguans mb5" />
+													<a href={`/users/${item.user_login}`} className="color-dark">
+														<img src={getImageUrl(`images/${item.avatar_url}`)} className={"mb10 mt5"}/>
+													</a>
+												</li>
+												<Col className={`height-${nd1}`}>
+
+												</Col>
+											</Col>
+										)
+									}
+
+								})}
+
+								{data&&data.map((item,key)=>{
+									if(key===2){
+										return(
+											<Col span={5}>
+												<li className="pr rankingss">
+													<a href={`/users/${item.user_login}`} className="color-dark">
+														<img src={getImageUrl(`images/${item.avatar_url}`)} className={"mb10"}/>
+													</a>
+												</li>
+												<Col className={`height-${nd3}`}>
+
+												</Col>
+											</Col>
+										)
+									}
+
+								})}
+
+
+								{data&&data.map((item,key)=>{
+									if(key===4){
+										return(
+											<Col span={3}>
+												<li className="pr rankingss">
+													<a href={`/users/${item.user_login}`} className="color-dark">
+														<img src={getImageUrl(`images/${item.avatar_url}`)}/>
+													</a>
+												</li>
+											</Col>
+										)
+									}
+
+								})}
 
-									</Col>
-								</Col>
-
-								<Col span={3}>
-									<li className="pr rankingss">
-										<a href="https://test-newweb.educoder.net/users/cao_jl" className="color-dark">
-											<img src="https://test-newweb.educoder.net/images/avatars/User/g"/>
-										</a>
-									</li>
-								</Col>
 
 							</Row>
 
 
 							<Row className="mt10" type="flex" justify="center" align="bottom">
-								<Col span={3} className={"Statisticscenter"}>
-									<Col>威震江湖</Col>
-									<Col>4th</Col>
-								</Col>
-								<Col span={5} className={"Statisticscenter"}>
-									<Col>神魔遮天</Col>
-									<Col>2th</Col>
-								</Col>
-								<Col span={5} className={"Statisticscenter"}>
-									<Col>雄霸天下</Col>
-									<Col>1th</Col>
-								</Col>
-								<Col span={5} className={"Statisticscenter"}>
-									<Col>不灭战神</Col>
-									<Col>3th</Col>
-								</Col>
-								<Col span={3} className={"Statisticscenter"}>
-									<Col>霸气初现</Col>
-									<Col>5th</Col>
-								</Col>
+
+								{data&&data.map((item,key)=>{
+									if(key===3){
+										return(
+											<Col span={3} className={"Statisticscenter"}>
+												<Col>{item.user_name}</Col>
+												<Col>4th</Col>
+											</Col>
+										)
+									}
+								})}
+								{data&&data.map((item,key)=>{
+									if(key===1){
+										return(
+											<Col span={5} className={"Statisticscenter"}>
+												<Col>{item.user_name}</Col>
+												<Col>2th</Col>
+											</Col>
+										)
+									}
+								})}
+								{data&&data.map((item,key)=>{
+									if(key===0){
+										return(
+											<Col span={5} className={"Statisticscenter"}>
+												<Col>{item.user_name}</Col>
+												<Col>1th</Col>
+											</Col>
+										)
+									}
+								})}
+								{data&&data.map((item,key)=>{
+									if(key===2){
+										return(
+											<Col span={5} className={"Statisticscenter"}>
+												<Col>{item.user_name}</Col>
+												<Col>3th</Col>
+											</Col>
+										)
+									}
+								})}
+								{data&&data.map((item,key)=>{
+									if(key===4){
+										return(
+											<Col span={3} className={"Statisticscenter"}>
+												<Col>{item.user_name}</Col>
+												<Col>5th</Col>
+											</Col>
+										)
+									}
+								})}
+
 							</Row>
 						</p>
 					</div>