{{ t('complete_all_required_fields_to_proceed_with_identity_verification') }}
@@ -100,6 +100,9 @@ export default {
}
},
computed: {
+ isRequiredFieldEmpty () {
+ return this.emptyValueRequiredStep && this.emptyValueRequiredStep[0] !== this.field
+ },
countryCode () {
const browserTimeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
const browserTz = browserTimeZone.split('/')[1]
@@ -131,17 +134,19 @@ export default {
}
},
async mounted () {
- this.isLoading = true
+ if (!this.isRequiredFieldEmpty) {
+ this.isLoading = true
- if (new URLSearchParams(window.location.search).get('submit') === 'true') {
- this.$emit('submit')
- } else {
- Promise.all([
- import('@eid-easy/eideasy-widget'),
- this.start()
- ]).finally(() => {
- this.isLoading = false
- })
+ if (new URLSearchParams(window.location.search).get('submit') === 'true') {
+ this.$emit('submit')
+ } else {
+ Promise.all([
+ import('@eid-easy/eideasy-widget'),
+ this.start()
+ ]).finally(() => {
+ this.isLoading = false
+ })
+ }
}
},
methods: {
@@ -170,7 +175,7 @@ export default {
redirectUrl.searchParams.append('lang', this.locale)
this.redirectUrl = redirectUrl.toString()
- } else {
+ } else if (this.$refs.widgetContainer) {
const eidEasyWidget = document.createElement('eideasy-widget')
for (const key in this.widgetSettings) {
diff --git a/app/javascript/template_builder/area.vue b/app/javascript/template_builder/area.vue
index c786061a..d88475b3 100644
--- a/app/javascript/template_builder/area.vue
+++ b/app/javascript/template_builder/area.vue
@@ -10,7 +10,7 @@
diff --git a/app/views/shared/_github.html.erb b/app/views/shared/_github.html.erb
index df415db6..c07cc7cc 100644
--- a/app/views/shared/_github.html.erb
+++ b/app/views/shared/_github.html.erb
@@ -1,6 +1,6 @@
<%= svg_icon('start', class: 'h-3 w-3') %>
- 9k
+ 10k
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index dd124e46..6d66674c 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -61,7 +61,9 @@
<% if (can?(:manage, EncryptedConfig) && current_user == true_user) || (current_user != true_user && current_account.testing?) %>
<%= form_for '', url: testing_account_path, method: current_account.testing? ? :delete : :get, html: { class: 'w-full py-1' } do |f| %>
<% end %>
-
+
+
+
+
@@ -397,6 +439,16 @@ export default {
required: false,
default: false
},
+ pageWidth: {
+ type: Number,
+ required: false,
+ default: 0
+ },
+ pageHeight: {
+ type: Number,
+ required: false,
+ default: 0
+ },
defaultSubmitters: {
type: Array,
required: false,
@@ -436,8 +488,33 @@ export default {
fieldNames: FieldType.computed.fieldNames,
fieldLabels: FieldType.computed.fieldLabels,
fieldIcons: FieldType.computed.fieldIcons,
+ bgClasses () {
+ if (this.field.type === 'heading') {
+ return 'bg-gray-50'
+ } else if (this.field.type === 'strikethrough') {
+ return 'bg-transparent'
+ } else {
+ return this.bgColors[this.submitterIndex % this.bgColors.length]
+ }
+ },
+ activeBorderClasses () {
+ if (this.field.type === 'heading') {
+ return ''
+ } else if (this.field.type === 'strikethrough') {
+ return 'border-dashed border-gray-300'
+ } else {
+ return this.borderColors[this.submitterIndex % this.borderColors.length]
+ }
+ },
isWFullType () {
- return ['cells', 'checkbox', 'radio', 'multiple', 'select'].includes(this.field.type)
+ return ['cells', 'checkbox', 'radio', 'multiple', 'select', 'strikethrough'].includes(this.field.type)
+ },
+ strikethroughWidth () {
+ if (this.isInlineSize) {
+ return '0.6cqmin'
+ } else {
+ return 'clamp(0px, 0.5vw, 6px)'
+ }
},
fontStyle () {
let fontSize = ''
@@ -471,8 +548,11 @@ export default {
lineHeight () {
return 1.3
},
+ basePageWidth () {
+ return 1040.0
+ },
fontScale () {
- return 1040 / 612.0
+ return this.basePageWidth / 612.0
},
isDefaultValuePresent () {
return this.field?.default_value || this.field?.default_value === 0
@@ -742,8 +822,13 @@ export default {
delete this.field.options
}
- if (['heading'].includes(this.field.type)) {
+ if (this.field.type === 'heading') {
+ this.field.readonly = true
+ }
+
+ if (this.field.type === 'strikethrough') {
this.field.readonly = true
+ this.field.default_value = true
}
if (['select', 'multiple', 'radio'].includes(this.field.type)) {
diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index a9f3709b..c679a37e 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -402,7 +402,10 @@
:style="{ backgroundColor }"
>
<%= f.label :phone, t('phone'), class: 'label' %>
- <%= f.telephone_field :phone, value: params[:phone] || @submitter.phone, pattern: '^\+[0-9\s\-]+$', oninvalid: "this.value ? this.setCustomValidity('#{t('use_international_format_1xxx_')}') : ''", oninput: "this.setCustomValidity('')", required: true, class: 'base-input', placeholder: t(multiple_fields ? 'provide_your_phone_in_international_format' : 'provide_your_phone_in_international_format_to_start') %>
+
+ <%= f.telephone_field :phone, value: params[:phone] || @submitter.phone, pattern: '^\+[0-9\s\-]+$', required: true, class: 'base-input w-full', placeholder: t(multiple_fields ? 'provide_your_phone_in_international_format' : 'provide_your_phone_in_international_format_to_start') %>
+
<% end %>
<%= NumberUtils.format_number(value, field.dig('preferences', 'format')) %>
+ <% if (((1000.0 / local_assigns[:page_width]) * local_assigns[:page_height]) * area['h']) < 40 %>
+
+ <% else %>
+
+ <% end %>
+
<% else %>
diff --git a/app/views/submissions/show.html.erb b/app/views/submissions/show.html.erb
index eeb779e5..6f22607c 100644
--- a/app/views/submissions/show.html.erb
+++ b/app/views/submissions/show.html.erb
@@ -80,12 +80,12 @@
<% schema.each do |item| %>
<% document = @submission.schema_documents.find { |a| item['attachment_uuid'] == a.uuid } %>
<% if document.preview_images.first %>
- " onclick="[event.preventDefault(), window[event.target.closest('a').href.split('#')[1]].scrollIntoView({ behavior: 'smooth', block: 'start' })]" class="block cursor-pointer">
+
, expires_in: 10.minutes) { document.preview_images.first.url } %>)
+
<% end %>
<% end %>
@@ -123,7 +123,7 @@
<%= item['name'].presence || document.filename.base %>
-