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

Merge branches 'dev_ysmnewshixun' and 'develop' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_ysmnewshixun

Browse Source
chromesetting
杨树明 5 years ago
parent 1f76671c50 e3afa642f4
commit 984e38c55c
8 changed files with 68 additions and 51 deletions
Show Stats Download Patch File Download Diff File

2
app/controllers/student_works_controller.rb
Unescape View File

@ -559,6 +559,7 @@ class StudentWorksController < ApplicationController
if @work.work_status == 0
@work.work_status = 1
@work.commit_time = Time.now
@work.compelete_status = 1 if @homework.homework_type == "practice"
# 分组作业更新分组id
@work.group_id = @homework.max_group_id if @homework.homework_type == "group"
end
@ -878,6 +879,7 @@ class StudentWorksController < ApplicationController
def update_none_commit_work work, homework
if work.work_status == 0
work.work_status = 1
work.compelete_status = 1
work.commit_time = homework.end_time
work.update_time = Time.now
end

4
app/controllers/weapps/courses_controller.rb
Unescape View File

@ -93,8 +93,8 @@ class Weapps::CoursesController < Weapps::BaseController
end
if course_group_id.present?
course_group = CourseGroup.find(course_group_id) if course_group_id != 0
@students = @students.where(course_group_id: course_group&.id.to_i)
@course_group = CourseGroup.find(course_group_id) if course_group_id != 0
@students = @students.where(course_group_id: @course_group&.id.to_i)
end
@students_count = @students.size

2
app/helpers/homework_commons_helper.rb
Unescape View File

