kevinli
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop

This commit is contained in:
caishi 2017-09-15 22:59:24 +08:00
parent efdf12c5f7 a412a42976
commit 20c816cab0
17 changed files with 138 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -14,7 +14,7 @@ unless RUBY_PLATFORM =~ /w32/
gem 'nokogiri'
end
gem 'simple_xlsx_reader'
#gem 'simple_xlsx_reader'
gem 'wechat',path: 'lib/wechat'
gem 'grack', path:'lib/grack'
gem 'gitlab', path: 'lib/gitlab-cli'

28
app/controllers/courses_controller.rb
View File

@ -36,7 +36,7 @@ class CoursesController < ApplicationController
before_filter :require_login, :only => [:join, :unjoin]
#before_filter :allow_join, :only => [:join]
require 'bundler/setup'
require 'simple_xlsx_reader'
#require 'simple_xlsx_reader'
# params[:search] 搜索课程的名称
# params[:select] "join" "create" "all" 参与的 创建的 所有的课程
@ -978,23 +978,19 @@ class CoursesController < ApplicationController
join_course_messages = CourseMessage.where("user_id =? and course_message_type =? and course_id =? and status = ? and viewed =?", User.current.id, 'JoinCourse', @course.id, 1, 0)
join_course_messages.update_all(:viewed => true)
if User.current.allowed_to?(:as_teacher,@course)
@member ||= @course.members.new
@role = params[:role] if params[:role]
@member ||= @course.members.new
@role = params[:role] if params[:role]
@teachers = searchTeacherAndAssistant(@course)
@teacher_count = @teachers.count
@student_count = studentCount(@course)
@no_group_count = @course.members.where(:course_group_id => 0).select{|m| m.roles.to_s.include?("Student")}.count
@apply_users = CourseMessage.where(:course_id => @course.id,:course_message_type => 'JoinCourseRequest', :status => 0)
@teachers = searchTeacherAndAssistant(@course)
@teacher_count = @teachers.count
@student_count = studentCount(@course)
@no_group_count = @course.members.where(:course_group_id => 0).select{|m| m.roles.to_s.include?("Student")}.count
@apply_users = CourseMessage.where(:course_id => @course.id,:course_message_type => 'JoinCourseRequest', :status => 0)
@curr_page = '成员管理'
respond_to do |format|
format.html { render :layout => 'base_edu_course' }
format.api { render_validation_errors(@course) }
end
else
render_403
@curr_page = '成员管理'
respond_to do |format|
format.html { render :layout => 'base_edu_course' }
format.api { render_validation_errors(@course) }
end
end

2
app/controllers/homework_common_controller.rb
View File

@ -349,7 +349,7 @@ class HomeworkCommonController < ApplicationController
end
@homework.save
@homework_detail_manual.save
redirect_to student_work_index_path(:homework => @homework.id, :tab => 4)
redirect_to student_work_index_path(:homework => @homework.id)
end
def edit

24
app/helpers/courses_helper.rb
View File

