diff --git a/src/pages/BandoApplication/index.js b/src/pages/BandoApplication/index.js
index 0e5846d..f46dcf4 100644
--- a/src/pages/BandoApplication/index.js
+++ b/src/pages/BandoApplication/index.js
@@ -165,19 +165,32 @@ const BandoApplication = () => {
const validateApplicationCallback = (data) => {
if (data.status === 'SUCCESS') {
if (data.data.status) {
- setApplicationStatus(data.data.status); // ask why not 'applicationStatus'?
+ setApplicationStatus(data.data.status);
}
}
storeSet.main.unsetAsyncRequest();
}
const errValidateApplicationCallback = (data) => {
- if (toast.current) {
- toast.current.show({
- severity: 'error',
- summary: '',
- detail: data.message
- });
+ if (data.status === 'VALIDATION_ERROR') {
+ if (formMsgs.current) {
+ formMsgs.current.show([
+ {
+ id: '99',
+ sticky: true, severity: 'error', summary: '',
+ detail: data.data.join(' '),
+ closable: true
+ }
+ ]);
+ }
+ } else {
+ if (toast.current) {
+ toast.current.show({
+ severity: 'error',
+ summary: '',
+ detail: data.message
+ });
+ }
}
storeSet.main.unsetAsyncRequest();
}
@@ -260,7 +273,7 @@ const BandoApplication = () => {
{
id: '99',
sticky: true, severity: 'error', summary: '',
- detail: data.data.join(', '),
+ detail: data.data.join(' '),
closable: true
}
]);
@@ -420,7 +433,9 @@ const BandoApplication = () => {
icon="pi pi-arrow-right"
iconPos="right"/> : null}
@@ -678,7 +693,7 @@ const BandoApplication = () => {
iconPos="right"/>
: null}
- {'DRAFT' !== applicationStatus
+ {'AWAITING' === applicationStatus
?
: null}
- {'DRAFT' !== applicationStatus
+ {['AWAITING', 'READY'].includes(applicationStatus)
?
diff --git a/src/pages/SoccorsoIstruttorioPreInstructor/index.js b/src/pages/SoccorsoIstruttorioPreInstructor/index.js
index c254df7..6a92b97 100644
--- a/src/pages/SoccorsoIstruttorioPreInstructor/index.js
+++ b/src/pages/SoccorsoIstruttorioPreInstructor/index.js
@@ -1,10 +1,31 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
import { __ } from '@wordpress/i18n';
// components
import PreInstructorSoccorsiTable from './components/PreInstructorSoccorsiTable';
+import DashboardService from '../../service/dashboard-service';
+import { pathOr } from 'ramda';
+import NumberFlow from '@number-flow/react';
const SoccorsoIstruttorioPreInstructor = () => {
+ const [mainStats, setMainStats] = useState({});
+
+ const getStats = (data) => {
+ if (data.status === 'SUCCESS') {
+ setMainStats(data.data);
+ }
+ }
+
+ const errGetStats = () => {}
+
+ const getStatValue = (key, fallback = '') => {
+ return pathOr(fallback, [key], mainStats);
+ }
+
+ useEffect(() => {
+ DashboardService.getAmendmentsStats(getStats, errGetStats);
+ }, []);
+
return(
@@ -16,6 +37,57 @@ const SoccorsoIstruttorioPreInstructor = () => {
+
+
+
+
+
{__('Riepilogo', 'gepafin')}
+
+
+ {__('Totale richieste', 'gepafin')}
+
+
+
+ {__('In attesa risposta', 'gepafin')}
+
+
+
+ {__('Risposte ricevute', 'gepafin')}
+
+
+
+ {__('Tempo medio di risposta', 'gepafin')}
+
+
+
+ {__('Scadute', 'gepafin')}
+
+
+
+ {__('Richieste in scadenza (48h)', 'gepafin')}
+
+
+
+
)
}
diff --git a/src/service/dashboard-service.js b/src/service/dashboard-service.js
index 87d7572..6951e9c 100644
--- a/src/service/dashboard-service.js
+++ b/src/service/dashboard-service.js
@@ -12,6 +12,10 @@ export default class DashboardService {
NetworkService.get(`${API_BASE_URL}/dashboard/application`, callback, errCallback);
};
+ static getAmendmentsStats = (callback, errCallback) => {
+ NetworkService.get(`${API_BASE_URL}/dashboard/amendment`, callback, errCallback);
+ };
+
static getBeneficiaryStatsForCompany = (id, callback, errCallback) => {
NetworkService.get(`${API_BASE_URL}/dashboard/beneficiary/company/${id}`, callback, errCallback);
};