BFLOWS/bflows-bandi-fe
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #59 from Kitzanos/master-sync/01-10-2025

Browse Source 
Master sync/01 10 2025
This commit is contained in:
Vitalii Kiiko
2025-10-01 11:23:23 +02:00
committed by GitHub
parent fd6f861024 0ea7fc5ca5
commit facc022f3a
14 changed files with 602 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.env
View File

@@ -4,6 +4,7 @@ REACT_APP_API_ADDRESS=https://api-dev-gepafin.memento.credit
REACT_APP_API_ADDRESS_WS=https://api-dev-gepafin.memento.credit/wss
REACT_APP_LOGO_FILENAME=gepafin-logo.svg
REACT_APP_FAVICON_FILENAME=gepafin-favicon.ico
# t7jh5wfg9QXylNaTZkPoE - sviluppumbria | p4lk3bcx1RStqTaIVVbXs - gepafin
REACT_APP_HUB_ID=p4lk3bcx1RStqTaIVVbXs
REACT_APP_EVALUATION_FLOW_ID=1
REACT_APP_LOCAL_DEVELOPMENT=1

54
src/assets/scss/components/evaluation.scss
View File

@@ -39,3 +39,57 @@
padding: 3px;
}
}
.file-upload-container {
display: flex;
flex-direction: column;
gap: 0.5rem;
}
.file-upload-item {
display: flex;
align-items: center;
justify-content: space-between;
padding: 0.5rem;
border: 1px solid #dee2e6;
border-radius: 4px;
background-color: #f8f9fa;
.file-name {
font-size: 0.875rem;
color: #495057;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
flex: 1;
margin-right: 0.5rem;
.pi-file {
margin-right: 0.5rem;
}
}
.p-button {
min-width: auto;
padding: 0.25rem;
}
}
.file-upload-button {
cursor: pointer;
display: inline-flex;
align-items: center;
gap: 0.5rem;
padding: 0.5rem 1rem;
border-radius: 4px;
border: 1px dashed #007ad9;
background-color: transparent;
color: #007ad9;
font-size: 0.875rem;
text-decoration: none;
transition: background-color 0.2s;
&:hover {
background-color: rgba(0, 122, 217, 0.04);
}
}

2
src/components/FormField/components/CriteriaTable/RenderTable/components/LastRowCell/index.js
View File

