Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' into educoder

Browse Source
dev_local
cxt 6 years ago
parent 8640200398 c88142d360
commit ee320c4c34
16 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File

4
Gemfile
Unescape View File

@ -15,8 +15,6 @@ unless RUBY_PLATFORM =~ /w32/
gem 'rqrcode_png'
gem 'roo-xls'
gem 'newrelic_rpm'
gem 'seventeen_mon'
gem 'mobinfo'
end
gem 'certified'
gem 'net-ssh', '2.9.1'
@ -24,6 +22,8 @@ unless RUBY_PLATFORM =~ /w32/
gem 'nokogiri'
end
gem 'seventeen_mon'
gem 'mobinfo'
gem 'simple_xlsx_reader'
gem 'wechat',path: 'lib/wechat'
gem 'grack', path:'lib/grack'

8
app/controllers/ec_courses_controller.rb
Unescape View File

@ -3,8 +3,8 @@ class EcCoursesController < ApplicationController
layout 'base_ec'
before_filter :find_ec_course, :except => [:create, :get_calculation_data, :sync_all_course_data]
before_filter :find_year, :only => [:create, :get_calculation_data]
before_filter :require_login
before_filter :ec_auth, :except => [:sync_all_course_data]
before_filter :require_login, :except => [:sync_all_course_data]
before_filter :ec_auth, :except => [:search_courses]
skip_before_filter :verify_authenticity_token, :only => [:crud_targets, :crud_score_level, :sync_all_course_data, :search_courses,
:correlation_course, :delete_course]
@ -349,11 +349,11 @@ class EcCoursesController < ApplicationController
if user.try(:admin?)
courses = Course.where(:is_delete => 0)
else
course_ids = Member.where("user_id = #{params[:user_id]} and course_id != -1").pluck(:course_id)
course_ids = Member.where("user_id = #{user.try(:id)} and course_id != -1").pluck(:course_id)
courses = Course.where(:is_delete => 0, :id => course_ids)
end
if params[:search] && params[:search].strip != ""
courses = courses.where("name like '%#{params[:search].strip}%'").reorder("created_at desc")
courses = courses.where("name like ?", "%#{params[:search].strip}%").reorder("created_at desc")
else
courses = courses.reorder("created_at desc")
end

6
app/controllers/ec_years_controller.rb
Unescape View File

@ -31,12 +31,10 @@ class EcYearsController < ApplicationController
end
@status = 1
end
@major_manager = User.current.admin? ||
@major_school.school.ec_school_users.pluck(:user_id).include?(User.current.id) ||
@major_school.ec_major_school_users.pluck(:user_id).include?(User.current.id)
@major_manager = true
@btn_text = @major_school.template_major && User.current.admin? ? "立即配置" :
(!@major_school.template_major && @major_manager ? "立即配置" : "查看")
@years = @major_school.ec_years
@years = EcYear.where(:ec_major_school_id => @major_school.id)
@years = paginateHelper @years, 10
respond_to do |format|
format.js

2
app/views/common/index.html.erb
Unescape View File

@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><meta name="renderer" content="webkit"/><meta name="force-rendering" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>Educoder</title><script type="text/javascript">window.__isR=!0</script><link rel="stylesheet" href="/react/build/css/css_min_all.css"><link rel="stylesheet" href="/assets/iconfont/iconfont.css"><link href="/react/build/./static/css/main.c95e49c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="md_div" style="display:none"></div><div id="root" class="page -layout-v -fit"></div><div id="picture_display" style="display:none"></div><script type="text/javascript" src="/react/build/js/js_min_all.js"></script><script type="text/javascript" src="/assets/kindeditor/kindeditor.js"></script><script type="text/javascript" src="/react/build/js/create_kindeditor.js"></script><script type="text/javascript" src="/javascripts/educoder/edu_application.js"></script><script type="text/javascript" src="/react/build/./static/js/main.533264d5.js"></script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><meta name="renderer" content="webkit"/><meta name="force-rendering" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>Educoder</title><script type="text/javascript">window.__isR=!0</script><link rel="stylesheet" href="/react/build/css/css_min_all.css"><link rel="stylesheet" href="/assets/iconfont/iconfont.css"><link href="/react/build/./static/css/main.c95e49c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="md_div" style="display:none"></div><div id="root" class="page -layout-v -fit"></div><div id="picture_display" style="display:none"></div><script type="text/javascript" src="/react/build/js/js_min_all.js"></script><script type="text/javascript" src="/assets/kindeditor/kindeditor.js"></script><script type="text/javascript" src="/react/build/js/create_kindeditor.js"></script><script type="text/javascript" src="/javascripts/educoder/edu_application.js"></script><script type="text/javascript" src="/react/build/./static/js/main.21bade1d.js"></script></body></html>