@ -95,10 +95,10 @@ module CoursesHelper
#生成课程老师成员链接
def course_teacher_link teacher_num
if User.current.allowed_to?(:as_teacher, @course)
link_to teacher_num, settings_course_path(@course, :tab => 'member'), :class => 'ml5 edu-cir-grey-q color-orange05', :id => 'teacher_number'
elsif User.current.member_of_course?(@course)
link_to teacher_num, course_member_path(@course, :role => 't'), :class => 'ml5 edu-cir-grey-q color-orange05', :id => 'teacher_number'
if User.current.allowed_to?(:as_teacher, @course) || User.current.member_of_course?(@course)
link_to teacher_num, members_course_path(@course), :class => 'ml5 edu-cir-grey-q color-orange05', :id => 'teacher_number'
# elsif User.current.member_of_course?(@course)
# link_to teacher_num, course_member_path(@course, :role => 't'), :class => 'ml5 edu-cir-grey-q color-orange05', :id => 'teacher_number'
else
content_tag 'span',teacher_num, :class => 'ml5 edu-cir-grey-q color-orange05'
end
@ -106,10 +106,10 @@ module CoursesHelper
#生成课程学生列表连接
def course_student_link student_num
if User.current.allowed_to?(:as_teacher, @course)
link_to "#{student_num}", settings_course_path(@course, :tab => 'member', :role => 'as'), :class => 'ml5 edu-cir-grey-q color-orange05', :id => 'student_number'
elsif (User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course))
link_to "#{student_num}", course_member_path(@course, :role => 'as'), :class => 'ml5 edu-cir-grey-q color-orange05', :id => "student_number"
if User.current.allowed_to?(:as_teacher, @course) || User.current.member_of_course?(@course)
link_to "#{student_num}", members_course_path(@course, :role => 'as'), :class => 'ml5 edu-cir-grey-q color-orange05', :id => 'student_number'
# elsif (User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course))
# link_to "#{student_num}", course_member_path(@course, :role => 'as'), :class => 'ml5 edu-cir-grey-q color-orange05', :id => "student_number"
else
content_tag 'span',student_num, :class => 'ml5 edu-cir-grey-q color-orange05'
end
@ -117,10 +117,10 @@ module CoursesHelper
# 生成分班列表连接
def course_group_link group_num
if User.current.allowed_to?(:as_teacher, @course)
link_to "#{group_num}", settings_course_path(@course, :tab => 'member', :role => @course.course_groups.first.id), :class => 'ml5 edu-cir-grey-q color-orange05', :id => 'group_number'
elsif (User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course))
link_to "#{group_num}", course_member_path(@course, :role => @course.course_groups.first.id), :class => 'ml5 edu-cir-grey-q color-orange05', :id => "group_number"
if User.current.allowed_to?(:as_teacher, @course) || User.current.member_of_course?(@course)
link_to "#{group_num}", members_course_path(@course, :role => @course.course_groups.first.id), :class => 'ml5 edu-cir-grey-q color-orange03', :id => 'group_number'
# elsif (User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course))
# link_to "#{group_num}", course_member_path(@course, :role => @course.course_groups.first.id), :class => 'ml5 edu-cir-grey-q color-orange03', :id => "group_number"
else
content_tag 'span',group_num, :class => 'ml5 edu-cir-grey-q color-orange05'
end

6
app/views/boards/_course_show_detail.html.erb
View File

@ -3,8 +3,4 @@
<%= javascript_include_tag "create_kindeditor" %>
<% end %>
<% if @topics.count > 0 %>
<%= render :partial => 'users/course_boardlist', :locals => {:topics => @topics, :is_course => 1, :is_board=>1} %>
<% else %>
<%= render :partial => "welcome/no_data" %>
<% end %>
<%= render :partial => 'users/course_boardlist', :locals => {:topics => @topics, :is_course => 1, :is_board=>1} %>

2
app/views/courses/all_student_list.js.erb
View File

@ -1,4 +1,4 @@
<% if params[:page] %>
<% if params[:page] || params[:search] %>
<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
$("#student_table_div").html("<%= j(render :partial => "courses/settings/student_table", :locals => {:is_teacher => is_teacher}) %>");
<% else %>

2
app/views/courses/has_group_student_list.js.erb
View File

@ -1,4 +1,4 @@
<% if params[:page] %>
<% if params[:page] || params[:search] %>
<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
$("#student_table_div").html("<%= j(render :partial => "courses/settings/student_table", :locals => {:is_teacher => is_teacher}) %>");
<% else %>

2
app/views/courses/no_group_student_list.js.erb
View File

@ -1,4 +1,4 @@
<% if params[:page] %>
<% if params[:page] || params[:search] %>
<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
$("#student_table_div").html("<%= j(render :partial => "courses/settings/student_table", :locals => {:is_teacher => is_teacher}) %>");
<% else %>

19
app/views/courses/settings/_members.html.erb
View File

