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

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

Browse Source
dev_auth
杨树明 5 years ago
parent d615be0346 bb238dee63
commit 4761a7fe23
23 changed files with 56369 additions and 2741 deletions
Show Stats Download Patch File Download Diff File

12
app/assets/javascripts/admins/competition_settings/index.js
Unescape View File

@ -486,8 +486,8 @@ $(document).on('turbolinks:load', function(){
' <div class="col-6 no_padding ">\n' +
' <input type="number" class="form-control" onchange="change_total(this)" value="3" name="stage[][entry]">\n' +
' </div></div>\n' +
' <div class="row col-4"><span class="col-3 text-right mt-2 no_padding">成绩来源:</span>\n' +
' <div class="col-7 no_padding ">\n' +
' <div class="row col-3"><span class="col-4 text-right mt-2 no_padding">成绩来源:</span>\n' +
' <div class="col-6 no_padding ">\n' +
' <select class="form-control" name="stage[][score_source]">\n' +
' <option value="0">经验值</option>\n' +
' <option value="1">预测准确率</option>\n' +
@ -562,8 +562,8 @@ $(document).on('turbolinks:load', function(){
' <div class="col-6 no_padding ">\n' +
' <input type="number" class="form-control" onchange="change_total(this)" value="3" name="stage[][entry]">\n' +
' </div></div>\n' +
' <div class="row col-4"><span class="col-3 mr10 text-right mt-2 no_padding">成绩来源:</span>\n' +
' <div class="col-7 no_padding ">\n' +
' <div class="row col-3"><span class="col-4 mr10 text-right mt-2 no_padding">成绩来源:</span>\n' +
' <div class="col-6 no_padding ">\n' +
' <select class="form-control" name="stage[][score_source]">\n' +
' <option value="0">经验值</option>\n' +
' <option value="1">预测准确率</option>\n' +
@ -764,8 +764,8 @@ function addNewTab(competition_id) {
' <div class="col-6 no_padding ">\n' +
' <input type="number" class="form-control" onchange="change_total(this)" value="3" name="stage[][entry]">\n' +
' </div></div>\n' +
' <div class="row col-4"><span class="col-3 text-right mt-2 no_padding mr10">成绩来源:</span>\n' +
' <div class="col-7 no_padding ">\n' +
' <div class="row col-3"><span class="col-4 text-right mt-2 no_padding mr10">成绩来源:</span>\n' +
' <div class="col-6 no_padding ">\n' +
' <select class="form-control" name="stage[][score_source]">\n' +
' <option value="0">经验值</option>\n' +
' <option value="1">预测准确率</option>\n' +

12
app/assets/stylesheets/admins/competition_settings.scss
Unescape View File

@ -101,16 +101,16 @@
max-width: 25%;
}
.task_Input_div:nth-child(3n){
flex: 0 0 33.3%;
max-width: 33.3%;
}
.task_Input_div:nth-child(3n) > span.col-4{
flex: 0 0 25%;
max-width: 25%;
}
.task_Input_div:nth-child(3n) > span.col-4{
flex: 0 0 33.3%;
max-width: 33.3%;
}
.task_Input_div:nth-child(3n) > div.col-6{
flex: 0 0 58.3%;
max-width: 58.3%;
flex: 0 0 50%;
max-width: 50%;
}
}
}

21
app/controllers/courses_controller.rb
Unescape View File

@ -253,14 +253,14 @@ class CoursesController < ApplicationController
group_ids = params[:group_ids].is_a?(Array) ? params[:group_ids] : params[:group_ids].split(",") if params[:group_ids]
all_members = course_act_scores @course, group_ids
@course_members = all_members[0 .. 9]
if @user_course_identity == Course::STUDENT
user_ids = all_members.map(&:user_id)
rank = user_ids.index(current_user.id).to_i + 1
if rank > 10
current_member = all_members.select{|member| member.user_id == current_user.id}.first
@course_members << current_member if current_member.present?
end
end
# if @user_course_identity == Course::STUDENT
# user_ids = all_members.map(&:user_id)
# rank = user_ids.index(current_user.id).to_i + 1
# if rank > 10
# current_member = all_members.select{|member| member.user_id == current_user.id}.first
# @course_members << current_member if current_member.present?
# end
# end
end
def join_excellent_course
@ -1266,7 +1266,7 @@ class CoursesController < ApplicationController
@all_members = @course.students
search = params[:search] ? "#{params[:search].strip}" : "" #用户名或学生学号id搜索
group_id = params[:group_id] #分班的班级id
@all_members = @all_members.where(course_group_id: group_id) unless group_id.blank?
@all_members = @all_members.where(course_group_id: group_id.map(&:to_i)) unless group_id.blank?
unless search.blank?
@all_members = @all_members.joins(user: [:user_extension]).where('concat(users.lastname, users.firstname) like ? or user_extensions.student_id like ?',"%#{search}%","%#{search}%")
end
@ -1498,7 +1498,8 @@ class CoursesController < ApplicationController
WHERE cm.role = 4 and
(concat(users.lastname, users.firstname) like '%#{search}%' or ue.student_id like '%#{search}%')}
elsif group_id.present?
sql_select += %Q{ WHERE cm.role = 4 and cm.course_id = #{@course.id} and cm.course_group_id = #{group_id}}
group_id = group_id.is_a?(Array) ? group_id.map(&:to_i) : [group_id.to_i]
sql_select += %Q{ WHERE cm.role = 4 and cm.course_id = #{@course.id} and cm.course_group_id in (#{group_id.join(",")})}
else
sql_select += %Q{ WHERE cm.role = 4 and cm.course_id = #{@course.id}}
end

2
app/forms/users/apply_authentication_form.rb
Unescape View File

@ -1,7 +1,7 @@
class Users::ApplyAuthenticationForm
include ActiveModel::Model
attr_accessor :name, :id_number, :upload_image
attr_accessor :name, :id_number, :gender, :upload_image
validates :name, presence: true
validate :validate_ID_number

12
app/views/admins/competition_settings/index.html.erb
Unescape View File

@ -395,9 +395,9 @@
<input type="number" class="form-control task_all" value="<%= section.entry %>" onchange="change_total(this)" name="stage[][entry]"/>
</div>
</div>
<div class="row col-4">
<span class="col-3 text-right mt-2 no_padding mr10">成绩来源:</span>
<div class="col-7 no_padding">
<div class="row col-3">
<span class="col-4 text-right mt-2 no_padding mr10">成绩来源:</span>
<div class="col-6 no_padding">
<select class="form-control" name="stage[][score_source]">
<option value="0" <%= section.score_source == 0 ? "selected='selected'" : "" %>>经验值</option>
<option value="1" <%= section.score_source == 1 ? "selected='selected'" : "" %>>预测准确率</option>
@ -465,9 +465,9 @@
<input type="number" class="form-control task_all" onchange="change_total(this)" value="3" name="stage[][entry]"/>
</div>
</div>
<div class="row col-4">
<span class="col-3 text-right mt-2 no_padding mr10">成绩来源:</span>
<div class="col-7 no_padding">
<div class="row col-3">
<span class="col-4 text-right mt-2 no_padding mr10">成绩来源:</span>
<div class="col-6 no_padding">
<select class="form-control" name="stage[][score_source]">
<option value="0">经验值</option>
<option value="1">预测准确率</option>

2
public/assets/.sprockets-manifest-4627fa5586ef7fed55ca286af7c028e9.json
View File

File diff suppressed because one or more lines are too long

12
public/assets/admin-5d791c4f4a14e1586cfa44776ae262b3c1494e1c0fb0e00c330f0cb9d30fd7ba.js → public/assets/admin-22af0d0f8c16da312c9355540590a8b6de54729793a1bef2782aa4f9469a77ad.js
Unescape View File

@ -136556,8 +136556,8 @@ $(document).on('turbolinks:load', function(){
' <div class="col-6 no_padding ">\n' +
' <input type="number" class="form-control" onchange="change_total(this)" value="3" name="stage[][entry]">\n' +
' </div></div>\n' +
' <div class="row col-4"><span class="col-3 text-right mt-2 no_padding">成绩来源:</span>\n' +
' <div class="col-7 no_padding ">\n' +
' <div class="row col-3"><span class="col-4 text-right mt-2 no_padding">成绩来源:</span>\n' +
' <div class="col-6 no_padding ">\n' +
' <select class="form-control" name="stage[][score_source]">\n' +
' <option value="0">经验值</option>\n' +
' <option value="1">预测准确率</option>\n' +
@ -136632,8 +136632,8 @@ $(document).on('turbolinks:load', function(){
' <div class="col-6 no_padding ">\n' +
' <input type="number" class="form-control" onchange="change_total(this)" value="3" name="stage[][entry]">\n' +
' </div></div>\n' +
' <div class="row col-4"><span class="col-3 mr10 text-right mt-2 no_padding">成绩来源:</span>\n' +
' <div class="col-7 no_padding ">\n' +
' <div class="row col-3"><span class="col-4 mr10 text-right mt-2 no_padding">成绩来源:</span>\n' +
' <div class="col-6 no_padding ">\n' +
' <select class="form-control" name="stage[][score_source]">\n' +
' <option value="0">经验值</option>\n' +
' <option value="1">预测准确率</option>\n' +
@ -136834,8 +136834,8 @@ function addNewTab(competition_id) {
' <div class="col-6 no_padding ">\n' +
' <input type="number" class="form-control" onchange="change_total(this)" value="3" name="stage[][entry]">\n' +
' </div></div>\n' +
' <div class="row col-4"><span class="col-3 text-right mt-2 no_padding mr10">成绩来源:</span>\n' +
' <div class="col-7 no_padding ">\n' +
' <div class="row col-3"><span class="col-4 text-right mt-2 no_padding mr10">成绩来源:</span>\n' +
' <div class="col-6 no_padding ">\n' +
' <select class="form-control" name="stage[][score_source]">\n' +
' <option value="0">经验值</option>\n' +
' <option value="1">预测准确率</option>\n' +

BIN
public/assets/admin-5d791c4f4a14e1586cfa44776ae262b3c1494e1c0fb0e00c330f0cb9d30fd7ba.js.gz → public/assets/admin-22af0d0f8c16da312c9355540590a8b6de54729793a1bef2782aa4f9469a77ad.js.gz
View File

Binary file not shown.

5390
public/assets/admin-70dc0e7136a8f54139e4167c00f3fde9ccc92b404b01b37ac6064913806e3f6e.css → public/assets/admin-4c1fcf5a570db989682ef483c1016234a3b7614e0a8d42c040eed220298fef8c.css
View File

File diff suppressed because it is too large Load Diff

BIN
public/assets/admin-4c1fcf5a570db989682ef483c1016234a3b7614e0a8d42c040eed220298fef8c.css.gz
View File

Binary file not shown.

BIN
public/assets/admin-70dc0e7136a8f54139e4167c00f3fde9ccc92b404b01b37ac6064913806e3f6e.css.gz
View File

Binary file not shown.

11976
public/assets/application-8c9d6bb61c50908f584b3070c79aeb95f25c1166d39e07da5e95438b39ca0de9.css
View File

File diff suppressed because it is too large Load Diff

BIN
public/assets/application-8c9d6bb61c50908f584b3070c79aeb95f25c1166d39e07da5e95438b39ca0de9.css.gz
View File

Binary file not shown.

16088
public/assets/college-2fdfc5431b46ad4a454a25386dbcbc390466886f76b85fdb7e3f75018196a870.css
View File

File diff suppressed because it is too large Load Diff

BIN
public/assets/college-2fdfc5431b46ad4a454a25386dbcbc390466886f76b85fdb7e3f75018196a870.css.gz
View File

Binary file not shown.

25553
public/assets/cooperative-47d516a0904d0633e82c1de39a6ec4c9e6de0a37813843e01d4bacf97e8b2ebf.css
View File

File diff suppressed because it is too large Load Diff

BIN
public/assets/cooperative-47d516a0904d0633e82c1de39a6ec4c9e6de0a37813843e01d4bacf97e8b2ebf.css.gz
View File

Binary file not shown.

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.4 KiB

9
public/react/src/modules/courses/statistics/Statistics.css
Unescape View File

@ -40,13 +40,16 @@
width: 60px;
height: 60px;
border-radius: 50%;
box-shadow: 0px 0px 12px rgba(0,0,0,0.2);
border:1px solid #F4F4F4;
/*box-shadow: 0px 0px 12px rgba(0,0,0,0.2);*/
}
.huangguans{
width: 36px;
height: 17px;
position: absolute;
top: -30px;
left: 72px;
top: -6px;
left: 71px;
}
.relatives{

12
public/react/src/modules/courses/statistics/Statistics.js
Unescape View File

@ -6,8 +6,9 @@ import Dropdownbox from './Dropdownbox';
import Dynamiclist from './Dynamiclist';
import NoneData from "../../courses/coursesPublic/NoneData";
import './Statistics.css';
const qs = require('qs');
const { TabPane } = Tabs;
class Statistics extends Component{
constructor(props){
super(props);
@ -163,7 +164,10 @@ class Statistics extends Component{
group_id:group_ids
}
axios.get(url,{params:
data
data,
paramsSerializer: function(params) {
return qs.stringify(params, {arrayFormat: 'brackets'})
}
}).then((response)=>{
if(response === undefined){
return
@ -383,7 +387,7 @@ class Statistics extends Component{
{...this.state}
postwork_scoredata={(group_idss)=>this.getwork_scoredata(1,group_idss,'desc')}
/>}
<a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`)}>导出</a>
<a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(this.state.activeKey==="1"?`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`:`/courses/${this.props.match.params.coursesId}/export_member_act_score.xlsx`)}>导出</a>
</React.Fragment>;
return(
<React.Fragment>
@ -434,7 +438,7 @@ class Statistics extends Component{
return(
<Col span={5} className={"relatives"}>
<li className="pr rankingss">
<img src="https://test-newweb.educoder.net/images/educoder/huangguan.png" className="huangguans mb5" />
<img src="https://test-newweb.educoder.net/images/educoder/imperialcrown.png" className="huangguans mb5" />
<a href={`/users/${item.user_login}`} className="color-dark">
<img src={getImageUrl(`images/${item.avatar_url}`)} className={"mb10 mt5"}/>
</a>

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

@ -235,6 +235,10 @@ class NewHeader extends Component {
}
tojoinitem=()=>{
if(this.props.user&&this.props.user.email===undefined||this.props.user&&this.props.user.email===null||this.props.user&&this.props.user.email===""){
this.openNotification("请先绑定邮箱，谢谢");
return
}
let{user} =this.state;
if(user===undefined){
this.setState({
@ -609,7 +613,7 @@ submittojoinclass=(value)=>{
getUser=(url,type)=>{
if(type==="projects"){
if(!this.props.user&&this.props.user.email){
if(this.props.user&&this.props.user.email===undefined||this.props.user&&this.props.user.email===null||this.props.user&&this.props.user.email===""){
this.openNotification("请先绑定邮箱，谢谢");
return
}

3
public/react/src/modules/user/usersInfo/publicCreatNew.js
Unescape View File

@ -17,8 +17,7 @@ class publicCreateNew extends Component{
//头部获取是否已经登录了
getUser=(url)=> {
console.log(this.props)
if (!this.props.user && this.props.user.email) {
if (this.props.user&&this.props.user.email===undefined||this.props.user&&this.props.user.email===null||this.props.user&&this.props.user.email==="") {
this.props.showNotification("请先绑定邮箱，谢谢");
return
}

Write Preview
Loading…
Cancel
Save