@ -26,10 +26,11 @@ class UsersController < ApplicationController
menu_item :user_homework , :only = > :user_homeworks
menu_item :user_project , :only = > [ :user_projects , :watch_projects ]
# menu_item :requirement_focus, :only => :watch_bids
menu_item :requirement_focus , :only = > :watch_contests
menu_item :requirement_focus , :only = > :watch_contests
menu_item :user_newfeedback , :only = > :user_newfeedback
menu_item :user_messages , :only = > :user_messages
#Ended by young
# edit
@ -39,23 +40,28 @@ class UsersController < ApplicationController
before_filter :require_admin , :except = > [ :show , :index , :search , :tag_save , :tag_saveEx , :user_projects , :user_newfeedback , :user_comments , :watch_contests , :info ,
:user_watchlist , :user_fanslist , :update , :user_courses , :user_homeworks , :watch_projects , :show_score , :topic_score_index , :project_score_index ,
:activity_score_index , :influence_score_index , :score_index , :show_new_score , :topic_new_score_index , :project_new_score_index ,
:activity_new_score_index , :influence_new_score_index , :score_new_index , :update_score , :user_activities , :user_projects_index ]
:activity_new_score_index , :influence_new_score_index , :score_new_index , :update_score , :user_activities , :user_projects_index ,
:user_courses4show , :user_projects4show , :user_course_activities , :user_project_activities , :user_feedback4show , :user_visitorlist , :user_messages ]
#edit has been deleted by huang, 2013-9-23
before_filter :find_user , :only = > [ :user_fanslist , :user_watchlist , :show , :edit , :update , :destroy , :edit_membership , :user_courses ,
:user_homeworks , :destroy_membership , :user_activities , :user_projects , :user_newfeedback , :user_comments ,
before_filter :find_user , :only = > [ :user_fanslist , :user_watchlist , :show , :edit , :update , :destroy , :edit_membership , :user_courses ,
:user_homeworks , :destroy_membership , :user_activities , :user_projects , :user_newfeedback , :user_comments ,
:watch_contests , :info , :watch_projects , :show_score , :topic_score_index , :project_score_index ,
:activity_score_index , :influence_score_index , :score_index , :show_new_score , :topic_new_score_index , :project_new_score_index ,
:activity_new_score_index , :influence_new_score_index , :score_new_index , :user_projects_index ]
:activity_new_score_index , :influence_new_score_index , :score_new_index , :user_projects_index ,
:user_courses4show , :user_projects4show , :user_course_activities , :user_project_activities , :user_feedback4show , :user_visitorlist , :user_messages ]
before_filter :auth_user_extension , only : :show
#before_filter :rest_user_score, only: :show
#before_filter :select_entry, only: :user_projects
accept_api_auth :index , :show , :create , :update , :destroy , :tag_save , :tag_saveEx
#william
before_filter :require_login , :only = > [ :tag_save , :tag_saveEx ]
#before_filter :refresh_changests, :only =>[:user_activities,:user_courses,:user_projects,:user_newfeedback]
#visitor
before_filter :recorded_visitor , :only = > [ :show , :user_fanslist , :user_watchlist , :user_visitorlist ]
helper :sort
include SortHelper
helper :custom_fields
@ -76,6 +82,9 @@ class UsersController < ApplicationController
# fq
helper :words
helper :project_score
helper :issues
include UsersHelper
def refresh_changests
if ! ( @user . nil? ) && ! ( @user . memberships . nil? )
@ -87,6 +96,41 @@ class UsersController < ApplicationController
end
end
# 用户消息
def user_messages
unless User . current . logged?
render_403
return
end
# 当前用户查看消息，则设置消息为已读
querys = @user . course_messages
if User . current . id == @user . id
querys . update_all ( :viewed = > true )
end
if @user . course_messages
if params [ :type ] . nil?
@user_course_messages = @user . course_messages . reverse
@user_project_messges = @user . forge_messages . reverse
else
case params [ :type ]
when 'homework'
@user_course_messages = @user . course_messages . reverse . select { | x | x . course_message_type == " HomeworkCommon " }
#@user_course_messages = ForgeMessage.find_by_sql("select * from course_messages where user_id='#{@user.id}' and course_message_type = 'HomeworkCommon' order by created_at desc;")
when 'message'
@user_course_messages = @user . course_messages . reverse . select { | x | x . course_message_type == " Message " }
when 'news'
@user_course_messages = @user . course_messages . reverse . select { | x | x . course_message_type == " News " }
when 'poll'
@user_course_messages = @user . course_messages . reverse . select { | x | x . course_message_type == " Poll " }
end
end
respond_to do | format |
format . html { render :layout = > 'base_users_new' }
format . api
end
end
end
def user_projects_index
if User . current . admin?
memberships = @user . memberships . all ( conditions : " projects.project_type = #{ Project :: ProjectType_project } " ) . first
@ -104,34 +148,22 @@ class UsersController < ApplicationController
#added by young
def user_projects
if User . current . admin?
@memberships = @user . memberships . all ( conditions : " projects.project_type = #{ Project :: ProjectType_project } " )
else
cond = Project . visible_condition ( User . current ) + " AND projects.project_type <> 1 "
@memberships = @user . memberships . all ( :conditions = > cond )
end
@memberships = @memberships . sort { | a , b | b . created_on . to_i < = > a . created_on . to_i }
# unless @memberships.nil?
# @user_projects = []
# @memberships.each do |membership|
# @user_projects << membership.project
# end
# @user_projects = @user_projects.sort {|a,b| b.created_on.to_i <=> a.created_on.to_i}
# end
#events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 20)
#@events_by_day = events.group_by(&:event_date)
@state = 0
#add by huang
unless User . current . admin?
if ! @user . active? #|| (@user != User.current && @memberships.empty? && events.empty?)
render_404
return
return
end
end
#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 " )
if ( params [ :status ] == '1' )
projects = projects . where ( " projects.user_id = ? " , @user . id )
elsif ( params [ :status ] == '2' )
projects = projects . where ( " projects.user_id <> ? " , @user . id )
end
@list = paginateHelper projects , 10
@params = params [ :status ]
respond_to do | format |
format . html
format . html { render :layout = > 'base_users_new' }
format . api
end
end
@ -168,21 +200,21 @@ class UsersController < ApplicationController
# format.api
# end
end
#new add by linchun
def watch_contests
@bids = Contest . watched_by ( @user )
def watch_contests
@bids = Contest . watched_by ( @user )
@offset , @limit = api_offset_and_limit ( { :limit = > 10 } )
@contest_count = @contests . count
@contest_pages = Paginator . new @contest_count , @limit , params [ 'page' ]
@offset || = @contest_pages . reverse_offset
@offset || = @contest_pages . reverse_offset
unless @offset == 0
@contest = @contests . offset ( @offset ) . limit ( @limit ) . all . reverse
else
limit = @bid_count % @limit
@contest = @contests . offset ( @offset ) . limit ( limit ) . all . reverse
end
respond_to do | format |
format . html {
render :layout = > 'base_users'
@ -219,9 +251,9 @@ class UsersController < ApplicationController
end
end
# end
# added by huang
def user_homeworks
def user_homeworks
# @membership = @user.memberships.all(:conditions => Project.visible_condition(User.current))
# @memberships = []
# @membership.each do |membership|
@ -240,65 +272,42 @@ class UsersController < ApplicationController
# return
# end
# end
end
end
include CoursesHelper
def user_courses
def user_courses
unless User . current . admin?
if ! @user . active? #|| (@user != User.current && @memberships.empty? && events.empty?)
if ! @user . active?
render_404
return
return
end
end
#@user.coursememberships.all(:conditions => Course.visible_condition(User.current))
if User . current == @user || User . current . admin?
membership = @user . coursememberships . all
else
membership = @user . coursememberships . all ( :conditions = > Course . visible_condition ( User . current ) )
end
membership . sort! { | older , newer | newer . created_on < = > older . created_on }
@memberships = [ ]
membership . collect { | e | @memberships . push ( e ) }
## 判断课程是否过期 [需封装]
@memberships_doing = [ ]
@memberships_done = [ ]
#now_time = Time.now.year
@memberships . map { | e |
#end_time = e.course.get_time.year
isDone = course_endTime_timeout? ( e . course )
if isDone
@memberships_done . push e
else
@memberships_doing . push e
end
}
# respond_to do |format|
# format.html
# format.api
# end
courses = @user . courses . visible . select ( " courses.*,(SELECT MAX(created_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a " ) . order ( " a desc " )
if ( params [ :status ] == '1' )
courses = courses . where ( " endup_time >= ? or endup_time is null or endup_time='' " , Time . now )
elsif ( params [ :status ] == '2' )
courses = courses . where ( " endup_time < ? " , Time . now )
end
@list = paginateHelper courses , 10
@params = params [ :status ]
render :layout = > 'base_users_new'
end
# modified by fq
def user_newfeedback
@jours = @user . journals_for_messages . where ( 'm_parent_id IS NULL' ) . order ( 'created_on DESC' )
@jours . update_all ( :is_readed = > true , :status = > false )
@jours . each do | journal |
fetch_user_leaveWord_reply ( journal ) . update_all ( :is_readed = > true , :status = > false )
jours = @user . journals_for_messages . where ( 'm_parent_id IS NULL' ) . order ( 'created_on DESC' )
if User . current == @user
jours . update_all ( :is_readed = > true , :status = > false )
jours . each do | journal |
fetch_user_leaveWord_reply ( journal ) . update_all ( :is_readed = > true , :status = > false )
end
end
#@limit = 10
#@feedback_count = @jours.count
#@feedback_pages = Paginator.new @feedback_count, @limit, params['page']
#@offset ||= @feedback_pages.offset
@jour = paginateHelper @jours , 10
@jour = paginateHelper jours , 10
@state = false
render :layout = > 'base_users_new'
end
# end
def user_comments
@ -306,7 +315,7 @@ class UsersController < ApplicationController
#end
def index
@status = params [ :status ] || 1
sort_init 'login' , 'asc'
sort_update %w( login firstname lastname mail admin created_on last_login_on )
@ -322,7 +331,7 @@ class UsersController < ApplicationController
# 先内连一下statuses 保证排序之后数量一致
scope = User . visible .
joins ( " INNER JOIN user_statuses ON users.id = user_statuses.user_id " )
# unknow
scope = scope . in_group ( params [ :group_id ] ) if params [ :group_id ] . present?
@ -359,7 +368,7 @@ class UsersController < ApplicationController
# limit and offset
@users = @users . limit ( @user_pages . per_page ) . offset ( @user_pages . offset )
@user_base_tag = params [ :id ] ? 'base_users' :'users_base'
respond_to do | format |
format . html {
@ -369,7 +378,7 @@ class UsersController < ApplicationController
format . api
end
end
def search
sort_init 'login' , 'asc'
sort_update %w( login firstname lastname mail admin created_on last_login_on )
@ -413,8 +422,122 @@ class UsersController < ApplicationController
format . api
end
end
def user_courses4show
query = Course . joins ( " join members m on #{ Course . table_name } .id=m.course_id " )
query = query . where ( " m.user_id = ? " , @user . id ) . order ( " #{ Course . table_name } .id desc " )
if User . current == @user #看自己
else
if @user . user_extensions! = nil && @user . user_extensions . identity == 0 #看老师
query = query . joins ( " join member_roles r on m.id = r.member_id " )
query = query . where ( " r.role_id in(3,7,9) " )
end
query = query . where ( Course . table_name + " .is_public = 1 " )
end
if params [ :lastid ] != nil && ! params [ :lastid ] . empty?
query = query . where ( " #{ Course . table_name } .id < ? " , params [ :lastid ] , )
end
@list = query . limit ( 8 )
render :layout = > nil
end
def user_projects4show
query = Project . joins ( " join members m on #{ Project . table_name } .id=m.project_id " )
query = query . where ( " m.user_id = ? and #{ Project . table_name } .project_type=? " , @user . id , Project :: ProjectType_project )
if User . current == @user #看自己
else
query = query . where ( Project . table_name + " .is_public = 1 " )
# TODO or exists (select 1 from project c2,members m2 where c2.id=m2.course_id and c2.id=#{Project.table_name}.id and m2.user_id= User.current.id)
end
if params [ :lastid ] != nil && ! params [ :lastid ] . empty?
query = query . where ( " ( ( #{ Project . table_name } .updated_on=? and #{ Project . table_name } .id < ?) or #{ Project . table_name } .updated_on<?) " , params [ :lasttime ] , params [ :lastid ] , params [ :lasttime ] )
end
@list = query . order ( " #{ Project . table_name } .updated_on desc, #{ Project . table_name } .id desc " ) . limit ( 8 ) . all
render :layout = > nil
end
def user_course_activities
lastid = nil
if params [ :lastid ] != nil && ! params [ :lastid ] . empty?
lastid = params [ :lastid ] ;
end
user_ids = [ ]
if @user == User . current
watcher = User . watched_by ( @user )
watcher . push ( User . current )
user_ids = watcher . map { | x | x . id }
else
user_ids << @user . id
end
query = Activity . joins ( " join courses c on c.id= #{ Activity . table_name } .activity_container_id and #{ Activity . table_name } .activity_container_type='Course' " )
query = query . where ( " #{ Activity . table_name } .user_id in (?) " , user_ids )
if User . current != @user #看别人
if @user . user_extensions! = nil && @user . user_extensions . identity == 0 #看老师
query = query . joins ( " join members m on c.id=m.course_id and m.user_id = #{ @user . id } " )
query = query . joins ( " join member_roles r on m.id = r.member_id " )
query = query . where ( " r.role_id in(3,7,9) " )
end
query = query . where ( " c.is_public=1 " )
end
if ( lastid != nil )
query = query . where ( " #{ Activity . table_name } .id < ? " , lastid )
end
query = query . order ( " #{ Activity . table_name } .id desc " )
@list = query_activities ( query )
render :layout = > nil
end
def user_project_activities
lastid = nil
if params [ :lastid ] != nil && ! params [ :lastid ] . empty?
lastid = params [ :lastid ] ;
end
user_ids = [ ]
if @user == User . current
watcher = User . watched_by ( @user )
watcher . push ( User . current )
user_ids = watcher . map { | x | x . id }
else
user_ids << @user . id
end
query = Activity . joins ( " join projects c on c.id= #{ Activity . table_name } .activity_container_id and #{ Activity . table_name } .activity_container_type='Project' " )
query = query . where ( user_id : user_ids )
if User . current != @user #看别人
query = query . where ( " c.is_public=1 " )
end
if ( lastid != nil )
query = query . where ( " #{ Activity . table_name } .id < ? " , lastid )
end
query = query . order ( " #{ Activity . table_name } .id desc " )
@list = query_activities ( query )
render :action = > 'user_course_activities' , :layout = > nil
end
def user_feedback4show
query = @user . journals_for_messages
if params [ :lastid ] != nil && ! params [ :lastid ] . empty?
query = query . where ( " #{ JournalsForMessage . table_name } .id < ? " , params [ :lastid ] )
end
logger . info ( 'xxoo' )
@list = query . order ( " #{ JournalsForMessage . table_name } .id desc " ) . limit ( 3 ) . all
logger . info ( 'aavv' )
render :layout = > nil , :locals = > { :feed_list = > @list }
end
def show
render :layout = > 'base_users_new'
end
def show_old
pre_count = 10 #limit
# Time 2015-02-04 11:46:34
# Author lizanle
@ -430,9 +553,9 @@ class UsersController < ApplicationController
end
when " 2 "
message = [ ]
if @user == User . current
if @user == User . current
message = JournalsForMessage . reference_message ( @user . id )
message += Journal . reference_message ( @user . id )
message += Journal . reference_message ( @user . id )
end
@activity_count = message . size
@info_pages = Paginator . new @activity_count , pre_count , params [ 'page' ]
@ -463,7 +586,7 @@ class UsersController < ApplicationController
p_ids = [ ]
Project . where ( id : project_ids ) . each do | x |
p_ids << x . id unless x . visible? ( User . current )
end
end
ids = [ ]
ids << Issue . where ( id : act_ids , project_id : p_ids ) . map { | x | x . id }
@ -482,7 +605,7 @@ class UsersController < ApplicationController
p_ids = [ ]
Project . where ( id : project_ids ) . each do | x |
p_ids << x . id unless x . visible? ( User . current )
end
end
ids << Journal . where ( id : act_ids , journalized_id : p_ids , journalized_type : 'Project' ) . map { | x | x . id }
#News
@ -491,16 +614,16 @@ class UsersController < ApplicationController
p_ids = [ ]
Project . where ( id : project_ids ) . each do | x |
p_ids << x . id unless x . visible? ( User . current )
end
end
ids << News . where ( id : act_ids , project_id : p_ids ) . map { | x | x . id }
project_ids = News . where ( id : act_ids ) . select ( 'distinct course_id' ) . map { | x | x . course_id }
c_ids = [ ]
Course . where ( id : project_ids ) . each do | x |
c_ids << x . id unless x . is_public != 0 && User . current . member_of_course? ( x )
end
end
ids << News . where ( id : act_ids , course_id : p_ids ) . map { | x | x . id }
#Message
act_ids = activity . where ( act_type : 'Message' ) . select ( 'act_id' ) . map { | x | x . act_id }
board_ids = Message . where ( id : act_ids ) . select ( 'distinct board_id' ) . map { | x | x . board_id }
@ -508,14 +631,14 @@ class UsersController < ApplicationController
p_ids = [ ]
Project . where ( id : project_ids ) . each do | x |
p_ids << x . id unless x . visible? ( User . current )
end
end
ids << Message . where ( id : act_ids , board_id : p_ids ) . map { | x | x . id }
project_ids = Board . where ( id : board_ids ) . select ( 'distinct course_id' ) . map { | x | x . course_id }
c_ids = [ ]
Course . where ( id : project_ids ) . each do | x |
c_ids << x . id unless x . is_public != 0 && User . current . member_of_course? ( x )
end
end
ids << Message . where ( id : act_ids , board_id : c_ids ) . map { | x | x . id }
logger . debug " filter ids #{ ids } "
@ -533,33 +656,33 @@ class UsersController < ApplicationController
# (e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course))))))
# }
#
@activity_count = activity . count
@activity_pages = Paginator . new @activity_count , pre_count , params [ 'page' ]
@activity = activity . slice ( @activity_pages . offset , @activity_pages . per_page )
@state = 0
end
if params [ :user ] . present?
user_temp = User . find_by_sql ( " select id from users where concat(lastname,firstname) like '% #{ params [ :user ] } %' or lastname like '% #{ params [ :user ] } %' " )
if user_temp . size > 1
activity = Activity . where ( 'user_id in (?)' , user_temp ) . where ( 'user_id in (?)' , watcher ) . order ( 'id desc' )
activity = Activity . where ( 'user_id in (?)' , user_temp ) . where ( 'user_id in (?)' , watcher ) . order ( 'id desc' )
elsif user_temp . size == 1
activity = Activity . where ( 'user_id = ?' , user_temp ) . where ( 'user_id in (?)' , watcher ) . order ( 'id desc' )
activity = Activity . where ( 'user_id = ?' , user_temp ) . where ( 'user_id in (?)' , watcher ) . order ( 'id desc' )
else
activity = Activity . where ( " 1 = 0 " )
end
@offset , @limit = api_offset_and_limit ( { :limit = > 10 } )
@activity_count = activity . count
@activity_count = activity . count
@activity_pages = Paginator . new @activity_count , @limit , params [ 'page' ]
@offset || = @activity_pages . offset
@activity = activity . offset ( @offset ) . limit ( @limit )
@activity = activity . offset ( @offset ) . limit ( @limit )
@state = 0
end
#Modified by nie
unless User . current . admin?
if ! @user . active? #|| (@user != User.current && @memberships.empty? && events.empty?)
@ -581,17 +704,17 @@ class UsersController < ApplicationController
def info
message = [ ]
if @user == User . current
if @user == User . current
message = JournalsForMessage . reference_message ( @user . id )
message += Journal . reference_message ( @user . id )
message += Journal . reference_message ( @user . id )
end
@offset , @limit = api_offset_and_limit ( { :limit = > 10 } )
@info_count = message . size
@info_pages = Paginator . new @info_count , @limit , params [ 'page' ]
@offset || = @info_pages . offset
messages = message . sort { | x , y | y . created_on < = > x . created_on }
@message = messages [ @offset , @limit ]
unless User . current . admin?
@ -607,7 +730,7 @@ class UsersController < ApplicationController
end
end
#### end
def new
@user = User . new ( :language = > Setting . default_language , :mail_notification = > Setting . default_notification_option )
@ -665,7 +788,7 @@ class UsersController < ApplicationController
@auth_sources = AuthSource . all
@membership || = Member . new
end
def watch_projects
@watch_projects = Project . joins ( :watchers ) . where ( " project_type <>? and watchable_type = ? and `watchers`.user_id = ? " , '1' , 'Project' , @user . id )
@state = 1
@ -835,42 +958,66 @@ class UsersController < ApplicationController
end
end
###add by huang
def user_watchlist
def user_watchlist
limit = 10 ;
query = User . watched_by ( @user . id ) ;
@obj_count = query . count ( ) ;
@obj_pages = Paginator . new @obj_count , limit , params [ 'page' ]
@list = query . order ( " #{ Watcher . table_name } .id desc " ) . limit ( limit ) . offset ( @obj_pages . offset ) . all ( ) ;
render :template = > 'users/user_fanslist' , :layout = > 'base_users_new'
end
###add by huang
def user_fanslist
def user_fanslist
limit = 10 ;
query = @user . watcher_users ;
@obj_count = query . count ( ) ;
@obj_pages = Paginator . new @obj_count , limit , params [ 'page' ]
@list = query . order ( " #{ Watcher . table_name } .id desc " ) . limit ( limit ) . offset ( @obj_pages . offset ) . all ( ) ;
@action = 'fans'
render :layout = > 'base_users_new'
end
def user_visitorlist
limit = 10 ;
#query = @user.watcher_users;
query = User . joins ( " join visitors v on #{ User . table_name } .id=v.user_id " )
query = query . where ( " v.master_id=? " , @user . id )
@obj_count = query . count ( ) ;
@obj_pages = Paginator . new @obj_count , limit , params [ 'page' ]
@list = query . order ( " v.updated_on desc " ) . limit ( limit ) . offset ( @obj_pages . offset ) . all ( ) ;
@action = 'visitor'
render :template = > 'users/user_fanslist' , :layout = > 'base_users_new'
end
#william
def update_extensions ( user_extensions )
user_extensions = params [ :user_extensions ]
unless user_extensions . nil?
user_extensions = UserExtensions . find_by_id ( user_extensions . user_id )
# user_extensions.
end
end
# added by bai
def topic_score_index
end
def project_score_index
end
def activity_score_index
end
def influence_score_index
end
def score_index
end
# end
def topic_new_score_index
@ -916,7 +1063,7 @@ class UsersController < ApplicationController
# 必填自己的工作单位，其实就是学校
def auth_user_extension
if @user == User . current && @user . user_extensions . nil?
if @user == User . current && @user . user_extensions . nil?
flash [ :error ] = l ( :error_complete_occupation )
redirect_to my_account_url
end
@ -944,4 +1091,20 @@ class UsersController < ApplicationController
render_404
end
end
def recorded_visitor
if ( User . current . logged? && User . current != @user )
#impl = Visitor.where('user_id=? and master_id=?',User.current.id,@user.id).find;
# impl = Visitor.find_by_sql('user_id=? and master_id=?',[User.current.id,@user.id]);
impl = Visitor . find_by_user_id_and_master_id ( User . current . id , @user . id ) ;
if ( impl . nil? )
impl = Visitor . new
impl . user_id = User . current . id
impl . master_id = @user . id
else
impl . updated_on = Time . now
end
impl . save
end
end
end
