updateRowData(rowData.id, updateResponse)}/>
diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js
index c5b656a..1fb3c20 100644
--- a/src/pages/DomandaEditInstructorManager/index.js
+++ b/src/pages/DomandaEditInstructorManager/index.js
@@ -53,6 +53,7 @@ import ApplicationInfo from '../DomandaEditPreInstructor/components/ApplicationI
import ApplicationDownloadFiles from '../DomandaEditPreInstructor/components/ApplicationDownloadFiles';
import FormField from '../../components/FormField';
import SoccorsoResendEmails from '../SoccorsoEditPreInstructor/components/SoccorsoResendEmails';
+import EvaluationReAdmit from '../DomandaEditPreInstructor/components/EvaluationReAdmit';
const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
const APP_HUB_ID = process.env.REACT_APP_HUB_ID;
@@ -875,11 +876,29 @@ const DomandaEditInstructorManager = () => {
}
+ const auxActions = () => {
+ return
+
+
+
+ }
+
const updateEmailSendResponses = useCallback((newEmailData) => {
const newData = wrap(data).set(['emailSendResponse'], newEmailData).value();
setData(newData);
}, [data]);
+ const motivationMsg = () => {
+ return data.motivation && !isEmpty(data.motivation) && ['REJECTED', 'APPROVED'].includes(data.applicationStatus)
+ ?
+
+ {__('Motivazione:', 'gepafin')}
+ {renderHtmlContent(data.motivation)}
+
: null
+ }
+
useEffect(() => {
let updatedFormValues = klona(formValues);
let context = {};
@@ -971,19 +990,21 @@ const DomandaEditInstructorManager = () => {
?
+
+ {motivationMsg()}
+
+
{__('Azioni rapide', 'gepafin')}
{actionBtns()}
-
-
-
+ {auxActions()}
+
+
@@ -1008,6 +1029,23 @@ const DomandaEditInstructorManager = () => {
sourceName="evaluation"/>
+
+
{__('Note', 'gepafin')}
+
+ updateEvaluationValue(
+ e.htmlValue,
+ ['note']
+ )}
+ style={{ height: 80 * 3, width: '100%' }}
+ />
+
+
+
{data.evaluationVersion === 'V2'
?
{__('Documenti allegati', 'gepafin')}
@@ -1120,21 +1158,6 @@ const DomandaEditInstructorManager = () => {
)}
-
- {__('Note', 'gepafin')}
-
- updateEvaluationValue(
- e.htmlValue,
- ['note']
- )}
- style={{ height: 80 * 3, width: '100%' }}
- />
-
{__('Documenti allegati', 'gepafin')}
@@ -1253,11 +1276,7 @@ const DomandaEditInstructorManager = () => {
{actionBtns()}
-
-
-
+ {auxActions()}
}
+ const auxActions = () => {
+ return
+
+
+
+ }
+
const updateEmailSendResponses = useCallback((newEmailData) => {
const newData = wrap(data).set(['emailSendResponse'], newEmailData).value();
setData(newData);
}, [data]);
+ const motivationMsg = () => {
+ return data.motivation && !isEmpty(data.motivation) && ['REJECTED', 'APPROVED'].includes(data.applicationStatus)
+ ?
+
+ {__('Motivazione:', 'gepafin')}
+ {renderHtmlContent(data.motivation)}
+
: null
+ }
+
useEffect(() => {
let updatedFormValues = klona(formValues);
let context = {};
@@ -973,19 +992,21 @@ const DomandaEditPreInstructor = () => {
?
+
+ {motivationMsg()}
+
+
{__('Azioni rapide', 'gepafin')}
{actionBtns()}
-
-
-
+ {auxActions()}
+
+
@@ -1010,6 +1031,23 @@ const DomandaEditPreInstructor = () => {
sourceName="evaluation"/>
+
+
{__('Note', 'gepafin')}
+
+ updateEvaluationValue(
+ e.htmlValue,
+ ['note']
+ )}
+ style={{ height: 80 * 3, width: '100%' }}
+ />
+
+
+
{data.evaluationVersion === 'V2'
?
{__('Documenti allegati', 'gepafin')}
@@ -1122,21 +1160,6 @@ const DomandaEditPreInstructor = () => {
)}
-
- {__('Note', 'gepafin')}
-
- updateEvaluationValue(
- e.htmlValue,
- ['note']
- )}
- style={{ height: 80 * 3, width: '100%' }}
- />
-
{__('Documenti allegati', 'gepafin')}
@@ -1255,11 +1278,7 @@ const DomandaEditPreInstructor = () => {
{actionBtns()}
-
-
-
+ {auxActions()}