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

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

Browse Source
dev_forum
杨树林 5 years ago
parent b59765568a c4389cccf7
commit ea6245ba93
22 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File

13
app/controllers/challenges_controller.rb
Unescape View File

@ -230,11 +230,16 @@ class ChallengesController < ApplicationController
def crud_answer
raise '参考答案不能为空' if params[:challenge_answer].empty?
raise '占比之和必须为100%' if params[:challenge_answer].map{|a| a[:score]}.sum != 100
@challenge.challenge_answers.destroy_all if @challenge.challenge_answers
params[:challenge_answer].each_with_index do |answer, index|
ChallengeAnswer.create(name: answer[:name], contents: answer[:contents],
level: index+1, score: answer[:score], challenge_id: @challenge.id)
ActiveRecord::Base.transaction do
@challenge.challenge_answers.destroy_all if @challenge.challenge_answers
params[:challenge_answer].each_with_index do |answer, index|
# 内容为空不保存
next if answer[:contents].blank?
ChallengeAnswer.create(name: answer[:name], contents: answer[:contents],
level: index+1, score: answer[:score], challenge_id: @challenge.id)
end
end
end
# 查看参考答案接口

2
app/controllers/courses_controller.rb
Unescape View File

@ -315,7 +315,7 @@ class CoursesController < ApplicationController
# @users = User.where.not(id: user_ids_of_course_members)
@users = User.where(status: User::STATUS_ACTIVE)
@users = @users.where("concat(users.firstname, users.lastname) like '%#{name}%'") if name.present?
@users = @users.where("concat(users.lastname, users.firstname) like '%#{name}%'") if name.present?
# REDO:Extension
@users = @users.joins(user_extension: :school).where("schools.name like '%#{school_name}%'") if school_name.present?

2
app/controllers/homework_commons_controller.rb
Unescape View File

@ -1597,7 +1597,7 @@ class HomeworkCommonsController < ApplicationController
att = attachment.copy
att.author_id = homework_bank.user_id
att.copy_from = attachment.id
att.attachtype = attachment.attachtype
att.attachtype = attachment.attachtype || 1
homework_bank.attachments << att
end
homework_bank

2
app/controllers/question_banks_controller.rb
Unescape View File

@ -154,7 +154,7 @@ class QuestionBanksController < ApplicationController
att.container_id = nil
att.container_type = nil
att.author_id = homework.user_id
att.attachtype = attachment.attachtype
att.attachtype = attachment.attachtype || 1
# att.attachtype = 1
att.copy_from = attachment.id
att.save!

2
app/models/game.rb
Unescape View File

@ -31,7 +31,7 @@ class Game < ApplicationRecord
# 根据得分比例来算实际得分(试卷、实训作业)
def real_score score
(final_score.to_f / challenge.all_score) * score
((final_score < 0 ? 0 : final_score).to_f / challenge.all_score) * score
end
# 判断实训是否全部通关

2
app/views/courses/search_teacher_candidate.json.jbuilder
Unescape View File

@ -1,7 +1,7 @@
json.candidates do
json.array! @users do |user|
json.id user.id
json.name user.firstname + user.lastname
json.name user.real_name
json.nickname user.nickname
json.school_name user.user_extension.school.try(:name)
json.school_id user.user_extension.school.try(:id)

6
db/migrate/20190723152256_delete_contents_is_null_for_challenge_answers.rb
Unescape View File

@ -0,0 +1,6 @@
class DeleteContentsIsNullForChallengeAnswers < ActiveRecord::Migration[5.2]
def change
contents = ChallengeAnswer.where("contents = ''")
contents.delete_all
end
end

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 5.7 KiB

19
public/react/src/AppConfig.js
Unescape View File

