diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb index 7f643b285..2c8aeddcf 100644 --- a/app/helpers/reports_helper.rb +++ b/app/helpers/reports_helper.rb @@ -128,9 +128,22 @@ module ReportsHelper form_response.form.form_fields&.map do |form_field| form_field_value = form_field_values.find_by(form_field_id: form_field.id, latest: true) + value = if form_field_value&.not_applicable + I18n.t('forms.export.values.not_applicable') + elsif form_field_value.is_a?(FormTextFieldValue) + custom_auto_link( + form_field_value&.formatted, + simple_format: false, + tags: %w(img), + team: current_team + ) + else + form_field_value&.formatted + end + { name: form_field.name, - value: form_field_value&.not_applicable ? I18n.t('forms.export.values.not_applicable') : form_field_value&.formatted.to_s, + value: value, submitted_at: form_field_value&.submitted_at&.utc.to_s, submitted_by: form_field_value&.submitted_by&.full_name.to_s } diff --git a/app/javascript/vue/forms/fields/text.vue b/app/javascript/vue/forms/fields/text.vue index 2fae7a8f4..ac1942fc3 100644 --- a/app/javascript/vue/forms/fields/text.vue +++ b/app/javascript/vue/forms/fields/text.vue @@ -1,17 +1,25 @@