From fd2be71821334cf24efc6c10d079834eaca67288 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Thu, 2 Jan 2025 09:10:38 +0100
Subject: [PATCH 1/4] - added env var websocket url;

---
 environments/dev/dev.env | 1 +
 1 file changed, 1 insertion(+)

diff --git a/environments/dev/dev.env b/environments/dev/dev.env
index 38e36ec..ae149fd 100644
--- a/environments/dev/dev.env
+++ b/environments/dev/dev.env
@@ -1,6 +1,7 @@
 REACT_APP_TAB_TITLE=Gepafin
 REACT_APP_API_EXECUTION_ADDRESS=https://api-dev-gepafin.memento.credit/v1
 REACT_APP_API_ADDRESS=https://api-dev-gepafin.memento.credit
+REACT_APP_API_ADDRESS_WS=https://api-dev-gepafin.memento.credit/wss
 REACT_APP_LOGO_FILENAME=gepafin-logo.svg
 REACT_APP_FAVICON_FILENAME=gepafin-favicon.ico
 REACT_APP_HUB_ID=p4lk3bcx1RStqTaIVVbXs

From 8430b0a7d5bb0f86978b7ef8e252d2dc701aa9e6 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Thu, 2 Jan 2025 10:17:41 +0100
Subject: [PATCH 2/4] - saving progress;

---
 src/pages/DomandaEditPreInstructor/index.js | 52 ++++++++++++++++-----
 1 file changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 9c2c517..2e7a81e 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -6,7 +6,7 @@ import { klona } from 'klona';
 import { wrap } from 'object-path-immutable';
 
 // store
-import { storeSet, useStore } from '../../store';
+import { storeGet, storeSet, useStore } from '../../store';
 
 // api
 import ApplicationEvaluationService from '../../service/application-evaluation-service';
@@ -502,6 +502,11 @@ const DomandaEditPreInstructor = () => {
         // TODO
     }
 
