diff --git a/src/helpers/getBandoLabel.js b/src/helpers/getBandoLabel.js index 1816a42..7cbf3bf 100644 --- a/src/helpers/getBandoLabel.js +++ b/src/helpers/getBandoLabel.js @@ -59,6 +59,9 @@ const getBandoLabel = (status) => { case 'CLOSE': return __('Chiuso', 'gepafin'); + case 'REJECTED': + return __('Respinto', 'gepafin'); + default: return ''; } diff --git a/src/helpers/getBandoSeverity.js b/src/helpers/getBandoSeverity.js index d6c4dbf..03b8704 100644 --- a/src/helpers/getBandoSeverity.js +++ b/src/helpers/getBandoSeverity.js @@ -57,6 +57,9 @@ const getBandoSeverity = (status) => { case 'CLOSE': return 'closed'; + case 'REJECTED': + return 'danger'; + default: return 'info'; } diff --git a/src/pages/BandoViewBeneficiario/index.js b/src/pages/BandoViewBeneficiario/index.js index f6bea38..ab99cb8 100644 --- a/src/pages/BandoViewBeneficiario/index.js +++ b/src/pages/BandoViewBeneficiario/index.js @@ -1,7 +1,7 @@ import React, { useState, useEffect, useRef } from 'react'; import { __ } from '@wordpress/i18n'; import { useNavigate, useParams } from 'react-router-dom'; -import { is, isEmpty, isNil } from 'ramda'; +import { head, is, isEmpty, isNil } from 'ramda'; import 'quill/dist/quill.core.css'; // store @@ -12,11 +12,13 @@ import getNumberWithCurrency from '../../helpers/getNumberWithCurrency'; import getDateFromISOstring from '../../helpers/getDateFromISOstring'; import set404FromErrorResponse from '../../helpers/set404FromErrorResponse'; import renderHtmlContent from '../../helpers/renderHtmlContent'; +import isDateTimeInPast from '../../helpers/isDateTimeInPast'; // api import BandoService from '../../service/bando-service'; import FaqItemService from '../../service/faq-item-service'; import ApplicationService from '../../service/application-service'; +import PreferredBandoService from '../../service/preferred-bando-service'; // components import { Skeleton } from 'primereact/skeleton'; @@ -28,8 +30,6 @@ import { Message } from 'primereact/message'; import { Toast } from 'primereact/toast'; import { Editor } from 'primereact/editor'; import { Dialog } from 'primereact/dialog'; -import PreferredBandoService from '../../service/preferred-bando-service'; -import isDateTimeInPast from '../../helpers/isDateTimeInPast'; const REACT_APP_HUB_ID = process.env.REACT_APP_HUB_ID; @@ -244,7 +244,10 @@ const BandoViewBeneficiario = () => { const getApplCallback = (data) => { if (data.status === 'SUCCESS') { if (data.data.length) { - setApplicationObj(data.data[0]); + const nonRejectedAppl = head(data.data.filter(o => !['REJECTED'].includes(o.status))); + if (nonRejectedAppl) { + setApplicationObj(nonRejectedAppl); + } } } storeSet.main.unsetAsyncRequest(); diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js index c47351e..a85efde 100644 --- a/src/pages/DomandaEditInstructorManager/index.js +++ b/src/pages/DomandaEditInstructorManager/index.js @@ -204,25 +204,28 @@ const DomandaEditInstructorManager = () => { setData(getFormattedData(resp.data)); setMotivation(resp.data.motivation); updateFlagsForSoccorso(resp.data); - setFormData(resp.data.applicationEvaluationFormResponse.content); - setFormId(resp.data.applicationEvaluationFormResponse.id); - let formDataInitial = {}; - if (resp.data.applicationEvaluationFormResponse.formFields) { - const submitData = resp.data.applicationEvaluationFormResponse.formFields.map((o) => ({ - fieldId: o.fieldId, - fieldValue: o.fieldValue - })); - formDataInitial = submitData.reduce((acc, cur) => { - if (cur.fieldValue) { - acc[cur.fieldId] = cur.fieldValue; - } - return acc; - }, formDataInitial); + if (resp.data.evaluationVersion === 'V2') { + setFormData(resp.data.applicationEvaluationFormResponse.content); + setFormId(resp.data.applicationEvaluationFormResponse.id); + let formDataInitial = {}; + + if (resp.data.applicationEvaluationFormResponse.formFields) { + const submitData = resp.data.applicationEvaluationFormResponse.formFields.map((o) => ({ + fieldId: o.fieldId, + fieldValue: o.fieldValue + })); + formDataInitial = submitData.reduce((acc, cur) => { + if (cur.fieldValue) { + acc[cur.fieldId] = cur.fieldValue; + } + return acc; + }, formDataInitial); + } + + reset(); + setFormInitialData(formDataInitial); } - - reset(); - setFormInitialData(formDataInitial); } storeSet.main.unsetAsyncRequest(); }