diff --git a/src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSetting/index.js b/src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSetting/index.js
index 6e2dcfc..1da64fa 100644
--- a/src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSetting/index.js
+++ b/src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSetting/index.js
@@ -10,6 +10,7 @@ import { Editor } from 'primereact/editor';
import { mimeTypes } from '../../../../../../configData';
import ElementSettingTableColumns from '../ElementSettingTableColumns';
+import { InputSwitch } from 'primereact/inputswitch';
const ElementSetting = ({ setting, changeFn, updateDataFn, bandoStatus }) => {
@@ -17,6 +18,7 @@ const ElementSetting = ({ setting, changeFn, updateDataFn, bandoStatus }) => {
label: __('Label', 'gepafin'),
placeholder: __('Segnaposto', 'gepafin'),
step: __('Numero Decimali', 'gepafin'),
+ isRequestedAmount: __('Importo richiesto', 'gepafin'),
options: __('Opzioni', 'gepafin'),
mime: __('Tipo di file', 'gepafin'),
text: __('Testo formattato', 'gepafin'),
@@ -78,6 +80,10 @@ const ElementSetting = ({ setting, changeFn, updateDataFn, bandoStatus }) => {
name={setting.name}
bandoStatus={bandoStatus}
setDataFn={updateDataFn}/>
+ } else if (setting.name === 'isRequestedAmount') {
+ return
changeFn(e.value, setting.name)}/>
} else {
return {
useEffect(() => {
const chosen = head(elements.filter(o => o.id === activeElement));
+ const elementItems = storeGet.main.elementItems();
+ const chosenElementItemCfg = head(elementItems.filter(o => o.name === chosen.name));
+ let settings = [];
+
+ if (chosenElementItemCfg) {
+ settings = chosenElementItemCfg.settings.map((o) => {
+ const setting = head(chosen.settings.filter(s => s.name === o.name));
+ return setting ? klona(setting) : klona(o)
+ });
+ }
if (chosen) {
setActiveElementData(klona(chosen));
- setSettings(klona(chosen.settings));
+ setSettings(settings);
setValidators(klona(chosen.validators));
setDynamicData(chosen.dynamicData ? chosen.dynamicData : '');
setCriteria(chosen.criteria ? chosen.criteria : []);
diff --git a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
index 23f988b..a0eed2c 100644
--- a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
+++ b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
@@ -126,7 +126,8 @@ const BeneficiarioDomandeTable = () => {
const statusFilterTemplate = (options) => {
return options.filterCallback(e.value, options.index)}
- itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
+ itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel}
+ className="p-column-filter"
showClear/>;
};
@@ -139,11 +140,17 @@ const BeneficiarioDomandeTable = () => {
};
const actionsBodyTemplate = (rowData) => {
- return rowData.status === 'SOCCORSO'
- ?
-