@ -2,7 +2,7 @@ import React from "react";
import axios from 'axios';
import { requestProxy } from "./indexEduplus2RequestProxy";
import { broadcastChannelOnmessage ,SetAppModel} from 'educoder';
import { broadcastChannelOnmessage ,SetAppModel, isDev, queryString} from 'educoder';
import { notification } from 'antd';
import './index.css'
broadcastChannelOnmessage('refreshPage', () => {
@ -18,10 +18,19 @@ function locationurl(list){
}
// TODO 开发期多个身份切换
const debugType =""
// window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
// window.location.search.indexOf('debug=s') != -1 ? 'student' : 'admin'
// window._debugType = debugType;
let debugType = ""
if (isDev) {
const _search = window.location.search;
let parsed = {};
if (_search) {
parsed = queryString.parse(_search);
}
debugType = window.location.search.indexOf('debug=t') != -1 ? 'teacher' :
window.location.search.indexOf('debug=s') != -1 ? 'student' :
window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || ''
}
window._debugType = debugType;
export function initAxiosInterceptors(props) {
// TODO 避免重复的请求 https://github.com/axios/axios#cancellation

2
public/react/src/modules/comment/Comments.js
Unescape View File

@ -574,7 +574,7 @@ class Comments extends Component {
<div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20"
src={getImageUrl("images/educoder/nodata.png")} />
<p className="edu-nodata-p mb20">暂时还没有评论~</p>
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
</div>
</div>
: '' }

2
public/react/src/modules/courses/Resource/index.js
Unescape View File

@ -956,7 +956,7 @@ class Fileslists extends Component{
>
<div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20" src="/images/educoder/nodata.png" />
<p className="edu-nodata-p mb20">暂无数据哦~</p></div>
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
</div>

2
public/react/src/modules/courses/coursesHome/CoursesHome.js
Unescape View File

@ -145,7 +145,7 @@ class CoursesHome extends Component{
{coursesHomelist===undefined?"":coursesHomelist.courses.length===0?<div className="edu-tab-con-box clearfix edu-txt-center mb50">
<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
<p className="edu-nodata-p mb20">暂无数据哦~</p>
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
</div>:""}
{

2
public/react/src/modules/courses/coursesPublic/NoneData.js
Unescape View File

@ -9,7 +9,7 @@ class NoneData extends Component{
return(
<div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
<p className="edu-nodata-p mb20">暂无数据哦~</p>
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
</div>
)
}

2
public/react/src/modules/courses/graduation/tasks/index.js
Unescape View File

@ -773,7 +773,7 @@ class GraduationTasks extends Component{
>
<div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20" src="/images/educoder/nodata.png" />
<p className="edu-nodata-p mb20">暂无数据哦~</p></div>
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
</div>
<div>

2
public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
Unescape View File

@ -838,7 +838,7 @@ class ShixunStudentWork extends Component {
{datalist === undefined ? "" : datalist.length===0? <div className="alltask">
<div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20" src="/images/educoder/nodata.png" />
<p className="edu-nodata-p mb20">暂无数据哦~</p>
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
</div>
</div>:<Table
dataSource={datalist}

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

@ -1203,7 +1203,7 @@ class ShixunHomework extends Component{
>
<div className="edu-tab-con-box clearfix edu-txt-center"><img className="edu-nodata-img mb20"
src="/images/educoder/nodata.png" />
<p className="edu-nodata-p mb20">暂无数据哦~</p></div>
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
</div>
</Spin>

2
public/react/src/modules/paths/ShixunPathCard.js
Unescape View File

@ -68,7 +68,7 @@ class ShixunPathCard extends Component{
):(
<div className="edu-tab-con-box clearfix edu-txt-center mb50">
<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
<p className="edu-nodata-p mb20">暂无数据哦~</p>
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
</div>
)
}

6
public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
Unescape View File

@ -348,14 +348,14 @@ class Challenges extends Component {
<div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20"
src={getImageUrl("images/educoder/nodata.png")} />
<p className="edu-nodata-p mb20">暂无数据哦~</p>
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
</div>
</div> : ChallengesDataList.challenge_list === undefined ?
<div className="alltask">
<div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20"
src={getImageUrl("images/educoder/nodata.png")} />
<p className="edu-nodata-p mb20">暂无数据哦~</p>
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
</div>
</div>
: ChallengesDataList.challenge_list.length === 0 ?
@ -363,7 +363,7 @@ class Challenges extends Component {
<div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20"
src={getImageUrl("images/educoder/nodata.png")} />
<p className="edu-nodata-p mb20">暂无数据哦~</p>
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
</div>
</div>
: ChallengesDataList.challenge_list.map((item, key) => {

2
public/react/src/modules/tpm/shixunchild/Propaedeutics/Propaedeu_tics.js
Unescape View File

@ -92,7 +92,7 @@ class Propaedeutics extends Component {
<div className="alltask">
<div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
<p className="edu-nodata-p mb20">暂无数据哦~</p>
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
</div>
</div>
</div>

2
public/react/src/modules/tpm/shixunchild/Repository/Repository.js
Unescape View File

@ -164,7 +164,7 @@ class Repository extends Component {
trees === undefined || trees === null ? <div className="alltask">
<div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
<p className="edu-nodata-p mb20">暂无数据哦~</p>
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
</div>
</div> :
<div>

2
public/react/src/modules/tpm/shixuns/ShixunCard.js
Unescape View File

@ -64,7 +64,7 @@ class ShixunCard extends Component {
<div className="square-list clearfix">
<div className="edu-tab-con-box clearfix edu-txt-center">
<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
<p className="edu-nodata-p mb20">暂无数据哦~</p>
<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
</div>
</div>
<div className="educontent edu-txt-center mb80">

5
public/stylesheets/educoder/edu-main.css
Unescape View File

@ -444,8 +444,9 @@ ul.abouttable li .minh-label{min-width: 150px;height: 28px;line-height: 28px;tex
.allNone tr{height: 30px!important;}
/*数据为空公共页面*/
img.edu-nodata-img{ width:300px; margin:50px auto 20px; display: block;}
.edu-nodata-p{ font-size: 20px; text-align: center; color:#999;border-bottom:none!important;padding-left: 18px;box-sizing: border-box;}
img.edu-nodata-img{ width:300px; margin:50px auto 20px; display: block; width: 128px;}
/* 不能加 padding-left: 18px; 会影响其他地方的居中 */
.edu-nodata-p{ font-size: 20px; text-align: center; color:#999;border-bottom:none!important;box-sizing: border-box;}
/*输入为空或者错误的提示*/
.input-none{box-shadow: 0px 0px 2px rgba(0,0,0,0.1);}

Write Preview
Loading…
Cancel
Save