Commit 94fcc54e by Tấn Trần Thanh

fix comment

parent 01ef1b86
Pipeline #1586 failed with stages
in 0 seconds
......@@ -16,17 +16,15 @@ class WorkflowReportController < ApplicationController
project_id = Project.find_by(name: params[:team]).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
leader_ids = User.all.where(admin: 1).pluck(:id)
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|
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
report = {}
result.each do |item|
report[item[:fullname]] = WorkflowReportTimeEntries.query_time_entry(item[:id], date[0].to_i, date[1].to_i, date[2].to_i, project_ids)
result.each do |user|
report[user[:fullname]] = WorkflowReportTimeEntries.query_time_entry(user[:id], date[0].to_i, date[1].to_i, date[2].to_i, project_ids)
end
respond_to do |format|
......
module WorkflowReportHelper
def build_report(entrie)
done_ratio = entrie.issue.done_ratio
github_issue_id = entrie.issue.subject.match(/.*(#\d+).*/)[1] rescue "##{entrie.issue.id}"
text = "#{entrie.project.name}#{github_issue_id}: #{entrie.activity.name} - #{entrie.comments}"
def build_report(entry)
done_ratio = entry.issue.done_ratio
github_issue_id = entry.issue.subject.match(/.*(#\d+).*/)[1] rescue "##{entry.issue.id}"
text = "#{entry.project.name}#{github_issue_id}: #{entry.activity.name} - #{entry.comments}"
text.concat(" (#{done_ratio}%)") if done_ratio > 0
text
......
......@@ -3,12 +3,12 @@ p = "Project: #{params[:team]}"
p = "*Daily Report #{params[:date]}*"
- report.each_with_index do |(username, entries), index|
- total_time = entries.reduce(0) { |acc, entrie| acc + entrie.hours }
- total_time = entries.reduce(0) { |acc, entry| acc + entry.hours }
.mt-10 class=("bg-danger" if total_time < 8)
span = "#{(index + 1).to_s}. #{username} #{'(' +total_time.to_s + 'h)' if display_hour}"
- entries.each do |entrie|
- entries.each do |entry|
div
span &nbsp;&nbsp;
- #{build_report(entrie)}
- #{build_report(entry)}
- if display_hour
span = " (#{entrie.hours} h)"
span = " (#{entry.hours} h)"
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