From 3a394315a40a70942fc8737b79d9af09a8ff9d98 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 15 Sep 2017 21:25:16 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=A4=B4=E9=83=A8?= =?UTF-8?q?=E7=9A=84=E5=AD=A6=E7=94=9F=E5=88=97=E8=A1=A8=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 +- app/controllers/courses_controller.rb | 2 +- app/helpers/courses_helper.rb | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 711032123..9ba9eafd7 100644 --- a/Gemfile +++ b/Gemfile @@ -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' diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 8bfd88ffa..e223c0222 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -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" 参与的 创建的 所有的课程 diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 5336ffd56..127c65fcf 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -96,7 +96,7 @@ 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' + 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 @@ -107,7 +107,7 @@ 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' + 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 @@ -118,7 +118,7 @@ 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-orange03', :id => 'group_number' + 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 From 61f1d9bd10c7c08ba02b801094d66bc8f6e8ac2e Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 15 Sep 2017 22:35:36 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 26 ++++++-------- app/helpers/courses_helper.rb | 18 +++++----- app/views/boards/_course_show_detail.html.erb | 6 +--- app/views/courses/all_student_list.js.erb | 2 +- .../courses/has_group_student_list.js.erb | 2 +- .../courses/no_group_student_list.js.erb | 2 +- app/views/courses/settings/_members.html.erb | 19 +++++++---- .../_edit_late_setting.html.erb | 2 +- .../layouts/_group_children_list.html.erb | 20 +++++------ app/views/users/_course_boardlist.html.erb | 34 +++++++++++-------- app/views/users/_homework_base_info.html.erb | 2 +- public/javascripts/edu/application.js | 1 - public/javascripts/edu/base_edu.js | 34 ++++++++++++++++++- 13 files changed, 101 insertions(+), 67 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index e223c0222..d33d211ae 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -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 diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 127c65fcf..21acbdcb2 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -95,10 +95,10 @@ module CoursesHelper #生成课程老师成员链接 def course_teacher_link teacher_num - if User.current.allowed_to?(:as_teacher, @course) + 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' + # 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) + 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" + # 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) + 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" + # 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 diff --git a/app/views/boards/_course_show_detail.html.erb b/app/views/boards/_course_show_detail.html.erb index 5930d76df..8b766d033 100644 --- a/app/views/boards/_course_show_detail.html.erb +++ b/app/views/boards/_course_show_detail.html.erb @@ -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 %> \ No newline at end of file +<%= render :partial => 'users/course_boardlist', :locals => {:topics => @topics, :is_course => 1, :is_board=>1} %> diff --git a/app/views/courses/all_student_list.js.erb b/app/views/courses/all_student_list.js.erb index b17d198a1..a439657cb 100644 --- a/app/views/courses/all_student_list.js.erb +++ b/app/views/courses/all_student_list.js.erb @@ -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 %> diff --git a/app/views/courses/has_group_student_list.js.erb b/app/views/courses/has_group_student_list.js.erb index a9b65f5b3..4896db9dd 100644 --- a/app/views/courses/has_group_student_list.js.erb +++ b/app/views/courses/has_group_student_list.js.erb @@ -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 %> diff --git a/app/views/courses/no_group_student_list.js.erb b/app/views/courses/no_group_student_list.js.erb index 63c3e0e6d..662e8380b 100644 --- a/app/views/courses/no_group_student_list.js.erb +++ b/app/views/courses/no_group_student_list.js.erb @@ -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 %> diff --git a/app/views/courses/settings/_members.html.erb b/app/views/courses/settings/_members.html.erb index c3b9ef0e8..1c1806e00 100644 --- a/app/views/courses/settings/_members.html.erb +++ b/app/views/courses/settings/_members.html.erb @@ -1,3 +1,4 @@ +<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
    @@ -7,9 +8,11 @@
    @@ -33,10 +36,12 @@ diff --git a/app/views/homework_common/_edit_late_setting.html.erb b/app/views/homework_common/_edit_late_setting.html.erb index 2986eb927..d41ac0bed 100644 --- a/app/views/homework_common/_edit_late_setting.html.erb +++ b/app/views/homework_common/_edit_late_setting.html.erb @@ -27,7 +27,7 @@
    • - + " name="homework_late_penalty" placeholder="5" />
    diff --git a/app/views/layouts/_group_children_list.html.erb b/app/views/layouts/_group_children_list.html.erb index 5a80ec320..10e456a37 100644 --- a/app/views/layouts/_group_children_list.html.erb +++ b/app/views/layouts/_group_children_list.html.erb @@ -1,15 +1,15 @@ +
  • + 分班 + <% group_count = @course.course_groups.count %> + <%= group_count %> +
    • +
  • + <% count = @course.members.where(:course_group_id => 0).select{|m| m.roles.to_s.include?("Student")}.count %> + 未分班 + <%= count %> +
    • <% unless @course.course_groups.empty? %>
      - <% group_count = @course.course_groups.count %> -
    • - 分班 - <%= group_count %> -
      • -
    • - <% count = @course.members.where(:course_group_id => 0).select{|m| m.roles.to_s.include?("Student")}.count %> - 未分班 - <%= count %> -
      • <% @course.course_groups.each do |group| %>
    • <% count = group.members.count %> diff --git a/app/views/users/_course_boardlist.html.erb b/app/views/users/_course_boardlist.html.erb index 74c6654ac..15f4bc394 100644 --- a/app/views/users/_course_boardlist.html.erb +++ b/app/views/users/_course_boardlist.html.erb @@ -1,4 +1,19 @@

      @@ -46,7 +48,8 @@

      - <% topics.each do |activity| %> + <% if @topics.count > 0 %> + <% topics.each do |activity| %>
      <%= 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;" %>
      @@ -77,6 +80,9 @@

      + <% end %> + <% else %> + <%= render :partial => "welcome/no_data" %> <% end %>
      diff --git a/app/views/users/_homework_base_info.html.erb b/app/views/users/_homework_base_info.html.erb index bb42721cf..20f848480 100644 --- a/app/views/users/_homework_base_info.html.erb +++ b/app/views/users/_homework_base_info.html.erb @@ -95,7 +95,7 @@
      • <% end %>
    • - <%= link_to "设置", setting_homework_common_path(activity), :class => "wpostOptionLink" %> + <%= link_to "设置", student_work_index_path(:homework => activity.id, :tab => 4), :class => "wpostOptionLink" %>
    • <%= link_to "导出成绩", student_work_index_path(:homework => activity, :format => 'xls'), :id => "export_student_work", :class => "wpostOptionLink" %> diff --git a/public/javascripts/edu/application.js b/public/javascripts/edu/application.js index 8dac759a2..b90880a8a 100644 --- a/public/javascripts/edu/application.js +++ b/public/javascripts/edu/application.js @@ -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(); diff --git a/public/javascripts/edu/base_edu.js b/public/javascripts/edu/base_edu.js index 2aab075c6..88d9f4eaf 100644 --- a/public/javascripts/edu/base_edu.js +++ b/public/javascripts/edu/base_edu.js @@ -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"); } }); From 9b5218410642284410f338b2c378fa324643bcbb Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 15 Sep 2017 22:44:17 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=88=91=E7=9A=84=E9=A2=98=E5=BA=93?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=90=9C=E7=B4=A2=EF=BC=8C=E5=9B=9E?= =?UTF-8?q?=E8=BD=A6=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_common_controller.rb | 2 +- .../_homework_bank_list.html.erb | 20 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index 7f26da079..182d355f4 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -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 diff --git a/app/views/homework_bank/_homework_bank_list.html.erb b/app/views/homework_bank/_homework_bank_list.html.erb index 60b44b7e2..5cdc44cd7 100644 --- a/app/views/homework_bank/_homework_bank_list.html.erb +++ b/app/views/homework_bank/_homework_bank_list.html.erb @@ -91,4 +91,22 @@
    - \ No newline at end of file + + + \ No newline at end of file From a6d393d3af95261bfb03312edb76cf7352ba1b8b Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 15 Sep 2017 22:51:32 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AF=95=E7=94=A8=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=BC=B9=E6=A1=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/_two_btn_mask_pop.html.erb | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/views/welcome/_two_btn_mask_pop.html.erb b/app/views/welcome/_two_btn_mask_pop.html.erb index 8fa59a36a..6b035ca4b 100644 --- a/app/views/welcome/_two_btn_mask_pop.html.erb +++ b/app/views/welcome/_two_btn_mask_pop.html.erb @@ -24,24 +24,24 @@ <%= tip2 %>

    <% end %> - <% if @authentication %> -
    - <%= btn1 %> -
    - <% else %> -
    - <%= btn1 %> - <%= btn2 %> -
    - <% end %> + <%# if @authentication %> + + + + <%# else %> + + + + + <%# end %>
    -
    +
    <%= form_tag(url1, :remote => true,:name=>"apply_trail_form",:id=>'apply_trail_form') do %>

    请填写推荐人信息或申请理由

    - 确定 + 试用申请
    <% end %>
    <%= user.try(:login) %> <%= zh_course_role(h teacher.roles.where("name != 'Student'").first.name) %> - <% if User.current == @course.teacher && user.id == @course.tea_id %> - 更换管理员 - <% elsif user.id != @course.tea_id %> - 删除 + <% if is_teacher %> + <% if User.current == @course.teacher && user.id == @course.tea_id %> + 更换管理员 + <% elsif user.id != @course.tea_id %> + 删除 + <% end %> <% end %>