diff --git a/app/javascript/submission_form/completed.vue b/app/javascript/submission_form/completed.vue index 00310eb4..67edd700 100644 --- a/app/javascript/submission_form/completed.vue +++ b/app/javascript/submission_form/completed.vue @@ -10,7 +10,7 @@ :height="30" /> - {{ completedMessage.title || t('form_has_been_completed') }} + {{ completedMessage.title || (hasSignatureFields ? (hasMultipleDocuments ? t('documents_have_been_signed') : t('document_has_been_signed')) : t('form_has_been_completed')) }}
<%= @submitter.submission.template.name %>
-<%= t('signed_on_time', time: l(@submitter.completed_at.to_date, format: :long)) %>
++ <%= t(@submitter.with_signature_fields? ? 'signed_on_time' : 'completed_on_time', time: l(@submitter.completed_at.to_date, format: :long)) %> +
<%= @submission.template.name %>
- <% if completed_at = @submission.submitters.map(&:completed_at).compact.max %> -<%= t('signed_on_time', time: l(completed_at.to_date, format: :long)) %>
+ <% last_submitter = @submission.submitters.completed.order(:completed_at).last %> + <% if last_submitter %> ++ <%= t(last_submitter.with_signature_fields? ? 'signed_on_time' : 'completed_on_time', time: l(last_submitter.completed_at.to_date, format: :long)) %> +
<% end %><%= @submitter.submission.template.name %>
-<%= t('signed_on_time', time: l(@submitter.completed_at.to_date, format: :long)) %>
++ <%= t(@submitter.with_signature_fields? ? 'signed_on_time' : 'completed_on_time', time: l(@submitter.completed_at.to_date, format: :long)) %> +