diff --git a/src/assets/scss/components/appForm.scss b/src/assets/scss/components/appForm.scss index c114ba9..bb532bd 100644 --- a/src/assets/scss/components/appForm.scss +++ b/src/assets/scss/components/appForm.scss @@ -147,6 +147,7 @@ .appForm__fileUploadItemName { color: var(--global-textColor); font-style: italic; + text-align: left; } .appForm__row { diff --git a/src/assets/scss/components/misc.scss b/src/assets/scss/components/misc.scss index c276636..0b795e1 100644 --- a/src/assets/scss/components/misc.scss +++ b/src/assets/scss/components/misc.scss @@ -118,6 +118,10 @@ user-select: none; } +.p-dropdown-panel { + max-width: 100%; +} + .p-inputgroup.flex-1 { align-items: center; } diff --git a/src/components/FormFieldRepeater/index.js b/src/components/FormFieldRepeater/index.js index 9d69312..fe00a72 100644 --- a/src/components/FormFieldRepeater/index.js +++ b/src/components/FormFieldRepeater/index.js @@ -73,6 +73,7 @@ const FormFieldRepeater = ({ const properField = (item, i) => { return !isNil(item.lookUpDataId) ? selectItem(e, i)} optionDisabled={(opt) => usedExistingValues().includes(opt.value)} diff --git a/src/components/FormFieldRepeaterCriteria/index.js b/src/components/FormFieldRepeaterCriteria/index.js index 7882cf8..9f96447 100644 --- a/src/components/FormFieldRepeaterCriteria/index.js +++ b/src/components/FormFieldRepeaterCriteria/index.js @@ -79,6 +79,7 @@ const FormFieldRepeaterCriteria = ({ const properField = (item, i) => { return !isNil(item.lookUpDataId) ? selectItem(e, i)} optionDisabled={(opt) => usedExistingValues().includes(opt.value)} diff --git a/src/components/FormFieldRepeaterFaq/index.js b/src/components/FormFieldRepeaterFaq/index.js index 2420943..5ba60a3 100644 --- a/src/components/FormFieldRepeaterFaq/index.js +++ b/src/components/FormFieldRepeaterFaq/index.js @@ -182,6 +182,7 @@ const FormFieldRepeaterFaq = ({ disabled={disabled} icon="pi pi-plus" onClick={addNewItem}/> selectItem(e)} + filter disabled={disabled} optionDisabled={(opt) => usedExistingValues().includes(opt.title)} options={stateOptionsData} diff --git a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js index 8d167f8..a4cdef6 100644 --- a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js +++ b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js @@ -1,6 +1,6 @@ import React, { useState, useEffect} from 'react'; import { __ } from '@wordpress/i18n'; -import { is, uniq, isNil } from 'ramda'; +import { is, uniq, isNil, isEmpty } from 'ramda'; import { wrap } from 'object-path-immutable'; // store @@ -28,6 +28,7 @@ import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse const AllBandiAccordion = () => { + const chosenCompanyId = useStore().main.chosenCompanyId(); const isAsyncRequest = useStore().main.isAsyncRequest(); const [items, setItems] = useState(null); const [filters, setFilters] = useState(null); @@ -113,11 +114,11 @@ const AllBandiAccordion = () => {
{renderHtmlContent(data.descriptionShort)}

{__('Scadenza', 'gepafin')}: {getDateFromISOstring(data.dates[1])}

- {!data.confidi + {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && !data.confidi ? : null} - {data.confidi + {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && data.confidi ? : null} diff --git a/src/pages/BandiBeneficiario/index.js b/src/pages/BandiBeneficiario/index.js index 66942d3..8165092 100644 --- a/src/pages/BandiBeneficiario/index.js +++ b/src/pages/BandiBeneficiario/index.js @@ -1,10 +1,8 @@ import React from 'react'; import { __ } from '@wordpress/i18n'; -import { useNavigate } from 'react-router-dom'; // components import AllBandiAccordion from './components/AllBandiAccordion'; -import { Button } from 'primereact/button'; const BandiBeneficiario = () => { return( diff --git a/src/pages/BandoEdit/components/BandoEditFormActions/index.js b/src/pages/BandoEdit/components/BandoEditFormActions/index.js index 3b65462..b431c89 100644 --- a/src/pages/BandoEdit/components/BandoEditFormActions/index.js +++ b/src/pages/BandoEdit/components/BandoEditFormActions/index.js @@ -5,14 +5,16 @@ import { isNil } from 'ramda'; // components import { Button } from 'primereact/button'; -const BandoEditFormActions = ({ id, openPreview, openPreviewEvaluation, submitFn }) => { +const BandoEditFormActions = ({ id, openPreview, openPreviewEvaluation, submitFn, status }) => { return (
) - - /*return ( -
- {draggingId === id - ?
- : <> -
- - -
-
-
- - } -
- )*/ } export default BuilderElement; \ No newline at end of file diff --git a/src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSetting/index.js b/src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSetting/index.js index 6264b89..6e2dcfc 100644 --- a/src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSetting/index.js +++ b/src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSetting/index.js @@ -11,7 +11,7 @@ import { Editor } from 'primereact/editor'; import { mimeTypes } from '../../../../../../configData'; import ElementSettingTableColumns from '../ElementSettingTableColumns'; -const ElementSetting = ({ setting, changeFn, updateDataFn }) => { +const ElementSetting = ({ setting, changeFn, updateDataFn, bandoStatus }) => { const settingLabels = { label: __('Label', 'gepafin'), @@ -48,6 +48,7 @@ const ElementSetting = ({ setting, changeFn, updateDataFn }) => { return } else if (setting.name === 'mime') { return { return } else { return { const [stateFieldData, setStateFieldData] = useState([]); @@ -53,10 +54,10 @@ const ElementSettingRepeater = ({ {stateFieldData.map((o, i) =>
{properField(o, i)} -
)} -
) } diff --git a/src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSettingTableColumns/index.js b/src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSettingTableColumns/index.js index 5815843..9681540 100644 --- a/src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSettingTableColumns/index.js +++ b/src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSettingTableColumns/index.js @@ -14,7 +14,8 @@ import uniqid from '../../../../../../helpers/uniqid'; const ElementSettingTableColumns = ({ value, name, - setDataFn + setDataFn, + bandoStatus }) => { const [stateFieldData, setStateFieldData] = useState([]); const [rowsData, setRowsData] = useState([]); @@ -34,7 +35,7 @@ const ElementSettingTableColumns = ({ .reduce((acc, cur) => { acc[cur.name] = '' return acc; - }, {}); + }, {}); setRowsData([...rowsData, obj]); } @@ -87,7 +88,10 @@ const ElementSettingTableColumns = ({ onInputChange(e, i)}/>
{__('Predefinito?', 'gepafin')} - setChecked(e.value, i)}/> + setChecked(e.value, i)}/>
} @@ -118,10 +122,10 @@ const ElementSettingTableColumns = ({ {stateFieldData.map((o, i) =>
{properField(o, i)} -
)} -