-
- <% Array.wrap(@submission.values[field['uuid']]).each do |uuid| %>
-
-
- - <%= image_tag ActiveStorage::Attachment.find_by(uuid:).url %> --
+ <% @submission.submitters.each do |submitter| %>
+ <% Array.wrap(submitter.values[field['uuid']]).each do |uuid| %>
+
-
+ + <%= image_tag ActiveStorage::Attachment.find_by(uuid:).url %> ++
+ <% end %>
<% end %>
-
- <% Array.wrap(@submission.values[field['uuid']]).each do |uuid| %>
- <% attachment = ActiveStorage::Attachment.find_by(uuid:) %>
-
-
- - <%= svg_icon('paperclip', class: 'h-5 w-5 flex-shrink-0 text-gray-300') %> -diff --git a/app/views/submit_form/completed.html.erb b/app/views/submit_form/completed.html.erb index f95300a7..88bb2b15 100644 --- a/app/views/submit_form/completed.html.erb +++ b/app/views/submit_form/completed.html.erb @@ -1,5 +1,5 @@- - <%= attachment.filename %> - + <% @submission.submitters.each do |submitter| %> + <% Array.wrap(submitter.values[field['uuid']]).each do |uuid| %> + <% attachment = ActiveStorage::Attachment.find_by(uuid:) %> +-
- +
+ <%= svg_icon('paperclip', class: 'h-5 w-5 flex-shrink-0 text-gray-300') %> +++ + <%= attachment.filename %> + +++ <%= link_to 'Download', attachment.url, class: "font-medium text-indigo-600 hover:text-indigo-500" %>-- <%= link_to 'Download', attachment.url, class: "font-medium text-indigo-600 hover:text-indigo-500" %> -- + + <% end %> <% end %> <% else %> - <%= @submission.values[field['uuid']] %> + <% @submission.submitters.each do |submitter| %> + <%= submitter.values[field['uuid']] %> + <% end %> <% end %>Form completed - thanks!
-<%= button_to button_title(title: 'Send copy to Email', disabled_with: 'Sending'), send_submission_email_index_path, params: { submission_slug: @submission.slug }, form: { onsubmit: 'event.submitter.disabled = true' } %> -<%= button_to button_title(title: 'Download documents', disabled_with: 'Downloading'), submission_download_index_path(@submission.slug), method: :get, form: { onsubmit: 'event.submitter.disabled = true' } %> +<%= button_to button_title(title: 'Send copy to Email', disabled_with: 'Sending'), send_submission_email_index_path, params: { submitter_slug: @submitter.slug }, form: { onsubmit: 'event.submitter.disabled = true' } %> +<%= button_to button_title(title: 'Download documents', disabled_with: 'Downloading'), submitter_download_index_path(@submitter.slug), method: :get, form: { onsubmit: 'event.submitter.disabled = true' } %> diff --git a/app/views/submit_form/show.html.erb b/app/views/submit_form/show.html.erb index 330b96f2..918cf47e 100644 --- a/app/views/submit_form/show.html.erb +++ b/app/views/submit_form/show.html.erb @@ -1,8 +1,8 @@ -<% attachment_field_uuids = @submission.template.fields.select { |f| f['type'].in?(%w[image signature attachment]) }.pluck('uuid') %> -<% attachments = ActiveStorage::Attachment.where(uuid: @submission.values.values_at(*attachment_field_uuids).flatten).preload(:blob) %> +<% attachment_field_uuids = @submitter.submission.template.fields.select { |f| f['type'].in?(%w[image signature attachment]) }.pluck('uuid') %> +<% attachments = ActiveStorage::Attachment.where(uuid: @submitter.values.values_at(*attachment_field_uuids).flatten).preload(:blob) %>- <% @submission.template.schema.each do |item| %> - <% document = @submission.template.documents.find { |a| a.uuid == item['attachment_uuid'] } %> + <% @submitter.submission.template.schema.each do |item| %> + <% document = @submitter.submission.template.documents.find { |a| a.uuid == item['attachment_uuid'] } %> <% document.preview_images.sort_by { |a| a.filename.base.to_i }.each_with_index do |page, index| %>diff --git a/app/views/submitter_mailer/copy_to_submitter.html.erb b/app/views/submitter_mailer/copy_to_submitter.html.erb new file mode 100644 index 00000000..611c2398 --- /dev/null +++ b/app/views/submitter_mailer/copy_to_submitter.html.erb @@ -0,0 +1,3 @@ +@@ -12,7 +12,7 @@ <% end %>
-+ Hi +<%= @submitter.values %> +<%= link_to 'Download', submitter_download_index_url(@submitter.slug) %> diff --git a/app/views/submission_mailer/invitation_email.html.erb b/app/views/submitter_mailer/invitation_email.html.erb similarity index 53% rename from app/views/submission_mailer/invitation_email.html.erb rename to app/views/submitter_mailer/invitation_email.html.erb index 3c71c4c1..5dc22b60 100644 --- a/app/views/submission_mailer/invitation_email.html.erb +++ b/app/views/submitter_mailer/invitation_email.html.erb @@ -1,4 +1,4 @@ -
Hi there
+Hi there,
You have been invited to submit a form:
-<%= link_to 'Submit', submit_form_index_url(slug: @submission.slug) %>
+<%= link_to 'Submit', submit_form_url(slug: @submitter.slug) %>
If you didn't request this, please ignore this email.
diff --git a/config/initializers/active_storage.rb b/config/initializers/active_storage.rb index bf7bf83d..2cf7c277 100644 --- a/config/initializers/active_storage.rb +++ b/config/initializers/active_storage.rb @@ -13,7 +13,7 @@ Rails.configuration.to_prepare do LoadActiveStorageConfigs.call rescue StandardError => e - Rails.logger.debug(e) + Rails.logger.error(e) nil end diff --git a/config/initializers/field_error_proc.rb b/config/initializers/field_error_proc.rb index 2393455d..e47d6c49 100644 --- a/config/initializers/field_error_proc.rb +++ b/config/initializers/field_error_proc.rb @@ -10,10 +10,16 @@ ActionView::Base.field_error_proc = proc do |html_tag, instance| parsed_html_tag = Nokogiri::HTML::DocumentFragment.parse(html_tag) parsed_html_tag.children.add_class 'input-error' + # rubocop:disable Rails/OutputSafety html_tag = parsed_html_tag.to_s.html_safe + # rubocop:enable Rails/OutputSafety result = html_tag - result += ApplicationController.helpers.tag.label(ApplicationController.render(partial: 'shared/field_error', locals: { message: "#{field_name} #{errors}" }), class: 'label') if errors.present? + + if errors.present? + result += + ApplicationController.render(partial: 'shared/field_error', locals: { message: "#{field_name} #{errors}" }) + end result end diff --git a/config/routes.rb b/config/routes.rb index df2ef200..daa8fa4e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -34,11 +34,11 @@ Rails.application.routes.draw do resources :submissions, only: %i[index new create] end - resources :start_form, only: %i[show update], path: 'f', param: 'slug' do + resources :start_form, only: %i[show update], path: 't', param: 'slug' do get :completed end - resources :submit_form, only: %i[show update], path: 'l', param: 'slug' do + resources :submit_form, only: %i[show update], path: 's', param: 'slug' do get :completed end @@ -46,7 +46,7 @@ Rails.application.routes.draw do get :success, on: :collection end - resources :submissions, only: %i[], param: 'slug' do + resources :submitters, only: %i[], param: 'slug' do resources :download, only: %i[index], controller: 'submissions_download' resources :debug, only: %i[index], controller: 'submissions_debug' end diff --git a/db/migrate/20230519144036_create_submissions.rb b/db/migrate/20230519144036_create_submissions.rb index d482bffe..2dcd103d 100644 --- a/db/migrate/20230519144036_create_submissions.rb +++ b/db/migrate/20230519144036_create_submissions.rb @@ -3,16 +3,8 @@ class CreateSubmissions < ActiveRecord::Migration[7.0] def change create_table :submissions do |t| - t.string :email, null: false, index: true - t.string :slug, null: false, index: { unique: true } t.references :template, null: false, foreign_key: true, index: true - t.string :values, null: false - t.string :ua - t.string :ip - t.datetime :sent_at - t.datetime :opened_at - t.datetime :completed_at t.datetime :deleted_at t.timestamps diff --git a/db/migrate/20230612182744_create_submitters.rb b/db/migrate/20230612182744_create_submitters.rb new file mode 100644 index 00000000..0bf4a45a --- /dev/null +++ b/db/migrate/20230612182744_create_submitters.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +class CreateSubmitters < ActiveRecord::Migration[7.0] + def change + create_table :submitters do |t| + t.references :submission, null: false, foreign_key: true, index: true + + t.string :uuid, null: false + t.string :email, null: false, index: true + t.string :slug, null: false, index: { unique: true } + t.string :values, null: false + t.string :ua + t.string :ip + + t.datetime :sent_at + t.datetime :opened_at + t.datetime :completed_at + + t.timestamps + end + end +end diff --git a/db/schema.rb b/db/schema.rb index da90df29..14ac7708 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema[7.0].define(version: 2023_05_19_144036) do +ActiveRecord::Schema[7.0].define(version: 2023_06_12_182744) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -61,21 +61,29 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_19_144036) do end create_table "submissions", force: :cascade do |t| + t.bigint "template_id", null: false + t.datetime "deleted_at" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + t.index ["template_id"], name: "index_submissions_on_template_id" + end + + create_table "submitters", force: :cascade do |t| + t.bigint "submission_id", null: false + t.string "uuid", null: false t.string "email", null: false t.string "slug", null: false - t.bigint "template_id", null: false t.string "values", null: false t.string "ua" t.string "ip" t.datetime "sent_at" t.datetime "opened_at" t.datetime "completed_at" - t.datetime "deleted_at" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index ["email"], name: "index_submissions_on_email" - t.index ["slug"], name: "index_submissions_on_slug", unique: true - t.index ["template_id"], name: "index_submissions_on_template_id" + t.index ["email"], name: "index_submitters_on_email" + t.index ["slug"], name: "index_submitters_on_slug", unique: true + t.index ["submission_id"], name: "index_submitters_on_submission_id" end create_table "templates", force: :cascade do |t| @@ -125,6 +133,7 @@ ActiveRecord::Schema[7.0].define(version: 2023_05_19_144036) do add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id" add_foreign_key "encrypted_configs", "accounts" add_foreign_key "submissions", "templates" + add_foreign_key "submitters", "submissions" add_foreign_key "templates", "accounts" add_foreign_key "templates", "users", column: "author_id" add_foreign_key "users", "accounts" diff --git a/lib/submissions/generate_result_attachments.rb b/lib/submissions/generate_result_attachments.rb index 014c42ac..643648ff 100644 --- a/lib/submissions/generate_result_attachments.rb +++ b/lib/submissions/generate_result_attachments.rb @@ -8,19 +8,18 @@ module Submissions module_function # rubocop:disable Metrics - def call(submission) - cert = submission.template.account.encrypted_configs - .find_by(key: EncryptedConfig::ESIGN_CERTS_KEY).value + def call(submitter) + template = submitter.submission.template + + cert = submitter.submission.template.account.encrypted_configs + .find_by(key: EncryptedConfig::ESIGN_CERTS_KEY).value zip_file = Tempfile.new zip_stream = Zip::ZipOutputStream.open(zip_file) - pdfs_index = - submission.template.documents.to_h do |attachment| - [attachment.uuid, HexaPDF::Document.new(io: StringIO.new(attachment.download))] - end + pdfs_index = build_pdfs_index(submitter) - submission.template.fields.each do |field| + template.fields.each do |field| field.fetch('areas', []).each do |area| pdf = pdfs_index[area['attachment_uuid']] @@ -29,7 +28,7 @@ module Submissions width = page.box.width height = page.box.height - value = submission.values[field['uuid']] + value = submitter.values[field['uuid']] canvas = page.canvas(type: :overlay) @@ -88,7 +87,8 @@ module Submissions end when 'date' canvas.font(FONT_NAME, size: FONT_SIZE) - canvas.text(I18n.l(Date.parse(value)), at: [area['x'] * width, height - ((area['y'] * height) + FONT_SIZE)]) + canvas.text(I18n.l(Date.parse(value)), + at: [area['x'] * width, height - ((area['y'] * height) + FONT_SIZE)]) else canvas.font(FONT_NAME, size: FONT_SIZE) canvas.text(value.to_s, at: [area['x'] * width, height - ((area['y'] * height) + FONT_SIZE)]) @@ -96,14 +96,14 @@ module Submissions end end - submission.template.schema.map do |item| - document = submission.template.documents.find { |a| a.uuid == item['attachment_uuid'] } + template.schema.map do |item| + template.documents.find { |a| a.uuid == item['attachment_uuid'] } io = StringIO.new pdf = pdfs_index[item['attachment_uuid']] - pdf.sign(io, reason: "Signed by #{submission.email}", + pdf.sign(io, reason: "Signed by #{submitter.email}", # doc_mdp_permissions: :no_changes, certificate: OpenSSL::X509::Certificate.new(cert['cert']), key: OpenSSL::PKey::RSA.new(cert['key']), @@ -113,13 +113,33 @@ module Submissions zip_stream.put_next_entry("#{item['name']}.pdf") zip_stream.write(io.string) - submission.documents.attach(io: StringIO.new(io.string), filename: document.filename) + ActiveStorage::Attachment.create!( + uuid: item['attachment_uuid'], + blob: ActiveStorage::Blob.create_and_upload!( + io: StringIO.new(io.string), filename: "#{item['name']}.pdf" + ), + name: 'documents', + record: submitter + ) end zip_stream.close - submission.archive.attach(io: zip_file, filename: "#{submission.template.name}.zip") + submitter.archive.attach(io: zip_file, filename: "#{template.name}.zip") end # rubocop:enable Metrics + + def build_pdfs_index(submitter) + latest_submitter = submitter.submission.submitters + .select { |e| e.id != submitter.id && e.completed_at? } + .max_by(&:completed_at) + + documents = latest_submitter&.documents.to_a.presence + documents ||= submitter.submission.template.documents + + documents.to_h do |attachment| + [attachment.uuid, HexaPDF::Document.new(io: StringIO.new(attachment.download))] + end + end end end - +