From 1336d6219e0b2985886cf6376c7adc6708ed4236 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Mon, 9 Jun 2025 13:39:23 +0200
Subject: [PATCH 01/12] - removed status 'close' from request that was
 preventing creating new amendments;

---
 src/pages/DomandaEditPreInstructor/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index b90787c..d48278a 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -968,7 +968,7 @@ const DomandaEditPreInstructor = () => {
         storeSet('setAsyncRequest');
         ApplicationEvaluationService.getEvaluationVersionByApplId(entityId, getVersion, errGetVersion);
         AmendmentsService.getSoccorsoByApplId(entityId, getAmendmentsCallback, errGetAmendmentsCallback, [
-            ['statuses', ['AWAITING', 'RESPONSE_RECEIVED', 'CLOSE']]
+            ['statuses', ['AWAITING', 'RESPONSE_RECEIVED']]
         ]);
     }, [id]);
 

From 0894823c10c156ab1656059d463d2d5f60af6367 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Thu, 26 Jun 2025 10:26:14 +0200
Subject: [PATCH 02/12] - fixed disabled note field for instructor;

---
 src/pages/DomandaEditInstructorManager/index.js | 2 +-
 src/pages/DomandaEditPreInstructor/index.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js
index 8601ddb..1c41c99 100644
--- a/src/pages/DomandaEditInstructorManager/index.js
+++ b/src/pages/DomandaEditInstructorManager/index.js
@@ -596,7 +596,7 @@ const DomandaEditInstructorManager = () => {
 
     const shouldDisableField = useCallback((fieldName) => {
         return !['EVALUATION', 'ADMISSIBLE'].includes(data.applicationStatus)
-            || (['ADMISSIBLE'].includes(data.applicationStatus) && fieldName !== 'criteria')
+            || (['ADMISSIBLE', 'TECHNICAL_EVALUATION'].includes(data.applicationStatus) && !['criteria', 'note'].includes(fieldName))
             || (fieldName === 'files' && !isEmpty(data.amendmentDetails))
     }, [data.applicationStatus]);
 
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index d48278a..dd69b96 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -595,7 +595,7 @@ const DomandaEditPreInstructor = () => {
 
     const shouldDisableField = useCallback((fieldName) => {
         return !['EVALUATION', 'ADMISSIBLE'].includes(data.applicationStatus)
-            || (['ADMISSIBLE'].includes(data.applicationStatus) && !['criteria', 'note'].includes(fieldName))
+            || (['ADMISSIBLE', 'TECHNICAL_EVALUATION'].includes(data.applicationStatus) && !['criteria', 'note'].includes(fieldName))
             || (fieldName === 'files' && !isEmpty(data.amendmentDetails))
     }, [data.applicationStatus]);
 

From 7ea6f579afc9901557762616361df22748245ee1 Mon Sep 17 00:00:00 2001
From: Noemi <noemi@bflows.net>
Date: Thu, 26 Jun 2025 10:49:29 +0200
Subject: [PATCH 03/12] add button scarica graduatoria

---
 .../components/AllBandiPreInstructorTableAsync/index.js          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js b/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js
index 4f5b400..67b90f1 100644
--- a/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js
+++ b/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js
@@ -88,6 +88,7 @@ const AllBandiPreInstructorTableAsync = () => {
     const actionsBodyTemplate = (rowData) => {
         return <Link to={`/bandi/${rowData.id}`}>
             <Button severity="info" label={__('Mostra', 'gepafin')} icon="pi pi-eye" size="small" iconPos="right" />
+            <Button severity="info" label={__('Scarica graduatoria', 'gepafin')} icon="pi pi-download" size="small" iconPos="right" style={{marginTop:'10px'}}/>
         </Link>
     }
 

From cfba0534c4418a886ded1e94367966adaeb1f130 Mon Sep 17 00:00:00 2001
From: Noemi <noemi@bflows.net>
Date: Thu, 26 Jun 2025 11:41:59 +0200
Subject: [PATCH 04/12] add new button in domandaEditPreInstructor

---
 src/pages/DomandaEditPreInstructor/index.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index dd69b96..3c94a13 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -857,6 +857,14 @@ const DomandaEditPreInstructor = () => {
                 severity={isAdmissible ? 'success' : 'warning'}
                 label={__('Valutazione tecnico-finanziaria positiva', 'gepafin')}
             />
+            <Button
+                type="button"
+                disabled={!data.id || (!['ADMISSIBLE'].includes(data.applicationStatus) && !['TECHNICAL_EVALUATION'].includes(data.applicationStatus)) || evaluationBlockedForUser(data)}
+                // onClick={doPassTechnicalEvaluation}
+                icon="pi pi-info-circle" iconPos="right"
+                severity={isAdmissible ? 'success' : 'warning'}
+                label={__('Respingi domanda per valutazione TF negativa', 'gepafin')}
+            />
             {data.id
                 ? <Button
                     type="button"

From 97e20d565648ace6f73c32628af229d63fd4f2dd Mon Sep 17 00:00:00 2001
From: Noemi <noemi@bflows.net>
Date: Mon, 30 Jun 2025 13:01:01 +0200
Subject: [PATCH 05/12] add change status function

---
 src/helpers/getBandoLabel.js                  |  3 ++
 .../DomandaEditInstructorManager/index.js     | 44 ++++++++++++++++++-
 src/pages/DomandaEditPreInstructor/index.js   | 39 ++++++++++++++--
 src/service/application-evaluation-service.js |  4 ++
 4 files changed, 86 insertions(+), 4 deletions(-)

diff --git a/src/helpers/getBandoLabel.js b/src/helpers/getBandoLabel.js
index e379402..286c9d2 100644
--- a/src/helpers/getBandoLabel.js
+++ b/src/helpers/getBandoLabel.js
@@ -71,6 +71,9 @@ const getBandoLabel = (status) => {
         case 'REJECTED':
             return __('Respinto', 'gepafin');
 
+        case 'TECHNICAL_EVALUATION_REJECTED':
+            return __('Respinto', 'gepafin');
+            
         default:
             return '';
     }
diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js
index 1c41c99..2738cb3 100644
--- a/src/pages/DomandaEditInstructorManager/index.js
+++ b/src/pages/DomandaEditInstructorManager/index.js
@@ -793,6 +793,40 @@ const DomandaEditInstructorManager = () => {
         setData(newData);
     }, [data]);
 
+    const handleRejectingSuccess = useCallback((response) => {
+        if (response.status === 'SUCCESS') {
+            if (toast.current) {
+                toast.current.show({
+                    severity: 'success',
+                    summary: 'Successo',
+                    detail: 'Stato aggiornato a Rifiutato (Valutazione Tecnica)'
+                });
+            }
+        }
+        storeSet('unsetAsyncRequest');
+    }, []);
+
+    const handleRejectingError = useCallback((errorResponse) => {
+        if (toast.current) {
+            toast.current.show({
+                severity: 'error',
+                summary: 'Errore',
+                detail: 'Si è verificato un errore durante l\'aggiornamento dello stato.'
+            });
+        }
+        set404FromErrorResponse(errorResponse);
+        storeSet('unsetAsyncRequest');
+    }, []);
+
+    const doRejectingStatus = (assignedApplicationId) => {
+        storeSet('setAsyncRequest')
+        const body = {
+            applicationStatus: 'TECHNICAL_EVALUATION_REJECTED'
+        };
+
+        ApplicationEvaluationService.updateStatus(assignedApplicationId, body, handleRejectingSuccess, handleRejectingError);
+    }
+
     const actionBtns = () => {
         return <div className="appPageSection__actions">
             {['EVALUATION', 'SOCCORSO', 'CLOSE'].includes(data.applicationStatus)
@@ -858,6 +892,14 @@ const DomandaEditInstructorManager = () => {
                 severity={isAdmissible ? 'success' : 'warning'}
                 label={__('Valutazione tecnico-finanziaria positiva', 'gepafin')}
             />
+            <Button
+                type="button"
+                disabled={!data.id || !['TECHNICAL_EVALUATION'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
+                onClick={()=>doRejectingStatus(data.assignedApplicationId)}
+                icon="pi pi-info-circle" iconPos="right"
+                severity={isAdmissible ? 'success' : 'warning'}
+                label={__('Respingi domanda per valutazione TF negativa', 'gepafin')}
+            />
             {data.id
                 ? <Button
                     type="button"
@@ -873,7 +915,7 @@ const DomandaEditInstructorManager = () => {
                 ? <Button
                     type="button"
                     disabled={APP_EVALUATION_FLOW_ID === '1'
-                        && (!['EVALUATION', 'ADMISSIBLE', 'NDG', 'APPOINTMENT', 'TECHNICAL_EVALUATION'].includes(data.applicationStatus)
+                        && (!['EVALUATION', 'ADMISSIBLE', 'NDG', 'APPOINTMENT'].includes(data.applicationStatus)
                             || evaluationBlockedForUser(data))}
                     onClick={initiateRejecting}
                     label={__('Respingi domanda', 'gepafin')}
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 3c94a13..14e98fd 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -792,6 +792,39 @@ const DomandaEditPreInstructor = () => {
         setData(newData);
     }, [data]);
 
+    const handleRejectingSuccess = useCallback((response) => {
+        if (response.status === 'SUCCESS') {
+            if (toast.current) {
+                toast.current.show({
+                    severity: 'success',
+                    summary: 'Successo',
+                    detail: 'Stato aggiornato a Rifiutato (Valutazione Tecnica)'
+                });
+            }
+        }
+        storeSet('unsetAsyncRequest');
+    }, []);
+
+    const handleRejectingError = useCallback((errorResponse) => {
+        if (toast.current) {
+            toast.current.show({
+                severity: 'error',
+                summary: 'Errore',
+                detail: 'Si è verificato un errore durante l\'aggiornamento dello stato.'
+            });
+        }
+        set404FromErrorResponse(errorResponse);
+        storeSet('unsetAsyncRequest');
+    }, []);
+
+    const doRejectingStatus = (assignedApplicationId) => {
+        storeSet('setAsyncRequest')
+        const body = {
+            applicationStatus: 'TECHNICAL_EVALUATION_REJECTED'
+        };
+
+        ApplicationEvaluationService.updateStatus(assignedApplicationId, body, handleRejectingSuccess, handleRejectingError);
+    }
     const actionBtns = () => {
         return <div className="appPageSection__actions">
             {['EVALUATION', 'SOCCORSO', 'CLOSE'].includes(data.applicationStatus)
@@ -859,8 +892,8 @@ const DomandaEditPreInstructor = () => {
             />
             <Button
                 type="button"
-                disabled={!data.id || (!['ADMISSIBLE'].includes(data.applicationStatus) && !['TECHNICAL_EVALUATION'].includes(data.applicationStatus)) || evaluationBlockedForUser(data)}
-                // onClick={doPassTechnicalEvaluation}
+                disabled={!data.id || !['TECHNICAL_EVALUATION'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
+                onClick={()=>doRejectingStatus(data.assignedApplicationId)}
                 icon="pi pi-info-circle" iconPos="right"
                 severity={isAdmissible ? 'success' : 'warning'}
                 label={__('Respingi domanda per valutazione TF negativa', 'gepafin')}
@@ -881,7 +914,7 @@ const DomandaEditPreInstructor = () => {
                     type="button"
                     disabled={['APPROVED', 'REJECTED'].includes(data.applicationStatus)
                         || (APP_EVALUATION_FLOW_ID === '1'
-                            && (!['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT', 'TECHNICAL_EVALUATION'].includes(data.applicationStatus)
+                            && (!['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
                                 || evaluationBlockedForUser(data)))
                     }
                     onClick={initiateRejecting}
diff --git a/src/service/application-evaluation-service.js b/src/service/application-evaluation-service.js
index cc20ea6..ee8dedc 100644
--- a/src/service/application-evaluation-service.js
+++ b/src/service/application-evaluation-service.js
@@ -25,4 +25,8 @@ export default class ApplicationEvaluationService {
             ['evaluationFormId', formId]
         ]);
     };
+
+    static updateStatus = (assignedApplicationId, body, callback, errCallback)=>{
+        NetworkService.put(`${API_BASE_URL}/applicationEvaluation/${assignedApplicationId}`, body, callback, errCallback,);
+    }
 }

From 191209294d1287f75b8b7f0291b15f24ba0b6cae Mon Sep 17 00:00:00 2001
From: Noemi <noemi@bflows.net>
Date: Mon, 30 Jun 2025 15:26:17 +0200
Subject: [PATCH 06/12] add download csv ranking

---
 .../AllBandiPreInstructorTableAsync/index.js  | 38 +++++++++++++++++--
 src/service/application-service.js            |  4 ++
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js b/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js
index 67b90f1..823f916 100644
--- a/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js
+++ b/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js
@@ -6,6 +6,7 @@ import translationStrings from '../../../../translationStringsForComponents';
 
 // api
 import BandoService from '../../../../service/bando-service';
+import ApplicationService from '../../../../service/application-service';
 
 // tools
 import getTimeParsedFromString from '../../../../helpers/getTimeParsedFromString';
@@ -23,6 +24,8 @@ import ProperBandoLabel from '../../../../components/ProperBandoLabel';
 import { Dropdown } from 'primereact/dropdown';
 import { Tag } from 'primereact/tag';
 import { Calendar } from 'primereact/calendar';
+import { storeSet } from '../../../../store';
+
 
 const AllBandiPreInstructorTableAsync = () => {
     const [localAsyncRequest, setLocalAsyncRequest] = useState(false);
@@ -86,10 +89,37 @@ const AllBandiPreInstructorTableAsync = () => {
     };
 
     const actionsBodyTemplate = (rowData) => {
-        return <Link to={`/bandi/${rowData.id}`}>
-            <Button severity="info" label={__('Mostra', 'gepafin')} icon="pi pi-eye" size="small" iconPos="right" />
-            <Button severity="info" label={__('Scarica graduatoria', 'gepafin')} icon="pi pi-download" size="small" iconPos="right" style={{marginTop:'10px'}}/>
-        </Link>
+        return (
+            <div  className="p-d-flex p-flex-column">
+                <Link to={`/bandi/${rowData.id}`}>
+                    <Button severity="info" label={__('Mostra', 'gepafin')} icon="pi pi-eye" size="small" iconPos="right" />
+                </Link>
+                <Button severity="info" label={__('Scarica graduatoria', 'gepafin')} icon="pi pi-download" size="small" iconPos="right" style={{marginTop:'10px'}} onClick={() => handleDownloadRanking(rowData.id)}/> 
+            </div>
+        )
+    }
+
+    const downloadSuccessCallback =  (resp, callId) => {
+        const file = new Blob([resp], { type: 'text/csv' });
+        const url = window.URL.createObjectURL(file);
+        const link = document.createElement('a');
+        link.href = url;
+        link.setAttribute('download', `call-${callId}-applications-report.csv`);
+        document.body.appendChild(link);
+        link.click();
+        link.remove();
+        setLocalAsyncRequest(false);
+    }
+
+    const downloadErrorCallback  = (resp) => {
+        setLocalAsyncRequest(false);
+    }
+
+    const handleDownloadRanking = (callId)=>{
+        setLocalAsyncRequest(true);
+        ApplicationService.downloadRanking(callId, 
+            (resp)=>downloadSuccessCallback(resp,callId),
+             downloadErrorCallback)
     }
 
     const statusBodyTemplate = (rowData) => {
diff --git a/src/service/application-service.js b/src/service/application-service.js
index aeb016d..a6e1ea2 100644
--- a/src/service/application-service.js
+++ b/src/service/application-service.js
@@ -67,4 +67,8 @@ export default class ApplicationService {
     static reAdmitApplication = (id, callback, errCallback) => {
         NetworkService.put(`${API_BASE_URL}/application/${id}/readmit`, {}, callback, errCallback);
     };
+
+    static downloadRanking = (callId, callback, errCallback)=> {
+         NetworkService.getBlob(`${API_BASE_URL}/application/call/${callId}/ranking-csv`, callback, errCallback);
+    }
 }

From 48b2596ff25bd09ae0f17c5027cef962f8ab95ee Mon Sep 17 00:00:00 2001
From: Noemi <noemi@bflows.net>
Date: Mon, 30 Jun 2025 15:29:24 +0200
Subject: [PATCH 07/12] change file name

---
 .../components/AllBandiPreInstructorTableAsync/index.js         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js b/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js
index 823f916..50c3c0a 100644
--- a/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js
+++ b/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js
@@ -104,7 +104,7 @@ const AllBandiPreInstructorTableAsync = () => {
         const url = window.URL.createObjectURL(file);
         const link = document.createElement('a');
         link.href = url;
-        link.setAttribute('download', `call-${callId}-applications-report.csv`);
+        link.setAttribute('download', `call-${callId}-applications-ranking.csv`);
         document.body.appendChild(link);
         link.click();
         link.remove();

From d044454ea4e58609e6ee2de06ae8102f4e18514a Mon Sep 17 00:00:00 2001
From: Noemi <noemi@bflows.net>
Date: Mon, 30 Jun 2025 15:41:08 +0200
Subject: [PATCH 08/12] add role to button

---
 .../components/AllBandiPreInstructorTableAsync/index.js  | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js b/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js
index 50c3c0a..853808e 100644
--- a/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js
+++ b/src/pages/BandiPreInstructor/components/AllBandiPreInstructorTableAsync/index.js
@@ -24,7 +24,7 @@ import ProperBandoLabel from '../../../../components/ProperBandoLabel';
 import { Dropdown } from 'primereact/dropdown';
 import { Tag } from 'primereact/tag';
 import { Calendar } from 'primereact/calendar';
-import { storeSet } from '../../../../store';
+import { storeGet, storeSet } from '../../../../store';
 
 
 const AllBandiPreInstructorTableAsync = () => {
@@ -46,6 +46,8 @@ const AllBandiPreInstructorTableAsync = () => {
     });
     const statuses = ['DRAFT','PUBLISH','EXPIRED'];
 
+    const role = storeGet('getRole')
+
     const getPaginationQuery = useCallback(() => getQueryParamsForPaginatedEndpoint(lazyState, statuses, 'id'), [lazyState]);
 
     const onPage = (event) => {
@@ -94,7 +96,10 @@ const AllBandiPreInstructorTableAsync = () => {
                 <Link to={`/bandi/${rowData.id}`}>
                     <Button severity="info" label={__('Mostra', 'gepafin')} icon="pi pi-eye" size="small" iconPos="right" />
                 </Link>
-                <Button severity="info" label={__('Scarica graduatoria', 'gepafin')} icon="pi pi-download" size="small" iconPos="right" style={{marginTop:'10px'}} onClick={() => handleDownloadRanking(rowData.id)}/> 
+                {role === 'ROLE_INSTRUCTOR_MANAGER' && (
+                    <Button severity="info" label={__('Scarica graduatoria', 'gepafin')} icon="pi pi-download" size="small" iconPos="right" style={{marginTop:'10px'}} onClick={() => handleDownloadRanking(rowData.id)}/> 
+                )}
+                
             </div>
         )
     }

From c38fa85aa082fe918b194e2bd0c5e62247b1c83e Mon Sep 17 00:00:00 2001
From: Noemi <noemi@bflows.net>
Date: Mon, 30 Jun 2025 15:57:34 +0200
Subject: [PATCH 09/12] add dialog

---
 src/pages/DomandaEditPreInstructor/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 14e98fd..394233b 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -822,8 +822,10 @@ const DomandaEditPreInstructor = () => {
         const body = {
             applicationStatus: 'TECHNICAL_EVALUATION_REJECTED'
         };
-
+        setLoading(true);
+        setIsVisibleCompleteDialog(false);
         ApplicationEvaluationService.updateStatus(assignedApplicationId, body, handleRejectingSuccess, handleRejectingError);
+        
     }
     const actionBtns = () => {
         return <div className="appPageSection__actions">

From 536c6269c86956df70f803de4862b70ca6e547fa Mon Sep 17 00:00:00 2001
From: Noemi <noemi@bflows.net>
Date: Mon, 30 Jun 2025 16:13:27 +0200
Subject: [PATCH 10/12] add dialog

---
 src/pages/DomandaEditPreInstructor/index.js | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 394233b..59d47b6 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -612,12 +612,26 @@ const DomandaEditPreInstructor = () => {
     }
 
     const footerCompleteDialog = useCallback(() => {
+        let onSubmitAction;
+        let isDisabled = loading;
+
+        if (operationType === 'approve') {
+            onSubmitAction = doApprove;
+            isDisabled = isDisabled || !amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0;
+        } else if (operationType === 'tf_reject') { 
+            onSubmitAction = doRejectingStatus;
+  
+        } else { 
+            onSubmitAction = doReject;
+
+        }
+
         return <div>
             <Button type="button" label={__('Annulla', 'gepafin')} onClick={hideCompleteDialog} outlined/>
             <Button
                 type="button"
-                disabled={loading || ('approve' === operationType && (!amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0))}
-                label={__('Invia', 'gepafin')} onClick={'approve' === operationType ? doApprove : doReject}/>
+                disabled={isDisabled}
+                label={__('Invia', 'gepafin')} onClick={onSubmitAction}/>
         </div>
     }, [amountAccepted, data, motivation]);
 
@@ -823,7 +837,8 @@ const DomandaEditPreInstructor = () => {
             applicationStatus: 'TECHNICAL_EVALUATION_REJECTED'
         };
         setLoading(true);
-        setIsVisibleCompleteDialog(false);
+        setOperationType('tf_reject');
+        setIsVisibleCompleteDialog(true);
         ApplicationEvaluationService.updateStatus(assignedApplicationId, body, handleRejectingSuccess, handleRejectingError);
         
     }

From e2ce5c354b9bbd2b82e681932f551b993599e60a Mon Sep 17 00:00:00 2001
From: Noemi <noemi@bflows.net>
Date: Mon, 30 Jun 2025 16:27:21 +0200
Subject: [PATCH 11/12] open modal works

---
 .../DomandaEditInstructorManager/index.js     | 37 ++++++++++++++-----
 src/pages/DomandaEditPreInstructor/index.js   | 12 ++++--
 2 files changed, 36 insertions(+), 13 deletions(-)

diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js
index 2738cb3..424cddc 100644
--- a/src/pages/DomandaEditInstructorManager/index.js
+++ b/src/pages/DomandaEditInstructorManager/index.js
@@ -613,14 +613,28 @@ const DomandaEditInstructorManager = () => {
     }
 
     const footerCompleteDialog = useCallback(() => {
-        return <div>
-            <Button type="button" label={__('Annulla', 'gepafin')} onClick={hideCompleteDialog} outlined/>
-            <Button
-                type="button"
-                disabled={loading || ('approve' === operationType && (!amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0))}
-                label={__('Invia', 'gepafin')} onClick={'approve' === operationType ? doApprove : doReject}/>
-        </div>
-    }, [amountAccepted, data, motivation]);
+            let onSubmitAction;
+            let isDisabled = loading;
+    
+            if (operationType === 'approve') {
+                onSubmitAction = doApprove;
+                isDisabled = isDisabled || !amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0;
+            } else if (operationType === 'tf_reject') { 
+                onSubmitAction = doRejectingStatus();
+      
+            } else { 
+                onSubmitAction = doReject;
+    
+            }
+    
+            return <div>
+                <Button type="button" label={__('Annulla', 'gepafin')} onClick={hideCompleteDialog} outlined/>
+                <Button
+                    type="button"
+                    disabled={isDisabled}
+                    label={__('Invia', 'gepafin')} onClick={onSubmitAction}/>
+            </div>
+        }, [amountAccepted, data, motivation]);
 
     const initiateApproving = () => {
         setOperationType('approve');
@@ -633,6 +647,11 @@ const DomandaEditInstructorManager = () => {
         setIsVisibleCompleteDialog(true);
     }
 
+     const initiateTFRejecting = () => {
+        setOperationType('tf_reject');
+        setIsVisibleCompleteDialog(true);
+    }
+
     const doCheckNDG = () => {
         doSaveDraft(doGetNDGRequest);
     }
@@ -895,7 +914,7 @@ const DomandaEditInstructorManager = () => {
             <Button
                 type="button"
                 disabled={!data.id || !['TECHNICAL_EVALUATION'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
-                onClick={()=>doRejectingStatus(data.assignedApplicationId)}
+                onClick={initiateTFRejecting}
                 icon="pi pi-info-circle" iconPos="right"
                 severity={isAdmissible ? 'success' : 'warning'}
                 label={__('Respingi domanda per valutazione TF negativa', 'gepafin')}
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 59d47b6..32dedca 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -619,7 +619,7 @@ const DomandaEditPreInstructor = () => {
             onSubmitAction = doApprove;
             isDisabled = isDisabled || !amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0;
         } else if (operationType === 'tf_reject') { 
-            onSubmitAction = doRejectingStatus;
+            onSubmitAction = doRejectingStatus();
   
         } else { 
             onSubmitAction = doReject;
@@ -646,6 +646,11 @@ const DomandaEditPreInstructor = () => {
         setIsVisibleCompleteDialog(true);
     }
 
+     const initiateTFRejecting = () => {
+        setOperationType('tf_reject');
+        setIsVisibleCompleteDialog(true);
+    }
+
     const doCheckNDG = () => {
         doSaveDraft(doGetNDGRequest);
     }
@@ -837,8 +842,7 @@ const DomandaEditPreInstructor = () => {
             applicationStatus: 'TECHNICAL_EVALUATION_REJECTED'
         };
         setLoading(true);
-        setOperationType('tf_reject');
-        setIsVisibleCompleteDialog(true);
+
         ApplicationEvaluationService.updateStatus(assignedApplicationId, body, handleRejectingSuccess, handleRejectingError);
         
     }
@@ -910,7 +914,7 @@ const DomandaEditPreInstructor = () => {
             <Button
                 type="button"
                 disabled={!data.id || !['TECHNICAL_EVALUATION'].includes(data.applicationStatus) || evaluationBlockedForUser(data)}
-                onClick={()=>doRejectingStatus(data.assignedApplicationId)}
+                onClick={initiateTFRejecting}
                 icon="pi pi-info-circle" iconPos="right"
                 severity={isAdmissible ? 'success' : 'warning'}
                 label={__('Respingi domanda per valutazione TF negativa', 'gepafin')}

From d103ffa576489e7bf0158bc7be1b9f164f40c508 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Mon, 30 Jun 2025 16:48:24 +0200
Subject: [PATCH 12/12] - fixed rejecting tf;

---
 .../DomandaEditInstructorManager/index.js     | 89 ++++++-------------
 src/pages/DomandaEditPreInstructor/index.js   | 51 ++---------
 2 files changed, 34 insertions(+), 106 deletions(-)

diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js
index 424cddc..0a70d10 100644
--- a/src/pages/DomandaEditInstructorManager/index.js
+++ b/src/pages/DomandaEditInstructorManager/index.js
@@ -444,10 +444,10 @@ const DomandaEditInstructorManager = () => {
         }
     }, [data, motivation]);
 
-    const doReject = useCallback(() => {
+    const doReject = useCallback((newStatus) => {
         if (data.evaluationVersion === 'V1') {
             const submitData = {
-                applicationStatus: 'REJECTED',
+                applicationStatus: newStatus,
                 criteria: klona(data.criteria),
                 checklist: klona(data.checklist),
                 files: klona(data.files),
@@ -466,7 +466,7 @@ const DomandaEditInstructorManager = () => {
         } else if (data.evaluationVersion === 'V2') {
             const newFormValues = getTransformedSubmitData();
             const submitData = {
-                applicationStatus: 'REJECTED',
+                applicationStatus: newStatus,
                 formFields: newFormValues,
                 files: klona(data.files),
                 evaluationDocument: klona(data.evaluationDocument.map(o => ({
@@ -613,28 +613,26 @@ const DomandaEditInstructorManager = () => {
     }
 
     const footerCompleteDialog = useCallback(() => {
-            let onSubmitAction;
-            let isDisabled = loading;
-    
-            if (operationType === 'approve') {
-                onSubmitAction = doApprove;
-                isDisabled = isDisabled || !amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0;
-            } else if (operationType === 'tf_reject') { 
-                onSubmitAction = doRejectingStatus();
-      
-            } else { 
-                onSubmitAction = doReject;
-    
-            }
-    
-            return <div>
-                <Button type="button" label={__('Annulla', 'gepafin')} onClick={hideCompleteDialog} outlined/>
-                <Button
-                    type="button"
-                    disabled={isDisabled}
-                    label={__('Invia', 'gepafin')} onClick={onSubmitAction}/>
-            </div>
-        }, [amountAccepted, data, motivation]);
+        let onSubmitAction;
+        let isDisabled = loading;
+
+        if (operationType === 'approve') {
+            onSubmitAction = doApprove;
+            isDisabled = isDisabled || !amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0;
+        } else if (operationType === 'tf_reject') {
+            onSubmitAction = () => doReject('TECHNICAL_EVALUATION_REJECTED');
+        } else {
+            onSubmitAction = () => doReject('REJECTED');
+        }
+
+        return <div>
+            <Button type="button" label={__('Annulla', 'gepafin')} onClick={hideCompleteDialog} outlined/>
+            <Button
+                type="button"
+                disabled={isDisabled}
+                label={__('Invia', 'gepafin')} onClick={onSubmitAction}/>
+        </div>
+    }, [amountAccepted, data, motivation]);
 
     const initiateApproving = () => {
         setOperationType('approve');
@@ -647,7 +645,7 @@ const DomandaEditInstructorManager = () => {
         setIsVisibleCompleteDialog(true);
     }
 
-     const initiateTFRejecting = () => {
+    const initiateTFRejecting = () => {
         setOperationType('tf_reject');
         setIsVisibleCompleteDialog(true);
     }
@@ -812,40 +810,6 @@ const DomandaEditInstructorManager = () => {
         setData(newData);
     }, [data]);
 
-    const handleRejectingSuccess = useCallback((response) => {
-        if (response.status === 'SUCCESS') {
-            if (toast.current) {
-                toast.current.show({
-                    severity: 'success',
-                    summary: 'Successo',
-                    detail: 'Stato aggiornato a Rifiutato (Valutazione Tecnica)'
-                });
-            }
-        }
-        storeSet('unsetAsyncRequest');
-    }, []);
-
-    const handleRejectingError = useCallback((errorResponse) => {
-        if (toast.current) {
-            toast.current.show({
-                severity: 'error',
-                summary: 'Errore',
-                detail: 'Si è verificato un errore durante l\'aggiornamento dello stato.'
-            });
-        }
-        set404FromErrorResponse(errorResponse);
-        storeSet('unsetAsyncRequest');
-    }, []);
-
-    const doRejectingStatus = (assignedApplicationId) => {
-        storeSet('setAsyncRequest')
-        const body = {
-            applicationStatus: 'TECHNICAL_EVALUATION_REJECTED'
-        };
-
-        ApplicationEvaluationService.updateStatus(assignedApplicationId, body, handleRejectingSuccess, handleRejectingError);
-    }
-
     const actionBtns = () => {
         return <div className="appPageSection__actions">
             {['EVALUATION', 'SOCCORSO', 'CLOSE'].includes(data.applicationStatus)
@@ -947,7 +911,8 @@ const DomandaEditInstructorManager = () => {
             <SoccorsoResendEmails
                 emailsData={emailSendResponse}
                 setDataEmailsSoccorso={updateEmailSendResponses}/>
-            <EvaluationReAdmit id={data.applicationId} status={data.applicationStatus} statusUpdateFn={updateStatusOfAppl}/>
+            <EvaluationReAdmit id={data.applicationId} status={data.applicationStatus}
+                               statusUpdateFn={updateStatusOfAppl}/>
         </div>
     }
 
@@ -1315,7 +1280,7 @@ const DomandaEditInstructorManager = () => {
                                     </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>
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 32dedca..2d0604c 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -443,10 +443,10 @@ const DomandaEditPreInstructor = () => {
         }
     }, [data, motivation]);
 
-    const doReject = useCallback(() => {
+    const doReject = useCallback((newStatus) => {
         if (data.evaluationVersion === 'V1') {
             const submitData = {
-                applicationStatus: 'REJECTED',
+                applicationStatus: newStatus,
                 criteria: klona(data.criteria),
                 checklist: klona(data.checklist),
                 files: klona(data.files),
@@ -465,7 +465,7 @@ const DomandaEditPreInstructor = () => {
         } else if (data.evaluationVersion === 'V2') {
             const newFormValues = getTransformedSubmitData();
             const submitData = {
-                applicationStatus: 'REJECTED',
+                applicationStatus: newStatus,
                 formFields: newFormValues,
                 files: klona(data.files),
                 evaluationDocument: klona(data.evaluationDocument.map(o => ({
@@ -618,12 +618,10 @@ const DomandaEditPreInstructor = () => {
         if (operationType === 'approve') {
             onSubmitAction = doApprove;
             isDisabled = isDisabled || !amountAccepted || isEmpty(amountAccepted) || amountAccepted === 0;
-        } else if (operationType === 'tf_reject') { 
-            onSubmitAction = doRejectingStatus();
-  
-        } else { 
-            onSubmitAction = doReject;
-
+        } else if (operationType === 'tf_reject') {
+            onSubmitAction = () => doReject('TECHNICAL_EVALUATION_REJECTED');
+        } else {
+            onSubmitAction = () => doReject('REJECTED');
         }
 
         return <div>
@@ -811,41 +809,6 @@ const DomandaEditPreInstructor = () => {
         setData(newData);
     }, [data]);
 
-    const handleRejectingSuccess = useCallback((response) => {
-        if (response.status === 'SUCCESS') {
-            if (toast.current) {
-                toast.current.show({
-                    severity: 'success',
-                    summary: 'Successo',
-                    detail: 'Stato aggiornato a Rifiutato (Valutazione Tecnica)'
-                });
-            }
-        }
-        storeSet('unsetAsyncRequest');
-    }, []);
-
-    const handleRejectingError = useCallback((errorResponse) => {
-        if (toast.current) {
-            toast.current.show({
-                severity: 'error',
-                summary: 'Errore',
-                detail: 'Si è verificato un errore durante l\'aggiornamento dello stato.'
-            });
-        }
-        set404FromErrorResponse(errorResponse);
-        storeSet('unsetAsyncRequest');
-    }, []);
-
-    const doRejectingStatus = (assignedApplicationId) => {
-        storeSet('setAsyncRequest')
-        const body = {
-            applicationStatus: 'TECHNICAL_EVALUATION_REJECTED'
-        };
-        setLoading(true);
-
-        ApplicationEvaluationService.updateStatus(assignedApplicationId, body, handleRejectingSuccess, handleRejectingError);
-        
-    }
     const actionBtns = () => {
         return <div className="appPageSection__actions">
             {['EVALUATION', 'SOCCORSO', 'CLOSE'].includes(data.applicationStatus)