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
add specs, move strings to I18n
as-op03fb540832d0
diff --git a/app/models/exports/pdf/common/common.rb b/app/models/exports/pdf/common/common.rbindex 9ab97991356..86808db2300 100644--- a/app/models/exports/pdf/common/common.rb+++ b/app/models/exports/pdf/common/common.rb@@ -317,6 +317,10 @@ module Exports::PDF::Common::Commonpdf.page_number + @page_count - (with_cover? ? 1 : 0)end+ def total_page_nr+ @total_page_nr - (with_cover? ? 1 : 0) if @total_page_nr+ end+def write_horizontal_line(y_position, height, color, left_padding: 0)draw_horizontal_line(y_position,diff --git a/modules/meeting/app/workers/meetings/pdf/minutes/exporter.rb b/modules/meeting/app/workers/meetings/pdf/minutes/exporter.rbindex 30a272c6e30..f042d453ebc 100644--- a/modules/meeting/app/workers/meetings/pdf/minutes/exporter.rb+++ b/modules/meeting/app/workers/meetings/pdf/minutes/exporter.rb@@ -143,7 +143,7 @@ module Meetings::PDF::Minutesenddef write_minutes_headers_text- pdf.repeat lambda { |pg| pg == 1 } do+ pdf.repeat lambda { |pg| pg == 1 }, dynamic: true dodraw_header_text_multiline_left(text: page_header_text,text_style: styles.page_header,@@ -191,14 +191,10 @@ module Meetings::PDF::Minutesenddef footer_page_nr- "S. #{current_page_nr}#{total_page_nr_text}"- end-- def total_page_nr_textif @total_page_nr- " von #{@total_page_nr - (with_cover? ? 1 : 0)}"+ I18n.t("meeting.export.minutes.footer_page_numbers", current_page: current_page_nr, total_pages: total_page_nr)else- ""+ current_page_nr.to_sendend@@ -210,18 +206,6 @@ module Meetings::PDF::Minutesbuild_pdf_filename(meeting.title)end- def with_participants?- ActiveModel::Type::Boolean.new.cast(options[:participants])- end-- def with_attachments_list?- ActiveModel::Type::Boolean.new.cast(options[:attachments])- end-- def with_backlog?- ActiveModel::Type::Boolean.new.cast(options[:backlog])- end-def with_outcomes?ActiveModel::Type::Boolean.new.cast(options[:outcomes])enddiff --git a/modules/meeting/app/workers/meetings/pdf/minutes/page_head.rb b/modules/meeting/app/workers/meetings/pdf/minutes/page_head.rbindex 842b36a3fc8..7715b86ccdb 100644--- a/modules/meeting/app/workers/meetings/pdf/minutes/page_head.rb+++ b/modules/meeting/app/workers/meetings/pdf/minutes/page_head.rb@@ -46,7 +46,7 @@ module Meetings::PDF::Minutesdef write_page_subheadingstyle = styles.page_subheadingwith_vertical_margin(styles.page_subheading_margins) do- pdf.formatted_text([style.merge({ text: "Protokoll" })], style)+ pdf.formatted_text([style.merge({ text: I18n.t("meeting.export.minutes.title") })], style)endenddiff --git a/modules/meeting/config/locales/crowdin/de.yml b/modules/meeting/config/locales/crowdin/de.ymlindex bcadf22c233..c0207818581 100644--- a/modules/meeting/config/locales/crowdin/de.yml+++ b/modules/meeting/config/locales/crowdin/de.yml@@ -241,6 +241,7 @@ de:export:your_meeting_export: "Besprechung wird exportiert"minutes:+ footer_page_numbers: "S. %{current_page} von %{total_pages}"author: "Verfasser:in"date: "Datum"time: "Zeit"diff --git a/modules/meeting/config/locales/en.yml b/modules/meeting/config/locales/en.ymlindex a26063f75bf..6e7c3e09c4f 100644--- a/modules/meeting/config/locales/en.yml+++ b/modules/meeting/config/locales/en.yml@@ -262,6 +262,7 @@ en:export:your_meeting_export: "Meeting is being exported"minutes:+ footer_page_numbers: "P. %{current_page} of %{total_pages}"author: "Author"date: "Date"time: "Time"diff --git a/modules/meeting/spec/workers/meetings/pdf/minutes/exporter_spec.rb b/modules/meeting/spec/workers/meetings/pdf/minutes/exporter_spec.rbnew file mode 100644index 00000000000..4a9a9649d0c--- /dev/null+++ b/modules/meeting/spec/workers/meetings/pdf/minutes/exporter_spec.rb@@ -0,0 +1,299 @@+# frozen_string_literal: true++#-- copyright+# OpenProject is an open source project management software.+# Copyright (C) the OpenProject GmbH+#+# This program is free software; you can redistribute it and/or+# modify it under the terms of the GNU General Public License version 3.+#+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:+# Copyright (C) 2006-2013 Jean-Philippe Lang+# Copyright (C) 2010-2013 the ChiliProject Team+#+# This program is free software; you can redistribute it and/or+# modify it under the terms of the GNU General Public License+# as published by the Free Software Foundation; either version 2+# of the License, or (at your option) any later version.+#+# This program is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+# GNU General Public License for more details.+#+# You should have received a copy of the GNU General Public License+# along with this program; if not, write to the Free Software+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.+#+# See COPYRIGHT and LICENSE files for more details.+#++++require "spec_helper"+require "pdf/inspector"++RSpec.describe Meetings::PDF::Minutes::Exporter do+ include Redmine::I18n++ shared_let(:role) { create(:project_role, permissions: [:view_work_packages]) }+ shared_let(:user) { create(:user, firstname: "Minutes", lastname: "User") }+ shared_let(:other_user) { create(:user, firstname: "Other", lastname: "Account") }+ shared_let(:project) do+ project = create(:project, enabled_module_names: Setting.default_projects_modules + %w[meetings])+ create(:member, principal: user, project:, roles: [role])+ project+ end+ shared_let(:export_time) { DateTime.new(2025, 6, 3, 13, 37) }+ shared_let(:export_time_formatted) { format_date(export_time) }+ shared_let(:recurring_meeting) do+ create :recurring_meeting,+ project:,+ author: user,+ start_time: DateTime.parse("2024-12-05T10:00:00Z"),+ frequency: "daily"+ end+ shared_let(:work_package) { create(:work_package, project:) }+ let(:default_options) do+ {+ author: "N. Ame",+ first_page_header_left: "A header text that is wrapped into multiple lines",+ backlog: "0"+ }+ end+ let(:options) do+ default_options+ end+ let(:exporter) { described_class.new(meeting, options) }+ let(:meeting) { create(:meeting, author: user, project:, title: "Minutes meeting!", location: "Moon Base") }+ let(:pdf_export) do+ Timecop.freeze(export_time) do+ exporter.export!+ end+ end++ subject(:pdf) do+ result = pdf_export+ # If you want to actually see the PDF for debugging, uncomment the following line+ # File.binwrite("Minutes-test-preview.pdf", result.content)+ # `open Minutes-test-preview.pdf`+ PDF::Inspector::Text.analyze(result.content).strings.join(" ")+ end++ def meeting_info+ [+ "Minutes",+ "Date: #{format_date(meeting.start_time)}",+ "|",+ "Time: #{format_time(meeting.start_time, include_date: false)}",+ "–",+ format_time(meeting.end_time, include_date: false).to_s,+ "|",+ "Location: #{meeting.location}"+ ]+ end++ def meeting_info_custom+ ["Author: N. Ame"]+ end++ def expected_header+ ["A header text that is wrapped into multiple lines"]+ end++ def expected_footer+ [+ "P. 1 of 1",+ "#{meeting.title} • #{format_date(meeting.start_time)}"+ ]+ end++ def expected_header_footer+ [+ *expected_header, # PDF inspector reads the strings in the order they are written, not position on page+ *expected_footer+ ]+ end++ context "with an empty single meeting" do+ it "renders the expected document" do+ expected_document = [+ meeting.title,+ *meeting_info,+ *meeting_info_custom,+ *expected_header_footer+ ].join(" ")++ expect(subject).to eq expected_document+ end+ end++ context "with an empty recurring meeting" do+ let!(:meeting) do+ create(:meeting, :author_participates, recurring_meeting:, project:, title: "Minutes meeting!", location: "Moon Base")+ end++ it "renders the expected document" do+ expected_document = [+ meeting.title,+ *meeting_info,+ *meeting_info_custom,+ *expected_header_footer+ ].join(" ")++ expect(subject).to eq expected_document+ end+ end++ context "with a meeting with agenda items" do+ let(:meeting) do+ create(:meeting, author: user, project:, title: "Minutes closed meeting!", location: "Mars Base", state: :closed)+ end+ let(:type_task) { create(:type_task) }+ let(:status) { create(:status, is_default: true, name: "Workin' on it") }+ let(:work_package) { create(:work_package, project:, status:, subject: "Important task", type: type_task) }+ let(:meeting_section) { create(:meeting_section, meeting:, title: nil) }+ let(:meeting_section_second) { create(:meeting_section, meeting:, title: "Second section") }+ let(:meeting_agenda_item) do+ create(:meeting_agenda_item, meeting_section:, duration_in_minutes: 15, title: "Agenda Item TOP 1", presenter: user,+ notes: "**foo**")+ end+ let(:wp_agenda_item) do+ create(:wp_meeting_agenda_item,+ meeting:,+ meeting_section: meeting_section_second,+ work_package:,+ duration_in_minutes: 10,+ notes: "*bar*")+ end+ let(:outcome) { create(:meeting_outcome, meeting_agenda_item:, notes: "An outcome") }+ let(:attachment) { create(:attachment, container: meeting) }+ let(:meeting_backlog_item) do+ create(:meeting_agenda_item, meeting_section: meeting.backlog,+ duration_in_minutes: 1,+ title: "Agenda Item in Backlog", presenter: user, notes: "# yeah")+ end+ let(:invited) { create(:meeting_participant, user: other_user, meeting:, invited: true) }+ let(:attended) { create(:meeting_participant, :attendee, user: user, meeting:) }++ before do+ User.current = user+ meeting_agenda_item # create the agenda item+ wp_agenda_item # create the wp agenda item+ outcome # create the outcome+ attachment # create the attachment+ meeting_backlog_item # create the backlog item+ attended # create the attended participant+ invited # create the invited participant+ end++ context "with bells and whistles options" do+ let(:options) do+ default_options.merge(+ {+ outcomes: "1"+ }+ )+ end++ it "renders the expected document" do+ expected_document = [+ meeting.title,+ *meeting_info,+ *meeting_info_custom,+ "1. Untitled section", " ", "15 mins",+ "1.1. Agenda Item TOP 1",+ "foo",+ "✓ Outcome",+ "An outcome",++ "2. Second section", " ", "10 mins",+ "2.1. Task", "##{work_package.id}", "Important task", " (Workin' on it)",+ "bar",++ *expected_header_footer+ ].join(" ")++ expect(subject).to eq expected_document+ end+ end++ context "with minimal options" do+ let(:options) do+ default_options.merge(+ {+ first_page_header_left: "",+ outcomes: "0",+ author: ""+ }+ )+ end++ it "renders the expected document" do+ expected_document = [+ meeting.title,+ *meeting_info,+ "1. Untitled section", " ", "15 mins",+ "1.1. Agenda Item TOP 1",+ "foo",++ "2. Second section", " ", "10 mins",+ "2.1. Task", "##{work_package.id}", "Important task", " (Workin' on it)",+ "bar",++ *expected_footer+ ].join(" ")++ expect(subject).to eq expected_document+ end+ end+ end++ context "with a meeting with special work package agenda item" do+ let!(:secret_project) { create(:project, members: [other_user]) }+ let(:secret_work_package) { create(:work_package, project: secret_project) }+ let(:wp_agenda_item) do+ create(:wp_meeting_agenda_item, meeting:, work_package: secret_work_package, duration_in_minutes: 10,+ notes: "title of the work package should not be visible")+ end++ before do+ secret_work_package # create the work_package+ wp_agenda_item # create the wp agenda item+ end++ context "and with a non visible work package" do+ it "renders the expected document" do+ expected_document = [+ meeting.title,+ *meeting_info,+ *meeting_info_custom,+ "1. Untitled section", " ", "10 mins",+ "1.1. Work package ##{secret_work_package.id} not visible",+ "title of the work package should not be visible",+ *expected_header_footer+ ].join(" ")++ expect(subject).to eq expected_document+ end+ end++ context "and with a deleted work package" do+ before do+ secret_work_package.destroy+ end++ it "renders the expected document" do+ expected_document = [+ meeting.title,+ *meeting_info,+ *meeting_info_custom,+ "1. Untitled section", " ", "10 mins",+ "1.1. Deleted work package reference",+ "title of the work package should not be visible",+ *expected_header_footer+ ].join(" ")++ expect(subject).to eq expected_document+ end+ end+ end+end