From 6d32e812aa95b637902d5e54bcbdb36dbf2bb20d Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 9 May 2016 11:06:23 +0800 Subject: [PATCH 01/68] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=92=8C=E4=BD=9C=E4=B8=9A=E7=9A=84=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20160509025404_update_activity.rb | 24 ++++++++++++++++++++ db/schema.rb | 2 +- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 db/migrate/20160509025404_update_activity.rb diff --git a/db/migrate/20160509025404_update_activity.rb b/db/migrate/20160509025404_update_activity.rb new file mode 100644 index 000000000..2a959f5a2 --- /dev/null +++ b/db/migrate/20160509025404_update_activity.rb @@ -0,0 +1,24 @@ +class UpdateActivity < ActiveRecord::Migration + def up + homeworks = HomeworkCommon.where("course_id = 342") + unless homeworks.nil? + homeworks.each do |h| + course_activity = CourseActivity.where("course_act_type=? and course_act_id =?", 'HomeworkCommon', h.id).first + user_activity = UserActivity.where("act_type=? and act_id =?", 'HomeworkCommon', h.id).first + org_activity = OrgActivity.where("org_act_type=? and org_act_id =?", 'HomeworkCommon', h.id).first + if course_activity && h.updated_at > course_activity.updated_at + course_activity.update_column('updated_at', h.updated_at) + end + if user_activity && h.updated_at > user_activity.updated_at + user_activity.update_column('updated_at', h.updated_at) + end + if org_activity && h.updated_at > org_activity.updated_at + org_activity.update_column('updated_at', h.updated_at) + end + end + end + end + + def down + end +end diff --git a/db/schema.rb b/db/schema.rb index 3ffa35872..c96524c5e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20160506104128) do +ActiveRecord::Schema.define(:version => 20160509025404) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false From 644e097dc8bb17ac881b3a3e0d7d14f38b67e107 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 9 May 2016 16:16:03 +0800 Subject: [PATCH 02/68] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E5=85=B3=E8=81=94=E9=A1=B9=E7=9B=AE=E7=9A=84=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/homework_common_controller.rb | 6 +- lib/tasks/update_homework.rake | 65 +++++++++++++++++++ 2 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 lib/tasks/update_homework.rake diff --git a/app/controllers/homework_common_controller.rb b/app/controllers/homework_common_controller.rb index e724846d6..02a6992e8 100644 --- a/app/controllers/homework_common_controller.rb +++ b/app/controllers/homework_common_controller.rb @@ -11,9 +11,9 @@ class HomeworkCommonController < ApplicationController before_filter :member_of_course, :only => [:index] def index - unless params[:page] - update_homework_time(@course.homework_commons) - end + #unless params[:page] + # update_homework_time(@course.homework_commons) + #end @new_homework = HomeworkCommon.new @new_homework.homework_detail_manual = HomeworkDetailManual.new @new_homework.course = @course diff --git a/lib/tasks/update_homework.rake b/lib/tasks/update_homework.rake new file mode 100644 index 000000000..229337dc5 --- /dev/null +++ b/lib/tasks/update_homework.rake @@ -0,0 +1,65 @@ +#coding=utf-8 + +namespace :update_homework do + desc "update homework project time" + def update_homework_time homeworks + unless homeworks.nil? + homeworks.each do |h| + if h.homework_type == 3 + student_works = h.student_work_projects.where("is_leader = 1 && project_id != -1") + time = h.updated_at + unless student_works.nil? + student_works.each do |s| + project = Project.find s.project_id + unless project.nil? && project.gpid.nil? + project_time=project.updated_on + project_time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last + if time.strftime('%Y-%m-%d %H:%M:%S') < project_time.strftime('%Y-%m-%d %H:%M:%S') + time = project_time + end + begin + # gitlab端获取默认分支 + g = Gitlab.client + default_branch = g.project(project.gpid).default_branch + changesets = g.commits(project.gpid, :ref_name => default_branch) + changesets_latest_coimmit = changesets[0] + unless changesets[0].blank? + if time.strftime('%Y-%m-%d %H:%M:%S') h.updated_at.strftime('%Y-%m-%d %H:%M:%S') + h.update_column('updated_at', s_time) + course_activity = CourseActivity.where("course_act_type=? and course_act_id =?", 'HomeworkCommon', h.id).first + if course_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > course_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S')) + course_activity.update_column('updated_at', s_time) + end + user_activity = UserActivity.where("act_type=? and act_id =?", 'HomeworkCommon', h.id).first + if user_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > user_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S')) + user_activity.update_column('updated_at', s_time) + end + org_activity = OrgActivity.where("org_act_type=? and org_act_id =?", 'HomeworkCommon', h.id).first + if org_activity && (time.strftime('%Y-%m-%d %H:%M:%S') > org_activity.updated_at.strftime('%Y-%m-%d %H:%M:%S')) + org_activity.update_column('updated_at', s_time) + end + end + end + end + end + end + task :update_homework => :environment do + year = Time.now.year + courses = Course.where("time > ? and is_delete = 0", (year.to_i - 2)) + course_ids = courses.nil? ? '(-1)' : '(' + courses.map{|c| c.id}.join(',') + ')' + homeworks = HomeworkCommon.where("course_id in #{course_ids} and homework_type = 3") + unless homeworks.nil? + update_homework_time homeworks + end + end +end From 1eb41478b2d551731c06570f358cdfa25fe94cc6 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 9 May 2016 17:06:10 +0800 Subject: [PATCH 03/68] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E5=92=8C=E9=A6=96=E9=A1=B5=E5=8A=A8=E6=80=81=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8A=A8=E6=80=81=E5=AE=9E=E7=8E=B0=E4=BA=8C?= =?UTF-8?q?=E7=BA=A7=E5=9B=9E=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 6 ++ app/controllers/words_controller.rb | 4 +- .../_org_course_homework.html.erb | 66 ++++++++++++++---- app/views/users/_course_homework.html.erb | 67 ++++++++++++++----- app/views/users/_reply_to.html.erb | 2 + .../users/_user_homework_detail.html.erb | 4 +- app/views/words/reply_to_homework.js.erb | 5 +- 7 files changed, 121 insertions(+), 33 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 0dd947be4..01d87374c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -95,7 +95,13 @@ class UsersController < ApplicationController case params[:type] when 'HomeworkCommon' @reply = JournalsForMessage.find params[:reply_id] + if params[:user_activity_id] + @user_activity_id = params[:user_activity_id] + else + @user_activity_id = -1 + end @is_in_course = params[:is_in_course] + @course_activity = params[:course_activity].to_i end respond_to do |format| format.js diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index e17f03c38..fa084e349 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -317,7 +317,9 @@ class WordsController < ApplicationController update_org_activity(@homework_common.class,@homework_common.id) respond_to do |format| format.js{ - @is_in_course = params[:is_in_course] + @user_activity_id = params[:user_activity_id].to_i + @is_in_course = params[:is_in_course].to_i + @course_activity = params[:course_activity].to_i } end else diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb index 19cdcf2f1..179e4678e 100644 --- a/app/views/organizations/_org_course_homework.html.erb +++ b/app/views/organizations/_org_course_homework.html.erb @@ -276,7 +276,8 @@ <% count=activity.journals_for_messages.count %>
-
回复 +
回复 + ︿ <%= count>0 ? "（#{count}）" : "" %>▪ <% if activity.user == User.current %> @@ -318,23 +319,60 @@ <% else %> <%= link_to comment.try(:user).try(:realname), user_url_in_org(comment.user_id), :class => "newsBlue mr10 f14" %> <% end %> - <%= format_time(comment.created_on) %> - - <% if comment.user == User.current %> - + <%= time_from_now(comment.created_on) %> +
+ <% unless comment.m_parent_id.nil? %> + <% parents_rely = [] %> + <% parents_rely = get_reply_parents parents_rely, comment %> + <% length = parents_rely.length %> +
+ <% if length <= 3 %> + <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %> <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> +
+
+
+ <%=render :partial => 'users/comment_reply', :locals => {:comment => parents_rely[length - 1]} %> +
+ <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %> +
+
↓ <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment),:remote=>true %>
+ <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %> +
<% end %> - - -
+
+ <% end %>
<%= comment.notes.html_safe %>
+
+
+ + + <% if comment.user == User.current %> + + <% else %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> + <% end %> + + + <%= link_to( + l(:button_reply), + {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => 'HomeworkCommon', :is_in_course => -1, :user_activity_id => user_activity_id, :course_activity=>course_activity}, + :remote => true, + :method => 'get', + :title => l(:button_reply)) %> + + + + <% if User.current.admin? ||is_teacher || comment.user == User.current%> + <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => -1, :user_activity_id => user_activity_id, :course_activity=>course_activity}, + :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete)) %> + <% end %> + +
+
+
+

diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index b6ea36de5..a96ae5d74 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -285,7 +285,8 @@ <% count=activity.journals_for_messages.count %>
-
回复 +
回复 + ︿ <%= count>0 ? "（#{count}）" : "" %>▪ <% if activity.user == User.current %> @@ -327,24 +328,60 @@ <% else %> <%= link_to comment.try(:user).try(:realname), user_path(comment.user_id), :class => "newsBlue mr10 f14" %> <% end %> - <%= format_time(comment.created_on) %> - - <% if comment.user == User.current %> - + <%= time_from_now(comment.created_on) %> +
+ <% unless comment.m_parent_id.nil? %> + <% parents_rely = [] %> + <% parents_rely = get_reply_parents parents_rely, comment %> + <% length = parents_rely.length %> +
+ <% if length <= 3 %> + <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %> <% else %> - <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> - <% end %> - - - -
+
+ <% end %>
<%= comment.notes.html_safe %>
+
+
+ + + <% if comment.user == User.current %> + + <% else %> + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>comment, :user_activity_id=>comment.id,:type=>"reply"}%> + <% end %> + + + <%= link_to( + l(:button_reply), + {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => 'HomeworkCommon', :is_in_course => -1, :user_activity_id => user_activity_id, :course_activity=>course_activity}, + :remote => true, + :method => 'get', + :title => l(:button_reply)) %> + + + + <% if User.current.admin? ||is_teacher || comment.user == User.current%> + <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => -1, :user_activity_id => user_activity_id, :course_activity=>course_activity}, + :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete)) %> + <% end %> + +
+
+
+

diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb index ccfc07db2..30f4e3542 100644 --- a/app/views/users/_reply_to.html.erb +++ b/app/views/users/_reply_to.html.erb @@ -4,6 +4,8 @@
<%= form_for('new_form',:url => {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %> > + > + >
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index 30bec6685..fde67f472 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -373,7 +373,7 @@ <%= link_to( l(:button_reply), - {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => 'HomeworkCommon', :is_in_course => is_in_course}, + {:controller => 'users' ,:action => 'reply_to', :reply_id => comment.id, :type => 'HomeworkCommon', :is_in_course => is_in_course, :course_activity => -1}, :remote => true, :method => 'get', :title => l(:button_reply)) %> @@ -381,7 +381,7 @@ <% if User.current.admin? ||is_teacher || comment.user == User.current%> - <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => is_in_course,:course_activity=>-1}, + <%= link_to('删除', {:controller => 'words', :action => 'destroy', :object_id => comment, :user_id => comment.user,:is_in_course => is_in_course, :course_activity => -1}, :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete)) %> <% end %> diff --git a/app/views/words/reply_to_homework.js.erb b/app/views/words/reply_to_homework.js.erb index 85275277a..7da72fa54 100644 --- a/app/views/words/reply_to_homework.js.erb +++ b/app/views/words/reply_to_homework.js.erb @@ -1,4 +1,7 @@ -<% if @is_in_course %> +<% if @user_activity_id != -1 %> +$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework_common,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>"); +sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity"); +<% else %> $("#homework_common_<%= @homework_common.id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework_common,:is_in_course => @is_in_course}) %>"); sd_create_editor_from_data(<%= @homework_common.id%>,"","100%", "HomeworkCommon"); <% end %> \ No newline at end of file From f6d7df73936aab80417869e9b52f5a34eb510168 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 9 May 2016 18:40:21 +0800 Subject: [PATCH 04/68] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E6=B7=BB=E5=8A=A0=E2=80=9C=E5=88=86=E4=BA=AB=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E7=94=B3=E8=AF=B7=E2=80=9D=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin_controller.rb | 10 +++ app/views/admin/apply_for_homework.html.erb | 89 +++++++++++++++++++++ config/locales/zh.yml | 1 + config/routes.rb | 1 + lib/redmine.rb | 1 + lib/redmine/menu_manager.rb | 2 + 6 files changed, 104 insertions(+) create mode 100644 app/views/admin/apply_for_homework.html.erb diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 99732fc6b..11dfbf5f4 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -593,4 +593,14 @@ class AdminController < ApplicationController end end + #分享作业申请 + def apply_for_homework + homeworks = ApplyHomework.where("user_id != 0") + @homework = paginateHelper homeworks,30 + @page = (params['page'] || 1).to_i - 1 + respond_to do |format| + format.html + end + end + end diff --git a/app/views/admin/apply_for_homework.html.erb b/app/views/admin/apply_for_homework.html.erb new file mode 100644 index 000000000..1c7a04901 --- /dev/null +++ b/app/views/admin/apply_for_homework.html.erb @@ -0,0 +1,89 @@ +

+ <%=l(:label_apply_homework)%> +

