Skip to content

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

obey rubocop

as-opa380a2a96950
diff --git a/modules/meeting/app/workers/meetings/pdf/minutes/agenda.rb b/modules/meeting/app/workers/meetings/pdf/minutes/agenda.rb
index b348cdff696..bb5dcd226d1 100644
--- a/modules/meeting/app/workers/meetings/pdf/minutes/agenda.rb
+++ b/modules/meeting/app/workers/meetings/pdf/minutes/agenda.rb
@@ -57,18 +57,22 @@ module Meetings::PDF::Minutes
def write_section_title(section, index)
margins = styles.agenda_section_title_table_margins
with_vertical_margin(margins) do
- pdf.table(
- [[
- { content: "#{index + 1}." },
- { content: format_agenda_section_title_cell(section) }
- ]],
- width: pdf.bounds.width,
- column_widths: [40, pdf.bounds.width - 40],
- cell_style: { inline_format: true }.merge(styles.agenda_section_title_cell)
- )
+ write_section_title_table(section, index)
end
end
+ def write_section_title_table(section, index)
+ pdf.table(
+ [[
+ { content: "#{index + 1}." },
+ { content: format_agenda_section_title_cell(section) }
+ ]],
+ width: pdf.bounds.width,
+ column_widths: [40, pdf.bounds.width - 40],
+ cell_style: { inline_format: true }.merge(styles.agenda_section_title_cell)
+ )
+ end
+
def format_agenda_section_title_cell(section)
content = [prawn_table_cell_inline_formatting_data(section_title(section), styles.agenda_section_title)]
if section.agenda_items_sum_duration_in_minutes > 0
@@ -114,9 +118,9 @@ module Meetings::PDF::Minutes
with_vertical_margin(styles.agenda_item_title_margins) do
pdf.table(
[[
- { content: "#{section_index + 1}.#{index + 1}." },
- { content: title }
- ]],
+ { content: "#{section_index + 1}.#{index + 1}." },
+ { content: title }
+ ]],
width: pdf.bounds.width,
column_widths: [40, pdf.bounds.width - 40],
cell_style: { inline_format: true }.merge(styles.agenda_item_title_cell)
diff --git a/modules/meeting/app/workers/meetings/pdf/minutes/page_head.rb b/modules/meeting/app/workers/meetings/pdf/minutes/page_head.rb
index ddae5426ede..842b36a3fc8 100644
--- a/modules/meeting/app/workers/meetings/pdf/minutes/page_head.rb
+++ b/modules/meeting/app/workers/meetings/pdf/minutes/page_head.rb
@@ -57,20 +57,29 @@ module Meetings::PDF::Minutes
end
end
- def meeting_subtitle
+ def meeting_subtitle_date
+ format_date(meeting.start_time)
+ end
+
+ def meeting_subtitle_time
+ "#{format_time(meeting.start_time, include_date: false)} – #{format_time(meeting.end_time, include_date: false)}"
+ end
+
+ def meeting_subtitle_first_line
list = [
- "#{I18n.t("meeting.export.minutes.date")}:",
- format_date(meeting.start_time),
- "|",
- "#{I18n.t("meeting.export.minutes.time")}:",
- format_time(meeting.start_time, include_date: false), "–", format_time(meeting.end_time, include_date: false),
+ "#{I18n.t('meeting.export.minutes.date')}:", meeting_subtitle_date, "|",
+ "#{I18n.t('meeting.export.minutes.time')}:", meeting_subtitle_time
]
if meeting.location.present?
- list += ["|", "#{I18n.t("meeting.export.minutes.location")}:", meeting.location]
+ list += ["|", "#{I18n.t('meeting.export.minutes.location')}:", meeting.location]
end
- result = list.join(" ")
+ list.join(" ")
+ end
+
+ def meeting_subtitle
+ result = meeting_subtitle_first_line
if minutes_author.present?
- result += "\n#{I18n.t("meeting.export.minutes.author")}: #{minutes_author}"
+ result += "\n#{I18n.t('meeting.export.minutes.author')}: #{minutes_author}"
end
result
end