diff --git a/src/assets/scss/components/appPage.scss b/src/assets/scss/components/appPage.scss index 9bf6f18..2bd10e3 100644 --- a/src/assets/scss/components/appPage.scss +++ b/src/assets/scss/components/appPage.scss @@ -182,8 +182,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/helpers/getBandoLabel.js b/src/helpers/getBandoLabel.js index e92005f..0986759 100644 --- a/src/helpers/getBandoLabel.js +++ b/src/helpers/getBandoLabel.js @@ -8,9 +8,6 @@ const getBandoLabel = (status) => { case 'SUBMIT': return __('Inviato', 'gepafin'); - case 'ACTIVE': - return __('Attivo', 'gepafin'); - case 'PUBLISH': return __('Pubblicato', 'gepafin'); diff --git a/src/helpers/getBandoSeverity.js b/src/helpers/getBandoSeverity.js index b4d38b2..829fd52 100644 --- a/src/helpers/getBandoSeverity.js +++ b/src/helpers/getBandoSeverity.js @@ -6,9 +6,6 @@ const getBandoSeverity = (status) => { case 'SUBMIT': return 'success'; - case 'ACTIVE': - return 'success'; - case 'PUBLISH': return 'success'; diff --git a/src/layouts/DefaultLayout/components/AppSidebar/index.js b/src/layouts/DefaultLayout/components/AppSidebar/index.js index 005dc21..b596b83 100644 --- a/src/layouts/DefaultLayout/components/AppSidebar/index.js +++ b/src/layouts/DefaultLayout/components/AppSidebar/index.js @@ -33,6 +33,13 @@ const AppSidebar = () => { id: 3, enable: intersection(permissions, ['APPLY_CALLS']).length }, + { + label: __('Gestione Domande', 'gepafin'), + icon: 'pi pi-file', + href: '/domande', + id: 5, + enable: intersection(permissions, ['VIEW_USERS', 'MANAGE_USERS']).length + }, { label: __('Bandi disponibili', 'gepafin'), icon: 'pi pi-bookmark', diff --git a/src/pages/BandoApplication/index.js b/src/pages/BandoApplication/index.js index 627784f..bdcf8c4 100644 --- a/src/pages/BandoApplication/index.js +++ b/src/pages/BandoApplication/index.js @@ -91,12 +91,13 @@ const BandoApplication = () => { storeSet.main.setAsyncRequest(); formMsgs.current.clear(); - ApplicationService.updateStatusApplication(applId, {}, submitApplicationCallback, errSubmitApplicationCallback, [ + /*ApplicationService.updateStatusApplication(applId, {}, submitApplicationCallback, errSubmitApplicationCallback, [ ['status', 'SUBMIT'] - ]); + ]);*/ + ApplicationService.validateApplication(applId, {}, validateApplicationCallback, errValidateApplicationCallback); }; - const submitApplicationCallback = (data) => { + /*const submitApplicationCallback = (data) => { if (data.status === 'SUCCESS') { if (data.data.status) { setApplicationStatus(data.data.status); // ask why not 'applicationStatus'? @@ -139,6 +140,8 @@ const BandoApplication = () => { closable: true } ]); + } + if (toast.current) { toast.current.show({ severity: 'error', summary: '', @@ -148,6 +151,26 @@ const BandoApplication = () => { } else { set404FromErrorResponse(data); } + }*/ + + const validateApplicationCallback = (data) => { + if (data.status === 'SUCCESS') { + if (data.data.status) { + setApplicationStatus(data.data.status); // ask why not 'applicationStatus'? + } + } + storeSet.main.unsetAsyncRequest(); + } + + const errValidateApplicationCallback = (data) => { + if (toast.current) { + toast.current.show({ + severity: 'error', + summary: '', + detail: data.message + }); + } + storeSet.main.unsetAsyncRequest(); } const saveDraft = (saveAndMove = '') => { @@ -306,7 +329,6 @@ const BandoApplication = () => { } }) } - console.log('formDataInitial1', klona(formDataInitial)); if (data.data.applicationFormResponse.formFields) { const submitData = data.data.applicationFormResponse.formFields.map((o) => ({ @@ -320,7 +342,6 @@ const BandoApplication = () => { return acc; }, formDataInitial); } - console.log('formDataInitial2', klona(formDataInitial)); reset(); setFormInitialData(formDataInitial); @@ -378,7 +399,7 @@ const BandoApplication = () => { iconPos="right"/> : null}