2
app/views/ec_majors/_major_addAcademicYear.html.erb
Unescape View File

@ -17,7 +17,7 @@
</div>
<li class="clearfix mt10 edu-txt-center">
<a href="javascript:void(0);" class="task-btn mr10" onclick="hideModal()">取消</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange ml20" onclick="submit_data();">确定</a>
<a href="javascript:void(0);" class="task-btn task-btn-orange ml20" onclick="submit_data(); hideModal();">确定</a>
</li>
</div>
</div>

5
app/views/ec_years/create.js.erb
Unescape View File

@ -1,6 +1,7 @@
<% if @status.to_i == -1 %>
notice_box("该界别已经存在,请勿重复创建")
<% else %>
$("#year_list").html('<%= j(render :partial => "ec_major_schools/year_list") %>')
hideModal();
window.location.reload();
console.log("##########<%= @years.count %>")
//$("#year_list").html('<%#= j(render :partial => "ec_major_schools/year_list") %>')
<% end %>

8
public/react/build/asset-manifest.json
Unescape View File

@ -17,8 +17,8 @@
"./static/js/15.0dcec662.chunk.js.map": "./static/js/15.0dcec662.chunk.js.map",
"./static/js/16.e8e3aa00.chunk.js": "./static/js/16.e8e3aa00.chunk.js",
"./static/js/16.e8e3aa00.chunk.js.map": "./static/js/16.e8e3aa00.chunk.js.map",
"./static/js/17.9edde574.chunk.js": "./static/js/17.9edde574.chunk.js",
"./static/js/17.9edde574.chunk.js.map": "./static/js/17.9edde574.chunk.js.map",
"./static/js/17.709dcd2a.chunk.js": "./static/js/17.709dcd2a.chunk.js",
"./static/js/17.709dcd2a.chunk.js.map": "./static/js/17.709dcd2a.chunk.js.map",
"./static/js/18.5fe45ac4.chunk.js": "./static/js/18.5fe45ac4.chunk.js",
"./static/js/18.5fe45ac4.chunk.js.map": "./static/js/18.5fe45ac4.chunk.js.map",
"./static/js/19.5f9a9263.chunk.js": "./static/js/19.5f9a9263.chunk.js",
@ -67,8 +67,8 @@
"./static/js/9.e77edf45.chunk.js.map": "./static/js/9.e77edf45.chunk.js.map",
"main.css": "./static/css/main.c95e49c6.css",
"main.css.map": "./static/css/main.c95e49c6.css.map",
"main.js": "./static/js/main.533264d5.js",
"main.js.map": "./static/js/main.533264d5.js.map",
"main.js": "./static/js/main.21bade1d.js",
"main.js.map": "./static/js/main.21bade1d.js.map",
"static/media/ERASBD.ttf": "static/media/ERASBD.d5213044.ttf",
"static/media/background1.png": "static/media/background1.a34df396.png",
"static/media/background2.png": "static/media/background2.22ee659e.png",

2
public/react/build/index.html
Unescape View File

@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><meta name="renderer" content="webkit"/><meta name="force-rendering" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>Educoder</title><script type="text/javascript">window.__isR=!0</script><link rel="stylesheet" href="/css/css_min_all.css"><link rel="stylesheet" href="http://testbdweb.educoder.net/assets/iconfont/iconfont.css"><link href="/react/build/./static/css/main.c95e49c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="md_div" style="display:none"></div><div id="root" class="page -layout-v -fit"></div><div id="picture_display" style="display:none"></div><script type="text/javascript" src="/js/js_min_all.js"></script><script type="text/javascript" src="http://testbdweb.educoder.net/assets/kindeditor/kindeditor.js"></script><script type="text/javascript" src="/js/create_kindeditor.js"></script><script type="text/javascript" src="http://testbdweb.educoder.net/javascripts/educoder/edu_application.js"></script><script type="text/javascript" src="/react/build/./static/js/main.533264d5.js"></script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"><meta name="theme-color" content="#000000"><meta name="renderer" content="webkit"/><meta name="force-rendering" content="webkit"/><meta http-equiv="X-UA-Compatible" content="IE=edge"/><link rel="manifest" href="/manifest.json"><link rel="shortcut icon" href="/favicon.ico"><title>Educoder</title><script type="text/javascript">window.__isR=!0</script><link rel="stylesheet" href="/css/css_min_all.css"><link rel="stylesheet" href="http://testbdweb.educoder.net/assets/iconfont/iconfont.css"><link href="/react/build/./static/css/main.c95e49c6.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="md_div" style="display:none"></div><div id="root" class="page -layout-v -fit"></div><div id="picture_display" style="display:none"></div><script type="text/javascript" src="/js/js_min_all.js"></script><script type="text/javascript" src="http://testbdweb.educoder.net/assets/kindeditor/kindeditor.js"></script><script type="text/javascript" src="/js/create_kindeditor.js"></script><script type="text/javascript" src="http://testbdweb.educoder.net/javascripts/educoder/edu_application.js"></script><script type="text/javascript" src="/react/build/./static/js/main.21bade1d.js"></script></body></html>

