- updated tables - displaying protocol id, columns for ndg and appointment;

- added 2 buttons for download delega and download signed pdf for application;

src/assets/scss/components/appPage.scss

@@ -342,6 +342,10 @@
 .appPageSection__row {
     display: flex;
     gap: 1rem;
+
+    &.autoFlow {
+        flex-wrap: wrap;
+    }
 }
 
 .appPageSection__pMeta {

src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js

@@ -141,7 +141,16 @@ const PreInstructorDomandeTable = () => {
                        header={header}
                        emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
-                <Column field="applicationId" header={__('ID domanda', 'gepafin')}
+                <Column field="id" header={__('ID domanda', 'gepafin')}
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
+                <Column field="protocolNumber" header={__('Protocollo', 'gepafin')}
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
+                <Column field="ndg" header={__('NDG', 'gepafin')}
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
+                <Column field="appointmentId" header={__('ID appuntamento', 'gepafin')}
                         sortable filterPlaceholder={__('Cerca', 'gepafin')}
                         style={{ minWidth: '6rem' }}/>
                 <Column field="callName" header={__('Bando', 'gepafin')}

src/pages/DomandaEditPreInstructor/components/DownloadCompanyDelegation/index.js

@@ -0,0 +1,51 @@
+import React, { useState, useEffect } from 'react';
+import { __ } from '@wordpress/i18n';
+import { isEmpty } from 'ramda';
+
+// api
+import CompanyService from '../../../../service/company-service';
+
+// components
+import { Button } from 'primereact/button';
+
+const DownloadCompanyDelegation = ({ applicationId = 0 }) => {
+    const [loading, setLoading] = useState(false);
+    const [delega, setDelega] = useState({});
+
+    const onClickDownload = () => {
+        if (delega.filePath) {
+            window.open(encodeURI(delega.filePath), '_blank').focus()
+        }
+    }
+
+    const getDellegaCallback = (data) => {
+        if (data.data) {
+            setDelega([data.data]);
+        }
+        setLoading(false);
+    }
+
+    const errDellegaCallback = () => {
+        setDelega([]);
+        setLoading(false);
+    }
+
+    useEffect(() => {
+        setLoading(true);
+        CompanyService.getCompanyDelega(0, getDellegaCallback, errDellegaCallback, [
+            ['applicationId', applicationId]
+        ]);
+    }, [])
+
+    return (applicationId && applicationId !== 0
+            ? <Button
+                type="button"
+                disabled={loading || isEmpty(delega)}
+                onClick={onClickDownload}
+                label={__('Scarica la delega', 'gepafin')}
+                icon="pi pi-download"
+                iconPos="right"/> : null
+    )
+}
+
+export default DownloadCompanyDelegation;

src/pages/DomandaEditPreInstructor/components/DownloadSignedApplication/index.js

@@ -0,0 +1,45 @@
+import React, { useState } from 'react';
+import { __ } from '@wordpress/i18n';
+
+// api
+import ApplicationService from '../../../../service/application-service';
+
+// components
+import { Button } from 'primereact/button';
+
+const DownloadSignedApplication = ({ applicationId = 0 }) => {
+    const [loading, setLoading] = useState(false);
+    const [, setDocument] = useState({});
+
+    const onClickDownload = () => {
+        setLoading(true);
+        ApplicationService.getApplicationSignedPdf(applicationId, getSignedPdfCallback, errSignedPdfCallbacks);
+    }
+
+    const getSignedPdfCallback = (data) => {
+        if (data.data) {
+            setDocument([data.data]);
+            if (data.data.filePath) {
+                window.open(encodeURI(data.data.filePath), '_blank').focus()
+            }
+        }
+        setLoading(false);
+    }
+
+    const errSignedPdfCallbacks = () => {
+        setDocument([]);
+        setLoading(false);
+    }
+
+    return (applicationId && applicationId !== 0
+            ? <Button
+                type="button"
+                disabled={loading}
+                onClick={onClickDownload}
+                label={__('Scarica PDF firmato', 'gepafin')}
+                icon="pi pi-download"
+                iconPos="right"/> : null
+    )
+}
+
+export default DownloadSignedApplication;

src/pages/DomandaEditPreInstructor/index.js

@@ -33,6 +33,8 @@ import { classNames } from 'primereact/utils';
 import { InputTextarea } from 'primereact/inputtextarea';
 import { InputText } from 'primereact/inputtext';
 import DownloadApplicationArchive from './components/DownloadApplicationArchive';
+import DownloadCompanyDelegation from './components/DownloadCompanyDelegation';
+import DownloadSignedApplication from './components/DownloadSignedApplication';
 
 const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
 
@@ -436,6 +438,18 @@ const DomandaEditPreInstructor = () => {
                             <span>{__('ID domanda', 'gepafin')}</span>
                             <span>{data.applicationId}</span>
                         </p>
+                        <p className="appPageSection__pMeta">
+                            <span>{__('Protocollo', 'gepafin')}</span>
+                            <span>{data.protocolNumber}</span>
+                        </p>
+                        <p className="appPageSection__pMeta">
+                            <span>{__('NDG', 'gepafin')}</span>
+                            <span>{data.ndg}</span>
+                        </p>
+                        <p className="appPageSection__pMeta">
+                            <span>{__('Appuntamento', 'gepafin')}</span>
+                            <span>{data.appointmentId}</span>
+                        </p>
                         <p className="appPageSection__pMeta">
                             <span>{__('Bando', 'gepafin')}</span>
                             <span>{data.callName}</span>
@@ -446,7 +460,7 @@ const DomandaEditPreInstructor = () => {
                         </p>
                         <p className="appPageSection__pMeta">
                             <span>{__('Azienda', 'gepafin')}</span>
-                            <span></span>
+                            <span>{data.companyName}</span>
                         </p>
                         <p className="appPageSection__pMeta">
                             <span>{__('Data ricezione', 'gepafin')}</span>
@@ -464,7 +478,11 @@ const DomandaEditPreInstructor = () => {
 
                     <div className="appPageSection">
                         <h2>{__('Scarica documenti della domanda', 'gepafin')}</h2>
-                        <DownloadApplicationArchive applicationId={id}/>
+                        <div className="appPageSection__row autoFlow">
+                            <DownloadApplicationArchive applicationId={id}/>
+                            <DownloadSignedApplication applicationId={id}/>
+                            <DownloadCompanyDelegation applicationId={id}/>
+                        </div>
                     </div>
 
                     <div className="appPageSection">

src/pages/Domande/components/AllDomandeTable/index.js

@@ -98,9 +98,9 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => {
         return formatDate(rowData.submissionDate);
     };
 
-    const dateEndBodyTemplate = (rowData) => {
+    /*const dateEndBodyTemplate = (rowData) => {
         return formatDate(rowData.callEndDate);
-    };
+    };*/
 
     const dateFilterTemplate = (options) => {
         return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)}
@@ -138,9 +138,11 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => {
                        emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
                 <Column field="id" header={__('ID domanda', 'gepafin')}
-                        sortable
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
-                        filterPlaceholder={__('Cerca', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
-                        style={{ minWidth: '8rem' }}/>
+                <Column field="protocolNumber" header={__('Protocollo', 'gepafin')}
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
                 <Column field="callTitle" header={__('Bando', 'gepafin')}
                         filter sortable
                         filterPlaceholder={__('Cerca', 'gepafin')}
@@ -153,10 +155,10 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => {
                         filterField="submissionDate" dataType="date"
                         style={{ minWidth: '8rem' }}
                         body={dateAppliedBodyTemplate} filter filterElement={dateFilterTemplate}/>
-                <Column header={__('Scadenza', 'gepafin')}
+                {/*<Column header={__('Scadenza', 'gepafin')}
                         filterField="callEndDate" dataType="date"
                         style={{ minWidth: '8rem' }}
-                        body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/>
+                        body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/>*/}
                 <Column field="status" header={__('Stato', 'gepafin')}
                         style={{ minWidth: '8rem' }} body={statusBodyTemplate}/>
                 <Column header={__('Azioni', 'gepafin')}

src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js

@@ -156,8 +156,10 @@ const BeneficiarioDomandeTable = () => {
                        emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
                 <Column field="id" header={__('ID domanda', 'gepafin')}
-                        sortable
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
-                        filterPlaceholder={__('Cerca il nome', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
+                <Column field="protocolNumber" header={__('Protocollo', 'gepafin')}
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
                         style={{ minWidth: '6rem' }}/>
                 <Column field="callTitle" header={__('Titolo bando', 'gepafin')}
                         filter sortable

src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js

@@ -54,7 +54,7 @@ const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
     const getFormattedData = (data) => {
         return data.map((d) => {
             d.startDate = is(String, d.startDate) ? new Date(d.startDate) : (d.startDate ? d.startDate : '');
-            d.expirationDate = is(String, d.expirationDate) ? new Date(d.expirationDate) : (d.expirationDate ? d.expirationDate : '');
+            d.evaluationEndDate = is(String, d.evaluationEndDate) ? new Date(d.evaluationEndDate) : (d.evaluationEndDate ? d.evaluationEndDate : '');
             return d;
         });
     };
@@ -86,7 +86,7 @@ const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
                 operator: FilterOperator.AND,
                 constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
             },
-            expirationDate: {
+            evaluationEndDate: {
                 operator: FilterOperator.AND,
                 constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
             }
@@ -106,7 +106,7 @@ const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
     };
 
     const dateExpirationBodyTemplate = (rowData) => {
-        return rowData.expirationDate ? formatDate(rowData.expirationDate) : '';
+        return rowData.evaluationEndDate ? formatDate(rowData.evaluationEndDate) : '';
     };
 
     const dateFilterTemplate = (options) => {
@@ -140,8 +140,11 @@ const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
                        header={header}
                        emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
-                <Column field="applicationId" header={__('ID domanda', 'gepafin')}
+                <Column field="id" header={__('ID domanda', 'gepafin')}
-                        filter filterPlaceholder={__('Cerca', 'gepafin')}
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
+                <Column field="protocolNumber" header={__('Protocollo', 'gepafin')}
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
                         style={{ minWidth: '6rem' }}/>
                 <Column field="callName" header={__('Bando', 'gepafin')}
                         filter filterPlaceholder={__('Cerca', 'gepafin')}
@@ -154,7 +157,7 @@ const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
                         style={{ minWidth: '8rem' }}
                         body={dateStartBodyTemplate} filter filterElement={dateFilterTemplate}/>
                 <Column header={__('Scadenza', 'gepafin')}
-                        filterField="expirationDate" dataType="date"
+                        filterField="evaluationEndDate" dataType="date"
                         style={{ minWidth: '8rem' }}
                         body={dateExpirationBodyTemplate} filter filterElement={dateFilterTemplate}/>
                 <Column field="status" header={__('Stato', 'gepafin')}