From 992706144bf6445bf81911c799cf22443725b4a2 Mon Sep 17 00:00:00 2001 From: Alex Turchyn Date: Wed, 14 Jun 2023 02:08:26 +0300 Subject: [PATCH] fix start form --- app/controllers/start_form_controller.rb | 2 +- lib/submissions/generate_result_attachments.rb | 4 ++-- tailwind.form.config.js | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/start_form_controller.rb b/app/controllers/start_form_controller.rb index e7f2d160..bdde91a0 100644 --- a/app/controllers/start_form_controller.rb +++ b/app/controllers/start_form_controller.rb @@ -12,7 +12,7 @@ class StartFormController < ApplicationController end def update - @submitter = Submitter.where(submission: @template.submissions.where(submission: { deleted_at: nil })) + @submitter = Submitter.where(submission: @template.submissions.where(deleted_at: nil)) .find_or_initialize_by(**submitter_params) if @submitter.completed_at? diff --git a/lib/submissions/generate_result_attachments.rb b/lib/submissions/generate_result_attachments.rb index 643648ff..3503e58f 100644 --- a/lib/submissions/generate_result_attachments.rb +++ b/lib/submissions/generate_result_attachments.rb @@ -34,7 +34,7 @@ module Submissions case field['type'] when 'image', 'signature' - attachment = submission.attachments.find { |a| a.uuid == value } + attachment = submitter.attachments.find { |a| a.uuid == value } io = StringIO.new(attachment.download) Vips::Image.new_from_buffer(io.read, '') @@ -49,7 +49,7 @@ module Submissions height: attachment.metadata['height'] * scale) when 'file' Array.wrap(value).each_with_index do |uuid, index| - attachment = submission.attachments.find { |a| a.uuid == uuid } + attachment = submitter.attachments.find { |a| a.uuid == uuid } canvas.image(PdfIcons.paperclip_io, at: [area['x'] * width, diff --git a/tailwind.form.config.js b/tailwind.form.config.js index ec4bcb6d..3725b4f8 100644 --- a/tailwind.form.config.js +++ b/tailwind.form.config.js @@ -6,6 +6,7 @@ module.exports = { './app/javascript/submission_form/**/*.vue', './app/views/submit_form/**/*.erb', './app/views/start_form/**/*.erb', + './app/views/shared/_button_title.html.erb', './app/views/send_submission_copy/**/*.erb' ] }