From 2609c03f3633b64b46947a02bd87295711edef4a Mon Sep 17 00:00:00 2001 From: Vitalii Kiiko Date: Mon, 23 Dec 2024 16:00:11 +0100 Subject: [PATCH] - opened for participation call #6; --- src/pages/Bandi/components/AllBandiTable/index.js | 11 +++++++++-- .../components/AllBandiAccordion/index.js | 8 ++++++-- src/pages/BandoViewBeneficiario/index.js | 11 ++++++++++- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/pages/Bandi/components/AllBandiTable/index.js b/src/pages/Bandi/components/AllBandiTable/index.js index 6eeba6a..9bbc70f 100644 --- a/src/pages/Bandi/components/AllBandiTable/index.js +++ b/src/pages/Bandi/components/AllBandiTable/index.js @@ -97,7 +97,14 @@ const AllBandiTable = () => { }; const statusFilterTemplate = (options) => { - return options.filterCallback(e.value, options.index)} itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter" showClear />; + return options.filterCallback(e.value, options.index)} + itemTemplate={statusItemTemplate} + placeholder={translationStrings.selectOneLabel} + className="p-column-filter" + showClear />; }; const statusItemTemplate = (option) => { @@ -139,4 +146,4 @@ const AllBandiTable = () => { ) } -export default AllBandiTable; \ No newline at end of file +export default AllBandiTable; diff --git a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js index bba88cf..89882e5 100644 --- a/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js +++ b/src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js @@ -30,6 +30,8 @@ import { Button } from 'primereact/button'; // i18n import translationStrings from '../../../../translationStringsForComponents'; +const REACT_APP_HUB_ID = process.env.REACT_APP_HUB_ID; + const AllBandiAccordion = ({ showOnlyPreferred = false }) => { const chosenCompanyId = useStore().main.chosenCompanyId(); const isAsyncRequest = useStore().main.isAsyncRequest(); @@ -182,11 +184,13 @@ const AllBandiAccordion = ({ showOnlyPreferred = false }) => {
{renderHtmlContent(data.descriptionShort)}

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

- {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && !data.confidi + {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && (!data.confidi + || (data.confidi && data.id === 6 && REACT_APP_HUB_ID === 'p4lk3bcx1RStqTaIVVbXs')) ? : null} {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && data.confidi + && (data.id !== 6 || (data.id === 6 && REACT_APP_HUB_ID !== 'p4lk3bcx1RStqTaIVVbXs')) ? : null} @@ -229,4 +233,4 @@ const AllBandiAccordion = ({ showOnlyPreferred = false }) => { ) } -export default AllBandiAccordion; \ No newline at end of file +export default AllBandiAccordion; diff --git a/src/pages/BandoViewBeneficiario/index.js b/src/pages/BandoViewBeneficiario/index.js index f717c67..66209f8 100644 --- a/src/pages/BandoViewBeneficiario/index.js +++ b/src/pages/BandoViewBeneficiario/index.js @@ -116,7 +116,16 @@ const BandoViewBeneficiario = () => { const submitApplication = () => { if (data.confidi) { - displayConfidiPopup(); + if (data.id === 6 && REACT_APP_HUB_ID === 'p4lk3bcx1RStqTaIVVbXs') { + if (applicationObj && applicationObj.id) { + navigate(`/imieibandi/${applicationObj.id}`); + } else { + const bandoId = getBandoId(); + ApplicationService.createApplication(bandoId, {}, createApplCallback, errCreateApplCallback, [['companyId', chosenCompanyId]]); + } + } else { + displayConfidiPopup(); + } } else { if (REACT_APP_HUB_ID === 't7jh5wfg9QXylNaTZkPoE') { const bandoId = getBandoId();