@ -225,7 +225,7 @@ module HomeworkCommonsHelper
# 作品状态
def practice_homework_status homework, member
[{id: 0, name: "未提交", count: homework.compelete_status_count(member, 0)},
[{id: 0, name: "未开启", count: homework.compelete_status_count(member, 0)},
{id: 1, name: "未通关", count: homework.compelete_status_count(member, 1)},
{id: 2, name: "按时通关", count: homework.compelete_status_count(member, 2)},
{id: 3, name: "迟交通关", count: homework.compelete_status_count(member, 3)}]

4
app/views/homework_commons/works_list.json.jbuilder
Unescape View File

@ -43,7 +43,7 @@ elsif @user_course_identity == Course::STUDENT
json.eff_score work_score_format(@work.eff_score, true, @score_open)
json.current_complete_count @work.myshixun.try(:passed_count) if @homework.end_or_late
json.complete_count @work.myshixun&.time_passed_count(@homework.homework_group_setting(@work.user_id)&.end_time)
json.view_answer_count @work.myshixun.try(:view_answer_count)
json.view_answer_count @work.myshixun.try(:view_answer_count).to_i
json.work_status @work.compelete_status
else
json.(@work, :id, :work_status, :update_time, :ultimate_score)
@ -100,7 +100,7 @@ if @homework.homework_type == "practice"
json.cost_time work.myshixun.try(:total_spend_time)
json.current_complete_count work.myshixun.try(:passed_count) if @homework.end_or_late
json.complete_count work.myshixun&.time_passed_count(@homework.homework_group_setting(work.user_id)&.end_time)
json.view_answer_count work.myshixun.try(:view_answer_count)
json.view_answer_count work.myshixun.try(:view_answer_count).to_i
json.user_login work.user.try(:login)
json.user_name work.user.try(:real_name)
json.student_id work.user.try(:student_id)

7
app/views/weapps/courses/students.json.jbuilder
Unescape View File

@ -1,2 +1,7 @@
json.students student_list @students, @course.excellent
json.students_count @students_count
json.students_count @students_count
if @course_group
json.course_group do
json.(@course_group, :id, :name, :invite_code, :course_members_count)
end
end

84
public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
Unescape View File

@ -104,32 +104,32 @@ class Listofworksstudentone extends Component {
key: 'number',
align: "center",
className: 'font-14',
width: '100px',
width: '90px',
render: (text, record) => (
<span style={{width: '100px'}}>
<span style={{width: '90px'}}>
{record.number === undefined ?
<span style={{
color: '#9A9A9A',
textAlign: "center",
width: '100px'
width: '90px'
}}> --</span>
: record.number === "" ?
<span style={{
color: '#9A9A9A',
textAlign: "center",
width: '100px'
width: '90px'
}}>--</span>
: record.number === "--" ?
<span style={{
color: '#9A9A9A',
textAlign: "center",
width: '100px'
width: '90px'
}}>--</span>
:
<span style={{
color: '#07111B',
textAlign: "center",
width: '100px'
width: '90px'
}}> {record.number}</span>
}
</span>
@ -187,48 +187,46 @@ class Listofworksstudentone extends Component {
dataIndex: 'stduynumber',
key: 'stduynumber',
align: "center",
className: 'font-14 maxnamewidth145',
width: '145px',
className: 'font-14 maxnamewidth120',
width: '120px',
render: (text, record) => (
<span className="maxnamewidth145" style={{
width: '145px',
<span className="maxnamewidth120" style={{
width: '120px',
}}>
{record.stduynumber === undefined ?
<span style={{
color: '#000',
textAlign: "center",
width: '145px',
width: '120px',
}}>--
</span>
: record.stduynumber === null ?
<span style={{
color: '#000',
textAlign: "center",
width: '145px',
width: '120px',
}}>--
</span>
: record.stduynumber === "" ?
<span style={{
color: '#000',
textAlign: "center",
width: '145px',
width: '120px',
}}>--
</span>
:
<a
title={record.stduynumber}
className="maxnamewidth145"
className="maxnamewidth120"
style={{
color: '#000',
textAlign: "center",
width: '145px',
width: '120px',
}}>{
record.stduynumber
}
</a>
}
</span>
),
},
@ -237,36 +235,36 @@ class Listofworksstudentone extends Component {
key: 'classroom',
dataIndex: 'classroom',
align: "center",
className: 'font-14 maxnamewidth145',
width: '145px',
className: 'font-14 maxnamewidth120',
width: '120px',
render: (text, record) => (
<span className="font-14 maxnamewidth145" style={{width: '145px'}}>
<span className="font-14 maxnamewidth120" style={{width: '120px'}}>
{record.classroom === undefined ?
<a className=" font-14 maxnamewidth145"
<a className=" font-14 maxnamewidth120"
style={{
color: '#9A9A9A',
textAlign: "center",
width: '145px',
width: '120px',
}}>--</a> : record.classroom === "" ?
<a className=" font-14 maxnamewidth145"
<a className=" font-14 maxnamewidth120"
style={{
color: '#9A9A9A',
textAlign: "center",
width: '145px',
width: '120px',
}}>--</a> : record.classroom === null ?
<a className=" font-14 maxnamewidth145"
<a className=" font-14 maxnamewidth120"
style={{
color: '#9A9A9A',
textAlign: "center",
width: '145px',
width: '120px',
}}>--</a>
:
<a className=" font-14 maxnamewidth145"
<a className=" font-14 maxnamewidth120"
title={record.classroom}
style={{
color: '#9A9A9A',
textAlign: "center",
width: '145px',
width: '120px',
}}>{record.classroom}</a>
}
</span>
@ -346,7 +344,7 @@ class Listofworksstudentone extends Component {
// ),
// },
{
title: '当前完成关卡',
title: '最新完成关卡',
dataIndex: 'curcomlevel',
key: 'curcomlevel',
align: "center",
@ -494,8 +492,9 @@ class Listofworksstudentone extends Component {
key: 'operating',
align: "center",
className: 'font-14',
width: '40px',
render: (text, record) => (
<span>
<span style={{width: '40px'}}>
{
record.submitstate === "未提交" ? <span style={{color: '#9A9A9A'}}>--</span>
:
@ -739,7 +738,7 @@ class Listofworksstudentone extends Component {
// ),
// },
{
title: '当前完成关卡',
title: '最新完成关卡',
dataIndex: 'curcomlevel',
key: 'curcomlevel',
align: "center",
@ -887,8 +886,10 @@ class Listofworksstudentone extends Component {
key: 'operating',
align: "center",
className: 'font-14',
width: '40px',
render: (text, record) => (
<span>
<span style={{width: '40px'}}>
{
record.submitstate === "未提交" ? <span style={{color: '#9A9A9A'}}>--</span>
:
@ -1090,7 +1091,7 @@ class Listofworksstudentone extends Component {
// ),
// },
{
title: '当前完成关卡',
title: '最新完成关卡',
dataIndex: 'curcomlevel',
key: 'curcomlevel',
align: "center",
@ -1287,9 +1288,11 @@ class Listofworksstudentone extends Component {
display: 'block',
align: 'center',
className: 'font-14',
width: '40px',
render: (text, record) => (
record.submitstate === "未提交" ?
<a style={{textAlign: "center"}} className="color-blue"
<a style={{textAlign: "center",width: '40px'}} className="color-blue"
onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
onClick={() => this.Viewstudenttraininginformationt(record)}>评阅</a> :
<span>
@ -1451,7 +1454,7 @@ class Listofworksstudentone extends Component {
)
},
{
title: '当前完成关卡',
title: '最新完成关卡',
dataIndex: 'curcomlevel',
key: 'curcomlevel',
align: "center",
@ -1648,9 +1651,10 @@ class Listofworksstudentone extends Component {
display: 'block',
align: 'center',
className: 'font-14',
width: '40px',
render: (text, record) => (
record.submitstate === "未提交" ?
<a style={{textAlign: "center"}} className="color-blue"
<a style={{textAlign: "center",width: '40px'}} className="color-blue"
onMouseDown={(e) => this.Viewstudenttraininginformationtysl2(e, record)}
onClick={() => this.Viewstudenttraininginformationt(record)}>评阅</a> :
<span>
@ -3473,22 +3477,22 @@ class Listofworksstudentone extends Component {
}
if(homewrok===false){
for(var i=0;i<columnsstu.length;i++){
if (columnsstu[i].title === "当前完成关卡"){//item.id==122
if (columnsstu[i].title === "最新完成关卡"){//item.id==122
columnsstu.splice(i,1)
}
}
for(var i=0;i<columnsstu2.length;i++){
if (columnsstu2[i].title === "当前完成关卡"){//item.id==122
if (columnsstu2[i].title === "最新完成关卡"){//item.id==122
columnsstu2.splice(i,1)
}
}
for(var i=0;i<columns.length;i++){
if (columns[i].title === "当前完成关卡"){//item.id==122
if (columns[i].title === "最新完成关卡"){//item.id==122
columns.splice(i,1)
}
}
for(var i=0;i<columnss.length;i++){
if (columnss[i].title === "当前完成关卡"){//item.id==122
if (columnss[i].title === "最新完成关卡"){//item.id==122
columnss.splice(i,1)
}
}

8
public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js
Unescape View File

@ -232,11 +232,9 @@ class ShixunHomeworkPage extends Component {
typelist={teacherdatapage === undefined ? [""] : teacherdatapage.homework_status}
/>
<a className="color-grey-9 fr font-16 summaryname ml20 mr20" onClick={()=>this.gotohome()}>返回</a>
{teacherdatapage&&teacherdatapage.shixun_status>1?this.props.isAdmin()?<a className="color-grey-9 fr font-16 mr20"
href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
target={"_blank"}>实训详情</a>: this.props.isStudent()?teacherdatapage&&teacherdatapage.time_status<5?<a className="color-grey-9 fr font-16 mr20"
href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
target={"_blank"}>实训详情</a>:"":"":""}
{teacherdatapage&&teacherdatapage.shixun_status>1?<a className="color-grey-9 fr font-16 mr20"
href={`/shixuns/${teacherdatapage === undefined ? "" : teacherdatapage.shixun_identifier}/challenges`}
target={"_blank"}>实训详情</a>:""}
</div>

8
public/react/src/modules/courses/shixunHomework/style.css
Unescape View File

@ -73,6 +73,14 @@
white-space:nowrap;
cursor: default;
}
.maxnamewidth120{
max-width: 120px;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
cursor: default;
}
.maxnamewidth145{
max-width: 145px;
overflow:hidden;

Write Preview
Loading…
Cancel
Save