From 92ac388a5b87be84a3867a5018349218af70a7b7 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Mon, 2 Dec 2024 11:12:30 +0100
Subject: [PATCH 01/23] - enabled fiscal code field for flow 2;

---
 src/helpers/formatDateString.js | 1 -
 src/pages/AddCompany/index.js   | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/helpers/formatDateString.js b/src/helpers/formatDateString.js
index 9c08c55..9690a1b 100644
--- a/src/helpers/formatDateString.js
+++ b/src/helpers/formatDateString.js
@@ -4,7 +4,6 @@
  * @return {string}
  */
 const formatDateString = (date) => {
-    console.log('date', date);
     const year = date.getFullYear();
     const month = String(date.getMonth() + 1).padStart(2, '0');
     const day = String(date.getDate()).padStart(2, '0');
diff --git a/src/pages/AddCompany/index.js b/src/pages/AddCompany/index.js
index 57d6d83..4a81ad2 100644
--- a/src/pages/AddCompany/index.js
+++ b/src/pages/AddCompany/index.js
@@ -22,6 +22,8 @@ import CompanyService from '../../service/company-service';
 import { isPIVA, isEmail, isEmailPEC } from '../../helpers/validators';
 import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
 
+const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
+
 const AddCompany = () => {
     const navigate = useNavigate();
     const isAsyncRequest = useStore().main.isAsyncRequest();
@@ -186,7 +188,7 @@ const AddCompany = () => {
 
                         <FormField
                             type="textinput"
-                            disabled={true}
+                            disabled={APP_EVALUATION_FLOW_ID === '1'}
                             fieldName="codiceFiscale"
                             label={__('Codice fiscale', 'gepafin')}
                             control={control}

From 893b49a66bab0b304e13d084ccf7f0143caa8eb5 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Mon, 2 Dec 2024 12:33:01 +0100
Subject: [PATCH 02/23] - updated source code for amendment fileupload;

---
 src/pages/DomandaBeneficiario/index.js       | 1 +
 src/pages/SoccorsoEditPreInstructor/index.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/pages/DomandaBeneficiario/index.js b/src/pages/DomandaBeneficiario/index.js
index 3ba58ae..2aee3a5 100644
--- a/src/pages/DomandaBeneficiario/index.js
+++ b/src/pages/DomandaBeneficiario/index.js
@@ -289,6 +289,7 @@ const DomandaBeneficiario = () => {
                                         errors={errors}
                                         defaultValue={formInitialData[o.fieldId] ? formInitialData[o.fieldId] : []}
                                         accept={[]}
+                                        source="AMENDMENT"
                                         sourceId={data.applicationId}
                                         multiple={true}
                                     />
diff --git a/src/pages/SoccorsoEditPreInstructor/index.js b/src/pages/SoccorsoEditPreInstructor/index.js
index 41420c5..7ca9299 100644
--- a/src/pages/SoccorsoEditPreInstructor/index.js
+++ b/src/pages/SoccorsoEditPreInstructor/index.js
@@ -407,6 +407,7 @@ const SoccorsoEditPreInstructor = () => {
                                     errors={errors}
                                     defaultValue={formInitialData[o.fieldId] ? formInitialData[o.fieldId] : []}
                                     accept={[]}
+                                    source="AMENDMENT"
                                     sourceId={data.applicationId}
                                     multiple={true}
                                 />

From a60ef5238e6bd8cfede4f269769c52bd831c0dd1 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Mon, 2 Dec 2024 13:31:33 +0100
Subject: [PATCH 03/23] - fixed error related to saving valuation object;

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

diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index ad8e506..95c0c9b 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -134,6 +134,7 @@ const DomandaEditPreInstructor = () => {
             files: klona(data.files),
             note: data.note
         }
+
         ApplicationEvaluationService.updateEvaluation(
             data.assignedApplicationId,
             formData,
@@ -661,13 +662,13 @@ const DomandaEditPreInstructor = () => {
                                 ? <Button
                                     type="button"
                                     disabled={data.status === 'CLOSE'}
-                                    onClick={doSaveDraft}
+                                    onClick={() => doSaveDraft()}
                                     outlined
                                     label={__('Salva bozza valutazione', 'gepafin')}
                                     icon="pi pi-save" iconPos="right"/>
                                 : <Button
                                     type="button"
-                                    onClick={doSaveDraft}
+                                    onClick={() => doSaveDraft()}
                                     label={__('Crea valutazione', 'gepafin')}
                                     icon="pi pi-save" iconPos="right"/>}
                             {APP_EVALUATION_FLOW_ID === '1' && ['EVALUATION'].includes(data.applicationStatus)

From 2816d388a59459ea73c4405f099343a16ad93a8b Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Tue, 3 Dec 2024 11:47:53 +0100
Subject: [PATCH 04/23] - saving progress;

---
 .env                                     |  3 +-
 package.json                             |  3 +-
 src/components/ErrorBoundary/index.js    | 41 +++++++++++++
 src/components/ProtectedRoute/index.js   |  3 +-
 src/pages/AddCompany/index.js            | 56 +++++++++++++----
 src/pages/Applications/index.js          |  3 +-
 src/pages/BandiBeneficiario/index.js     |  3 +-
 src/pages/DashboardBeneficiario/index.js |  5 +-
 src/service/network-service.js           | 76 +++++++++++++++++++-----
 9 files changed, 159 insertions(+), 34 deletions(-)
 create mode 100644 src/components/ErrorBoundary/index.js

diff --git a/.env b/.env
index 9ef0c84..ef5dcea 100644
--- a/.env
+++ b/.env
@@ -4,4 +4,5 @@ REACT_APP_API_ADDRESS=https://api-dev-gepafin.memento.credit
 REACT_APP_LOGO_FILENAME=gepafin-logo.svg
 REACT_APP_FAVICON_FILENAME=gepafin-favicon.ico
 REACT_APP_HUB_ID=p4lk3bcx1RStqTaIVVbXs
-REACT_APP_EVALUATION_FLOW_ID=1
\ No newline at end of file
+REACT_APP_EVALUATION_FLOW_ID=1
+REACT_APP_LOCAL_DEVELOPMENT=1
\ No newline at end of file
diff --git a/package.json b/package.json
index eb4ec21..e58a0a4 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,8 @@
     "@date-fns/tz": "1.1.2",
     "@emailjs/browser": "^4.4.1",
     "@emotion/styled": "11.13.0",
-    "@number-flow/react": "0.2.0",
+    "@number-flow/react": "0.4.2",
+    "@sentry/browser": "^8.42.0",
     "@tanstack/react-table": "^8.20.5",
     "@wordpress/i18n": "5.8.0",
     "@wordpress/react-i18n": "4.8.0",
diff --git a/src/components/ErrorBoundary/index.js b/src/components/ErrorBoundary/index.js
new file mode 100644
index 0000000..4ac790c
--- /dev/null
+++ b/src/components/ErrorBoundary/index.js
@@ -0,0 +1,41 @@
+import React, { Component } from 'react';
+import * as Sentry from '@sentry/browser';
+
+const LOCAL_DEVELOPMENT = process.env.REACT_APP_LOCAL_DEVELOPMENT;
+
+class ErrorBoundary extends Component {
+    constructor(props) {
+        super(props);
+
+        this.state = {
+            builderError: false
+        };
+    }
+
+    static getDerivedStateFromError(error) {
+        try {
+            if (LOCAL_DEVELOPMENT !== '1') {
+                Sentry.init({
+                    dsn: "https://e7b2134f7d816f663bb83e51b106a694@o4508381921738752.ingest.de.sentry.io/4508381935501392",
+                    environment: process.env.NODE_ENV || "development"
+                });
+
+                Sentry.captureException(error);
+            }
+        } catch (err) {
+            console.log('err')
+            console.log(err);
+        }
+        return { builderError: true };
+    }
+
+    render() {
+        if (this.state.builderError) {
+            return <div>Error</div>;
+        }
+
+        return this.props.children;
+    }
+}
+
+export default ErrorBoundary;
\ No newline at end of file
diff --git a/src/components/ProtectedRoute/index.js b/src/components/ProtectedRoute/index.js
index f50b3f8..a5620f8 100644
--- a/src/components/ProtectedRoute/index.js
+++ b/src/components/ProtectedRoute/index.js
@@ -3,6 +3,7 @@ import { Navigate, Outlet } from 'react-router-dom';
 
 // tools
 import AuthenticationService from '../../service/authentication-service';
+import ErrorBoundary from '../ErrorBoundary';
 
 const ProtectedRoute = () => {
 
@@ -22,7 +23,7 @@ const ProtectedRoute = () => {
         return (<Navigate to={'/'} replace/>);
     }*/
 
-    return <Outlet/>;
+    return <ErrorBoundary><Outlet/></ErrorBoundary>;
 }
 
 export default ProtectedRoute;
\ No newline at end of file
diff --git a/src/pages/AddCompany/index.js b/src/pages/AddCompany/index.js
index 4a81ad2..8f30a74 100644
--- a/src/pages/AddCompany/index.js
+++ b/src/pages/AddCompany/index.js
@@ -35,12 +35,14 @@ const AddCompany = () => {
         handleSubmit,
         formState: { errors },
         setValue,
-        watch
+        watch,
+        getValues
     } = useForm({
         defaultValues: {},
         mode: 'onChange'
     });
     const isPiva = watch('vatNumber');
+    //const isPiva = watch('vatNumber');
 
     const setEmptyValues = () => {
         const formData = {
@@ -138,6 +140,11 @@ const AddCompany = () => {
         storeSet.main.unsetAsyncRequest();
     }
 
+    const shouldDisableFiscalCode = () => {
+        const formData = getValues();
+        return !formData.type || formData.type && formData.type === 'giuridica';
+    }
+
     useEffect(() => {
         setInputPiva(isPiva);
     }, [isPiva]);
@@ -145,7 +152,7 @@ const AddCompany = () => {
     useEffect(() => {
         checkVatNumber(debouncedPivaValue);
     }, [debouncedPivaValue])
-
+console.log('APP_EVALUATION_FLOW_ID', APP_EVALUATION_FLOW_ID)
     return (
         <div className="appPage">
             <div className="appPage__pageHeader">
@@ -176,6 +183,23 @@ const AddCompany = () => {
                         />
                     </div>
 
+                    {APP_EVALUATION_FLOW_ID === '2'
+                        ? <div className="appForm__cols">
+                            <FormField
+                                type="radio"
+                                fieldName="type"
+                                label={__('Type', 'gepafin')}
+                                control={control}
+                                errors={errors}
+                                config={{ required: __('È obbligatorio', 'gepafin') }}
+                                defaultValue="giuridica"
+                                options={[
+                                    { name: 'giuridica', label: 'Giuridica' },
+                                    { name: 'fisica', label: 'Fisica' },
+                                ]}
+                            />
+                        </div> : null}
+
                     <div className="appForm__cols">
                         <FormField
                             type="textinput"
@@ -186,15 +210,25 @@ const AddCompany = () => {
                             config={{ required: __('È obbligatorio', 'gepafin') }}
                         />
 
-                        <FormField
-                            type="textinput"
-                            disabled={APP_EVALUATION_FLOW_ID === '1'}
-                            fieldName="codiceFiscale"
-                            label={__('Codice fiscale', 'gepafin')}
-                            control={control}
-                            errors={errors}
-                            config={{ required: __('È obbligatorio', 'gepafin') }}
-                        />
+                        {APP_EVALUATION_FLOW_ID === '1'
+                            ? <FormField
+                                type="textinput"
+                                disabled
+                                fieldName="codiceFiscale"
+                                label={__('Codice fiscale', 'gepafin')}
+                                control={control}
+                                errors={errors}
+                                config={{ required: __('È obbligatorio', 'gepafin') }}
+                            />
+                            : <FormField
+                                type="textinput"
+                                disabled={shouldDisableFiscalCode()}
+                                fieldName="codiceFiscale"
+                                label={__('Codice fiscale', 'gepafin')}
+                                control={control}
+                                errors={errors}
+                                config={{ required: __('È obbligatorio', 'gepafin') }}
+                            />}
                     </div>
 
                     <div className="appForm__cols">
diff --git a/src/pages/Applications/index.js b/src/pages/Applications/index.js
index 08b1012..ad3393f 100644
--- a/src/pages/Applications/index.js
+++ b/src/pages/Applications/index.js
@@ -5,6 +5,7 @@ import { useNavigate } from 'react-router-dom';
 // components
 import MyLatestSubmissionsTable from '../DashboardBeneficiario/components/MyLatestSubmissionsTable';
 import { Button } from 'primereact/button';
+import ErrorBoundary from '../../components/ErrorBoundary';
 
 const Applications = () => {
     const navigate = useNavigate();
@@ -22,7 +23,7 @@ const Applications = () => {
             <div className="appPage__spacer"></div>
 
             <div className="appPageSection">
-                <MyLatestSubmissionsTable/>
+                <ErrorBoundary><MyLatestSubmissionsTable/></ErrorBoundary>
             </div>
 
             <div className="appPage__spacer"></div>
diff --git a/src/pages/BandiBeneficiario/index.js b/src/pages/BandiBeneficiario/index.js
index be925d3..5a191be 100644
--- a/src/pages/BandiBeneficiario/index.js
+++ b/src/pages/BandiBeneficiario/index.js
@@ -8,6 +8,7 @@ import { useStore } from '../../store';
 
 // components
 import AllBandiAccordion from './components/AllBandiAccordion';
+import ErrorBoundary from '../../components/ErrorBoundary';
 
 const BandiBeneficiario = () => {
     const chosenCompanyId = useStore().main.chosenCompanyId();
@@ -34,7 +35,7 @@ const BandiBeneficiario = () => {
                 </> : null}
 
             <div className="appPageSection">
-                <AllBandiAccordion/>
+                <ErrorBoundary><AllBandiAccordion/></ErrorBoundary>
             </div>
         </div>
     )
diff --git a/src/pages/DashboardBeneficiario/index.js b/src/pages/DashboardBeneficiario/index.js
index 66ac510..cc12f6e 100644
--- a/src/pages/DashboardBeneficiario/index.js
+++ b/src/pages/DashboardBeneficiario/index.js
@@ -14,6 +14,7 @@ import DashboardService from '../../service/dashboard-service';
 import LatestBandiTable from './components/LatestBandiTable';
 import MyLatestSubmissionsTable from './components/MyLatestSubmissionsTable';
 import { Button } from 'primereact/button';
+import ErrorBoundary from '../../components/ErrorBoundary';
 
 const DashboardBeneficiario = () => {
     const navigate = useNavigate();
@@ -85,7 +86,7 @@ const DashboardBeneficiario = () => {
 
             <div className="appPageSection">
                 <h2>{__('Domande in lavorazione', 'gepafin')}</h2>
-                <MyLatestSubmissionsTable/>
+                <ErrorBoundary><MyLatestSubmissionsTable/></ErrorBoundary>
             </div>
 
             <div className="appPage__spacer"></div>
@@ -105,7 +106,7 @@ const DashboardBeneficiario = () => {
 
             <div className="appPageSection">
                 <h2>{__('Bandi disponibili', 'gepafin')}</h2>
-                <LatestBandiTable/>
+                <ErrorBoundary><LatestBandiTable/></ErrorBoundary>
             </div>
 
             <div className="appPage__spacer"></div>
diff --git a/src/service/network-service.js b/src/service/network-service.js
index 98464cb..fa0ef72 100644
--- a/src/service/network-service.js
+++ b/src/service/network-service.js
@@ -1,9 +1,36 @@
 import { storeGet } from '../store';
+import * as Sentry from "@sentry/browser";
+
+const LOCAL_DEVELOPMENT = process.env.REACT_APP_LOCAL_DEVELOPMENT;
 
 export class NetworkService {
     static TOKEN_KEY
     static REFRESH_TOKEN_KEY
 
+    static logApiError = (endpoint, status = 0, resp) => {
+        try {
+            if ([500].includes(status)) {
+                if (LOCAL_DEVELOPMENT !== '1') {
+                    Sentry.init({
+                        dsn: "https://e7b2134f7d816f663bb83e51b106a694@o4508381921738752.ingest.de.sentry.io/4508381935501392",
+                        environment: process.env.NODE_ENV || "development"
+                    });
+
+                    const error = new Error(`Status ${status}`);
+                    Sentry.captureException(`Error in endpoint: ${endpoint}`, {
+                        level: 'error',
+                        extra: {
+                            originalError: error,
+                            details: resp
+                        }
+                    });
+                }
+            }
+        } catch (err) {
+            console.log(err);
+        }
+    }
+
     static postEmptyResponse = (url, body, callback, errorCallback) => {
         fetch(url, {
             method: 'POST',
@@ -77,10 +104,12 @@ export class NetworkService {
                 return { response: await response.json(), status: status }
             })
             .then(data => {
-                if (data.status >= 400 && data.status <= 599)
+                if (data.status >= 400 && data.status <= 599) {
                     errorCallback(data.response)
-                else
+                    this.logApiError(url, data.status, data.response);
+                } else {
                     callback(data.response)
+                }
             })
             .catch(err => errorCallback(err));
     };
@@ -118,10 +147,12 @@ export class NetworkService {
                 return { response: await response.json(), status: status }
             })
             .then(data => {
-                if (data.status >= 400 && data.status <= 599)
+                if (data.status >= 400 && data.status <= 599) {
                     errorCallback(data.response)
-                else
+                    this.logApiError(url, data.status, data.response);
+                } else {
                     callback(data.response)
+                }
             })
             .catch(err => errorCallback(err));
     };
@@ -159,10 +190,12 @@ export class NetworkService {
                 return { response: await response.blob(), status: status }
             })
             .then(data => {
-                if (data.status >= 400 && data.status <= 599)
+                if (data.status >= 400 && data.status <= 599) {
                     errorCallback(data.response)
-                else
+                    this.logApiError(url, data.status, data.response);
+                } else {
                     callback(data.response)
+                }
             })
             .catch(err => errorCallback(err));
     };
@@ -198,10 +231,12 @@ export class NetworkService {
                 return { response: await response.json(), status: status }
             })
             .then(data => {
-                if (data.status >= 400 && data.status <= 599)
+                if (data.status >= 400 && data.status <= 599) {
                     errorCallback(data.response)
-                else
+                    this.logApiError(url, data.status, data.response);
+                } else {
                     callback(data.response)
+                }
             })
             .catch(err => errorCallback(err));
     };
@@ -261,10 +296,12 @@ export class NetworkService {
                 return { response: await response.json(), status: status }
             })
             .then(data => {
-                if (data.status >= 400 && data.status <= 599)
+                if (data.status >= 400 && data.status <= 599) {
                     errorCallback(data.response)
-                else
+                    this.logApiError(url, data.status, data.response);
+                } else {
                     callback(data.response)
+                }
             })
             .catch(err => errorCallback(err));
     };
@@ -381,12 +418,15 @@ export class NetworkService {
             })
             .then(data => {
                 if (data.status >= 400 && data.status <= 599) {
-                    errorCallback(data.response)
+                    errorCallback(data.response);
+                    this.logApiError(url, data.status, data.response);
                 } else {
                     callback(data.response)
                 }
             })
-            .catch(err => errorCallback(err));
+            .catch(err => {
+                errorCallback(err)
+            });
 
     };
 
@@ -422,10 +462,12 @@ export class NetworkService {
                 return { response: await response.blob(), status: status }
             })
             .then(data => {
-                if (data.status >= 400 && data.status <= 599)
+                if (data.status >= 400 && data.status <= 599) {
                     errorCallback(data.response)
-                else
+                    this.logApiError(url, data.status, data.response);
+                } else {
                     callback(data.response)
+                }
             })
             .catch(err => errorCallback(err));
     };
@@ -504,10 +546,12 @@ export class NetworkService {
                 return { response: await response.json(), status: status }
             })
             .then(data => {
-                if (data.status >= 400 && data.status <= 599)
+                if (data.status >= 400 && data.status <= 599) {
                     errorCallback(data.response)
-                else
+                    this.logApiError(url, data.status, data.response);
+                } else {
                     callback(data.response)
+                }
             })
             .catch(err => errorCallback(err));
 

From 5f02a89f1df0722c86d4155973deaf7b8a30b414 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Tue, 3 Dec 2024 17:00:34 +0100
Subject: [PATCH 05/23] - hid console message; - fixed adding company page;

---
 src/pages/AddCompany/index.js | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/pages/AddCompany/index.js b/src/pages/AddCompany/index.js
index 8f30a74..87c712e 100644
--- a/src/pages/AddCompany/index.js
+++ b/src/pages/AddCompany/index.js
@@ -22,7 +22,7 @@ import CompanyService from '../../service/company-service';
 import { isPIVA, isEmail, isEmailPEC } from '../../helpers/validators';
 import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
 
-const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
+//const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
 
 const AddCompany = () => {
     const navigate = useNavigate();
@@ -140,10 +140,10 @@ const AddCompany = () => {
         storeSet.main.unsetAsyncRequest();
     }
 
-    const shouldDisableFiscalCode = () => {
+    /*const shouldDisableFiscalCode = () => {
         const formData = getValues();
         return !formData.type || formData.type && formData.type === 'giuridica';
-    }
+    }*/
 
     useEffect(() => {
         setInputPiva(isPiva);
@@ -152,7 +152,7 @@ const AddCompany = () => {
     useEffect(() => {
         checkVatNumber(debouncedPivaValue);
     }, [debouncedPivaValue])
-console.log('APP_EVALUATION_FLOW_ID', APP_EVALUATION_FLOW_ID)
+
     return (
         <div className="appPage">
             <div className="appPage__pageHeader">
@@ -183,7 +183,7 @@ console.log('APP_EVALUATION_FLOW_ID', APP_EVALUATION_FLOW_ID)
                         />
                     </div>
 
-                    {APP_EVALUATION_FLOW_ID === '2'
+                    {/*{APP_EVALUATION_FLOW_ID === '2'
                         ? <div className="appForm__cols">
                             <FormField
                                 type="radio"
@@ -198,7 +198,7 @@ console.log('APP_EVALUATION_FLOW_ID', APP_EVALUATION_FLOW_ID)
                                     { name: 'fisica', label: 'Fisica' },
                                 ]}
                             />
-                        </div> : null}
+                        </div> : null}*/}
 
                     <div className="appForm__cols">
                         <FormField
@@ -210,7 +210,16 @@ console.log('APP_EVALUATION_FLOW_ID', APP_EVALUATION_FLOW_ID)
                             config={{ required: __('È obbligatorio', 'gepafin') }}
                         />
 
-                        {APP_EVALUATION_FLOW_ID === '1'
+                        <FormField
+                            type="textinput"
+                            disabled
+                            fieldName="codiceFiscale"
+                            label={__('Codice fiscale', 'gepafin')}
+                            control={control}
+                            errors={errors}
+                            config={{ required: __('È obbligatorio', 'gepafin') }}
+                        />
+                        {/*{APP_EVALUATION_FLOW_ID === '1'
                             ? <FormField
                                 type="textinput"
                                 disabled
@@ -228,7 +237,7 @@ console.log('APP_EVALUATION_FLOW_ID', APP_EVALUATION_FLOW_ID)
                                 control={control}
                                 errors={errors}
                                 config={{ required: __('È obbligatorio', 'gepafin') }}
-                            />}
+                            />}*/}
                     </div>
 
                     <div className="appForm__cols">

From 0142e20edefb2c827c1ed62f5570995604fd2189 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Wed, 4 Dec 2024 17:34:33 +0100
Subject: [PATCH 06/23] - force user redirect to login page after response 403;

---
 src/service/network-service.js | 217 ++++-----------------------------
 1 file changed, 24 insertions(+), 193 deletions(-)

diff --git a/src/service/network-service.js b/src/service/network-service.js
index fa0ef72..e1ee1ab 100644
--- a/src/service/network-service.js
+++ b/src/service/network-service.js
@@ -1,5 +1,5 @@
-import { storeGet } from '../store';
-import * as Sentry from "@sentry/browser";
+import { storeGet, storeSet } from '../store';
+import * as Sentry from '@sentry/browser';
 
 const LOCAL_DEVELOPMENT = process.env.REACT_APP_LOCAL_DEVELOPMENT;
 
@@ -7,13 +7,13 @@ export class NetworkService {
     static TOKEN_KEY
     static REFRESH_TOKEN_KEY
 
-    static logApiError = (endpoint, status = 0, resp) => {
-        try {
-            if ([500].includes(status)) {
-                if (LOCAL_DEVELOPMENT !== '1') {
+    static logApiError = (endpoint, status = 0, resp = {}) => {
+        if (status === 500) {
+            if (LOCAL_DEVELOPMENT !== '1') {
+                try {
                     Sentry.init({
-                        dsn: "https://e7b2134f7d816f663bb83e51b106a694@o4508381921738752.ingest.de.sentry.io/4508381935501392",
-                        environment: process.env.NODE_ENV || "development"
+                        dsn: 'https://e7b2134f7d816f663bb83e51b106a694@o4508381921738752.ingest.de.sentry.io/4508381935501392',
+                        environment: process.env.NODE_ENV || 'development'
                     });
 
                     const error = new Error(`Status ${status}`);
@@ -24,53 +24,19 @@ export class NetworkService {
                             details: resp
                         }
                     });
+                } catch (err) {
+                    console.log(err);
                 }
             }
-        } catch (err) {
-            console.log(err);
+        } else if (status === 403) {
+            storeSet.main.token('');
+            const { pathname } = window.location;
+            if (!['/login', '/loginadmin', '/reset-password'].includes(pathname)) {
+                window.location.replace('/login');
+            }
         }
     }
 
-    static postEmptyResponse = (url, body, callback, errorCallback) => {
-        fetch(url, {
-            method: 'POST',
-            mode: 'cors',
-            headers: {
-                'Content-Type': 'application/json',
-                'Authorization': storeGet.main.getToken(),
-                'Access-Control-Allow-Origin': '*'
-            },
-            body: JSON.stringify(body)
-        })
-            .then(data => {
-                if (data.status >= 400 && data.status <= 599)
-                    errorCallback(data.status)
-                else
-                    callback()
-            })
-            .catch(err => errorCallback(err));
-    };
-
-    static putEmptyResponse = (url, body, callback, errorCallback) => {
-        fetch(url, {
-            method: 'PUT',
-            mode: 'cors',
-            headers: {
-                'Content-Type': 'application/json',
-                'Authorization': storeGet.main.getToken(),
-                'Access-Control-Allow-Origin': '*'
-            },
-            body: JSON.stringify(body)
-        })
-            .then(data => {
-                if (data.status >= 400 && data.status <= 599)
-                    errorCallback(data.status)
-                else
-                    callback()
-            })
-            .catch(err => errorCallback(err));
-    };
-
     static post = (url, body, callback, errorCallback, queryParams) => {
 
         if (queryParams) {
@@ -101,6 +67,7 @@ export class NetworkService {
         })
             .then(async response => {
                 let status = response.status;
+                this.logApiError(url, status);
                 return { response: await response.json(), status: status }
             })
             .then(data => {
@@ -144,6 +111,7 @@ export class NetworkService {
         })
             .then(async response => {
                 let status = response.status;
+                this.logApiError(url, status);
                 return { response: await response.json(), status: status }
             })
             .then(data => {
@@ -187,6 +155,7 @@ export class NetworkService {
         })
             .then(async response => {
                 let status = response.status;
+                this.logApiError(url, status);
                 return { response: await response.blob(), status: status }
             })
             .then(data => {
@@ -228,6 +197,7 @@ export class NetworkService {
         })
             .then(async response => {
                 let status = response.status;
+                this.logApiError(url, status);
                 return { response: await response.json(), status: status }
             })
             .then(data => {
@@ -241,28 +211,6 @@ export class NetworkService {
             .catch(err => errorCallback(err));
     };
 
-    static patch = (url, body, callback, errorCallback) => {
-        fetch(url, {
-            method: 'PATCH',
-            mode: 'cors',
-            headers: {
-                'Content-Type': 'application/json'
-            },
-            body: JSON.stringify(body)
-        })
-            .then(async response => {
-                let status = response.status;
-                return { response: await response.json(), status: status }
-            })
-            .then(data => {
-                if (data.status >= 400 && data.status <= 599)
-                    errorCallback(data.response)
-                else
-                    callback(data.response)
-            })
-            .catch(err => errorCallback(err));
-    };
-
     static put = (url, body, callback, errorCallback, queryParams = null) => {
         if (queryParams) {
             url += '?'
@@ -293,6 +241,7 @@ export class NetworkService {
         })
             .then(async response => {
                 let status = response.status;
+                this.logApiError(url, status);
                 return { response: await response.json(), status: status }
             })
             .then(data => {
@@ -306,79 +255,6 @@ export class NetworkService {
             .catch(err => errorCallback(err));
     };
 
-    static unauthorizedPostEmptyResponse = (url, body, callback, errorCallback) => {
-        fetch(url, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'Access-Control-Allow-Origin': '*'
-            },
-            body: JSON.stringify(body)
-        })
-            .then(data => callback(data))
-            .catch(err => errorCallback(err));
-
-    };
-
-    static unauthorizedPutEmptyResponse = (url, body, callback, errorCallback) => {
-        fetch(url, {
-            method: 'PUT',
-            headers: {
-                'Content-Type': 'application/json',
-                'Access-Control-Allow-Origin': '*'
-            },
-            body: JSON.stringify(body)
-        })
-            .then(data => callback(data))
-            .catch(err => errorCallback(err));
-
-    };
-
-    static unauthorizedGet = (url, queryParams, callback, errorCallback) => {
-        fetch(url, {
-            method: 'GET',
-            mode: 'cors',
-            headers: {
-                'Content-Type': 'application/json',
-            }
-        })
-            .then(async response => {
-                let status = response.status;
-                return { response: await response.json(), status: status }
-            })
-            .then(data => {
-                if (data.status >= 400 && data.status <= 599)
-                    errorCallback(data.response)
-                else
-                    callback(data.response)
-            })
-            .catch(err => errorCallback(err));
-
-    };
-
-    static unauthorizedPatch = (url, body, callback, errorCallback) => {
-        fetch(url, {
-            method: 'PATCH',
-            mode: 'cors',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify(body)
-        })
-            .then(async response => {
-                let status = response.status;
-                return { response: await response.json(), status: status }
-            })
-            .then(data => {
-                if (data.status >= 400 && data.status <= 599)
-                    errorCallback(data.response)
-                else
-                    callback(data.response)
-            })
-            .catch(err => errorCallback(err));
-
-    };
-
     static isNotBlank(value) {
         return value !== null && value !== undefined && value !== ''
     }
@@ -413,7 +289,7 @@ export class NetworkService {
         })
             .then(async response => {
                 let status = response.status;
-                //console.log('status in fetch:', status)
+                this.logApiError(url, status);
                 return { response: await response.json(), status: status }
             })
             .then(data => {
@@ -459,6 +335,7 @@ export class NetworkService {
         })
             .then(async response => {
                 let status = response.status;
+                this.logApiError(url, status);
                 return { response: await response.blob(), status: status }
             })
             .then(data => {
@@ -472,53 +349,6 @@ export class NetworkService {
             .catch(err => errorCallback(err));
     };
 
-    static promiseGet = async (url, queryParams = null) => {
-        const response = await fetch(url, {
-            method: 'GET',
-            mode: 'cors',
-            headers: {
-                'Content-Type': 'application/json',
-                'Authorization': 'Bearer ' + storeGet.main.getToken(),
-                'Access-Control-Allow-Origin': '*'
-            }
-        });
-
-        const json = await response.json();
-        return json;
-    }
-
-    static deleteEmptyResponse = (url, callback, errorCallback, queryParams = null) => {
-        if (queryParams) {
-            let params = '?'
-
-            for (let i = 0; i < queryParams.length; i++) {
-                params += queryParams[i][0] + '=' + queryParams[i][1]
-                if (queryParams.length !== i + 1)
-                    params += '&'
-                url += params
-                params = ''
-            }
-
-        }
-
-        fetch(url, {
-            method: 'DELETE',
-            mode: 'cors',
-            headers: {
-                'Content-Type': 'application/json',
-                'Authorization': storeGet.main.getToken(),
-                'Access-Control-Allow-Origin': '*'
-            }
-        })
-            .then(data => {
-                if (data.status >= 400 && data.status <= 599)
-                    errorCallback(data.status)
-                else
-                    callback()
-            })
-            .catch(err => errorCallback(err));
-    }
-
     static delete = (url, body, callback, errorCallback, queryParams = null) => {
         if (queryParams) {
             let params = '?'
@@ -543,6 +373,7 @@ export class NetworkService {
         })
             .then(async response => {
                 let status = response.status;
+                this.logApiError(url, status);
                 return { response: await response.json(), status: status }
             })
             .then(data => {

From 4081b8b3751351152249bd331461712929ac7ba9 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Thu, 5 Dec 2024 09:39:29 +0100
Subject: [PATCH 07/23] - updated hotkeys;

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

diff --git a/src/pages/Login/index.js b/src/pages/Login/index.js
index 3b7a6d8..eacfec4 100644
--- a/src/pages/Login/index.js
+++ b/src/pages/Login/index.js
@@ -116,7 +116,7 @@ const Login = () => {
         /*if ('t7jh5wfg9QXylNaTZkPoE' === APP_HUB_ID) {
             setIsMaintenance(true);
         }*/
-        hotkeys('command+x', function(event, handler){
+        hotkeys('command+x,ctrl+x', function(event, handler){
             window.location.replace('/loginadmin')
         });
     }, []);

From cf19ea9d12d3cc6ce09e1fd984d8ef328bb168ff Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Thu, 5 Dec 2024 11:38:58 +0100
Subject: [PATCH 08/23] - added button download zip of application?; - changed
 order of section on evaluation page;

---
 src/pages/DomandaBeneficiario/index.js        |  56 ++---
 .../DownloadApplicationArchive/index.js       |  49 +++++
 src/pages/DomandaEditPreInstructor/index.js   | 198 +++++++++---------
 src/service/application-service.js            |   4 +
 4 files changed, 187 insertions(+), 120 deletions(-)
 create mode 100644 src/pages/DomandaEditPreInstructor/components/DownloadApplicationArchive/index.js

diff --git a/src/pages/DomandaBeneficiario/index.js b/src/pages/DomandaBeneficiario/index.js
index 2aee3a5..081b39c 100644
--- a/src/pages/DomandaBeneficiario/index.js
+++ b/src/pages/DomandaBeneficiario/index.js
@@ -207,35 +207,39 @@ const DomandaBeneficiario = () => {
             <div className="appPage__content">
                 {data.id
                     ? <div className="appPageSection__withBorder columns">
-                    <p className="appPageSection__pMeta">
-                        <span>{__('ID domanda', 'gepafin')}</span>
-                        <span>{data.applicationId}</span>
-                    </p>
-                    <p className="appPageSection__pMeta">
-                        <span>{__('Bando', 'gepafin')}</span>
-                        <span>{data.callName}</span>
-                    </p>
-                    <p className="appPageSection__pMeta">
-                        <span>{__('Beneficiario', 'gepafin')}</span>
-                        <span>{data.beneficiaryName}</span>
-                    </p>
-                    <p className="appPageSection__pMeta">
-                        <span>{__('Inizio', 'gepafin')}</span>
-                        <span>{getDateFromISOstring(data.startDate)}</span>
-                    </p>
-                    <p className="appPageSection__pMeta">
-                        <span>{__('Scadenza', 'gepafin')}</span>
-                        <span>{getDateFromISOstring(data.expirationDate)}</span>
-                    </p>
-                    <p className="appPageSection__pMeta">
-                        <span>{__('Stato', 'gepafin')}</span>
-                        <span>{getBandoLabel(data.status)}</span>
-                    </p>
-                </div> : null}
+                        <p className="appPageSection__pMeta">
+                            <span>{__('ID domanda', 'gepafin')}</span>
+                            <span>{data.applicationId}</span>
+                        </p>
+                        <p className="appPageSection__pMeta">
+                            <span>{__('Bando', 'gepafin')}</span>
+                            <span>{data.callName}</span>
+                        </p>
+                        <p className="appPageSection__pMeta">
+                            <span>{__('Beneficiario', 'gepafin')}</span>
+                            <span>{data.beneficiaryName}</span>
+                        </p>
+                        <p className="appPageSection__pMeta">
+                            <span>{__('Azienda', 'gepafin')}</span>
+                            <span></span>
+                        </p>
+                        <p className="appPageSection__pMeta">
+                            <span>{__('Inizio', 'gepafin')}</span>
+                            <span>{getDateFromISOstring(data.startDate)}</span>
+                        </p>
+                        <p className="appPageSection__pMeta">
+                            <span>{__('Scadenza', 'gepafin')}</span>
+                            <span>{getDateFromISOstring(data.expirationDate)}</span>
+                        </p>
+                        <p className="appPageSection__pMeta">
+                            <span>{__('Stato', 'gepafin')}</span>
+                            <span>{getBandoLabel(data.status)}</span>
+                        </p>
+                    </div> : null}
                 {dataAppl.id
                     ? <div className="appPageSection__withBorder columns">
                         <p className="appPageSection__pMeta">
-                            <span>{__('ID domanda', 'gepafin')}</span>
+                        <span>{__('ID domanda', 'gepafin')}</span>
                             <span>{dataAppl.id}</span>
                         </p>
                         <p className="appPageSection__pMeta">
diff --git a/src/pages/DomandaEditPreInstructor/components/DownloadApplicationArchive/index.js b/src/pages/DomandaEditPreInstructor/components/DownloadApplicationArchive/index.js
new file mode 100644
index 0000000..dd19bed
--- /dev/null
+++ b/src/pages/DomandaEditPreInstructor/components/DownloadApplicationArchive/index.js
@@ -0,0 +1,49 @@
+import React, { useState } from 'react';
+import { __ } from '@wordpress/i18n';
+
+// tools
+import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse';
+
+// api
+import ApplicationService from '../../../../service/application-service';
+
+// components
+import { Button } from 'primereact/button';
+
+const DownloadApplicationArchive = ({ applicationId = 0 }) => {
+    const [loading, setLoading] = useState(false);
+
+    const onClickDownload = () => {
+        setLoading(true);
+        ApplicationService.downloadCompleteZip(applicationId, getCompleteZipCallback, errCompleteZipCallback);
+    }
+
+    const getCompleteZipCallback = (data) => {
+        const file = new Blob([data], { type: 'application/zip' });
+        const url = window.URL.createObjectURL(file);
+        const link = document.createElement('a');
+        link.href = url;
+        link.setAttribute('download', `application-${applicationId}.zip`);
+        document.body.appendChild(link);
+        link.click();
+        link.remove();
+        setLoading(false);
+    }
+
+    const errCompleteZipCallback = (data) => {
+        set404FromErrorResponse(data);
+        setLoading(false);
+    }
+
+    return (applicationId && applicationId !== 0
+            ? <Button
+                type="button"
+                disabled={loading}
+                onClick={onClickDownload}
+                label={__('Scarica ZIP', 'gepafin')}
+                icon="pi pi-download"
+                iconPos="right"/> : null
+    )
+}
+
+export default DownloadApplicationArchive;
\ No newline at end of file
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 95c0c9b..1fe5727 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -32,6 +32,7 @@ import ArchiveDocument from './components/ArchiveDocument';
 import { classNames } from 'primereact/utils';
 import { InputTextarea } from 'primereact/inputtextarea';
 import { InputText } from 'primereact/inputtext';
+import DownloadApplicationArchive from './components/DownloadApplicationArchive';
 
 const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
 
@@ -442,6 +443,10 @@ const DomandaEditPreInstructor = () => {
                             <span>{__('Beneficiario', 'gepafin')}</span>
                             <span>{data.beneficiary}</span>
                         </p>
+                        <p className="appPageSection__pMeta">
+                            <span>{__('Azienda', 'gepafin')}</span>
+                            <span></span>
+                        </p>
                         <p className="appPageSection__pMeta">
                             <span>{__('Data ricezione', 'gepafin')}</span>
                             <span>{getDateFromISOstring(data.submissionDate)}</span>
@@ -456,85 +461,9 @@ const DomandaEditPreInstructor = () => {
                         </p>
                     </div>
 
-                    <div className="appPageSection"></div>
-
                     <div className="appPageSection">
-                        <h2>{__('Punteggi di valutazione', 'gepafin')}</h2>
-                        {data.criteria
-                            ? <table className="myTable">
-                                <thead className="myThead">
-                                <tr>
-                                    <th>{__('Parametro', 'gepafin')}</th>
-                                    <th style={{ width: 200 }}>{__('Punteggio', 'gepafin')}</th>
-                                    <th style={{ width: 220 }}>{__('Stato', 'gepafin')}</th>
-                                </tr>
-                                </thead>
-                                <tbody className="myTbody">
-                                {data.criteria.map((o, i) => <tr key={o.id}>
-                                    <td>{o.label}</td>
-                                    <td>
-                                        <div className="p-inputgroup">
-                                            <InputNumber
-                                                disabled={shouldDisableField('criteria')}
-                                                placeholder={__('Punteggio', 'gepafin')}
-                                                keyfilter="int"
-                                                value={o.score}
-                                                max={o.maxScore}
-                                                onChange={(e) => updateEvaluationValue(
-                                                    e.value,
-                                                    `criteria.${i}.score`,
-                                                    o.maxScore
-                                                )}/>
-                                            <span className="p-inputgroup-addon">
-                                                / {o.maxScore}
-                                            </span>
-                                        </div>
-                                    </td>
-                                    <td>
-                                        <div className="appPageSection__iconActions">
-                                            {!isEmpty(o.criteriaMappedFields)
-                                                ? <Button icon="pi pi-eye"
-                                                          rounded outlined severity="info"
-                                                          onClick={() => displayCriterionData(o.id)}
-                                                          aria-label={__('Mostra', 'gepafin')}/> : null}
-                                            <Button icon="pi pi-thumbs-up" rounded outlined
-                                                    disabled={shouldDisableField('criteria')}
-                                                    severity={!isNil(o.valid) && o.valid ? 'success' : 'secondary'}
-                                                    onClick={() => updateEvaluationValue(
-                                                        true,
-                                                        `criteria.${i}.valid`
-                                                    )}
-                                                    aria-label={__('Su', 'gepafin')}/>
-                                            <Button icon="pi pi-thumbs-down" rounded outlined
-                                                    disabled={shouldDisableField('criteria')}
-                                                    severity={!isNil(o.valid) && !o.valid ? 'danger' : 'secondary'}
-                                                    onClick={() => updateEvaluationValue(
-                                                        false,
-                                                        `criteria.${i}.valid`
-                                                    )}
-                                                    aria-label={__('Giu', 'gepafin')}/>
-                                        </div>
-                                    </td>
-                                </tr>)}
-                                <tr>
-                                    <td>{__('Punteggio:', 'gepafin')}</td>
-                                    <td>{sum(data.criteria.map(o => o.score))}</td>
-                                    <td>
-                                        {isAdmissible
-                                            ? <Tag icon="pi pi-check" severity="success"
-                                                   value={__('Ammissibile')}></Tag> : null}
-                                        {!isAdmissible
-                                            ? <Tag icon="pi pi-times" severity="warning"
-                                                   value={__('Inammissibile')}></Tag> : null}
-                                    </td>
-                                </tr>
-                                </tbody>
-                                <tfoot className="myTfoot">
-                                <tr>
-                                    <td colSpan="3">{sprintf(__('Punteggio minimo per l\'ammissione: %d'), data.minScore)}</td>
-                                </tr>
-                                </tfoot>
-                            </table> : null}
+                        <h2>{__('Scarica documenti della domanda', 'gepafin')}</h2>
+                        <DownloadApplicationArchive applicationId={id}/>
                     </div>
 
                     <div className="appPageSection">
@@ -635,6 +564,85 @@ const DomandaEditPreInstructor = () => {
                         </div>
                     </div>
 
+                    <div className="appPageSection">
+                        <h2>{__('Punteggi di valutazione', 'gepafin')}</h2>
+                        {data.criteria
+                            ? <table className="myTable">
+                                <thead className="myThead">
+                                <tr>
+                                    <th>{__('Parametro', 'gepafin')}</th>
+                                    <th style={{ width: 200 }}>{__('Punteggio', 'gepafin')}</th>
+                                    <th style={{ width: 220 }}>{__('Stato', 'gepafin')}</th>
+                                </tr>
+                                </thead>
+                                <tbody className="myTbody">
+                                {data.criteria.map((o, i) => <tr key={o.id}>
+                                    <td>{o.label}</td>
+                                    <td>
+                                        <div className="p-inputgroup">
+                                            <InputNumber
+                                                disabled={shouldDisableField('criteria')}
+                                                placeholder={__('Punteggio', 'gepafin')}
+                                                keyfilter="int"
+                                                value={o.score}
+                                                max={o.maxScore}
+                                                onChange={(e) => updateEvaluationValue(
+                                                    e.value,
+                                                    `criteria.${i}.score`,
+                                                    o.maxScore
+                                                )}/>
+                                            <span className="p-inputgroup-addon">
+                                                / {o.maxScore}
+                                            </span>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <div className="appPageSection__iconActions">
+                                            {!isEmpty(o.criteriaMappedFields)
+                                                ? <Button icon="pi pi-eye"
+                                                          rounded outlined severity="info"
+                                                          onClick={() => displayCriterionData(o.id)}
+                                                          aria-label={__('Mostra', 'gepafin')}/> : null}
+                                            <Button icon="pi pi-thumbs-up" rounded outlined
+                                                    disabled={shouldDisableField('criteria')}
+                                                    severity={!isNil(o.valid) && o.valid ? 'success' : 'secondary'}
+                                                    onClick={() => updateEvaluationValue(
+                                                        true,
+                                                        `criteria.${i}.valid`
+                                                    )}
+                                                    aria-label={__('Su', 'gepafin')}/>
+                                            <Button icon="pi pi-thumbs-down" rounded outlined
+                                                    disabled={shouldDisableField('criteria')}
+                                                    severity={!isNil(o.valid) && !o.valid ? 'danger' : 'secondary'}
+                                                    onClick={() => updateEvaluationValue(
+                                                        false,
+                                                        `criteria.${i}.valid`
+                                                    )}
+                                                    aria-label={__('Giu', 'gepafin')}/>
+                                        </div>
+                                    </td>
+                                </tr>)}
+                                <tr>
+                                    <td>{__('Punteggio:', 'gepafin')}</td>
+                                    <td>{sum(data.criteria.map(o => o.score))}</td>
+                                    <td>
+                                        {isAdmissible
+                                            ? <Tag icon="pi pi-check" severity="success"
+                                                   value={__('Ammissibile')}></Tag> : null}
+                                        {!isAdmissible
+                                            ? <Tag icon="pi pi-times" severity="warning"
+                                                   value={__('Inammissibile')}></Tag> : null}
+                                    </td>
+                                </tr>
+                                </tbody>
+                                <tfoot className="myTfoot">
+                                <tr>
+                                    <td colSpan="3">{sprintf(__('Punteggio minimo per l\'ammissione: %d'), data.minScore)}</td>
+                                </tr>
+                                </tfoot>
+                            </table> : null}
+                    </div>
+
                     <div className="appPage__spacer"></div>
 
                     <div className="appPageSection__hr">
@@ -645,19 +653,19 @@ const DomandaEditPreInstructor = () => {
                         <div className="appPageSection__actions">
                             {['EVALUATION', 'SOCCORSO', 'CLOSE'].includes(data.applicationStatus)
                                 ? <Button
-                                type="button"
-                                disabled={!data.id || data.status === 'CLOSE'}
-                                onClick={doNewSoccorso}
-                                outlined
-                                label={<>
-                                    {data.applicationStatus === 'EVALUATION'
-                                        ? __('Richiedi Soccorso Istruttorio', 'gepafin')
-                                        : __('Apri Soccorso Istruttorio', 'gepafin')}
-                                    <i style={{ marginLeft: 7 }}>
-                                        <HelpIcon/>
-                                    </i>
-                                </>}
-                            /> : null}
+                                    type="button"
+                                    disabled={!data.id || data.status === 'CLOSE'}
+                                    onClick={doNewSoccorso}
+                                    outlined
+                                    label={<>
+                                        {data.applicationStatus === 'EVALUATION'
+                                            ? __('Richiedi Soccorso Istruttorio', 'gepafin')
+                                            : __('Apri Soccorso Istruttorio', 'gepafin')}
+                                        <i style={{ marginLeft: 7 }}>
+                                            <HelpIcon/>
+                                        </i>
+                                    </>}
+                                /> : null}
                             {data.id
                                 ? <Button
                                     type="button"
@@ -746,7 +754,8 @@ const DomandaEditPreInstructor = () => {
                         style={{ maxWidth: '600px', width: '100%' }}
                         onHide={hideAppointmentDialog}>
                         <div className="appForm__field">
-                            <label className={classNames({ 'p-error': isEmpty(appointmentData.amount) || appointmentData.amount === 0})}>
+                            <label
+                                className={classNames({ 'p-error': isEmpty(appointmentData.amount) || appointmentData.amount === 0 })}>
                                 {__('Importo', 'gepafin')}
                             </label>
                             <InputNumber
@@ -756,13 +765,14 @@ const DomandaEditPreInstructor = () => {
                                 onChange={(e) => setValue('amount', e.value)}/>
                         </div>
                         <div className="appForm__field">
-                            <label className={classNames({ 'p-error': isEmpty(appointmentData.duration) || appointmentData.duration  === 0 })}>
+                            <label
+                                className={classNames({ 'p-error': isEmpty(appointmentData.duration) || appointmentData.duration === 0 })}>
                                 {__('Durata', 'gepafin')}
                             </label>
                             <InputNumber
                                 value={appointmentData.duration}
                                 keyfilter="int"
-                                invalid={isEmpty(appointmentData.duration) || appointmentData.duration  === 0}
+                                invalid={isEmpty(appointmentData.duration) || appointmentData.duration === 0}
                                 onChange={(e) => setValue('duration', e.value)}/>
                         </div>
                         <div className="appForm__field">
diff --git a/src/service/application-service.js b/src/service/application-service.js
index 4b81e45..d68b1bf 100644
--- a/src/service/application-service.js
+++ b/src/service/application-service.js
@@ -47,4 +47,8 @@ export default class ApplicationService {
     static deleteApplicationSignedPdf = (id, callback, errCallback) => {
         NetworkService.delete(`${API_BASE_URL}/application/${id}/signedDocument`, {}, callback, errCallback);
     };
+
+    static downloadCompleteZip = (id, callback, errCallback, queryParams) => {
+        NetworkService.getBlob(`${API_BASE_URL}/application/${id}/documents/zip`, callback, errCallback, queryParams);
+    };
 }

From f072c3d6a64c46b64b4dca1e72691284c5bd8191 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Thu, 5 Dec 2024 13:08:37 +0100
Subject: [PATCH 09/23] - added url encoding for S3 file urls;

---
 src/pages/AddCompany/index.js               | 10 ++++++++--
 src/pages/DomandaEditPreInstructor/index.js | 13 +++++++++----
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/pages/AddCompany/index.js b/src/pages/AddCompany/index.js
index 87c712e..8e06d7d 100644
--- a/src/pages/AddCompany/index.js
+++ b/src/pages/AddCompany/index.js
@@ -36,7 +36,7 @@ const AddCompany = () => {
         formState: { errors },
         setValue,
         watch,
-        getValues
+        trigger
     } = useForm({
         defaultValues: {},
         mode: 'onChange'
@@ -131,6 +131,7 @@ const AddCompany = () => {
         } else {
             setEmptyValues();
         }
+        trigger();
         storeSet.main.unsetAsyncRequest();
     }
 
@@ -207,7 +208,12 @@ const AddCompany = () => {
                             label={__('P.IVA', 'gepafin')}
                             control={control}
                             errors={errors}
-                            config={{ required: __('È obbligatorio', 'gepafin') }}
+                            config={{
+                                required: __('È obbligatorio', 'gepafin'),
+                                validate: {
+                                    isPIVA
+                                }
+                        }}
                         />
 
                         <FormField
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 1fe5727..3e1c3be 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -118,13 +118,14 @@ const DomandaEditPreInstructor = () => {
     const header = renderHeader();
 
     const updateEvaluationValue = (value, path, maxValue) => {
+        const pathEls = path.split('.');
         let finalValue = value;
 
         if (maxValue || maxValue === 0) {
             finalValue = value > maxValue ? maxValue : value;
         }
 
-        const newData = wrap(data).set(path.split('.'), finalValue).value();
+        const newData = wrap(data).set(pathEls, finalValue).value();
         setData(newData);
     }
 
@@ -242,7 +243,7 @@ const DomandaEditPreInstructor = () => {
             case 'fileupload' :
                 content = <ul>
                     {item.fieldValue.map(o => <li key={o.id}>
-                        {o.filePath ? <a href={o.filePath}>{o.name}</a> : null}
+                        {o.filePath ? <a href={encodeURI(o.filePath)}>{o.name}</a> : null}
                     </li>)}
                 </ul>;
                 break;
@@ -512,7 +513,9 @@ const DomandaEditPreInstructor = () => {
                                             <div className="appPageSection__iconActions">
                                                 {o.fileDetail && o.fileDetail.length === 1
                                                     ? <Button icon="pi pi-eye" rounded
-                                                              onClick={() => window.open(o.fileDetail[0].filePath, '_blank').focus()}
+                                                              onClick={() => {
+                                                                  window.open(encodeURI(o.fileDetail[0].filePath), '_blank').focus()
+                                                              }}
                                                               outlined severity="info"
                                                               aria-label={__('Mostra', 'gepafin')}/> : null}
                                                 <Button icon="pi pi-thumbs-up" rounded outlined
@@ -551,7 +554,9 @@ const DomandaEditPreInstructor = () => {
                                                     <div className="appPageSection__iconActions">
                                                         <ArchiveDocument ndg={data.ndg} fileId={k.id}/>
                                                         <Button icon="pi pi-eye" rounded
-                                                                onClick={() => window.open(k.filePath, '_blank').focus()}
+                                                                onClick={() => {
+                                                                    window.open(encodeURI(k.filePath), '_blank').focus()
+                                                                }}
                                                                 outlined severity="info"
                                                                 aria-label={__('Mostra', 'gepafin')}/>
                                                     </div>

From 0f54ce6bd967f91093ea1fcbe231881b2e71d5a0 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Thu, 5 Dec 2024 17:16:27 +0100
Subject: [PATCH 10/23] - updated tables - displaying protocol id, columns for
 ndg and appointment; - added 2 buttons for download delega and download
 signed pdf for application;

---
 src/assets/scss/components/appPage.scss       |  4 ++
 .../PreInstructorDomandeTable/index.js        | 11 +++-
 .../DownloadCompanyDelegation/index.js        | 51 +++++++++++++++++++
 .../DownloadSignedApplication/index.js        | 45 ++++++++++++++++
 src/pages/DomandaEditPreInstructor/index.js   | 22 +++++++-
 .../components/AllDomandeTable/index.js       | 16 +++---
 .../BeneficiarioDomandeTable/index.js         |  6 ++-
 .../PreInstructorSoccorsiTable/index.js       | 15 +++---
 8 files changed, 152 insertions(+), 18 deletions(-)
 create mode 100644 src/pages/DomandaEditPreInstructor/components/DownloadCompanyDelegation/index.js
 create mode 100644 src/pages/DomandaEditPreInstructor/components/DownloadSignedApplication/index.js

diff --git a/src/assets/scss/components/appPage.scss b/src/assets/scss/components/appPage.scss
index 8f40ad9..da0721a 100644
--- a/src/assets/scss/components/appPage.scss
+++ b/src/assets/scss/components/appPage.scss
@@ -342,6 +342,10 @@
 .appPageSection__row {
     display: flex;
     gap: 1rem;
+
+    &.autoFlow {
+        flex-wrap: wrap;
+    }
 }
 
 .appPageSection__pMeta {
diff --git a/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js b/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
index 537fa3c..4cac1b4 100644
--- a/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
+++ b/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
@@ -141,7 +141,16 @@ const PreInstructorDomandeTable = () => {
                        header={header}
                        emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
-                <Column field="applicationId" header={__('ID domanda', 'gepafin')}
+                <Column field="id" header={__('ID domanda', 'gepafin')}
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
+                <Column field="protocolNumber" header={__('Protocollo', 'gepafin')}
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
+                <Column field="ndg" header={__('NDG', 'gepafin')}
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
+                <Column field="appointmentId" header={__('ID appuntamento', 'gepafin')}
                         sortable filterPlaceholder={__('Cerca', 'gepafin')}
                         style={{ minWidth: '6rem' }}/>
                 <Column field="callName" header={__('Bando', 'gepafin')}
diff --git a/src/pages/DomandaEditPreInstructor/components/DownloadCompanyDelegation/index.js b/src/pages/DomandaEditPreInstructor/components/DownloadCompanyDelegation/index.js
new file mode 100644
index 0000000..8d7f6f3
--- /dev/null
+++ b/src/pages/DomandaEditPreInstructor/components/DownloadCompanyDelegation/index.js
@@ -0,0 +1,51 @@
+import React, { useState, useEffect } from 'react';
+import { __ } from '@wordpress/i18n';
+import { isEmpty } from 'ramda';
+
+// api
+import CompanyService from '../../../../service/company-service';
+
+// components
+import { Button } from 'primereact/button';
+
+const DownloadCompanyDelegation = ({ applicationId = 0 }) => {
+    const [loading, setLoading] = useState(false);
+    const [delega, setDelega] = useState({});
+
+    const onClickDownload = () => {
+        if (delega.filePath) {
+            window.open(encodeURI(delega.filePath), '_blank').focus()
+        }
+    }
+
+    const getDellegaCallback = (data) => {
+        if (data.data) {
+            setDelega([data.data]);
+        }
+        setLoading(false);
+    }
+
+    const errDellegaCallback = () => {
+        setDelega([]);
+        setLoading(false);
+    }
+
+    useEffect(() => {
+        setLoading(true);
+        CompanyService.getCompanyDelega(0, getDellegaCallback, errDellegaCallback, [
+            ['applicationId', applicationId]
+        ]);
+    }, [])
+
+    return (applicationId && applicationId !== 0
+            ? <Button
+                type="button"
+                disabled={loading || isEmpty(delega)}
+                onClick={onClickDownload}
+                label={__('Scarica la delega', 'gepafin')}
+                icon="pi pi-download"
+                iconPos="right"/> : null
+    )
+}
+
+export default DownloadCompanyDelegation;
\ No newline at end of file
diff --git a/src/pages/DomandaEditPreInstructor/components/DownloadSignedApplication/index.js b/src/pages/DomandaEditPreInstructor/components/DownloadSignedApplication/index.js
new file mode 100644
index 0000000..0e6a529
--- /dev/null
+++ b/src/pages/DomandaEditPreInstructor/components/DownloadSignedApplication/index.js
@@ -0,0 +1,45 @@
+import React, { useState } from 'react';
+import { __ } from '@wordpress/i18n';
+
+// api
+import ApplicationService from '../../../../service/application-service';
+
+// components
+import { Button } from 'primereact/button';
+
+const DownloadSignedApplication = ({ applicationId = 0 }) => {
+    const [loading, setLoading] = useState(false);
+    const [, setDocument] = useState({});
+
+    const onClickDownload = () => {
+        setLoading(true);
+        ApplicationService.getApplicationSignedPdf(applicationId, getSignedPdfCallback, errSignedPdfCallbacks);
+    }
+
+    const getSignedPdfCallback = (data) => {
+        if (data.data) {
+            setDocument([data.data]);
+            if (data.data.filePath) {
+                window.open(encodeURI(data.data.filePath), '_blank').focus()
+            }
+        }
+        setLoading(false);
+    }
+
+    const errSignedPdfCallbacks = () => {
+        setDocument([]);
+        setLoading(false);
+    }
+
+    return (applicationId && applicationId !== 0
+            ? <Button
+                type="button"
+                disabled={loading}
+                onClick={onClickDownload}
+                label={__('Scarica PDF firmato', 'gepafin')}
+                icon="pi pi-download"
+                iconPos="right"/> : null
+    )
+}
+
+export default DownloadSignedApplication;
\ No newline at end of file
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 3e1c3be..8492567 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -33,6 +33,8 @@ import { classNames } from 'primereact/utils';
 import { InputTextarea } from 'primereact/inputtextarea';
 import { InputText } from 'primereact/inputtext';
 import DownloadApplicationArchive from './components/DownloadApplicationArchive';
+import DownloadCompanyDelegation from './components/DownloadCompanyDelegation';
+import DownloadSignedApplication from './components/DownloadSignedApplication';
 
 const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
 
@@ -436,6 +438,18 @@ const DomandaEditPreInstructor = () => {
                             <span>{__('ID domanda', 'gepafin')}</span>
                             <span>{data.applicationId}</span>
                         </p>
+                        <p className="appPageSection__pMeta">
+                            <span>{__('Protocollo', 'gepafin')}</span>
+                            <span>{data.protocolNumber}</span>
+                        </p>
+                        <p className="appPageSection__pMeta">
+                            <span>{__('NDG', 'gepafin')}</span>
+                            <span>{data.ndg}</span>
+                        </p>
+                        <p className="appPageSection__pMeta">
+                            <span>{__('Appuntamento', 'gepafin')}</span>
+                            <span>{data.appointmentId}</span>
+                        </p>
                         <p className="appPageSection__pMeta">
                             <span>{__('Bando', 'gepafin')}</span>
                             <span>{data.callName}</span>
@@ -446,7 +460,7 @@ const DomandaEditPreInstructor = () => {
                         </p>
                         <p className="appPageSection__pMeta">
                             <span>{__('Azienda', 'gepafin')}</span>
-                            <span></span>
+                            <span>{data.companyName}</span>
                         </p>
                         <p className="appPageSection__pMeta">
                             <span>{__('Data ricezione', 'gepafin')}</span>
@@ -464,7 +478,11 @@ const DomandaEditPreInstructor = () => {
 
                     <div className="appPageSection">
                         <h2>{__('Scarica documenti della domanda', 'gepafin')}</h2>
-                        <DownloadApplicationArchive applicationId={id}/>
+                        <div className="appPageSection__row autoFlow">
+                            <DownloadApplicationArchive applicationId={id}/>
+                            <DownloadSignedApplication applicationId={id}/>
+                            <DownloadCompanyDelegation applicationId={id}/>
+                        </div>
                     </div>
 
                     <div className="appPageSection">
diff --git a/src/pages/Domande/components/AllDomandeTable/index.js b/src/pages/Domande/components/AllDomandeTable/index.js
index 2f0ee3e..f4696c1 100644
--- a/src/pages/Domande/components/AllDomandeTable/index.js
+++ b/src/pages/Domande/components/AllDomandeTable/index.js
@@ -98,9 +98,9 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => {
         return formatDate(rowData.submissionDate);
     };
 
-    const dateEndBodyTemplate = (rowData) => {
+    /*const dateEndBodyTemplate = (rowData) => {
         return formatDate(rowData.callEndDate);
-    };
+    };*/
 
     const dateFilterTemplate = (options) => {
         return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)}
@@ -138,9 +138,11 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => {
                        emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
                 <Column field="id" header={__('ID domanda', 'gepafin')}
-                        sortable
-                        filterPlaceholder={__('Cerca', 'gepafin')}
-                        style={{ minWidth: '8rem' }}/>
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
+                <Column field="protocolNumber" header={__('Protocollo', 'gepafin')}
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
                 <Column field="callTitle" header={__('Bando', 'gepafin')}
                         filter sortable
                         filterPlaceholder={__('Cerca', 'gepafin')}
@@ -153,10 +155,10 @@ const AllDomandeTable = ({ openDialogFn, updaterString = '' }) => {
                         filterField="submissionDate" dataType="date"
                         style={{ minWidth: '8rem' }}
                         body={dateAppliedBodyTemplate} filter filterElement={dateFilterTemplate}/>
-                <Column header={__('Scadenza', 'gepafin')}
+                {/*<Column header={__('Scadenza', 'gepafin')}
                         filterField="callEndDate" dataType="date"
                         style={{ minWidth: '8rem' }}
-                        body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/>
+                        body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/>*/}
                 <Column field="status" header={__('Stato', 'gepafin')}
                         style={{ minWidth: '8rem' }} body={statusBodyTemplate}/>
                 <Column header={__('Azioni', 'gepafin')}
diff --git a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
index 91e6831..51ef317 100644
--- a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
+++ b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
@@ -156,8 +156,10 @@ const BeneficiarioDomandeTable = () => {
                        emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
                 <Column field="id" header={__('ID domanda', 'gepafin')}
-                        sortable
-                        filterPlaceholder={__('Cerca il nome', 'gepafin')}
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
+                <Column field="protocolNumber" header={__('Protocollo', 'gepafin')}
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
                         style={{ minWidth: '6rem' }}/>
                 <Column field="callTitle" header={__('Titolo bando', 'gepafin')}
                         filter sortable
diff --git a/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js b/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
index 9cd4e9c..05ca8ee 100644
--- a/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
+++ b/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
@@ -54,7 +54,7 @@ const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
     const getFormattedData = (data) => {
         return data.map((d) => {
             d.startDate = is(String, d.startDate) ? new Date(d.startDate) : (d.startDate ? d.startDate : '');
-            d.expirationDate = is(String, d.expirationDate) ? new Date(d.expirationDate) : (d.expirationDate ? d.expirationDate : '');
+            d.evaluationEndDate = is(String, d.evaluationEndDate) ? new Date(d.evaluationEndDate) : (d.evaluationEndDate ? d.evaluationEndDate : '');
             return d;
         });
     };
@@ -86,7 +86,7 @@ const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
                 operator: FilterOperator.AND,
                 constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
             },
-            expirationDate: {
+            evaluationEndDate: {
                 operator: FilterOperator.AND,
                 constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
             }
@@ -106,7 +106,7 @@ const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
     };
 
     const dateExpirationBodyTemplate = (rowData) => {
-        return rowData.expirationDate ? formatDate(rowData.expirationDate) : '';
+        return rowData.evaluationEndDate ? formatDate(rowData.evaluationEndDate) : '';
     };
 
     const dateFilterTemplate = (options) => {
@@ -140,8 +140,11 @@ const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
                        header={header}
                        emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
-                <Column field="applicationId" header={__('ID domanda', 'gepafin')}
-                        filter filterPlaceholder={__('Cerca', 'gepafin')}
+                <Column field="id" header={__('ID domanda', 'gepafin')}
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
+                        style={{ minWidth: '6rem' }}/>
+                <Column field="protocolNumber" header={__('Protocollo', 'gepafin')}
+                        sortable filterPlaceholder={__('Cerca', 'gepafin')}
                         style={{ minWidth: '6rem' }}/>
                 <Column field="callName" header={__('Bando', 'gepafin')}
                         filter filterPlaceholder={__('Cerca', 'gepafin')}
@@ -154,7 +157,7 @@ const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
                         style={{ minWidth: '8rem' }}
                         body={dateStartBodyTemplate} filter filterElement={dateFilterTemplate}/>
                 <Column header={__('Scadenza', 'gepafin')}
-                        filterField="expirationDate" dataType="date"
+                        filterField="evaluationEndDate" dataType="date"
                         style={{ minWidth: '8rem' }}
                         body={dateExpirationBodyTemplate} filter filterElement={dateFilterTemplate}/>
                 <Column field="status" header={__('Stato', 'gepafin')}

From 1ad1cc19bcbd27f49f7cc04b1e28425f6e1dcae0 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Fri, 6 Dec 2024 09:22:25 +0100
Subject: [PATCH 11/23] - updated functionality of downloading company
 delegation;

---
 .../components/DownloadCompanyDelegation/index.js             | 4 ++--
 src/pages/ProfileCompany/index.js                             | 4 +++-
 src/service/company-service.js                                | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/pages/DomandaEditPreInstructor/components/DownloadCompanyDelegation/index.js b/src/pages/DomandaEditPreInstructor/components/DownloadCompanyDelegation/index.js
index 8d7f6f3..c950949 100644
--- a/src/pages/DomandaEditPreInstructor/components/DownloadCompanyDelegation/index.js
+++ b/src/pages/DomandaEditPreInstructor/components/DownloadCompanyDelegation/index.js
@@ -20,7 +20,7 @@ const DownloadCompanyDelegation = ({ applicationId = 0 }) => {
 
     const getDellegaCallback = (data) => {
         if (data.data) {
-            setDelega([data.data]);
+            setDelega(data.data);
         }
         setLoading(false);
     }
@@ -32,7 +32,7 @@ const DownloadCompanyDelegation = ({ applicationId = 0 }) => {
 
     useEffect(() => {
         setLoading(true);
-        CompanyService.getCompanyDelega(0, getDellegaCallback, errDellegaCallback, [
+        CompanyService.getCompanyDelega(getDellegaCallback, errDellegaCallback, [
             ['applicationId', applicationId]
         ]);
     }, [])
diff --git a/src/pages/ProfileCompany/index.js b/src/pages/ProfileCompany/index.js
index 8dc0128..f7ee19d 100644
--- a/src/pages/ProfileCompany/index.js
+++ b/src/pages/ProfileCompany/index.js
@@ -341,7 +341,9 @@ const ProfileCompany = () => {
     useEffect(() => {
         if (formInitialData.id) {
             storeSet.main.setAsyncRequest();
-            CompanyService.getCompanyDelega(formInitialData.id, getDellegaCallback, errDellegaCallback);
+            CompanyService.getCompanyDelega(getDellegaCallback, errDellegaCallback, [
+                ['companyId', formInitialData.id]
+            ]);
         }
     }, [formInitialData])
 
diff --git a/src/service/company-service.js b/src/service/company-service.js
index e3eeeb8..0dc3e8c 100644
--- a/src/service/company-service.js
+++ b/src/service/company-service.js
@@ -20,8 +20,8 @@ export default class CompanyService {
         NetworkService.get(`${API_BASE_URL}/company/user/${id}`, callback, errCallback);
     };
 
-    static getCompanyDelega = (id, callback, errCallback) => {
-        NetworkService.get(`${API_BASE_URL}/company/${id}/delegation`, callback, errCallback);
+    static getCompanyDelega = (callback, errCallback, queryParams) => {
+        NetworkService.get(`${API_BASE_URL}/company/delegation`, callback, errCallback, queryParams);
     };
 
     static downloadCompanyDelega = (id, body, callback, errCallback) => {

From 26a6c2a2b18bf31fba02aa3e9bdf9b3940b69c21 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Fri, 6 Dec 2024 11:32:24 +0100
Subject: [PATCH 12/23] - updated styles for disabled icons; - added checks for
 disabled/enabled buttons; - fixed displaying the date of assignment;

---
 src/assets/scss/components/misc.scss          |  4 +++
 .../PreInstructorDomandeTable/index.js        |  8 ++---
 src/pages/DomandaEditPreInstructor/index.js   | 33 ++++++++++++++++---
 3 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/assets/scss/components/misc.scss b/src/assets/scss/components/misc.scss
index ca53588..b809ae8 100644
--- a/src/assets/scss/components/misc.scss
+++ b/src/assets/scss/components/misc.scss
@@ -12,6 +12,10 @@
 .p-button:not(.p-button-outlined, .p-button-secondary, .p-confirm-popup-reject, .p-button-link, .p-column-filter-add-button, .p-column-filter-remove-button) span {
   color: var(--menuitem-active-color);
 }
+.p-button.p-button-success.p-button-icon-only[disabled],
+.p-button.p-button-danger.p-button-icon-only[disabled] {
+  filter: unset;
+}
 .p-column-filter-remove-button {
   span {
     margin: 0 5px;
diff --git a/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js b/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
index 4cac1b4..117a7e2 100644
--- a/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
+++ b/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
@@ -54,7 +54,7 @@ const PreInstructorDomandeTable = () => {
 
     const getFormattedData = (data) => {
         return data.map((d) => {
-            d.callEndDate = is(String, d.callEndDate) ? new Date(d.callEndDate) : (d.callEndDate ? d.callEndDate : '');
+            d.evaluationEndDate = is(String, d.evaluationEndDate) ? new Date(d.evaluationEndDate) : (d.evaluationEndDate ? d.evaluationEndDate : '');
             d.submissionDate = is(String, d.submissionDate) ? new Date(d.submissionDate) : (d.submissionDate ? d.submissionDate : '');
             return d;
         });
@@ -87,7 +87,7 @@ const PreInstructorDomandeTable = () => {
                 operator: FilterOperator.AND,
                 constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
             },
-            callEndDate	: {
+            evaluationEndDate: {
                 operator: FilterOperator.AND,
                 constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
             }
@@ -107,7 +107,7 @@ const PreInstructorDomandeTable = () => {
     };
 
     const dateEndBodyTemplate = (rowData) => {
-        return formatDate(rowData.callEndDate);
+        return formatDate(rowData.evaluationEndDate);
     };
 
     const dateFilterTemplate = (options) => {
@@ -164,7 +164,7 @@ const PreInstructorDomandeTable = () => {
                 <Column header={__('Data ricezione', 'gepafin')} filterField="submissionDate" dataType="date"
                         style={{ minWidth: '8rem' }}
                         body={dateAppliedBodyTemplate} filter filterElement={dateFilterTemplate}/>
-                <Column header={__('Scadenza', 'gepafin')} filterField="callEndDate" dataType="date"
+                <Column header={__('Scadenza', 'gepafin')} filterField="evaluationEndDate" dataType="date"
                         style={{ minWidth: '8rem' }}
                         body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/>
                 <Column field="status" header={__('Stato', 'gepafin')}
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 8492567..3f9acbd 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -54,6 +54,9 @@ const DomandaEditPreInstructor = () => {
     const [operationType, setOperationType] = useState('');
     const [motivation, setMotivation] = useState('');
     const [isVisibleAppointmentDialog, setIsVisibleAppointmentDialog] = useState(false);
+    const [allFilesRated, setAllFilesRated] = useState(false);
+    const [atLeastOneChecked, setAtLeastOneChecked] = useState(false);
+    const [allChecksChecked, setAllChecksChecked] = useState(false);
     const [appointmentData, setAppointmentData] = useState({
         title: '',
         text: '',
@@ -65,6 +68,22 @@ const DomandaEditPreInstructor = () => {
         navigate('/domande');
     }
 
+    const updateFlagsForSoccorso = (data) => {
+        if (data.files) {
+            const nonRatedFiles = data.files
+                .map(el => el.valid)
+                .filter(v => isNil(v));
+            setAllFilesRated(nonRatedFiles.length === 0);
+        }
+        if (data.checklist) {
+            const checkedChecklistItems = data.checklist
+                .map(el => el.valid)
+                .filter(v => v);
+            setAtLeastOneChecked(checkedChecklistItems.length > 0);
+            setAllChecksChecked(checkedChecklistItems.length === data.checklist.length)
+        }
+    }
+
     const doNewSoccorso = () => {
         if (connectedSoccorsoId !== 0) {
             doSaveDraft(`/domande/${id}/soccorso/${connectedSoccorsoId}`)
@@ -77,6 +96,7 @@ const DomandaEditPreInstructor = () => {
         if (data.status === 'SUCCESS') {
             setData(getFormattedData(data.data));
             setMotivation(data.data.motivation);
+            updateFlagsForSoccorso(data.data);
         }
         storeSet.main.unsetAsyncRequest();
     }
@@ -129,6 +149,7 @@ const DomandaEditPreInstructor = () => {
 
         const newData = wrap(data).set(pathEls, finalValue).value();
         setData(newData);
+        updateFlagsForSoccorso(newData);
     }
 
     const doSaveDraft = (doRedirect = '') => {
@@ -466,9 +487,13 @@ const DomandaEditPreInstructor = () => {
                             <span>{__('Data ricezione', 'gepafin')}</span>
                             <span>{getDateFromISOstring(data.submissionDate)}</span>
                         </p>
+                        <p className="appPageSection__pMeta">
+                            <span>{__('Data assegnazione', 'gepafin')}</span>
+                            <span>{getDateFromISOstring(data.assignedAt)}</span>
+                        </p>
                         <p className="appPageSection__pMeta">
                             <span>{__('Scadenza Valutazione', 'gepafin')}</span>
-                            <span>{getDateFromISOstring(data.callEndDate)}</span>
+                            <span>{getDateFromISOstring(data.evaluationEndDate)}</span>
                         </p>
                         <p className="appPageSection__pMeta">
                             <span>{__('Stato', 'gepafin')}</span>
@@ -479,7 +504,7 @@ const DomandaEditPreInstructor = () => {
                     <div className="appPageSection">
                         <h2>{__('Scarica documenti della domanda', 'gepafin')}</h2>
                         <div className="appPageSection__row autoFlow">
-                            <DownloadApplicationArchive applicationId={id}/>
+                        <DownloadApplicationArchive applicationId={id}/>
                             <DownloadSignedApplication applicationId={id}/>
                             <DownloadCompanyDelegation applicationId={id}/>
                         </div>
@@ -677,7 +702,7 @@ const DomandaEditPreInstructor = () => {
                             {['EVALUATION', 'SOCCORSO', 'CLOSE'].includes(data.applicationStatus)
                                 ? <Button
                                     type="button"
-                                    disabled={!data.id || data.status === 'CLOSE'}
+                                    disabled={!data.id || data.status === 'CLOSE' || !allFilesRated || !atLeastOneChecked}
                                     onClick={doNewSoccorso}
                                     outlined
                                     label={<>
@@ -705,7 +730,7 @@ const DomandaEditPreInstructor = () => {
                             {APP_EVALUATION_FLOW_ID === '1' && ['EVALUATION'].includes(data.applicationStatus)
                                 ? <Button
                                     type="button"
-                                    disabled={!data.id}
+                                    disabled={!data.id || !allFilesRated || !allChecksChecked}
                                     onClick={doCheckNDG}
                                     label={__('Controlla NDG', 'gepafin')}
                                 /> : null}

From f2b16cd386087de75ce40eb7b400d0e9da045474 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Fri, 6 Dec 2024 11:51:15 +0100
Subject: [PATCH 13/23] - updated logic adding company;

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

diff --git a/src/pages/AddCompany/index.js b/src/pages/AddCompany/index.js
index 8e06d7d..5987042 100644
--- a/src/pages/AddCompany/index.js
+++ b/src/pages/AddCompany/index.js
@@ -120,7 +120,7 @@ const AddCompany = () => {
                     pec,
                     email: pec,
                     city: comune,
-                    codiceFiscale: cf,
+                    codiceFiscale: cf ? cf : piva,
                     address: indirizzo,
                     vatNumber: piva,
                     companyName: denominazione

From a36bb3fcaf84de9ea0d73dc0c5c352843d8f05be Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Fri, 6 Dec 2024 12:07:06 +0100
Subject: [PATCH 14/23] - enabled codice fiscale always; - updated cf
 validation;

---
 src/helpers/validators.js     |  2 ++
 src/pages/AddCompany/index.js | 10 +++++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/helpers/validators.js b/src/helpers/validators.js
index 3a05435..388f318 100644
--- a/src/helpers/validators.js
+++ b/src/helpers/validators.js
@@ -4,6 +4,7 @@ import CodiceFiscale from 'codice-fiscale-js';
 
 export const isPIVA = (v) => {
     const regexp = new RegExp(/^[0-9]{11}$/);
+    //console.log('isPIVA', !isEmpty(match(regexp, String(v))))
     return !isEmpty(match(regexp, String(v)));
 }
 
@@ -11,6 +12,7 @@ export const isPIVA = (v) => {
 export const isCodiceFiscale = (v) => {
     //const regexp = new RegExp(/^(?:[A-Z][AEIOU][AEIOUX]|[AEIOU]X{2}|[B-DF-HJ-NP-TV-Z]{2}[A-Z]){2}(?:[\dLMNP-V]{2}(?:[A-EHLMPR-T](?:[04LQ][1-9MNP-V]|[15MR][\dLMNP-V]|[26NS][0-8LMNP-U])|[DHPS][37PT][0L]|[ACELMRT][37PT][01LM]|[AC-EHLMPR-T][26NS][9V])|(?:[02468LNQSU][048LQU]|[13579MPRTV][26NS])B[26NS][9V])(?:[A-MZ][1-9MNP-V][\dLMNP-V]{2}|[A-M][0L](?:[1-9MNP-V][\dLMNP-V]|[0L][1-9MNP-V]))[A-Z]$/, 'i')
     //return !isEmpty(match(regexp, v));
+    //console.log('isCodiceFiscale', CodiceFiscale.check(v))
     return CodiceFiscale.check(v);
 }
 
diff --git a/src/pages/AddCompany/index.js b/src/pages/AddCompany/index.js
index 5987042..9a80617 100644
--- a/src/pages/AddCompany/index.js
+++ b/src/pages/AddCompany/index.js
@@ -19,7 +19,7 @@ import BlockingOverlay from '../../components/BlockingOverlay';
 import CompanyService from '../../service/company-service';
 
 // tools
-import { isPIVA, isEmail, isEmailPEC } from '../../helpers/validators';
+import { isPIVA, isEmail, isEmailPEC, isCodiceFiscale } from '../../helpers/validators';
 import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
 
 //const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
@@ -218,12 +218,16 @@ const AddCompany = () => {
 
                         <FormField
                             type="textinput"
-                            disabled
                             fieldName="codiceFiscale"
                             label={__('Codice fiscale', 'gepafin')}
                             control={control}
                             errors={errors}
-                            config={{ required: __('È obbligatorio', 'gepafin') }}
+                            config={{
+                                required: __('È obbligatorio', 'gepafin'),
+                                validate: {
+                                    validCF: (value) => isCodiceFiscale(value) || isPIVA(value)
+                                }
+                        }}
                         />
                         {/*{APP_EVALUATION_FLOW_ID === '1'
                             ? <FormField

From e65fb6bde2d8975a241bd562c9bd6cd154225976 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Fri, 6 Dec 2024 16:29:48 +0100
Subject: [PATCH 15/23] - added proper form fields for archiving document;

---
 src/configData.js                             | 109 +++++++++-
 .../components/ArchiveDocument/index.js       | 198 +++++++++++++-----
 src/pages/DomandaEditPreInstructor/index.js   |  28 ++-
 src/service/appointment-service.js            |  14 ++
 4 files changed, 296 insertions(+), 53 deletions(-)
 create mode 100644 src/service/appointment-service.js

diff --git a/src/configData.js b/src/configData.js
index 81eadc2..c8827e7 100644
--- a/src/configData.js
+++ b/src/configData.js
@@ -44,4 +44,111 @@ export const dynamicDataOptions = {
     ],
     textinput: dynamicDataForTextinput,
     textarea: dynamicDataForTextinput
-}
\ No newline at end of file
+}
+
+export const protocolType = [
+    {
+        'id': 1,
+        'name': 'PROTOCOLLO IN ENTRATA'
+    },
+    {
+        'id': 2,
+        'name': 'PROTOCOLLO IN USCITA'
+    },
+    {
+        'id': 3,
+        'name': 'DOCUMENTO INTERNO'
+    },
+    {
+        'id': 1003,
+        'name': 'PROTOCOLLO INTERNO '
+    }
+];
+
+export const classificationType = [
+    {
+        'idClassificazione': 101,
+        'name': 'BILANCIO',
+        'idTipoprotocollo': 1
+    },
+    {
+        'idClassificazione': 102,
+        'name': 'DICHHIARAZIONE DEI REDDITI',
+        'idTipoprotocollo': 1
+    },
+    {
+        'idClassificazione': 103,
+        'name': 'SITUAZIONE CONTABILE',
+        'idTipoprotocollo': 1
+    },
+    {
+        'idClassificazione': 104,
+        'name': 'PROSPETTO CONTO ECONOMICO',
+        'idTipoprotocollo': 1
+    },
+    {
+        'idClassificazione': 105,
+        'name': 'CENTRALE DEI RISCHI',
+        'idTipoprotocollo': 1
+    },
+    {
+        'idClassificazione': 106,
+        'name': 'RELAZIONE AZIENDALE ILLUSTRATIVA (MOD R1C, R1I, R1R, R1R A SECONDO DEI ',
+        'idTipoprotocollo': 1
+    },
+    {
+        'idClassificazione': 107,
+        'name': 'DOCUMENTO IDENTITA\'',
+        'idTipoprotocollo': 1
+    },
+    {
+        'idClassificazione': 108,
+        'name': 'MODELLO SP1',
+        'idTipoprotocollo': 1
+    },
+    {
+        'idClassificazione': 109,
+        'name': 'PRIVACY',
+        'idTipoprotocollo': 1
+    },
+    {
+        'idClassificazione': 110,
+        'name': 'DOCUMENTAZIONE CHE ATTESTA POSSIBILITA\' DI RILASCIARE GAA FAVORE',
+        'idTipoprotocollo': 1
+    },
+    {
+        'idClassificazione': 111,
+        'name': 'MODELLO AR1 D.LG 231/2007',
+        'idTipoprotocollo': 1
+    },
+    {
+        'idClassificazione': 112,
+        'name': 'DOCUMENTO IDENTITA\' FIRMATORIO DICHHIARAZIONE SOSTITUTIVA',
+        'idTipoprotocollo': 1
+    },
+    {
+        'idClassificazione': 113,
+        'name': 'PRIVACY FIRMATARIO DICHHIARAZIONE SOSTITUTIVA',
+        'idTipoprotocollo': 1
+    },
+    {
+        'idClassificazione': 114,
+        'name': 'NULLAOSTA ANTIMAFIA',
+        'idTipoprotocollo': 1
+    },
+    {
+        'idClassificazione': 201,
+        'name': 'LETTERA ESITO DELIBERA',
+        'idTipoprotocollo': 2
+    },
+    {
+        'idClassificazione': 202,
+        'name': 'LETTERA DI GARANZIA',
+        'idTipoprotocollo': 1
+    },
+    {
+        'idClassificazione': 203,
+        'name': 'GENERICO',
+        'idTipoprotocollo': 3
+    }
+];
\ No newline at end of file
diff --git a/src/pages/DomandaEditPreInstructor/components/ArchiveDocument/index.js b/src/pages/DomandaEditPreInstructor/components/ArchiveDocument/index.js
index 4a093dd..094d468 100644
--- a/src/pages/DomandaEditPreInstructor/components/ArchiveDocument/index.js
+++ b/src/pages/DomandaEditPreInstructor/components/ArchiveDocument/index.js
@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { __ } from '@wordpress/i18n';
 import { isEmpty } from 'ramda';
 import { wrap } from 'object-path-immutable';
@@ -9,24 +9,37 @@ import { Dialog } from 'primereact/dialog';
 import { InputTextarea } from 'primereact/inputtextarea';
 import { Dropdown } from 'primereact/dropdown';
 import { classNames } from 'primereact/utils';
+import { InputSwitch } from 'primereact/inputswitch';
+import { InputText } from 'primereact/inputtext';
 
-const ArchiveDocument = ({ ndg = '', fileId = 0 }) => {
+import { classificationType, protocolType } from '../../../../configData';
+import AppointmentService from '../../../../service/appointment-service';
+import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse';
+import { storeSet } from '../../../../store';
+import { Toast } from 'primereact/toast';
+
+const ArchiveDocument = ({ applicationId, ndg = '', fileId = 0 }) => {
     const [loading, setLoading] = useState(false);
     const [isVisibleDialog, setIsVisibleDialog] = useState(false);
     const [modalData, setModalData] = useState({});
+    const [types, setTypes] = useState([]);
     const [categories, setCategories] = useState([]);
+    const toast = useRef(null);
 
     const openArchivationModal = () => {
         setIsVisibleDialog(true);
         setModalData({
-            description: '',
-            categoryId: 0,
+            descrizione: '',
+            idTipoProtocollo: 0,
+            idClassificazione: 0,
+            flagDaFirmare: false,
+            email: '',
             fileId
         });
     }
 
     const headerDialog = () => {
-        return <span>{__('Archive document', 'gepafin')}</span>;
+        return <span>{__('Archiviazione del documento', 'gepafin')}</span>;
     }
 
     const hideDialog = () => {
@@ -50,56 +63,141 @@ const ArchiveDocument = ({ ndg = '', fileId = 0 }) => {
     }
 
     const submitData = () => {
-        console.log('submitData', modalData)
+        if (
+            modalData.idTipoProtocollo !== 0 && modalData.idClassificazione !== 0
+            && !isEmpty(modalData.descrizione) && !isEmpty(modalData.email)
+        ) {
+            setLoading(true);
+            const submitData = {
+                'input': {
+                    'idTipoProtocollo': modalData.idTipoProtocollo,
+                    'idClassificazione': modalData.idClassificazione,
+                    'flagDaFirmare': modalData.flagDaFirmare,
+                    'descrizione': modalData.descrizione,
+                    'attributes': {
+                        'ndg': ndg,
+                        'email': modalData.email
+                    }
+                }
+            }
+            console.log('submitData', submitData);
+            //AppointmentService.archiveDocument(applicationId, fileId, submitData, submitCallback, errSubmitCallback)
+        }
+    }
+
+    const submitCallback = (data) => {
+        if (data.status === 'SUCCESS') {
+            console.log(data.data);
+        }
+        setLoading(false);
+    }
+
+    const errSubmitCallback = (data) => {
+        if (toast.current && data.message) {
+            toast.current.show({
+                severity: 'error',
+                summary: '',
+                detail: data.message
+            });
+        }
+        set404FromErrorResponse(data);
+        setLoading(false);
     }
 
     useEffect(() => {
-        setCategories([
-            {value: 1, label: 'Type 1'},
-            {value: 2, label: 'Type 2'},
-        ])
+        const newModalData = {
+            ...modalData,
+            idClassificazione: 0
+        };
+        setModalData(newModalData);
+        setCategories(classificationType
+            .filter(o => o.idTipoprotocollo === modalData.idTipoProtocollo)
+            .map(o => ({ value: o.idClassificazione, label: o.name })));
+    }, [modalData.idTipoProtocollo])
+
+    useEffect(() => {
+        setTypes(protocolType.map(o => ({ value: o.id, label: o.name })));
     }, []);
 
-    return (
-        <>
-            {!isEmpty(ndg)
-                ? <Button icon="pi pi-file-export"
-                          rounded
-                          onClick={openArchivationModal}
-                          outlined
-                          severity="info"
-                          aria-label={__('Mostra', 'gepafin')}/>
-                : null}
-            <Dialog
-                visible={isVisibleDialog}
-                modal
-                header={headerDialog}
-                footer={footerDialog}
-                style={{ maxWidth: '600px', width: '100%' }}
-                onHide={hideDialog}>
-                <div className="appForm__field">
-                    <label className={classNames({ 'p-error': !modalData.categoryId || modalData.categoryId === 0 })}>
-                        {__('Classificazione', 'gepafin')}*
-                    </label>
-                    <Dropdown
-                        value={modalData.categoryId}
-                        invalid={!modalData.categoryId || modalData.categoryId === 0}
-                        onChange={(e) => setValue('categoryId', e.value)}
-                        options={categories}/>
-                </div>
-                <div className="appForm__field">
-                    <label className={classNames({ 'p-error': isEmpty(modalData.description) })}>
-                        {__('Descrizione', 'gepafin')}
-                    </label>
-                    <InputTextarea
-                        value={modalData.description}
-                        invalid={isEmpty(modalData.description)}
-                        onChange={(e) => setValue('description', e.target.value)}
-                        rows={3}
-                        cols={30}/>
-                </div>
-            </Dialog>
-        </>
+    return (!isEmpty(ndg)
+            ? <>
+                <Toast ref={toast}/>
+                <Button icon="pi pi-file-export"
+                        rounded
+                        onClick={openArchivationModal}
+                        outlined
+                        severity="info"
+                        aria-label={__('Mostra', 'gepafin')}/>
+                <Dialog
+                    visible={isVisibleDialog}
+                    modal
+                    header={headerDialog}
+                    footer={footerDialog}
+                    style={{ maxWidth: '600px', width: '100%' }}
+                    onHide={hideDialog}>
+                    <div className="appForm__field">
+                        <label
+                            className={classNames({ 'p-error': !modalData.idTipoProtocollo || modalData.idTipoProtocollo === 0 })}>
+                            {__('Tipo di protocollo', 'gepafin')}*
+                        </label>
+                        <Dropdown
+                            value={modalData.idTipoProtocollo}
+                            invalid={!modalData.idTipoProtocollo || modalData.idTipoProtocollo === 0}
+                            onChange={(e) => setValue('idTipoProtocollo', e.value)}
+                            options={types}/>
+                    </div>
+                    <div className="appForm__field">
+                        <label
+                            className={classNames({ 'p-error': !modalData.idClassificazione || modalData.idClassificazione === 0 })}>
+                            {__('Classificazione', 'gepafin')}*
+                        </label>
+                        <Dropdown
+                            value={modalData.idClassificazione}
+                            invalid={!modalData.idClassificazione || modalData.idClassificazione === 0}
+                            onChange={(e) => setValue('idClassificazione', e.value)}
+                            options={categories}/>
+                    </div>
+                    <div className="appForm__field">
+                        <label>
+                            {__('Da firmare?', 'gepafin')}
+                        </label>
+                        <InputSwitch
+                            checked={modalData.flagDaFirmare}
+                            onChange={(e) => setValue('flagDaFirmare', e.value)}/>
+                    </div>
+                    <div className="appForm__field">
+                        <label className={classNames({ 'p-error': isEmpty(modalData.descrizione) })}>
+                            {__('Descrizione', 'gepafin')}*
+                        </label>
+                        <InputTextarea
+                            value={modalData.descrizione}
+                            invalid={isEmpty(modalData.descrizione)}
+                            onChange={(e) => setValue('descrizione', e.target.value)}
+                            rows={3}
+                            cols={30}/>
+                    </div>
+                    <div className="appForm__field">
+                        <label>
+                            {__('NDG', 'gepafin')}*
+                        </label>
+                        <InputText
+                            value={ndg}
+                            disabled
+                            onChange={() => {
+                            }}/>
+                    </div>
+                    <div className="appForm__field">
+                        <label className={classNames({ 'p-error': isEmpty(modalData.email) })}>
+                            {__('Email', 'gepafin')}*
+                        </label>
+                        <InputText
+                            value={modalData.email}
+                            keyfilter="email"
+                            invalid={isEmpty(modalData.email)}
+                            onChange={(e) => setValue('email', e.target.value)}/>
+                    </div>
+                </Dialog>
+            </> : null
     )
 }
 
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 3f9acbd..92ff515 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -35,6 +35,7 @@ import { InputText } from 'primereact/inputtext';
 import DownloadApplicationArchive from './components/DownloadApplicationArchive';
 import DownloadCompanyDelegation from './components/DownloadCompanyDelegation';
 import DownloadSignedApplication from './components/DownloadSignedApplication';
+import AppointmentService from '../../service/appointment-service';
 
 const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
 
@@ -360,7 +361,30 @@ const DomandaEditPreInstructor = () => {
     }
 
     const doCheckNDG = () => {
-        // TODO
+        storeSet.main.setAsyncRequest();
+        doSaveDraft();
+        setTimeout(() => {
+            AppointmentService.getNdg(id, getNdgCallback, errGetNdgCallback);
+        }, 100);
+    }
+
+    const getNdgCallback = (data) => {
+        if (data.status === 'SUCCESS') {
+            console.log('data', data.data);
+        }
+        storeSet.main.unsetAsyncRequest();
+    }
+
+    const errGetNdgCallback = (data) => {
+        if (toast.current && data.message) {
+            toast.current.show({
+                severity: 'error',
+                summary: '',
+                detail: data.message
+            });
+        }
+        set404FromErrorResponse(data);
+        storeSet.main.unsetAsyncRequest();
     }
 
     const doCreateAppointment = () => {
@@ -595,7 +619,7 @@ const DomandaEditPreInstructor = () => {
                                                 }}>
                                                     <span>{k.name}</span>
                                                     <div className="appPageSection__iconActions">
-                                                        <ArchiveDocument ndg={data.ndg} fileId={k.id}/>
+                                                        <ArchiveDocument ndg={data.ndg} applicationId={id} fileId={k.id}/>
                                                         <Button icon="pi pi-eye" rounded
                                                                 onClick={() => {
                                                                     window.open(encodeURI(k.filePath), '_blank').focus()
diff --git a/src/service/appointment-service.js b/src/service/appointment-service.js
new file mode 100644
index 0000000..0bf12bd
--- /dev/null
+++ b/src/service/appointment-service.js
@@ -0,0 +1,14 @@
+import { NetworkService } from './network-service';
+
+const API_BASE_URL = process.env.REACT_APP_API_EXECUTION_ADDRESS;
+
+export default class AppointmentService {
+
+    static getNdg = (id, callback, errCallback, queryParams) => {
+        NetworkService.get(`${API_BASE_URL}/appointment/application/${id}/check-ndg`, callback, errCallback, queryParams);
+    };
+
+    static archiveDocument = (applicationId, documentId, body, callback, errCallback, queryParams) => {
+        NetworkService.post(`${API_BASE_URL}/appointment/application/${applicationId}/document/${documentId}`, {}, callback, errCallback, queryParams);
+    };
+}

From 50a0a3b2117efe9afee866395532b79e19f76ab7 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Fri, 6 Dec 2024 16:31:59 +0100
Subject: [PATCH 16/23] - fixed displaying proper ID for applications;

---
 .../components/PreInstructorDomandeTable/index.js               | 2 +-
 .../components/PreInstructorSoccorsiTable/index.js              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js b/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
index 117a7e2..33dcab7 100644
--- a/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
+++ b/src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
@@ -141,7 +141,7 @@ const PreInstructorDomandeTable = () => {
                        header={header}
                        emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
-                <Column field="id" header={__('ID domanda', 'gepafin')}
+                <Column field="applicationId" header={__('ID domanda', 'gepafin')}
                         sortable filterPlaceholder={__('Cerca', 'gepafin')}
                         style={{ minWidth: '6rem' }}/>
                 <Column field="protocolNumber" header={__('Protocollo', 'gepafin')}
diff --git a/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js b/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
index 05ca8ee..e509e43 100644
--- a/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
+++ b/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
@@ -140,7 +140,7 @@ const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
                        header={header}
                        emptyMessage={translationStrings.emptyMessage}
                        onFilter={(e) => setFilters(e.filters)}>
-                <Column field="id" header={__('ID domanda', 'gepafin')}
+                <Column field="applicationId" header={__('ID domanda', 'gepafin')}
                         sortable filterPlaceholder={__('Cerca', 'gepafin')}
                         style={{ minWidth: '6rem' }}/>
                 <Column field="protocolNumber" header={__('Protocollo', 'gepafin')}

From 7f54e5e1ec43c204232adfd260f4028c6975a81f Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Fri, 6 Dec 2024 16:54:37 +0100
Subject: [PATCH 17/23] - added labels for new statuses;

---
 src/helpers/getBandoLabel.js                             | 9 +++++++++
 src/helpers/getBandoSeverity.js                          | 9 +++++++++
 .../components/BeneficiarioDomandeTable/index.js         | 2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/helpers/getBandoLabel.js b/src/helpers/getBandoLabel.js
index c48db88..9c8af0f 100644
--- a/src/helpers/getBandoLabel.js
+++ b/src/helpers/getBandoLabel.js
@@ -20,6 +20,15 @@ const getBandoLabel = (status) => {
         case 'READY':
             return __('Pronto', 'gepafin');
 
+        case 'NDG':
+            return __('NDG', 'gepafin');
+
+        case 'APPOINTMENT':
+            return __('Appuntamento', 'gepafin');
+
+        case 'ADMISSIBLE':
+            return __('Ammisibile', 'gepafin');
+
         case 'SOCCORSO':
             return __('Soccorso', 'gepafin');
 
diff --git a/src/helpers/getBandoSeverity.js b/src/helpers/getBandoSeverity.js
index 9cb6b89..9b9d16c 100644
--- a/src/helpers/getBandoSeverity.js
+++ b/src/helpers/getBandoSeverity.js
@@ -18,6 +18,15 @@ const getBandoSeverity = (status) => {
         case 'READY':
             return 'info';
 
+        case 'NDG':
+            return 'info';
+
+        case 'APPOINTMENT':
+            return 'info';
+
+        case 'ADMISSIBLE':
+            return 'info';
+
         case 'SOCCORSO':
             return 'warning';
 
diff --git a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
index 51ef317..c07c1ef 100644
--- a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
+++ b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
@@ -37,7 +37,7 @@ const BeneficiarioDomandeTable = () => {
             setLocalAsyncRequest(true);
             ApplicationService.getApplications(getApplCallback, errGetApplCallback, [
                 ['companyId', chosenCompanyId],
-                ['statuses', ['SOCCORSO', 'APPROVED', 'REJECTED', 'EVALUATION', 'SUBMIT']]
+                ['statuses', ['SOCCORSO', 'NDG', 'ADMISSIBLE', 'APPOINTMENT', 'APPROVED', 'REJECTED', 'EVALUATION', 'SUBMIT']]
             ]);
         }
     }, [chosenCompanyId]);

From ed6abc1e9507abfd1ff0985c9cbeec872547eb01 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Fri, 6 Dec 2024 16:56:00 +0100
Subject: [PATCH 18/23] - removed url encoding;

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

diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 3f9acbd..0e7c936 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -266,7 +266,7 @@ const DomandaEditPreInstructor = () => {
             case 'fileupload' :
                 content = <ul>
                     {item.fieldValue.map(o => <li key={o.id}>
-                        {o.filePath ? <a href={encodeURI(o.filePath)}>{o.name}</a> : null}
+                        {o.filePath ? <a href={o.filePath}>{o.name}</a> : null}
                     </li>)}
                 </ul>;
                 break;
@@ -557,7 +557,7 @@ const DomandaEditPreInstructor = () => {
                                                 {o.fileDetail && o.fileDetail.length === 1
                                                     ? <Button icon="pi pi-eye" rounded
                                                               onClick={() => {
-                                                                  window.open(encodeURI(o.fileDetail[0].filePath), '_blank').focus()
+                                                                  window.open(o.fileDetail[0].filePath, '_blank').focus()
                                                               }}
                                                               outlined severity="info"
                                                               aria-label={__('Mostra', 'gepafin')}/> : null}
@@ -598,7 +598,7 @@ const DomandaEditPreInstructor = () => {
                                                         <ArchiveDocument ndg={data.ndg} fileId={k.id}/>
                                                         <Button icon="pi pi-eye" rounded
                                                                 onClick={() => {
-                                                                    window.open(encodeURI(k.filePath), '_blank').focus()
+                                                                    window.open(k.filePath, '_blank').focus()
                                                                 }}
                                                                 outlined severity="info"
                                                                 aria-label={__('Mostra', 'gepafin')}/>

From 5efe8aa37766c17444f7bc939ee7c4f5cac75c1e Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Mon, 9 Dec 2024 10:31:57 +0100
Subject: [PATCH 19/23] - fiexed redirection to login error; - refactored the
 code;

---
 .../components/ArchiveDocument/index.js       |  4 +-
 .../components/ListOfFiles/index.js           | 72 ++++++++++++++++
 src/pages/DomandaEditPreInstructor/index.js   | 84 ++++---------------
 src/pages/Login/index.js                      |  6 +-
 4 files changed, 94 insertions(+), 72 deletions(-)
 create mode 100644 src/pages/DomandaEditPreInstructor/components/ListOfFiles/index.js

diff --git a/src/pages/DomandaEditPreInstructor/components/ArchiveDocument/index.js b/src/pages/DomandaEditPreInstructor/components/ArchiveDocument/index.js
index 094d468..b50c321 100644
--- a/src/pages/DomandaEditPreInstructor/components/ArchiveDocument/index.js
+++ b/src/pages/DomandaEditPreInstructor/components/ArchiveDocument/index.js
@@ -80,8 +80,8 @@ const ArchiveDocument = ({ applicationId, ndg = '', fileId = 0 }) => {
                     }
                 }
             }
-            console.log('submitData', submitData);
-            //AppointmentService.archiveDocument(applicationId, fileId, submitData, submitCallback, errSubmitCallback)
+            
+            AppointmentService.archiveDocument(applicationId, fileId, submitData, submitCallback, errSubmitCallback)
         }
     }
 
diff --git a/src/pages/DomandaEditPreInstructor/components/ListOfFiles/index.js b/src/pages/DomandaEditPreInstructor/components/ListOfFiles/index.js
new file mode 100644
index 0000000..80f5a85
--- /dev/null
+++ b/src/pages/DomandaEditPreInstructor/components/ListOfFiles/index.js
@@ -0,0 +1,72 @@
+import React from 'react';
+import { Button } from 'primereact/button';
+import { __ } from '@wordpress/i18n';
+import { isNil } from 'ramda';
+import ArchiveDocument from '../ArchiveDocument';
+
+const ListOfFiles = ({ files, updateFn, shouldDisableFieldFn, name, ndg, applicationId }) => {
+
+    return (
+        <ol className="appPageSection__list">
+            {files.map((o, i) => <li key={o.id} className="appPageSection__listItem">
+                <div className="appPageSection__listItemRow">
+                    <span>{o.label}</span>
+                    <div className="appPageSection__iconActions">
+                        {o.fileDetail && o.fileDetail.length === 1
+                            ? <Button icon="pi pi-eye" rounded
+                                      onClick={() => {
+                                          window.open(o.fileDetail[0].filePath, '_blank').focus()
+                                      }}
+                                      outlined severity="info"
+                                      aria-label={__('Mostra', 'gepafin')}/> : null}
+                        <Button icon="pi pi-thumbs-up" rounded outlined
+                                disabled={shouldDisableFieldFn(name)}
+                                severity={!isNil(o.valid) && o.valid ? 'success' : 'secondary'}
+                                onClick={() => updateFn(
+                                    true,
+                                    [name, i, 'valid']
+                                )}
+                                aria-label={__('Su', 'gepafin')}/>
+                        <Button icon="pi pi-thumbs-down" rounded outlined
+                                disabled={shouldDisableFieldFn(name)}
+                                severity={!isNil(o.valid) && !o.valid ? 'danger' : 'secondary'}
+                                onClick={() => updateFn(
+                                    false,
+                                    [name, i, 'valid']
+                                )}
+                                aria-label={__('Giu', 'gepafin')}/>
+                    </div>
+                </div>
+                {o.fileDetail && o.fileDetail.length > 1
+                    ? <ul style={{
+                        width: '100%',
+                        paddingLeft: '15px',
+                        display: 'flex',
+                        flexDirection: 'column',
+                        gap: '10px'
+                    }}>
+                        {o.fileDetail.map((k) => <li key={k.id} style={{
+                            display: 'flex',
+                            flexDirection: 'row',
+                            alignItems: 'center',
+                            justifyContent: 'space-between'
+                        }}>
+                            <span>{k.name}</span>
+                            <div className="appPageSection__iconActions">
+                                <ArchiveDocument ndg={ndg} applicationId={applicationId} fileId={k.id}/>
+                                <Button icon="pi pi-eye" rounded
+                                        onClick={() => {
+                                            window.open(k.filePath, '_blank').focus()
+                                        }}
+                                        outlined severity="info"
+                                        aria-label={__('Mostra', 'gepafin')}/>
+                            </div>
+                        </li>)}
+                    </ul>
+                    : null}
+            </li>)}
+        </ol>
+    )
+}
+
+export default ListOfFiles;
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 2bd14cb..f9b5d75 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -36,6 +36,7 @@ import DownloadApplicationArchive from './components/DownloadApplicationArchive'
 import DownloadCompanyDelegation from './components/DownloadCompanyDelegation';
 import DownloadSignedApplication from './components/DownloadSignedApplication';
 import AppointmentService from '../../service/appointment-service';
+import ListOfFiles from './components/ListOfFiles';
 
 const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
 
@@ -140,15 +141,14 @@ const DomandaEditPreInstructor = () => {
 
     const header = renderHeader();
 
-    const updateEvaluationValue = (value, path, maxValue) => {
-        const pathEls = path.split('.');
+    const updateEvaluationValue = (value, path, maxValue = null) => {
         let finalValue = value;
 
         if (maxValue || maxValue === 0) {
             finalValue = value > maxValue ? maxValue : value;
         }
 
-        const newData = wrap(data).set(pathEls, finalValue).value();
+        const newData = wrap(data).set(path, finalValue).value();
         setData(newData);
         updateFlagsForSoccorso(newData);
     }
@@ -548,7 +548,7 @@ const DomandaEditPreInstructor = () => {
                                                 inputId={`checklist_${o.id}`}
                                                 onChange={(e) => updateEvaluationValue(
                                                     e.checked,
-                                                    `checklist.${i}.valid`
+                                                    ['checklist', i, 'valid']
                                                 )}
                                                 checked={o.valid}></Checkbox>
                                             <label htmlFor={`checklist_${o.id}`}>{o.label}</label>
@@ -565,7 +565,7 @@ const DomandaEditPreInstructor = () => {
                                         headerTemplate={header}
                                         onTextChange={(e) => updateEvaluationValue(
                                             e.htmlValue,
-                                            'note'
+                                            ['note']
                                         )}
                                         style={{ height: 80 * 3, width: '100%' }}
                                     />
@@ -573,65 +573,13 @@ const DomandaEditPreInstructor = () => {
                             </div>
                             <div>
                                 <h3>{__('Documenti allegati', 'gepafin')}</h3>
-                                <ol className="appPageSection__list">
-                                    {data.files.map((o, i) => <li key={o.id} className="appPageSection__listItem">
-                                        <div className="appPageSection__listItemRow">
-                                            <span>{o.label}</span>
-                                            <div className="appPageSection__iconActions">
-                                                {o.fileDetail && o.fileDetail.length === 1
-                                                    ? <Button icon="pi pi-eye" rounded
-                                                              onClick={() => {
-                                                                  window.open(o.fileDetail[0].filePath, '_blank').focus()
-                                                              }}
-                                                              outlined severity="info"
-                                                              aria-label={__('Mostra', 'gepafin')}/> : null}
-                                                <Button icon="pi pi-thumbs-up" rounded outlined
-                                                        disabled={shouldDisableField('files')}
-                                                        severity={!isNil(o.valid) && o.valid ? 'success' : 'secondary'}
-                                                        onClick={() => updateEvaluationValue(
-                                                            true,
-                                                            `files.${i}.valid`
-                                                        )}
-                                                        aria-label={__('Su', 'gepafin')}/>
-                                                <Button icon="pi pi-thumbs-down" rounded outlined
-                                                        disabled={shouldDisableField('files')}
-                                                        severity={!isNil(o.valid) && !o.valid ? 'danger' : 'secondary'}
-                                                        onClick={() => updateEvaluationValue(
-                                                            false,
-                                                            `files.${i}.valid`
-                                                        )}
-                                                        aria-label={__('Giu', 'gepafin')}/>
-                                            </div>
-                                        </div>
-                                        {o.fileDetail && o.fileDetail.length > 1
-                                            ? <ul style={{
-                                                width: '100%',
-                                                paddingLeft: '15px',
-                                                display: 'flex',
-                                                flexDirection: 'column',
-                                                gap: '10px'
-                                            }}>
-                                                {o.fileDetail.map((k, i) => <li key={k.id} style={{
-                                                    display: 'flex',
-                                                    flexDirection: 'row',
-                                                    alignItems: 'center',
-                                                    justifyContent: 'space-between'
-                                                }}>
-                                                    <span>{k.name}</span>
-                                                    <div className="appPageSection__iconActions">
-                                                        <ArchiveDocument ndg={data.ndg} applicationId={id} fileId={k.id}/>
-                                                        <Button icon="pi pi-eye" rounded
-                                                                onClick={() => {
-                                                                    window.open(k.filePath, '_blank').focus()
-                                                                }}
-                                                                outlined severity="info"
-                                                                aria-label={__('Mostra', 'gepafin')}/>
-                                                    </div>
-                                                </li>)}
-                                            </ul>
-                                            : null}
-                                    </li>)}
-                                </ol>
+                                <ListOfFiles
+                                    files={data.files}
+                                    updateFn={updateEvaluationValue}
+                                    shouldDisableFieldFn={shouldDisableField}
+                                    name="files"
+                                    ndg={data.ndg}
+                                    applicationId={id}/>
                             </div>
                         </div>
                     </div>
@@ -660,8 +608,8 @@ const DomandaEditPreInstructor = () => {
                                                 max={o.maxScore}
                                                 onChange={(e) => updateEvaluationValue(
                                                     e.value,
-                                                    `criteria.${i}.score`,
-                                                    o.maxScore
+                                                    ['criteria', i, 'score'],
+                                                    o.criteria
                                                 )}/>
                                             <span className="p-inputgroup-addon">
                                                 / {o.maxScore}
@@ -680,7 +628,7 @@ const DomandaEditPreInstructor = () => {
                                                     severity={!isNil(o.valid) && o.valid ? 'success' : 'secondary'}
                                                     onClick={() => updateEvaluationValue(
                                                         true,
-                                                        `criteria.${i}.valid`
+                                                        ['criteria', i, 'valid']
                                                     )}
                                                     aria-label={__('Su', 'gepafin')}/>
                                             <Button icon="pi pi-thumbs-down" rounded outlined
@@ -688,7 +636,7 @@ const DomandaEditPreInstructor = () => {
                                                     severity={!isNil(o.valid) && !o.valid ? 'danger' : 'secondary'}
                                                     onClick={() => updateEvaluationValue(
                                                         false,
-                                                        `criteria.${i}.valid`
+                                                        ['criteria', i, 'valid']
                                                     )}
                                                     aria-label={__('Giu', 'gepafin')}/>
                                         </div>
diff --git a/src/pages/Login/index.js b/src/pages/Login/index.js
index eacfec4..be260a1 100644
--- a/src/pages/Login/index.js
+++ b/src/pages/Login/index.js
@@ -3,6 +3,7 @@ import { __, sprintf } from '@wordpress/i18n';
 import { classNames } from 'primereact/utils';
 import { isEmpty, isNil } from 'ramda';
 import hotkeys from 'hotkeys-js';
+import { useSearchParams } from 'react-router-dom';
 
 // store
 import { storeSet, useStore } from '../../store';
@@ -13,7 +14,6 @@ import AuthenticationService from '../../service/authentication-service';
 // components
 import LogoIcon from '../../icons/LogoIcon';
 import { Messages } from 'primereact/messages';
-import { useSearchParams } from 'react-router-dom';
 import { Dialog } from 'primereact/dialog';
 import { Accordion } from 'primereact/accordion';
 import { AccordionTab } from 'primereact/accordion';
@@ -98,7 +98,9 @@ const Login = () => {
     }, [isMaintenance])
 
     useEffect(() => {
-        if (!isEmpty(token)) {
+        const queryParams = Object.fromEntries(searchParams);
+
+        if (!isEmpty(token) && isNil(queryParams.redirectReason)) {
             window.location.replace('/')
         }
     }, [token]);

From 7edc94e1323b557b3512bab18533d92f6255935c Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Mon, 9 Dec 2024 15:48:29 +0100
Subject: [PATCH 20/23] - removed new statuses which are not deployed yet;

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

diff --git a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
index c07c1ef..4b405db 100644
--- a/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
+++ b/src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
@@ -37,7 +37,7 @@ const BeneficiarioDomandeTable = () => {
             setLocalAsyncRequest(true);
             ApplicationService.getApplications(getApplCallback, errGetApplCallback, [
                 ['companyId', chosenCompanyId],
-                ['statuses', ['SOCCORSO', 'NDG', 'ADMISSIBLE', 'APPOINTMENT', 'APPROVED', 'REJECTED', 'EVALUATION', 'SUBMIT']]
+                ['statuses', ['SOCCORSO', 'APPROVED', 'REJECTED', 'EVALUATION', 'SUBMIT']] // 'NDG', 'ADMISSIBLE', 'APPOINTMENT'
             ]);
         }
     }, [chosenCompanyId]);

From edbbea19e0d8f0ba0f8c4fc787c05dc2f59ea61c Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Mon, 9 Dec 2024 16:56:28 +0100
Subject: [PATCH 21/23] - fixed issue of redirecting on registartion page;

---
 src/service/network-service.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/service/network-service.js b/src/service/network-service.js
index e1ee1ab..82bde68 100644
--- a/src/service/network-service.js
+++ b/src/service/network-service.js
@@ -31,7 +31,7 @@ export class NetworkService {
         } else if (status === 403) {
             storeSet.main.token('');
             const { pathname } = window.location;
-            if (!['/login', '/loginadmin', '/reset-password'].includes(pathname)) {
+            if (!['/login', '/loginadmin', '/reset-password', '/registration'].includes(pathname)) {
                 window.location.replace('/login');
             }
         }

From 9a66a54a22d932b84e58ee7d04dcce534e7a4c32 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Tue, 10 Dec 2024 16:33:37 +0100
Subject: [PATCH 22/23] - fixed bug in evaluation page - related to null in
 fieldValue that was not accounted for;

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

diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index f9b5d75..4660a96 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -266,9 +266,11 @@ const DomandaEditPreInstructor = () => {
         switch (item.fieldName) {
             case 'fileupload' :
                 content = <ul>
-                    {item.fieldValue.map(o => <li key={o.id}>
-                        {o.filePath ? <a href={o.filePath}>{o.name}</a> : null}
-                    </li>)}
+                    {item.fieldValue
+                        ? item.fieldValue.map(o => <li key={o.id}>
+                            {o.filePath ? <a href={o.filePath}>{o.name}</a> : null}
+                        </li>)
+                        : null}
                 </ul>;
                 break;
             case 'table' :
@@ -280,9 +282,11 @@ const DomandaEditPreInstructor = () => {
                     </tr>
                     </thead>
                     <tbody>
-                    {item.fieldValue.map((o, i) => <tr key={i}>
-                        {Object.values(o).map(v => <td key={v}>{v}</td>)}
-                    </tr>)}
+                    {item.fieldValue
+                        ? item.fieldValue.map((o, i) => <tr key={i}>
+                            {Object.values(o).map(v => <td key={v}>{v}</td>)}
+                        </tr>)
+                        : null}
                     </tbody>
                 </table>;
                 break;
@@ -424,7 +428,7 @@ const DomandaEditPreInstructor = () => {
     const doCreateAppointmentRequest = () => {
         if (
             !isEmpty(appointmentData.title) && !isEmpty(appointmentData.text) && !isEmpty(appointmentData.amount)
-        && !isEmpty(appointmentData.duration) && appointmentData.duration !== 0 && appointmentData.amount !== 0
+            && !isEmpty(appointmentData.duration) && appointmentData.duration !== 0 && appointmentData.amount !== 0
         ) {
             console.log(appointmentData);
         }
@@ -528,7 +532,7 @@ const DomandaEditPreInstructor = () => {
                     <div className="appPageSection">
                         <h2>{__('Scarica documenti della domanda', 'gepafin')}</h2>
                         <div className="appPageSection__row autoFlow">
-                        <DownloadApplicationArchive applicationId={id}/>
+                            <DownloadApplicationArchive applicationId={id}/>
                             <DownloadSignedApplication applicationId={id}/>
                             <DownloadCompanyDelegation applicationId={id}/>
                         </div>

From f6404e1d7ab4c6f0e4c802b05c66413768a86f30 Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Wed, 11 Dec 2024 09:13:14 +0100
Subject: [PATCH 23/23] - refactored logic of logging;

---
 src/components/ErrorBoundary/index.js | 14 ++----------
 src/helpers/logMsgWithSentry.js       | 31 +++++++++++++++++++++++++++
 src/service/network-service.js        | 26 ++--------------------
 3 files changed, 35 insertions(+), 36 deletions(-)
 create mode 100644 src/helpers/logMsgWithSentry.js

diff --git a/src/components/ErrorBoundary/index.js b/src/components/ErrorBoundary/index.js
index 4ac790c..6521776 100644
--- a/src/components/ErrorBoundary/index.js
+++ b/src/components/ErrorBoundary/index.js
@@ -1,7 +1,5 @@
 import React, { Component } from 'react';
-import * as Sentry from '@sentry/browser';
-
-const LOCAL_DEVELOPMENT = process.env.REACT_APP_LOCAL_DEVELOPMENT;
+import logMsgWithSentry from '../../helpers/logMsgWithSentry';
 
 class ErrorBoundary extends Component {
     constructor(props) {
@@ -14,16 +12,8 @@ class ErrorBoundary extends Component {
 
     static getDerivedStateFromError(error) {
         try {
-            if (LOCAL_DEVELOPMENT !== '1') {
-                Sentry.init({
-                    dsn: "https://e7b2134f7d816f663bb83e51b106a694@o4508381921738752.ingest.de.sentry.io/4508381935501392",
-                    environment: process.env.NODE_ENV || "development"
-                });
-
-                Sentry.captureException(error);
-            }
+            logMsgWithSentry('', 0, {}, error);
         } catch (err) {
-            console.log('err')
             console.log(err);
         }
         return { builderError: true };
diff --git a/src/helpers/logMsgWithSentry.js b/src/helpers/logMsgWithSentry.js
new file mode 100644
index 0000000..5dee179
--- /dev/null
+++ b/src/helpers/logMsgWithSentry.js
@@ -0,0 +1,31 @@
+import * as Sentry from '@sentry/browser';
+
+const LOCAL_DEVELOPMENT = process.env.REACT_APP_LOCAL_DEVELOPMENT;
+
+const logMsgWithSentry = (endpoint = '', status = 0, resp = {}, error = null) => {
+    try {
+        if (LOCAL_DEVELOPMENT !== '1') {
+            Sentry.init({
+                dsn: 'https://e7b2134f7d816f663bb83e51b106a694@o4508381921738752.ingest.de.sentry.io/4508381935501392',
+                environment: process.env.NODE_ENV || 'development'
+            });
+
+            if (!error) {
+                const newError = new Error(`Status ${status}`);
+                Sentry.captureException(`Error in endpoint: ${endpoint}`, {
+                    level: 'error',
+                    extra: {
+                        originalError: newError,
+                        details: resp
+                    }
+                });
+            } else {
+                Sentry.captureException(error);
+            }
+        }
+    } catch (err) {
+        console.log(err);
+    }
+}
+
+export default logMsgWithSentry;
\ No newline at end of file
diff --git a/src/service/network-service.js b/src/service/network-service.js
index 82bde68..431fce5 100644
--- a/src/service/network-service.js
+++ b/src/service/network-service.js
@@ -1,33 +1,11 @@
 import { storeGet, storeSet } from '../store';
-import * as Sentry from '@sentry/browser';
-
-const LOCAL_DEVELOPMENT = process.env.REACT_APP_LOCAL_DEVELOPMENT;
+import logMsgWithSentry from '../helpers/logMsgWithSentry';
 
 export class NetworkService {
-    static TOKEN_KEY
-    static REFRESH_TOKEN_KEY
 
     static logApiError = (endpoint, status = 0, resp = {}) => {
         if (status === 500) {
-            if (LOCAL_DEVELOPMENT !== '1') {
-                try {
-                    Sentry.init({
-                        dsn: 'https://e7b2134f7d816f663bb83e51b106a694@o4508381921738752.ingest.de.sentry.io/4508381935501392',
-                        environment: process.env.NODE_ENV || 'development'
-                    });
-
-                    const error = new Error(`Status ${status}`);
-                    Sentry.captureException(`Error in endpoint: ${endpoint}`, {
-                        level: 'error',
-                        extra: {
-                            originalError: error,
-                            details: resp
-                        }
-                    });
-                } catch (err) {
-                    console.log(err);
-                }
-            }
+            logMsgWithSentry(endpoint, status, resp);
         } else if (status === 403) {
             storeSet.main.token('');
             const { pathname } = window.location;