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

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

Browse Source
dev_jupyter
杨树明 6 years ago
parent 0687d1e79d 86c170cd6e 3c8bcae9fc
commit 0bba8b6972
6 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File

2
app/controllers/homework_commons_controller.rb
Unescape View File

@ -194,7 +194,7 @@ class HomeworkCommonsController < ApplicationController
# TODO user_extension 如果修改 请调整 # TODO user_extension 如果修改 请调整
unless params[:search].blank? unless params[:search].blank?
@student_works = @student_works.joins(user: :user_extension).where("concat(lastname, firstname) like ? @student_works = @student_works.joins(user: :user_extension).where("concat(lastname, firstname) like ?
or student_id like ?", "%#{params[:search]}%", "%#{params[:search]}%") or student_id like ?", "%#{params[:search].strip}%", "%#{params[:search].strip}%")
end end
@work_count = @student_works.size @work_count = @student_works.size

BIN
public/images/educoder/RepositoryNoneData.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 66 KiB

3
public/react/src/modules/question/Question.js
Unescape View File

@ -170,6 +170,7 @@ class Question extends Component {
this.setState({ this.setState({
defaultActiveKey: key, defaultActiveKey: key,
selectallquestionsonthispages:false, selectallquestionsonthispages:false,
difficulty:null,
}) })
var data = { var data = {
discipline_id:this.state.discipline_id, discipline_id:this.state.discipline_id,
@ -177,7 +178,7 @@ class Question extends Component {
tag_discipline_id:this.state.tag_discipline_id, tag_discipline_id:this.state.tag_discipline_id,
public: key, public: key,
item_type: this.state.item_type, item_type: this.state.item_type,
difficulty: this.state.difficulty, difficulty: null,
page: 1, page: 1,
per_page:10, per_page:10,
}; };

8
public/react/src/modules/question/component/Contentpart.js
Unescape View File

@ -40,8 +40,10 @@ class Contentpart extends Component {
const content = ( const content = (
<div className="questiontypes" style={{ <div className="questiontypes" style={{
width:'93px', width:'93px',
height:'161px', height:'200px',
}}> }}>
<p className="questiontype " onClick={()=>this.props.setitem_types(null)}>全部</p>
<p className="questiontypeheng" ></p>
<p className="questiontype " onClick={()=>this.props.setitem_types("SINGLE")}>单选题</p> <p className="questiontype " onClick={()=>this.props.setitem_types("SINGLE")}>单选题</p>
<p className="questiontypeheng" ></p> <p className="questiontypeheng" ></p>
<p className="questiontype " onClick={()=>this.props.setitem_types("MULTIPLE")}>多选题</p> <p className="questiontype " onClick={()=>this.props.setitem_types("MULTIPLE")}>多选题</p>
@ -56,8 +58,10 @@ class Contentpart extends Component {
const contents = ( const contents = (
<div className="questiontypes" style={{ <div className="questiontypes" style={{
width:'93px', width:'93px',
height:'120px', height:'161px',
}}> }}>
<p className="questiontype " onClick={()=>this.props.setdifficulty(null)}>全部</p>
<p className="questiontypeheng"></p>
<p className="questiontype " onClick={()=>this.props.setdifficulty(1)}>简单</p> <p className="questiontype " onClick={()=>this.props.setdifficulty(1)}>简单</p>
<p className="questiontypeheng"></p> <p className="questiontypeheng"></p>
<p className="questiontype " onClick={()=>this.props.setdifficulty(2)}>适中</p> <p className="questiontype " onClick={()=>this.props.setdifficulty(2)}>适中</p>

52
public/react/src/modules/testpaper/Testpaperlibrary.js
Unescape View File

@ -96,8 +96,13 @@ class Testpaperlibrary extends Component {
}) })
var data={ var data={
page:pages, page:pages,
per_page:10, discipline_id:this.state.discipline_id,
sub_discipline_id:this.state.sub_discipline_id,
tag_discipline_id:this.state.tag_discipline_id,
public: this.state.defaultActiveKey, public: this.state.defaultActiveKey,
difficulty: this.state.difficulty,
keywords: null,
per_page:10,
} }
this.getdata(data); this.getdata(data);
} }
@ -114,20 +119,31 @@ class Testpaperlibrary extends Component {
keywords: value, keywords: value,
}) })
var data={ var data={
page:1, page:this.state.page,
per_page:10, discipline_id:this.state.discipline_id,
sub_discipline_id:this.state.sub_discipline_id,
tag_discipline_id:this.state.tag_discipline_id,
public: this.state.defaultActiveKey, public: this.state.defaultActiveKey,
difficulty: this.state.difficulty,
keywords: value,
per_page:10,
} }
this.getdata(data); this.getdata(data);
} }
callback = (key) => { callback = (key) => {
this.setState({ this.setState({
defaultActiveKey: key, defaultActiveKey: key,
difficulty:null
}) })
var data={ var data={
page:1, page:this.state.page,
per_page:10, discipline_id:this.state.discipline_id,
sub_discipline_id:this.state.sub_discipline_id,
tag_discipline_id:this.state.tag_discipline_id,
public: key, public: key,
difficulty: this.state.difficulty,
keywords: this.state.keywords,
per_page:10,
} }
this.getdata(data); this.getdata(data);
} }
@ -178,9 +194,9 @@ class Testpaperlibrary extends Component {
sub_discipline_id:null, sub_discipline_id:null,
tag_discipline_id:null, tag_discipline_id:null,
public: this.state.defaultActiveKey, public: this.state.defaultActiveKey,
difficulty: this.state.difficulty, difficulty: null,
keywords: this.state.keywords, keywords: null,
page: this.state.page, page: 1,
per_page:10, per_page:10,
}; };
this.getdata(data); this.getdata(data);
@ -196,9 +212,9 @@ class Testpaperlibrary extends Component {
sub_discipline_id:sub_discipline_id, sub_discipline_id:sub_discipline_id,
tag_discipline_id:null, tag_discipline_id:null,
public: this.state.defaultActiveKey, public: this.state.defaultActiveKey,
difficulty: this.state.difficulty, difficulty: null,
keywords: this.state.keywords, keywords: null,
page: this.state.page, page:1,
per_page:10, per_page:10,
}; };
this.getdata(data); this.getdata(data);
@ -213,17 +229,15 @@ class Testpaperlibrary extends Component {
sub_discipline_id:this.state.sub_discipline_id, sub_discipline_id:this.state.sub_discipline_id,
tag_discipline_id:tag_discipline_id, tag_discipline_id:tag_discipline_id,
public: this.state.defaultActiveKey, public: this.state.defaultActiveKey,
difficulty: this.state.difficulty, difficulty: null,
keywords: this.state.keywords, keywords: null,
page: this.state.page, page: 1,
per_page:10, per_page:10,
}; };
this.getdata(data); this.getdata(data);
} }
setdifficulty=(bool)=>{
}
modalCancels=()=>{ modalCancels=()=>{
this.setState({ this.setState({
modalsTypes: false modalsTypes: false
@ -258,7 +272,7 @@ class Testpaperlibrary extends Component {
}) })
} }
//公开试题 //公开试卷
publicopentimu = (id) => { publicopentimu = (id) => {
const url = `/examination_banks/${id}/set_public.json`; const url = `/examination_banks/${id}/set_public.json`;
@ -283,7 +297,7 @@ class Testpaperlibrary extends Component {
}) })
} }
//删除试题 //删除试卷
deletetimu = (id) => { deletetimu = (id) => {
const url = `/examination_banks/${id}.json`; const url = `/examination_banks/${id}.json`;
@ -313,7 +327,7 @@ class Testpaperlibrary extends Component {
showmodels = (id) => { showmodels = (id) => {
this.setState({ this.setState({
modalsType: true, modalsType: true,
titilesm: "设为公开后，所有成员均可使用试题", titilesm: "设为公开后，所有成员均可使用试卷",
titiless: "是否设置为公开？", titiless: "是否设置为公开？",
titbool: true, titbool: true,
timuid: id timuid: id

4
public/react/src/modules/testpaper/component/Contentpart.js
Unescape View File

@ -44,8 +44,10 @@ class Contentpart extends Component {
const contents = ( const contents = (
<div className="questiontypes" style={{ <div className="questiontypes" style={{
width:'93px', width:'93px',
height:'120px', height:'160px',
}}> }}>
<p className="questiontype " onClick={()=>this.props.setdifficulty(null)}>全部</p>
<p className="questiontypeheng"></p>
<p className="questiontype " onClick={()=>this.props.setdifficulty(1)}>简单</p> <p className="questiontype " onClick={()=>this.props.setdifficulty(1)}>简单</p>
<p className="questiontypeheng"></p> <p className="questiontypeheng"></p>
<p className="questiontype " onClick={()=>this.props.setdifficulty(2)}>适中</p> <p className="questiontype " onClick={()=>this.props.setdifficulty(2)}>适中</p>

Write Preview
Loading…
Cancel
Save