From 78df0a1e5234a3c6e08d85f9c46678a368bb6634 Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Wed, 23 Oct 2024 12:42:53 +0200 Subject: [PATCH] - added aspect-ratio for bando hero image; --- src/assets/scss/components/appPage.scss | 5 ++++- src/pages/BandoApplication/index.js | 3 ++- src/pages/BandoViewBeneficiario/index.js | 11 +++++++---- .../components/MyLatestSubmissionsTable/index.js | 5 +++-- src/pages/Registration/index.js | 5 ++++- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/assets/scss/components/appPage.scss b/src/assets/scss/components/appPage.scss index feb7d93..522398d 100644 --- a/src/assets/scss/components/appPage.scss +++ b/src/assets/scss/components/appPage.scss @@ -170,8 +170,11 @@ .appPageSection__hero { display: flex; - height: 250px; + aspect-ratio: 16 / 9; width: 100%; + @supports not (aspect-ratio: 16 / 9) { + height: calc(100% * 9/16); + } img { width: 100%; diff --git a/src/pages/BandoApplication/index.js b/src/pages/BandoApplication/index.js index aeecfd7..c07de26 100644 --- a/src/pages/BandoApplication/index.js +++ b/src/pages/BandoApplication/index.js @@ -39,6 +39,7 @@ import getFormatedFileSizeText from '../../helpers/getFormatedFileSizeText'; import { defaultMaxFileSize } from '../../configData'; const BandoApplication = () => { + const chosenCompanyId = useStore().main.chosenCompanyId(); const { id } = useParams(); const [formData, setFormData] = useState([]); const [formInitialData, setFormInitialData] = useState(null); @@ -407,7 +408,7 @@ const BandoApplication = () => { storeSet.main.setAsyncRequest(); ApplicationService.getApplicationForm(applId, getApplFormCallback, errGetApplFormCallbacks); } - }, [id]); + }, [id, chosenCompanyId]); return (
diff --git a/src/pages/BandoViewBeneficiario/index.js b/src/pages/BandoViewBeneficiario/index.js index 34d728f..5fb2cf5 100644 --- a/src/pages/BandoViewBeneficiario/index.js +++ b/src/pages/BandoViewBeneficiario/index.js @@ -219,8 +219,11 @@ const BandoViewBeneficiario = () => { const bandoId = getBandoId(); storeSet.main.setAsyncRequest(); BandoService.getBando(bandoId, getBandoCallback, errGetBandoCallback); - ApplicationService.getApplications(getApplCallback, errGetApplCallback, [['callId', bandoId]]) - }, [id]); + ApplicationService.getApplications(getApplCallback, errGetApplCallback, [ + ['callId', bandoId], + ['companyId', chosenCompanyId] + ]) + }, [id, chosenCompanyId]); return (
@@ -244,10 +247,10 @@ const BandoViewBeneficiario = () => { {!isAsyncRequest && !isEmpty(data) ?
{!isEmpty(data.images) - ? + ?
{data.name}/ - : null} +
: null}

{__('Descrizione breve', 'gepafin')}

diff --git a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js index 0fda671..5c81745 100644 --- a/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js +++ b/src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js @@ -26,6 +26,7 @@ import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse const MyLatestSubmissionsTable = () => { + const chosenCompanyId = useStore().main.chosenCompanyId(); const isAsyncRequest = useStore().main.isAsyncRequest(); const [items, setItems] = useState(null); const [filters, setFilters] = useState(null); @@ -34,8 +35,8 @@ const MyLatestSubmissionsTable = () => { useEffect(() => { storeSet.main.setAsyncRequest(); - ApplicationService.getApplications(getApplCallback, errGetApplCallback) - }, []); + ApplicationService.getApplications(getApplCallback, errGetApplCallback, [['companyId', chosenCompanyId]]) + }, [chosenCompanyId]); const getApplCallback = (data) => { if (data.status === 'SUCCESS') { diff --git a/src/pages/Registration/index.js b/src/pages/Registration/index.js index b3a2497..90677e8 100644 --- a/src/pages/Registration/index.js +++ b/src/pages/Registration/index.js @@ -23,6 +23,8 @@ import { Panel } from 'primereact/panel'; import { Dialog } from 'primereact/dialog'; import getDateFromISOstring from '../../helpers/getDateFromISOstring'; +const APP_HUB_ID = process.env.REACT_APP_HUB_ID; + const Registration = () => { const token = useStore().main.token(); const [loading, setLoading] = useState(false); @@ -47,7 +49,8 @@ const Registration = () => { setLoading(true); const newFormData = { ...formData, - dateOfBirth: originalDateOfBirth + dateOfBirth: originalDateOfBirth, + hubUuid: APP_HUB_ID } AuthenticationService.registerUser(newFormData, regCallback, regError, [