From 430f8c6f80390e33c780cc085e737e132ec6e40f Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 18 Sep 2017 10:00:36 +0800 Subject: [PATCH 01/38] gem --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 9ba9eafd7..711032123 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' From 63aed6be252f73eca565857697080deef9859831 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 18 Sep 2017 10:12:50 +0800 Subject: [PATCH 02/38] =?UTF-8?q?C=E8=AF=AD=E8=A8=80=E8=AF=84=E6=B5=8B?= =?UTF-8?q?=E5=AE=9E=E9=99=85=E8=BE=93=E5=87=BA=E4=B8=8E=E4=B8=AD=E9=97=B4?= =?UTF-8?q?=E5=B1=82=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/edu/edu_tpi.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/javascripts/edu/edu_tpi.js b/public/javascripts/edu/edu_tpi.js index 500d9b74c..a7ee1c82e 100644 --- a/public/javascripts/edu/edu_tpi.js +++ b/public/javascripts/edu/edu_tpi.js @@ -360,7 +360,7 @@ function setupAjaxIndicatorBase() { } function match_specific_symbol(str){ - str = str.replace(/ /g, "").replace(/\r\n$/, "").replace(/\n$/, "").replace(/\r\n/g, "
").replace(/\n/g, "
").replace(/\t/g, "") + str = str.replace(/ /g, "").replace(/\r\n$/, "").replace(/\n$/, "").replace(/\r$/, "").replace(/\r\n/g, "
").replace(/\n/g, "
").replace(/\r/g, "
").replace(/\t/g, "") return str }; From bad9e0b5e1da4aa5aad41c5e3810139182eee21a Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 18 Sep 2017 10:21:15 +0800 Subject: [PATCH 03/38] =?UTF-8?q?gem=E6=8A=A5=E6=9C=AC=E5=9C=B0=E4=B8=8D?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index 9ba9eafd7..405abe432 100644 --- a/Gemfile +++ b/Gemfile @@ -6,6 +6,7 @@ unless RUBY_PLATFORM =~ /w32/ if RUBY_PLATFORM =~ /darwin/ gem "rmagick", "= 2.15.4" ## osx must be this version elsif RUBY_PLATFORM =~ /linux/ + gem 'simple_xlsx_reader' gem "rmagick", "~> 2.13.1" ## centos yum install ImageMagick-devel end gem 'certified' @@ -14,7 +15,6 @@ unless RUBY_PLATFORM =~ /w32/ gem 'nokogiri' end -#gem 'simple_xlsx_reader' gem 'wechat',path: 'lib/wechat' gem 'grack', path:'lib/grack' gem 'gitlab', path: 'lib/gitlab-cli' From 71d2c18442ce2d96066174c1405dcd5b48d48cfb Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 18 Sep 2017 14:21:29 +0800 Subject: [PATCH 04/38] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E6=8A=80=E6=9C=AF=E5=B9=B3=E5=8F=B0=E5=90=8E=EF=BC=8C=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90TPM=E8=84=9A?= =?UTF-8?q?=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 48edf6bf8..7c13f9c13 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -580,7 +580,7 @@ class ShixunsController < ApplicationController begin @shixun.save! if language != params[:language] - shixun_modify_status_without_publish(@shixun, 1) + add_shixun_modify_status(@shixun, 1) end rescue @error = "实训保存失败" From eeefb8e51e85975a8d5e4f075563b05017fac9be Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 18 Sep 2017 14:43:00 +0800 Subject: [PATCH 05/38] =?UTF-8?q?=E5=9C=A8=E5=AE=9E=E8=AE=AD=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E6=A8=A1=E6=8B=9F?= =?UTF-8?q?=E5=AE=9E=E6=88=98=E5=90=8E=E8=B7=B3=E8=BD=AC=E7=9A=84=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA=E4=B8=8D=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/shixuns/_settings_edit.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/shixuns/_settings_edit.html.erb b/app/views/shixuns/_settings_edit.html.erb index 9124e27c9..6d3741c93 100644 --- a/app/views/shixuns/_settings_edit.html.erb +++ b/app/views/shixuns/_settings_edit.html.erb @@ -88,7 +88,7 @@ event.stopPropagation(); }); - $("body").click(function(event){ + $(".task-pm-content").click(function(event){ $(".course_list_ul").hide(); event.stopPropagation(); }); From 9161d4c065e1aede9be9360812fb6dd88a9cc83d Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 18 Sep 2017 14:46:18 +0800 Subject: [PATCH 06/38] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AF=BC=E5=87=BAexcel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index d33d211ae..746939399 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" 参与的 创建的 所有的课程 From f3c85b300c7af00348e69c1ba03a8388cd428291 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 18 Sep 2017 14:48:24 +0800 Subject: [PATCH 07/38] =?UTF-8?q?=E5=90=8C=E6=84=8F=E6=88=96=E6=8B=92?= =?UTF-8?q?=E7=BB=9D=E6=95=99=E5=B8=88=E5=8A=A0=E5=85=A5=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E4=BC=9A=E8=B7=B3=E8=BD=AC=E5=88=B0?= =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/members_controller.rb | 2 +- app/controllers/users_controller.rb | 2 +- app/views/members/destroy.js.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 156a6653b..5155933e0 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -487,7 +487,7 @@ class MembersController < ApplicationController CourseMessage.create(:user_id => @member.user_id, :course_id => @course.id, :course_message_type => "RemoveFromCourse", :viewed => false, :course_message_id => User.current.id) end respond_to do |format| - format.html { redirect_to_settings_in_courses } + format.html { redirect_to members_course_path(@course) } format.js format.api { if @member.destroyed? diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 78569490a..075e897f3 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -812,7 +812,7 @@ class UsersController < ApplicationController cs.send_wechat_join_class_notice apply_user,c,7,1 end end - redirect_to settings_course_path(@msg.course_id, :tab => 'member') + redirect_to members_course_path(@msg.course_id) end # 处理资源引用请求 diff --git a/app/views/members/destroy.js.erb b/app/views/members/destroy.js.erb index 93c878ec5..8ecee9521 100644 --- a/app/views/members/destroy.js.erb +++ b/app/views/members/destroy.js.erb @@ -3,7 +3,7 @@ $("#project_members_number").html("<%= @project.members.count %>"); <%elsif @course%> <% if params[:type] == '1' %> - notice_box_redirect('<%= settings_course_path(@course, :tab => 'member') %>',"删除成功"); + notice_box_redirect('<%= members_course_path(@course) %>',"删除成功"); <% else %> notice_box("删除成功"); <% if params[:group_id] == '0' %> From cb9e28f9073a8269b5de257c398414e2d0b2df59 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 18 Sep 2017 15:16:03 +0800 Subject: [PATCH 08/38] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E6=96=87=E5=AD=97?= =?UTF-8?q?=E7=9A=84=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 | 2 +- app/views/layouts/_course_base_info.html.erb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 746939399..12cd48c94 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -25,7 +25,7 @@ class CoursesController < ApplicationController menu_item l(:label_sort_by_active), :only => :index menu_item l(:label_sort_by_influence), :only => :index - before_filter :can_show_course, :except => [] + #before_filter :can_show_course, :except => [] before_filter :logged_user_by_apptoken,:only => [:show,:feedback] before_filter :find_course, :except => [ :index, :search, :new, :join, :unjoin, :create, :new_join, :course, :join_private_courses, :join_course_multi_role, :unjoin_group, :search_course_list] before_filter :authorize_course, :only => [:show, :settings, :update, :course] diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb index 097955e1c..a275be916 100644 --- a/app/views/layouts/_course_base_info.html.erb +++ b/app/views/layouts/_course_base_info.html.erb @@ -11,7 +11,7 @@ <% if User.current.admin? || User.current.member_of_course?(@course) %> 请将邀请码告诉成员
他们可以主动加入 <% else %> - 请向班级教师或助教
索要邀请码 + 请向课堂教师或助教
索要邀请码 <% end %> <% else %> 邀请码已停用
成员不能主动加入哦 @@ -83,7 +83,7 @@ <% unless (is_teacher || is_TA || is_TE || is_ST) %>
-

<%= link_to "加入班级", join_private_courses_courses_path, :remote => true, :method => "post", :class => 'color_white' %>

+

<%= link_to "加入课堂", join_private_courses_courses_path, :remote => true, :method => "post", :class => 'color_white' %>

<% end %> @@ -96,12 +96,12 @@ @@ -109,7 +109,7 @@
<% end %> From fcaa798620e4b2b1cd6d9fde92ed37427277ec6d Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 18 Sep 2017 15:25:34 +0800 Subject: [PATCH 09/38] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E4=BB=A3=E7=A0=81hook=E8=A7=A6=E5=8F=91=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 48edf6bf8..0aad136cb 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -20,7 +20,7 @@ class ShixunsController < ApplicationController end # push代码的时候会触发gitlab hook def ghook - shixun_modify_status_without_publish(@shixun, 1) + # shixun_modify_status_without_publish(@shixun, 1) render :json => {status: "success"} end From cd6d56059f5d1b9300fa4ef7152c87db8857b91c Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 18 Sep 2017 16:21:27 +0800 Subject: [PATCH 10/38] =?UTF-8?q?=E6=8F=90=E4=BE=9B=E8=B6=85=E7=BA=A7?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=9A=84=E6=A3=80=E7=B4=A2=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/managements_controller.rb | 50 +++++++++++-------- .../managements/classroom_classment.html.erb | 14 +++++- .../managements/classroom_classment.js.erb | 11 ++++ 3 files changed, 52 insertions(+), 23 deletions(-) diff --git a/app/controllers/managements_controller.rb b/app/controllers/managements_controller.rb index 3d60ed6ec..049118784 100644 --- a/app/controllers/managements_controller.rb +++ b/app/controllers/managements_controller.rb @@ -688,11 +688,11 @@ end end @search = params[:search] # 搜索字 @keyword = params[:keyword].blank? ? "u_name" : params[:keyword] # 根据姓名/课程名搜索 - status = params[:status].to_i - courselist = params[:course_list] + @status = params[:status] + @courselist = params[:course_list] + @school_id = params[:school_id] if params[:school_id] && params[:school_id] != '' - @school_id = params[:school_id] @courses = Course.joins("join users u on courses.tea_id = u.id").joins("join user_extensions ue on u.id = ue.user_id").where("ue.school_id = #{params[:school_id]}") end @@ -701,12 +701,11 @@ end end if params[:course_list] && params[:course_list] != '' - @courses = @courses.where(:course_list_id => courselist) + @courses = @courses.where(:course_list_id => @courselist) end if params[:status] && params[:status]!='' - @status = params[:status] - @courses =@courses.where(:is_end =>status) + @courses =@courses.where(:is_end => @status.to_i) end if "u_name" == @keyword if @search.blank? @@ -719,6 +718,7 @@ end @courses= @courses.where("name like '%#{@search}%'") end @courses = @courses.select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS updatetime").reorder("updatetime #{@sx_order}") + @export_courses = @courses @courses_count = @courses.count limit = 20 @is_remote = true @@ -728,6 +728,11 @@ end respond_to do |format| format.js format.html + format.xls{ + @export_courses = @export_courses.all + filename = "#{l(:label_course_list_xls)}.xls" + send_data(course_list_xls(@export_courses), :type => 'application/octet-stream', :filename => filename_for_content_disposition(filename)) + } end end @@ -1379,28 +1384,29 @@ end render_404 end - def course_list_xls course + def course_list_xls courses xls_report = StringIO.new book = Spreadsheet::Workbook.new sheet1 = book.create_worksheet :name => "course" blue = Spreadsheet::Format.new :color => :blue, :weight => :bold, :size => 10 sheet1.row(0).default_format = blue - sheet1.row(0).concat([l(:issue_xls_id),l(:issue_xls_tracker_id),l(:issue_xls_title),l(:issue_xls_description),l(:issue_xls_status),l(:issue_xls_assign),l(:issue_xls_priority),l(:issue_xls_author),l(:issue_xls_created_at),l(:milestone),l(:issue_xls_start),l(:issue_xls_due),l(:issue_xls_ratio)]) + sheet1.row(0).concat(["ID","课堂名称","成员","资源","普通作业"," 实训作业","试卷","私有","状态","创建者单位","创建者","动态时间"]) count_row = 1 - issues.each do |issue| - sheet1[count_row,0] = issue.id - sheet1[count_row,1] = issue_tracker_change(issue.tracker_id) - sheet1[count_row,2] = issue.subject - sheet1[count_row,3] = (issue.description.gsub(/<\/?.*?>/,"")).html_safe - sheet1[count_row,4] = issue_status_change(issue.status_id) - sheet1[count_row,5] = issue.assigned_to.try(:show_name) - sheet1[count_row,6] = issue_priority_change(issue.priority_id) - sheet1[count_row,7] = issue.author.show_name - sheet1[count_row,8] = issue.created_on.nil? ? issue.created_on : issue.created_on.strftime('%Y-%m-%d %H:%M:%S') - sheet1[count_row,9] = issue.fixed_version.try(:name) - sheet1[count_row,10] = issue.start_date.nil? ? issue.start_date : issue.start_date.strftime('%Y-%m-%d') - sheet1[count_row,11] = issue.due_date.nil? ? issue.due_date : issue.due_date.strftime('%Y-%m-%d') - sheet1[count_row,12] = issue_ratio_change(issue.done_ratio, issue.status_id) + courses.each do |course| + school = course.teacher.try(:user_extensions).try(:school).try(:name).blank? ? "--" : course.teacher.school_name + teacher_name = course.teacher ? course.teacher.show_real_name : "" + sheet1[count_row,0] = course.id + sheet1[count_row,1] = course.name + sheet1[count_row,2] = course.members.count + sheet1[count_row,3] = course.attachments.count + sheet1[count_row,4] = course.homework_commons.where(:homework_type => 1).count + sheet1[count_row,5] = course.homework_commons.where(:homework_type => 4).count + sheet1[count_row,6] = course.exercises.count + sheet1[count_row,7] = course.is_public.to_i == 1 ? '否' : '是' + sheet1[count_row,8] = course.is_end ? "已结束" : "正在进行" + sheet1[count_row,9] = school + sheet1[count_row,10] = teacher_name + sheet1[count_row,11] = format_time(course.updatetime) count_row += 1 end book.write xls_report diff --git a/app/views/managements/classroom_classment.html.erb b/app/views/managements/classroom_classment.html.erb index e8f8eae86..19eea2798 100644 --- a/app/views/managements/classroom_classment.html.erb +++ b/app/views/managements/classroom_classment.html.erb @@ -34,7 +34,19 @@ - <%#= link_to "导出Excel", export_excel_managements_path(:format => "xls"), :class => "task-btn task-btn-blue ml5 mt3 fr mb5 mr30" %> +
+ <%= link_to "导出Excel", + classroom_classment_managements_path( + :search => @search, + :keyword => @keyword, + :status => @status, + :course_list => @courselist, + :school_id => @school_id, + :format => "xls" + ), + :method => "POST", + :class => "task-btn task-btn-blue ml5 mt3 fr mb5 mr30" %> +
<% end %>
diff --git a/app/views/managements/classroom_classment.js.erb b/app/views/managements/classroom_classment.js.erb index de9e9f519..c51130b52 100644 --- a/app/views/managements/classroom_classment.js.erb +++ b/app/views/managements/classroom_classment.js.erb @@ -1 +1,12 @@ $("#managements_classroom_classment").html("<%= j(render :partial => "managements/classroom_classment_list") %>"); +$("#export_course_to_excel").html('<%= link_to "导出Excel", + classroom_classment_managements_path( + :search => @search, + :keyword => @keyword, + :status => @status, + :course_list => @courselist, + :school_id => @school_id, + :format => "xls" + ), + :method => "POST", + :class => "task-btn task-btn-blue ml5 mt3 fr mb5 mr30"%>'); \ No newline at end of file From 92f4506504d9faffa797c8ac458fa1eae75a776e Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 18 Sep 2017 17:11:16 +0800 Subject: [PATCH 11/38] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E6=A3=80=E7=B4=A2=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E7=82=B9=E5=87=BB=E5=8F=89=E5=8F=89=EF=BC=8C=E4=B9=9F?= =?UTF-8?q?=E4=BC=9A=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/shixuns/_shixun_list.html.erb | 21 ++++++++++++++------- app/views/shixuns/index.html.erb | 12 ------------ 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/app/views/shixuns/_shixun_list.html.erb b/app/views/shixuns/_shixun_list.html.erb index 0c31c3df1..7b425c6be 100644 --- a/app/views/shixuns/_shixun_list.html.erb +++ b/app/views/shixuns/_shixun_list.html.erb @@ -56,13 +56,20 @@ <% end %>
+ + + +
+
+
+

+ + kosasa > 讨论 > 新建 +

+
+

新建话题

+
+
+
    +
  • + +
    + + +
    +

    通 告

    +

    智能课堂

    +

    实训项目

    +
    +
    +
    • +
  • + + +

    标题不能超过60个字符

    +
    • +
  • + + + +

    内容不能为空

    +
    • +
  • +
    + + + + 上传附件 + +
    +
    • +
  • + 保存 + 取消 +
    • +
+
+
+
+
+ + diff --git a/app/views/forums/forum_form_detail.html b/app/views/forums/forum_form_detail.html new file mode 100644 index 000000000..2f7bf4b62 --- /dev/null +++ b/app/views/forums/forum_form_detail.html @@ -0,0 +1,116 @@ + + + + + + + + + + + + + +
+
+
+

+ + kosasa > 讨论 > 新建 +

+
+

五个值得推荐的英语学习网站，不可错过哦！

+

返回

+
+
+
+
+ 用户头像 +
+

创新使者

+

+ 类别：分享发表于1年前 +

+
+ +
+ + +
+
+
+ + 上传文件 +
+ +
+
+
+

全部回复(1)

+

+ 回复 + + + 赞 + 0 + + +

+
+ + +
+
+
+ +
+ +
+
+
+
+
+
+
+
+ + + + diff --git a/app/views/forums/forum_form_list.html b/app/views/forums/forum_form_list.html new file mode 100644 index 000000000..6ba36013a --- /dev/null +++ b/app/views/forums/forum_form_list.html @@ -0,0 +1,143 @@ + + + + + + + + + + + + + +
+
+
+

+ + kosasa > 讨论 +

+
+
+
+ +
+
  • 胡莎莎
    • +
  • P547687645213
    • +
    +
    +
      +
    • 983
      被赞
      • +
    • 983
      回复/评论
      • +
    • 983
      主题
      • +
    +
    +
    + +
    +
    +

    问吧

    + + 新话题 +
    +
    +
    + +
    + 华沙沙 +

    + 五个值得推荐的英语学习网站，不可错过哦！ +

    +

    1.练习口语 在线英语： http://dwz.cn/1XHGmL（免费在线口语课领取，外教一对一交流互动~） 特点：有正式课程挂网上公开，注册可免费听口语课，与外国老师实时交流哦~哈哈哈哈哈哈

    +

    + 10 + 10 + 10 + 类别：分享 + 最后更新：2小时前 +

    + +
    + + +
    +
    +
    + +
    + +
    + 华沙沙 +

    + 五个值得推荐的英语学习网站，不可错过哦！ +

    +

    1.练习口语 在线英语： http://dwz.cn/1XHGmL（免费在线口语课领取，外教一对一交流互动~） 特点：有正式课程挂网上公开，注册可免费听口语课，与外国老师实时交流哦~哈哈哈哈哈哈

    +

    + 10 + 10 + 10 + 类别：分享 + 最后更新：2小时前 +

    + +
    + + +
    +
    +
    + +
    + +
    + 华沙沙 +

    + 五个值得推荐的英语学习网站，不可错过哦！ +

    +

    1.练习口语 在线英语： http://dwz.cn/1XHGmL（免费在线口语课领取，外教一对一交流互动~） 特点：有正式课程挂网上公开，注册可免费听口语课，与外国老师实时交流哦~哈哈哈哈哈哈

    +

    + 10 + 10 + 10 + 类别：分享 + 最后更新：2小时前 +

    + +
    + + +
    +
    +
    +
    + +
    +
    + +
    +
    +
    +
    +
    +
    +
    + + diff --git a/app/views/homework_common/_homework_index_list.html.erb b/app/views/homework_common/_homework_index_list.html.erb index 4f9eea2b2..9c7692fa4 100644 --- a/app/views/homework_common/_homework_index_list.html.erb +++ b/app/views/homework_common/_homework_index_list.html.erb @@ -55,7 +55,7 @@

    <% if @is_teacher %> -
    +
      <% if homework_common.homework_type != 4 %> diff --git a/app/views/shixuns/settings.html.erb b/app/views/shixuns/settings.html.erb index f70b954c3..03a3e965e 100644 --- a/app/views/shixuns/settings.html.erb +++ b/app/views/shixuns/settings.html.erb @@ -1,8 +1,8 @@ <%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %> <%= javascript_include_tag '/editormd/lib/marked.min.js','/editormd/lib/prettify.min.js','/editormd/lib/raphael.min.js','/editormd/lib/underscore.min.js','/editormd/lib/sequence-diagram.min.js', '/editormd/lib/flowchart.min.js','/editormd/lib/jquery.flowchart.min.js','/editormd/editormd.js'%> -
      -
        +
        + -
        +
        diff --git a/public/stylesheets/css/edu-common.css b/public/stylesheets/css/edu-common.css index dff21d46b..5c52d96cf 100644 --- a/public/stylesheets/css/edu-common.css +++ b/public/stylesheets/css/edu-common.css @@ -235,6 +235,7 @@ a.edu-txt-w140,.edu-txt-w140{ width:141px; display: inline-block;} a.edu-txt-w100,.edu-txt-w100{ width:100px; display: inline-block;} .edu-txt-w50{ width:50px;} .edu-w245{ width: 245px; } +.overellipsis{overflow: hidden;white-space: nowrap;text-overflow: ellipsis;} /* 筛选按钮 */ .edu-btn-search{ position: absolute; top:0; right:15px;} .edu-bg-light-blue{ background:#f7f9fd; padding:5px;} @@ -326,6 +327,12 @@ html>body #ajax-indicator { position: fixed; } } +/*----------------------列表结构*/ +.forum_table .forum_table_item:nth-child(odd){background: #fafbfb} +.forum_table_item{padding: 10px 15px;display: flex;} +.forum_table_item .item_name{color: #333} +.forum_table_item .item_name:hover{color: #FF7500} + .edu-bg{ background:#fff;} /*---------tab切换-----*/ From ba67ef8a3a1264b49ee21b437311cf664249e7e4 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 19 Sep 2017 09:26:14 +0800 Subject: [PATCH 14/38] =?UTF-8?q?=E9=97=AE=E5=90=A7=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E7=B1=BB=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/forum_form_add.html | 4 ++-- app/views/forums/forum_form_detail.html | 6 +++--- app/views/forums/forum_form_list.html | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/forums/forum_form_add.html b/app/views/forums/forum_form_add.html index 6e3159fed..78240dfaa 100644 --- a/app/views/forums/forum_form_add.html +++ b/app/views/forums/forum_form_add.html @@ -23,7 +23,7 @@
          -
        • +
        • diff --git a/app/views/forums/forum_form_detail.html b/app/views/forums/forum_form_detail.html index 2f7bf4b62..ef849ed00 100644 --- a/app/views/forums/forum_form_detail.html +++ b/app/views/forums/forum_form_detail.html @@ -29,7 +29,7 @@

          创新使者

          - 类别：分享发表于1年前 + 发表于1年前

          @@ -42,11 +42,11 @@
        -
        +
        上传文件
        -
        From df60c289ad56c2663b29377d04264b3a2e2c6035 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Tue, 19 Sep 2017 17:15:50 +0800 Subject: [PATCH 18/38] =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A2=98=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E6=8D=A2=E8=A1=8C=E3=80=81=E5=BC=80=E5=A7=8B=E5=AE=9E?= =?UTF-8?q?=E6=88=98=E7=9A=84=E5=8A=A0=E8=BD=BD=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/games_controller.rb | 1 + app/controllers/myshixuns_controller.rb | 2 +- app/controllers/shixuns_controller.rb | 4 ++-- .../_single_or_multiple_question_show.html.erb | 2 +- app/views/games/_choice_question.html.erb | 2 +- app/views/layouts/base_myshixun.html.erb | 9 +++++++++ app/views/shixuns/_shixun_top.html.erb | 2 +- app/views/student_work/show.html.erb | 9 +++++---- app/views/subjects/show.html.erb | 8 ++++---- public/javascripts/edu/course.js | 2 +- public/stylesheets/css/taskstyle.css | 4 ++-- 11 files changed, 28 insertions(+), 17 deletions(-) diff --git a/app/controllers/games_controller.rb b/app/controllers/games_controller.rb index 335db9cb0..0a09663cf 100644 --- a/app/controllers/games_controller.rb +++ b/app/controllers/games_controller.rb @@ -29,6 +29,7 @@ class GamesController < ApplicationController # @st 0 实践任务 1 多选任务 2 单选任务 def show # 展示全部实训 + @is_subject = params[:is_subject] if @game.status == 1 # 放置页面ajax数据还没获取就关闭 @game.update_attribute(:status, 0) diff --git a/app/controllers/myshixuns_controller.rb b/app/controllers/myshixuns_controller.rb index 1c7aef02c..813c790b4 100644 --- a/app/controllers/myshixuns_controller.rb +++ b/app/controllers/myshixuns_controller.rb @@ -98,7 +98,7 @@ class MyshixunsController < ApplicationController raise("实训云平台繁忙（繁忙等级：87）") end end - redirect_to shixun_exec_shixun_path(shixun, :type => 1) + redirect_to shixun_exec_shixun_path(shixun, :type => 1, :is_subject => params[:is_subject]) rescue Exception => e flash[:error] = "实训云平台繁忙（繁忙等级：89）" g.delete_project(@myshixun.gpid) if !g_project.try(:id).nil? diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 48edf6bf8..a1fd6a384 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -384,7 +384,7 @@ class ShixunsController < ApplicationController myshixun = Myshixun.where(:user_id => User.current.id, :shixun_id => @shixun.id).first unless myshixun.blank? logger.info("current task id is #{myshixun.current_task}") - redirect_to myshixun_game_path(myshixun.current_task, :myshixun_id => myshixun) + redirect_to myshixun_game_path(myshixun.current_task, :myshixun_id => myshixun, :is_subject => params[:is_subject]) return end ActiveRecord::Base.transaction do @@ -434,7 +434,7 @@ class ShixunsController < ApplicationController raise("实训云平台繁忙（繁忙等级：81）") end logger.info("myshixun id si #{myshixun.id} and current_task id is#{myshixun.current_task.id}") - redirect_to myshixun_game_path(myshixun.current_task, :myshixun_id => myshixun) + redirect_to myshixun_game_path(myshixun.current_task, :myshixun_id => myshixun, :is_subject => params[:is_subject]) rescue Exception => e flash[:error] = e.message logger.info("failed to exec shixun: current task id is #{e}") diff --git a/app/views/challenges/_single_or_multiple_question_show.html.erb b/app/views/challenges/_single_or_multiple_question_show.html.erb index cc540b285..b4a528a8d 100644 --- a/app/views/challenges/_single_or_multiple_question_show.html.erb +++ b/app/views/challenges/_single_or_multiple_question_show.html.erb @@ -13,7 +13,7 @@ <% @challenge_choose.challenge_questions.each_with_index do |option, index| %>
      • -
        +
        <%= option.option_name %>
        • diff --git a/app/views/games/_choice_question.html.erb b/app/views/games/_choice_question.html.erb index e55443456..fdd548bea 100644 --- a/app/views/games/_choice_question.html.erb +++ b/app/views/games/_choice_question.html.erb @@ -27,7 +27,7 @@ name="answer[]" category="<%= choose.category %>" value="<%= (question.position + 65).chr %>" id="result_<%= index %>_<%= i %>" class="ml-3 mr5 magic-checkbox ml5"> <% end %> - +

        <% end %> diff --git a/app/views/layouts/base_myshixun.html.erb b/app/views/layouts/base_myshixun.html.erb index f633e36f4..221caf818 100644 --- a/app/views/layouts/base_myshixun.html.erb +++ b/app/views/layouts/base_myshixun.html.erb @@ -17,6 +17,12 @@ +
        +
        +
        EDUCODER
        +

        LOADING

        +
        +
        @@ -61,6 +67,9 @@ \ No newline at end of file diff --git a/app/views/challenges/choose_type_show.js.erb b/app/views/challenges/choose_type_show.js.erb index 2934cbc53..402097644 100644 --- a/app/views/challenges/choose_type_show.js.erb +++ b/app/views/challenges/choose_type_show.js.erb @@ -1,6 +1,7 @@ $("#task_content").html("<%= j(render :partial => 'single_or_multiple_question_show')%>"); $("#challenge_choose_tab").html("<%= j(render :partial => "challenges/choose_tab") %>"); +/* // JS局部刷新时，有可能加载不成功，需要重新加载一次（具体原因不明） editormd.loadKaTeX(function() { editormd.markdownToHTML("challenge_choose_subject_show", { @@ -17,4 +18,4 @@ editormd.loadKaTeX(function() { flowChart: true, // 默认不解析 sequenceDiagram: true // 默认不解析 }) -}); \ No newline at end of file +});*/ From d24b6fdb6d679fca7b31b340efa5689aa7a9a984 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 20 Sep 2017 09:47:36 +0800 Subject: [PATCH 22/38] =?UTF-8?q?=E5=AE=9E=E8=AE=ADtpm=E7=9A=84=E9=A2=84?= =?UTF-8?q?=E5=A4=87=E7=9F=A5=E8=AF=86=E7=82=B9=E5=87=BB=E6=97=A0=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/challenges/edit.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/challenges/edit.html.erb b/app/views/challenges/edit.html.erb index 148133a98..342c17084 100644 --- a/app/views/challenges/edit.html.erb +++ b/app/views/challenges/edit.html.erb @@ -56,9 +56,9 @@
      • "> 参考答案
        • -
      • - 预备知识 -
        • +
      • "> + 预备知识 +
      • "> 评分设置
        • From d1cf530237d896ae21d53e51131ce5e6be1c6051 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 20 Sep 2017 10:00:47 +0800 Subject: [PATCH 23/38] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E7=9A=84=E5=85=A8=E9=83=A8=E6=98=BE=E7=A4=BA=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=92=8C=E6=A3=80=E7=B4=A2=E7=9A=84=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=EF=BC=8C=E5=85=A8=E9=83=A8=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E7=9A=84=E6=95=B0=E6=8D=AE=E4=B8=8D=E7=AE=97=E9=9A=90?= =?UTF-8?q?=E8=97=8F=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index c398d388c..b975e6186 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -139,7 +139,7 @@ class ShixunsController < ApplicationController @sort = "asc" search = params[:search] @mail = User.current.mail.blank? - @shixun_all_count = Shixun.all.count + @shixun_all_count = Shixun.where(:hidden => 0).count @shixuns = Shixun.where("name like ? and hidden = 0", "%#{search}%") @shixuns.each do |shixun| shixun[:myshixunCount] = shixun.myshixuns.count From e86720be6bdcd5d21d2b631af020972dd9584a19 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 20 Sep 2017 10:19:41 +0800 Subject: [PATCH 24/38] =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=AE=9E=E8=AE=AD?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E7=9A=84=E6=8E=92=E5=BA=8F=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 2 +- app/views/shixuns/_shixun_list.html.erb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index b975e6186..cfbeacef6 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -242,7 +242,7 @@ class ShixunsController < ApplicationController bsort = params[:sort] || "desc" @sort = bsort == "desc" ? "asc" : "desc" if @order == "updated_at" - order_str = "#{Shixun.table_name}.updated_at #{bsort}" + order_str = "#{Shixun.table_name}.updated_at #{@sort}" else order_str = "myshixun_count #{bsort}, #{Shixun.table_name}.updated_at #{bsort}" end diff --git a/app/views/shixuns/_shixun_list.html.erb b/app/views/shixuns/_shixun_list.html.erb index 7b425c6be..295a301e4 100644 --- a/app/views/shixuns/_shixun_list.html.erb +++ b/app/views/shixuns/_shixun_list.html.erb @@ -2,8 +2,8 @@
      • "> <%= link_to "最热", search_shixuns_path(:order => "myshixun_count", :shixun_status => @shixun_status, :status => @status, :language => @language, :search => @search, :trainee => @trainee, :major =>@major, :course => @course, :sort => @sort), :remote => true %>
        • -
      • " id="nav_check_item_2"> - <%= link_to "最新", search_shixuns_path(:order => "created_at", :shixun_status => @shixun_status, :status => @status, :language => @language, :search => @search, :trainee => @trainee, :major =>@major, :course => @course, :sort => @sort), :remote => true %> +
      • " id="nav_check_item_2"> + <%= link_to "最新", search_shixuns_path(:order => "updated_at", :shixun_status => @shixun_status, :status => @status, :language => @language, :search => @search, :trainee => @trainee, :major =>@major, :course => @course, :sort => @sort), :remote => true %>
        • 共<%= @shixuns_count %>个检索结果
      From 01b8a72e38a74c372ea23fa5266635e2b217f2a1 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 20 Sep 2017 10:29:39 +0800 Subject: [PATCH 25/38] =?UTF-8?q?=E9=80=89=E6=8B=A9=E9=A2=98tpi=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=98=BE=E7=A4=BA=E6=B2=A1=E6=9C=89=E6=8C=89=E7=85=A7?= =?UTF-8?q?tpm=E7=9A=84=E6=8E=92=E5=BA=8F=E6=9D=A5=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...920022714_modify_position_type_for_challenge_choose.rb | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 db/migrate/20170920022714_modify_position_type_for_challenge_choose.rb diff --git a/db/migrate/20170920022714_modify_position_type_for_challenge_choose.rb b/db/migrate/20170920022714_modify_position_type_for_challenge_choose.rb new file mode 100644 index 000000000..94c1b6445 --- /dev/null +++ b/db/migrate/20170920022714_modify_position_type_for_challenge_choose.rb @@ -0,0 +1,8 @@ +class ModifyPositionTypeForChallengeChoose < ActiveRecord::Migration + def up + change_column :challenge_chooses, :position, :integer + end + + def down + end +end From 833be4dbaabb12f9a641ea74d4688679fec080d5 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 20 Sep 2017 11:16:26 +0800 Subject: [PATCH 26/38] =?UTF-8?q?=E8=AE=AD=E8=B7=AF=E5=BE=84=E7=9A=84?= =?UTF-8?q?=E7=AE=80=E4=BB=8B=E3=80=81=E5=AD=A6=E4=B9=A0=E9=A1=BB=E7=9F=A5?= =?UTF-8?q?=EF=BC=8C=E8=AF=B7=E6=94=B9=E4=B8=BA=20ke=20=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 2 +- app/views/subjects/new.html.erb | 38 ++++++++++++++++++++++++--- app/views/subjects/show.html.erb | 4 +-- public/javascripts/edu/base_edu.js | 6 +++-- 4 files changed, 41 insertions(+), 9 deletions(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 12cd48c94..8ea6afc5b 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/views/subjects/new.html.erb b/app/views/subjects/new.html.erb index 6e2fd1f6f..95e0779bd 100644 --- a/app/views/subjects/new.html.erb +++ b/app/views/subjects/new.html.erb @@ -1,3 +1,6 @@ +<%= content_for(:header_tags) do %> + <%= import_ke(enable_at: false, prettify: false, init_activity: false) %> +<% end %>

      @@ -23,14 +26,41 @@

    • - - + + <%#= hidden_field_tag :asset_id, params[:asset_id], :required => false, :style => 'display:none' %> + + <%= f.kindeditor :description, + :editor_id => 'new_subject_description', + :owner_id => 0, + :owner_type => OwnerTypeHelper::MESSAGE, + :width => '80%', + :height => 300, + :minHeight=>300, + :class => 'talk_text fl', + :input_html => { :id => 'new_subject_description', + :class => 'task task-height-220 panel-box-sizing task-form-80 fl color-grey ml20', + :maxlength => 5000 } + %> +
      请输入简介
    • - - + + + <%= f.kindeditor :learning_notes, + :editor_id => 'new_learning_notes', + :owner_id => 0, + :owner_type => OwnerTypeHelper::MESSAGE, + :width => '80%', + :height => 300, + :minHeight=>300, + :class => 'talk_text fl', + :input_html => { :id => 'new_learning_notes', + :class => 'task task-height-220 panel-box-sizing task-form-80 fl color-grey ml20', + :maxlength => 5000 } + %> + <
      请输入学习须知
      • diff --git a/app/views/subjects/show.html.erb b/app/views/subjects/show.html.erb index 7db344b7a..a3593101e 100644 --- a/app/views/subjects/show.html.erb +++ b/app/views/subjects/show.html.erb @@ -9,7 +9,7 @@ <% end %>

      - 
      <%= @subject.description.blank? ? "暂未填写" : (@subject.description) %>
      + 
      <%= @subject.description.blank? ? "暂未填写" : (@subject.description.html_safe) %>
      <% end %> @@ -142,7 +142,7 @@ <% end %>

      - 
      <%= @subject.learning_notes.blank? ? "暂未填写" : @subject.learning_notes %>
      + 
      <%= @subject.learning_notes.blank? ? "暂未填写" : @subject.learning_notes.html_safe %>

      教学团队 diff --git a/public/javascripts/edu/base_edu.js b/public/javascripts/edu/base_edu.js index 88d9f4eaf..34e761a12 100644 --- a/public/javascripts/edu/base_edu.js +++ b/public/javascripts/edu/base_edu.js @@ -1094,19 +1094,21 @@ function submit_new_subject(){ } else{ $("#new_subject_name_notice").hide(); } - if($("#new_subject_description").val().trim() == ""){ + if(new_subject_description.isEmpty()){ check = false; $("#new_subject_description_notice").show(); } else{ $("#new_subject_description_notice").hide(); } - if($("#new_learning_notes").val().trim() == ""){ + if(new_learning_notes.isEmpty()){ check = false; $("#new_learning_notes_notice").show(); } else { $("#new_learning_notes_notice").hide(); } if(check){ + new_subject_description.sync(); + new_learning_notes.sync(); $("#new_subject").submit(); } } From 982c8dde1201b9aaadbec64cf973047268a95a19 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 20 Sep 2017 11:30:40 +0800 Subject: [PATCH 27/38] =?UTF-8?q?=E5=BA=95=E9=83=A8=E5=AF=BC=E8=88=AA?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E8=B7=B3=E8=BD=AC=E5=87=BA=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_footer.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 0ebd74121..eacd49b71 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -9,7 +9,7 @@

      -

      Copyright 2007~2017, All Rights Reserved.  湘ICP备17009477号
      Powered by Trustie and IntelliDE.

      +

      Copyright 2007~2017, All Rights Reserved.  湘ICP备17009477号
      Powered by Trustie and IntelliDE.

      From a89f462b22086bcc14b9e83ba0a545586ecbaf84 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 20 Sep 2017 14:06:25 +0800 Subject: [PATCH 28/38] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=A2=98=E4=BB=BB=E5=8A=A1=E7=9A=84=E6=8A=80=E8=83=BD=E7=82=B9?= =?UTF-8?q?=E6=94=B9=E6=88=90=E7=9F=A5=E8=AF=86=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/challenges/_single_or_multiple_question.html.erb | 2 +- app/views/challenges/_single_or_multiple_question_show.html.erb | 2 +- app/views/games/_games_list.html.erb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/challenges/_single_or_multiple_question.html.erb b/app/views/challenges/_single_or_multiple_question.html.erb index 724071dc4..9f51cbabf 100644 --- a/app/views/challenges/_single_or_multiple_question.html.erb +++ b/app/views/challenges/_single_or_multiple_question.html.erb @@ -120,7 +120,7 @@
    • - +
      <% unless @challenge_choose.blank? %> <% @challenge_choose.challenge_tags.each do |tag| %> diff --git a/app/views/challenges/_single_or_multiple_question_show.html.erb b/app/views/challenges/_single_or_multiple_question_show.html.erb index 04861b126..088a1fee3 100644 --- a/app/views/challenges/_single_or_multiple_question_show.html.erb +++ b/app/views/challenges/_single_or_multiple_question_show.html.erb @@ -48,7 +48,7 @@

    • - +
      <% if @challenge_choose.challenge_tags.blank? %> 无 diff --git a/app/views/games/_games_list.html.erb b/app/views/games/_games_list.html.erb index 9c57cd290..868cf8624 100644 --- a/app/views/games/_games_list.html.erb +++ b/app/views/games/_games_list.html.erb @@ -45,7 +45,7 @@ <% else %> 经验值<%= challenge.choose_score %> 金币<%= challenge.choose_score %> - 技能标签<%= challenge.choose_tags_num %> + 知识点<%= challenge.choose_tags_num %> <% end %> <% elsif game.try(:status) == 2 %> <% final_score = (game.answer_open? || @myshixun.shixun.status <= 1) ? 0 : game.final_score.to_i %> From e5dc4a904df5bfb4d42888b78b978b587b4f8c3d Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Wed, 20 Sep 2017 14:28:20 +0800 Subject: [PATCH 29/38] =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=8D=95=E9=80=89?= =?UTF-8?q?=E9=A2=98=E9=A2=98=E5=B9=B2=EF=BC=8CMD=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E5=99=A8=E6=9C=89=E7=82=B9=E5=8F=B3=E5=81=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_single_or_multiple_question.html.erb | 119 ++++++++++-------- app/views/games/_games_list.html.erb | 1 - 2 files changed, 64 insertions(+), 56 deletions(-) diff --git a/app/views/challenges/_single_or_multiple_question.html.erb b/app/views/challenges/_single_or_multiple_question.html.erb index 9f51cbabf..04496dd2d 100644 --- a/app/views/challenges/_single_or_multiple_question.html.erb +++ b/app/views/challenges/_single_or_multiple_question.html.erb @@ -1,5 +1,16 @@ <%= stylesheet_link_tag '/editormd/css/editormd','/editormd/css/editormd.min.css' %> <%= javascript_include_tag '/editormd/editormd.min.js','/editormd/examples/js/jquery.min.js' %> +