@ -1,3 +1,4 @@
<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
<div class="people clearfix">
<div class="left fl font-16 user_bg_shadow bor-grey-e">
<ul id="all_teacher_list_ul">
@ -7,9 +8,11 @@
<div class="right fl user_bg_shadow bc-white bor-grey-e">
<div class="banner clearfix font-16 teacher_banner" style="border-bottom:1px solid #eee;">
<span class="span1 fl ">成员列表（教师）</span>
<span class="span2 fr color-light-green">
<%= link_to '+&nbsp;教师/助教'.html_safe, search_not_teachers_course_path(@course), :remote => true, :class => 'white-btn orange-btn font-14' %>
</span>
<% if is_teacher %>
<span class="span2 fr color-light-green">
<%= link_to '+&nbsp;教师/助教'.html_safe, search_not_teachers_course_path(@course), :remote => true, :class => 'white-btn orange-btn font-14' %>
</span>
<% end %>
</div>
<div class="edu-bg" style="min-height:500px;">
<table class="edu-pop-table color-grey edu-txt-center table-pa5 interval-td" style="border:none;" cellspacing="0" cellpadding="0" >
@ -33,10 +36,12 @@
<td><span class="edu-txt-w140 task-hide mt5"><%= user.try(:login) %></span></td>
<td><%= zh_course_role(h teacher.roles.where("name != 'Student'").first.name) %></td>
<td>
<% if User.current == @course.teacher && user.id == @course.tea_id %>
<a href="javascript:void(0);" class="span5 changeadmin alink-operate" onclick="change_manager();">更换管理员</a>
<% elsif user.id != @course.tea_id %>
<a href="javascript:void(0);" class="span5 delete alink-operate" onclick="delete_confirm_box_2('<%=membership_path(teacher, :type => 1) %>', '确定要从教师列表中删除吗？')">删除</a>
<% if is_teacher %>
<% if User.current == @course.teacher && user.id == @course.tea_id %>
<a href="javascript:void(0);" class="span5 changeadmin alink-operate" onclick="change_manager();">更换管理员</a>
<% elsif user.id != @course.tea_id %>
<a href="javascript:void(0);" class="span5 delete alink-operate" onclick="delete_confirm_box_2('<%=membership_path(teacher, :type => 1) %>', '确定要从教师列表中删除吗？')">删除</a>
<% end %>
<% end %>
</td>
</tr>

20
app/views/homework_bank/_homework_bank_list.html.erb
View File

@ -91,4 +91,22 @@
<div class="cl"></div>
</div>
</ul>
</div>
</div>
<script>
$(function(){
$("#homework_bank_search").on("keydown", function(event){
var code;
if (!event) {
event = window.event; //针对ie浏览器
code = event.keyCode;
}
else {
code = event.keyCode;
}
if(code == 13) {
submit_homework_bank_search('<%= homework_bank_index_path(:type => @type, :order => @order, :sort => @r_sort, :property=>@property) %>')
}
});
});
</script>

2
app/views/homework_common/_edit_late_setting.html.erb
View File

@ -27,7 +27,7 @@
<ul id="late_relate_setting_ul">
<li class="clearfix mb15 pl30">
<label class="panel-form-label fl mr10">迟交扣分</label>
<input type="text" class="fl task-form-15 task-height-40 panel-box-sizing" value="<%= @homework.late_penalty %>" name="homework_late_penalty" placeholder="5" />
<input type="text" class="fl task-form-15 task-height-40 panel-box-sizing" value="<%= @is_new ? "5" : @homework.late_penalty %>" name="homework_late_penalty" placeholder="5" />
<span class="color-orange fl ml20 mt5 none" id="homework_late_penalty_notice"><i class="fa fa-exclamation-circle mr5 color-orange"></i></span>
</li>
</ul>

20
app/views/layouts/_group_children_list.html.erb
View File

@ -1,15 +1,15 @@
<li id="sy_08" class="clearfix">
<a href="<%= all_student_list_course_path(@course) %>" class="fl ml15">分班</a>
<% group_count = @course.course_groups.count %>
<span class="edu-cir-grey fl ml10 mt15"><%= group_count %></span>
</li>
<li id="sy_09" class="clearfix">
<% count = @course.members.where(:course_group_id => 0).select{|m| m.roles.to_s.include?("Student")}.count %>
<a href="<%= no_group_student_list_course_path(@course) %>" class="fl ml15">未分班</a>
<span class="edu-cir-grey fl ml10 mt15"><%= count %></span>
</li>
<% unless @course.course_groups.empty? %>
<ul>
<% group_count = @course.course_groups.count %>
<li id="sy_08" class="clearfix">
<a href="<%= all_student_list_course_path(@course) %>" class="fl ml15">分班</a>
<span class="edu-cir-grey fl ml10 mt15"><%= group_count %></span>
</li>
<li id="sy_09" class="clearfix">
<% count = @course.members.where(:course_group_id => 0).select{|m| m.roles.to_s.include?("Student")}.count %>
<a href="<%= no_group_student_list_course_path(@course) %>" class="fl ml15">未分班</a>
<span class="edu-cir-grey fl ml10 mt15"><%= count %></span>
</li>
<% @course.course_groups.each do |group| %>
<li id="course_group_<%=group.id %>" class="clearfix">
<% count = group.members.count %>