+    const evaluationShouldBeBlocked = (data = {}) => {
+        const userData = storeGet.main.userData()
+        return isAsyncRequest || userData.id !== data.assignedUserId;
+    }
+
     useEffect(() => {
         const maxScore = pathOr(0, ['minScore'], data);
         const criteria = pathOr([], ['criteria'], data);
@@ -767,7 +772,7 @@ const DomandaEditPreInstructor = () => {
                                 ? <Button
                                     type="button"
                                     disabled={!data.id || data.status === 'CLOSE' || (data.applicationStatus === 'EVALUATION'
-                                        && (!allFilesRated || !atLeastOneChecked))}
+                                        && (!allFilesRated || !atLeastOneChecked)) || evaluationShouldBeBlocked(data)}
                                     onClick={doNewSoccorso}
                                     outlined
                                     label={<>
@@ -782,7 +787,7 @@ const DomandaEditPreInstructor = () => {
                             {data.id
                                 ? <Button
                                     type="button"
-                                    disabled={data.status === 'CLOSE'}
+                                    disabled={data.status === 'CLOSE' || evaluationShouldBeBlocked(data)}
                                     onClick={() => doSaveDraft()}
                                     outlined
                                     label={__('Salva bozza valutazione', 'gepafin')}
@@ -795,28 +800,49 @@ const DomandaEditPreInstructor = () => {
                             {/*{APP_EVALUATION_FLOW_ID === '1' && ['EVALUATION'].includes(data.applicationStatus)
                                 ? <Button
                                     type="button"
-                                    disabled={!data.id || !allFilesRated || !allChecksChecked}
+                                    disabled={!data.id || !allFilesRated || !allChecksChecked || evaluationShouldBeBlocked(data)}
                                     onClick={doCheckNDG}
                                     label={__('Controlla NDG', 'gepafin')}
                                 /> : null}*/}
-                            {APP_EVALUATION_FLOW_ID === '1' && ['NDG'].includes(data.applicationStatus) && data.ndg
+                            <Button
+                                type="button"
+                                disabled={true}
+                                onClick={() => {
+                                }}
+                                label={__('Controlla NDG', 'gepafin')}
+                            />
+                            {/*{APP_EVALUATION_FLOW_ID === '1' && ['NDG'].includes(data.applicationStatus) && data.ndg
                                 ? <Button
                                     type="button"
-                                    disabled={!data.id}
+                                    disabled={!data.id || evaluationShouldBeBlocked(data)}
                                     onClick={doCreateAppointment}
                                     label={__('Crea l\'appuntamento', 'gepafin')}
-                                /> : null}
-                            {APP_EVALUATION_FLOW_ID === '1' && ['APPOINTMENT'].includes(data.applicationStatus)
+                                /> : null}*/}
+                            <Button
+                                type="button"
+                                disabled={true}
+                                onClick={() => {
+                                }}
+                                label={__('Crea l\'appuntamento', 'gepafin')}
+                            />
+                            {/*{APP_EVALUATION_FLOW_ID === '1' && ['APPOINTMENT'].includes(data.applicationStatus)
                                 ? <Button
                                     type="button"
-                                    disabled={!data.id}
+                                    disabled={!data.id || evaluationShouldBeBlocked(data)}
                                     onClick={doMakeAdmisible}
                                     label={__('Ammissibile', 'gepafin')}
-                                /> : null}
+                                /> : null}*/}
+                            <Button
+                                type="button"
+                                disabled={true}
+                                onClick={() => {
+                                }}
+                                label={__('Ammissibile', 'gepafin')}
+                            />
                             {data.id
                                 ? <Button
                                     type="button"
-                                    disabled={!isAdmissible || ['APPROVED'].includes(data.applicationStatus)}
+                                    disabled={!isAdmissible || ['APPROVED'].includes(data.applicationStatus) || evaluationShouldBeBlocked(data)}
                                     /*disabled={!isAdmissible
                                         || (APP_EVALUATION_FLOW_ID === '1' && !['ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus))}*/
                                     onClick={initiateApproving}
@@ -832,7 +858,9 @@ const DomandaEditPreInstructor = () => {
                             {data.id
                                 ? <Button
                                     type="button"
-                                    disabled={APP_EVALUATION_FLOW_ID === '1' && !['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)}
+                                    disabled={APP_EVALUATION_FLOW_ID === '1'
+                                        && !['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
+                                        || evaluationShouldBeBlocked(data)}
                                     onClick={initiateRejecting}
                                     label={__('Respingi Domanda', 'gepafin')}
                                     icon="pi pi-times" iconPos="right"/> : null}

From 4f5bb942460c7b183c9fefa761cf4109563f558e Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Thu, 2 Jan 2025 10:33:54 +0100
Subject: [PATCH 3/4] - fixed parsing websocket message;

---
 src/components/NotificationsSidebar/index.js | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/components/NotificationsSidebar/index.js b/src/components/NotificationsSidebar/index.js
index 31b00e5..07ad67d 100644
--- a/src/components/NotificationsSidebar/index.js
+++ b/src/components/NotificationsSidebar/index.js
@@ -163,12 +163,11 @@ const NotificationsSidebar = () => {
         stomp.current.connect(
             {},
             () => {
-                // connected
-                console.log('Websocket connected');
+                //console.log('Websocket connected');
                 setIsConnected(true);
             },
             (error) => {
-                console.error('WebSocket Connection Error:', error);
+                //console.error('WebSocket Connection Error:', error);
                 setIsConnected(false);
                 setTimeout(connectWebSocket, 5000);
             }
@@ -176,14 +175,12 @@ const NotificationsSidebar = () => {
     };
 
     const subscribeTo = (topic) => {
-        console.log('subscribeTo', topic)
         const subscription = stomp.current.subscribe(
             topic,
             (message) => {
                 try {
                     const notification = JSON.parse(message.body);
-                    console.log('notification', notification)
-                    //setNotifications(prev => [notification, ...prev]);
+                    setNotifications(prev => [notification, ...prev]);
                 } catch (error) {
                     console.error('Error parsing notification:', error);
                 }
@@ -208,7 +205,7 @@ const NotificationsSidebar = () => {
 
             if (stomp.current) {
                 stomp.current.disconnect(() => {
-                    console.log('WebSocket Disconnected');
+                    //console.log('WebSocket Disconnected');
                 });
             }
         };

From be4ab1e1bd440de7c3f3cb6365bb13ee37ccfce0 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Thu, 2 Jan 2025 10:41:38 +0100
Subject: [PATCH 4/4] - updated edit application page for instructor;

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

diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js
index 589dab1..99793aa 100644
--- a/src/pages/DomandaEditInstructorManager/index.js
+++ b/src/pages/DomandaEditInstructorManager/index.js
@@ -28,7 +28,6 @@ import { InputNumber } from 'primereact/inputnumber';
 import { Toast } from 'primereact/toast';
 import { Dialog } from 'primereact/dialog';
 import HelpIcon from '../../icons/HelpIcon';
-import BlockingOverlay from '../../components/BlockingOverlay';
 import { classNames } from 'primereact/utils';
 import { InputTextarea } from 'primereact/inputtextarea';
 import { InputText } from 'primereact/inputtext';
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 2e7a81e..14bc5e3 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -615,7 +615,7 @@ const DomandaEditPreInstructor = () => {
                                 data,
                                 ['evaluationDocument']
                             )}
-                            shouldDisable={['APPROVED', 'REJECTED'].includes(data.applicationStatus)}
+                            shouldDisable={['APPROVED', 'REJECTED'].includes(data.applicationStatus) || evaluationShouldBeBlocked(data)}
                             sourceId={data.assignedApplicationId}
                             sourceName="evaluation"/>
                     </div>
@@ -629,7 +629,7 @@ const DomandaEditPreInstructor = () => {
                                     <div className="appPageSection__checklist">
                                         {data.checklist.map((o, i) => <div key={o.id}>
                                             <Checkbox
-                                                disabled={shouldDisableField('checklist')}
+                                                disabled={shouldDisableField('checklist') || evaluationShouldBeBlocked(data)}
                                                 inputId={`checklist_${o.id}`}
                                                 onChange={(e) => updateEvaluationValue(
                                                     e.checked,
@@ -645,7 +645,7 @@ const DomandaEditPreInstructor = () => {
                                 <div>
                                     <Editor
                                         value={data.note}
-                                        readOnly={shouldDisableField('note')}
+                                        readOnly={shouldDisableField('note') || evaluationShouldBeBlocked(data)}
                                         placeholder={__('Digita qui il messagio', 'gepafin')}
                                         headerTemplate={header}
                                         onTextChange={(e) => updateEvaluationValue(
@@ -661,7 +661,7 @@ const DomandaEditPreInstructor = () => {
                                 <ListOfFiles
                                     files={data.files}
                                     updateFn={updateEvaluationValue}
-                                    shouldDisableFieldFn={shouldDisableField}
+                                    shouldDisableFieldFn={(name) => shouldDisableField(name) || evaluationShouldBeBlocked(data)}
                                     name="files"
                                     ndg={data.ndg}
                                     applicationId={id}/>
@@ -675,7 +675,7 @@ const DomandaEditPreInstructor = () => {
                             <ListOfFiles
                                 files={data.amendmentDetails}
                                 updateFn={updateEvaluationValue}
-                                shouldDisableFieldFn={shouldDisableField}
+                                shouldDisableFieldFn={(name) => shouldDisableField(name) || evaluationShouldBeBlocked(data)}
                                 name="amendmentDetails"
                                 ndg={data.ndg}
                                 applicationId={id}/>
@@ -698,7 +698,7 @@ const DomandaEditPreInstructor = () => {
                                     <td>
                                         <div className="p-inputgroup">
                                             <InputNumber
-                                                disabled={shouldDisableField('criteria')}
+                                                disabled={shouldDisableField('criteria') || evaluationShouldBeBlocked(data)}
                                                 placeholder={__('Punteggio', 'gepafin')}
                                                 keyfilter="int"
                                                 value={o.score}
@@ -721,7 +721,7 @@ const DomandaEditPreInstructor = () => {
                                                           onClick={() => displayCriterionData(o.id)}
                                                           aria-label={__('Mostra', 'gepafin')}/> : null}
                                             <Button icon="pi pi-thumbs-up" rounded outlined
-                                                    disabled={shouldDisableField('criteria')}
+                                                    disabled={shouldDisableField('criteria') || evaluationShouldBeBlocked(data)}
                                                     severity={!isNil(o.valid) && o.valid ? 'success' : 'secondary'}
                                                     onClick={() => updateEvaluationValue(
                                                         true,
@@ -729,7 +729,7 @@ const DomandaEditPreInstructor = () => {
                                                     )}
                                                     aria-label={__('Su', 'gepafin')}/>
                                             <Button icon="pi pi-thumbs-down" rounded outlined
-                                                    disabled={shouldDisableField('criteria')}
+                                                    disabled={shouldDisableField('criteria') || evaluationShouldBeBlocked(data)}
                                                     severity={!isNil(o.valid) && !o.valid ? 'danger' : 'secondary'}
                                                     onClick={() => updateEvaluationValue(
                                                         false,