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] 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')}