34
app/views/users/_course_boardlist.html.erb
View File

@ -1,4 +1,19 @@
<script>
$(function(){
$("#all_message_search").on("keydown", function(event){
var code;
if (!event) {
event = window.event; //针对ie浏览器
code = event.keyCode;
} else {
code = event.keyCode;
}
if(code == 13) {
submit_message_search();
return false;
}
});
});
function clear_search(){
if($('#all_message_search').val().trim() != ""){
$('#all_message_search').val('');
@ -15,19 +30,6 @@
}
});
}
$("#all_message_search").on("keydown", function(event){
var code;
if (!event) {
event = window.event; //针对ie浏览器
code = event.keyCode;
} else {
code = event.keyCode;
}
if(code == 13) {
submit_message_search();
return false;
}
});
</script>
<div class="bor-bottom-greyE pb5 pt5 clearfix">
<p class="fl pt5">
@ -46,7 +48,8 @@
<div class="cl"></div>
<div class="resources" style="padding: 0;width: 100%">
<!--列表内容-->
<% topics.each do |activity| %>
<% if @topics.count > 0 %>
<% topics.each do |activity| %>
<div class="panel-inner-fourm" style="padding: 10px 20px;">
<%= link_to image_tag(url_to_avatar(activity.author), :width => "60", :height => "60", :class => "panel-list-img mr15"), user_path(activity.author), :alt => "用户",:style => "width:60px;height:60px;display: block;" %>
<div class="panel-list-infobox clearfix ds">
@ -77,6 +80,9 @@
</p>
</div>
</div>
<% end %>
<% else %>
<%= render :partial => "welcome/no_data" %>
<% end %>
<!--列表分页-->
<div style="text-align:center;" class="new_expand">

2
app/views/users/_homework_base_info.html.erb
View File

@ -95,7 +95,7 @@
</li>
<% end %>
<li>
<%= link_to "设置", setting_homework_common_path(activity), :class => "wpostOptionLink" %>
<%= link_to "设置", student_work_index_path(:homework => activity.id, :tab => 4), :class => "wpostOptionLink" %>
</li>
<li>
<%= link_to "导出成绩", student_work_index_path(:homework => activity, :format => 'xls'), :id => "export_student_work", :class => "wpostOptionLink" %>

24
app/views/welcome/_two_btn_mask_pop.html.erb
View File

@ -24,24 +24,24 @@
<%= tip2 %>
</p>
<% end %>
<% if @authentication %>
<div class="clearfix task-popup-submit04">
<a href="javascript:void(0);" class="task-btn task-btn-blue" id="mask-left-btn"><%= btn1 %></a>
</div>
<% else %>
<div class="clearfix task-popup-submit" style="width:180px;">
<a href="javascript:void(0);" class="task-btn task-btn-blue fr" id="mask-left-btn"><%= btn1 %></a>
<a href="<%= url2 %>" class="task-btn task-btn-blue fr mr10" id="mask-right-btn" onclick="$('.task-popup-warp').remove();"><%= btn2 %></a>
</div>
<% end %>
<%# if @authentication %>
<!--<div class="clearfix task-popup-submit04">-->
<!--<a href="javascript:void(0);" class="task-btn task-btn-blue" id="mask-left-btn"><%#= btn1 %></a>-->
<!--</div>-->
<%# else %>
<!--<div class="clearfix task-popup-submit" style="width:180px;">-->
<!--<a href="javascript:void(0);" class="task-btn task-btn-blue fr" id="mask-left-btn"><%#= btn1 %></a>-->
<!--<a href="<%#= url2 %>" class="task-btn task-btn-blue fr mr10" id="mask-right-btn" onclick="$('.task-popup-warp').remove();"><%= btn2 %></a>-->
<!--</div>-->
<%# end %>
<div class="cl"></div>
<div class="mt10 undis" id="apply_reason_form">
<div class="mt10" id="apply_reason_form">
<%= form_tag(url1, :remote => true,:name=>"apply_trail_form",:id=>'apply_trail_form') do %>
<textarea class="reUploadDetail" id="apply_reason" name="apply_reason" placeholder="请在此填写推荐人信息或申请理由（必填）"></textarea>
<div class="cl"></div>
<div class="mt10">
<p id="hint_message" class="color-orange fl undis">请填写推荐人信息或申请理由</p>
<a href="javascript:void(0);" id="apply_trail_submit_btn" class="task-btn task-btn-blue fr sure">确定</a>
<a href="javascript:void(0);" id="apply_trail_submit_btn" class="task-btn task-btn-blue fr sure">试用申请</a>
<div class="cl"></div>
</div>
<% end %>

