|
|
@@ -287,8 +287,8 @@ class ProjectsController < ApplicationController |
|
|
end |
|
|
end |
|
|
|
|
|
|
|
|
def watch_users |
|
|
def watch_users |
|
|
start_at = params[:start_at] |
|
|
|
|
|
end_at = params[:end_at] |
|
|
|
|
|
|
|
|
start_at = params[:start_at].to_i |
|
|
|
|
|
end_at = params[:end_at].to_i |
|
|
watchers = @project.watchers.includes(:user).order("watchers.created_at desc").distinct |
|
|
watchers = @project.watchers.includes(:user).order("watchers.created_at desc").distinct |
|
|
watchers = watchers.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? |
|
|
watchers = watchers.where("watchers.created_at > ? and watchers.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? |
|
|
@watchers_count = watchers.size |
|
|
@watchers_count = watchers.size |
|
|
@@ -296,8 +296,8 @@ class ProjectsController < ApplicationController |
|
|
end |
|
|
end |
|
|
|
|
|
|
|
|
def praise_users |
|
|
def praise_users |
|
|
start_at = params[:start_at] |
|
|
|
|
|
end_at = params[:end_at] |
|
|
|
|
|
|
|
|
start_at = params[:start_at].to_i |
|
|
|
|
|
end_at = params[:end_at].to_i |
|
|
praises = @project.praise_treads.includes(:user).order("praise_treads.created_at desc").distinct |
|
|
praises = @project.praise_treads.includes(:user).order("praise_treads.created_at desc").distinct |
|
|
praises = praises.where("praise_treads.created_at > ? and praise_treads.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? |
|
|
praises = praises.where("praise_treads.created_at > ? and praise_treads.created_at < ?", Time.at(start_at), Time.at(end_at)) if start_at.present? && end_at.present? |
|
|
@praises_count = praises.size |
|
|
@praises_count = praises.size |
|
|
|