From 460c2d25898fcb118b54369f8898b8b68d7508ed Mon Sep 17 00:00:00 2001 From: Anton Date: Thu, 12 Dec 2024 11:24:35 +0100 Subject: [PATCH] Add number and datetime field [SCI-11386] --- app/controllers/form_fields_controller.rb | 2 +- app/javascript/vue/forms/edit_field.vue | 36 +++--- .../vue/forms/edit_fields/datetime.vue | 28 ++++- .../vue/forms/edit_fields/field_mixin.js | 25 ++++ .../vue/forms/edit_fields/multiple_choice.vue | 21 +--- .../vue/forms/edit_fields/number.vue | 100 ++++++++++++++- .../vue/forms/edit_fields/single_choice.vue | 21 +--- app/javascript/vue/forms/show.vue | 27 ++-- config/locales/en.yml | 22 +++- .../assets/stylesheets/fonts/SN-icon-font.eot | Bin 34970 -> 40458 bytes .../assets/stylesheets/fonts/SN-icon-font.svg | 33 +++++ .../assets/stylesheets/fonts/SN-icon-font.ttf | Bin 34784 -> 40272 bytes .../stylesheets/fonts/SN-icon-font.woff | Bin 34860 -> 40348 bytes .../stylesheets/fonts/SN-icon-font.woff2 | Bin 14832 -> 16296 bytes vendor/assets/stylesheets/sn-icon-font.css | 117 ++++++++++++++++-- 15 files changed, 357 insertions(+), 75 deletions(-) create mode 100644 app/javascript/vue/forms/edit_fields/field_mixin.js diff --git a/app/controllers/form_fields_controller.rb b/app/controllers/form_fields_controller.rb index f386dd25e..c222333f7 100644 --- a/app/controllers/form_fields_controller.rb +++ b/app/controllers/form_fields_controller.rb @@ -72,6 +72,6 @@ class FormFieldsController < ApplicationController end def form_field_params - params.require(:form_field).permit(:name, :description, { data: [%i(type options)] }, :required, :allow_not_applicable, :uid) + params.require(:form_field).permit(:name, :description, { data: [:type, :options, :unit, :time, :range, validations: {}] }, :required, :allow_not_applicable, :uid) end end diff --git a/app/javascript/vue/forms/edit_field.vue b/app/javascript/vue/forms/edit_field.vue index b7a68948c..1c427f0ec 100644 --- a/app/javascript/vue/forms/edit_field.vue +++ b/app/javascript/vue/forms/edit_field.vue @@ -1,7 +1,10 @@