didadmin/docuseal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix pdf generation

Browse Source
This commit is contained in:
Alex Turchyn
2023-06-18 16:30:35 +03:00
parent 662d052904
commit 02fee9f885
9 changed files with 99 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/api/attachments_controller.rb
+1 -1
View File
@@ -5,7 +5,7 @@ module Api
skip_before_action :authenticate_user!
def create
submitter = Submitter.find_by!(slug: params[:submitter_slug]) unless current_account
submitter = Submitter.find_by!(slug: params[:submitter_slug])
blob = ActiveStorage::Blob.find_signed(params[:blob_signed_id])
app/controllers/submissions_controller.rb
+2 -2
View File
@@ -60,7 +60,7 @@ class SubmissionsController < ApplicationController
submissions_params[:submission].to_h.map do |_, attrs|
submission = @template.submissions.new
attrs[:submitters].each do |_, submitter_attrs|
attrs[:submitters].each do |submitter_attrs|
submission.submitters.new(**submitter_attrs, sent_at: params[:send_email] == '1' ? Time.current : nil)
end
@@ -69,7 +69,7 @@ class SubmissionsController < ApplicationController
end
def submissions_params
params.permit(submission: { submitters: %i[uuid email] })
params.permit(submission: { submitters: [%i[uuid email]] })
end
def load_template
app/controllers/submissions_debug_controller.rb
+2 -2
View File
@@ -12,10 +12,10 @@ class SubmissionsDebugController < ApplicationController
respond_to do |f|
f.html do
render 'submit_template/show'
render 'submit_form/show'
end
f.pdf do
Submissions::GenerateResultAttachments.call(@submitter.submission)
Submissions::GenerateResultAttachments.call(@submitter)
send_data ActiveStorage::Attachment.where(name: :documents).last.download,
filename: 'debug.pdf',
app/javascript/elements/dynamic_list.js
+3 -2
View File
@@ -4,7 +4,7 @@ import { targets, targetable } from '@github/catalyst/lib/targetable'
export default actionable(targetable(class extends HTMLElement {
static [targets.static] = ['items']
addItem = (e) => {
addItem (e) {
e.preventDefault()
const originalItem = this.items[0]
@@ -26,8 +26,9 @@ export default actionable(targetable(class extends HTMLElement {
originalItem.parentNode.append(duplicateItem)
}
removeItem = (e) => {
removeItem (e) {
e.preventDefault()
this.items.find((item) => item.contains(e.target))?.remove()
}
}))
app/javascript/submission_form/area.vue
+5 -7
View File
@@ -46,7 +46,7 @@
>
<div
v-else-if="field.type === 'file'"
class="px-0.5 flex items-center"
class="px-0.5 flex flex-col justify-center"
>
<a
v-for="(attachment, index) in attachments"
@@ -73,9 +73,8 @@
:checked="!!modelValue"
@click="$emit('update:model-value', !modelValue)"
>
<component
:is="modelValue ? 'IconCheckbox' : 'IconSquare'"
v-else
<IconCheck
v-else-if="modelValue"
class="aspect-square"
:class="{ '!w-auto !h-full': area.w > area.h, '!w-full !h-auto': area.w <= area.h }"
/>
@@ -98,14 +97,13 @@
</template>
<script>
import { IconTextSize, IconWriting, IconCalendarEvent, IconPhoto, IconCheckbox, IconPaperclip, IconSelect, IconCircleDot, IconChecks, IconSquare } from '@tabler/icons-vue'
import { IconTextSize, IconWriting, IconCalendarEvent, IconPhoto, IconCheckbox, IconPaperclip, IconSelect, IconCircleDot, IconChecks, IconCheck } from '@tabler/icons-vue'
export default {
name: 'FieldArea',
components: {
IconPaperclip,
IconCheckbox,
IconSquare
IconCheck
},
props: {
field: {
app/javascript/submission_form/completed.vue
+4 -5
View File
@@ -91,13 +91,12 @@ export default {
fetch(`/submitters/${this.submitterSlug}/download`).then((response) => response.json()).then((urls) => {
urls.forEach((url) => {
fetch(url).then(async (response) => {
const blob = new Blob([await response.text()], { type: `${response.headers.get('content-type')};charset=utf-8;` })
const url = URL.createObjectURL(blob)
fetch(url).then(async (resp) => {
const blobUrl = URL.createObjectURL(await resp.blob())
const link = document.createElement('a')
link.href = url
link.setAttribute('download', response.headers.get('content-disposition').split('"')[1])
link.href = blobUrl
link.setAttribute('download', resp.headers.get('content-disposition').split('"')[1])
link.click()
app/views/submissions/new.html.erb
+3 -3
View File
@@ -16,13 +16,13 @@
</a>
</div>
<div class="grid md:grid-cols-2 gap-4">
<% @template.submitters.each.with_index(1) do |item, index| %>
<% @template.submitters.each do |item| %>
<div class="form-control">
<label class="label">
<span class="label-text"> <%= item['name'] %></span>
</label>
<input type="hidden" name="submission[1][submitters][<%= index %>][uuid]" value="<%= item['uuid'] %>" >
<input type="email" name="submission[1][submitters][<%= index %>][email]" value="<%= item['email'] %>" class="input input-sm input-bordered" placeholder="Email" required>
<input type="hidden" name="submission[1][submitters][][uuid]" value="<%= item['uuid'] %>" >
<input type="email" name="submission[1][submitters][][email]" value="<%= item['email'] %>" class="input input-sm input-bordered" placeholder="Email" required>
</div>
<% end %>
</div>
lib/pdf_icons.rb
+3
View File
@@ -3,6 +3,9 @@
module PdfIcons
PATH = Rails.root.join('lib/pdf_icons')
WIDTH = 240
HEIGHT = 240
module_function
def check_io
lib/submissions/generate_result_attachments.rb
+76 -46
View File
@@ -2,13 +2,14 @@
module Submissions
module GenerateResultAttachments
FONT_SIZE = 12
FONT_SIZE = 11
FONT_NAME = 'Helvetica'
module_function
# rubocop:disable Metrics
def call(submitter)
layouter = HexaPDF::Layout::TextLayouter.new(valign: :center)
template = submitter.submission.template
cert = submitter.submission.template.account.encrypted_configs
@@ -36,61 +37,91 @@ module Submissions
attachment = submitter.attachments.find { |a| a.uuid == value }
io = StringIO.new(attachment.download)
Vips::Image.new_from_buffer(io.read, '')
scale = [(area['w'] * width) / attachment.metadata['width'],
(area['h'] * height) / attachment.metadata['height']].min
canvas.image(io, at: [area['x'] * width,
height - (area['y'] * height) -
(((attachment.metadata['height'] * scale) + (area['h'] * height)) / 2)],
width: attachment.metadata['width'] * scale,
height: attachment.metadata['height'] * scale)
canvas.image(
io,
at: [
(area['x'] * width) + (area['w'] * width / 2) - ((attachment.metadata['width'] * scale) / 2),
height - (area['y'] * height) - (attachment.metadata['height'] * scale / 2) - (area['h'] * height / 2)
],
width: attachment.metadata['width'] * scale,
height: attachment.metadata['height'] * scale
)
when 'file'
Array.wrap(value).each_with_index do |uuid, index|
page[:Annots] ||= []
items = Array.wrap(value).each_with_object([]) do |uuid, acc|
attachment = submitter.attachments.find { |a| a.uuid == uuid }
canvas.image(PdfIcons.paperclip_io,
at: [area['x'] * width,
height - ((area['y'] * height) + (1.2 * FONT_SIZE) - (FONT_SIZE * index))],
width: FONT_SIZE, height: FONT_SIZE)
acc << HexaPDF::Layout::InlineBox.create(width: FONT_SIZE, height: FONT_SIZE,
margin: [0, 1, -2, 0]) do |cv, box|
cv.image(PdfIcons.paperclip_io, at: [0, 0], width: box.content_width)
end
canvas.font(FONT_NAME, size: FONT_SIZE)
canvas.text(attachment.filename.to_s,
at: [(area['x'] * width) + FONT_SIZE,
height - ((area['y'] * height) + FONT_SIZE - (FONT_SIZE * index))])
page[:Annots] ||= []
page[:Annots] << pdf.add({
Type: :Annot, Subtype: :Link,
Rect: [
area['x'] * width,
height - (area['y'] * height),
(area['x'] * width) + (area['w'] * width),
height - (area['y'] * height) - FONT_SIZE
],
A: { Type: :Action, S: :URI, URI: attachment.url }
})
acc << HexaPDF::Layout::TextFragment.create("#{attachment.filename}\n", font: pdf.fonts.add(FONT_NAME),
font_size: FONT_SIZE)
end
lines = layouter.fit(items, area['w'] * width, height).lines
box_height = lines.sum(&:height)
height_diff = [0, box_height - (area['h'] * height)].max
lines.each_with_index.reduce(0) do |acc, (line, index)|
next acc unless line.items.first.is_a?(HexaPDF::Layout::InlineBox)
attachment_uuid = Array.wrap(value)[acc]
attachment = submitter.attachments.find { |a| a.uuid == attachment_uuid }
next_index =
lines[(index + 1)..].index { |l| l.items.first.is_a?(HexaPDF::Layout::InlineBox) } || (lines.size - 1)
page[:Annots] << pdf.add(
{
Type: :Annot, Subtype: :Link,
Rect: [
area['x'] * width,
height - (area['y'] * height) - lines[...index].sum(&:height) + height_diff,
(area['x'] * width) + (area['w'] * width),
height - (area['y'] * height) - lines[..next_index].sum(&:height) + height_diff
],
A: { Type: :Action, S: :URI, URI: attachment.url }
}
)
acc + 1
end
layouter.fit(items, area['w'] * width, height_diff.positive? ? box_height : area['h'] * height)
.draw(canvas, area['x'] * width, height - (area['y'] * height) + height_diff)
when 'checkbox'
Array.wrap(value).each_with_index do |value, index|
canvas.image(PdfIcons.check_io,
at: [area['x'] * width,
height - ((area['y'] * height) + (1.2 * FONT_SIZE) - (FONT_SIZE * index))],
width: FONT_SIZE, height: FONT_SIZE)
next unless value == true
canvas.font(FONT_NAME, size: FONT_SIZE)
canvas.text(value,
at: [(area['x'] * width) + FONT_SIZE,
height - ((area['y'] * height) + FONT_SIZE - (FONT_SIZE * index))])
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)])
scale = [(area['w'] * width) / PdfIcons::WIDTH, (area['h'] * height) / PdfIcons::HEIGHT].min
canvas.image(
PdfIcons.check_io,
at: [
(area['x'] * width) + (area['w'] * width / 2) - (PdfIcons::WIDTH * scale / 2),
height - (area['y'] * height) - (area['h'] * height / 2) - (PdfIcons::HEIGHT * scale / 2)
],
width: PdfIcons::WIDTH * scale,
height: PdfIcons::HEIGHT * scale
)
else
canvas.font(FONT_NAME, size: FONT_SIZE)
canvas.text(value.to_s, at: [area['x'] * width, height - ((area['y'] * height) + FONT_SIZE)])
value = I18n.l(Date.parse(value)) if field['type'] == 'date'
text = HexaPDF::Layout::TextFragment.create(Array.wrap(value).join(', '), font: pdf.fonts.add(FONT_NAME),
font_size: FONT_SIZE)
lines = layouter.fit([text], area['w'] * width, height).lines
box_height = lines.sum(&:height)
height_diff = [0, box_height - (area['h'] * height)].max
layouter.fit([text], area['w'] * width, height_diff.positive? ? box_height : area['h'] * height)
.draw(canvas, area['x'] * width, height - (area['y'] * height) + height_diff)
end
end
end
@@ -103,7 +134,6 @@ module Submissions
pdf = pdfs_index[item['attachment_uuid']]
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']),
certificate_chain: [OpenSSL::X509::Certificate.new(cert['sub_ca']),