diff --git a/app/assets/javascripts/reports/reports_datatable.js b/app/assets/javascripts/reports/reports_datatable.js index e0d066559..e85d50cc6 100644 --- a/app/assets/javascripts/reports/reports_datatable.js +++ b/app/assets/javascripts/reports/reports_datatable.js @@ -360,6 +360,8 @@ }); } + $('#show_report_preview').click(); + initDatatable(); initUpdatePDFReport(); initGenerateDocxReport(); diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb index cbb881125..725871cca 100644 --- a/app/controllers/reports_controller.rb +++ b/app/controllers/reports_controller.rb @@ -188,6 +188,7 @@ class ReportsController < ApplicationController respond_to do |format| format.json do @report.update!(pdf_file_processing: true) + log_activity(:generate_pdf_report) Reports::PdfJob.perform_later(@report, current_user) render json: { message: I18n.t('projects.reports.index.generation.accepted_message') @@ -200,6 +201,7 @@ class ReportsController < ApplicationController respond_to do |format| format.json do @report.update!(docx_file_processing: true) + log_activity(:generate_docx_report) Reports::DocxJob.perform_later(@report, current_user, current_team, root_url) render json: { message: I18n.t('projects.reports.index.generation.accepted_message') @@ -550,6 +552,7 @@ class ReportsController < ApplicationController end def generate_pdf_report + log_activity(:generate_pdf_report) Reports::PdfJob.perform_later(@report, current_user) if @report.persisted? end end diff --git a/app/helpers/global_activities_helper.rb b/app/helpers/global_activities_helper.rb index 4fe5e5c0f..9500988d4 100644 --- a/app/helpers/global_activities_helper.rb +++ b/app/helpers/global_activities_helper.rb @@ -96,7 +96,8 @@ module GlobalActivitiesHelper when Step return current_value when Report - path = reports_path(team: obj.team.id) + preview_type = activity.type_of == 'generate_docx_report' ? :docx : :pdf + path = reports_path(team: obj.team.id, preview_report_id: obj.id, preview_type: preview_type) when ProjectFolder path = if obj.new_record? projects_path(team: activity.team.id) diff --git a/app/views/global_activities/references/_report.html.erb b/app/views/global_activities/references/_report.html.erb index 9bcb7acef..e3fc38821 100644 --- a/app/views/global_activities/references/_report.html.erb +++ b/app/views/global_activities/references/_report.html.erb @@ -3,7 +3,7 @@