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
Make reports work on this
Klaus Zandersba67dc6e695c
diff --git a/modules/reporting/app/helpers/reporting_helper.rb b/modules/reporting/app/helpers/reporting_helper.rbindex 558760ed5e6..1743099f123 100644--- a/modules/reporting/app/helpers/reporting_helper.rb+++ b/modules/reporting/app/helpers/reporting_helper.rb@@ -119,6 +119,12 @@ module ReportingHelperbudget_link valuewhen :work_package_idlink_to_work_package(WorkPackage.find(value.to_i))+ when :entity_id # rubocop:disable Lint/DuplicateBranch+ # TODO: Add ability to use other resources here as well+ link_to_work_package(WorkPackage.find(value.to_i))+ when :entity_type+ # TODO: Skip for now+ nilwhen :spent_onformat_date(value.to_date)when :type_id@@ -177,8 +183,8 @@ module ReportingHelperreturn "" if value.blank?case key.to_sym- when :work_package_id, :tweek, :tmonth, :week then value.to_i- when :spent_on then value.to_date.mjd+ when :work_package_id, :entity_id, :tweek, :tmonth, :week then value.to_i+ when :spent_on then value.to_date.mjdelse strip_tags(field_representation_map(key, value))endenddiff --git a/modules/reporting/app/models/cost_query/group_by/work_package_id.rb b/modules/reporting/app/models/cost_query/group_by/work_package_id.rbindex c48c054ca4f..b6e365f69e8 100644--- a/modules/reporting/app/models/cost_query/group_by/work_package_id.rb+++ b/modules/reporting/app/models/cost_query/group_by/work_package_id.rb@@ -31,7 +31,7 @@ class CostQuery::GroupBy::WorkPackageId < Report::GroupBy::Basedef initialize(child = nil, options = {})super- group_fields :entity_type, :entity_id+ group_fields "entity_type", "entity_id"enddef self.labeldiff --git a/modules/reporting/app/workers/cost_query/pdf/timesheet_generator.rb b/modules/reporting/app/workers/cost_query/pdf/timesheet_generator.rbindex 41c4d4924c1..635eb452c90 100644--- a/modules/reporting/app/workers/cost_query/pdf/timesheet_generator.rb+++ b/modules/reporting/app/workers/cost_query/pdf/timesheet_generator.rb@@ -165,7 +165,7 @@ class CostQuery::PDF::TimesheetGenerator.filter { |r| r.fields["type"] == "TimeEntry" }.flat_map { |r| r.fields["id"] }- TimeEntry.where(id: ids).includes(%i[user activity work_package project])+ TimeEntry.where(id: ids).includes(%i[user activity project])endenddiff --git a/modules/reporting/lib/widget/table/entry_table.rb b/modules/reporting/lib/widget/table/entry_table.rbindex 513934a3f0c..57345af3245 100644--- a/modules/reporting/lib/widget/table/entry_table.rb+++ b/modules/reporting/lib/widget/table/entry_table.rb@@ -29,7 +29,7 @@class Widget::Table::EntryTable < Widget::Tableinclude ReportingHelper- FIELDS = %i[user_id activity_id work_package_id comments logged_by_id project_id].freeze+ FIELDS = %i[user_id activity_id entity_id comments logged_by_id project_id].freezedef rendercontent = content_tag :div, class: "generic-table--container -with-footer" dodiff --git a/modules/reporting/spec/features/date_filter_spec.rb b/modules/reporting/spec/features/date_filter_spec.rbindex 01153f918ba..869f2595380 100644--- a/modules/reporting/spec/features/date_filter_spec.rb+++ b/modules/reporting/spec/features/date_filter_spec.rb@@ -34,9 +34,11 @@ require "spec_helper"RSpec.describe "Cost report date filter", :js dolet(:project) { create(:project) }- let!(:today_time_entry) { create(:time_entry, project: project, hours: 5) }- let!(:five_days_ago_time_entry) { create(:time_entry, project: project, hours: 10, spent_on: 5.days.ago) }- let!(:five_days_from_now_time_entry) { create(:time_entry, project: project, hours: 15, spent_on: 5.days.from_now) }+ let(:work_package) { create(:work_package, project:) }++ let!(:today_time_entry) { create(:time_entry, entity: work_package, hours: 5) }+ let!(:five_days_ago_time_entry) { create(:time_entry, entity: work_package, hours: 10, spent_on: 5.days.ago) }+ let!(:five_days_from_now_time_entry) { create(:time_entry, entity: work_package, hours: 15, spent_on: 5.days.from_now) }current_user { create(:admin) }