- save progress;

src/pages/BandoViewBeneficiario/index.js

@@ -406,9 +406,10 @@ const BandoViewBeneficiario = () => {
                         : null}
 
                     <div className="appPageSection">
-                        <h2>{__('Download Documenti', 'gepafin')}</h2>
+                        {/*<h2>{__('Download Documenti', 'gepafin')}</h2>*/}
+                        <h2>{__('Partecipa', 'gepafin')}</h2>
                         <div className="appPageSection__actions">
-                           {/* <Button
+                            {/* <Button
                                 type="button"
                                 disabled={true}
                                 outlined

src/pages/SoccorsoEditPreInstructor/index.js

@@ -28,12 +28,14 @@ import { Toast } from 'primereact/toast';
 import HelpIcon from '../../icons/HelpIcon';
 import AmendmentsService from '../../service/amendments-service';
 import renderHtmlContent from '../../helpers/renderHtmlContent';
+import CommunicationService from '../../service/communication-service';
 
 const SoccorsoEditPreInstructor = () => {
     const isAsyncRequest = useStore().main.isAsyncRequest();
     const { id, amendmendId } = useParams();
     const navigate = useNavigate();
     const [data, setData] = useState({});
+    const [comms, setComms] = useState([]);
     const toast = useRef(null);
 
     const goToEvaluationPage = () => {
@@ -43,11 +45,31 @@ const SoccorsoEditPreInstructor = () => {
     const getCallback = (data) => {
         if (data.status === 'SUCCESS') {
             setData(getFormattedData(data.data));
+            CommunicationService.getCommsByAmendmentId(data.data.id, getCommsCallback, errGetCommsCallback);
+        }
+        //storeSet.main.unsetAsyncRequest();
+    }
+
+    const errGetCallback = (data) => {
+        if (toast.current && data.message) {
+            toast.current.show({
+                severity: 'error',
+                summary: '',
+                detail: data.message
+            });
+        }
+        set404FromErrorResponse(data);
+        storeSet.main.unsetAsyncRequest();
+    }
+
+    const getCommsCallback = (data) => {
+        if (data.status === 'SUCCESS') {
+            setComms(data.data.commentsList);
         }
         storeSet.main.unsetAsyncRequest();
     }
 
-    const errGetCallback = (data) => {
+    const errGetCommsCallback = (data) => {
         if (toast.current && data.message) {
             toast.current.show({
                 severity: 'error',
@@ -219,8 +241,8 @@ const SoccorsoEditPreInstructor = () => {
                             </tr>
                             </thead>
                             <tbody className="myTbody">
-                            {data.criteria
+                            {!isNil(comms) && !isEmpty(comms)
-                                ? data.criteria.map((o, i) => <tr key={o.id}>
+                                ? comms.map((o, i) => <tr key={o.id}>
                                 <td></td>
                                 <td></td>
                             </tr>) : null}
@@ -230,6 +252,12 @@ const SoccorsoEditPreInstructor = () => {
                             </tr>
                             </tbody>
                         </table>
+
+                        <Button
+                            style={{marginTop: 30}}
+                            type="button"
+                            label={__('Aggiungi Comunicazione', 'gepafin')}
+                            icon="pi pi-plus" iconPos="right"/>
                     </div>
 
                     <div className="appPage__spacer"></div>

src/service/communication-service.js

@@ -5,6 +5,10 @@ const API_BASE_URL = process.env.REACT_APP_API_EXECUTION_ADDRESS;
 export default class CommunicationService {
 
     static getCommsByAmendmentId = (id, callback, errCallback, queryParams) => {
-        NetworkService.get(`${API_BASE_URL}/amendments/applicationEvaluation/${id}`, callback, errCallback, queryParams);
+        NetworkService.get(`${API_BASE_URL}/communication/${id}`, callback, errCallback, queryParams);
+    };
+
+    static getCommsByAmendmentId = (id, callback, errCallback, queryParams) => {
+        NetworkService.get(`${API_BASE_URL}/communication/${id}`, callback, errCallback, queryParams);
     };
 }