diff --git a/app/controllers/api/submitters_controller.rb b/app/controllers/api/submitters_controller.rb index eee1e835c..5b91fec68 100644 --- a/app/controllers/api/submitters_controller.rb +++ b/app/controllers/api/submitters_controller.rb @@ -158,7 +158,9 @@ module Api if attrs[:completed] submitter.values = Submitters::SubmitValues.merge_default_values(submitter) - submitter.values = Submitters::SubmitValues.maybe_remove_condition_values(submitter) + submitter.values = Submitters::SubmitValues.maybe_remove_condition_values( + submitter, formula_values: Submitters::SubmitValues.build_formula_values(submitter) + ) formula_values = Submitters::SubmitValues.build_formula_values(submitter) diff --git a/app/javascript/submission_form/form.vue b/app/javascript/submission_form/form.vue index bf8ca66cb..8bdc64960 100644 --- a/app/javascript/submission_form/form.vue +++ b/app/javascript/submission_form/form.vue @@ -1093,7 +1093,8 @@ export default { submittedValues: {}, isFormStarted: false, recalculateButtonDisabledKey: '', - isAccessibilityMode: false + isAccessibilityMode: false, + isMathLoaded: false } }, computed: { @@ -1197,6 +1198,24 @@ export default { return acc }, {}) }, + formulaFieldsUuidIndex () { + return this.fields.reduce((acc, f) => { + if (f.preferences?.formula && f.type !== 'payment') { + acc[f.uuid] = f + } + + return acc + }, {}) + }, + readonlyValues () { + return this.fields.reduce((acc, f) => { + if (f.readonly) { + acc[f.uuid] = isEmpty(this.values[f.uuid]) ? f.default_value : this.values[f.uuid] + } + + return acc + }, {}) + }, previousInitialsValue () { if (this.reuseSignature !== false) { const initialsField = this.fields.findLast @@ -1449,6 +1468,16 @@ export default { }) }, methods: { + normalizeFormula: FormulaFieldAreas.methods.normalizeFormula, + calculateFormula: FormulaFieldAreas.methods.calculateFormula, + dateFormulaValue: FormulaFieldAreas.methods.dateFormulaValue, + evalTextFormula: FormulaFieldAreas.methods.evalTextFormula, + loadCalculator () { + this.calculatorPromise ||= import('./calculator').then(({ Calculator }) => { + this.math = new Calculator() + this.isMathLoaded = true + }) + }, t (key) { return this.i18n[key] || i18n[this.language?.toLowerCase()]?.[key] || i18n[this.browserLanguage]?.[key] || i18n.en[key] || key }, @@ -1497,17 +1526,25 @@ export default { } const defaultValue = !field || isEmpty(field.default_value) ? null : field.default_value + const isFormulaField = !!field?.preferences?.formula && field.type !== 'payment' + + if (isFormulaField && !this.isMathLoaded) { + this.loadCalculator() + } + + const formulaValue = isFormulaField && this.isMathLoaded + ? (field.type === 'text' ? this.evalTextFormula(field) : this.calculateFormula(field)) + : null + const fieldValue = formulaValue ?? this.values[condition.field_uuid] ?? defaultValue if (['empty', 'unchecked'].includes(condition.action)) { - return isEmpty(this.values[condition.field_uuid] ?? defaultValue) + return isEmpty(fieldValue) } else if (['not_empty', 'checked'].includes(condition.action)) { - return !isEmpty(this.values[condition.field_uuid] ?? defaultValue) + return !isEmpty(fieldValue) } else if (field?.type === 'number' && ['equal', 'not_equal', 'greater_than', 'less_than'].includes(condition.action)) { - const value = this.values[condition.field_uuid] ?? defaultValue + if (isEmpty(fieldValue) || isEmpty(condition.value)) return false - if (isEmpty(value) || isEmpty(condition.value)) return false - - const actual = parseFloat(value) + const actual = parseFloat(fieldValue) const expected = parseFloat(condition.value) if (Number.isNaN(actual) || Number.isNaN(expected)) return false @@ -1523,21 +1560,21 @@ export default { const option = field.options.find((o) => o.uuid === condition.value) if (option) { - const values = [this.values[condition.field_uuid] ?? defaultValue].flat() + const values = [fieldValue].flat() return values.includes(this.optionValue(option, field.options.indexOf(option))) } else { return false } } else { - return [this.values[condition.field_uuid] ?? defaultValue].flat().includes(condition.value) + return [fieldValue].flat().includes(condition.value) } } else if (['not_equal', 'does_not_contain'].includes(condition.action) && field) { if (field.options) { const option = field.options.find((o) => o.uuid === condition.value) if (option) { - const values = [this.values[condition.field_uuid] ?? defaultValue].flat() + const values = [fieldValue].flat() return !values.includes(this.optionValue(option, field.options.indexOf(option))) } else { diff --git a/lib/submissions/create_from_submitters.rb b/lib/submissions/create_from_submitters.rb index dd2780537..28f55fa2e 100644 --- a/lib/submissions/create_from_submitters.rb +++ b/lib/submissions/create_from_submitters.rb @@ -459,7 +459,9 @@ module Submissions def assign_completed_attributes(submitter, with_verification: true) submitter.values = Submitters::SubmitValues.merge_default_values(submitter, with_verification:) - submitter.values = Submitters::SubmitValues.maybe_remove_condition_values(submitter) + submitter.values = Submitters::SubmitValues.maybe_remove_condition_values( + submitter, formula_values: Submitters::SubmitValues.build_formula_values(submitter) + ) formula_values = Submitters::SubmitValues.build_formula_values(submitter) diff --git a/lib/submitters/submit_values.rb b/lib/submitters/submit_values.rb index f1313e389..9b3b9fb40 100644 --- a/lib/submitters/submit_values.rb +++ b/lib/submitters/submit_values.rb @@ -81,7 +81,8 @@ module Submitters required_field_uuids_acc = Set.new - submitter.values = maybe_remove_condition_values(submitter, required_field_uuids_acc:) + submitter.values = maybe_remove_condition_values(submitter, formula_values: build_formula_values(submitter), + required_field_uuids_acc:) formula_values = build_formula_values(submitter) @@ -204,10 +205,10 @@ module Submitters default_values.compact_blank.merge(submitter.values) end - def build_formula_values(submitter) - submission_values = nil + def build_formula_values(submitter, submission_values: nil) + submission = submitter.submission - computed_values = submitter.submission.template_fields.each_with_object({}) do |field, acc| + computed_values = (submission.template_fields || submission.template.fields).each_with_object({}) do |field, acc| next if field['submitter_uuid'] != submitter.uuid next if field['type'] == 'payment' @@ -297,17 +298,17 @@ module Submitters field:) end - def maybe_remove_condition_values(submitter, required_field_uuids_acc: nil) + def maybe_remove_condition_values(submitter, formula_values: {}, required_field_uuids_acc: nil) submission = submitter.submission - submitters_values = nil + submitters_values = formula_values.merge(merge_submitters_values(submitter)) if formula_values.present? has_other_submitters = submission.template_submitters.size > 1 has_document_conditions = submission_has_document_conditions?(submission) attachments_index = if has_document_conditions - submitters_values = merge_submitters_values(submitter) + submitters_values ||= merge_submitters_values(submitter) Submissions.filtered_conditions_schema(submission, values: submitters_values) .index_by { |i| i['attachment_uuid'] }