- updated page of adding ammendment;

- updated communication form;

src/pages/SoccorsoAddInstructorManager/index.js

@@ -124,8 +124,24 @@ const SoccorsoAddInstructorManager = () => {
 
     const doCreate = () => {
         storeSet('setAsyncRequest');
+        const updatedFormData = { ...formData };
+        delete updatedFormData.files;
+        delete updatedFormData.formFields;
 
-        AmendmentsService.createSoccorso(formData, createCallback, errCreateCallback, [
+        const formDataToSend = new FormData();
+
+        const jsonBlob = new Blob([JSON.stringify(updatedFormData)], {
+            type: 'application/json'
+        });
+        formDataToSend.append('applicationAmendmentRequest', jsonBlob);
+
+        if (formData.files && formData.files.length > 0) {
+            formData.files.forEach((file) => {
+                formDataToSend.append('files', file);
+            });
+        }
+
+        AmendmentsService.createSoccorso(formDataToSend, createCallback, errCreateCallback, [
             ['applicationEvaluationId', evaluationId]
         ]);
     }

src/pages/SoccorsoAddPreInstructor/index.js

@@ -124,8 +124,24 @@ const SoccorsoAddPreInstructor = () => {
 
     const doCreate = () => {
         storeSet('setAsyncRequest');
+        const updatedFormData = { ...formData };
+        delete updatedFormData.files;
+        delete updatedFormData.formFields;
         
-        AmendmentsService.createSoccorso(formData, createCallback, errCreateCallback, [
+        const formDataToSend = new FormData();
+        
+        const jsonBlob = new Blob([JSON.stringify(updatedFormData)], {
+            type: 'application/json'
+        });
+        formDataToSend.append('applicationAmendmentRequest', jsonBlob);
+        
+        if (formData.files && formData.files.length > 0) {
+            formData.files.forEach((file) => {
+                formDataToSend.append('files', file);
+            });
+        }
+
+        AmendmentsService.createSoccorso(formDataToSend, createCallback, errCreateCallback, [
             ['applicationEvaluationId', evaluationId]
         ]);
     }

src/pages/SoccorsoEditBeneficiario/index.js

@@ -338,6 +338,16 @@ const SoccorsoEditBeneficiario = () => {
                         <SoccorsoComunications amendmentId={data.id} soccorsoStatus={data.status}/>
                     </div> : null}
 
+                {data.id && data.amendmentInitialDocument && is(Array, data.amendmentInitialDocument)
+                    ? <div className="appPageSection">
+                        <h3>{__('Documenti da PEC', 'gepafin')}</h3>
+                        <ol className="appPageSection__list">
+                            {data.amendmentInitialDocument.map((o, i) => <li key={o.fieldId}>
+                                <a href={o.filePath} target="_blank" rel="noreferrer">{o.name}</a>
+                            </li>)}
+                        </ol>
+                    </div> : null}
+
                 {data.id
                     ? <div className="appPageSection">
                         <h3>{__('Documenti richiesti', 'gepafin')}</h3>

src/pages/SoccorsoEditInstructorManager/index.js

@@ -422,6 +422,17 @@ const SoccorsoEditInstructorManager = () => {
                     <div
                         className="appPageSection__emailTemplate">{getEmailTemplateForSoccorso(data.emailTemplate, data.note)}</div>
                 </div>
+
+                {data.amendmentInitialDocument && is(Array, data.amendmentInitialDocument)
+                    ? <div className="appPageSection">
+                        <h3>{__('Documenti da PEC', 'gepafin')}</h3>
+                        <ol className="appPageSection__list">
+                            {data.amendmentInitialDocument.map((o, i) => <li key={o.fieldId}>
+                                <a href={o.filePath} target="_blank" rel="noreferrer">{o.name}</a>
+                            </li>)}
+                        </ol>
+                    </div> : null}
+
                 <div className="appPageSection">
                     <h3>{__('Documenti richiesti', 'gepafin')}</h3>
                     <ol className="appPageSection__list">

src/pages/SoccorsoEditPreInstructor/components/SoccorsoComunications/index.js

@@ -24,6 +24,7 @@ import { Toast } from 'primereact/toast';
 import { FileUpload } from 'primereact/fileupload';
 import { defaultMaxFileSize, mimeTypes } from '../../../../configData';
 import { Editor } from 'primereact/editor';
+import renderHtmlContent from '../../../../helpers/renderHtmlContent';
 
 const SoccorsoComunications = ({amendmentId, soccorsoStatus}) => {
     const [comms, setComms] = useState([]);
@@ -104,7 +105,22 @@ const SoccorsoComunications = ({amendmentId, soccorsoStatus}) => {
 
     const createCommunication = () => {
         setIsLoadingCommunication(true);
-        CommunicationService.createCommunication(amendmentId, newCommData, createCommunicationCallback, errCreateCommunicationCallback);
+        const updatedFormData = { ...newCommData };
+        delete updatedFormData.files;
+        const formDataToSend = new FormData();
+
+        const jsonBlob = new Blob([JSON.stringify(updatedFormData)], {
+            type: 'application/json'
+        });
+        formDataToSend.append('communicationRequestBean', jsonBlob);
+
+        if (newCommData.files && newCommData.files.length > 0) {
+            newCommData.files.forEach((file) => {
+                formDataToSend.append('files', file);
+            });
+        }
+
+        CommunicationService.createCommunication(amendmentId, formDataToSend, createCommunicationCallback, errCreateCommunicationCallback);
     };
 
     const createCommunicationCallback = (data) => {
@@ -188,7 +204,10 @@ const SoccorsoComunications = ({amendmentId, soccorsoStatus}) => {
                         </td>
                         <td>
                             <h3>{o.title}</h3>
-                            <p>{o.comment}</p>
+                            {renderHtmlContent(o.comment)}
+                            {o.documents && !isEmpty(o.documents)
+                                ? <div>{o.documents.map((doc) => <a href={doc.filePath} target="_blank" rel="noreferrer">{doc.name}</a>)}</div>
+                                : null }
                         </td>
                     </tr>)
                     : <tr>

src/pages/SoccorsoEditPreInstructor/index.js

@@ -422,6 +422,17 @@ const SoccorsoEditPreInstructor = () => {
                     <div
                         className="appPageSection__emailTemplate">{getEmailTemplateForSoccorso(data.emailTemplate, data.note)}</div>
                 </div>
+
+                {data.amendmentInitialDocument && is(Array, data.amendmentInitialDocument)
+                    ? <div className="appPageSection">
+                        <h3>{__('Documenti da PEC', 'gepafin')}</h3>
+                        <ol className="appPageSection__list">
+                            {data.amendmentInitialDocument.map((o, i) => <li key={o.fieldId}>
+                                <a href={o.filePath} target="_blank" rel="noreferrer">{o.name}</a>
+                            </li>)}
+                        </ol>
+                    </div> : null}
+
                 <div className="appPageSection">
                     <h3>{__('Documenti richiesti', 'gepafin')}</h3>
                     <ol className="appPageSection__list">

src/service/amendments-service.js

@@ -25,7 +25,7 @@ export default class AmendmentsService {
     };
 
     static createSoccorso = (body, callback, errCallback, queryParams) => {
-        NetworkService.post(`${API_BASE_URL}/amendments`, body, callback, errCallback, queryParams);
+        NetworkService.postMultiPart(`${API_BASE_URL}/amendments`, body, callback, errCallback, queryParams);
     };
 
     static updateSoccorso = (id, body, callback, errCallback, queryParams) => {

src/service/communication-service.js

@@ -9,6 +9,6 @@ export default class CommunicationService {
     };
 
     static createCommunication = (id, body, callback, errCallback, queryParams) => {
-        NetworkService.post(`${API_BASE_URL}/communication/${id}`, body, callback, errCallback, queryParams);
+        NetworkService.postMultiPart(`${API_BASE_URL}/communication/${id}`, body, callback, errCallback, queryParams);
     };
 }