Commit 9cf01390 by Tấn Trần Thanh

fix comment

parent 01ef1b86
Pipeline #1585 canceled with stages
in 0 seconds
...@@ -16,17 +16,15 @@ class WorkflowReportController < ApplicationController ...@@ -16,17 +16,15 @@ class WorkflowReportController < ApplicationController
project_id = Project.find_by(name: params[:team]).id project_id = Project.find_by(name: params[:team]).id
project_ids = Project.visible.active.where(parent_id: project_id).pluck(:id).push(project_id) project_ids = Project.visible.active.where(parent_id: project_id).pluck(:id).push(project_id)
users_by_role = Project.find(project_id).users_by_role users_by_role = Project.find(project_id).users_by_role
leader_ids = User.all.where(admin: 1).pluck(:id)
result = [] result = []
users_by_role.each { |key, _value| users_by_role.delete(key) if key.is_a?(Role) && key.name.in?(%w[Manager JP TeamLead]) } users_by_role.each do |role, users|
users_by_role.each do |_role, users|
users.each do |u| users.each do |u|
result << { id: u.id, fullname: "#{u.firstname} #{u.lastname}" } unless leader_ids.include?(u.id) result << { id: u.id, fullname: "#{u.firstname} #{u.lastname}" } unless role.name.in?(%w[Manager JP TeamLead])
end end
end end
report = {} report = {}
result.each do |item| result.each do |user|
report[item[:fullname]] = WorkflowReportTimeEntries.query_time_entry(item[:id], date[0].to_i, date[1].to_i, date[2].to_i, project_ids) report[user[:fullname]] = WorkflowReportTimeEntries.query_time_entry(user[:id], date[0].to_i, date[1].to_i, date[2].to_i, project_ids)
end end
respond_to do |format| respond_to do |format|
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment