- {{ t('reason') }}: {{ t('digitally_signed_by') }} {{ submitter.name }}
+ {{ t('reason') }}: {{ values[field.preferences?.reason_field_uuid] || t('digitally_signed_by') }} {{ submitter.name }}
<{{ submitter.email }}>
@@ -258,6 +258,11 @@ export default {
required: false,
default: ''
},
+ values: {
+ type: Object,
+ required: false,
+ default: () => ({})
+ },
isActive: {
type: Boolean,
required: false,
diff --git a/app/javascript/submission_form/areas.vue b/app/javascript/submission_form/areas.vue
index 6e68efd0..7f72a629 100644
--- a/app/javascript/submission_form/areas.vue
+++ b/app/javascript/submission_form/areas.vue
@@ -1,6 +1,6 @@
diff --git a/app/javascript/submission_form/form.vue b/app/javascript/submission_form/form.vue
index 7e5147ed..c84c7eb1 100644
--- a/app/javascript/submission_form/form.vue
+++ b/app/javascript/submission_form/form.vue
@@ -327,17 +327,20 @@
ref="currentStep"
:key="currentField.uuid"
v-model="values[currentField.uuid]"
+ :reason="values[currentField.preferences?.reason_field_uuid]"
:field="currentField"
:previous-value="previousSignatureValueFor(currentField) || previousSignatureValue"
:with-typed-signature="withTypedSignature"
:remember-signature="rememberSignature"
:attachments-index="attachmentsIndex"
+ :require-signing-reason="requireSigningReason"
:button-text="buttonText"
:dry-run="dryRun"
:with-disclosure="withDisclosure"
:with-qr-button="withQrButton"
:submitter="submitter"
:show-field-names="showFieldNames"
+ @update:reason="values[currentField.preferences?.reason_field_uuid] = $event"
@attached="attachments.push($event)"
@start="scrollIntoField(currentField)"
@minimize="isFormVisible = false"
@@ -450,7 +453,7 @@
href="#"
class="inline border border-base-300 h-3 w-3 rounded-full mx-1 mt-1"
:class="{ 'bg-base-300': index === currentStep, 'bg-base-content': (index < currentStep && stepFields[index].every((f) => !f.required || ![null, undefined, ''].includes(values[f.uuid]))) || isCompleted, 'bg-white': index > currentStep }"
- @click.prevent="isCompleted ? '' : [saveStep(), goToStep(step, true)]"
+ @click.prevent="isCompleted ? '' : [saveStep(), goToStep(index, true)]"
/>
@@ -549,6 +552,11 @@ export default {
required: false,
default: '-80px'
},
+ requireSigningReason: {
+ type: Boolean,
+ required: false,
+ default: false
+ },
canSendEmail: {
type: Boolean,
required: false,
@@ -915,18 +923,22 @@ export default {
checkFieldConditions (field) {
if (field.conditions?.length) {
return field.conditions.reduce((acc, c) => {
+ const field = this.fieldsUuidIndex[c.field_uuid]
+
+ if (['not_empty', 'checked', 'equal', 'contains'].includes(c.action) && field && !this.checkFieldConditions(field)) {
+ return false
+ }
+
if (['empty', 'unchecked'].includes(c.action)) {
return acc && isEmpty(this.values[c.field_uuid])
} else if (['not_empty', 'checked'].includes(c.action)) {
return acc && !isEmpty(this.values[c.field_uuid])
} else if (['equal', 'contains'].includes(c.action)) {
- const field = this.fieldsUuidIndex[c.field_uuid]
const option = field.options.find((o) => o.uuid === c.value)
const values = [this.values[c.field_uuid]].flat()
return acc && values.includes(this.optionValue(option, field.options.indexOf(option)))
} else if (['not_equal', 'does_not_contain'].includes(c.action)) {
- const field = this.fieldsUuidIndex[c.field_uuid]
const option = field.options.find((o) => o.uuid === c.value)
const values = [this.values[c.field_uuid]].flat()
@@ -1016,8 +1028,8 @@ export default {
return null
}
},
- goToStep (step, scrollToArea = false, clickUpload = false) {
- this.currentStep = this.stepFields.indexOf(step)
+ goToStep (stepIndex, scrollToArea = false, clickUpload = false) {
+ this.currentStep = stepIndex
this.showFillAllRequiredFields = false
this.$nextTick(() => {
@@ -1025,7 +1037,7 @@ export default {
if (!this.isCompleted) {
if (scrollToArea) {
- this.scrollIntoField(step[0])
+ this.scrollIntoField(this.currentField)
}
this.enableScrollIntoField = false
@@ -1132,7 +1144,7 @@ export default {
this.isFormVisible = false
}
- this.goToStep(nextStep, this.autoscrollFields)
+ this.goToStep(this.stepFields.indexOf(nextStep), this.autoscrollFields)
if (emptyRequiredField === nextStep) {
this.showFillAllRequiredFields = true
diff --git a/app/javascript/submission_form/i18n.js b/app/javascript/submission_form/i18n.js
index 30730517..d5c65791 100644
--- a/app/javascript/submission_form/i18n.js
+++ b/app/javascript/submission_form/i18n.js
@@ -6,6 +6,14 @@ const en = {
signature: 'Signature',
initials: 'Initials',
drawn_signature_on_a_touchscreen_device: 'Drawn signature on a touchscreen device',
+ approved: 'Approved',
+ reviewed: 'Reviewed',
+ other: 'Other',
+ authored_by_me: 'Authored by me',
+ approved_by: 'Approved by',
+ reviewed_by: 'Reviewed by',
+ authored_by: 'Authored by',
+ select_a_reason: 'Select a reason',
scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: 'Scan the QR code with the camera app to open the form on mobile and draw your signature',
date: 'Date',
number: 'Number',
@@ -77,6 +85,14 @@ const en = {
}
const es = {
+ approved: 'Aprobado',
+ reviewed: 'Revisado',
+ other: 'Otro',
+ authored_by_me: 'Escrito por mí',
+ approved_by: 'Aprobado por',
+ reviewed_by: 'Revisado por',
+ authored_by: 'Escrito por',
+ select_a_reason: 'Selecciona una razón',
value_is_invalid: 'El valor no es válido',
verification_code_is_invalid: 'El código de verificación no es válido',
drawn_signature_on_a_touchscreen_device: 'Firma dibujada en un dispositivo con pantalla táctil',
@@ -154,6 +170,14 @@ const es = {
}
const it = {
+ approved: 'Approvato',
+ reviewed: 'Revisionato',
+ other: 'Altro',
+ authored_by_me: 'Creato da me',
+ approved_by: 'Approvato da',
+ reviewed_by: 'Revisionato da',
+ authored_by: 'Creato da',
+ select_a_reason: 'Seleziona una ragione',
value_is_invalid: 'Il valore non è valido',
verification_code_is_invalid: 'Il codice di verifica non è valido',
drawn_signature_on_a_touchscreen_device: 'Firma disegnata su un dispositivo con schermo tattile',
@@ -231,6 +255,14 @@ const it = {
}
const de = {
+ approved: 'Genehmigt',
+ reviewed: 'Überprüft',
+ other: 'Andere',
+ authored_by_me: 'Von mir verfasst',
+ approved_by: 'Genehmigt von',
+ reviewed_by: 'Überprüft von',
+ authored_by: 'Verfasst von',
+ select_a_reason: 'Grund auswählen',
value_is_invalid: 'Wert ist ungültig',
verification_code_is_invalid: 'Bestätigungscode ist ungültig',
drawn_signature_on_a_touchscreen_device: 'Gezeichnete Unterschrift auf einem Touchscreen-Gerät',
@@ -308,6 +340,14 @@ const de = {
}
const fr = {
+ approved: 'Approuvé',
+ reviewed: 'Révisé',
+ other: 'Autre',
+ authored_by_me: 'Rédigé par moi',
+ approved_by: 'Approuvé par',
+ reviewed_by: 'Révisé par',
+ authored_by: 'Rédigé par',
+ select_a_reason: 'Sélectionnez une raison',
value_is_invalid: 'La valeur est invalide',
verification_code_is_invalid: 'Le code de vérification est invalide',
drawn_signature_on_a_touchscreen_device: 'Signature dessinée sur un appareil à écran tactile',
@@ -385,6 +425,14 @@ const fr = {
}
const pl = {
+ approved: 'Zaakceptowany',
+ reviewed: 'Przejrzany',
+ other: 'Inny',
+ authored_by_me: 'Napisane przeze mnie',
+ approved_by: 'Zaakceptowany przez',
+ reviewed_by: 'Przejrzany przez',
+ authored_by: 'Napisane przez',
+ select_a_reason: 'Wybierz powód',
value_is_invalid: 'Wartość jest nieprawidłowa',
verification_code_is_invalid: 'Kod weryfikacyjny jest nieprawidłowy',
drawn_signature_on_a_touchscreen_device: 'Podpis odręczny na urządzeniu z ekranem dotykowym',
@@ -462,6 +510,14 @@ const pl = {
}
const uk = {
+ approved: 'Затверджено',
+ reviewed: 'Переглянуто',
+ other: 'Інше',
+ authored_by_me: 'Авторство моє',
+ approved_by: 'Затверджено',
+ reviewed_by: 'Переглянуто',
+ authored_by: 'Автор',
+ select_a_reason: 'Виберіть причину',
value_is_invalid: 'Значення є неправильним',
verification_code_is_invalid: 'Код підтвердження є неправильним',
drawn_signature_on_a_touchscreen_device: 'Підпис на сенсорному пристрої',
@@ -539,6 +595,14 @@ const uk = {
}
const cs = {
+ approved: 'Schváleno',
+ reviewed: 'Zkontrolováno',
+ other: 'Jiné',
+ authored_by_me: 'Autorem jsem já',
+ approved_by: 'Schváleno kým',
+ reviewed_by: 'Zkontrolováno kým',
+ authored_by: 'Autorem',
+ select_a_reason: 'Vyberte důvod',
value_is_invalid: 'Hodnota je neplatná',
verification_code_is_invalid: 'Ověřovací kód je neplatný',
drawn_signature_on_a_touchscreen_device: 'Namalovaný podpis na dotykovém zařízení',
@@ -616,6 +680,14 @@ const cs = {
}
const pt = {
+ approved: 'Aprovado',
+ reviewed: 'Revisado',
+ other: 'Outro',
+ authored_by_me: 'Autorizado por mim',
+ approved_by: 'Aprovado por',
+ reviewed_by: 'Revisado por',
+ authored_by: 'Autorizado por',
+ select_a_reason: 'Selecione um motivo',
value_is_invalid: 'Valor é inválido',
verification_code_is_invalid: 'Código de verificação é inválido',
drawn_signature_on_a_touchscreen_device: 'Assinatura desenhada em um dispositivo com tela sensível ao toque',
@@ -693,6 +765,14 @@ const pt = {
}
const he = {
+ approved: 'מאושר',
+ reviewed: 'נסקר',
+ other: 'אחר',
+ authored_by_me: 'נכתב על ידי',
+ approved_by: 'אושר על ידי',
+ reviewed_by: 'נסקר על ידי',
+ authored_by: 'נכתב על ידי',
+ select_a_reason: 'בחר סיבה',
value_is_invalid: 'ערך לא תקין',
verification_code_is_invalid: 'קוד האימות אינו תקין',
drawn_signature_on_a_touchscreen_device: 'חתימה שנוצרה במכשיר עם מסך מגע',
@@ -771,6 +851,14 @@ const he = {
}
const nl = {
+ approved: 'Goedgekeurd',
+ reviewed: 'Beoordeeld',
+ other: 'Anders',
+ authored_by_me: 'Door mij geschreven',
+ approved_by: 'Goedgekeurd door',
+ reviewed_by: 'Beoordeeld door',
+ authored_by: 'Geschreven door',
+ select_a_reason: 'Selecteer een reden',
value_is_invalid: 'Waarde is ongeldig',
verification_code_is_invalid: 'Verificatiecode is ongeldig',
drawn_signature_on_a_touchscreen_device: 'Getekende handtekening op een apparaat met een touchscreen',
@@ -849,6 +937,14 @@ const nl = {
}
const ar = {
+ approved: 'موافق عليه',
+ reviewed: 'تمت مراجعته',
+ other: 'آخر',
+ authored_by_me: 'مؤلف بواسطتي',
+ approved_by: 'موافق عليه من قبل',
+ reviewed_by: 'مراجع من قبل',
+ authored_by: 'مؤلف من قبل',
+ select_a_reason: 'اختر سببًا',
value_is_invalid: 'القيمة غير صالحة',
verification_code_is_invalid: 'رمز التحقق غير صالح',
drawn_signature_on_a_touchscreen_device: 'توقيع مرسوم على جهاز بشاشة تعمل باللمس',
@@ -926,6 +1022,14 @@ const ar = {
}
const ko = {
+ approved: '승인됨',
+ reviewed: '검토됨',
+ other: '기타',
+ authored_by_me: '내가 작성한',
+ approved_by: '승인자',
+ reviewed_by: '검토자',
+ authored_by: '작성자',
+ select_a_reason: '이유 선택',
drawn_signature_on_a_touchscreen_device: '터치스크린 장치에서 그린 서명',
scan_the_qr_code_with_the_camera_app_to_open_the_form_on_mobile_and_draw_your_signature: '카메라 앱으로 QR 코드를 스캔하여 모바일에서 양식을 열고 서명을 그리세요',
by_clicking_you_agree_to_the: '"{button}"를 클릭함으로써, 다음에 동의하게 됩니다',
diff --git a/app/javascript/submission_form/signature_step.vue b/app/javascript/submission_form/signature_step.vue
index 47a19648..0988ee10 100644
--- a/app/javascript/submission_form/signature_step.vue
+++ b/app/javascript/submission_form/signature_step.vue
@@ -194,6 +194,48 @@
type="text"
@input="updateWrittenSignature"
>
+ {
if (this.$refs.canvas) {
diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index 6d782b66..343f0673 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -435,6 +435,7 @@ export default {
save: this.save,
t: this.t,
currencies: this.currencies,
+ locale: this.locale,
baseFetch: this.baseFetch,
fieldTypes: this.fieldTypes,
backgroundColor: this.backgroundColor,
@@ -468,6 +469,11 @@ export default {
required: false,
default: ''
},
+ locale: {
+ type: String,
+ required: false,
+ default: ''
+ },
editable: {
type: Boolean,
required: false,
@@ -649,6 +655,20 @@ export default {
computed: {
selectedAreaRef: () => ref(),
fieldsDragFieldRef: () => ref(),
+ defaultDateFormat () {
+ const isUsBrowser = Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US')
+ const isUsTimezone = new Intl.DateTimeFormat('en-US', { timeZoneName: 'short' }).format(new Date()).match(/\s(?:CST|CDT|PST|PDT|EST|EDT)$/)
+
+ return this.localeDateFormats[this.locale] || ((isUsBrowser || isUsTimezone) ? 'MM/DD/YYYY' : 'DD/MM/YYYY')
+ },
+ localeDateFormats () {
+ return {
+ 'de-DE': 'DD.MM.YYYY',
+ 'fr-FR': 'DD/MM/YYYY',
+ 'it-IT': 'DD/MM/YYYY',
+ 'es-ES': 'DD/MM/YYYY'
+ }
+ },
fieldAreasIndex () {
const areas = {}
@@ -768,7 +788,7 @@ export default {
if (type === 'date') {
field.preferences = {
- format: Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') || new Intl.DateTimeFormat('en-US', { timeZoneName: 'short' }).format(new Date()).match(/\s(?:CST|CDT|PST|PDT|EST|EDT)$/) ? 'MM/DD/YYYY' : 'DD/MM/YYYY'
+ format: this.defaultDateFormat
}
}
@@ -801,7 +821,7 @@ export default {
if (type === 'date') {
field.preferences = {
- format: Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') || new Intl.DateTimeFormat('en-US', { timeZoneName: 'short' }).format(new Date()).match(/\s(?:CST|CDT|PST|PDT|EST|EDT)$/) ? 'MM/DD/YYYY' : 'DD/MM/YYYY'
+ format: this.defaultDateFormat
}
}
@@ -1138,7 +1158,7 @@ export default {
if (field.type === 'date') {
field.preferences = {
- format: Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') || new Intl.DateTimeFormat('en-US', { timeZoneName: 'short' }).format(new Date()).match(/\s(?:CST|CDT|PST|PDT|EST|EDT)$/) ? 'MM/DD/YYYY' : 'DD/MM/YYYY'
+ format: this.defaultDateFormat
}
}
}
diff --git a/app/javascript/template_builder/field.vue b/app/javascript/template_builder/field.vue
index 3cbde2da..73001e1e 100644
--- a/app/javascript/template_builder/field.vue
+++ b/app/javascript/template_builder/field.vue
@@ -130,6 +130,7 @@
@click-description="isShowDescriptionModal = true"
@click-condition="isShowConditionsModal = true"
@set-draw="$emit('set-draw', $event)"
+ @remove-area="removeArea"
@scroll-to="$emit('scroll-to', $event)"
/>
@@ -281,7 +282,7 @@ export default {
IconMathFunction,
FieldType
},
- inject: ['template', 'save', 'backgroundColor', 'selectedAreaRef', 't'],
+ inject: ['template', 'save', 'backgroundColor', 'selectedAreaRef', 't', 'locale'],
props: {
field: {
type: Object,
@@ -341,10 +342,15 @@ export default {
if (this.field.type === 'date') {
this.field.preferences.format ||=
- (Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') || new Intl.DateTimeFormat('en-US', { timeZoneName: 'short' }).format(new Date()).match(/\s(?:CST|CDT|PST|PDT|EST|EDT)$/) ? 'MM/DD/YYYY' : 'DD/MM/YYYY')
+ ({ 'de-DE': 'DD.MM.YYYY' }[this.locale] || ((Intl.DateTimeFormat().resolvedOptions().locale.endsWith('-US') || new Intl.DateTimeFormat('en-US', { timeZoneName: 'short' }).format(new Date()).match(/\s(?:CST|CDT|PST|PDT|EST|EDT)$/)) ? 'MM/DD/YYYY' : 'DD/MM/YYYY'))
}
},
methods: {
+ removeArea (area) {
+ this.field.areas.splice(this.field.areas.indexOf(area), 1)
+
+ this.save()
+ },
buildDefaultName (field, fields) {
if (field.type === 'payment' && field.preferences?.price && !field.preferences?.formula) {
const { price, currency } = field.preferences || {}
diff --git a/app/javascript/template_builder/field_settings.vue b/app/javascript/template_builder/field_settings.vue
index ec0f910f..a2340027 100644
--- a/app/javascript/template_builder/field_settings.vue
+++ b/app/javascript/template_builder/field_settings.vue
@@ -358,7 +358,7 @@
>
{{ t('page') }}
{{ template.schema.findIndex((item) => item.attachment_uuid === area.attachment_uuid) + 1 }}-{{ area.page + 1 }}
+
@@ -399,7 +404,7 @@