+ +
+ + + + + + + + + + + + + + <%@count=@page*30 %> + <% for homework in @homework do %> + <% unless homework.nil? %> + <% @count+=1 %> + + + <% c_h = HomeworkCommon.find homework.homework_common_id %> + <% if c_h %> + + <% if c_h.course %> + + <% end %> + + <% end %> + + + + + <% end %> + <% end %> + +
+ 序号 + + 作业名称 + + 课程名称 + + 作者 + + 申请者 + + 申请状态 + + 申请日期 +
+ <%=@count %> + + <%=link_to(c_h.try(:name), student_work_index_path(:homework => c_h.id))%> + + <%= link_to(c_h.course.name, course_path(c_h.course.id)) %> + <%= c_h.try(:user)%><% else %><%=c_h.try(:user).try(:realname) %><% end %>'> + <% if c_h.try(:user).try(:realname) == ' '%> + <%= link_to(c_h.try(:user), user_path(c_h.user_id)) %> + <% else %> + <%= link_to(c_h.try(:user).try(:realname), user_path(c_h.user_id)) %> + <% end %> + <%= homework.try(:user)%><% else %><%=homework.try(:user).try(:realname) %><% end %>'> + <% if homework.try(:user).try(:realname) == ' '%> + <%= link_to(homework.try(:user), user_path(homework.user_id)) %> + <% else %> + <%= link_to(homework.try(:user).try(:realname), user_path(homework.user_id)) %> + <% end %> + + <% if homework.status == 1 %> + 待审核 + <% elsif homework.status == 2 %> + 已通过 + <% else %> + 已拒绝 + <% end %> + + <%=format_date( homework.created_at ) %> +
+
+ + + +<% html_title(l(:label_apply_homework)) -%> diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 088ce3d8e..55124cf58 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -419,6 +419,7 @@ zh: label_project_all: 所有的项目 label_project_latest: 最近的项目 label_issue: 问题 + label_apply_homework: 分享作业申请 label_issue_view_all: 查看所有问题 label_issues_by: "按 %{value} 分组显示问题" diff --git a/config/routes.rb b/config/routes.rb index afefc9e3c..6b06feebc 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -985,6 +985,7 @@ RedmineApp::Application.routes.draw do match 'admin/latest_login_users', as: :latest_login_users match 'admin/latest_login_teachers', as: :latest_login_teachers get 'admin/homework' + get 'admin/apply_for_homework' resources :auth_sources do member do diff --git a/lib/redmine.rb b/lib/redmine.rb index 47ee3d38f..7fec36426 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -395,6 +395,7 @@ Redmine::MenuManager.map :admin_menu do |menu| menu.push :course_resource_list, {:controller => 'admin', :action => 'course_resource_list'}, :caption => :label_course_resource_list menu.push :project_resource_list, {:controller => 'admin', :action => 'project_resource_list'}, :caption => :label_project_resource_list menu.push :homework, {:controller => 'admin', :action => 'homework'}, :caption => :label_user_homework + menu.push :apply_for_homework, {:controller => 'admin', :action => 'apply_for_homework'}, :caption => :label_apply_homework end #Modified by young diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb index f9ce21987..6d1bb2fcb 100644 --- a/lib/redmine/menu_manager.rb +++ b/lib/redmine/menu_manager.rb @@ -193,6 +193,8 @@ module Redmine title = h(caption) + "(#{Course.all.count})" when '用户列表' title = h(caption) + "(#{User.all.count})" + when '分享作业申请' + title = h(caption) + "(#{ApplyHomework.where("user_id != 0").count})" end link_to(title, url, item.html_options(:selected => selected)) From ccc4ddc325ae0999d4ebf4884045cca03c0b333f Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 10 May 2016 10:18:47 +0800 Subject: [PATCH 05/68] =?UTF-8?q?=E7=BB=84=E7=BB=87=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_org_subfield_leftMD.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/organizations/_org_subfield_leftMD.html.erb b/app/views/organizations/_org_subfield_leftMD.html.erb index faec87015..d0439439a 100644 --- a/app/views/organizations/_org_subfield_leftMD.html.erb +++ b/app/views/organizations/_org_subfield_leftMD.html.erb @@ -168,7 +168,7 @@ <%= link_to activity.description.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-title sn-hidden" %>
- <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.content, :maxheight=>54, :maxwordsnum => 28} %> + <%=render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => activity.id, :content=> activity.description, :maxheight=>54, :maxwordsnum => 28} %> <%#= link_to activity.content.to_s.html_safe, news_url_in_org(activity.id), :target => '_blank', :class => "resources-tag" %>
<%#= link_to "更多", news_url_in_org(activity.id), :class => "more-btn", :target => "_blank" %> @@ -244,7 +244,7 @@ <% end %>
- <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %> + <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %> <%#= link_to content.to_s.html_safe, board_message_url_in_org(activity.board_id, activity.id), :target => '_blank', :class => "resources-tag" %>
<%#= link_to "更多", board_message_url_in_org(message.board.id,message.id), :class => "more-btn", :target => "_blank" %> @@ -264,7 +264,7 @@ <% end %>
- <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %> + <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => message.id, :content=> content, :maxheight=>54, :maxwordsnum => 28} %> <%#= link_to content.to_s.html_safe, board_message_path(message.board,activity), :target => '_blank', :class => "resources-tag" %>
<%#= link_to "更多", board_message_path(message.board,activity), :class => "more-btn", :target => "_blank" %> @@ -285,7 +285,7 @@
<%#= link_to news.description.to_s.html_safe, news_path(news), :target => '_blank', :class => "resources-tag" %> - <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => document.id, :content=> content, :maxheight=>54, :maxwordsnum => 28, :maxwordsnum => 28} %> + <%= render :partial =>"users/intro_content_ex", :locals=>{:user_activity_id => news.id, :content=> news.description, :maxheight=>54, :maxwordsnum => 28, :maxwordsnum => 28} %>
<%#= link_to "更多", news_path(news), :class => "more-btn", :target => "_blank" %>
From 11017d72c5b63e18611f6226f3d7380a7e6b843a Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 10 May 2016 11:28:24 +0800 Subject: [PATCH 06/68] =?UTF-8?q?=E8=80=81=E5=B8=88=E5=AF=B9=E4=BD=9C?= =?UTF-8?q?=E5=93=81=E7=9A=84=E8=AF=84=E5=88=86=E5=8F=AF=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_add_score.html.erb | 28 +++++++++++-- .../_no_teacher_score_notice.html.erb | 15 +++++++ public/javascripts/course.js | 42 ++++++++++++++++++- 3 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 app/views/student_work/_no_teacher_score_notice.html.erb diff --git a/app/views/student_work/_add_score.html.erb b/app/views/student_work/_add_score.html.erb index a2137d103..ca580bebc 100644 --- a/app/views/student_work/_add_score.html.erb +++ b/app/views/student_work/_add_score.html.erb @@ -7,8 +7,9 @@

  • 评分： - - 分 + + 分 +
  • <% if @is_teacher%> @@ -16,6 +17,8 @@
    <%= render :partial => 'student_work/student_work_attachment_form', :locals => {:work => work,:score => score} %>
    +
    + <%end%> 提交
    @@ -28,12 +31,29 @@ $('#hint_message_'+id).html("为了对其他学生的作品负责，请您务必填写评语"); $("#hint_message_"+id).css('color','#ff0000'); $("#score_comment_"+id).focus(); - } else { + } else if (parseFloat($("#score_"+id).val()) == -1) { + $('#score_notice_span_'+id).html("请先评分"); + $('#score_notice_span_'+id).show(); + $("#score_"+id).focus(); + } + else { $("#work_submit_"+id).parent().parent().submit(); $('#about_hwork_'+id).html(''); } <% else %> - $("#work_submit_"+id).parent().parent().submit(); + if($.trim($('#score_comment_'+id).val()) == "" && parseFloat($("#score_"+id).val()) == -1 && $("#attachments_fields"+id).children().length == 0){ + $("#none_notice_"+id).show(); + } else if(parseFloat($("#score_"+id).val()) == -1) { + $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/no_teacher_score_notice') %>'); + showModal('ajax-modal', '450px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before("" + + ""); + $('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9"); + } + else { + $("#work_submit_" + id).parent().parent().submit(); + } <% end %> } \ No newline at end of file diff --git a/app/views/student_work/_no_teacher_score_notice.html.erb b/app/views/student_work/_no_teacher_score_notice.html.erb new file mode 100644 index 000000000..12b3025a9 --- /dev/null +++ b/app/views/student_work/_no_teacher_score_notice.html.erb @@ -0,0 +1,15 @@ +
    +
    +

    + 当前作品未进行评分，是否确定提交？ +

    +
    + + 确  定 + + + 取  消 + +
    +
    +
    \ No newline at end of file diff --git a/public/javascripts/course.js b/public/javascripts/course.js index 4e698e6f2..cdaf8866a 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -1057,10 +1057,26 @@ $.fn.peSlider = function(settings){ max: parseFloat(input.attr('max')), value: parseFloat(input.val()) }); + if(parseFloat(input.val()) == -1){ + input.css("color", "#fff"); + input.next().next().html("未评分"); + input.next().next().show(); + } else{ + input.css("color", "#000"); + input.next().next().hide(); + } slider .insertBefore(input) .slider(sliderOptions) .bind('slide', function(e, ui){ + if(ui.value == -1){ + input.css("color", "#fff"); + input.next().next().html("未评分"); + input.next().next().show(); + } else { + input.css("color", "#000"); + input.next().next().hide(); + } input.val(ui.value); friendlyVal = input.val() + ' ' + thisUnits; slider.find('a').attr({ @@ -1081,6 +1097,14 @@ $.fn.peSlider = function(settings){ .keyup(function(){ var inVal = parseFloat(input.val()); if( !isNaN(inVal) ){ + if(inVal == -1){ + input.css("color", "#fff"); + input.next().next().html("未评分"); + input.next().next().show(); + } else { + input.css("color", "#000"); + input.next().next().hide(); + } slider.slider('value', inVal); input.val(slider.slider('value')); } @@ -1088,6 +1112,14 @@ $.fn.peSlider = function(settings){ .change(function(){ var inVal = parseFloat(input.val()); if( !isNaN(inVal) ){ + if(inVal == -1){ + input.css("color", "#fff"); + input.next().next().html("未评分"); + input.next().next().show(); + } else { + input.css("color", "#000"); + input.next().next().hide(); + } slider.slider('value', inVal); input.val(slider.slider('value')); } @@ -1095,7 +1127,15 @@ $.fn.peSlider = function(settings){ .blur(function(){ var inVal = parseFloat(input.val()); if( isNaN(inVal) ){ - input.val(0); + input.val(-1); + } + if(input.val() == -1){ + input.css("color", "#fff"); + input.next().next().html("未评分"); + input.next().next().show(); + } else { + input.css("color", "#000"); + input.next().next().hide(); } }); if( !settings.step ){ From d303a0637766b9c2974da2d63c1c5e0bfc03d4cb Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 10 May 2016 11:32:20 +0800 Subject: [PATCH 07/68] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=9A=84=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 4 ++-- app/views/layouts/new_base_user.html.erb | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index ad8aca864..3001164a5 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1260,13 +1260,13 @@ class UsersController < ApplicationController #显示更多用户课程 def user_courses4show @page = params[:page].to_i + 1 - @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(created_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5).offset(@page * 5) + @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5).offset(@page * 5) end #显示更多用户项目 def user_projects4show @page = params[:page].to_i + 1 - @projects = @user.projects.visible.select("projects.*,(SELECT MAX(created_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5).offset(@page * 5) + @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5).offset(@page * 5) end def user_course_activities diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 83d463d65..e43aa499f 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -226,7 +226,6 @@ end %> - <%# courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %> <% courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(5) %>
    @@ -258,7 +257,6 @@ end %> - <%# projects = @user.projects.visible.select("projects.*, (SELECT MAX(created_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%> <% projects = @user.projects.visible.select("projects.*, (SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(5)%>
    From ba07e564dbf8f5411f2270ba30c1a8efc9e0ebe1 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 10 May 2016 11:51:41 +0800 Subject: [PATCH 08/68] =?UTF-8?q?=E8=80=81=E5=B8=88=E8=AF=84=E5=88=86?= =?UTF-8?q?=E7=9A=84=E5=BC=B9=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_add_score.html.erb | 3 +++ app/views/student_work/_no_teacher_score_notice.html.erb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/student_work/_add_score.html.erb b/app/views/student_work/_add_score.html.erb index ca580bebc..29fd8b63a 100644 --- a/app/views/student_work/_add_score.html.erb +++ b/app/views/student_work/_add_score.html.erb @@ -56,4 +56,7 @@ } <% end %> } + function submit_teacher_score(){ + $("#work_submit_<%=work.id %>").parent().parent().submit(); + } \ No newline at end of file diff --git a/app/views/student_work/_no_teacher_score_notice.html.erb b/app/views/student_work/_no_teacher_score_notice.html.erb index 12b3025a9..02febb5d5 100644 --- a/app/views/student_work/_no_teacher_score_notice.html.erb +++ b/app/views/student_work/_no_teacher_score_notice.html.erb @@ -4,7 +4,7 @@ 当前作品未进行评分，是否确定提交？

    - + 确  定 From e502aa7c439558fcd7f96d5b23c95213e0aeb67d Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Tue, 10 May 2016 12:51:42 +0800 Subject: [PATCH 09/68] =?UTF-8?q?KE=E8=A1=A8=E6=A0=BC=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=97=AE=E9=A2=98=EF=BC=8C=E8=87=AA=E5=8A=A8=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=81=9A=E4=BA=86=E4=B8=80=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 12 ++-- app/views/users/_user_course_list.html.erb | 2 +- app/views/users/_user_project_list.html.erb | 2 +- .../kindeditor/assets_controller.rb | 12 ++++ lib/rails_kindeditor/config/routes.rb | 1 + public/assets/kindeditor/kindeditor.js | 16 ++--- public/assets/kindeditor/pasteimg.js | 66 +++++++++++++++++++ .../kindeditor/plugins/code/previewcode.css | 10 ++- .../assets/kindeditor/plugins/paste/paste.js | 1 + .../assets/kindeditor/plugins/table/table.js | 2 +- public/stylesheets/courses.css | 6 ++ public/stylesheets/new_user.css | 11 +++- public/stylesheets/project.css | 4 ++ public/stylesheets/public.css | 6 +- 14 files changed, 127 insertions(+), 24 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 54970add6..ce54496a0 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2855,11 +2855,11 @@ class UsersController < ApplicationController @c_sort = 2 end - sort_name = "updated_at" + sort_name = "updated_on" sort_type = @c_sort == 1 ? "asc" : "desc" - @courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}") - # @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a #{sort_type}") + # @courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}") + @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}") #根据 作业+资源数排序 if @order.to_i == 2 @@ -2900,11 +2900,11 @@ class UsersController < ApplicationController @c_sort = 2 end - sort_name = "updated_on" + sort_name = "updated_at" sort_type = @c_sort == 1 ? "asc" : "desc" - @projects = @user.projects.visible.order("#{sort_name} #{sort_type}") - # @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a #{sort_type}") + #@projects = @user.projects.visible.order("#{sort_name} #{sort_type}") + @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS #{sort_name} ").order("#{sort_name} #{sort_type}") #根据 问题+资源数排序 @project.project_score.issue_num @project.project_score.attach_num if @order.to_i == 2 diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb index 212798eb1..8ef0faa9e 100644 --- a/app/views/users/_user_course_list.html.erb +++ b/app/views/users/_user_course_list.html.erb @@ -31,7 +31,7 @@ 创建时间：<%= format_time(course.created_at) %> - 更新时间：<%= format_time(course.updated_at) %> + 更新时间：<%= format_time(course.updated_on) %> 开课学期:  <%= current_time_and_term course %> diff --git a/app/views/users/_user_project_list.html.erb b/app/views/users/_user_project_list.html.erb index b7b4948e4..1526da58f 100644 --- a/app/views/users/_user_project_list.html.erb +++ b/app/views/users/_user_project_list.html.erb @@ -28,7 +28,7 @@
  • 创建时间：<%= format_time(project.created_on) %> - 更新时间：<%= format_time(project.updated_on) %> + 更新时间：<%= format_time(project.updated_at) %>

    <%= project.project_score.issue_num %>问题| <%= project.project_score.attach_num %>资源

    • diff --git a/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb b/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb index 0e1177563..c94a3944e 100644 --- a/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb +++ b/lib/rails_kindeditor/app/controllers/kindeditor/assets_controller.rb @@ -118,6 +118,18 @@ class Kindeditor::AssetsController < ApplicationController @result[:file_list] = @file_list render :text => @result.to_json end + + def uploadpic + picstr = params["pic"]; + + picArry = picstr.split("|") + + picArry.each do |picurl| + puts picurl + end + + + end private def show_error(msg) diff --git a/lib/rails_kindeditor/config/routes.rb b/lib/rails_kindeditor/config/routes.rb index 7ebb0b748..86b888ad3 100644 --- a/lib/rails_kindeditor/config/routes.rb +++ b/lib/rails_kindeditor/config/routes.rb @@ -2,5 +2,6 @@ Rails.application.routes.draw do namespace :kindeditor do post "/upload" => "assets#create" get "/filemanager" => "assets#list" + get "/uploadpic" => "assets#uploadpic" end end \ No newline at end of file diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index 74013be54..579da5d0c 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -3,8 +3,7 @@ // for (var property in myObject) { // s = s + "\n "+property +": " + myObject[property] ; // } -// alert(s); -//} +// alert(s) /******************************************************************************* * KindEditor - WYSIWYG HTML Editor for Internet * Copyright (C) 2006-2013 kindsoft.net @@ -3788,17 +3787,17 @@ _extend(KEdit, KWidget, { } else { val = body.innerHTML; } - if (self.beforeGetHtml) { - val = self.beforeGetHtml(val); - } +// if (self.beforeGetHtml) { +// val = self.beforeGetHtml(val); +// } if (_GECKO && val == '
    ') { val = ''; } return val; } - if (self.beforeSetHtml) { - val = self.beforeSetHtml(val); - } +// if (self.beforeSetHtml) { +// val = self.beforeSetHtml(val); +// } if (_IE && _V >= 9) { val = val.replace(/(<.*?checked=")checked(".*>)/ig, '$1$2'); } @@ -4690,6 +4689,7 @@ function _bindNewlineEvent() { }); K(doc).keyup(function(e) { if (e.which != 13 || e.shiftKey || e.ctrlKey || e.altKey) { + df(); return; } if (newlineTag == 'br') { diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js index f08a768aa..5f62eac17 100644 --- a/public/assets/kindeditor/pasteimg.js +++ b/public/assets/kindeditor/pasteimg.js @@ -352,3 +352,69 @@ function enablePasteImg(_editor) { }); return; }; + +function df() { + var haspicContainer = document.getElementById("has_pic"); + if (haspicContainer == null) { + haspicContainer = document.createElement("div"); + haspicContainer.id = "has_pic"; + haspicContainer.innerHTML = "
    "; + $(".ke-toolbar").after(haspicContainer); + } + + var img = $(".ke-edit-iframe").contents().find("img"); + + var piccount = 0; + var sstr = ""; + $(img).each(function (i) { + var that = $(this); + if (that.attr("src").indexOf("http://") >= 0 || that.attr("src").indexOf("https://") >= 0) { + piccount++; + if (i == $(img).length - 1) + sstr += that.attr("src"); + else + sstr += that.attr("src") + "|"; + } + }); + + $("#piclist").val(sstr); + document.getElementById("has_pic").style.display = (piccount > 0) ? "block" : "none"; +} + +function closeupload() { + $("#has_pic").hide(); + $("#upload").show(); +} + +function uploadpic() { + var piclist = encodeURI($("#piclist").val()); + if (piclist.length == 0) return false; + $.ajax({ + url: "/kindeditor/uploadpic", + data: "pic=" + piclist, + type: "GET", + beforeSend: function () { + $("#upload").hide(); + $("#confirm").text("正在上传中..."); + }, + success: function (msg) { + if (msg !== "") { + var str = new Array(); + str = msg.split('|'); + var img = $(".ke-edit-iframe").contents().find("img"); + + $(img).each(function (i) { + var that = $(this); + if (that.attr("src").indexOf("http://") >= 0 || that.attr("src").indexOf("https://") >= 0) { + that.attr("src", "/uploads/image/" + str[i]); + that.attr("data-ke-src", "/uploads/image/" + str[i]); + } + }); + + $("#confirm").html(img.length + "张图片已经上传成功！  关闭"); + } + else $("#confirm").text("上传失败！"); + } + }); +} + diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css index c2adf3a35..b9c8252e8 100644 --- a/public/assets/kindeditor/plugins/code/previewcode.css +++ b/public/assets/kindeditor/plugins/code/previewcode.css @@ -1,7 +1,7 @@ .ke-content { font-size: 12px; - font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: ΢ź, ; - font-family:Tahoma; + font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: ΢���ź�, ����; + font-family:Tahoma; } .ke-content pre { font-size:9pt; @@ -48,4 +48,8 @@ .ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;background:#f4f5f7 url('../img/blockquote.gif') no-repeat left top;color:#060;font-size:9pt;} span.at {color:#269ac9;} -span.at a{color:#269ac9;text-decoration: none;} \ No newline at end of file +span.at a{color:#269ac9;text-decoration: none;} + +/*yk*/ +.ke-content ol li{list-style-type: decimal;margin-left: 20px;} +.ke-content ul li{list-style-type: disc;margin-left: 20px;} \ No newline at end of file diff --git a/public/assets/kindeditor/plugins/paste/paste.js b/public/assets/kindeditor/plugins/paste/paste.js index 767cefb09..abf777398 100644 --- a/public/assets/kindeditor/plugins/paste/paste.js +++ b/public/assets/kindeditor/plugins/paste/paste.js @@ -353,3 +353,4 @@ KindEditor.plugin('paste', function(K) { return; }); + diff --git a/public/assets/kindeditor/plugins/table/table.js b/public/assets/kindeditor/plugins/table/table.js index 9eb29fb30..be386f7cc 100644 --- a/public/assets/kindeditor/plugins/table/table.js +++ b/public/assets/kindeditor/plugins/table/table.js @@ -283,7 +283,7 @@ KindEditor.plugin('table', function(K) { for (var i = 0; i < rows; i++) { html += ''; for (var j = 0; j < cols; j++) { - html += '' + (K.IE ? ' ' : '
    ') + ''; + html += '' + (K.IE ? ' ' : '
    ') + ''; } html += ''; } diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index f83a180d3..6e55146a6 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -124,12 +124,14 @@ a.postTypeGrey:hover {color:#269ac9;} .homepagePostDes {float:left; width:655px; margin-left:15px;} .homepagePostTo {font-size:14px; color:#484848; margin-bottom:5px;} .homepagePostTitle {font-size:14px; color:#484848; margin-bottom:5px; font-weight:bold;} +.homepagePostTitle td,.homepagePostTitle tr {border: 1px solid; border-color: inherit;} .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;} .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;} .homepagePostSubmit:hover {background-color:#d8d8d8;} .homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;} .homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;} .homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;} +.homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;} .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;} .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;} @@ -172,6 +174,7 @@ a.postOptionLink2:hover {color:#ffffff; background-color:#269ac9;} .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;} .homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;} .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;} +.homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;} .table_maxWidth table {max-width: 642px;} .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;} .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;} @@ -1111,6 +1114,9 @@ a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; paddin .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;} .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;} .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;} +.postDetailDes ol li{list-style-type: decimal;margin-left: 20px;} +.postDetailDes ul li{list-style-type: disc;margin-left: 20px;} +.postDetailDes td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;} .homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;} .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;} .postDetailDate {color:#888888; font-size:12px; float:left;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 8e62f6d3f..67176c761 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -7,7 +7,8 @@ div,img,tr,td,table{ border:0;} table,tr,td{border:0;cellspacing:0; cellpadding:0;} ol,ul,li{ list-style-type:none} a:link,a:visited{color:#7f7f7f;text-decoration:none;} -a:hover,a:active{color:#000;} +a:hover,a:active{color:#000;}tr,td,table{ border:0;} +table,tr,td{border:0;cellspacing:0; cellpadding:0;} .pInline {margin:0px; padding:0px; display:inline-block;} /*常用*/ @@ -667,6 +668,7 @@ a.postTypeGrey:hover {color:#269ac9;} .homepagePostDes {float:left; width:655px; margin-left:15px; overflow:hidden;} .homepagePostTo {font-size:14px; color:#484848; margin-bottom:5px;} .homepagePostTitle {font-size:14px; color:#484848; margin-bottom:5px; font-weight:bold;} +.homepagePostTitle td,.homepagePostTitle tr {border: 1px solid; border-color: inherit;} .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;} .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;} .homepagePostSubmit:hover {background-color:#d8d8d8;} @@ -676,6 +678,7 @@ a.postTypeGrey:hover {color:#269ac9;} .homepagePostReply {width:720px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;} .homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;} .homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;} +.homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;} .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;} .borderBottomNone {border-bottom:none !important;} .topBorder {border-top: 1px solid #e4e4e4;} @@ -712,6 +715,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} .homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family:"微软雅黑","宋体";} .homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;} .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;} +.homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;} .table_maxWidth table {max-width: 642px;} .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;} .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;} @@ -853,6 +857,9 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re .postDetailTitle {width:570px; max-width:570px; margin-bottom:5px;} .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;} .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;} +.postDetailDes ol li{list-style-type: decimal;margin-left: 20px;} +.postDetailDes ul li{list-style-type: disc;margin-left: 20px;} +.postDetailDes td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;} .homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;} .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;} .postDetailDate {color:#888888; font-size:12px; float:left;} @@ -1551,4 +1558,4 @@ ul.wlist li{float: left;} ul.wlist li a{ border:1px solid #15bccf; padding: 1px 4px 1px 4px; margin-left:3px;} ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;} /*.wlist_select { background-color:#64bdd9; color:#fff; padding: 1px 5px 0px 5px; margin-left:3px;margin-top: -2px; border:1px solid #64bdd9;}*/ -.wlist_select a{background-color: #64bdd9;cursor: default;} +.wlist_select a{background-color: #64bdd9;cursor: default;} \ No newline at end of file diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 79f06769e..1ef99e66b 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -973,6 +973,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;} } .homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;} .homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;} +.homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;} .topBorder { border-top: 1px solid #E4E4E4; } @@ -1110,6 +1111,9 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;} .postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;} .postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;text-overflow:ellipsis;} .postDetailDes p,div,em{word-break: break-all;word-wrap: break-word;} +.postDetailDes ol li{list-style-type: decimal;margin-left: 20px;} +.postDetailDes ul li{list-style-type: disc;margin-left: 20px;} +.postDetailDes td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;} .homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; line-height: 18px !important;} .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;} .postDetailDate {color:#888888; font-size:12px; float:left;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index d016fee4a..253aaf46b 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -601,6 +601,7 @@ a.postTypeGrey:hover {color:#269ac9;} .homepagePostIntro {font-size:14px; color:#484848;overflow:hidden;} .homepagePostIntro ol li{list-style-type: decimal;margin-left: 20px;} .homepagePostIntro ul li{list-style-type: disc;margin-left: 20px;} +.homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;} .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;} .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;} .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;} @@ -636,6 +637,7 @@ a.postReplyCancel:hover {color:#ffffff;} .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;} .homepagePostReplyContent ol li{list-style-type: decimal;margin-left: 20px;} .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;} +.homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;} .table_maxWidth table {max-width: 642px;} .homepagePostProjectState {width:42px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;} .homepagePostAssignTo {float:left; font-size:14px; color:#15bccf;} @@ -972,8 +974,8 @@ a.resourcesTypeUser {background:url(images/homepage_icon.png) -178px -453px no-r .AgreementTxt{text-indent:2em; margin-bottom:15px;} .AgreementImg{ margin:0px auto;} -.list_style ol li{list-style-type: decimal;margin-left: 20px;} -.list_style ul li{list-style-type: disc;margin-left: 20px;} +.list_style ol li{list-style-type:decimal; margin-left:20px;} +.list_style ul li{list-style-type:disc; margin-left:20px;} /* @功能 定义 */ span.at {color:#269ac9;} From 629591ad00aa1f1b5613396c99a8fab91edd7ddb Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Tue, 10 May 2016 12:55:42 +0800 Subject: [PATCH 10/68] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E3=80=81=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=88=97=E8=A1=A8=E6=9B=B4=E6=96=B0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=8F=96=E5=8A=A8=E6=80=81=E8=A1=A8=E4=B8=AD=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 12 +++++++----- app/views/users/_user_course_list.html.erb | 2 +- app/views/users/_user_project_list.html.erb | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 3001164a5..f7d965f8c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2997,10 +2997,12 @@ class UsersController < ApplicationController @c_sort = 2 end - sort_name = "updated_at" + sort_name = "updated_on" sort_type = @c_sort == 1 ? "asc" : "desc" - @courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}") + # @courses = @user.courses.visible.where("is_delete =?", 0).order("#{sort_name} #{sort_type}") + @courses = @user.courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS #{sort_name}").order("#{sort_name} #{sort_type}") + #根据 作业+资源数排序 if @order.to_i == 2 @type = 2 @@ -3040,11 +3042,11 @@ class UsersController < ApplicationController @c_sort = 2 end - sort_name = "updated_on" + sort_name = "updated_at" sort_type = @c_sort == 1 ? "asc" : "desc" - @projects = @user.projects.visible.order("#{sort_name} #{sort_type}") - # @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a #{sort_type}") + #@projects = @user.projects.visible.order("#{sort_name} #{sort_type}") + @projects = @user.projects.visible.select("projects.*,(SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS #{sort_name} ").order("#{sort_name} #{sort_type}") #根据 问题+资源数排序 @project.project_score.issue_num @project.project_score.attach_num if @order.to_i == 2 diff --git a/app/views/users/_user_course_list.html.erb b/app/views/users/_user_course_list.html.erb index 212798eb1..8ef0faa9e 100644 --- a/app/views/users/_user_course_list.html.erb +++ b/app/views/users/_user_course_list.html.erb @@ -31,7 +31,7 @@ 创建时间：<%= format_time(course.created_at) %> - 更新时间：<%= format_time(course.updated_at) %> + 更新时间：<%= format_time(course.updated_on) %> 开课学期:  <%= current_time_and_term course %> diff --git a/app/views/users/_user_project_list.html.erb b/app/views/users/_user_project_list.html.erb index b7b4948e4..1526da58f 100644 --- a/app/views/users/_user_project_list.html.erb +++ b/app/views/users/_user_project_list.html.erb @@ -28,7 +28,7 @@
  • 创建时间：<%= format_time(project.created_on) %> - 更新时间：<%= format_time(project.updated_on) %> + 更新时间：<%= format_time(project.updated_at) %>

    <%= project.project_score.issue_num %>问题| <%= project.project_score.attach_num %>资源

    • From 5baf467d13e9fe5d18345bdf70a5e7be9351f1a2 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 10 May 2016 15:26:08 +0800 Subject: [PATCH 11/68] =?UTF-8?q?=E4=BD=9C=E5=93=81=E8=AF=84=E5=88=86?= =?UTF-8?q?=E4=B8=8D=E8=A6=86=E7=9B=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 56 +++++++++++++++------- app/helpers/student_work_helper.rb | 2 +- app/views/student_work/_add_score.html.erb | 2 +- app/views/student_work/add_score.js.erb | 6 +-- public/stylesheets/courses.css | 8 ++-- public/stylesheets/new_user.css | 4 +- 6 files changed, 50 insertions(+), 28 deletions(-) diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index e80b90d7b..c0e54df70 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -614,38 +614,60 @@ class StudentWorkController < ApplicationController render_403 and return unless @is_teacher || @homework.homework_detail_manual.comment_status == 2 @score = student_work_score @work,User.current if @score - @score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != "" - @score.score = params[:score] if params[:score] + @new_score = StudentWorksScore.new + if params[:score] + @new_score.score = params[:score].to_i == -1 ? @score.score : params[:score] + end + @new_score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != "" + @new_score.user_id = User.current.id + @new_score.student_work_id = @work.id if User.current.admin? - @score.reviewer_role = 1 + @new_score.reviewer_role = 1 else role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name - @score.reviewer_role = get_role_by_name(role) + @new_score.reviewer_role = get_role_by_name(role) + end + if @is_teacher + @is_new = true + @is_last_a = false + else + @is_new = false end - @is_new = false + + #@score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != "" + #@score.score = params[:score] if params[:score] + #if User.current.admin? + # @score.reviewer_role = 1 + #else + # role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name + # @score.reviewer_role = get_role_by_name(role) + #end + #@is_new = false else @is_last_a = @work.student_works_scores.empty? - @score = StudentWorksScore.new - @score.score = params[:score] if params[:score] - @score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != "" - @score.user_id = User.current.id - @score.student_work_id = @work.id + @new_score = StudentWorksScore.new + if params[:score] + @new_score.score = params[:score].to_i == -1 ? nil : params[:score] + end + @new_score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != "" + @new_score.user_id = User.current.id + @new_score.student_work_id = @work.id if User.current.admin? - @score.reviewer_role = 1 + @new_score.reviewer_role = 1 else role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name - @score.reviewer_role = get_role_by_name(role) + @new_score.reviewer_role = get_role_by_name(role) end @is_new = true end - @score.save_attachments(params[:attachments]) - render_attachment_warning_if_needed(@score) + @new_score.save_attachments(params[:attachments]) + render_attachment_warning_if_needed(@new_score) - if @score.save - case @score.reviewer_role + if @new_score.save + case @new_score.reviewer_role when 1 #教师评分：最后一个教师评分为最终评分 - @work.teacher_score = @score.score + @work.teacher_score = @new_score.score when 2 #教辅评分 教辅评分显示平均分 @work.teaching_asistant_score = @work.student_works_scores.where(:reviewer_role => 2).average(:score).try(:round, 2).to_f when 3 #学生评分 学生评分显示平均分 diff --git a/app/helpers/student_work_helper.rb b/app/helpers/student_work_helper.rb index 4e11e153e..74788751b 100644 --- a/app/helpers/student_work_helper.rb +++ b/app/helpers/student_work_helper.rb @@ -23,7 +23,7 @@ module StudentWorkHelper #获取指定用户对某一作业的评分结果 def student_work_score work,user - StudentWorksScore.where(:user_id => user.id,:student_work_id => work.id).first + StudentWorksScore.where(:user_id => user.id,:student_work_id => work.id).last end #获取指定评分的角色 diff --git a/app/views/student_work/_add_score.html.erb b/app/views/student_work/_add_score.html.erb index 29fd8b63a..74f81a30b 100644 --- a/app/views/student_work/_add_score.html.erb +++ b/app/views/student_work/_add_score.html.erb @@ -45,7 +45,7 @@ $("#none_notice_"+id).show(); } else if(parseFloat($("#score_"+id).val()) == -1) { $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/no_teacher_score_notice') %>'); - showModal('ajax-modal', '450px'); + showModal('ajax-modal', '500px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("" + ""); diff --git a/app/views/student_work/add_score.js.erb b/app/views/student_work/add_score.js.erb index 762aa4a8a..d3cb963f6 100644 --- a/app/views/student_work/add_score.js.erb +++ b/app/views/student_work/add_score.js.erb @@ -1,10 +1,10 @@ -$("#add_student_score_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'add_score',:locals => {:work => @work,:score => @score}) %>"); +$("#add_student_score_<%= @work.id%>").html("<%= escape_javascript(render :partial => 'add_score',:locals => {:work => @work,:score => @new_score}) %>"); $('#score_<%= @work.id%>').peSlider({range: 'min'}); <% if @is_new%> - $("#score_list_<%= @work.id%>").prepend("
    <%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score,:is_last => @is_last_a}) %>
    "); + $("#score_list_<%= @work.id%>").prepend("
    <%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @new_score,:is_last => @is_last_a}) %>
    "); <% else %> - $("#work_score_<%= @score.id%>").html("<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @score,:is_last => @is_last}) %>"); + $("#work_score_<%= @score.id%>").html("<%= escape_javascript(render :partial => 'student_work_score', :locals => {:score => @new_score,:is_last => @is_last}) %>"); <% end%> $("#score_list_<%= @work.id%>").removeAttr("style"); diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index b81a7a7b6..2bc77b8ff 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -434,8 +434,8 @@ span.author { font-size: 0.9em; color: #888; } .bo{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:470px; } .bo02{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:480px; margin-left:2px; color: #999; } .hwork_txt{ width:560px; padding-left:5px; background:#fff;} -a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:10px;} -a:hover.tijiao{ background:#0f99a9;} +a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#269ac9; text-align:center; padding-top:4px; float:left; margin-right:10px;} +a:hover.tijiao{ background:#297fb8;} .members_left{ float:left; width:410px; margin-right:20px; text-align:center;} .members_left{} .members_left ul li{ height:30px; border-bottom:1px solid #E4E4E4; width:410px; padding-top:10px; } @@ -497,8 +497,8 @@ a.xls{ margin-left:5px; color:#136b3b;} .ni_con p{ color:#808181; } .ni_con a:hover{ text-decoration:none;} .ni_btn{ width:190px; margin:15px auto; line-height:1.9;} -a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:15px;} -a:hover.tijiao{ background:#0f99a9;} +a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#269ac9; text-align:center; padding-top:4px; float:left; margin-right:15px;} +a:hover.tijiao{ background:#297fb8;} .c_pink{ color:#e65d5e;} .ni_con_work { width:300px; margin:25px 20px;} .ni_con_work p{ color:#808181; } diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index be6cea109..20bc59a0e 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -1222,8 +1222,8 @@ blockquote { .bo{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:470px; } .bo02{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:480px; margin-left:2px; color: #999; } .hwork_txt{ width:560px; padding-left:5px; background:#fff;} -a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:10px;} -a:hover.tijiao{ background:#0f99a9;} +a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#269ac9; text-align:center; padding-top:4px; float:left; margin-right:10px;} +a:hover.tijiao{ background:#297fb8;} .members_left{ float:left; width:410px; margin-right:20px; text-align:center;} .members_left{} .members_left ul li{ height:30px; border-bottom:1px solid #E4E4E4; width:410px; padding-top:10px; } From 83f7de597ad33a1aa8f2552a4dbcb65912f48197 Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 10 May 2016 15:30:27 +0800 Subject: [PATCH 12/68] =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E7=9A=84=E5=BE=AE=E4=BF=A1=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=92=8C=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/news.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/news.rb b/app/models/news.rb index 1a2205f48..f0457dc81 100644 --- a/app/models/news.rb +++ b/app/models/news.rb @@ -62,7 +62,7 @@ class News < ActiveRecord::Base :author_key => :author_id acts_as_watchable - after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_system_message, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score + after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity, :add_author_as_watcher, :send_mail, :add_news_count, :act_as_student_score after_update :update_activity after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities, :down_course_score From 9bc8ccbb9e69fc75435b093bff5a6472740013ca Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 11 May 2016 09:18:55 +0800 Subject: [PATCH 13/68] =?UTF-8?q?=E6=95=99=E8=BE=85=E5=8F=AF=E5=8F=AA?= =?UTF-8?q?=E8=AF=84=E8=AF=AD=E4=B8=8D=E8=AF=84=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 79 ++++++++++--------- .../_org_course_homework.html.erb | 4 +- app/views/student_work/_add_score.html.erb | 20 ++--- .../student_work/_evaluation_un_work.html.erb | 4 +- .../_no_teacher_score_notice.html.erb | 2 +- .../student_work/_student_work_score.html.erb | 10 ++- .../student_work/add_comments_to_work.js.erb | 6 ++ app/views/users/_course_homework.html.erb | 3 +- .../users/_user_homework_detail.html.erb | 4 +- config/routes.rb | 1 + 10 files changed, 73 insertions(+), 60 deletions(-) create mode 100644 app/views/student_work/add_comments_to_work.js.erb diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index c0e54df70..3c103f98b 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -613,51 +613,39 @@ class StudentWorkController < ApplicationController #老师、教辅可以随时评分，学生只能在匿评作业的匿评阶段进行评分 render_403 and return unless @is_teacher || @homework.homework_detail_manual.comment_status == 2 @score = student_work_score @work,User.current + #@score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != "" + #@score.score = params[:score] if params[:score] + #if User.current.admin? + # @score.reviewer_role = 1 + #else + # role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name + # @score.reviewer_role = get_role_by_name(role) + #end + #@is_new = false + @is_last_a = @work.student_works_scores.empty? + @new_score = StudentWorksScore.new + if @score && params[:score] + @new_score.score = params[:score].to_i == -1 ? @score.score : params[:score] + elsif @score.nil? && params[:score] + @new_score.score = params[:score].to_i == -1 ? nil : params[:score] + end + @new_score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != "" + @new_score.user_id = User.current.id + @new_score.student_work_id = @work.id + if User.current.admin? + @new_score.reviewer_role = 1 + else + role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name + @new_score.reviewer_role = get_role_by_name(role) + end if @score - @new_score = StudentWorksScore.new - if params[:score] - @new_score.score = params[:score].to_i == -1 ? @score.score : params[:score] - end - @new_score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != "" - @new_score.user_id = User.current.id - @new_score.student_work_id = @work.id - if User.current.admin? - @new_score.reviewer_role = 1 - else - role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name - @new_score.reviewer_role = get_role_by_name(role) - end if @is_teacher @is_new = true @is_last_a = false else @is_new = false end - - #@score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != "" - #@score.score = params[:score] if params[:score] - #if User.current.admin? - # @score.reviewer_role = 1 - #else - # role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name - # @score.reviewer_role = get_role_by_name(role) - #end - #@is_new = false else - @is_last_a = @work.student_works_scores.empty? - @new_score = StudentWorksScore.new - if params[:score] - @new_score.score = params[:score].to_i == -1 ? nil : params[:score] - end - @new_score.comment = params[:new_form][:user_message] if params[:new_form] && params[:new_form][:user_message] && params[:new_form][:user_message] != "" - @new_score.user_id = User.current.id - @new_score.student_work_id = @work.id - if User.current.admin? - @new_score.reviewer_role = 1 - else - role = User.current.members.where("course_id = ?",@course.id).first.roles.first.name - @new_score.reviewer_role = get_role_by_name(role) - end @is_new = true end @@ -669,15 +657,20 @@ class StudentWorkController < ApplicationController when 1 #教师评分：最后一个教师评分为最终评分 @work.teacher_score = @new_score.score when 2 #教辅评分 教辅评分显示平均分 - @work.teaching_asistant_score = @work.student_works_scores.where(:reviewer_role => 2).average(:score).try(:round, 2).to_f + #@work.teaching_asistant_score = @work.student_works_scores.where(:reviewer_role => 2).average(:score).try(:round, 2).to_f + ts_score = StudentWorksScore.find_by_sql("SELECT AVG(score) AS score FROM (SELECT * FROM (SELECT * FROM student_works_scores WHERE student_work_id = #{@work.id} AND reviewer_role = 2 AND score IS NOT NULL ORDER BY created_at DESC) AS t GROUP BY user_id) AS a") + @work.teaching_asistant_score = ts_score.first.score.nil? ? nil : ts_score.first.score.try(:round, 2).to_f when 3 #学生评分 学生评分显示平均分 - @work.student_score = @work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f + #@work.student_score = @work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f + stu_score = StudentWorksScore.find_by_sql("SELECT AVG(score) AS score FROM (SELECT * FROM (SELECT * FROM student_works_scores WHERE student_work_id = #{@work.id} AND reviewer_role = 3 ORDER BY created_at DESC) AS t GROUP BY user_id) AS a") + @work.student_score = stu_score.first.score.try(:round, 2).to_f end @homework.update_attributes(:updated_at => Time.now) update_course_activity(@homework.class,@homework.id) update_user_activity(@homework.class,@homework.id) update_org_activity(@homework.class,@homework.id) if @work.save + @work = @homework.student_works.select("student_works.*,student_works.work_score as score").where(:id => @work.id).first respond_to do |format| format.js end @@ -710,6 +703,14 @@ class StudentWorkController < ApplicationController end end + #提交未评分的评语 + def add_comments_to_work + @work = StudentWork.find params[:id] + respond_to do |format| + format.js + end + end + #为作品点赞 def praise_student_work pt = PraiseTread.new diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb index 179e4678e..8a780ea78 100644 --- a/app/views/organizations/_org_course_homework.html.erb +++ b/app/views/organizations/_org_course_homework.html.erb @@ -140,8 +140,8 @@
    <% if activity.student_works.count != 0 %> <% sw_id = "("+activity.student_works.map{|sw| sw.id}.join(",")+")" %> - <% student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %> - <%# student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> + <%# student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %> + <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id} and score is not null").reorder("created_at desc") %> <% unless student_work_scores.empty? %> <% last_score = student_work_scores.first %>
    diff --git a/app/views/student_work/_add_score.html.erb b/app/views/student_work/_add_score.html.erb index 74f81a30b..8dfc0a171 100644 --- a/app/views/student_work/_add_score.html.erb +++ b/app/views/student_work/_add_score.html.erb @@ -7,7 +7,7 @@

  • 评分： - + 分
    • @@ -44,19 +44,21 @@ if($.trim($('#score_comment_'+id).val()) == "" && parseFloat($("#score_"+id).val()) == -1 && $("#attachments_fields"+id).children().length == 0){ $("#none_notice_"+id).show(); } else if(parseFloat($("#score_"+id).val()) == -1) { - $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/no_teacher_score_notice') %>'); - showModal('ajax-modal', '500px'); - $('#ajax-modal').siblings().remove(); - $('#ajax-modal').before("" + - ""); - $('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9"); + $.ajax({ + type: "GET", + url: "/student_work/"+id+"/add_comments_to_work", + data: 'text', + success: function (data) { + } + }); } else { $("#work_submit_" + id).parent().parent().submit(); } <% end %> } - function submit_teacher_score(){ - $("#work_submit_<%=work.id %>").parent().parent().submit(); + function submit_teacher_score(id){ + $("#work_submit_"+id).parent().parent().submit(); + hideModal(); } \ No newline at end of file diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index 8e1c16264..965d126ee 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -70,11 +70,11 @@ <% end %> <% unless student_work.student_score.nil?%> - (<%= student_work.student_works_scores.where(:reviewer_role => 3).count%>) + (<%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%>)
    现共有 -  <%= student_work.student_works_scores.where(:reviewer_role => 3).count%>  +  <%= student_work.student_works_scores.where(:reviewer_role => 3).group_by(&:user_id).count%>  名学生进行了匿评，平均分为  <%= format("%.1f",student_work.student_score)%> 分。
    diff --git a/app/views/student_work/_no_teacher_score_notice.html.erb b/app/views/student_work/_no_teacher_score_notice.html.erb index 02febb5d5..5a8c768cc 100644 --- a/app/views/student_work/_no_teacher_score_notice.html.erb +++ b/app/views/student_work/_no_teacher_score_notice.html.erb @@ -4,7 +4,7 @@ 当前作品未进行评分，是否确定提交？

    - + 确  定 diff --git a/app/views/student_work/_student_work_score.html.erb b/app/views/student_work/_student_work_score.html.erb index c800ae8d0..64e5ffa01 100644 --- a/app/views/student_work/_student_work_score.html.erb +++ b/app/views/student_work/_student_work_score.html.erb @@ -6,10 +6,12 @@ （<%= student_work_score_role score%>） - 评分： - - <%= score.score%>分 - + <% unless score.score.nil? %> + 评分： + + <%= score.score%>分 + + <% end %> 回复 <%=format_time score.updated_at %> diff --git a/app/views/student_work/add_comments_to_work.js.erb b/app/views/student_work/add_comments_to_work.js.erb new file mode 100644 index 000000000..c14986c81 --- /dev/null +++ b/app/views/student_work/add_comments_to_work.js.erb @@ -0,0 +1,6 @@ +$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/no_teacher_score_notice', :locals => {:work => @work}) %>'); +showModal('ajax-modal', '500px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before("" + + ""); +$('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9"); \ No newline at end of file diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index a96ae5d74..232a58700 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -140,7 +140,8 @@
    <% if activity.student_works.count != 0 %> <% sw_id = "("+activity.student_works.map{|sw| sw.id}.join(",")+")" %> - <% student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %> + <%# student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %> + <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id} and score is not null").reorder("created_at desc") %> <% unless student_work_scores.empty? %> <% last_score = student_work_scores.first %>
    diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index fde67f472..6eb52f9d4 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -144,8 +144,8 @@
    <% if homework_common.student_works.count != 0 %> <% sw_id = "("+homework_common.student_works.map{|sw| sw.id}.join(",")+")" %> - <% student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %> - <%# student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> + <%# student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %> + <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id} and score is not null").reorder("created_at desc") %> <% unless student_work_scores.empty? %> <% last_score = student_work_scores.first %>
    diff --git a/config/routes.rb b/config/routes.rb index 6b06feebc..37cdeb22a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -266,6 +266,7 @@ RedmineApp::Application.routes.draw do post 'add_score' post 'revise_attachment' get 'retry_work' + get 'add_comments_to_work' get 'praise_student_work' get 'forbidden_anonymous_comment' end From 320c3881ef3276d2e35f7f33e37be64a544ec95e Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 11 May 2016 10:48:04 +0800 Subject: [PATCH 14/68] =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=8C=89=E9=92=AE=E4=B8=8D=E5=BA=94=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E5=A4=9A=E4=B8=AA=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 1234567 | 2 +- app/views/users/_user_homework_form.html.erb | 5 ++- db/schema.rb | 46 +++++++++++++++++++- 3 files changed, 49 insertions(+), 4 deletions(-) diff --git a/1234567 b/1234567 index e9cd9a1c1..08de77ab4 100644 --- a/1234567 +++ b/1234567 @@ -1 +1 @@ -{"access_token":"yFUfEXFu0_Pl_jdojoRv6eA8pmGjyRkRIL1VCB2HZ4kVJhEq6crriyCRCI-_u5QbWgtepiIOvqTHtXpKgzMuaB7Eo7MjlMcXeecqhzTjnvpivK5HUzGhZXBG1dk_BxicJAFlCAARIN","expires_in":7200,"got_token_at":1461934858} \ No newline at end of file +{"access_token":"bFlabz0uBcoIBfWL7nBJkgpl26aOWDy-dyCOvH_MjUo_hMOOKG83WV1cCL1MG6H-AE-6eMI0iyLoOoAMv9Y3pFFsLYD-GAGr3UH9fT8OqeHMDlFhXyRTvHv9l2QPHGpcARUcCGANEH","expires_in":7200,"got_token_at":1462934760} \ No newline at end of file diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index a6c7236df..3f6836614 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -3,6 +3,7 @@ <%= javascript_include_tag 'homework','baiduTemplate' %> \ No newline at end of file From 9ec488684b1e0aad209c6777b32bf3c29aa3fc47 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 May 2016 09:30:06 +0800 Subject: [PATCH 23/68] =?UTF-8?q?=E5=88=86=E4=BA=AB=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=9A=84=E6=B6=88=E6=81=AF=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/apply_homework.rb | 2 +- app/models/homework_common.rb | 1 + app/models/user.rb | 1 + app/views/admin/apply_for_homework.html.erb | 2 +- app/views/users/_homework_repository.html.erb | 2 +- app/views/users/_user_message_course.html.erb | 31 +++++++++---------- app/views/users/apply_for_homework.js.erb | 2 +- 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/app/models/apply_homework.rb b/app/models/apply_homework.rb index 0a7c505a4..f4ded9733 100644 --- a/app/models/apply_homework.rb +++ b/app/models/apply_homework.rb @@ -1,5 +1,5 @@ class ApplyHomework < ActiveRecord::Base - #status：1. 待审核 2.审核通过 3.已拒绝 + #status：1. 等待回复 2.审核通过 3.已拒绝 belongs_to :user belongs_to :homework_common attr_accessible :status, :user_id, :homework_common_id diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb index f8e222b0f..ac3303c15 100644 --- a/app/models/homework_common.rb +++ b/app/models/homework_common.rb @@ -15,6 +15,7 @@ class HomeworkCommon < ActiveRecord::Base has_many :student_works, :dependent => :destroy, :conditions => "is_test=0" has_many :student_works_evaluation_distributions, :through => :student_works #一个作业的分配的匿评列表 has_many :journals_for_messages, :as => :jour, :dependent => :destroy + has_many :apply_homeworks, :dependent => :destroy has_many :acts, :class_name => 'Activity', :as => :act, :dependent => :destroy #用户活动 # 课程动态 has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy diff --git a/app/models/user.rb b/app/models/user.rb index 2a9a13c73..cf71ec42c 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -108,6 +108,7 @@ class User < Principal has_many :student_works_evaluation_distributions, :dependent => :destroy has_many :student_works_scores, :dependent => :destroy has_many :student_work_projects, :dependent => :destroy + has_many :apply_homeworks, :dependent => :destroy #end has_and_belongs_to_many :groups, :after_add => Proc.new {|user, group| group.user_added(user)}, diff --git a/app/views/admin/apply_for_homework.html.erb b/app/views/admin/apply_for_homework.html.erb index 1c7a04901..25d15f707 100644 --- a/app/views/admin/apply_for_homework.html.erb +++ b/app/views/admin/apply_for_homework.html.erb @@ -65,7 +65,7 @@ <% if homework.status == 1 %> - 待审核 + 等待回复 <% elsif homework.status == 2 %> 已通过 <% else %> diff --git a/app/views/users/_homework_repository.html.erb b/app/views/users/_homework_repository.html.erb index 738de678c..6443942fb 100644 --- a/app/views/users/_homework_repository.html.erb +++ b/app/views/users/_homework_repository.html.erb @@ -43,7 +43,7 @@ <% if ah.nil? %> <%= link_to("请求分享", apply_homework_user_path(User.current.id,:homework_id => homework.id), :class => 'green_btn_share c_white', :remote => true) %> <% elsif ah.status == 1 %> - 待审核 + 等待回复 <% elsif ah.status == 2 %> 可引用 <% elsif ah.status == 3 %> diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index f3942d95e..9d49f687f 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -231,17 +231,17 @@ <% end %> <% if ma.course_message_type == "HomeworkCommon" && ma.status == 5 %>
      -
      • +
    • - 系统提示 - ">您有了新的引用作业申请： + <%= link_to User.find(ma.apply_user_id).show_name, + user_path(User.find(ma.apply_user_id)), :class => "newsBlue homepageNewsPublisher" %> + ">申请引用作业：
      • -
    • +
    • <% content = ma.content.nil? ? '' : '：'+ ma.content.to_s %> - <%=User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}" %> + <%= link_to User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}", student_work_index_path(:homework => ma.course_message.id), :title => User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> -
    • @@ -262,19 +262,18 @@ <% end %> <% if ma.course_message_type == "HomeworkCommon" && ma.status == 6 %> <% end %> + + <% if ma.course_message_type == "StudentWork" && ma.status == 2 %> + + <% end %> <% if ma.course_message_type == "Course" %>
        From b3782c5d0cd6d773dcdb614ec67522da5d3440e7 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 May 2016 10:47:07 +0800 Subject: [PATCH 25/68] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/admin_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 390d45cbc..d3f681a06 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -652,4 +652,5 @@ class AdminController < ApplicationController respond_to do |format| format.html end - endend + end +end From 7761bd53137782e729ece061a8f29a0855946f9a Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 May 2016 10:49:12 +0800 Subject: [PATCH 26/68] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E2=80=9C=E6=9C=89=E6=96=B0=E7=BC=BA?= =?UTF-8?q?=E9=99=B7=E4=BA=86=E2=80=9D=E6=94=B9=E6=88=90=E2=80=9C=E6=9C=89?= =?UTF-8?q?=E6=96=B0=E7=9A=84=E9=97=AE=E9=A2=98=E5=8A=A8=E6=80=81=E4=BA=86?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/zh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 163469723..18f027dce 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2141,7 +2141,7 @@ zh: label_journals_comment_template: 您的留言有新回复了 label_blog_comment_template: 您的博客有新回复了 label_new_blog_template: 有新博客了 - label_new_issue_template: 有新缺陷了 + label_new_issue_template: 有新的问题动态了 label_new_notice_template: 您的课程有新通知了 #edit yk label_code_work_tests: 代码测试列表 From ca5f03f2ea5aa89264ea1003d21d9a558940c14b Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 May 2016 14:13:34 +0800 Subject: [PATCH 27/68] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E7=9A=84=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5=EF=BC=8C=E8=AF=84?= =?UTF-8?q?=E9=98=85=E4=BD=9C=E5=93=81=E7=9A=84=E6=B6=88=E6=81=AF=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/journals_for_message.rb | 5 +++++ app/models/student_works_score.rb | 16 +++++++++++++-- app/views/users/_user_message_course.html.erb | 20 +++++++++++++++++++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index 10971d46f..4b5ac227f 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -256,6 +256,11 @@ class JournalsForMessage < ActiveRecord::Base end end if self.jour_type == 'HomeworkCommon' + if self.m_parent_id.nil? + if self.user_id != self.jour.user_id + self.course_messages << CourseMessage.new(:user_id => self.jour.user_id,:course_id => self.jour.course.id, :viewed => false) + end + end count = ShieldWechatMessage.where("container_type='User' and container_id=#{self.jour.user_id} and shield_type='Course' and shield_id=#{self.jour.course_id}").count if count == 0 ws = WechatService.new diff --git a/app/models/student_works_score.rb b/app/models/student_works_score.rb index aa38c5dcd..b2fc4fdcd 100644 --- a/app/models/student_works_score.rb +++ b/app/models/student_works_score.rb @@ -18,17 +18,29 @@ class StudentWorksScore < ActiveRecord::Base receiver = self.student_work.user # 判断是第一次评阅还是更新 status:0 新建；1 更新 if self.created_at == self.updated_at - if self.comment.nil? + if self.comment.nil? && self.score self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id, :viewed => false, :content => "作业评分：#{self.score}", :status=> false) + elsif self.score.nil? && self.comment + self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id, + :viewed => false, :content => "评语：#{self.comment}", :status=> false) + elsif self.comment.nil? && self.score.nil? + self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id, + :viewed => false, :content => "上传了批阅附件", :status=> false) else self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id, :viewed => false, :content => "作业评分：#{self.score}    评语：#{self.comment}", :status=> false) end else # 更新 - if self.comment.nil? + if self.comment.nil? && self.score self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id, :viewed => false, :content => "作业评分：#{self.score}", :status=> true) + elsif self.score.nil? && self.comment + self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id, + :viewed => false, :content => "评语：#{self.comment}", :status=> true) + elsif self.comment.nil? && self.score.nil? + self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id, + :viewed => false, :content => "上传了批阅附件", :status=> true) else self.course_messages << CourseMessage.new(:user_id => receiver.id, :course_id => self.student_work.homework_common.course.id, :viewed => false, :content => "作业评分：#{self.score}    评语：#{self.comment}", :status=> true) diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index f8e6655d9..6736b1de2 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -409,6 +409,26 @@
      • <%= time_tag(ma.created_at).html_safe %>
      <% end %> + <% elsif ma.course_message.jour_type == 'HomeworkCommon' %> + <% else %>
      • From ac5a9c87acae384b920d9441ec439d6e8b821837 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 May 2016 14:59:12 +0800 Subject: [PATCH 28/68] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E2=80=9C=E5=90=8C=E6=84=8F|=E6=8B=92?= =?UTF-8?q?=E7=BB=9D=E2=80=9D=E8=B0=83=E6=95=B4=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_apply_homework_course_message.html.erb | 27 ++++++++ .../_join_course_course_message.html.erb | 37 ++++++++++ app/views/users/_user_message_course.html.erb | 69 ++----------------- .../users/dealwith_apply_homework.js.erb | 12 +--- app/views/users/dealwith_apply_request.js.erb | 12 +--- public/stylesheets/new_user.css | 2 + 6 files changed, 72 insertions(+), 87 deletions(-) create mode 100644 app/views/users/_apply_homework_course_message.html.erb create mode 100644 app/views/users/_join_course_course_message.html.erb diff --git a/app/views/users/_apply_homework_course_message.html.erb b/app/views/users/_apply_homework_course_message.html.erb new file mode 100644 index 000000000..cf048bcd6 --- /dev/null +++ b/app/views/users/_apply_homework_course_message.html.erb @@ -0,0 +1,27 @@ +
        • +
      • + <%= link_to User.find(ma.apply_user_id).show_name, + user_path(User.find(ma.apply_user_id)), :class => "newsBlue homepageNewsPublisher" %> + ">申请引用作业： +
        • +
      • + <% content = ma.content.nil? ? '' : '：'+ ma.content.to_s %> + <%= link_to User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}", student_work_index_path(:homework => ma.course_message.id), :title => User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> + + +
        • + +
      • + + <% if ma.apply_result == 0 || ma.apply_result.nil?%> + <%= link_to '同意',dealwith_apply_homework_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true'%> + | + <%= link_to '拒绝',dealwith_apply_homework_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true'%> + <% elsif ma.apply_result == 1%> + 您已经同意了该申请 + <% elsif ma.apply_result == 2%> + 您已经拒绝了该申请 + <%end %> + +
        • +
      • <%= time_tag(ma.created_at).html_safe %>
        • \ No newline at end of file diff --git a/app/views/users/_join_course_course_message.html.erb b/app/views/users/_join_course_course_message.html.erb new file mode 100644 index 000000000..28675b7eb --- /dev/null +++ b/app/views/users/_join_course_course_message.html.erb @@ -0,0 +1,37 @@ +
        • +
      • + 系统提示 + ">您有了新的课程成员申请： +
        • +
      • + + <%= link_to User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9' ? "教师" : "教辅"}", user_path(User.find(ma.course_message_id), :course_id => ma.course_id), + :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %> + + + +
        • + +
      • + + <% if ma.status == 0 || ma.status.nil?%> + <%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true'%> + | + <%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true'%> + <% elsif ma.status == 1%> + 您已经同意了该申请 + <% elsif ma.status == 2%> + 您已经拒绝了该申请 + <%end %> + +
        • +
      • <%= time_tag(ma.created_at).html_safe %>
        • \ No newline at end of file diff --git a/app/views/users/_user_message_course.html.erb b/app/views/users/_user_message_course.html.erb index 6736b1de2..d278c7d74 100644 --- a/app/views/users/_user_message_course.html.erb +++ b/app/views/users/_user_message_course.html.erb @@ -230,34 +230,8 @@
      <% end %> <% if ma.course_message_type == "HomeworkCommon" && ma.status == 5 %> -
        -
        • -
      • - <%= link_to User.find(ma.apply_user_id).show_name, - user_path(User.find(ma.apply_user_id)), :class => "newsBlue homepageNewsPublisher" %> - ">申请引用作业： -
        • -
      • - <% content = ma.content.nil? ? '' : '：'+ ma.content.to_s %> - <%= link_to User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}", student_work_index_path(:homework => ma.course_message.id), :title => User.find(ma.apply_user_id).show_name+"申请引用作业\""+"#{HomeworkCommon.find(ma.course_message_id).name}"+"\"#{content}",:class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey "}" %> - - -
        • - -
      • - - <% if ma.apply_result == 0 || ma.apply_result.nil?%> - <%= link_to '同意',dealwith_apply_homework_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true'%> - | - <%= link_to '拒绝',dealwith_apply_homework_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true'%> - <% elsif ma.apply_result == 1%> - 您已经同意了该申请 - <% elsif ma.apply_result == 2%> - 您已经拒绝了该申请 - <%end %> - -
        • -
      • <%= time_tag(ma.created_at).html_safe %>
        • +
          + <%= render :partial => 'apply_homework_course_message', :locals => {:ma => ma} %>
        <% end %> <% if ma.course_message_type == "HomeworkCommon" && ma.status == 6 %> @@ -574,43 +548,8 @@
      <% end %> <% if ma.course_message_type == "JoinCourseRequest" %> -
        -
        • -
      • - 系统提示 - ">您有了新的课程成员申请： -
        • -
      • - <%= link_to User.find(ma.course_message_id).name+"申请成为课程\""+"#{Course.find(ma.course_id).name}"+"\"的"+"#{ma.content == '9' ? "教师" : "教辅"}", user_path(User.find(ma.course_message_id), :course_id => ma.course_id), - :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}" %> - - - -
        • - -
      • - - <% if ma.status == 0 || ma.status.nil?%> - <%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>ma.id),:remote=>'true'%> - | - <%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>ma.id),:remote=>'true'%> - <% elsif ma.status == 1%> - 您已经同意了该申请 - <% elsif ma.status == 2%> - 您已经拒绝了该申请 - <%end %> - -
        • -
      • <%= time_tag(ma.created_at).html_safe %>
        • +
          + <%= render :partial => 'join_course_course_message', :locals => {:ma => ma} %>
        <% end %> <% if ma.course_message_type == "CourseRequestDealResult" %> diff --git a/app/views/users/dealwith_apply_homework.js.erb b/app/views/users/dealwith_apply_homework.js.erb index 0f6f1af61..5cfe83d58 100644 --- a/app/views/users/dealwith_apply_homework.js.erb +++ b/app/views/users/dealwith_apply_homework.js.erb @@ -1,11 +1 @@ -$("#deal_info_<%=@msg.id%>").html( - <% if @msg.apply_result == 0 || @msg.apply_result.nil?%> - <%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>@msg.id),:remote=>'true'%> - '|' -<%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>@msg.id),:remote=>'true'%> -<% elsif @msg.apply_result == 1%> -'您已经同意了该申请' -<% elsif @msg.apply_result == 2%> -'您已经拒绝了该申请' -<%end %> -); \ No newline at end of file +$("#course_message_homework_<%=@msg.id %>").html('<%= escape_javascript(render :partial => 'users/apply_homework_course_message', :locals => {:ma => @msg}) %>'); \ No newline at end of file diff --git a/app/views/users/dealwith_apply_request.js.erb b/app/views/users/dealwith_apply_request.js.erb index e31c0be85..c71fd25cb 100644 --- a/app/views/users/dealwith_apply_request.js.erb +++ b/app/views/users/dealwith_apply_request.js.erb @@ -1,11 +1 @@ -$("#deal_info_<%=@msg.id%>").html( -<% if @msg.status == 0 || @msg.status.nil?%> -<%= link_to '同意',dealwith_apply_request_user_path(User.current,:agree=>'Y',:msg_id=>@msg.id),:remote=>'true'%> -'|' -<%= link_to '拒绝',dealwith_apply_request_user_path(User.current,:agree=>'N',:msg_id=>@msg.id),:remote=>'true'%> -<% elsif @msg.status == 1%> - '您已经同意了该申请' -<% elsif @msg.status == 2%> - '您已经拒绝了该申请' -<%end %> -); \ No newline at end of file +$("#course_message_join_<%=@msg.id %>").html('<%= escape_javascript(render :partial => 'users/join_course_course_message', :locals => {:ma => @msg}) %>'); \ No newline at end of file diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 8a49df253..2d8b1c2b8 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -620,6 +620,8 @@ a.homepageMenuControl {float:left; width:180px;} .homepageSystenMessageContent {width:281px; max-width:291px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden;text-overflow:ellipsis;max-height: 49px; } .homepageHomeworkContentWarn {width:110px; max-width:365px; margin-right:10px; font-size:12px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } .homepageHomeworkContent {width:235px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } +.homepageHomeworkContentWarn2 {width:60px; max-width:365px; margin-right:10px; font-size:12px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } +.homepageHomeworkContent2 {width:285px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; } .homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;} a.homepageWhite {color:#ffffff;} From d4c1f27533b2c45c9cd3f45b21f34c3c2bc0648c Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 May 2016 15:29:20 +0800 Subject: [PATCH 29/68] =?UTF-8?q?=E7=A7=81=E6=9C=89=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=88=86=E4=BA=AB=E6=97=B6=EF=BC=8C=E5=BC=BA?= =?UTF-8?q?=E5=88=B6=E8=A6=81=E6=B1=82=E5=86=99=E8=AF=B7=E6=B1=82=E5=88=86?= =?UTF-8?q?=E4=BA=AB=E7=9A=84=E8=AF=B4=E6=98=8E=E6=96=87=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_apply_homework.html.erb | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/app/views/users/_apply_homework.html.erb b/app/views/users/_apply_homework.html.erb index cd906fc8f..ddfac69cc 100644 --- a/app/views/users/_apply_homework.html.erb +++ b/app/views/users/_apply_homework.html.erb @@ -1,16 +1,28 @@
        <%= form_tag(apply_for_homework_user_path(:id=>User.current.id,:homework_id=>homework.id), :multipart => true,:remote => true,:name=>"apply_for_homework_form",:id=>'apply_for_homework_form') do %> -

        请求分享

        -

        - 请求说明（可选）： - +

        申请分享

        +

        + 申请说明（必选）： +

        +
        - + 确  定
        <% end %>
        -
        \ No newline at end of file +
    + \ No newline at end of file From 582c305a4709822009a844562f10d965cfc8dcfa Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 May 2016 16:29:39 +0800 Subject: [PATCH 30/68] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E8=BF=87=E7=9A=84=E4=BD=9C=E4=B8=9A=E5=9C=A8=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=8E=E4=B8=8D=E5=BA=94=E8=AF=A5=E5=9C=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=A2=98=E5=BA=93=E4=B8=AD=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 35 +++++++++++++++++++---------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 0440c0c80..60d9bb67c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -634,18 +634,27 @@ class UsersController < ApplicationController course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")" @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and course_id in #{course_ids}").order("#{@order} #{@b_sort}") elsif params[:type] == "3" #申请题库 - #apply_homeworks = ApplyHomework.where("user_id = ?",@user.id) + none_visible_course = Course.where("is_delete = 1") + none_visible_course_ids = none_visible_course.empty? ? "(-1)" : "(" + none_visible_course.map{|course| course.id}.join(",") + ")" + #apply_homeworks = ApplyHomework.where("user_id = ?",@user.id).order('created_at desc') #homework_ids = apply_homeworks.empty? ? "(-1)" : "(" + apply_homeworks.map{|ah| ah.homework_common_id}.join(",") + ")" - #@homeworks = HomeworkCommon.where("id in #{homework_ids}") - sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN apply_homeworks as ah ON homework_commons.id = ah.homework_common_id where ah.user_id = #{@user.id} order by ah.created_at desc" + #@homeworks = HomeworkCommon.where("id in #{homework_ids} and course_id not in #{none_visible_course_ids}") + + sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN apply_homeworks as ah ON homework_commons.id = ah.homework_common_id where ah.user_id = #{@user.id} and homework_commons.course_id not in #{none_visible_course_ids} order by ah.created_at desc" @homeworks = HomeworkCommon.find_by_sql(sql) end - if params[:property] && params[:property] == "1" - @homeworks = @homeworks.where("homework_type = 1").reorder("#{@order} #{@b_sort}") - elsif params[:property] && params[:property] == "2" - @homeworks = @homeworks.where("homework_type = 2").reorder("#{@order} #{@b_sort}") - elsif params[:property] && params[:property] == "3" - @homeworks = @homeworks.where("homework_type = 3").reorder("#{@order} #{@b_sort}") + if params[:property] + all_homework_ids = @homeworks.empty? ? "(-1)" : "(" + @homeworks.map{|h| h.id}.join(",") + ")" + if params[:property] == "1" + @homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 1") + #@homeworks = @homeworks.where("homework_type = 1").reorder("#{@order} #{@b_sort}") + elsif params[:property] == "2" + @homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 2") + #@homeworks = @homeworks.where("homework_type = 2").reorder("#{@order} #{@b_sort}") + elsif params[:property] == "3" + @homeworks = HomeworkCommon.find_by_sql("select * from homework_commons where id in #{all_homework_ids} and homework_type = 3") + #@homeworks = @homeworks.where("homework_type = 3").reorder("#{@order} #{@b_sort}") + end end @type = params[:type] @property = params[:property] @@ -723,13 +732,15 @@ class UsersController < ApplicationController elsif params[:type] == "3" #申请题库 apply_homeworks = ApplyHomework.where("user_id = ?",@user.id) homework_ids = apply_homeworks.empty? ? "(-1)" : "(" + apply_homeworks.map{|ah| ah.homework_common_id}.join(",") + ")" + none_visible_course = Course.where("is_delete = 1") + none_visible_course_ids = none_visible_course.empty? ? "(-1)" : "(" + none_visible_course.map{|course| course.id}.join(",") + ")" if @order == "course_name" - sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_commons.id in #{homework_ids} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}" + sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where courses.is_delete = 0 and homework_commons.id in #{homework_ids} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}" @homeworks = HomeworkCommon.find_by_sql(sql) elsif @order == "user_name" - @homeworks = HomeworkCommon.where("homework_commons.id in #{homework_ids} and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}") + @homeworks = HomeworkCommon.where("homework_commons.id in #{homework_ids} and course_id not in #{none_visible_course_ids} and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}") else - @homeworks = HomeworkCommon.where("id in #{homework_ids} and (name like '%#{search}%') and homework_type in #{type_ids}").order("#{@order} #{@b_sort}") + @homeworks = HomeworkCommon.where("id in #{homework_ids} and (name like '%#{search}%') and course_id not in #{none_visible_course_ids} and homework_type in #{type_ids}").order("#{@order} #{@b_sort}") end end =begin From 8af04595193bdc634b367da6c6f0e1e6350eabd9 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 May 2016 16:56:50 +0800 Subject: [PATCH 31/68] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E4=B8=AD=E4=B8=8D=E5=BA=94=E5=87=BA=E7=8E=B0=E5=B7=B2=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E7=9A=84=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 60d9bb67c..8995a5aee 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1371,7 +1371,7 @@ class UsersController < ApplicationController shield_course_ids = ShieldActivity.select("shield_id").where("container_type='User' and container_id=#{@user.id} and shield_type='Course'").map(&:shield_id) @page = params[:page] ? params[:page].to_i + 1 : 0 user_project_ids = (@user.projects.visible.map{|project| project.id}-shield_project_ids).empty? ? "(-1)" : "(" + (@user.projects.visible.map{|project| project.id}-shield_project_ids).join(",") + ")" - user_course_ids = (@user.courses.visible.map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.courses.visible.map{|course| course.id}-shield_course_ids).join(",") + ")" + user_course_ids = (@user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).empty? ? "(-1)" : "(" + (@user.courses.visible.where("is_delete = 0").map{|course| course.id}-shield_course_ids).join(",") + ")" course_types = "('Message','News','HomeworkCommon','Poll','Course','JournalsForMessage')" project_types = "('Message','Issue','ProjectCreateInfo')" principal_types = "JournalsForMessage" From 565d5e3bcc90548a99c60bb4e18b5d4e3174f53a Mon Sep 17 00:00:00 2001 From: Tim Date: Thu, 12 May 2016 17:41:27 +0800 Subject: [PATCH 32/68] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B5=8B=E9=AA=8C?= =?UTF-8?q?=E5=88=97=E8=A1=A8html=E4=BB=A3=E7=A0=81=E9=87=8D=E6=9E=84?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=BA=8F=E5=8F=B7=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_student_exercise.html.erb | 34 ++---- app/views/exercise/_student_table.html.erb | 1 + .../student_work/_evaluation_title.html.erb | 16 +-- .../_evaluation_un_title.html.erb | 20 ++- .../student_work/_evaluation_un_work.html.erb | 65 +++++----- .../student_work/_evaluation_work.html.erb | 115 ++++++++---------- public/stylesheets/courses.css | 16 ++- public/stylesheets/public.css | 4 +- 8 files changed, 130 insertions(+), 141 deletions(-) diff --git a/app/views/exercise/_student_exercise.html.erb b/app/views/exercise/_student_exercise.html.erb index 3bcd6b83f..d7a1b85bb 100644 --- a/app/views/exercise/_student_exercise.html.erb +++ b/app/views/exercise/_student_exercise.html.erb @@ -50,29 +50,19 @@ }*/
      -
    • -
        -
      • - <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40"),user_activities_path(exercise.user)) %> -
        • -
        -
      • -
          -
        • - <%=exercise.user.show_name %> -
          • -
        • - <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%> -
          • -
        • - -- -
          • -
        -
        • -
        -
      +
    • 1
      • +
    • + <%= link_to(image_tag(url_to_avatar(exercise.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(exercise.user)) %>
      • -
    • +
    • + <%=exercise.user.show_name %> +
    • + <%= exercise.user.user_extensions.nil? ? "--" : exercise.user.user_extensions.student_id%> +
      • +
    • + -- +
      • +
    • <% if exercise.created_at%> <%= Time.parse(format_time(exercise.created_at)).strftime("%m-%d %H:%M")%>  <% if @exercise.end_time <= exercise.created_at %> diff --git a/app/views/exercise/_student_table.html.erb b/app/views/exercise/_student_table.html.erb index 719667973..8957c5048 100644 --- a/app/views/exercise/_student_table.html.erb +++ b/app/views/exercise/_student_table.html.erb @@ -1,5 +1,6 @@
      • + 序号    姓名 学号 diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb index 2ef5ee9af..257fcb94a 100644 --- a/app/views/student_work/_evaluation_title.html.erb +++ b/app/views/student_work/_evaluation_title.html.erb @@ -1,13 +1,15 @@
          -
        • - 作品名称 +
        • 序号
          • +
        •  
          • +
        • + 作品名称 +
          • <% if @homework.homework_type != 3 %> - 姓名 - 学号 +
        • 姓名
          • +
        • 学号
          • <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> - 关联项目 +
        • 关联项目
          • <% end %> -
        • 时间 @@ -19,7 +21,7 @@
          • <% end%> -
        • +
        • 我的评分
        \ No newline at end of file diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb index aee833b70..08edeff91 100644 --- a/app/views/student_work/_evaluation_un_title.html.erb +++ b/app/views/student_work/_evaluation_un_title.html.erb @@ -1,21 +1,29 @@
          -
        • - 作品名称 +
        • 序号
          • +
        •  
          • +
        • + 作品名称 +
          • <% if @homework.homework_type != 3 %> - <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl" ,:remote => true%> +
        • + <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml18" ,:remote => true%> <% if @show_all && @order == "lastname"%> <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%> <% end%> +
          • +
        • - <%= link_to "学号",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml50" ,:remote => true%> + <%= link_to "学号",@show_all ? student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml30" ,:remote => true%> <% if @show_all && @order == "student_id"%> <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "student_id", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%> <% end%> +
          • <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> - 关联项目 +
        • + 关联项目 +
          • <% end %> -
        • <%= link_to "时间",@show_all ? student_work_index_path(:homework => @homework.id,:order => "created_at", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml50" ,:remote => true%> diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index 8e1c16264..e9518df7a 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -1,44 +1,35 @@
            -
          • -
              -
            • - <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40"),user_activities_path(student_work.user)) %> -
              • -
              -
            • - <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> -
              - <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%> -
              +
            • 1
              • +
            • + <%= link_to(image_tag(url_to_avatar(student_work.user),:width =>"40",:height => "40",:style => "display:block;"),user_activities_path(student_work.user)) %> +
              • +
              +
            • + <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> +
              + <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%> +
              +
              • + <% if @homework.homework_type != 3 %> +
            • + <%= student_work.user.show_name%>
              • -
            • - <% if @homework.homework_type != 3 %> -
                -
              • - <%= student_work.user.show_name%> -
                • -
              • "> - <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> -
                • -
              - <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> -
                - <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %> -
              • - <%= link_to( student_work.project.name, project_path(student_work.project.id))%> -
                • - <% else %> -
              • - <%= student_work.project.name %> -
                • - <% end %> -
              - <% end %> +
            • " onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor:pointer;"> + <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
              • -
              -
            -
            • + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> + <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %> +
          • + <%= link_to( student_work.project.name, project_path(student_work.project.id))%> +
            • + <% else %> +
          • + <%= student_work.project.name %> +
            • + <% end %> + <% end %> +
  • <% if student_work.created_at && @homework.end_time%> <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  diff --git a/app/views/student_work/_evaluation_work.html.erb b/app/views/student_work/_evaluation_work.html.erb index ad2ee56c3..51263e5ba 100644 --- a/app/views/student_work/_evaluation_work.html.erb +++ b/app/views/student_work/_evaluation_work.html.erb @@ -6,74 +6,63 @@ <% pro = @homework.student_work_projects.where(:user_id => User.current.id).first %> <% is_my_work = pro && pro.student_work_id == student_work.id%> <% end %> -
  • -
      - <% if is_my_work%> -
    • - <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %> -
      • -
    • - <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> -
      - <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w230"%> -
      + + <% if is_my_work%> +
    • 1
      • +
    • + <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40", style: "display:block;") %> +
      • +
    • +
      + <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> + <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%> +
      +
      • +
      + <% if @homework.homework_type != 3 %> +
    • + <%= student_work.user.show_name%>
      • -
    • - <% if @homework.homework_type != 3 %> -
        -
      • - <%= student_work.user.show_name%> -
        • -
      • "> - <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> -
        • -
      - <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> -
        - <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %> -
      • - <%= link_to( student_work.project.name, project_path(student_work.project.id))%> -
        • - <% else %> -
      • - <%= student_work.project.name %> -
        • - <% end %> -
      - <% end %> +
    • " onclick="show_student_work('<%= student_work_path(student_work)%>');" style="cursor: pointer;"> + <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%>
      • - <% else%> -
    • - <%= image_tag(url_to_avatar(""),width:"40", height: "40") %> + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> + <% if student_work.project.is_public || User.current.member_of?(student_work.project) || User.current.admin? %> +
    • + <%= link_to( student_work.project.name, project_path(student_work.project.id))%> +
      • + <% else %> +
    • + <%= student_work.project.name %> +
      • + <% end %> + <% end %> +
      + <% else%> +
    • 1
      • +
    • + <%= image_tag(url_to_avatar(""),width:"40", height: "40", style: "display:block;") %> +
      • +
    • +
      + <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w250"%> +
      +
      • + <% if @homework.homework_type != 3 %> +
    • + 匿名
      • -
    • -
      - <%= link_to "匿名的作品", student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word w230"%> -
      +
    • + --
      • -
    • - <% if @homework.homework_type != 3 %> -
        -
      • - 匿名 -
        • -
      • - -- -
        • -
      - <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> -
        -
      • - 匿名 -
        • -
      - <% end %> + <% elsif @homework.homework_type == 3 && @homework.homework_detail_group.base_on_project == 1 %> +
    • + 匿名
      • - <% end%> + <% end %> + <% end%> -
    -
    • -
  • +
  • <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(format_time(student_work.created_at)).strftime("%Y-%m-%d") %> [迟交] @@ -89,7 +78,7 @@ <% end%> <% my_score = student_work_score(student_work,User.current) %> -
  • +
  • <%= my_score.nil? ? "--" : format("%.1f",my_score.score)%>
    • diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index b81a7a7b6..b8f32986f 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -51,14 +51,18 @@ a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;} .hworkTip em {display:block; border-width:8px; position:absolute; bottom:4px; left:-16px; border-style:dashed solid dashed dashed; border-color:transparent #eaeaea transparent transparent; font-size:0; line-height:0;} .hworkTip span {display:block; border-width:8px; position:absolute; bottom:4px; left:-15px; border-style:dashed solid dashed dashed; border-color:transparent #FFF transparent transparent; font-size:0; line-height:0;} .hworkList340 {width:335px; text-align:left; height:50px; line-height:50px;padding-left:5px;} -.hworkList80 {width:80px; text-align:center;} +.hworkList30 {width:30px; text-align:center;} .hworkList50 {width:50px; text-align:center;} +.hworkList60 {width:60px; text-align:center;} +.hworkList80 {width:80px; text-align:center;} .hworkList130 {width:130px; text-align:center;} +.hworkList160 {width:160px; text-align:center;} +.hworkList260 {width:260px; text-align:left;} .codeList{ float:right; font-size:12px; color:#484848; padding:0px 3px; width:714px; margin-bottom:10px; } -.hworkName {width:115px; float:left; line-height:18px;} +.hworkName {width:80px; float:left; line-height:18px;} .hworkName div{max-height: 40px;overflow: hidden;} -.hworkStName {width:60px; max-width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;} -.hworkStID {width:80px; max-width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;} +.hworkStName {width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;} +.hworkStID {width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;} .hworkDate {max-width:150px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:14px; line-height:14px; font-size:12px; color:#888888;} .hworkMenu {width:100px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-110px; font-size:12px; color:#888888; display:none; line-height:2; z-index:99;} a.hworkExport {background:url(../images/homepage_icon2.png) -10px -401px no-repeat; padding-left:23px;} @@ -79,12 +83,14 @@ a.hworkSearchIcon:hover {background:url(../images/nav_icon.png) -49px -1px no-re .StudentName{display: table-cell;width: 115px;vertical-align: middle;text-align: left;height: 40px;} .width385{width: 385px;} .width505{width: 505px;} +.width130{width: 130px;} .width165{width: 165px;} .width180{width: 180px;} .width525{width: 525px;} .width285{width: 285px;} .width255{width: 255px;} .width530{width: 530px;} +.ml18 {margin-left:18px;} .mr95{margin-right: 95px;} .mr140 {margin-right: 140px;} .ml100{margin-left: 100px;} @@ -1223,7 +1229,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;} .ml7 {margin-left:7px;} .tac {text-align:center;} .proHelp {background:url(/images/course/hwork_icon.png) -5px -124px no-repeat; display:inline-block; width:15px; height:15px; display:inline-block;} -.hworkPrName {width:110px; max-width:110px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;} +.hworkPrName {width:160px; max-width:160px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:65px; line-height:65px; vertical-align:middle; font-size:12px; color:#888888; text-align:center;} .mr150 {margin-right:150px;} .relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;} .captainName {max-width:75px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 7345cad35..9b47490d3 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -87,6 +87,7 @@ h4{ font-size:14px; color:#3b3b3b;} .ml100{ margin-left:100px;} .ml110{ margin-left:110px;} .ml125 { margin-left:125px;} +.ml200 {margin-left:200px;} .ml320{ margin-left:320px;} .ml150 { margin-left:150px;} .mr-5 {margin-right:-5px;} @@ -144,7 +145,7 @@ h4{ font-size:14px; color:#3b3b3b;} .w50 {width:50px;} .w60{ width:60px;} .w70{ width:70px;} -.w80{ width:80px;} +.w80{ width:80px !important;} .w90{ width:90px;} .w100{width: 100px;} .w125{width:125px;} @@ -154,6 +155,7 @@ h4{ font-size:14px; color:#3b3b3b;} .w170{width:170px;} .w230{width:230px !important;} .w235{ width:235px !important;} +.w250{ width:250px !important;} .w280{ width:280px;} .w265{ width: 265px;} .w270{ width: 270px;} From 0f61994252038b66528a98ca5c4bcb512f2d6800 Mon Sep 17 00:00:00 2001 From: cxt Date: Thu, 12 May 2016 17:49:07 +0800 Subject: [PATCH 33/68] =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=BC=98=E7=A7=80=E6=8E=92=E8=A1=8C=E4=B8=AD?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E9=93=BE=E6=8E=A5=EF=BC=8C=E5=9C=A8=E6=89=93?= =?UTF-8?q?=E5=BC=80=E7=9A=84=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=AE=9A=E4=BD=8D=E5=88=B0=E8=AF=A5=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E4=BD=9C=E5=93=81=E5=B9=B6=E9=BB=98=E8=AE=A4=E6=89=93?= =?UTF-8?q?=E5=BC=80=E8=AF=A5=E4=BD=9C=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 4 +++- .../organizations/_org_course_homework.html.erb | 14 ++++++++++++-- .../student_work/_evaluation_un_work.html.erb | 1 + app/views/student_work/_student_work_list.html.erb | 2 +- app/views/users/_course_homework.html.erb | 4 ++-- app/views/users/_user_homework_detail.html.erb | 4 ++-- 6 files changed, 21 insertions(+), 8 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9b19b8c7c..bbf67f6a3 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2997,9 +2997,11 @@ def homework_common_index_url_in_org(course_id) Setting.protocol + "://" + Setting.host_name + "/homework_common?course=" + course_id.to_s end -def student_work_index_url_in_org(homework_id, is_focus = '') +def student_work_index_url_in_org(homework_id, is_focus = '', show_work_id = '') if is_focus != '' Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s + "&is_focus=" + is_focus.to_s + elsif show_work_id != '' + Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s + "&show_work_id=" + show_work_id.to_s else Setting.protocol + "://" + Setting.host_name + "/student_work?homework=" + homework_id.to_s end diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb index 8a780ea78..b4ca46959 100644 --- a/app/views/organizations/_org_course_homework.html.erb +++ b/app/views/organizations/_org_course_homework.html.erb @@ -159,8 +159,18 @@ <% end %> <% student_works.each_with_index do |sw, i| %>
    - <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_url_in_org(activity.id), :alt => "学生头像" %> - + + <% if User.current.member_of_course?(activity.course) || User.current.admin? || activity.is_open == 1 %> + <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_url_in_org(activity.id, '', sw.id), :alt => "学生头像" %> + + <% else %> + <%= image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40", :title => '该作业的作品暂未公开') %> + + <% end %> <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %>

    分数：<%=format("%.1f",score.to_i<0 ? 0 : score.to_i) %>分

    diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index 965d126ee..ad7f12efa 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -1,4 +1,5 @@ +
      • diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb index ca76b0f2a..66e3a4818 100644 --- a/app/views/student_work/_student_work_list.html.erb +++ b/app/views/student_work/_student_work_list.html.erb @@ -49,7 +49,6 @@
        <% end%> +<% end%> From 979598f334c042f434493708bb3afdd93845535a Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 13 May 2016 11:06:47 +0800 Subject: [PATCH 41/68] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=97=AE=E7=AD=94?= =?UTF-8?q?=E5=8C=BA=E5=B8=96=E5=AD=90=E7=9A=84=E5=8F=91=E9=80=81=E9=98=B2?= =?UTF-8?q?=E6=AD=A2=E8=BF=9E=E7=BB=AD=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/boards/_course_new.html.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/boards/_course_new.html.erb b/app/views/boards/_course_new.html.erb index 3deb04f6c..df61d2b9c 100644 --- a/app/views/boards/_course_new.html.erb +++ b/app/views/boards/_course_new.html.erb @@ -2,6 +2,7 @@ <%= import_ke(enable_at: true, prettify: false, init_activity: false) %> <% end %> +<% end %> - From 8d338cff9ee73788149d560c1d1bd23a1ed60d93 Mon Sep 17 00:00:00 2001 From: txz Date: Fri, 13 May 2016 15:48:31 +0800 Subject: [PATCH 54/68] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E9=94=81=E5=AE=9A?= =?UTF-8?q?=E5=B8=96=E5=AD=90=E5=85=B3=E9=97=AD=E5=9B=9E=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/course_discussion.html | 4 ++-- public/assets/wechat/project_discussion.html | 4 ++-- public/stylesheets/weui/weixin.css | 3 +++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html index 3f095ab62..e36fb3e27 100644 --- a/public/assets/wechat/course_discussion.html +++ b/public/assets/wechat/course_discussion.html @@ -3,7 +3,7 @@
        -
        {{discussion.subject}}
        +
        {{discussion.subject}}      
        @@ -38,7 +38,7 @@ -
        +
        diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html index 890b47a73..24ed8c9fc 100644 --- a/public/assets/wechat/project_discussion.html +++ b/public/assets/wechat/project_discussion.html @@ -3,7 +3,7 @@
        -
        {{discussion.subject}}
        +
        {{discussion.subject}}      
        发布者： {{discussion.user.realname}}
        @@ -38,7 +38,7 @@ -
        +
        diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index fffa7a214..daa66d6bb 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -77,3 +77,6 @@ a.underline {text-decoration:underline;} .loading-box {position:absolute; top:50%; background:white; width:160px; height:72px; left:50%; margin-top:-36px; margin-left:-80px; text-align:center;} .loading-box img {margin-top: 3px; text-align: center;} .loading-box span {display: block; font-size:12px;} + +/*帖子锁定样式*/ +.locked_btn_cir {background: url("/images/locked.png") 0 0 no-repeat; cursor: default;} \ No newline at end of file From be97675aede746391a589df4e6498b9253ec0226 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 13 May 2016 16:09:26 +0800 Subject: [PATCH 55/68] =?UTF-8?q?=E6=B2=A1=E5=B8=A6=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=9B=BE=E7=89=87=E4=B8=8D=E8=AE=A9?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=94=BE=E5=A4=A7=E7=9C=8B!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/application.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/public/javascripts/application.js b/public/javascripts/application.js index aa445f817..c43e0a6a2 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1013,15 +1013,18 @@ function showNormalImage(id) { var image=$(description_images[i]); var _path = getRootPath(); //如果图片是视频图片，不处理。 + if($(image).hasClass("mediaIco")){ var _src = _path+"/"+$(image).attr('src'); $(image).attr('src',_src); return; } - - var element=$("").attr("href",image.attr('src')); - image.wrap(element); - $(image).parent().colorbox({rel:'nofollow', close: "关闭", returnFocus: false}); + var tmpsrc = image.attr('src'); + if (tmpsrc.indexOf('.gif') >= 0 || tmpsrc.indexOf('.jpg') >= 0 || tmpsrc.indexOf('.jpeg') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.bmp') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.BMP') >= 0 || tmpsrc.indexOf('.JPEG') >= 0 || tmpsrc.indexOf('.JPG') >= 0 || tmpsrc.indexOf('.PNG') >= 0 || tmpsrc.indexOf('.GIF') >= 0) { + var element = $("").attr("href", image.attr('src')); + image.wrap(element); + $(image).parent().colorbox({rel: 'nofollow', close: "关闭", returnFocus: false}); + } } //$('#'+id+' a').colorbox({rel:'nofollow', close: "关闭", returnFocus: false}); //有图片才将链接变为弹出框 } From bc39b68bb2180b5e55296611627b206c39e99c9f Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 13 May 2016 16:50:41 +0800 Subject: [PATCH 56/68] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=B5=8B=E9=AA=8C?= =?UTF-8?q?=E9=A2=98=E7=9B=AE=E3=80=81=E9=97=AE=E5=8D=B7=E9=A2=98=E7=9B=AE?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=A4=9A=E6=AC=A1=E6=8F=90=E4=BA=A4=E8=A1=A8?= =?UTF-8?q?=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/exercise/_exercise_form.html.erb | 9 ++++ app/views/exercise/_new_MC.html.erb | 11 +++- app/views/exercise/_new_MCQ.html.erb | 11 +++- app/views/exercise/_new_single.html.erb | 11 +++- app/views/exercise/_show_MC.html.erb | 5 +- app/views/exercise/_show_MCQ.html.erb | 5 +- app/views/exercise/_show_single.html.erb | 5 +- app/views/poll/_new_MC.html.erb | 13 +++-- app/views/poll/_new_MCQ.html.erb | 13 +++-- app/views/poll/_new_mulit.html.erb | 13 +++-- app/views/poll/_new_single.html.erb | 13 +++-- app/views/poll/_poll_form.html.erb | 60 +++++++++++++++++----- app/views/poll/create_poll_question.js.erb | 2 +- 13 files changed, 135 insertions(+), 36 deletions(-) diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb index ec099cb09..f8fe7896c 100644 --- a/app/views/exercise/_exercise_form.html.erb +++ b/app/views/exercise/_exercise_form.html.erb @@ -87,10 +87,19 @@ var standard_ans = $.trim($("#question_standard_ans").val()); if(title.length == 0 || score.length == 0){ alert("题目标题/分数不能为空"); + doc.one('click', function(){ + add_poll_question($(this),quest_type); + }); }else if(!/^[1-9][0-9]*$/.test(score)) { alert("分数必须是非零开头的数字"); + doc.one('click', function(){ + add_poll_question($(this),quest_type); + }); }else if(quest_type !=3 && standard_ans.length == 0) { alert("标准答案不能为空"); + doc.one('click', function(){ + add_poll_question($(this),quest_type); + }); }else{ doc.parent().parent().parent().submit();} } diff --git a/app/views/exercise/_new_MC.html.erb b/app/views/exercise/_new_MC.html.erb index 6fd6c201e..43628f104 100644 --- a/app/views/exercise/_new_MC.html.erb +++ b/app/views/exercise/_new_MC.html.erb @@ -54,9 +54,16 @@
        - 保存 + 保存 取消
        -<% end %> \ No newline at end of file +<% end %> + \ No newline at end of file diff --git a/app/views/exercise/_new_MCQ.html.erb b/app/views/exercise/_new_MCQ.html.erb index a24835fc1..875b9ec4c 100644 --- a/app/views/exercise/_new_MCQ.html.erb +++ b/app/views/exercise/_new_MCQ.html.erb @@ -54,9 +54,16 @@
        - 保存 + 保存 取消
        -<% end %> \ No newline at end of file +<% end %> + \ No newline at end of file diff --git a/app/views/exercise/_new_single.html.erb b/app/views/exercise/_new_single.html.erb index 6180dac8e..24a0ad047 100644 --- a/app/views/exercise/_new_single.html.erb +++ b/app/views/exercise/_new_single.html.erb @@ -42,9 +42,16 @@
        - 保存 + 保存 取消
        -<% end %> \ No newline at end of file +<% end %> + \ No newline at end of file diff --git a/app/views/exercise/_show_MC.html.erb b/app/views/exercise/_show_MC.html.erb index eef7546e5..99c48a3ab 100644 --- a/app/views/exercise/_show_MC.html.erb +++ b/app/views/exercise/_show_MC.html.erb @@ -90,7 +90,7 @@ ''+ ''+ '
        '+ - ''+ + ''+ '保存'+ ''+ ''+ @@ -102,6 +102,9 @@ '<% end%>' ); $("#poll_questions_title").focus(); + $("#add_new_question").one('click', function(){ + add_poll_question($(this),1); + }); } } else { diff --git a/app/views/exercise/_show_MCQ.html.erb b/app/views/exercise/_show_MCQ.html.erb index 9e66f17f9..a7ee60aa3 100644 --- a/app/views/exercise/_show_MCQ.html.erb +++ b/app/views/exercise/_show_MCQ.html.erb @@ -89,7 +89,7 @@ ''+ '
        '+ '
        '+ - ''+ + ''+ '保存'+ ''+ ''+ @@ -101,6 +101,9 @@ '<% end%>' ); $("#poll_questions_title").focus(); + $("#add_new_question").one('click', function(){ + add_poll_question($(this),2); + }); } }else { $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(""); diff --git a/app/views/exercise/_show_single.html.erb b/app/views/exercise/_show_single.html.erb index 90f604da1..e559805fe 100644 --- a/app/views/exercise/_show_single.html.erb +++ b/app/views/exercise/_show_single.html.erb @@ -65,7 +65,7 @@ ''+ '
        '+ '
        '+ - ''+ + ''+ '保存'+ ''+ ''+ @@ -77,6 +77,9 @@ '<% end%>' ); $("#poll_questions_title").focus(); + $("#add_new_question").one('click', function(){ + add_poll_question($(this),3); + }); } } else { $("#insert_new_poll_question_"+quest_type+"_"+quest_id).html(""); diff --git a/app/views/poll/_new_MC.html.erb b/app/views/poll/_new_MC.html.erb index e5f2a6b82..268ce18b1 100644 --- a/app/views/poll/_new_MC.html.erb +++ b/app/views/poll/_new_MC.html.erb @@ -5,7 +5,7 @@
        - +
        @@ -35,7 +35,7 @@
        - + <%= l(:label_button_ok)%> @@ -45,4 +45,11 @@
        -<% end%> \ No newline at end of file +<% end%> + \ No newline at end of file diff --git a/app/views/poll/_new_MCQ.html.erb b/app/views/poll/_new_MCQ.html.erb index 43b41f95d..0fbb588c5 100644 --- a/app/views/poll/_new_MCQ.html.erb +++ b/app/views/poll/_new_MCQ.html.erb @@ -3,7 +3,7 @@
        - +
        @@ -33,7 +33,7 @@
        - + <%= l(:label_button_ok)%> @@ -42,4 +42,11 @@
        -<% end%> \ No newline at end of file +<% end%> + \ No newline at end of file diff --git a/app/views/poll/_new_mulit.html.erb b/app/views/poll/_new_mulit.html.erb index 8a2205760..d25d34542 100644 --- a/app/views/poll/_new_mulit.html.erb +++ b/app/views/poll/_new_mulit.html.erb @@ -3,7 +3,7 @@
        - +
        @@ -13,7 +13,7 @@
        - + <%= l(:label_button_ok)%> @@ -22,4 +22,11 @@
        -<% end%> \ No newline at end of file +<% end%> + \ No newline at end of file diff --git a/app/views/poll/_new_single.html.erb b/app/views/poll/_new_single.html.erb index 7588bf3b4..fe8e7b604 100644 --- a/app/views/poll/_new_single.html.erb +++ b/app/views/poll/_new_single.html.erb @@ -3,12 +3,12 @@
        - +
        - + <%= l(:label_button_ok)%> @@ -17,4 +17,11 @@
        -<% end%> \ No newline at end of file +<% end%> + \ No newline at end of file diff --git a/app/views/poll/_poll_form.html.erb b/app/views/poll/_poll_form.html.erb index e08b13033..73c783794 100644 --- a/app/views/poll/_poll_form.html.erb +++ b/app/views/poll/_poll_form.html.erb @@ -51,8 +51,8 @@ function chooseQuestionType(quest_type,quest_id){ } function add_MC(){ - $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MC') %>"); - $("#poll_questions_title").focus(); + $("#new_poll_question_new").html("<%= escape_javascript(render :partial => 'new_MC') %>"); + $("#poll_questions_title_new").focus(); } function insert_MC(quest_type,quest_num,quest_id){ @@ -94,7 +94,7 @@ function add_MC(){ ''+ ''+ '
        '+ - ''+ + ''+ '<%= l(:label_button_ok)%>'+ ''+ ''+ @@ -106,11 +106,14 @@ function add_MC(){ '<% end%>' ); $("#poll_questions_title").focus(); + $("#add_new_question").one('click', function(){ + add_poll_question($(this)); + }); } function add_MCQ(){ - $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_MCQ') %>"); - $("#poll_questions_title").focus(); + $("#new_poll_question_new").html("<%= escape_javascript(render :partial => 'new_MCQ') %>"); + $("#poll_questions_title_new").focus(); } function insert_MCQ(quest_type,quest_num,quest_id){ @@ -152,7 +155,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){ ''+ '
        '+ '
        '+ - ''+ + ''+ '<%= l(:label_button_ok)%>'+ ''+ ''+ @@ -164,11 +167,14 @@ function insert_MCQ(quest_type,quest_num,quest_id){ '<% end%>' ); $("#poll_questions_title").focus(); + $("#add_new_question").one('click', function(){ + add_poll_question($(this)); + }); } function add_single(){ - $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_single') %>"); - $("#poll_questions_title").focus(); + $("#new_poll_question_new").html("<%= escape_javascript(render :partial => 'new_single') %>"); + $("#poll_questions_title_new").focus(); } function insert_SINGLE(quest_type,quest_num,quest_id){ @@ -185,7 +191,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){ ''+ '
        '+ '
        '+ - ''+ + ''+ '<%= l(:label_button_ok)%>'+ ''+ ''+ @@ -197,10 +203,13 @@ function insert_MCQ(quest_type,quest_num,quest_id){ '<% end%>' ); $("#poll_questions_title").focus(); + $("#add_new_question").one('click', function(){ + add_poll_question($(this)); + }); } function add_mulit(){ - $("#new_poll_question").html("<%= escape_javascript(render :partial => 'new_mulit') %>"); - $("#poll_questions_title").focus(); + $("#new_poll_question_new").html("<%= escape_javascript(render :partial => 'new_mulit') %>"); + $("#poll_questions_title_new").focus(); } function insert_MULIT(quest_type,quest_num,quest_id){ @@ -219,7 +228,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){ '
        '+ '
        '+ '
        '+ - ''+ + ''+ '<%= l(:label_button_ok)%>'+ ''+ ''+ @@ -231,6 +240,9 @@ function insert_MCQ(quest_type,quest_num,quest_id){ '<% end%>' ); $("#poll_questions_title").focus(); + $("#add_new_question").one('click', function(){ + add_poll_question($(this)); + }); } //选择导入调查问卷 @@ -262,8 +274,28 @@ function insert_MCQ(quest_type,quest_num,quest_id){ function add_poll_question(doc) { var title = $.trim($("#poll_questions_title").val()); - if(title.length == 0){alert("标题不能为空");}else{doc.parent().parent().parent().submit();} + if(title.length == 0){ + alert("标题不能为空"); + doc.one('click', function(){ + add_poll_question($(this)); + }); + }else{ + doc.parent().parent().parent().submit(); + } } + + function add_poll_question_new(doc) + { + var title = $.trim($("#poll_questions_title_new").val()); + if(title.length == 0){ + alert("标题不能为空"); + doc.one('click', function(){ + add_poll_question($(this)); + }); + }else{ + doc.parent().parent().parent().submit(); + } + } //修改标题时确定按钮 function edit_poll_question(doc,id) { @@ -373,7 +405,7 @@ function insert_MCQ(quest_type,quest_num,quest_id){
        -
        +
        diff --git a/app/views/poll/create_poll_question.js.erb b/app/views/poll/create_poll_question.js.erb index 8a597514e..cbb9da3da 100644 --- a/app/views/poll/create_poll_question.js.erb +++ b/app/views/poll/create_poll_question.js.erb @@ -1,7 +1,7 @@ <% if @is_insert %> $("#poll_content").html('<%= escape_javascript(render :partial => 'poll_content', :locals => {:poll => @poll})%>'); <% else %> -$("#new_poll_question").html(""); +$("#new_poll_question_new").html(""); $("#poll_content").append("
        " + "
        " + From 2c7a964470b2f76c0de351058f47f5c1d746c460 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 13 May 2016 16:59:59 +0800 Subject: [PATCH 57/68] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E7=B2=98=E8=B4=B4?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/pasteimg.js | 1 + public/javascripts/application.js | 1 + 2 files changed, 2 insertions(+) diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js index 8831ba300..51f717086 100644 --- a/public/assets/kindeditor/pasteimg.js +++ b/public/assets/kindeditor/pasteimg.js @@ -416,6 +416,7 @@ function uploadpic(piclist,myself) { that.attr("src", str[tIndex]); that.attr("data-ke-src", str[tIndex]); + //复制过来带的链接class等都要去掉 和视频图片有关系 that.removeAttr("class"); that.parent().removeAttr("class"); that.parent().removeAttr("href"); diff --git a/public/javascripts/application.js b/public/javascripts/application.js index c43e0a6a2..4cf64abb7 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1019,6 +1019,7 @@ function showNormalImage(id) { $(image).attr('src',_src); return; } + //无格式的图片不让点击显示大图，显示的话会有问题 var tmpsrc = image.attr('src'); if (tmpsrc.indexOf('.gif') >= 0 || tmpsrc.indexOf('.jpg') >= 0 || tmpsrc.indexOf('.jpeg') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.bmp') >= 0 || tmpsrc.indexOf('.png') >= 0 || tmpsrc.indexOf('.BMP') >= 0 || tmpsrc.indexOf('.JPEG') >= 0 || tmpsrc.indexOf('.JPG') >= 0 || tmpsrc.indexOf('.PNG') >= 0 || tmpsrc.indexOf('.GIF') >= 0) { var element = $("").attr("href", image.attr('src')); From 79e57e2b7f6451ef9195965f3fdf03054d528f44 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 13 May 2016 17:00:25 +0800 Subject: [PATCH 58/68] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=92=8C=E5=B9=B6?= =?UTF-8?q?=E5=86=B2=E7=AA=81=E5=A4=84=E7=90=86=E5=8F=8A=E8=BF=9E=E6=8E=A5?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/organizations_helper.rb | 2 +- app/views/organizations/_org_subfield_rightM2.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/organizations_helper.rb b/app/helpers/organizations_helper.rb index 27f24ebd0..cba4fa210 100644 --- a/app/helpers/organizations_helper.rb +++ b/app/helpers/organizations_helper.rb @@ -184,7 +184,7 @@ module OrganizationsHelper def excellent_teachers User.find_by_sql("select u.*, ue.technical_title, ue.school_id,(select count(*) from courses where courses.tea_id = u.id) as course_count - from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and u.excellent_teacher =1 order by course_count desc") + from users u, user_extensions ue where u.id = ue.user_id and ue.identity=0 and u.excellent_teacher =1 order by course_count desc").first(5) end end diff --git a/app/views/organizations/_org_subfield_rightM2.html.erb b/app/views/organizations/_org_subfield_rightM2.html.erb index 63abb8d51..1482f64a2 100644 --- a/app/views/organizations/_org_subfield_rightM2.html.erb +++ b/app/views/organizations/_org_subfield_rightM2.html.erb @@ -1,7 +1,7 @@ <% unless excellent_teachers.count == 0 %>

        <%= field.name %> - <%= link_to "更多", teachers_organization_path(@organization, :type => "famous"), :target => "_blank", :class => "more" %> + <%= link_to "更多", teachers_organization_path(@organization, :type => "famous", :org_subfield_id => field.id), :target => "_blank", :class => "more" %>

        <% excellent_teachers.each do |teacher| %>
        From 66c410884fb9525456cc43627bb532de2b4d3067 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 13 May 2016 17:11:53 +0800 Subject: [PATCH 59/68] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E9=9C=80=E8=A6=81=E8=AF=B7=E6=B1=82=E5=88=86=E4=BA=AB=EF=BC=8C?= =?UTF-8?q?=E5=8F=AA=E5=88=A4=E6=96=AD=E4=BA=86=E7=94=A8=E6=88=B7=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=B1=9E=E4=BA=8E=E8=AF=BE=E7=A8=8B=EF=BC=8C=E6=9C=AA?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E4=BD=9C=E4=B8=9A=E5=88=9B=E5=BB=BA=E8=80=85?= =?UTF-8?q?=E7=9A=84ID=EF=BC=8C=E5=A6=82=E6=9E=9C=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=8D=E5=9C=A8=E6=9F=90=E4=B8=AA=E8=AF=BE=E7=A8=8B=E4=BA=86?= =?UTF-8?q?=EF=BC=8C=E5=88=99=E5=8F=98=E6=88=90=E9=9C=80=E8=A6=81=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E5=90=91=E8=87=AA=E5=B7=B1=E7=94=B3=E8=AF=B7=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=EF=BC=8C=E4=B8=94=E3=80=90=E6=88=91=E7=9A=84=E9=A2=98?= =?UTF-8?q?=E5=BA=93=E3=80=91=E4=B9=9F=E4=B8=8D=E6=98=BE=E7=A4=BA=E8=87=AA?= =?UTF-8?q?=E5=B7=B1=E4=B9=8B=E5=89=8D=E5=88=9B=E5=BB=BA=E7=9A=84=E4=BD=9C?= =?UTF-8?q?=E4=B8=9A=E4=BA=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 16 ++++++++-------- app/views/users/_homework_repository.html.erb | 3 ++- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 8995a5aee..4e8e14559 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -509,7 +509,7 @@ class UsersController < ApplicationController def choose_user_course homework = HomeworkCommon.find params[:send_id].to_i - if homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course) + if homework.user != User.current && homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course) ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", User.current.id, params[:send_id].to_i) if ah.empty? @status = 2 @@ -630,9 +630,9 @@ class UsersController < ApplicationController visible_course_ids = visible_course.empty? ? "(-1)" : "(" + visible_course.map{|course| course.id}.join(",") + ")" @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}'").order("#{@order} #{@b_sort}") elsif params[:type] == "2" #我的题库 - courses = @user.courses.where("is_delete = 0") + courses = @user.courses.where("is_delete = 1") course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")" - @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and course_id in #{course_ids}").order("#{@order} #{@b_sort}") + @homeworks = HomeworkCommon.where("user_id = #{@user.id} and publish_time <= '#{Date.today}' and course_id not in #{course_ids}").order("#{@order} #{@b_sort}") elsif params[:type] == "3" #申请题库 none_visible_course = Course.where("is_delete = 1") none_visible_course_ids = none_visible_course.empty? ? "(-1)" : "(" + none_visible_course.map{|course| course.id}.join(",") + ")" @@ -672,7 +672,7 @@ class UsersController < ApplicationController def show_homework_detail homework = HomeworkCommon.find params[:homework].to_i - if homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course) + if homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course) && User.current != homework.user ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", User.current.id, params[:homework].to_i) if ah.empty? @status = 2 @@ -719,15 +719,15 @@ class UsersController < ApplicationController @homeworks = HomeworkCommon.where("course_id in #{visible_course_ids} and publish_time <= '#{Date.today}' and homework_type in #{type_ids} and (name like '%#{search}%' or user_id in #{user_ids})").order("#{@order} #{@b_sort}") end elsif params[:type] == "2" #我的题库 - courses = @user.courses.where("is_delete = 0") + courses = @user.courses.where("is_delete = 1") course_ids = courses.empty? ? "(-1)" : "(" + courses.map{|course| course.id}.join(",") + ")" if @order == "course_name" - sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_commons.course_id in #{course_ids} and homework_commons.user_id = #{@user.id} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}" + sql = "SELECT homework_commons.* FROM homework_commons INNER JOIN courses ON homework_commons.course_id = courses.id where homework_commons.course_id not in #{course_ids} and homework_commons.user_id = #{@user.id} and homework_type in #{type_ids} and publish_time <= '#{Date.today}' and (homework_commons.name like '%#{search}%') order by CONVERT (courses.name USING gbk) COLLATE gbk_chinese_ci #{@b_sort}" @homeworks = HomeworkCommon.find_by_sql(sql) elsif @order == "user_name" - @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}") + @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").joins(:user).order("CONVERT (lastname USING gbk) COLLATE gbk_chinese_ci #{@b_sort}, CONVERT (firstname USING gbk) COLLATE gbk_chinese_ci #{@b_sort},login #{@b_sort}") else - @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").order("#{@order} #{@b_sort}") + @homeworks = HomeworkCommon.where("user_id = #{@user.id} and course_id not in #{course_ids} and publish_time <= '#{Date.today}' and (name like '%#{search}%') and homework_type in #{type_ids}").order("#{@order} #{@b_sort}") end elsif params[:type] == "3" #申请题库 apply_homeworks = ApplyHomework.where("user_id = ?",@user.id) diff --git a/app/views/users/_homework_repository.html.erb b/app/views/users/_homework_repository.html.erb index 4e88249de..463d250f5 100644 --- a/app/views/users/_homework_repository.html.erb +++ b/app/views/users/_homework_repository.html.erb @@ -37,7 +37,8 @@
      • <%= homework.quotes %>
      • <%=format_date homework.publish_time %>
        • - <% if homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course) %>
      • + <% if homework.user != User.current && (homework.course.is_public == 0 && !User.current.allowed_to?(:as_teacher,homework.course)) %> +
      • <% ah = ApplyHomework.where("user_id = ? and homework_common_id = ?", User.current.id, homework.id).first %> <% if ah.nil? %> <%= link_to("请求分享", apply_homework_user_path(User.current.id,:homework_id => homework.id), :class => 'green_btn_share c_white', :remote => true) %> From fbcae050ad066f416ab90aed36a8e4c2aacce67c Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 13 May 2016 17:16:09 +0800 Subject: [PATCH 60/68] =?UTF-8?q?=E9=A1=B9=E7=9B=AE500=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/issue.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index 79ddcd917..d5d148117 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -262,7 +262,7 @@ class Issue < ActiveRecord::Base # set default values for new records only self.status ||= IssueStatus.default self.priority ||= IssuePriority.default - self.watcher_user_ids = [] + # self.watcher_user_ids = [] end end From 519ed365cc71605cd4bbac064e6fe74d59eecad3 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 13 May 2016 17:24:12 +0800 Subject: [PATCH 61/68] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E7=82=B9=E5=87=BB=E6=B2=A1=E5=8F=8D=E5=BA=94?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 3 ++- app/views/repositories/show.html.erb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index a461903a9..e498ace44 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2780,7 +2780,8 @@ class UsersController < ApplicationController # 导入资源 def import_resources # 别人的资源库是没有权限去看的 - if User.current.id.to_i != params[:id].to_i + user = User.find_by_login(params[:id]) + if User.current != user render_403 return end diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb index 6fed85acf..276283e97 100644 --- a/app/views/repositories/show.html.erb +++ b/app/views/repositories/show.html.erb @@ -1,7 +1,7 @@ <%= call_hook(:view_repositories_show_contextual, {:repository => @repository, :project => @project}) %>

        <%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>

        - ZIP下载 +
        From 821cd8ad994dacb7b7b7dcd5328638b209cd36b2 Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 13 May 2016 17:26:17 +0800 Subject: [PATCH 62/68] =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/student_work/_evaluation_un_title.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/student_work/_evaluation_un_title.html.erb b/app/views/student_work/_evaluation_un_title.html.erb index 21b683a20..0721c9ff5 100644 --- a/app/views/student_work/_evaluation_un_title.html.erb +++ b/app/views/student_work/_evaluation_un_title.html.erb @@ -7,7 +7,7 @@ <% if @homework.homework_type != 3 %>
      • - <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl ml18" ,:remote => true%> + <%= link_to "姓名",@show_all ? student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) : "javascript:void(0)",:class => "c_dark f14 fb fl #{@homework.anonymous_comment == 1 ? 'ml35' : 'ml18'}" ,:remote => true%> <% if @show_all && @order == "lastname"%> <%= link_to "", student_work_index_path(:homework => @homework.id,:order => "lastname", :sort => @score, :name => @name, :group => @group) ,:class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt10" ,:remote => true%> <% end%> From 695e870a26c5a4c3817896285c1d5fd15d2470ca Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 13 May 2016 17:30:05 +0800 Subject: [PATCH 63/68] =?UTF-8?q?=E4=BD=9C=E5=93=81=E7=9A=84=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=B8=8D=E8=A7=81=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_work_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb index 121711a85..16c6ab935 100644 --- a/app/controllers/student_work_controller.rb +++ b/app/controllers/student_work_controller.rb @@ -499,6 +499,7 @@ class StudentWorkController < ApplicationController render_403 return end + @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,student_works.work_score as score").order("#{@order} #{@b_sort}"),@name).count end @score = @b_sort == "desc" ? "asc" : "desc" From b9e5c77b912acc5704f42a9475181a6889e1578d Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 13 May 2016 18:02:06 +0800 Subject: [PATCH 64/68] =?UTF-8?q?=E8=B5=84=E6=BA=90500=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index e498ace44..2e1abdecf 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2618,6 +2618,7 @@ class UsersController < ApplicationController # 获取我的资源 def get_my_resources author_id, user_course_ids, user_project_ids, order, score + author_id = User.find_by_login(author_id).id attachments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('OrgSubfield','Principal','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+ "or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" + "or (container_type = 'Project' and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}") @@ -2625,6 +2626,7 @@ class UsersController < ApplicationController # 获取我的资源查询结果 def get_my_resources_search (author_id, user_course_ids, user_project_ids, order, score, search) + author_id = User.find_by_login(author_id).id @attachments = Attachment.where("((author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+ "or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" + "or (container_type = 'Project' and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)) and (filename like :p)" ,:p => search).order("#{order.nil? ? 'created_on' : order} #{score}") @@ -2632,6 +2634,7 @@ class UsersController < ApplicationController # 获取我的课程资源 def get_course_resources author_id, user_course_ids, order, score + author_id = User.find_by_login(author_id).id attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Course')"+ "or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}") @@ -2639,6 +2642,7 @@ class UsersController < ApplicationController # 获取我的课程资源中搜索结果 def get_course_resources_search author_id, user_course_ids, order, score, search + author_id = User.find_by_login(author_id).id attchments = Attachment.where("((author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Course')"+ "or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}") @@ -2656,6 +2660,7 @@ class UsersController < ApplicationController # 获取我的项目资源 def get_project_resources author_id, user_project_ids, order, score + author_id = User.find_by_login(author_id).id attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Project') "+ "or (container_type = 'Project' and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)").order("#{order.nil? ? 'created_on' : order} #{score}") @@ -2663,6 +2668,7 @@ class UsersController < ApplicationController # 获取我的项目资源搜索 def get_project_resources_search author_id, user_project_ids, order, score, search + author_id = User.find_by_login(author_id).id attchments = Attachment.where("((author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Project') "+ "or (container_type = 'Project' and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}") @@ -2680,12 +2686,14 @@ class UsersController < ApplicationController # 获取我上传的附件 def get_attch_resources author_id, order, score + author_id = User.find_by_login(author_id).id attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue', 'Document','Message','News','StudentWorkScore','HomewCommon'))").order("#{order.nil? ? 'created_on' : order} #{score}") end # 获取我上传的附件搜索结果 def get_attch_resources_search author_id, order, score, search + author_id = User.find_by_login(author_id).id attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('Project','OrgSubfield','Principal','Course','Issue', 'Document','Message','News','StudentWorkScore','HomewCommon')) and (filename like :p)", :p => search ).order("#{order.nil? ? 'created_on' : order} #{score}") end @@ -2704,11 +2712,13 @@ class UsersController < ApplicationController # 获取我的用户类型资源 def get_principal_resources author_id, order, score + author_id = User.find_by_login(author_id).id attchments = Attachment.where("author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Principal'").order("#{order.nil? ? 'created_on' : order} #{score}") end # 获取我的用户类型资源搜索 def get_principal_resources_search author_id, order, score, search + author_id = User.find_by_login(author_id).id attchments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type = 'Principal') and (filename like :p)", :p => search).order("#{order.nil? ? 'created_on' : order} #{score}") end @@ -2780,14 +2790,13 @@ class UsersController < ApplicationController # 导入资源 def import_resources # 别人的资源库是没有权限去看的 - user = User.find_by_login(params[:id]) - if User.current != user + @user = User.find_by_login(params[:id]) + if User.current != @user render_403 return end @resource_id = params[:project_id].nil? ? (params[:course_id].nil? ? params[:subfield_file_id] : params[:course_id]) : params[:project_id] @resource_type = params[:project_id].nil? ? (params[:course_id].nil? ? "SubfieldFile" : "Course") : "Project" - @user = User.find(params[:id]) @order, @b_sort = params[:order] || "created_on", params[:sort] || "asc" @score = @b_sort == "desc" ? "asc" : "desc" user_course_ids = User.current.courses.map { |c| c.is_delete == 0 && c.id} From a31ffbf8fb5c1555a627b401ff6208eecd1a078e Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 13 May 2016 18:10:33 +0800 Subject: [PATCH 65/68] =?UTF-8?q?=E6=95=99=E5=B8=88=E6=A0=8F=E7=9B=AE?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=B7=BB=E5=8A=A0=E4=BA=8C=E7=BA=A7=E5=9F=9F?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/organizations/_subfield_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/organizations/_subfield_list.html.erb b/app/views/organizations/_subfield_list.html.erb index 3cdb2991c..f16e53b0e 100644 --- a/app/views/organizations/_subfield_list.html.erb +++ b/app/views/organizations/_subfield_list.html.erb @@ -92,7 +92,7 @@ <%= link_to "删除", org_subfield_path(field), :method => 'delete', :remote => true, :confirm => "您确定删除吗？", :class => "linkGrey fr ml5 mr5" %> | 编辑 - <% unless field.field_type == "Resource" %> + <% unless field.field_type == "Resource" || field.field_type == "Comptec" %> | From 6056505f967ceb731514bebf24cfd76af5ac6b9d Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Fri, 13 May 2016 19:07:36 +0800 Subject: [PATCH 66/68] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E7=B2=98=E8=B4=B4?= =?UTF-8?q?=E6=97=B6=E5=B0=86=E5=9B=BE=E7=89=87=E6=89=80=E5=B8=A6=E9=93=BE?= =?UTF-8?q?=E6=8E=A5=E5=88=A0=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/pasteimg.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/assets/kindeditor/pasteimg.js b/public/assets/kindeditor/pasteimg.js index 51f717086..7165b142a 100644 --- a/public/assets/kindeditor/pasteimg.js +++ b/public/assets/kindeditor/pasteimg.js @@ -419,7 +419,8 @@ function uploadpic(piclist,myself) { //复制过来带的链接class等都要去掉 和视频图片有关系 that.removeAttr("class"); that.parent().removeAttr("class"); - that.parent().removeAttr("href"); + that.parents().removeAttr("href"); //删除所有父节点的href +// that.parent().removeAttr("href"); that.parent().removeAttr("data-ke-src"); tIndex = tIndex + 1; } From aef178183c8f825a428a2d4bbee866dd5063f7cd Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 13 May 2016 19:41:07 +0800 Subject: [PATCH 67/68] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8D=E8=83=BD=E5=88=A0=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 6ce4807e1..a81ade3fa 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -2618,7 +2618,9 @@ class UsersController < ApplicationController # 获取我的资源 def get_my_resources author_id, user_course_ids, user_project_ids, order, score - author_id = User.find_by_login(author_id).id + unless author_id.to_i.to_s == author_id + author_id = User.find_by_login(author_id).id + end attachments = Attachment.where("(author_id = #{author_id} and is_publish = 1 and container_id is not null and container_type in('OrgSubfield','Principal','Issue','Document','Message','News','StudentWorkScore','HomewCommon')) "+ "or (container_type = 'Course' and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}) and is_publish = 1 and container_id is not null)" + "or (container_type = 'Project' and container_id in (#{user_project_ids.empty? ? '0': user_project_ids.join(',')}) and is_publish = 1 and container_id is not null)" ).order("#{order.nil? ? 'created_on' : order} #{score}") From 37b93a45954519d45c5973f1c0c62ba740b16b8a Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 13 May 2016 20:01:45 +0800 Subject: [PATCH 68/68] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E7=94=A8=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/org_document_comments_controller.rb | 2 +- app/views/org_document_comments/add_reply.js.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/org_document_comments_controller.rb b/app/controllers/org_document_comments_controller.rb index d1a8b23dd..c6047d227 100644 --- a/app/controllers/org_document_comments_controller.rb +++ b/app/controllers/org_document_comments_controller.rb @@ -79,7 +79,7 @@ class OrgDocumentCommentsController < ApplicationController def add_reply @document = OrgDocumentComment.find(params[:id]).root - @act = OrgActivity.find(params[:id]) + @act = OrgActivity.find(params[:act_id]) @comment = OrgDocumentComment.new(:organization_id => @document.organization_id, :creator_id => User.current.id, :reply_id => params[:id]) @comment.content = params[:org_content] @document.children << @comment diff --git a/app/views/org_document_comments/add_reply.js.erb b/app/views/org_document_comments/add_reply.js.erb index 79858dd03..d904cb920 100644 --- a/app/views/org_document_comments/add_reply.js.erb +++ b/app/views/org_document_comments/add_reply.js.erb @@ -1,2 +1,2 @@ -$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => params[:flag], :act => @act}) %>"); +$("#organization_document_<%= @document.id %>").replaceWith("<%= escape_javascript(render :partial => 'organizations/show_org_document', :locals => {:document => @document,:flag => params[:flag], :act => @act}) %>"); sd_create_editor_from_data(<%= @act.id %>,"","100%", "<%=@act.class.to_s%>");
        • 发布者： {{discussion.user.realname}}