m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
dev_home
cxt 6 years ago
parent 5d36f8c9ed 91068b0c38
commit 7e4c435f21
3 changed files with 47 additions and 36 deletions
Show Stats Download Patch File Download Diff File

3
app/controllers/exercises_controller.rb
Unescape View File

@ -1627,8 +1627,9 @@ class ExercisesController < ApplicationController
ex_and_user = user_groups_id & ex_group_settings #用户已设置的分班 ex_and_user = user_groups_id & ex_group_settings #用户已设置的分班
unpublish_group = unpublish_group + ex_and_user - ex_ended_groups #已发布的全部班级减去截止的全部班级 unpublish_group = unpublish_group + ex_and_user - ex_ended_groups #已发布的全部班级减去截止的全部班级
else else
ex_ended_groups = ex_all_group_settings.exercise_group_ended.pluck(:course_group_id).uniq
ex_and_user = user_groups_id & ex_group_settings #用户已设置的分班 ex_and_user = user_groups_id & ex_group_settings #用户已设置的分班
unpublish_group = unpublish_group + ex_and_user unpublish_group = unpublish_group + ex_and_user - ex_ended_groups
end end
end end
end end

56
public/react/src/modules/moop_cases/CaseItem.js
Unescape View File

@ -19,33 +19,35 @@ class CaseItem extends Component{
{ {
libraries && libraries.map((item,key)=>{ libraries && libraries.map((item,key)=>{
return( return(
<li className="library_list_item"> <a href={`/moop_cases/${item.id}`} target="_blank">
<img alt={item.id} className="mr15 mt3 radius4" height="90" src={getUrl(`${item.cover_url || "/images/educoder/library-default-cover.png"}`)} width="120" /> <li className="library_list_item pointer">
<div className="flex1"> <img alt={item.id} className="mr15 mt3 radius4" height="90" src={getUrl(`${item.cover_url || "/images/educoder/library-default-cover.png"}`)} width="120" />
<p className="clearfix mb25 lineh-40"> <div className="flex1">
<a href={`/moop_cases/${item.id}`} className="task-hide font-22 library_l_name">{item.title}</a> <p className="clearfix mb25 lineh-40">
<span className="fl mt10"><Tags tags={item.tags}></Tags></span> <a className="task-hide font-22 library_l_name">{item.title}</a>
</p> <span className="fl mt10"><Tags tags={item.tags}></Tags></span>
<p className="clearfix lineh-20"> </p>
<span className="color-grey-3 mr10">{item.author_name}</span> <p className="clearfix lineh-20">
<span className="color-grey-3 mr20">{item.author_school_name}</span> <span className="color-grey-3 mr10">{item.author_name}</span>
<span className="color-grey-c fr"> <span className="color-grey-3 mr20">{item.author_school_name}</span>
{ <span className="color-grey-c fr">
item.visited_count && item.visited_count != 0 ? {
<span className="color-grey-c ml20"><span className=" item-group-icon mr5"><i className="fa fa-eye"></i></span>{item.visited_count} 浏览</span>:"" item.visited_count && item.visited_count != 0 ?
} <span className="color-grey-c ml20"><span className=" item-group-icon mr5"><i className="fa fa-eye"></i></span>{item.visited_count} 浏览</span>:""
{ }
item.praise_count && item.praise_count != 0 ? {
<span className="color-grey-c ml20"><span className=" item-group-icon mr5"><i className="fa fa-thumbs-o-up"></i></span>{item.praise_count} 赞</span>:"" item.praise_count && item.praise_count != 0 ?
} <span className="color-grey-c ml20"><span className=" item-group-icon mr5"><i className="fa fa-thumbs-o-up"></i></span>{item.praise_count} 赞</span>:""
{ }
item.download_count && item.download_count != 0 ? {
<span className="color-grey-c ml20" style={{"marginRight":'1px'}}><span className=" item-group-icon mr5"><i className="fa fa-download"></i></span>{item.download_count} 下载</span>:"" item.download_count && item.download_count != 0 ?
} <span className="color-grey-c ml20" style={{"marginRight":'1px'}}><span className=" item-group-icon mr5"><i className="fa fa-download"></i></span>{item.download_count} 下载</span>:""
</span> }
</p> </span>
</div> </p>
</li> </div>
</li>
</a>
) )
}) })
} }

24
public/react/src/modules/osshackathon/Osshackathon.js
Unescape View File

@ -20,7 +20,8 @@ class Osshackathon extends Component {
hackathonedit:false, hackathonedit:false,
Osshackathonmodeltype:false, Osshackathonmodeltype:false,
spinning:false, spinning:false,
opentitletype:true opentitletype:true,
boxoffsetHeigh:0
} }
} }
@ -54,6 +55,7 @@ class Osshackathon extends Component {
spinning:true spinning:true
}) })
}) })
} }
@ -67,9 +69,16 @@ class Osshackathon extends Component {
} }
componentDidUpdate = (prevProps) => { componentDidUpdate = (prevProps,prevState) => {
if(prevState.data!=this.state.data){
//防止陷入无限循环
let box=document.getElementById("Osshackathonfontlists");
if(box){
this.setState({
boxoffsetHeigh:box.offsetHeight
})
}
}
} }
PaginationTask=(pageNumber)=>{ PaginationTask=(pageNumber)=>{
@ -228,7 +237,6 @@ class Osshackathon extends Component {
render() { render() {
let {page,data,hackathonedit,opentitletype}=this.state; let {page,data,hackathonedit,opentitletype}=this.state;
return ( return (
<div className="newMain clearfix newMainybot"> <div className="newMain clearfix newMainybot">
<style> <style>
@ -299,18 +307,18 @@ class Osshackathon extends Component {
{ {
` `
.Osshackathonfontlist{ .Osshackathonfontlist{
height: 180px; max-height: 180px;
overflow: hidden; overflow: hidden;
} }
` `
} }
</style>:""} </style>:""}
{hackathonedit===true?"":<p className={"Osshackathonfontlist mb30"}> {hackathonedit===true?"":<p className={"Osshackathonfontlist mb30"} id={"Osshackathonfontlists"}>
{data&&data.hackathon.description===null?"":<div className={"markdown-body"} {data&&data.hackathon.description===null?"":<div className={"markdown-body"}
dangerouslySetInnerHTML={{__html: markdownToHTML(data&&data.hackathon.description).replace(/▁/g, "▁▁▁")}}></div>} dangerouslySetInnerHTML={{__html: markdownToHTML(data&&data.hackathon.description).replace(/▁/g, "▁▁▁")}}></div>}
</p>} </p>}
{opentitletype===true?<Divider dashed={true} onClick={()=>this.opentitle()} className={"pointer Breadcrumbfont"}>展开阅读全文<Icon type="down" /></Divider>:""} {opentitletype===true&&this.state.boxoffsetHeigh===180?<Divider dashed={true} onClick={()=>this.opentitle()} className={"pointer Breadcrumbfont"}>展开阅读全文<Icon type="down" /></Divider>:""}
{hackathonedit===true?<Osshackathonmd {hackathonedit===true?<Osshackathonmd
getosshackathon={()=>this.getosshackathonlist()} getosshackathon={()=>this.getosshackathonlist()}

Write Preview
Loading…
Cancel
Save