2
public/react/build/service-worker.js
View File

File diff suppressed because one or more lines are too long

2
public/react/build/static/js/17.709dcd2a.chunk.js
View File

File diff suppressed because one or more lines are too long

1
public/react/build/static/js/17.709dcd2a.chunk.js.map
View File

File diff suppressed because one or more lines are too long

2
public/react/build/static/js/17.9edde574.chunk.js
View File

File diff suppressed because one or more lines are too long

1
public/react/build/static/js/17.9edde574.chunk.js.map
View File

File diff suppressed because one or more lines are too long

4
public/react/build/static/js/main.533264d5.js → public/react/build/static/js/main.21bade1d.js
View File

File diff suppressed because one or more lines are too long

2
public/react/build/static/js/main.533264d5.js.map → public/react/build/static/js/main.21bade1d.js.map
View File

File diff suppressed because one or more lines are too long

13
public/react/src/modules/ec/ecCourseEvaluations/ecCourseEvaluations.js
Unescape View File

@ -660,10 +660,11 @@ class ecCourseEvaluations extends Component {
let{checkevalue}=this.state;
let ec_course_id=this.props.match.params.ec_course_id;
let tuser_id=this.props.current_user.user_id;
let Url =`/ec_courses/`+ec_course_id+`/correlation_course.json`;
axios.post(Url,{
course_id:checkevalue,
user_id:this.props.current_user.user_id
user_id:tuser_id
},{
withCredentials: true
}
@ -701,10 +702,11 @@ class ecCourseEvaluations extends Component {
if(e.keyCode == 13){
let {assclassvalue}=this.state;
let ec_course_id=this.props.match.params.ec_course_id;
let tuser_id=this.props.current_user.user_id;
let Url =`/ec_courses/`+ec_course_id+`/search_courses.json`;
axios.post(Url,{
search:assclassvalue,
user_id:this.props.current_user.user_id
user_id:tuser_id
},{
withCredentials: true
}
@ -721,10 +723,11 @@ class ecCourseEvaluations extends Component {
assclassnamesearch=()=>{
let {assclassvalue}=this.state;
let ec_course_id=this.props.match.params.ec_course_id;
let tuser_id=this.props.current_user.user_id;
let Url =`/ec_courses/`+ec_course_id+`/search_courses.json`;
axios.post(Url,{
search:assclassvalue,
user_id:this.props.current_user.user_id
user_id:tuser_id
},{
withCredentials: true
}
@ -870,8 +873,8 @@ class ecCourseEvaluations extends Component {
{/*课程考核方式与数据来源*/}
{/* <span className="fl font-18 courseSystem"></span> */}
{/* <a href="javascript:void(0)" className="fr white-btn edu-blueback-btn mt4">导出培养目标</a> */}
<a class="white-btn edu-blueline-btn fr mr10 mt2 associatedclass" onClick={this.associatedclass} style={{display:course_url!=""&&ecmanager===true?"block":"none"}}>关联课堂</a>
<a class="white-btn edu-blueline-btn fr mr10 mt2 associatedclass" onClick={this.deleteassociatedclass} style={{display:course_url===""||ecmanager===true?"none":"block"}}>取消关联</a>
<a class="white-btn edu-blueline-btn fr mr10 mt2 associatedclass" onClick={this.associatedclass} style={{display:course_url===""&&ecmanager===true?"block":"none"}}>关联课堂</a>
<a class="white-btn edu-blueline-btn fr mr10 mt2 associatedclass" onClick={this.deleteassociatedclass} style={{display:course_url!=""&&ecmanager===true?"block":"none"}}>取消关联</a>
<span className="Importclassroomdata" style={{top: '22px',display:ecmanager===false?"none":""}}>
<a className="white-btn edu-blueback-btn fr mb10 mr10" target="_blank" href={'/ec_courses/'+ec_course_id+'/export_ec_course_targets?format=xls'}>导出考核方法</a>
</span>

Write Preview
Loading…
Cancel
Save