updateRowData(rowData.id, updateResponse)}/>
diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js
index 1fb3c20..f42e7b3 100644
--- a/src/pages/DomandaEditInstructorManager/index.js
+++ b/src/pages/DomandaEditInstructorManager/index.js
@@ -788,6 +788,11 @@ const DomandaEditInstructorManager = () => {
}
}
+ const updateStatusOfAppl = useCallback((newStatus) => {
+ const newData = wrap(data).set(['applicationStatus'], newStatus).value();
+ setData(newData);
+ }, [data]);
+
const actionBtns = () => {
return
{['EVALUATION', 'SOCCORSO', 'CLOSE'].includes(data.applicationStatus)
@@ -881,7 +886,7 @@ const DomandaEditInstructorManager = () => {
-
+
}
diff --git a/src/pages/DomandaEditPreInstructor/components/EvaluationReAdmit/index.js b/src/pages/DomandaEditPreInstructor/components/EvaluationReAdmit/index.js
index 909a86f..8c614bc 100644
--- a/src/pages/DomandaEditPreInstructor/components/EvaluationReAdmit/index.js
+++ b/src/pages/DomandaEditPreInstructor/components/EvaluationReAdmit/index.js
@@ -12,9 +12,11 @@ import { useStoreValue } from '../../../../store';
import { Toast } from 'primereact/toast';
import { Button } from 'primereact/button';
+import { Dialog } from 'primereact/dialog';
-const EvaluationReAdmit = ({ id, status }) => {
+const EvaluationReAdmit = ({ id, status, statusUpdateFn }) => {
const [isSendingRequest, setIsSendingRequest] = useState(false);
+ const [isVisibleConfirmDialog, setIsVisibleConfirmDialog] = useState(false);
const toast = useRef(null);
const role = useStoreValue('getRole');
@@ -33,7 +35,9 @@ const EvaluationReAdmit = ({ id, status }) => {
detail: resp.message
});
}
- window.location.reload();
+ if (statusUpdateFn) {
+ statusUpdateFn(resp.data.status);
+ }
}
setIsSendingRequest(false);
}
@@ -50,6 +54,28 @@ const EvaluationReAdmit = ({ id, status }) => {
setIsSendingRequest(false);
}
+ const headerConfirmDialog = () => {
+ return {__('Richiesta di conferma', 'gepafin')};
+ }
+
+ const hideConfirmDialog = () => {
+ setIsVisibleConfirmDialog(false);
+ }
+
+ const footerConfirmDialog = () => {
+ return
+
+ }
+
+ const doConfirm = () => {
+ setIsVisibleConfirmDialog(false);
+ doReAdmit();
+ }
+
return (
['ROLE_SUPER_ADMIN', 'ROLE_INSTRUCTOR_MANAGER'].includes(role) && ['REJECTED'].includes(status)
? <>
@@ -58,9 +84,20 @@ const EvaluationReAdmit = ({ id, status }) => {
type="button"
disabled={isSendingRequest}
severity="warning"
- onClick={doReAdmit}
+ onClick={() => setIsVisibleConfirmDialog(true)}
label={__('Riammetti', 'gepafin')}
icon="pi pi-arrow-circle-up" iconPos="right"/>
+
> : null
)
}
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 0cebc21..1d30a07 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -787,6 +787,11 @@ const DomandaEditPreInstructor = () => {
}
}
+ const updateStatusOfAppl = useCallback((newStatus) => {
+ const newData = wrap(data).set(['applicationStatus'], newStatus).value();
+ setData(newData);
+ }, [data]);
+
const actionBtns = () => {
return
{['EVALUATION', 'SOCCORSO', 'CLOSE'].includes(data.applicationStatus)
@@ -882,7 +887,7 @@ const DomandaEditPreInstructor = () => {
-
+
}
diff --git a/src/pages/SoccorsoAddPreInstructor/index.js b/src/pages/SoccorsoAddPreInstructor/index.js
index 6b6c78b..ac114b0 100644
--- a/src/pages/SoccorsoAddPreInstructor/index.js
+++ b/src/pages/SoccorsoAddPreInstructor/index.js
@@ -32,7 +32,7 @@ const SoccorsoAddPreInstructor = () => {
const [data, setData] = useState({});
const [evaluationId, setEvaluationId] = useState(0);
const [formData, setFormData] = useState({});
- const [isVisibleConfirmDialog, setIsVisibleConfirmDialog] = useState(false)
+ const [isVisibleConfirmDialog, setIsVisibleConfirmDialog] = useState(false);
const toast = useRef(null);
const goToEvaluationPage = () => {