diff --git a/src/configData.js b/src/configData.js index bf2ff08..8197a94 100644 --- a/src/configData.js +++ b/src/configData.js @@ -269,4 +269,30 @@ export const resendEmailLabelsByType = { APPLICATION_AMENDMENT_REMINDER: 'Invia email (sollecito)', APPLICATION_ADMISSIBLE: 'Invia email (ammisibile)', APPLICATION_REJECTED: 'Invia email (respinto)' +} + +export const rejectionReasons = [ + { label: 'Documentazione incompleta', text: 'la stessa è stata sottoposta ad istruttoria di ammissibilità con esito negativo.' }, + { label: 'Altri motivi', text: 'altri motivi' } +] + +export const amendmentRequestedDocs = { + NESSUNA_GARANZIA: [ + 'lettera di accettazione firmata' + ], + GARANZIA_MCC: [ + 'lettera di accettazione firmata', + 'Modulo di domanda della agevolazione (ex allegato 4)' + ], + MCC_START_UP: [ + 'lettera di accettazione firmata', + 'Modulo di domanda della agevolazione (ex allegato 4)', + 'Modello di valutazione bilanci previsionali', + 'Modello valutazione start up' + ], + ALTRE_GARANZIE: [ + 'lettera di accettazione firmata', + 'modello privacy', + 'autocertificazione e altri eventuali in zip/p7m' + ], } \ No newline at end of file diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js index 015156d..4522fa8 100644 --- a/src/pages/DomandaEditInstructorManager/index.js +++ b/src/pages/DomandaEditInstructorManager/index.js @@ -48,6 +48,7 @@ import BlockingOverlay from '../../components/BlockingOverlay'; import { classNames } from 'primereact/utils'; import { InputTextarea } from 'primereact/inputtextarea'; import { InputText } from 'primereact/inputtext'; +import { Dropdown } from 'primereact/dropdown'; import ListOfFiles from '../DomandaEditPreInstructor/components/ListOfFiles'; import RepeaterFields from '../DomandaEditPreInstructor/components/RepeaterFields'; import ApplicationInfo from '../DomandaEditPreInstructor/components/ApplicationInfo'; @@ -57,7 +58,7 @@ import SoccorsoResendEmails from '../SoccorsoEditPreInstructor/components/Soccor import EvaluationReAdmit from '../DomandaEditPreInstructor/components/EvaluationReAdmit'; import { SplitButton } from 'primereact/splitbutton'; import { FileUpload } from 'primereact/fileupload'; -import { defaultMaxFileSize, mimeTypes } from '../../configData'; +import { defaultMaxFileSize, mimeTypes, rejectionReasons } from '../../configData'; import getFormatedFileSizeText from '../../helpers/getFormatedFileSizeText'; const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID; @@ -377,9 +378,15 @@ const DomandaEditInstructorManager = () => { ...cfgModifier }; + const formDataToSend = new FormData(); + const jsonBlob = new Blob([JSON.stringify(submitData)], { + type: 'application/json' + }); + formDataToSend.append('evaluationRequest', jsonBlob); + ApplicationEvaluationService.updateEvaluation( data.assignedApplicationId, - submitData, + formDataToSend, (data) => updateCallback(data, afterUpdateCallback), errUpdateCallback ); @@ -398,10 +405,16 @@ const DomandaEditInstructorManager = () => { ...cfgModifier } + const formDataToSend = new FormData(); + const jsonBlob = new Blob([JSON.stringify(submitData)], { + type: 'application/json' + }); + formDataToSend.append('applicationEvaluationFormRequestBean', jsonBlob); + ApplicationEvaluationService.updateEvaluationV2( data.assignedApplicationId, formId, - submitData, + formDataToSend, (data) => updateCallback(data, afterUpdateCallback), errUpdateCallback ); @@ -454,11 +467,17 @@ const DomandaEditInstructorManager = () => { amountAccepted: finalDialogData.amount } + const formDataToSend = new FormData(); + const jsonBlob = new Blob([JSON.stringify(submitData)], { + type: 'application/json' + }); + formDataToSend.append('evaluationRequest', jsonBlob); + setLoading(true); setIsVisibleCompleteDialog(false); ApplicationEvaluationService.updateEvaluation( data.assignedApplicationId, - submitData, + formDataToSend, approveRejectCallback, errApproveRejectCallback ); @@ -479,12 +498,18 @@ const DomandaEditInstructorManager = () => { amountAccepted: finalDialogData.amount } + const formDataToSend = new FormData(); + const jsonBlob = new Blob([JSON.stringify(submitData)], { + type: 'application/json' + }); + formDataToSend.append('applicationEvaluationFormRequestBean', jsonBlob); + setLoading(true); setIsVisibleCompleteDialog(false); ApplicationEvaluationService.updateEvaluationV2( data.assignedApplicationId, formId, - submitData, + formDataToSend, approveRejectCallback, errApproveRejectCallback ); @@ -499,14 +524,27 @@ const DomandaEditInstructorManager = () => { checklist: klona(data.checklist), files: klona(data.files), note: data.note, - motivation: finalDialogData.motivation + motivation: finalDialogData.motivation, + rejectedReason: finalDialogData.subject + } + + const formDataToSend = new FormData(); + const jsonBlob = new Blob([JSON.stringify(submitData)], { + type: 'application/json' + }); + formDataToSend.append('evaluationRequest', jsonBlob); + + if (finalDialogData.files && finalDialogData.files.length > 0) { + finalDialogData.files.forEach((file) => { + formDataToSend.append('rejectedDocuments', file); + }); } setLoading(true); setIsVisibleCompleteDialog(false); ApplicationEvaluationService.updateEvaluation( data.assignedApplicationId, - submitData, + formDataToSend, approveRejectCallback, errApproveRejectCallback ); @@ -523,7 +561,20 @@ const DomandaEditInstructorManager = () => { )), amendmentDetails: klona(data.amendmentDetails), note: data.note, - motivation: finalDialogData.motivation + motivation: finalDialogData.motivation, + rejectedReason: finalDialogData.subject + } + + const formDataToSend = new FormData(); + const jsonBlob = new Blob([JSON.stringify(submitData)], { + type: 'application/json' + }); + formDataToSend.append('applicationEvaluationFormRequestBean', jsonBlob); + + if (finalDialogData.files && finalDialogData.files.length > 0) { + finalDialogData.files.forEach((file) => { + formDataToSend.append('rejectedDocuments', file); + }); } setLoading(true); @@ -531,7 +582,7 @@ const DomandaEditInstructorManager = () => { ApplicationEvaluationService.updateEvaluationV2( data.assignedApplicationId, formId, - submitData, + formDataToSend, approveRejectCallback, errApproveRejectCallback ); @@ -956,7 +1007,7 @@ const DomandaEditInstructorManager = () => { ?