diff --git a/src/assets/scss/components/appPage.scss b/src/assets/scss/components/appPage.scss index 54a8fba..dd87777 100644 --- a/src/assets/scss/components/appPage.scss +++ b/src/assets/scss/components/appPage.scss @@ -375,6 +375,10 @@ gap: 24px; padding: 0; flex-wrap: wrap; + + &.lessGap { + gap: 12px; + } } .appPageSection__addToFavourites { diff --git a/src/components/FormField/components/Datepicker/index.js b/src/components/FormField/components/Datepicker/index.js index 6744491..b33c13c 100644 --- a/src/components/FormField/components/Datepicker/index.js +++ b/src/components/FormField/components/Datepicker/index.js @@ -28,18 +28,17 @@ const Datepicker = ({ control={control} defaultValue={defaultValue} rules={config} - render={({ field, fieldState }) => ( - field.onChange(e.value)} - dateFormat="dd/mm/yy" - hourFormat="24" - timeOnly={timeOnly} - showIcon - minDate={minDate} - maxDate={maxDate} - className={classNames({ 'p-invalid': fieldState.invalid })}/> + render={({ field, fieldState }) => ( field.onChange(e.value)} + dateFormat="dd/mm/yy" + hourFormat="24" + timeOnly={timeOnly} + showIcon + minDate={minDate} + maxDate={maxDate} + className={classNames({ 'p-invalid': fieldState.invalid })}/> )}/> {infoText ? {infoText} : null} ) diff --git a/src/components/FormField/components/NumberInput/index.js b/src/components/FormField/components/NumberInput/index.js index d5d4ee4..62a90e9 100644 --- a/src/components/FormField/components/NumberInput/index.js +++ b/src/components/FormField/components/NumberInput/index.js @@ -1,7 +1,7 @@ import React from 'react'; import { classNames } from 'primereact/utils'; import { Controller } from 'react-hook-form'; -import { is } from 'ramda'; +import { is, isEmpty } from 'ramda'; import { InputNumber } from 'primereact/inputnumber'; @@ -23,6 +23,8 @@ const NumberInput = ({ disabled = false, useGrouping = true }) => { + const minAttr = config.min ? config.min : min; + const maxAttr = config.max ? config.max : max; const input = field.onChange(e.value)} - min={min} - max={max} + min={minAttr} + max={maxAttr} locale={locale} useGrouping={useGrouping} maxFractionDigits={!isNaN(parseInt(maxFractionDigits)) ? parseInt(maxFractionDigits) : 0} @@ -45,6 +47,8 @@ const NumberInput = ({ <> {inputgroup ?
diff --git a/src/pages/BandoEdit/components/BandoEditFormStep1/index.js b/src/pages/BandoEdit/components/BandoEditFormStep1/index.js index 07f5ad5..5d1d12b 100644 --- a/src/pages/BandoEdit/components/BandoEditFormStep1/index.js +++ b/src/pages/BandoEdit/components/BandoEditFormStep1/index.js @@ -202,7 +202,6 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, setInitialData, g }, [errors, isValid]); useEffect(() => { - console.log('here1') storeSet.main.formInitialData(initialData); setFormInitialData(initialData); }, [initialData]); diff --git a/src/pages/BandoEdit/components/BandoEditFormStep2/index.js b/src/pages/BandoEdit/components/BandoEditFormStep2/index.js index 791c2c1..8ce097e 100644 --- a/src/pages/BandoEdit/components/BandoEditFormStep2/index.js +++ b/src/pages/BandoEdit/components/BandoEditFormStep2/index.js @@ -174,7 +174,6 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, setInitialData, g }, [errors, isValid]); useEffect(() => { - console.log('here2') storeSet.main.formInitialData(initialData); setFormInitialData(initialData); }, [initialData]); diff --git a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js index ce3f987..75a7865 100644 --- a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js +++ b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js @@ -40,7 +40,7 @@ const MyLatestSubmissionsTable = () => { setLocalAsyncRequest(true); ApplicationService.getApplications(getApplCallback, errGetApplCallback, [ ['companyId', chosenCompanyId], - ['statuses', ['DRAFT', 'AWAITING', 'READY']] + ['statuses', ['DRAFT', 'AWAITING', 'READY', 'SUBMIT']] ]); } }, [chosenCompanyId]); diff --git a/src/pages/Domande/components/AllDomandeTable/index.js b/src/pages/Domande/components/AllDomandeTable/index.js index 6039d0b..eb0ae9e 100644 --- a/src/pages/Domande/components/AllDomandeTable/index.js +++ b/src/pages/Domande/components/AllDomandeTable/index.js @@ -31,7 +31,7 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => { useEffect(() => { setLocalAsyncRequest(true); ApplicationService.getApplications(getCallback, errGetCallbacks, [ - ['statuses', 'SUBMIT'] + ['statuses', ['SUBMIT', 'EVALUATION', 'SOCCORSO']] ]); }, [updaterString]); @@ -130,7 +130,7 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => { }; const actionsBodyTemplate = (rowData) => { - return <> + return
{openDialogFn ?
} const header = renderHeader();