-
<%= t('events_log') %>
+
<%= t('event_log') %>
<%= link_to t('all'), url_for(params: request.query_parameters.except('status', 'page')), style: 'margin-bottom: -1px', class: "tab h-10 text-base #{params[:status].blank? ? 'tab-active tab-bordered' : 'pb-[3px]'}" %>
<%= link_to t('succeeded'), url_for(params: request.query_parameters.except('page').merge('status' => 'success')), style: 'margin-bottom: -1px', class: "tab h-10 text-base #{params[:status] == 'success' ? 'tab-active tab-bordered' : 'pb-[3px]'}" %>
diff --git a/config/dotenv.rb b/config/dotenv.rb
index cb0f8e7c..0a6aedf0 100644
--- a/config/dotenv.rb
+++ b/config/dotenv.rb
@@ -105,6 +105,6 @@ if ENV['REDIS_URL'].to_s.empty?
redis_password = Digest::SHA1.hexdigest("redis#{ENV.fetch('SECRET_KEY_BASE', '')}")
- ENV['REDIS_URL'] = "redis://default:#{redis_password}@0.0.0.0:6379/0"
+ ENV['REDIS_URL'] = "redis://default:#{redis_password}@127.0.0.1:16379/0"
ENV['LOCAL_REDIS_URL'] = ENV.fetch('REDIS_URL', nil)
end
diff --git a/config/initializers/autoload.rb b/config/initializers/autoload.rb
index 99dc4962..fd307b35 100644
--- a/config/initializers/autoload.rb
+++ b/config/initializers/autoload.rb
@@ -2,7 +2,7 @@
autoload :CSV, 'csv'
autoload :CSVSafe, 'csv-safe'
-autoload :RubyXL, 'rubyXL'
+autoload :Xlsxtream, 'xlsxtream'
autoload :Zip, 'zip'
autoload :Numo, 'numo/narray'
autoload :OnnxRuntime, 'onnxruntime'
diff --git a/config/locales/i18n.yml b/config/locales/i18n.yml
index 869795e2..9e20f38d 100644
--- a/config/locales/i18n.yml
+++ b/config/locales/i18n.yml
@@ -8034,7 +8034,7 @@ nl: &nl
awaiting: Wachten
document_id: Document-ID
envelope_id: Envelop-ID
- event_log: Gebeurtenissenlogboek
+ event_log: Gebeurtenislogboek
verify: Verifiëren
testing_log_not_for_production_use: Testlogboek - Niet voor productiegebruik
original_sha256: Oorspronkelijke SHA256
diff --git a/lib/puma/plugin/redis_server.rb b/lib/puma/plugin/redis_server.rb
index cad448f9..e7bf7f28 100644
--- a/lib/puma/plugin/redis_server.rb
+++ b/lib/puma/plugin/redis_server.rb
@@ -54,6 +54,7 @@ Puma::Plugin.create do
Dir.chdir(ENV.fetch('WORKDIR', nil)) unless ENV['WORKDIR'].to_s.empty?
exec('redis-server', '--requirepass', Digest::SHA1.hexdigest("redis#{ENV.fetch('SECRET_KEY_BASE', '')}"),
+ '--bind', '127.0.0.1', '--port', '16379',
'--loglevel', 'warning')
end
end
diff --git a/lib/submissions/generate_audit_trail.rb b/lib/submissions/generate_audit_trail.rb
index 1e7bc33d..17733511 100644
--- a/lib/submissions/generate_audit_trail.rb
+++ b/lib/submissions/generate_audit_trail.rb
@@ -62,7 +62,7 @@ module Submissions
ActiveStorage::Attachment.create!(
blob: ActiveStorage::Blob.create_and_upload!(
io: io.tap(&:rewind), filename: "#{I18n.t('audit_log')} - " \
- "#{submission.name || submission.template&.name}.pdf"
+ "#{submission.name || submission.template&.name}.pdf".tr('/', '-')
),
name: 'audit_trail',
record: submission
diff --git a/lib/submissions/generate_combined_attachment.rb b/lib/submissions/generate_combined_attachment.rb
index d8a60bf9..45aadb1c 100644
--- a/lib/submissions/generate_combined_attachment.rb
+++ b/lib/submissions/generate_combined_attachment.rb
@@ -37,7 +37,7 @@ module Submissions
ActiveStorage::Attachment.create!(
blob: ActiveStorage::Blob.create_and_upload!(
- io: io.tap(&:rewind), filename: "#{submission.name || submission.template&.name}.pdf"
+ io: io.tap(&:rewind), filename: "#{submission.name || submission.template&.name}.pdf".tr('/', '-')
),
name: with_audit ? 'combined_document' : 'merged_document',
record: submission
diff --git a/lib/submissions/generate_export_files.rb b/lib/submissions/generate_export_files.rb
index f1096db2..ee115a77 100644
--- a/lib/submissions/generate_export_files.rb
+++ b/lib/submissions/generate_export_files.rb
@@ -19,22 +19,19 @@ module Submissions
end
def rows_to_xlsx(rows)
- workbook = RubyXL::Workbook.new
- worksheet = workbook[0]
- worksheet.sheet_name = Time.current.to_date.to_s
-
headers = build_headers(rows)
- headers.each_with_index do |column_name, column_index|
- worksheet.add_cell(0, column_index, column_name)
- end
- rows.each.with_index(1) do |row, row_index|
- extract_columns(row, headers).each_with_index do |value, column_index|
- worksheet.add_cell(row_index, column_index, value)
+ io = StringIO.new
+
+ Xlsxtream::Workbook.open(io) do |workbook|
+ workbook.write_worksheet(Time.current.to_date.to_s) do |sheet|
+ sheet << headers.to_a
+
+ rows.each { |row| sheet << extract_columns(row, headers) }
end
end
- workbook.stream.string
+ io.string
end
def rows_to_csv(rows)
@@ -150,8 +147,6 @@ module Submissions
ActiveStorage::Blob.proxy_url(attachment.blob, expires_at:) if attachment
end
- elsif submitter_value == true || submitter_value == false
- submitter_value.to_s
else
submitter_value
end
diff --git a/lib/submissions/generate_preview_attachments.rb b/lib/submissions/generate_preview_attachments.rb
index eb9011db..a35d18f0 100644
--- a/lib/submissions/generate_preview_attachments.rb
+++ b/lib/submissions/generate_preview_attachments.rb
@@ -71,7 +71,7 @@ module Submissions
submission:,
values_hash:,
name: 'preview_merged_document',
- filename: "#{submission.name || template&.name}.pdf"
+ filename: "#{submission.name || template&.name}.pdf".tr('/', '-')
)
ApplicationRecord.no_touching { attachment.save! }
@@ -115,7 +115,7 @@ module Submissions
submitter:,
uuid: GenerateResultAttachments.images_pdf_uuid(original_documents.select(&:image?)),
values_hash:,
- filename: "#{submission.name || template&.name}.pdf"
+ filename: "#{submission.name || template&.name}.pdf".tr('/', '-')
)
ApplicationRecord.no_touching do
diff --git a/lib/submissions/generate_result_attachments.rb b/lib/submissions/generate_result_attachments.rb
index c221d38a..44a047de 100644
--- a/lib/submissions/generate_result_attachments.rb
+++ b/lib/submissions/generate_result_attachments.rb
@@ -814,7 +814,7 @@ module Submissions
end
ActiveStorage::Attachment.new(
- blob: ActiveStorage::Blob.create_and_upload!(io: io.tap(&:rewind), filename: "#{name}.pdf"),
+ blob: ActiveStorage::Blob.create_and_upload!(io: io.tap(&:rewind), filename: "#{name}.pdf".tr('/', '-')),
metadata: { original_uuid: uuid,
analyzed: true,
sha256: Base64.urlsafe_encode64(Digest::SHA256.digest(io.string)) },
diff --git a/lib/submitters.rb b/lib/submitters.rb
index 3ea1aa07..b8de2bde 100644
--- a/lib/submitters.rb
+++ b/lib/submitters.rb
@@ -165,6 +165,21 @@ module Submitters
preferences
end
+ def fetch_values_for_delegate(submitter)
+ fields = submitter.submission.template_fields || submitter.template.fields
+ default_values = submitter.preferences['default_values'] || {}
+
+ field_uuids = fields.filter_map do |field|
+ next if field['submitter_uuid'] != submitter.uuid
+ next unless field['type'].in?(%w[signature phone verification kba initials])
+ next if default_values[field['uuid']].present?
+
+ field['uuid']
+ end
+
+ submitter.values.except(*field_uuids)
+ end
+
def send_signature_requests(submitters, delay_seconds: nil)
submitters.each_with_index do |submitter, index|
next if submitter.email.blank?
@@ -238,7 +253,7 @@ module Submitters
I18n.l(completed_at.in_time_zone(submitter.account.timezone), format: :short)
end
- "#{filename}.#{blob.filename.extension}"
+ "#{filename}.#{blob.filename.extension}".tr('/', '-')
end
def send_shared_link_email_verification_code(submitter, request:)
diff --git a/lib/submitters/submit_values.rb b/lib/submitters/submit_values.rb
index 3686b71c..e4ef2030 100644
--- a/lib/submitters/submit_values.rb
+++ b/lib/submitters/submit_values.rb
@@ -490,7 +490,7 @@ module Submitters
submission.submitters.create!(uuid: s['uuid'], email:, phone:, account_id: submitter.account_id)
- SubmissionEvents.create_with_tracking_data(submitter, 'invite_party', request, { uuid: submitter.uuid })
+ SubmissionEvents.create_with_tracking_data(submitter, 'invite_party', request, { uuid: s['uuid'] })
is_invited = true
end
diff --git a/lib/templates/create_attachments.rb b/lib/templates/create_attachments.rb
index f5b47fd9..6f8f695d 100644
--- a/lib/templates/create_attachments.rb
+++ b/lib/templates/create_attachments.rb
@@ -76,7 +76,7 @@ module Templates
blob = ActiveStorage::Blob.create_and_upload!(
io: StringIO.new(document_data),
- filename: file.original_filename,
+ filename: file.original_filename.tr('/', '-'),
metadata: {
**metadata,
identified: file.content_type == PDF_CONTENT_TYPE,
diff --git a/lib/users.rb b/lib/users.rb
index 49989a4f..9508fb78 100644
--- a/lib/users.rb
+++ b/lib/users.rb
@@ -3,6 +3,10 @@
module Users
module_function
+ def send_emails?(user)
+ !user.archived_at?
+ end
+
def generate_csv(users)
headers = %w[email first_name last_name role current_sign_in_at last_sign_in_at updated_at created_at]