ricky/redmine_qbo
1
1
Fork 0
mirror of https://github.com/rickbarrette/redmine_qbo.git synced 2025-11-08 17:04:23 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

nil check for customer & moved notes to the right

Browse Source
This commit is contained in:
Ricky Barrette
2016-05-31 09:55:48 -04:00
parent 96fcb81d9e
commit 4f8c57032c
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/pdf_patch.rb
View File

@@ -37,10 +37,11 @@ module IssuesPdfHelperPatch
pdf.RDMMultiCell(190, 5, "#{format_time(issue.created_on)} - #{issue.author}") pdf.RDMMultiCell(190, 5, "#{format_time(issue.created_on)} - #{issue.author}")
pdf.ln pdf.ln
customer = issue.customer.name if issue.customer
left = [] left = []
left << [l(:field_status), issue.status] left << [l(:field_status), issue.status]
left << [l(:field_priority), issue.priority] left << [l(:field_priority), issue.priority]
left << [l(:field_customer), issue.customer.name] left << [l(:field_customer), customer]
left << [l(:field_assigned_to), issue.assigned_to] unless issue.disabled_core_fields.include?('assigned_to_id') left << [l(:field_assigned_to), issue.assigned_to] unless issue.disabled_core_fields.include?('assigned_to_id')
#left << [l(:field_category), issue.category] unless issue.disabled_core_fields.include?('category_id') #left << [l(:field_category), issue.category] unless issue.disabled_core_fields.include?('category_id')
#left << [l(:field_fixed_version), issue.fixed_version] unless issue.disabled_core_fields.include?('fixed_version_id') #left << [l(:field_fixed_version), issue.fixed_version] unless issue.disabled_core_fields.include?('fixed_version_id')
@@ -51,7 +52,7 @@ module IssuesPdfHelperPatch
notes = v ? v.notes : nil notes = v ? v.notes : nil
left << [l(:field_vehicles), vehicle] left << [l(:field_vehicles), vehicle]
left << [l(:field_vin), vin] left << [l(:field_vin), vin]
left << [l(:field_notes), notes] #left << [l(:field_notes), notes]
right = [] right = []
right << [l(:field_start_date), format_date(issue.start_date)] unless issue.disabled_core_fields.include?('start_date') right << [l(:field_start_date), format_date(issue.start_date)] unless issue.disabled_core_fields.include?('start_date')
@@ -59,7 +60,7 @@ module IssuesPdfHelperPatch
right << [l(:field_done_ratio), "#{issue.done_ratio}%"] unless issue.disabled_core_fields.include?('done_ratio') right << [l(:field_done_ratio), "#{issue.done_ratio}%"] unless issue.disabled_core_fields.include?('done_ratio')
right << [l(:field_estimated_hours), l_hours(issue.estimated_hours)] unless issue.disabled_core_fields.include?('estimated_hours') right << [l(:field_estimated_hours), l_hours(issue.estimated_hours)] unless issue.disabled_core_fields.include?('estimated_hours')
right << [l(:label_spent_time), l_hours(issue.total_spent_hours)] if User.current.allowed_to?(:view_time_entries, issue.project) right << [l(:label_spent_time), l_hours(issue.total_spent_hours)] if User.current.allowed_to?(:view_time_entries, issue.project)
#right << [l(:field_notes), notes] right << [l(:field_notes), notes]
rows = left.size > right.size ? left.size : right.size rows = left.size > right.size ? left.size : right.size
while left.size < rows while left.size < rows