From 11a1c351088797e3599b35a67264fd1948833d37 Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Fri, 15 Nov 2024 14:28:23 +0100 Subject: [PATCH] - updates in labels and some refactoring; --- src/configData.js | 31 ++++++++++++++++++- .../components/BandoEditFormActions/index.js | 6 ++-- .../components/BandoEditFormStep1/index.js | 2 +- .../components/BandoEditFormStep2/index.js | 2 +- src/pages/BandoFlowEdit/index.js | 2 +- src/pages/BandoForms/index.js | 4 +-- .../ElementSettingTableColumns/index.js | 4 ++- .../BuilderElementSettings/index.js | 3 +- src/pages/BandoFormsEdit/index.js | 2 +- src/pages/DomandaEditPreInstructor/index.js | 4 +++ 10 files changed, 48 insertions(+), 12 deletions(-) diff --git a/src/configData.js b/src/configData.js index a7d3d1c..5de2560 100644 --- a/src/configData.js +++ b/src/configData.js @@ -13,4 +13,33 @@ export const mimeTypes = [ } ]; -export const defaultMaxFileSize = 314572800; // 314572800 = 300 Mb \ No newline at end of file +export const defaultMaxFileSize = 314572800; // 314572800 = 300 Mb + +const dynamicDataForTextinput = [ + { label: 'company name', value: 'company.companyName' }, + { label: 'company piva', value: 'company.vatNumber' }, + { label: 'company codiceFiscale', value: 'company.codiceFiscale' }, + { label: 'company address', value: 'company.address' }, + { label: 'company phoneNumber', value: 'company.phoneNumber' }, + { label: 'company city', value: 'company.city' }, + { label: 'company province', value: 'company.province' }, + { label: 'company cap', value: 'company.cap' }, + { label: 'company country', value: 'company.country' }, + { label: 'company pec', value: 'company.pec' }, + { label: 'company email', value: 'company.email' }, + { label: 'company contactName', value: 'company.contactName' }, + { label: 'company contactEmail', value: 'company.contactEmail' }, + { label: 'user email', value: 'user.email' }, + { label: 'user firstName', value: 'user.firstName' }, + { label: 'user lastName', value: 'user.lastName' }, + { label: 'user phoneNumber', value: 'user.phoneNumber' }, + { label: 'user codiceFiscale', value: 'user.codiceFiscale' } +] + +export const dynamicDataOptions = { + datepicker: [ + { label: 'user dateOfBirth', value: 'user.dateOfBirth' } + ], + textinput: dynamicDataForTextinput, + textarea: dynamicDataForTextinput +} \ No newline at end of file diff --git a/src/pages/BandoEdit/components/BandoEditFormActions/index.js b/src/pages/BandoEdit/components/BandoEditFormActions/index.js index b431c89..4658387 100644 --- a/src/pages/BandoEdit/components/BandoEditFormActions/index.js +++ b/src/pages/BandoEdit/components/BandoEditFormActions/index.js @@ -5,7 +5,7 @@ import { isNil } from 'ramda'; // components import { Button } from 'primereact/button'; -const BandoEditFormActions = ({ id, openPreview, openPreviewEvaluation, submitFn, status }) => { +const BandoEditFormActions = ({ id, openPreview, submitFn, status }) => { return (
@@ -21,13 +21,13 @@ const BandoEditFormActions = ({ id, openPreview, openPreviewEvaluation, submitFn outlined onClick={openPreview} label={__('Anteprima beneficiario', 'gepafin')} icon="pi pi-eye" iconPos="right"/> -
) diff --git a/src/pages/BandoEdit/components/BandoEditFormStep1/index.js b/src/pages/BandoEdit/components/BandoEditFormStep1/index.js index 4e3d009..0baca40 100644 --- a/src/pages/BandoEdit/components/BandoEditFormStep1/index.js +++ b/src/pages/BandoEdit/components/BandoEditFormStep1/index.js @@ -112,7 +112,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st toast.current.show({ severity: 'success', summary: '', - detail: __('Il bando è stato aggiornato corretamente!', 'gepafin') + detail: __('Il bando è stato aggiornato correttamente!', 'gepafin') }); } const values = getValues(); diff --git a/src/pages/BandoEdit/components/BandoEditFormStep2/index.js b/src/pages/BandoEdit/components/BandoEditFormStep2/index.js index d861c97..5b8e098 100644 --- a/src/pages/BandoEdit/components/BandoEditFormStep2/index.js +++ b/src/pages/BandoEdit/components/BandoEditFormStep2/index.js @@ -104,7 +104,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st toast.current.show({ severity: 'success', summary: '', - detail: __('Il bando è stato aggiornato corretamente!', 'gepafin') + detail: __('Il bando è stato aggiornato correttamente!', 'gepafin') }); const newFormData = {...formInitialData, ...data.data}; setFormInitialData(newFormData); diff --git a/src/pages/BandoFlowEdit/index.js b/src/pages/BandoFlowEdit/index.js index f10d9e0..e6b210d 100644 --- a/src/pages/BandoFlowEdit/index.js +++ b/src/pages/BandoFlowEdit/index.js @@ -112,7 +112,7 @@ const BandoFlowEdit = () => { toast.current.show({ severity: 'success', summary: '', - detail: __('Il flusso è stato aggiornato corretamente!', 'gepafin') + detail: __('Il flusso è stato aggiornato correttamente!', 'gepafin') }); } } diff --git a/src/pages/BandoForms/index.js b/src/pages/BandoForms/index.js index ea70e59..cee1051 100644 --- a/src/pages/BandoForms/index.js +++ b/src/pages/BandoForms/index.js @@ -91,7 +91,7 @@ const BandoForms = () => { toast.current.show({ severity: 'success', summary: '', - detail: __('Il form è stato aggiornato corretamente!', 'gepafin') + detail: __('Il form è stato aggiornato correttamente!', 'gepafin') }); } @@ -235,7 +235,7 @@ const BandoForms = () => { outlined disabled={!selectedForm} onClick={goToEditForm} - label={'PUBLISH' === bandoStatus ? __('Mostra', 'gepafin') : __('Modifica', 'gepafin')} + label={__('Modifica', 'gepafin')} icon="pi pi-cog" iconPos="right"/> diff --git a/src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSettingTableColumns/index.js b/src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSettingTableColumns/index.js index 9681540..5537956 100644 --- a/src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSettingTableColumns/index.js +++ b/src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSettingTableColumns/index.js @@ -137,7 +137,9 @@ const ElementSettingTableColumns = ({ return
{properSubField(c, k, o.name)} -
diff --git a/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js b/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js index a22a4ac..79b8671 100644 --- a/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js +++ b/src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js @@ -16,6 +16,7 @@ import { InputSwitch } from 'primereact/inputswitch'; import ElementSetting from './components/ElementSetting'; import { Dropdown } from 'primereact/dropdown'; import { MultiSelect } from 'primereact/multiselect'; +import { dynamicDataOptions } from '../../../../configData'; const BuilderElementSettings = ({ closeSettingsFn, bandoStatus }) => { const elements = useStore().main.formElements(); @@ -166,7 +167,7 @@ const BuilderElementSettings = ({ closeSettingsFn, bandoStatus }) => { changeFn={onChange} updateDataFn={onUpdateOptions}/>) : null} - {['textinput', 'datepicker'].includes(activeElementData.name) + {!isNil(dynamicDataOptions[activeElementData.name]) ?
{ toast.current.show({ severity: 'success', summary: '', - detail: __('Il form è stato aggiornato corretamente!', 'gepafin') + detail: __('Il form è stato aggiornato correttamente!', 'gepafin') }); } } diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js index e3871e3..82d1dd3 100644 --- a/src/pages/DomandaEditPreInstructor/index.js +++ b/src/pages/DomandaEditPreInstructor/index.js @@ -329,6 +329,10 @@ const DomandaEditPreInstructor = () => {

+
+ +
+

{__('Punteggi di valutazione', 'gepafin')}

{data.criteria