- updated call form, new fields;

- updated preview pages for bando;
- fixed bug with decimal number field;

src/pages/BandoViewBeneficiario/index.js

@@ -1,7 +1,7 @@
 import React, { useState, useEffect, useRef } from 'react';
 import { __, sprintf } from '@wordpress/i18n';
 import { useNavigate, useParams } from 'react-router-dom';
-import { is, isEmpty } from 'ramda';
+import { is, isEmpty, pathOr, isNil } from 'ramda';
 
 // store
 import { storeSet, useStore } from '../../store';
@@ -9,6 +9,8 @@ import { storeSet, useStore } from '../../store';
 // tools
 import getNumberWithCurrency from '../../helpers/getNumberWithCurrency';
 import getDateFromISOstring from '../../helpers/getDateFromISOstring';
+import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
+import renderHtmlContent from '../../helpers/renderHtmlContent';
 
 // components
 import { Skeleton } from 'primereact/skeleton';
@@ -16,21 +18,24 @@ import { Accordion } from 'primereact/accordion';
 import { AccordionTab } from 'primereact/accordion';
 import { InputTextarea } from 'primereact/inputtextarea';
 import { Button } from 'primereact/button';
-import BandoService from '../../service/bando-service';
 import { Messages } from 'primereact/messages';
-import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
+import { Message } from 'primereact/message';
+
+// api
+import BandoService from '../../service/bando-service';
 import FaqItemService from '../../service/faq-item-service';
 import ApplicationService from '../../service/application-service';
-import renderHtmlContent from '../../helpers/renderHtmlContent';
 
 const BandoViewBeneficiario = () => {
     const isAsyncRequest = useStore().main.isAsyncRequest();
+    const companies = useStore().main.companies();
     const { id } = useParams();
     const navigate = useNavigate();
     const [data, setData] = useState({});
     const [newQuestion, setNewQuestion] = useState('');
     const [applicationObj, setApplicationObj] = useState(true);
     const bandoMsgs = useRef(null);
+    const chosenCompanyId = pathOr(0, [0], companies);
 
     const scaricaBando = () => {
 
@@ -212,6 +217,10 @@ const BandoViewBeneficiario = () => {
                                 <span>{__('Importo totale', 'gepafin')}</span>
                                 <span>{getNumberWithCurrency(data.amount)}</span>
                             </p>
+                            <p className="appPageSection__pMeta">
+                                <span>{__('Importo minimo per progetto', 'gepafin')}</span>
+                                <span>{getNumberWithCurrency(data.amountMin)}</span>
+                            </p>
                             <p className="appPageSection__pMeta">
                                 <span>{__('Importo massimo per progetto', 'gepafin')}</span>
                                 <span>{getNumberWithCurrency(data.amountMax)}</span>
@@ -221,11 +230,11 @@ const BandoViewBeneficiario = () => {
                         <div className="appPageSection__withBorder">
                             <p className="appPageSection__pMeta">
                                 <span>{__('Data apertura', 'gepafin')}</span>
-                                <span>{getDateFromISOstring(data.dates[0])}</span>
+                                <span>{getDateFromISOstring(data.dates[0])} {data.startTime}</span>
                             </p>
                             <p className="appPageSection__pMeta">
                                 <span>{__('Data chiusura', 'gepafin')}</span>
-                                <span>{getDateFromISOstring(data.dates[1])}</span>
+                                <span>{getDateFromISOstring(data.dates[1])} {data.endTime}</span>
                             </p>
                         </div>
                     </div>
@@ -311,6 +320,12 @@ const BandoViewBeneficiario = () => {
                             label={__('Salva', 'gepafin')}/>
                     </div>
 
+                    {chosenCompanyId === 0
+                        ? <>
+                            <Message severity="error" text={__("Devi creare un'azienda prima di partecipare nei bandi. Vai nel profilo aziendale.", 'gepafin')} />
+                        </>
+                        : null}
+
                     <div className="appPageSection">
                         <h2>{__('Download Documenti', 'gepafin')}</h2>
                         <div className="appPageSection__actions">
@@ -330,7 +345,7 @@ const BandoViewBeneficiario = () => {
                                 icon="pi pi-download" iconPos="right"/>
                             <Button
                                 type="button"
-                                disabled={isAsyncRequest}
+                                disabled={isAsyncRequest || chosenCompanyId === 0}
                                 onClick={submitApplication}
                                 label={__('Presenta Domanda', 'gepafin')}
                                 icon="pi pi-save" iconPos="right"/>
@@ -348,8 +363,8 @@ const BandoViewBeneficiario = () => {
                     <div className="appPageSection__withBorder">
                         <h2>{__('Contatti per Assistenza', 'gepafin')}</h2>
                         <div className="row rowContent">
-                            <p>Email: bandi@gepafin.it</p>
-                            <p>Telefono: +39 075 123 4567</p>
+                            <p>Email: {data.email}</p>
+                            {!isNil(data.phoneNumber) ? <p>{__('Telefono', 'gepafin')}: +39 {data.phoneNumber}</p> : null}
                         </div>
                     </div>
                 </div>