OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
[#64697] Status tag is positioned too close to the title in pdf report with long words in title
as-op6a4ca8ac4ce7
diff --git a/app/models/exports/pdf/common/badge.rb b/app/models/exports/pdf/common/badge.rbindex 9933831086b..a9d217ab9fb 100644--- a/app/models/exports/pdf/common/badge.rb+++ b/app/models/exports/pdf/common/badge.rb@@ -35,6 +35,11 @@ module Exports::PDF::Common::Badge@document = options[:document]@radius = options[:radius] || 0@offset = options[:offset] || 0+ @line_height = options[:line_height] || 8+ end++ def badge_line_height+ @line_height + 2enddef render_behind(fragment)@@ -64,10 +69,22 @@ module Exports::PDF::Common::Badgebrightness < 130 ? "FFFFFF" : "000000"end- def prawn_badge(text, color, offset: 0, radius: 8, font_size: 8)- badge = BadgeCallback.new({ color: color, radius:, document: pdf, offset: })+ def prawn_badge_draw_text_callback(badge_text, offset)+ # prawn does not support vertical alignment of text fragments, so we need to adjust the y position of the badge+ ->(text, opts) do+ opts[:at][1] += offset if text.include? prawn_badge_text_stuffing(badge_text)+ pdf.draw_text!(text, opts)+ end+ end++ def prawn_badge_text_stuffing(text)+ (Prawn::Text::NBSP * 4) + text.tr(" ", Prawn::Text::NBSP) + (Prawn::Text::NBSP * 4)+ end++ def prawn_badge(text, color, offset: 0, radius: 8, font_size: 8, line_height: 8)+ badge = BadgeCallback.new({ color: color, radius:, document: pdf, offset:, line_height: }){- text: (Prawn::Text::NBSP * 3) + text + (Prawn::Text::NBSP * 3),+ text: prawn_badge_text_stuffing(text),size: font_size,color: readable_color(color),callback: badgediff --git a/app/models/work_package/pdf_export/work_package_to_pdf.rb b/app/models/work_package/pdf_export/work_package_to_pdf.rbindex 187760036ce..2be9acc66f6 100644--- a/app/models/work_package/pdf_export/work_package_to_pdf.rb+++ b/app/models/work_package/pdf_export/work_package_to_pdf.rb@@ -89,30 +89,21 @@ class WorkPackage::PDFExport::WorkPackageToPdf < Exports::Exporterdef write_wp_title!(work_package)badge_text = work_package.status.name.downcaseoffset = 2+ style = styles.page_headingwith_margin(styles.page_heading_margins) dopdf.formatted_text([- wp_title_formatted_text(work_package),+ wp_title_formatted_text(work_package, style),{ text: " " },- prawn_badge(badge_text, wp_status_prawn_color(work_package), offset:)+ prawn_badge(badge_text, wp_status_prawn_color(work_package), offset:, line_height: style[:size])],- styles.page_heading.merge({ draw_text_callback: prawn_badge_draw_text_callback(badge_text, offset) })+ style.merge({ draw_text_callback: prawn_badge_draw_text_callback(badge_text, offset) }))endend- def wp_title_formatted_text(work_package)- styles.page_heading.merge({ text: heading, link: url_helpers.work_package_url(work_package) })- end-- def prawn_badge_draw_text_callback(badge_text, offset)- # prawn does not support vertical alignment of text fragments, so we need to adjust the y position of the badge- ->(text, opts) do- if text.include? badge_text- opts[:at][1] += offset- end- pdf.draw_text!(text, opts)- end+ def wp_title_formatted_text(work_package, style)+ style.merge({ text: heading, link: url_helpers.work_package_url(work_package) })enddef headingdiff --git a/lib/open_project/patches/prawn_badge.rb b/lib/open_project/patches/prawn_badge.rbnew file mode 100644index 00000000000..3013d480580--- /dev/null+++ b/lib/open_project/patches/prawn_badge.rb@@ -0,0 +1,15 @@+module OpenProject::Patches::PrawnBadgePatch+ def fragment_measurements=(fragment)+ super++ # If the fragment is a badge, we need to adjust the line height+ callbacks = fragment.callback_objects+ callbacks.each do |obj|+ if obj.respond_to?(:badge_line_height)+ fragment.line_height = obj.badge_line_height+ end+ end+ end+end++Prawn::Text::Formatted::Arranger.prepend(OpenProject::Patches::PrawnBadgePatch)diff --git a/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rb b/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rbindex 287820e09ff..329ea48ae7f 100644--- a/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rb+++ b/spec/models/work_packages/pdf_export/work_package_to_pdf_spec.rb@@ -225,7 +225,7 @@ RSpec.describe WorkPackage::PDFExport::WorkPackageToPdf dolet(:expected_details) doresult = ["#{type.name} ##{work_package.id} - #{work_package.subject}",- " ", (Prawn::Text::NBSP * 3) + work_package.status.name.downcase + (Prawn::Text::NBSP * 3), # badge & padding+ " ", exporter.prawn_badge_text_stuffing(work_package.status.name.downcase), # badge & padding"People","Assignee", user.name,"Accountable", user.name,