diff --git a/src/assets/scss/components/appPage.scss b/src/assets/scss/components/appPage.scss index 6e831bd..9d3de37 100644 --- a/src/assets/scss/components/appPage.scss +++ b/src/assets/scss/components/appPage.scss @@ -262,7 +262,7 @@ .appPageSection__checklist { display: flex; flex-direction: column; - gap: 1rem; + gap: 1.2rem; div { display: flex; diff --git a/src/assets/scss/components/fieldsRepeater.scss b/src/assets/scss/components/fieldsRepeater.scss index 54599fb..2a28eda 100644 --- a/src/assets/scss/components/fieldsRepeater.scss +++ b/src/assets/scss/components/fieldsRepeater.scss @@ -1,5 +1,9 @@ .fieldsRepeater { - + display: flex; + flex-direction: column; + align-items: flex-start; + gap: 30px; + width: 100%; } .fieldsRepeater form { @@ -7,7 +11,7 @@ } .fieldsRepeater__panel { - + width: 100%; } .fieldsRepeater__heading { @@ -21,5 +25,4 @@ } .fieldsRepeater__addNew { - margin-top: 30px; } \ No newline at end of file diff --git a/src/pages/Applications/index.js b/src/pages/Applications/index.js index 6c88d66..21aaf42 100644 --- a/src/pages/Applications/index.js +++ b/src/pages/Applications/index.js @@ -21,7 +21,6 @@ const Applications = () => { navigate('/bandi') } - console.log('company', company, chosenCompanyId, companies) return(
diff --git a/src/pages/BandiBeneficiario/index.js b/src/pages/BandiBeneficiario/index.js index 5a191be..ec107f7 100644 --- a/src/pages/BandiBeneficiario/index.js +++ b/src/pages/BandiBeneficiario/index.js @@ -1,7 +1,7 @@ import React from 'react'; import { __ } from '@wordpress/i18n'; import { Link } from 'react-router-dom'; -import { isEmpty } from 'ramda'; +import { head, isEmpty } from 'ramda'; // store import { useStore } from '../../store'; @@ -12,11 +12,14 @@ import ErrorBoundary from '../../components/ErrorBoundary'; const BandiBeneficiario = () => { const chosenCompanyId = useStore().main.chosenCompanyId(); + const companies = useStore().main.companies(); + const company = head(companies.filter(o => o.id === chosenCompanyId)); return (

{__('Bandi disponibili', 'gepafin')}

+ {company ? {company.companyName} : null}
diff --git a/src/pages/BandiPreferredBeneficiario/index.js b/src/pages/BandiPreferredBeneficiario/index.js index e6e2063..df1f5a3 100644 --- a/src/pages/BandiPreferredBeneficiario/index.js +++ b/src/pages/BandiPreferredBeneficiario/index.js @@ -1,7 +1,7 @@ import React from 'react'; import { __ } from '@wordpress/i18n'; import { Link } from 'react-router-dom'; -import { isEmpty } from 'ramda'; +import { head, isEmpty } from 'ramda'; // store import { useStore } from '../../store'; @@ -11,11 +11,14 @@ import AllBandiAccordion from '../BandiBeneficiario/components/AllBandiAccordion const BandiPreferredBeneficiario = () => { const chosenCompanyId = useStore().main.chosenCompanyId(); + const companies = useStore().main.companies(); + const company = head(companies.filter(o => o.id === chosenCompanyId)); return (

{__('Bandi osservati', 'gepafin')}

+ {company ? {company.companyName} : null}
diff --git a/src/pages/DashboardBeneficiario/index.js b/src/pages/DashboardBeneficiario/index.js index cc12f6e..cec061b 100644 --- a/src/pages/DashboardBeneficiario/index.js +++ b/src/pages/DashboardBeneficiario/index.js @@ -21,6 +21,7 @@ const DashboardBeneficiario = () => { const [mainStats, setMainStats] = useState({}); const companies = useStore().main.companies(); const chosenCompanyId = useStore().main.chosenCompanyId(); + const company = head(companies.filter(o => o.id === chosenCompanyId)); const goToAllSubmissions = () => { navigate('/bandi'); @@ -51,6 +52,7 @@ const DashboardBeneficiario = () => {

{__('Dashboard', 'gepafin')}

+ {company ? {company.companyName} : null}
diff --git a/src/pages/DomandaBeneficiario/index.js b/src/pages/DomandaBeneficiario/index.js index 081b39c..200814c 100644 --- a/src/pages/DomandaBeneficiario/index.js +++ b/src/pages/DomandaBeneficiario/index.js @@ -25,6 +25,7 @@ import { Toast } from 'primereact/toast'; import { Dialog } from 'primereact/dialog'; import FormField from '../../components/FormField'; import SoccorsoComunications from '../SoccorsoEditPreInstructor/components/SoccorsoComunications'; +import RepeaterFields from '../DomandaEditPreInstructor/components/RepeaterFields'; const DomandaBeneficiario = () => { const isAsyncRequest = useStore().main.isAsyncRequest(); @@ -239,7 +240,7 @@ const DomandaBeneficiario = () => { {dataAppl.id ?

- {__('ID domanda', 'gepafin')} + {__('ID domanda', 'gepafin')} {dataAppl.id}

@@ -275,6 +276,12 @@ const DomandaBeneficiario = () => {

: null} {data.id + ?
+

{__('Documenti richiesti', 'gepafin')}

+ +
: null} + + {/*{data.id ?

{__('Documenti Richiesti', 'gepafin')}

@@ -299,37 +306,37 @@ const DomandaBeneficiario = () => { /> }) : null}
- {/*
    +
      {data.formFields ? data.formFields.map((o, i) =>
    1. {o.label}
    2. ) : null} -
    */} -
: null} + +
: null}*/} {data.id ?

{__('Comunicazioni', 'gepafin')}

-
: null} +
: null} {data.id ?
- - {__('Attenzione', 'gepafin')} - {__('Inviare la documentazione richiesta completa delle integrazioni esclusivamente via PEC. In caso contarrio l’integrazione non può essere ritenuta valida.', 'gepafin')} -
: null} + + {__('Attenzione', 'gepafin')} + {__('Inviare la documentazione richiesta completa delle integrazioni esclusivamente via PEC. In caso contarrio l’integrazione non può essere ritenuta valida.', 'gepafin')} +
: null}
{data.id ?
+

{__('Documenti ricevuti', 'gepafin')}

+ +
+ + {/*

{__('Documenti Ricevuti', 'gepafin')}

@@ -413,7 +419,7 @@ const SoccorsoEditPreInstructor = () => { /> }) : null}
-
+
*/}