From cd0752f5daa171c6c46fdab1fc622c8e8fd55204 Mon Sep 17 00:00:00 2001 From: yutao <283765470@qq.com> Date: Thu, 4 Jun 2015 15:55:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=A8=E8=AE=BA=E5=8C=BA?= =?UTF-8?q?=E5=8A=A8=E6=80=81=E4=B8=8E=E6=88=91=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity_notifys_controller.rb | 54 +++++++++++++++ app/controllers/boards_controller.rb | 43 +++++++++--- app/controllers/messages_controller.rb | 54 +++++++++++++++ app/models/activity_notify.rb | 3 + app/models/message.rb | 16 +++++ .../activity_notifys/chang_read_flag.html.erb | 1 + app/views/boards/_course_show.html.erb | 19 +++++- app/views/boards/show.html.erb | 2 + app/views/courses/show.html.erb | 64 ++++++++++++++++-- config/routes.rb | 6 ++ ...20150604153000_create_activity_notifies.rb | 17 +++++ public/images/new.png | Bin 0 -> 4196 bytes public/stylesheets/courses.css | 9 ++- 13 files changed, 270 insertions(+), 18 deletions(-) create mode 100644 app/controllers/activity_notifys_controller.rb create mode 100644 app/models/activity_notify.rb create mode 100644 app/views/activity_notifys/chang_read_flag.html.erb create mode 100644 db/migrate/20150604153000_create_activity_notifies.rb create mode 100644 public/images/new.png diff --git a/app/controllers/activity_notifys_controller.rb b/app/controllers/activity_notifys_controller.rb new file mode 100644 index 000000000..c696836b2 --- /dev/null +++ b/app/controllers/activity_notifys_controller.rb @@ -0,0 +1,54 @@ +class ActivityNotifysController < ApplicationController +# layout 'base_projects'#by young +# default_search_scope :messages + before_filter :find_project_by_project_id#, :find_board_if_available +# before_filter :authorize, :except => [:new, :show, :create, :index] +# accept_rss_auth :index, :show + + helper :activities + def index + query = nil + if @course + query = ActivityNotify.where('activity_container_id=? and activity_container_type=? and notify_to=?',@course.id,'Course',User.current.id); + else + @events_by_day = [] + end + + if( query != nil ) + logger.info('xxoo') + limit = 10; + @obj_count = query.count(); + @obj_pages = Paginator.new @obj_count,limit,params['page'] + list = query.order('id desc').limit(limit).offset(@obj_pages.offset).all(); + events=[]; + for item in list + event = item.activity; + event.set_notify_id(item.id) + event.set_notify_is_read(item.is_read) + events << event + end + @events_by_day = events.group_by {|event| User.current.time_to_date(event.event_datetime)} + @controller_name = 'ActivityNotifys' + logger.info('aavv') + end + respond_to do |format| + format.html {render :template => 'courses/show', :layout => 'base_courses'} + end + end + + def chang_read_flag + if @course + if(params[:an_id] != nil ) + query = ActivityNotify.where('id=? and notify_to=?',params[:an_id],User.current.id) + else + query = ActivityNotify.where('activity_container_id=? and activity_container_type=? and notify_to=? and is_read=0',@course.id,'Course',User.current.id) + end + @result = query.update_all('is_read=1'); + else + @result = false; + end + respond_to do |format| + format.html{render :layout => nil} + end + end +end \ No newline at end of file diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index db5bded55..6ff4d2f97 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -88,14 +88,40 @@ class BoardsController < ApplicationController preload(:author, {:last_reply => :author}). all elsif @course - board_topics = @board ? @board.topics.reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc"). - includes(:last_reply). - # limit(@topic_pages.per_page). - # offset(@topic_pages.offset). - - preload(:author, {:last_reply => :author}). - all : [] - @topics = paginateHelper board_topics,10 + # + # board_topics = @board ? @board.topics.reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc"). + # includes(:last_reply). + # # limit(@topic_pages.per_page). + # # offset(@topic_pages.offset). + # + # preload(:author, {:last_reply => :author}). + # all : [] + # @topics = paginateHelper board_topics,10 + if( @board ) + limit = 10; + pageno = params[:page]; + if(pageno == nil || pageno=='') + dw_topic = nil; + if( params[:parent_id]!=nil && params[:parent_id]!='' ) + dw_topic = @board.topics.where(id:params[:parent_id]).first(); + end + if( dw_topic != nil ) + dw_count = @board.topics.where('(sticky>?) or (sticky=? and created_on>?)',dw_topic.sticky,dw_topic.sticky,dw_topic.created_on).count(); + dw_count = dw_count+1; + pageno = dw_count%10==0 ? (dw_count/limit) : (dw_count/limit+1) + end + end + if(pageno == nil || pageno=='') + pageno=1; + end + @topic_count = @board.topics.count(); + @topic_pages = Paginator.new @topic_count, limit, pageno + @topics = @board.topics.reorder("#{Message.table_name}.sticky DESC, #{Message.table_name}.created_on desc"). + limit(limit).offset(@topic_pages.offset).includes(:last_reply). + preload(:author, {:last_reply => :author}).all(); + else + @topics = []; + end end @message = Message.new(:board => @board) @@ -103,6 +129,7 @@ class BoardsController < ApplicationController if @project render :action => 'show', :layout => 'base_projects' elsif @course + @params=params render :action => 'show', :layout => 'base_courses' end } diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index e33eb8d75..9e36d15f4 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -31,6 +31,8 @@ class MessagesController < ApplicationController include AttachmentsHelper helper :project_score + include CoursesHelper + REPLIES_PER_PAGE = 25 unless const_defined?(:REPLIES_PER_PAGE) # Show a topic and its replies @@ -91,6 +93,29 @@ class MessagesController < ApplicationController ids = params[:asset_id].split(',') update_kindeditor_assets_owner ids,@message.id,OwnerTypeHelper::MESSAGE end + # 与我相关动态的记录add start + if(@board.course_id>0) #项目的先不管 + teachers = searchTeacherAndAssistant(@board.course); + for teacher in teachers + if(teacher.user_id != User.current.id) + notify = ActivityNotify.new() + if(@board.course_id>0) + notify.activity_container_id = @board.course_id + notify.activity_container_type = 'Course' + else + notify.activity_container_id = @board.project_id + notify.activity_container_type = 'Project' + end + notify.activity_id = @message.id + notify.activity_type = 'Message' + notify.notify_to = teacher.user_id + notify.is_read = 0 + notify.save() + end + end + end + # 与我相关动态的记录add end + call_hook(:controller_messages_new_after_save, { :params => params, :message => @message}) render_attachment_warning_if_needed(@message) if params[:is_board] @@ -151,6 +176,35 @@ class MessagesController < ApplicationController ids = params[:asset_id].split(',') update_kindeditor_assets_owner ids,@reply.id,OwnerTypeHelper::MESSAGE end + + # 与我相关动态的记录add start + if(@board.course_id>0) #项目的先不管 + notifyto_arr = {} + notifyto_arr[@topic.author_id] = @topic.author_id + if( params[:parent_topic] != nil && params[:parent_topic] != '') + parent_topic = Message.find(params[:parent_topic]) + notifyto_arr[parent_topic.author_id] = parent_topic.author_id + end + notifyto_arr.each do |k,user_id| + if(user_id != User.current.id) + notify = ActivityNotify.new() + if(@board.course_id>0) + notify.activity_container_id = @board.course_id + notify.activity_container_type = 'Course' + else + notify.activity_container_id = @board.project_id + notify.activity_container_type = 'Project' + end + notify.activity_id = @reply.id + notify.activity_type = 'Message' + notify.notify_to = user_id + notify.is_read = 0 + notify.save() + end + end + end + # 与我相关动态的记录add end + call_hook(:controller_messages_reply_after_save, { :params => params, :message => @reply}) attachments = Attachment.attach_files(@reply, params[:attachments]) render_attachment_warning_if_needed(@reply) diff --git a/app/models/activity_notify.rb b/app/models/activity_notify.rb new file mode 100644 index 000000000..0fbe1f6f1 --- /dev/null +++ b/app/models/activity_notify.rb @@ -0,0 +1,3 @@ +class ActivityNotify < ActiveRecord::Base + belongs_to :activity, polymorphic: true +end \ No newline at end of file diff --git a/app/models/message.rb b/app/models/message.rb index bbf62b5dc..15d358789 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -34,6 +34,8 @@ class Message < ActiveRecord::Base has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy # end + has_many :ActivityNotifies,:as => :activity, :dependent => :destroy + acts_as_searchable :columns => ['subject', 'content'], :include => {:board => :project}, :project_key => "#{Board.table_name}.project_id", @@ -148,6 +150,19 @@ class Message < ActiveRecord::Base usr && usr.logged? && (usr.allowed_to?(:delete_messages, project) || (self.author == usr && usr.allowed_to?(:delete_own_messages, project))) end + def set_notify_id(notify_id) + @notify_id= notify_id + end + def get_notify_id() + return @notify_id + end + def set_notify_is_read(notify_is_read) + @notify_is_read = notify_is_read + end + def get_notify_is_read() + return @notify_is_read + end + private def add_author_as_watcher @@ -218,4 +233,5 @@ class Message < ActiveRecord::Base def delete_kindeditor_assets delete_kindeditor_assets_from_disk self.id,OwnerTypeHelper::MESSAGE end + end diff --git a/app/views/activity_notifys/chang_read_flag.html.erb b/app/views/activity_notifys/chang_read_flag.html.erb new file mode 100644 index 000000000..ca89a7e3f --- /dev/null +++ b/app/views/activity_notifys/chang_read_flag.html.erb @@ -0,0 +1 @@ +<%= @result == false ? 'false' : 'true' %> \ No newline at end of file diff --git a/app/views/boards/_course_show.html.erb b/app/views/boards/_course_show.html.erb index 0d9d6a780..48e5a870d 100644 --- a/app/views/boards/_course_show.html.erb +++ b/app/views/boards/_course_show.html.erb @@ -109,6 +109,7 @@ :html => {:nhname=>"form",:multipart => true, :id => 'message_form' + topic.id.to_s, :name=>'message-form'} do |f| %> <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %> +
<%= l(:button_cancel)%> @@ -127,7 +128,7 @@
+ + \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index bd4464458..e166e37e5 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -710,6 +710,12 @@ RedmineApp::Application.routes.draw do resources :news, :except => [:show, :edit, :update, :destroy] resources :boards match '/homework', :to => 'courses#homework', :as => 'homework', :via => :get + resources :activity_notifys do + collection do + match 'chang_read_flag', :via => :get + end + end + end # end of resources :courses match 'courses/:id/feedback', :to => 'courses#feedback', :via => :get, :as => 'course_feedback' match '/courses/search', :via => [:get, :post] diff --git a/db/migrate/20150604153000_create_activity_notifies.rb b/db/migrate/20150604153000_create_activity_notifies.rb new file mode 100644 index 000000000..ff9b78389 --- /dev/null +++ b/db/migrate/20150604153000_create_activity_notifies.rb @@ -0,0 +1,17 @@ +class CreateActivityNotifies < ActiveRecord::Migration + def change + create_table :activity_notifies do |t| + t.integer :activity_container_id + t.string :activity_container_type + t.integer :activity_id + t.string :activity_type + t.integer :notify_to + t.datetime :created_on + t.integer :is_read + + end + add_index "activity_notifies", ["notify_to"], :name => "index_an_notify_to" + add_index "activity_notifies", ["created_on"], :name => "index_an_created_on" + add_index "activity_notifies", ["activity_container_id","activity_container_type"], :name => "index_an_activity_container_id" + end +end \ No newline at end of file diff --git a/public/images/new.png b/public/images/new.png new file mode 100644 index 0000000000000000000000000000000000000000..91d15f3b1f008db25735bfeedb425d1eb38b6c33 GIT binary patch literal 4196 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