1
public/javascripts/edu/application.js
View File

@ -1011,7 +1011,6 @@ function submit_send_res_to_course(){
if($("input[name='course_ids[]']:checked").length >= 1){
$("#search_course_notice_h").html("").hide();
$("#course_list_form").submit();
alert("发送成功！");
hideModal();
}else{
$("#search_course_notice_h").html("请先选择一个班级").show();

34
public/javascripts/edu/base_edu.js
View File

@ -239,7 +239,19 @@ $(function(){
allowBlank:true,
lang:'ch',
format:'Y-m-d H:i',
validateOnBlur:false
validateOnBlur:false,
onSelectDate:function() {
if($.trim($("input[name='homework_appeal_time']").val()) == ""){
var date = new Date(Date.parse($("input[name='homework_evaluation_end']").val().replace(/-/g, "/")));
$("input[name='homework_appeal_time']").val(formate_time(new Date(date.setDate(date.getDate()+7))));
}
},
onSelectTime:function() {
if($.trim($("input[name='homework_appeal_time']").val()) == ""){
var date = new Date(Date.parse($("input[name='homework_evaluation_end']").val().replace(/-/g, "/")));
$("input[name='homework_appeal_time']").val(formate_time(new Date(date.setDate(date.getDate()+7))));
}
}
});
$("input[name='homework_appeal_time']").datetimepicker({
allowBlank:true,
@ -275,6 +287,22 @@ $(function(){
$(this).parent().parent('ul').find('input[type="text"]').removeAttr('disabled');
$(this).parent().parent('ul').find('input[type="text"]').removeClass('disabled-bg');
$("#anon_relate_setting_ul").show();
$("input[name='homework_anonymous_appeal']").attr("checked", "checked");
$("input[name='homework_appeal_time']").datetimepicker({
allowBlank:true,
lang:'ch',
format:'Y-m-d H:i',
validateOnBlur:false
});
$("input[name='homework_anonymous_appeal']").parent().parent('ul').find('input[type="text"]').removeAttr('disabled');
$("input[name='homework_anonymous_appeal']").parent().parent('ul').find('input[type="text"]').removeClass('disabled-bg');
if($("input[name='homework_evaluation_end']").val().trim() != ""){
var my_date = new Date();
var end_date = new Date(Date.parse($("input[name='homework_evaluation_end']").val().replace(/-/g, "/")));
var max_date = my_date > end_date ? my_date : end_date;
$("input[name='homework_appeal_time']").val(formate_time(new Date(max_date.setDate(max_date.getDate()+7))));
}
$("input[name='homework_appeal_penalty']").val("2");
if($("input[name='homework_end_time']").val().trim() != ""){
var my_date = new Date();
var end_date = new Date(Date.parse($("input[name='homework_end_time']").val().replace(/-/g, "/")));
@ -294,6 +322,10 @@ $(function(){
$("input[name='homework_absence_penalty']").val("0");
$("#anon_relate_setting_ul").hide();
$("select[name='st_proportion']").attr('disabled', 'disabled').addClass('disabled-bg').val(0.0);
$("input[name='homework_anonymous_appeal']").parent().parent('ul').find('input[type="text"]').attr('disabled', 'disabled');
$("input[name='homework_anonymous_appeal']").parent('ul').find('input[type="text"]').addClass('disabled-bg');
$("input[name='homework_appeal_time']").val("");
$("input[name='homework_appeal_penalty']").val("0");
}
});