- added amendemnt page for beneficiary;

- fixed styles in all tables;
- fixed displaying requested files list;
- fixed page of creating a new amendment;

src/pages/DomandaEditPreInstructor/index.js

@@ -10,6 +10,7 @@ import { storeSet, useStore } from '../../store';
 
 // api
 import ApplicationEvaluationService from '../../service/application-evaluation-service';
+import AmendmentsService from '../../service/amendments-service';
 
 // tools
 import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
@@ -37,6 +38,7 @@ const DomandaEditPreInstructor = () => {
     const [criterionDataTitle, setCriterionDataTitle] = useState('');
     const [criterionDataContent, setCriterionDataContent] = useState('');
     const [isAdmissible, setIsAdmissible] = useState(false);
+    const [connectedSoccorsoId, setConnectedSoccorsoId] = useState(0);
     const toast = useRef(null);
 
     const goToEvaluationsPage = () => {
@@ -44,7 +46,12 @@ const DomandaEditPreInstructor = () => {
     }
 
     const doNewSoccorso = () => {
-        navigate(`/domande/${id}/aggiungi-soccorso/${data.id}`);
+        if (connectedSoccorsoId !== 0) {
+            navigate(`/domande/${id}/soccorso/${connectedSoccorsoId}`);
+        } else {
+
+            navigate(`/domande/${id}/aggiungi-soccorso/`);
+        }
     }
 
     const getCallback = (data) => {
@@ -198,6 +205,17 @@ const DomandaEditPreInstructor = () => {
         setCriterionDataContent('');
     }
 
+    const getAmendmentsCallback = (data) => {
+        if (data.status === 'SUCCESS') {
+            if (data.data.length) {
+                setConnectedSoccorsoId(data.data[0].id);
+            }
+        }
+    }
+
+    const errGetAmendmentsCallback = () => {
+    }
+
     useEffect(() => {
         const maxScore = pathOr(0, ['minScore'], data);
         const criteria = pathOr([], ['criteria'], data);
@@ -210,9 +228,13 @@ const DomandaEditPreInstructor = () => {
         const parsed = parseInt(id)
         const entityId = !isNaN(parsed) ? parsed : 0;
 
+        storeSet.main.setAsyncRequest();
         ApplicationEvaluationService.getEvaluationByApplId(getCallback, errGetCallback, [
             ['applicationId', entityId]
         ]);
+        AmendmentsService.getSoccorsoByApplId(entityId, getAmendmentsCallback, errGetAmendmentsCallback, [
+            ['statuses', 'AWAITING']
+        ]);
     }, [id]);
 
     return (
@@ -448,6 +470,7 @@ const DomandaEditPreInstructor = () => {
                         <div className="appPageSection__actions">
                             <Button
                                 type="button"
+                                disabled={!data.id}
                                 onClick={doNewSoccorso}
                                 outlined
                                 label={<>
@@ -457,23 +480,31 @@ const DomandaEditPreInstructor = () => {
                                     </i>
                                 </>}
                             />
-                            <Button
-                                type="button"
-                                onClick={doSaveDraft}
-                                outlined
-                                label={__('Salva Bozza Valutazione', 'gepafin')}
-                                icon="pi pi-save" iconPos="right"/>
-                            <Button
-                                type="button"
-                                disabled={!isAdmissible}
-                                onClick={doApprove}
-                                label={__('Approva Domanda', 'gepafin')}
-                                icon="pi pi-check" iconPos="right"/>
-                            <Button
-                                type="button"
-                                onClick={doReject}
-                                label={__('Respingi Domanda', 'gepafin')}
-                                icon="pi pi-times" iconPos="right"/>
+                            {data.id
+                                ? <Button
+                                    type="button"
+                                    onClick={doSaveDraft}
+                                    outlined
+                                    label={__('Salva bozza valutazione', 'gepafin')}
+                                    icon="pi pi-save" iconPos="right"/>
+                                : <Button
+                                    type="button"
+                                    onClick={doSaveDraft}
+                                    label={__('Crea valutazione', 'gepafin')}
+                                    icon="pi pi-save" iconPos="right"/>}
+                            {data.id
+                                ? <Button
+                                    type="button"
+                                    disabled={!isAdmissible}
+                                    onClick={doApprove}
+                                    label={__('Approva Domanda', 'gepafin')}
+                                    icon="pi pi-check" iconPos="right"/> : null}
+                            {data.id
+                                ? <Button
+                                    type="button"
+                                    onClick={doReject}
+                                    label={__('Respingi Domanda', 'gepafin')}
+                                    icon="pi pi-times" iconPos="right"/> : null}
                         </div>
                     </div>