@@ -2,7 +2,7 @@ import { head, is, isNil, pathOr } from 'ramda';
import getNumberFormatted from '../../../../../../../helpers/getNumberFormatted';
const LastRowCell = ({columnId, lastRowCfg, columnMeta = {}, tableValue = []}) => {
const cellData = head(lastRowCfg.filter(o => !isNil(o[columnId])));
const cellData = pathOr({}, [], head(lastRowCfg.filter(o => !isNil(o[columnId]))));
let cellValue = cellData[columnId];
if (columnMeta.enableFormula) {

4
src/components/FormField/components/Table/RenderTable/components/LastRowCell/index.js
View File

@@ -1,9 +1,9 @@
import { head, isNil, sum } from 'ramda';
import { head, isNil, pathOr, sum } from 'ramda';
import getNumberFormatted from '../../../../../../../helpers/getNumberFormatted';
import parseLocaleNumber from '../../../../../../../helpers/parseLocaleNumber';
const LastRowCell = ({columnId, lastRowCfg, columnMeta = {}, getColumnDataFn}) => {
const cellData = head(lastRowCfg.filter(o => !isNil(o[columnId])));
const cellData = pathOr({}, [], head(lastRowCfg.filter(o => !isNil(o[columnId]))));
let cellValue = cellData[columnId];
if (columnMeta.enableFormula) {

3
src/helpers/getBandoLabel.js
View File

@@ -35,6 +35,9 @@ const getBandoLabel = (status) => {
case 'TECHNICAL_EVALUATION':
return __('Valutazione technico-finanziaria', 'gepafin');
case 'AWAITING_TECHNICAL_EVALUATION':
return __('Pre valutazione technico-finanziaria', 'gepafin');
case 'DUE':
return __('In scadenza', 'gepafin');

3
src/helpers/getBandoSeverity.js
View File

@@ -33,6 +33,9 @@ const getBandoSeverity = (status) => {
case 'TECHNICAL_EVALUATION':
return 'info';
case 'AWAITING_TECHNICAL_EVALUATION':
return 'warning';
case 'DUE':
return 'warning';

279
src/pages/DomandaEditInstructorManager/index.js
View File

@@ -4,9 +4,9 @@ import { useNavigate, useParams } from 'react-router-dom';
import { is, isEmpty, isNil, sum, pathOr, head, pluck } from 'ramda';
import { klona } from 'klona';
import { wrap } from 'object-path-immutable';
import { useForm } from 'react-hook-form';
import { evaluate } from 'mathjs';
import equal from 'fast-deep-equal';
import { useForm } from 'react-hook-form';
// store
import { storeGet, storeSet, useStoreValue } from '../../store';
@@ -44,6 +44,7 @@ import { InputNumber } from 'primereact/inputnumber';
import { Toast } from 'primereact/toast';
import { Dialog } from 'primereact/dialog';
import HelpIcon from '../../icons/HelpIcon';
import BlockingOverlay from '../../components/BlockingOverlay';
import { classNames } from 'primereact/utils';
import { InputTextarea } from 'primereact/inputtextarea';
import { InputText } from 'primereact/inputtext';
@@ -54,6 +55,7 @@ import ApplicationDownloadFiles from '../DomandaEditPreInstructor/components/App
import FormField from '../../components/FormField';
import SoccorsoResendEmails from '../SoccorsoEditPreInstructor/components/SoccorsoResendEmails';
import EvaluationReAdmit from '../DomandaEditPreInstructor/components/EvaluationReAdmit';
import { SplitButton } from 'primereact/splitbutton';
const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
const APP_HUB_ID = process.env.REACT_APP_HUB_ID;
@@ -69,12 +71,19 @@ const DomandaEditInstructorManager = () => {
const [isAdmissible, setIsAdmissible] = useState(false);
const [connectedSoccorsoId, setConnectedSoccorsoId] = useState(0);
const toast = useRef(null);
const tecFinBtnRef = useRef(null);
const [loading, setLoading] = useState(false);
const [isVisibleCompleteDialog, setIsVisibleCompleteDialog] = useState(false);
const [operationType, setOperationType] = useState('');
const [motivation, setMotivation] = useState('');
const [amountAccepted, setAmountAccepted] = useState(0);
const [isVisibleAppointmentDialog, setIsVisibleAppointmentDialog] = useState(false);
const [isVisiblePreTecEvalDialog, setIsVisiblePreTecEvalDialog] = useState(false);
const [preTecEvalData, setPreTecEvalData] = useState({
amendmentDocumentType: '',
pec: '',
amount: 0
});
const [allFilesRated, setAllFilesRated] = useState(false);
const [atLeastOneChecked, setAtLeastOneChecked] = useState(false);
const [allChecksChecked, setAllChecksChecked] = useState(false);
@@ -276,6 +285,40 @@ const DomandaEditInstructorManager = () => {
};
const header = renderHeader();
const technicalEvalItems = [
{
label: __('Nessuna garanzia', 'gepafin'),
icon: 'pi pi-pen-to-square',
command: () => {
setPreTecEvalData(prev => ({ ...prev, amendmentDocumentType: 'NESSUNA_GARANZIA' }));
setIsVisiblePreTecEvalDialog(true);
}
},
{
label: __('Garanzia MCC', 'gepafin'),
icon: 'pi pi-pen-to-square',
command: () => {
setPreTecEvalData(prev => ({ ...prev, amendmentDocumentType: 'GARANZIA_MCC' }));
setIsVisiblePreTecEvalDialog(true);
}
},
{
label: __('Garanzia MCC Start-Up', 'gepafin'),
icon: 'pi pi-pen-to-square',
command: () => {
setPreTecEvalData(prev => ({ ...prev, amendmentDocumentType: 'MCC_START_UP' }));
setIsVisiblePreTecEvalDialog(true);
}
},
{
label: __('Altre garanzie (fideiussioni)', 'gepafin'),
icon: 'pi pi-pen-to-square',
command: () => {
setPreTecEvalData(prev => ({ ...prev, amendmentDocumentType: 'ALTRE_GARANZIE' }));
setIsVisiblePreTecEvalDialog(true);
}
}
]
const updateEvaluationValue = (value, path, maxValue = null) => {
let finalValue = value;
@@ -579,6 +622,8 @@ const DomandaEditInstructorManager = () => {
if (data.status === 'SUCCESS') {
if (data.data.length) {
setConnectedSoccorsoId(data.data[0].id);
} else {
setConnectedSoccorsoId(0);
}
}
}
@@ -700,7 +745,7 @@ const DomandaEditInstructorManager = () => {
setIsVisibleAppointmentDialog(true);
}
const setFieldValue = (name, value) => {
const setAppointmentFieldValue = (name, value) => {
const newData = wrap(appointmentData).set(name, value).value();
setAppointmentData(newData);
}
@@ -724,6 +769,30 @@ const DomandaEditInstructorManager = () => {
</div>
}
const setPreTecEvalFieldValue = (name, value) => {
const newData = wrap(preTecEvalData).set(name, value).value();
setPreTecEvalData(newData);
}
const headerPreTecEvalDialog = () => {
return <span>{__('Valutazione Tecnico-Finanziaria', 'gepafin')}</span>;
}
const hidePreTecEvalDialog = () => {
setIsVisiblePreTecEvalDialog(false);
setPreTecEvalData({});
}
const footerPreTecEvalDialog = () => {
return <div>
<Button type="button" label={__('Annulla', 'gepafin')} onClick={hidePreTecEvalDialog} outlined/>
<Button
type="button"
disabled={loading}
label={__('Invia', 'gepafin')} onClick={doCreateSpecialAmendment}/>
</div>
}
const doCreateAppointmentRequest = () => {
if (
!isEmpty(appointmentData.title) && !isEmpty(appointmentData.text) && !isEmpty(appointmentData.amount)
@@ -776,6 +845,48 @@ const DomandaEditInstructorManager = () => {
storeSet('unsetAsyncRequest');
}
const doCreateSpecialAmendment = useCallback(() => {
if (
!isEmpty(preTecEvalData.amount) && !isEmpty(preTecEvalData.pec) && !isEmpty(preTecEvalData.amendmentDocumentType)
) {
storeSet('setAsyncRequest');
AmendmentsService.createAmendmentSpecial(preTecEvalData, getAmendmentSpecialCallback, errGetAmendmentSpecialCallback,
[
['applicationEvaluationId', data.id]
]);
}
}, [preTecEvalData, data]);
const getAmendmentSpecialCallback = (data) => {
if (data.status === 'SUCCESS') {
if (toast.current && data.message) {
toast.current.show({
severity: 'success',
summary: '',
detail: data.message
});
}
}
setIsVisiblePreTecEvalDialog(false);
setPreTecEvalData({});
storeSet('unsetAsyncRequest');
}
const errGetAmendmentSpecialCallback = (data) => {
if (toast.current && data.message) {
toast.current.show({
severity: data.status === 'SUCCESS' ? 'info' : 'error',
summary: '',
detail: data.message
});
}
setIsVisiblePreTecEvalDialog(false);
setPreTecEvalData({});
set404FromErrorResponse(data);
storeSet('unsetAsyncRequest');
}
const doMakeAdmisible = () => {
doSaveDraft(null, {
applicationStatus: 'ADMISSIBLE'
@@ -796,9 +907,9 @@ const DomandaEditInstructorManager = () => {
}
const shouldDisableNewSoccorso = () => {
if (data.evaluationVersion === 'V1') {
return !allFilesRated || !atLeastOneChecked;
} else if (data.evaluationVersion === 'V2') {
if (APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE') {
return !data.ndg || !data.appointmentId || !allFilesRated || !atLeastOneChecked;
} else if (APP_HUB_ID === 't7jh5wfg9QXylNaTZkPoE') {
return !allFilesRated || !atLeastOneChecked;
} else {
return true;
@@ -812,7 +923,11 @@ const DomandaEditInstructorManager = () => {
const actionBtns = () => {
return <div className="appPageSection__actions">
{['EVALUATION', 'SOCCORSO', 'CLOSE'].includes(data.applicationStatus)
{(['SOCCORSO', 'CLOSE', 'EVALUATION', 'NDG', 'APPOINTMENT', 'ADMISSIBLE',
'AWAITING_TECHNICAL_EVALUATION', 'TECHNICAL_EVALUATION'].includes(data.applicationStatus)
&& APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE')
|| (['SOCCORSO', 'CLOSE', 'EVALUATION', 'ADMISSIBLE', 'TECHNICAL_EVALUATION'].includes(data.applicationStatus)
&& APP_HUB_ID === 't7jh5wfg9QXylNaTZkPoE')
? <Button
type="button"
disabled={!data.id || data.status === 'CLOSE'
@@ -821,7 +936,7 @@ const DomandaEditInstructorManager = () => {
onClick={doNewSoccorso}
outlined
label={<>
{data.applicationStatus === 'EVALUATION'
{connectedSoccorsoId === 0
? __('Richiedi soccorso istruttorio', 'gepafin')
: __('Apri soccorso istruttorio', 'gepafin')}
<i style={{ marginLeft: 7 }}>
@@ -846,7 +961,7 @@ const DomandaEditInstructorManager = () => {
&& APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
? <Button
type="button"
disabled={!data.id || !allFilesRated || !allChecksChecked
disabled={!data.id
|| !['EVALUATION'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
onClick={doCheckNDG}
label={__('Controlla NDG', 'gepafin')}
@@ -858,15 +973,37 @@ const DomandaEditInstructorManager = () => {
onClick={doCreateAppointment}
label={__('Crea l\'appuntamento', 'gepafin')}
/> : null}
<Button
{APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
? <Button
type="button"
disabled={!data.id || !['APPOINTMENT'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
disabled={!data.id || !allFilesRated || !allChecksChecked
|| !['APPOINTMENT'].includes(data.applicationStatus) || evaluationBlockedForUser(data) || connectedSoccorsoId !== 0}
onClick={doMakeAdmisible}
label={__('Ammissibile formalmente', 'gepafin')}
/>
<Button
: <Button
type="button"
disabled={!data.id || !['ADMISSIBLE'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
disabled={!data.id || !allFilesRated || !allChecksChecked
|| evaluationBlockedForUser(data) || connectedSoccorsoId !== 0}
onClick={doMakeAdmisible}
label={__('Ammissibile formalmente', 'gepafin')}
/>}
{APP_HUB_ID === 't7jh5wfg9QXylNaTZkPoE'
? <Button
type="button"
disabled={!data.id || !['ADMISSIBLE'].includes(data.applicationStatus) || evaluationBlockedForUser(data) || connectedSoccorsoId !== 0}
onClick={doPassTechnicalEvaluation}
icon="pi pi-info-circle" iconPos="right"
tooltip={isAdmissible
? __('Punteggio sufficiente per passaggio alla valutazione tecnica ed economico finanziaria', 'gepafin')
: __('Punteggio non sufficiente per passaggio alla valutazione tecnica ed economico finanziaria', 'gepafin')}
severity={isAdmissible ? 'success' : 'warning'}
label={__('Valutazione tecnico-finanziaria positiva', 'gepafin')}
/> : null}
{APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE' && data.applicationStatus === 'AWAITING_TECHNICAL_EVALUATION'
? <Button
type="button"
disabled={!data.id || !['ADMISSIBLE'].includes(data.applicationStatus) || evaluationBlockedForUser(data) || connectedSoccorsoId !== 0}
onClick={doPassTechnicalEvaluation}
icon="pi pi-info-circle" iconPos="right"
tooltip={isAdmissible
@@ -875,6 +1012,15 @@ const DomandaEditInstructorManager = () => {
severity={isAdmissible ? 'success' : 'warning'}
label={__('Valutazione tecnico-finanziaria positiva', 'gepafin')}
/>
: APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
? <SplitButton
ref={tecFinBtnRef}
disabled={!data.id || !['ADMISSIBLE'].includes(data.applicationStatus) || evaluationBlockedForUser(data) || connectedSoccorsoId !== 0}
label={__('Valutazione tecnico-finanziaria', 'gepafin')}
onClick={(e) => {
tecFinBtnRef.current.show(e);
}}
model={technicalEvalItems}/> : null}
<Button
type="button"
disabled={!data.id || !['TECHNICAL_EVALUATION'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
@@ -887,19 +1033,22 @@ const DomandaEditInstructorManager = () => {
? <Button
type="button"
disabled={!isAdmissible
|| ['APPROVED'].includes(data.applicationStatus)
|| ['APPROVED', 'REJECTED'].includes(data.applicationStatus)
|| evaluationBlockedForUser(data)
|| (APP_EVALUATION_FLOW_ID === '1' && !['ADMISSIBLE', 'TECHNICAL_EVALUATION'].includes(data.applicationStatus))
|| (APP_EVALUATION_FLOW_ID === '1' && !['TECHNICAL_EVALUATION'].includes(data.applicationStatus))
|| connectedSoccorsoId !== 0
}
onClick={initiateApproving}
label={__('Domanda deliberata', 'gepafin')}
label={__('Domanda in Graduatoria Definitiva', 'gepafin')}
icon="pi pi-check" iconPos="right"/> : null}
{data.id
? <Button
type="button"
disabled={APP_EVALUATION_FLOW_ID === '1'
&& (!['EVALUATION', 'ADMISSIBLE', 'NDG', 'APPOINTMENT'].includes(data.applicationStatus)
|| evaluationBlockedForUser(data))}
disabled={['APPROVED', 'REJECTED'].includes(data.applicationStatus)
|| (APP_EVALUATION_FLOW_ID === '1'
&& (!['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
|| evaluationBlockedForUser(data)))
}
onClick={initiateRejecting}
label={__('Respingi domanda', 'gepafin')}
icon="pi pi-times" iconPos="right"/> : null}
@@ -951,6 +1100,7 @@ const DomandaEditInstructorManager = () => {
console.error('Error in formula', formula)
context = {}
}
const mathFormula = renderWithDataVars(formula.value, context);
try {
updatedFormValues[o.id] = evaluate(mathFormula);
@@ -1009,6 +1159,7 @@ const DomandaEditInstructorManager = () => {
<div className="appPage__spacer"></div>
<Toast ref={toast}/>
<BlockingOverlay shouldDisplay={isAsyncRequest}/>
<div className="appPageSection__row">
<Button
@@ -1290,10 +1441,10 @@ const DomandaEditInstructorManager = () => {
<td>
{isAdmissible
? <Tag icon="pi pi-check" severity="success"
value={__('Punteggio sufficiente per passaggio alla valutazione tecnica ed economico finanziaria')}></Tag> : null}
value={__('Punteggio sufficiente per passaggio alla valutazione tecnica ed economico finanziaria', 'gepafin')}></Tag> : null}
{!isAdmissible
? <Tag icon="pi pi-times" severity="warning"
value={__('Punteggio non sufficiente per passaggio alla valutazione tecnica ed economico finanziaria')}></Tag> : null}
value={__('Punteggio non sufficiente per passaggio alla valutazione tecnica ed economico finanziaria', 'gepafin')}></Tag> : null}
</td>
</tr>
</tbody>
@@ -1373,9 +1524,10 @@ const DomandaEditInstructorManager = () => {
</label>
<InputNumber
value={appointmentData.amount}
keyfilter="int"
locale="it-IT"
minFractionDigits={2}
invalid={isEmpty(appointmentData.amount) || appointmentData.amount === 0}
onChange={(e) => setFieldValue('amount', e.value)}/>
onChange={(e) => setAppointmentFieldValue('amount', e.value)}/>
</div>
<div className="appForm__field">
<label
@@ -1386,7 +1538,7 @@ const DomandaEditInstructorManager = () => {
value={appointmentData.duration}
keyfilter="int"
invalid={isEmpty(appointmentData.duration) || appointmentData.duration === 0}
onChange={(e) => setFieldValue('duration', e.value)}/>
onChange={(e) => setAppointmentFieldValue('duration', e.value)}/>
</div>
<div className="appForm__field">
<label className={classNames({ 'p-error': isEmpty(appointmentData.title) })}>
@@ -1395,7 +1547,7 @@ const DomandaEditInstructorManager = () => {
<InputText
value={appointmentData.title}
invalid={isEmpty(appointmentData.title)}
onChange={(e) => setFieldValue('title', e.target.value)}/>
onChange={(e) => setAppointmentFieldValue('title', e.target.value)}/>
</div>
<div className="appForm__field">
<label className={classNames({ 'p-error': isEmpty(appointmentData.text) })}>
@@ -1404,12 +1556,89 @@ const DomandaEditInstructorManager = () => {
<InputTextarea
value={appointmentData.text}
invalid={isEmpty(appointmentData.text)}
onChange={(e) => setFieldValue('text', e.target.value)}
onChange={(e) => setAppointmentFieldValue('text', e.target.value)}
rows={3}
cols={30}/>
</div>
</Dialog>
<Dialog
visible={isVisiblePreTecEvalDialog}
modal
header={headerPreTecEvalDialog}
footer={footerPreTecEvalDialog}
style={{ maxWidth: '600px', width: '100%' }}
onHide={hidePreTecEvalDialog}>
<div className="appForm__field">
<label
className={classNames({ 'p-error': isEmpty(preTecEvalData.amount) || preTecEvalData.amount === 0 })}>
{__('Importo', 'gepafin')}
</label>
<InputNumber
value={preTecEvalData.amount}
locale="it-IT"
minFractionDigits={2}
invalid={isEmpty(preTecEvalData.amount) || preTecEvalData.amount === 0}
onChange={(e) => setPreTecEvalFieldValue('amount', e.value)}/>
</div>
<div className="appForm__field">
<label className={classNames({ 'p-error': isEmpty(preTecEvalData.pec) })}>
{__('PEC', 'gepafin')}
</label>
<InputText
value={preTecEvalData.title}
invalid={isEmpty(preTecEvalData.title)}
onChange={(e) => setPreTecEvalFieldValue('pec', e.target.value)}/>
</div>
{/*<div className="appForm__field">
<label>
{__('Files', 'gepafin')}
</label>
<div className="file-upload-container">
{(preTecEvalData.files || []).map((file, index) => (
<div key={index} className="file-upload-item">
<span className="file-name">
<i className="pi pi-file"></i>
{file.name}
</span>
<button
type="button"
className="p-button p-button-sm p-button-danger p-button-text"
onClick={() => {
const newFiles = [...(preTecEvalData.files || [])];
newFiles.splice(index, 1);
setPreTecEvalFieldValue('files', newFiles);
}}
>
<i className="pi pi-times"></i>
</button>
</div>
))}
<div>
<input
type="file"
id="file-upload"
style={{ display: 'none' }}
multiple
onChange={(e) => {
const newFiles = Array.from(e.target.files);
const existingFiles = preTecEvalData.files || [];
setPreTecEvalFieldValue('files', [...existingFiles, ...newFiles]);
e.target.value = '';
}}
/>
<label
htmlFor="file-upload"
className="file-upload-button"
>
<i className="pi pi-upload"></i>
{__('Add Files', 'gepafin')}
</label>
</div>
</div>
</div>*/}
</Dialog>
</div>
: <>
<Skeleton width="20%" height="1rem" className="mb-2"></Skeleton>

270
src/pages/DomandaEditPreInstructor/index.js
View File

@@ -28,11 +28,11 @@ import {
isPIVA,
isUrl, maxChecks, minChecks, nonEmptyTables
} from '../../helpers/validators';
import formatDateString from '../../helpers/formatDateString';
import getTokens from '../../helpers/getTokens';
import parseCommaDecimal from '../../helpers/parseCommaDecimal';
import renderWithDataVars from '../../helpers/renderWithDataVars';
import renderHtmlContent from '../../helpers/renderHtmlContent';
import formatDateString from '../../helpers/formatDateString';
// components
import { Skeleton } from 'primereact/skeleton';
@@ -55,6 +55,7 @@ import ApplicationDownloadFiles from './components/ApplicationDownloadFiles';
import FormField from '../../components/FormField';
import SoccorsoResendEmails from '../SoccorsoEditPreInstructor/components/SoccorsoResendEmails';
import EvaluationReAdmit from './components/EvaluationReAdmit';
import { SplitButton } from 'primereact/splitbutton';
const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
const APP_HUB_ID = process.env.REACT_APP_HUB_ID;
@@ -70,12 +71,19 @@ const DomandaEditPreInstructor = () => {
const [isAdmissible, setIsAdmissible] = useState(false);
const [connectedSoccorsoId, setConnectedSoccorsoId] = useState(0);
const toast = useRef(null);
const tecFinBtnRef = useRef(null);
const [loading, setLoading] = useState(false);
const [isVisibleCompleteDialog, setIsVisibleCompleteDialog] = useState(false);
const [operationType, setOperationType] = useState('');
const [motivation, setMotivation] = useState('');
const [amountAccepted, setAmountAccepted] = useState(0);
const [isVisibleAppointmentDialog, setIsVisibleAppointmentDialog] = useState(false);
const [isVisiblePreTecEvalDialog, setIsVisiblePreTecEvalDialog] = useState(false);
const [preTecEvalData, setPreTecEvalData] = useState({
amendmentDocumentType: '',
pec: '',
amount: 0
});
const [allFilesRated, setAllFilesRated] = useState(false);
const [atLeastOneChecked, setAtLeastOneChecked] = useState(false);
const [allChecksChecked, setAllChecksChecked] = useState(false);
@@ -127,6 +135,7 @@ const DomandaEditPreInstructor = () => {
const updateFlagsForSoccorso = useCallback((data) => {
let nonRatedFilesLength = 0;
let nonRatedAmmendFilesLength = 0;
if (data.files) {
const nonRatedFiles = data.files
@@ -139,10 +148,10 @@ const DomandaEditPreInstructor = () => {
const nonRatedFiles = data.amendmentDetails
.map(el => el.valid)
.filter(v => isNil(v));
nonRatedFilesLength = nonRatedFiles.length;
nonRatedAmmendFilesLength = nonRatedFiles.length;
}
setAllFilesRated(nonRatedFilesLength === 0);
setAllFilesRated(nonRatedFilesLength === 0 && nonRatedAmmendFilesLength === 0);
if (data.evaluationVersion === 'V1') {
if (data.checklist) {
@@ -276,6 +285,40 @@ const DomandaEditPreInstructor = () => {
};
const header = renderHeader();
const technicalEvalItems = [
{
label: __('Nessuna garanzia', 'gepafin'),
icon: 'pi pi-pen-to-square',
command: () => {
setPreTecEvalData(prev => ({ ...prev, amendmentDocumentType: 'NESSUNA_GARANZIA' }));
setIsVisiblePreTecEvalDialog(true);
}
},
{
label: __('Garanzia MCC', 'gepafin'),
icon: 'pi pi-pen-to-square',
command: () => {
setPreTecEvalData(prev => ({ ...prev, amendmentDocumentType: 'GARANZIA_MCC' }));
setIsVisiblePreTecEvalDialog(true);
}
},
{
label: __('Garanzia MCC Start-Up', 'gepafin'),
icon: 'pi pi-pen-to-square',
command: () => {
setPreTecEvalData(prev => ({ ...prev, amendmentDocumentType: 'MCC_START_UP' }));
setIsVisiblePreTecEvalDialog(true);
}
},
{
label: __('Altre garanzie (fideiussioni)', 'gepafin'),
icon: 'pi pi-pen-to-square',
command: () => {
setPreTecEvalData(prev => ({ ...prev, amendmentDocumentType: 'ALTRE_GARANZIE' }));
setIsVisiblePreTecEvalDialog(true);
}
}
]
const updateEvaluationValue = (value, path, maxValue = null) => {
let finalValue = value;
@@ -418,6 +461,7 @@ const DomandaEditPreInstructor = () => {
} else if (data.evaluationVersion === 'V2') {
const newFormValues = getTransformedSubmitData();
const submitData = {
applicationStatus: 'APPROVED',
formFields: newFormValues,
files: klona(data.files),
evaluationDocument: klona(data.evaluationDocument.map(o => ({
@@ -578,6 +622,8 @@ const DomandaEditPreInstructor = () => {
if (data.status === 'SUCCESS') {
if (data.data.length) {
setConnectedSoccorsoId(data.data[0].id);
} else {
setConnectedSoccorsoId(0);
}
}
}
@@ -699,7 +745,7 @@ const DomandaEditPreInstructor = () => {
setIsVisibleAppointmentDialog(true);
}
const setFieldValue = (name, value) => {
const setAppointmentFieldValue = (name, value) => {
const newData = wrap(appointmentData).set(name, value).value();
setAppointmentData(newData);
}
@@ -723,6 +769,30 @@ const DomandaEditPreInstructor = () => {
</div>
}
const setPreTecEvalFieldValue = (name, value) => {
const newData = wrap(preTecEvalData).set(name, value).value();
setPreTecEvalData(newData);
}
const headerPreTecEvalDialog = () => {
return <span>{__('Valutazione Tecnico-Finanziaria', 'gepafin')}</span>;
}
const hidePreTecEvalDialog = () => {
setIsVisiblePreTecEvalDialog(false);
setPreTecEvalData({});
}
const footerPreTecEvalDialog = () => {
return <div>
<Button type="button" label={__('Annulla', 'gepafin')} onClick={hidePreTecEvalDialog} outlined/>
<Button
type="button"
disabled={loading}
label={__('Invia', 'gepafin')} onClick={doCreateSpecialAmendment}/>
</div>
}
const doCreateAppointmentRequest = () => {
if (
!isEmpty(appointmentData.title) && !isEmpty(appointmentData.text) && !isEmpty(appointmentData.amount)
@@ -775,6 +845,48 @@ const DomandaEditPreInstructor = () => {
storeSet('unsetAsyncRequest');
}
const doCreateSpecialAmendment = useCallback(() => {
if (
!isEmpty(preTecEvalData.amount) && !isEmpty(preTecEvalData.pec) && !isEmpty(preTecEvalData.amendmentDocumentType)
) {
storeSet('setAsyncRequest');
AmendmentsService.createAmendmentSpecial(preTecEvalData, getAmendmentSpecialCallback, errGetAmendmentSpecialCallback,
[
['applicationEvaluationId', data.id]
]);
}
}, [preTecEvalData, data]);
const getAmendmentSpecialCallback = (data) => {
if (data.status === 'SUCCESS') {
if (toast.current && data.message) {
toast.current.show({
severity: 'success',
summary: '',
detail: data.message
});
}
}
setIsVisiblePreTecEvalDialog(false);
setPreTecEvalData({});
storeSet('unsetAsyncRequest');
}
const errGetAmendmentSpecialCallback = (data) => {
if (toast.current && data.message) {
toast.current.show({
severity: data.status === 'SUCCESS' ? 'info' : 'error',
summary: '',
detail: data.message
});
}
setIsVisiblePreTecEvalDialog(false);
setPreTecEvalData({});
set404FromErrorResponse(data);
storeSet('unsetAsyncRequest');
}
const doMakeAdmisible = () => {
doSaveDraft(null, {
applicationStatus: 'ADMISSIBLE'
@@ -790,14 +902,14 @@ const DomandaEditPreInstructor = () => {
}, [isAdmissible]);
const evaluationBlockedForUser = (data = {}) => {
const userData = storeGet('userData')
const userData = storeGet('userData');
return isAsyncRequest || userData.id !== data.assignedUserId;
}
const shouldDisableNewSoccorso = () => {
if (data.evaluationVersion === 'V1') {
return !allFilesRated || !atLeastOneChecked;
} else if (data.evaluationVersion === 'V2') {
if (APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE') {
return !data.ndg || !data.appointmentId || !allFilesRated || !atLeastOneChecked;
} else if (APP_HUB_ID === 't7jh5wfg9QXylNaTZkPoE') {
return !allFilesRated || !atLeastOneChecked;
} else {
return true;
@@ -811,7 +923,11 @@ const DomandaEditPreInstructor = () => {
const actionBtns = () => {
return <div className="appPageSection__actions">
{['EVALUATION', 'SOCCORSO', 'CLOSE'].includes(data.applicationStatus)
{(['SOCCORSO', 'CLOSE', 'EVALUATION', 'NDG', 'APPOINTMENT', 'ADMISSIBLE',
'AWAITING_TECHNICAL_EVALUATION', 'TECHNICAL_EVALUATION'].includes(data.applicationStatus)
&& APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE')
|| (['SOCCORSO', 'CLOSE', 'EVALUATION', 'ADMISSIBLE', 'TECHNICAL_EVALUATION'].includes(data.applicationStatus)
&& APP_HUB_ID === 't7jh5wfg9QXylNaTZkPoE')
? <Button
type="button"
disabled={!data.id || data.status === 'CLOSE'
@@ -820,7 +936,7 @@ const DomandaEditPreInstructor = () => {
onClick={doNewSoccorso}
outlined
label={<>
{data.applicationStatus === 'EVALUATION'
{connectedSoccorsoId === 0
? __('Richiedi soccorso istruttorio', 'gepafin')
: __('Apri soccorso istruttorio', 'gepafin')}
<i style={{ marginLeft: 7 }}>
@@ -845,7 +961,7 @@ const DomandaEditPreInstructor = () => {
&& APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
? <Button
type="button"
disabled={!data.id || !allFilesRated || !allChecksChecked
disabled={!data.id
|| !['EVALUATION'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
onClick={doCheckNDG}
label={__('Controlla NDG', 'gepafin')}
@@ -857,15 +973,37 @@ const DomandaEditPreInstructor = () => {
onClick={doCreateAppointment}
label={__('Crea l\'appuntamento', 'gepafin')}
/> : null}
<Button
{APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
? <Button
type="button"
disabled={!data.id || !['APPOINTMENT'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
disabled={!data.id || !allFilesRated || !allChecksChecked
|| !['APPOINTMENT'].includes(data.applicationStatus) || evaluationBlockedForUser(data) || connectedSoccorsoId !== 0}
onClick={doMakeAdmisible}
label={__('Ammissibile formalmente', 'gepafin')}
/>
<Button
: <Button
type="button"
disabled={!data.id || !['ADMISSIBLE'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
disabled={!data.id || !allFilesRated || !allChecksChecked
|| evaluationBlockedForUser(data) || connectedSoccorsoId !== 0}
onClick={doMakeAdmisible}
label={__('Ammissibile formalmente', 'gepafin')}
/>}
{APP_HUB_ID === 't7jh5wfg9QXylNaTZkPoE'
? <Button
type="button"
disabled={!data.id || !['ADMISSIBLE'].includes(data.applicationStatus) || evaluationBlockedForUser(data) || connectedSoccorsoId !== 0}
onClick={doPassTechnicalEvaluation}
icon="pi pi-info-circle" iconPos="right"
tooltip={isAdmissible
? __('Punteggio sufficiente per passaggio alla valutazione tecnica ed economico finanziaria', 'gepafin')
: __('Punteggio non sufficiente per passaggio alla valutazione tecnica ed economico finanziaria', 'gepafin')}
severity={isAdmissible ? 'success' : 'warning'}
label={__('Valutazione tecnico-finanziaria positiva', 'gepafin')}
/> : null}
{APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE' && data.applicationStatus === 'AWAITING_TECHNICAL_EVALUATION'
? <Button
type="button"
disabled={!data.id || !['ADMISSIBLE'].includes(data.applicationStatus) || evaluationBlockedForUser(data) || connectedSoccorsoId !== 0}
onClick={doPassTechnicalEvaluation}
icon="pi pi-info-circle" iconPos="right"
tooltip={isAdmissible
@@ -874,6 +1012,15 @@ const DomandaEditPreInstructor = () => {
severity={isAdmissible ? 'success' : 'warning'}
label={__('Valutazione tecnico-finanziaria positiva', 'gepafin')}
/>
: APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
? <SplitButton
ref={tecFinBtnRef}
disabled={!data.id || !['ADMISSIBLE'].includes(data.applicationStatus) || evaluationBlockedForUser(data) || connectedSoccorsoId !== 0}
label={__('Valutazione tecnico-finanziaria', 'gepafin')}
onClick={(e) => {
tecFinBtnRef.current.show(e);
}}
model={technicalEvalItems}/> : null}
<Button
type="button"
disabled={!data.id || !['TECHNICAL_EVALUATION'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
@@ -889,9 +1036,10 @@ const DomandaEditPreInstructor = () => {
|| ['APPROVED', 'REJECTED'].includes(data.applicationStatus)
|| evaluationBlockedForUser(data)
|| (APP_EVALUATION_FLOW_ID === '1' && !['TECHNICAL_EVALUATION'].includes(data.applicationStatus))
|| connectedSoccorsoId !== 0
}
onClick={initiateApproving}
label={__('Domanda deliberata', 'gepafin')}
label={__('Domanda in Graduatoria Definitiva', 'gepafin')}
icon="pi pi-check" iconPos="right"/> : null}
{data.id
? <Button
@@ -912,7 +1060,8 @@ const DomandaEditPreInstructor = () => {
<SoccorsoResendEmails
emailsData={emailSendResponse}
setDataEmailsSoccorso={updateEmailSendResponses}/>
<EvaluationReAdmit id={data.applicationId} status={data.applicationStatus} statusUpdateFn={updateStatusOfAppl}/>
<EvaluationReAdmit id={data.applicationId} status={data.applicationStatus}
statusUpdateFn={updateStatusOfAppl}/>
</div>
}
@@ -1286,7 +1435,7 @@ const DomandaEditPreInstructor = () => {
</tr>)}
<tr>
<td>{__('Punteggio:', 'gepafin')}</td>
<td>{new Intl.NumberFormat("it-IT").format(
<td>{new Intl.NumberFormat('it-IT').format(
sum(data.criteria.map(o => o.score))
)}</td>
<td>
@@ -1378,7 +1527,7 @@ const DomandaEditPreInstructor = () => {
locale="it-IT"
minFractionDigits={2}
invalid={isEmpty(appointmentData.amount) || appointmentData.amount === 0}
onChange={(e) => setFieldValue('amount', e.value)}/>
onChange={(e) => setAppointmentFieldValue('amount', e.value)}/>
</div>
<div className="appForm__field">
<label
@@ -1389,7 +1538,7 @@ const DomandaEditPreInstructor = () => {
value={appointmentData.duration}
keyfilter="int"
invalid={isEmpty(appointmentData.duration) || appointmentData.duration === 0}
onChange={(e) => setFieldValue('duration', e.value)}/>
onChange={(e) => setAppointmentFieldValue('duration', e.value)}/>
</div>
<div className="appForm__field">
<label className={classNames({ 'p-error': isEmpty(appointmentData.title) })}>
@@ -1398,7 +1547,7 @@ const DomandaEditPreInstructor = () => {
<InputText
value={appointmentData.title}
invalid={isEmpty(appointmentData.title)}
onChange={(e) => setFieldValue('title', e.target.value)}/>
onChange={(e) => setAppointmentFieldValue('title', e.target.value)}/>
</div>
<div className="appForm__field">
<label className={classNames({ 'p-error': isEmpty(appointmentData.text) })}>
@@ -1407,12 +1556,89 @@ const DomandaEditPreInstructor = () => {
<InputTextarea
value={appointmentData.text}
invalid={isEmpty(appointmentData.text)}
onChange={(e) => setFieldValue('text', e.target.value)}
onChange={(e) => setAppointmentFieldValue('text', e.target.value)}
rows={3}
cols={30}/>
</div>
</Dialog>
<Dialog
visible={isVisiblePreTecEvalDialog}
modal
header={headerPreTecEvalDialog}
footer={footerPreTecEvalDialog}
style={{ maxWidth: '600px', width: '100%' }}
onHide={hidePreTecEvalDialog}>
<div className="appForm__field">
<label
className={classNames({ 'p-error': isEmpty(preTecEvalData.amount) || preTecEvalData.amount === 0 })}>
{__('Importo', 'gepafin')}
</label>
<InputNumber
value={preTecEvalData.amount}
locale="it-IT"
minFractionDigits={2}
invalid={isEmpty(preTecEvalData.amount) || preTecEvalData.amount === 0}
onChange={(e) => setPreTecEvalFieldValue('amount', e.value)}/>
</div>
<div className="appForm__field">
<label className={classNames({ 'p-error': isEmpty(preTecEvalData.pec) })}>
{__('PEC', 'gepafin')}
</label>
<InputText
value={preTecEvalData.title}
invalid={isEmpty(preTecEvalData.title)}
onChange={(e) => setPreTecEvalFieldValue('pec', e.target.value)}/>
</div>
{/*<div className="appForm__field">
<label>
{__('Files', 'gepafin')}
</label>
<div className="file-upload-container">
{(preTecEvalData.files || []).map((file, index) => (
<div key={index} className="file-upload-item">
<span className="file-name">
<i className="pi pi-file"></i>
{file.name}
</span>
<button
type="button"
className="p-button p-button-sm p-button-danger p-button-text"
onClick={() => {
const newFiles = [...(preTecEvalData.files || [])];
newFiles.splice(index, 1);
setPreTecEvalFieldValue('files', newFiles);
}}
>
<i className="pi pi-times"></i>
</button>
</div>
))}
<div>
<input
type="file"
id="file-upload"
style={{ display: 'none' }}
multiple
onChange={(e) => {
const newFiles = Array.from(e.target.files);
const existingFiles = preTecEvalData.files || [];
setPreTecEvalFieldValue('files', [...existingFiles, ...newFiles]);
e.target.value = '';
}}
/>
<label
htmlFor="file-upload"
className="file-upload-button"
>
<i className="pi pi-upload"></i>
{__('Add Files', 'gepafin')}
</label>
</div>
</div>
</div>*/}
</Dialog>
</div>
: <>
<Skeleton width="20%" height="1rem" className="mb-2"></Skeleton>

2
src/pages/Domande/components/AllDomandeTable/index.js
View File

@@ -37,7 +37,7 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => {
ApplicationService.getApplications(getCallback, errGetCallbacks, [
['statuses', [
'SUBMIT', 'EVALUATION', 'SOCCORSO',
'APPOINTMENT', 'NDG', 'ADMISSIBLE', 'TECHNICAL_EVALUATION'
'APPOINTMENT', 'NDG', 'ADMISSIBLE', 'AWAITING_TECHNICAL_EVALUATION', 'TECHNICAL_EVALUATION'
]]
]);
}, [updaterString]);

2
src/pages/Domande/components/AllDomandeTableAsync/index.js
View File

@@ -43,7 +43,7 @@ const AllDomandeTableAsync = ({ openDialogFn, updaterString = '' }) => {
status: { value: null, matchMode: 'equals' }
}
});
const statuses = ['SUBMIT', 'EVALUATION', 'SOCCORSO', 'APPOINTMENT', 'NDG', 'ADMISSIBLE', 'TECHNICAL_EVALUATION'];
const statuses = ['SUBMIT', 'EVALUATION', 'SOCCORSO', 'APPOINTMENT', 'NDG', 'ADMISSIBLE', 'AWAITING_TECHNICAL_EVALUATION', 'TECHNICAL_EVALUATION'];
const getPaginationQuery = useCallback(() => getQueryParamsForPaginatedEndpoint(lazyState, statuses, 'id'), [lazyState]);

2
src/pages/DomandeBeneficiario/components/AllDomandeBeneficiarioTableAsync/index.js
View File

@@ -92,7 +92,7 @@ const AllDomandeBeneficiarioTableAsync = ({ statuses }) => {
const actionsBodyTemplate = (rowData) => {
return <div className="appPageSection__tableActions">
{rowData.status === 'SOCCORSO'
{['SOCCORSO', 'AWAITING_TECHNICAL_EVALUATION'].includes(rowData.status)
? <Link to={`/domande/${rowData.id}`}>
<Button severity="info" label={__('Dettagli', 'gepafin')} icon="pi pi-eye" size="small"
iconPos="right"/>

2
src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
View File

@@ -42,7 +42,7 @@ const BeneficiarioDomandeTable = () => {
['companyId', chosenCompanyId],
['statuses', [
'SOCCORSO', 'APPROVED', 'REJECTED', 'EVALUATION', 'SUBMIT',
'APPOINTMENT', 'NDG', 'ADMISSIBLE', 'TECHNICAL_EVALUATION'
'APPOINTMENT', 'NDG', 'ADMISSIBLE', 'AWAITING_TECHNICAL_EVALUATION', 'TECHNICAL_EVALUATION'
]
] // 'NDG', 'ADMISSIBLE', 'APPOINTMENT'
]);

2
src/pages/DomandeBeneficiario/index.js
View File

@@ -24,7 +24,7 @@ const DomandeBeneficiario = () => {
<div className="appPageSection">
<AllDomandeBeneficiarioTableAsync statuses={['SOCCORSO', 'APPROVED', 'REJECTED', 'EVALUATION', 'SUBMIT',
'APPOINTMENT', 'NDG', 'ADMISSIBLE', 'TECHNICAL_EVALUATION']}/>
'APPOINTMENT', 'NDG', 'ADMISSIBLE', 'AWAITING_TECHNICAL_EVALUATION', 'TECHNICAL_EVALUATION']}/>
</div>
</div>
)

4
src/service/amendments-service.js
View File

@@ -42,6 +42,10 @@ export default class AmendmentsService {
]);
};
static createAmendmentSpecial = (body, callback, errCallback, queryParams) => {
NetworkService.post(`${API_BASE_URL}/amendments/special`, body, callback, errCallback, queryParams);
};
static sendReminderForSoccorso = (id, callback, errCallback, queryParams) => {
NetworkService.post(`${API_BASE_URL}/amendments/${id}/reminder`, {}, callback, errCallback, queryParams);
};