From 290ea762136053cf1d09298fdfd55c39dd6a96fa Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Thu, 9 Jan 2025 11:25:28 +0100
Subject: [PATCH 1/2] - updated copies;

---
 src/pages/BandoView/index.js                  |  2 +-
 src/pages/BandoViewBeneficiario/index.js      |  2 +-
 .../DomandaEditInstructorManager/index.js     | 12 ++--
 src/pages/DomandaEditPreInstructor/index.js   | 69 ++++++-------------
 src/pages/SoccorsoEditBeneficiario/index.js   |  4 +-
 src/pages/SoccorsoEditPreInstructor/index.js  |  6 +-
 .../PreInstructorSoccorsiTable/index.js       |  2 +-
 7 files changed, 36 insertions(+), 61 deletions(-)

diff --git a/src/pages/BandoView/index.js b/src/pages/BandoView/index.js
index 2322905..116c033 100644
--- a/src/pages/BandoView/index.js
+++ b/src/pages/BandoView/index.js
@@ -156,7 +156,7 @@ const BandoView = () => {
                     </div>
 
                     <div className="appPageSection__withBorder">
-                        <h2>{__('Documentazione Richiesta', 'gepafin')}</h2>
+                        <h2>{__('Documentazione richiesta', 'gepafin')}</h2>
                         <div className="ql-editor">
                             {renderHtmlContent(data.documentationRequested)}
                         </div>
diff --git a/src/pages/BandoViewBeneficiario/index.js b/src/pages/BandoViewBeneficiario/index.js
index 66209f8..1540284 100644
--- a/src/pages/BandoViewBeneficiario/index.js
+++ b/src/pages/BandoViewBeneficiario/index.js
@@ -408,7 +408,7 @@ const BandoViewBeneficiario = () => {
                     </div>
 
                     <div className="appPageSection__withBorder">
-                        <h2>{__('Documentazione Richiesta', 'gepafin')}</h2>
+                        <h2>{__('Documentazione richiesta', 'gepafin')}</h2>
                         <div className="ql-editor">
                             {renderHtmlContent(data.documentationRequested)}
                         </div>
diff --git a/src/pages/DomandaEditInstructorManager/index.js b/src/pages/DomandaEditInstructorManager/index.js
index 99793aa..888ec22 100644
--- a/src/pages/DomandaEditInstructorManager/index.js
+++ b/src/pages/DomandaEditInstructorManager/index.js
@@ -743,10 +743,10 @@ const DomandaEditPreInstructor = () => {
                                     <td>
                                         {isAdmissible
                                             ? <Tag icon="pi pi-check" severity="success"
-                                                   value={__('Ammissibile')}></Tag> : null}
+                                                   value={__('Ammissibile formalmente')}></Tag> : null}
                                         {!isAdmissible
                                             ? <Tag icon="pi pi-times" severity="warning"
-                                                   value={__('Inammissibile')}></Tag> : null}
+                                                   value={__('Punteggio non sufficiente per passaggio alla valutazione tecnica ed economico finanziaria')}></Tag> : null}
                                     </td>
                                 </tr>
                                 </tbody>
@@ -775,8 +775,8 @@ const DomandaEditPreInstructor = () => {
                                     outlined
                                     label={<>
                                         {data.applicationStatus === 'EVALUATION'
-                                            ? __('Richiedi Soccorso Istruttorio', 'gepafin')
-                                            : __('Apri Soccorso Istruttorio', 'gepafin')}
+                                            ? __('Richiedi soccorso istruttorio', 'gepafin')
+                                            : __('Apri soccorso istruttorio', 'gepafin')}
                                         <i style={{ marginLeft: 7 }}>
                                             <HelpIcon/>
                                         </i>
@@ -832,7 +832,7 @@ const DomandaEditPreInstructor = () => {
                                 type="button"
                                 disabled={true}
                                 onClick={() => {}}
-                                label={__('Ammissibile', 'gepafin')}
+                                label={__('Ammissibile formalmente', 'gepafin')}
                             />
                             {data.id
                                 ? <Button
@@ -841,7 +841,7 @@ const DomandaEditPreInstructor = () => {
                                     /*disabled={!isAdmissible
                                         || (APP_EVALUATION_FLOW_ID === '1' && !['ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus))}*/
                                     onClick={initiateApproving}
-                                    label={__('Approva Domanda', 'gepafin')}
+                                    label={__('Domanda deliberata', 'gepafin')}
                                     icon="pi pi-check" iconPos="right"/> : null}
                             {/*{data.id
                                 ? <Button
diff --git a/src/pages/DomandaEditPreInstructor/index.js b/src/pages/DomandaEditPreInstructor/index.js
index 14bc5e3..b3be073 100644
--- a/src/pages/DomandaEditPreInstructor/index.js
+++ b/src/pages/DomandaEditPreInstructor/index.js
@@ -745,10 +745,10 @@ const DomandaEditPreInstructor = () => {
                                     <td>
                                         {isAdmissible
                                             ? <Tag icon="pi pi-check" severity="success"
-                                                   value={__('Ammissibile')}></Tag> : null}
+                                                   value={__('Ammissibile formalmente')}></Tag> : null}
                                         {!isAdmissible
                                             ? <Tag icon="pi pi-times" severity="warning"
-                                                   value={__('Inammissibile')}></Tag> : null}
+                                                   value={__('Punteggio non sufficiente per passaggio alla valutazione tecnica ed economico finanziaria')}></Tag> : null}
                                     </td>
                                 </tr>
                                 </tbody>
@@ -777,8 +777,8 @@ const DomandaEditPreInstructor = () => {
                                     outlined
                                     label={<>
                                         {data.applicationStatus === 'EVALUATION'
-                                            ? __('Richiedi Soccorso Istruttorio', 'gepafin')
-                                            : __('Apri Soccorso Istruttorio', 'gepafin')}
+                                            ? __('Richiedi soccorso istruttorio', 'gepafin')
+                                            : __('Apri soccorso istruttorio', 'gepafin')}
                                         <i style={{ marginLeft: 7 }}>
                                             <HelpIcon/>
                                         </i>
@@ -797,64 +797,39 @@ const DomandaEditPreInstructor = () => {
                                     onClick={() => doSaveDraft()}
                                     label={__('Crea valutazione', 'gepafin')}
                                     icon="pi pi-save" iconPos="right"/>}
-                            {/*{APP_EVALUATION_FLOW_ID === '1' && ['EVALUATION'].includes(data.applicationStatus)
+                            {APP_EVALUATION_FLOW_ID === '1' && ['EVALUATION'].includes(data.applicationStatus)
                                 ? <Button
                                     type="button"
-                                    disabled={!data.id || !allFilesRated || !allChecksChecked || evaluationShouldBeBlocked(data)}
+                                    disabled={!data.id || !allFilesRated || !allChecksChecked
+                                        || !['EVALUATION'].includes(data.applicationStatus) || evaluationShouldBeBlocked(data)}
                                     onClick={doCheckNDG}
                                     label={__('Controlla NDG', 'gepafin')}
-                                /> : null}*/}
-                            <Button
-                                type="button"
-                                disabled={true}
-                                onClick={() => {
-                                }}
-                                label={__('Controlla NDG', 'gepafin')}
-                            />
-                            {/*{APP_EVALUATION_FLOW_ID === '1' && ['NDG'].includes(data.applicationStatus) && data.ndg
+                                /> : null}
+                            {APP_EVALUATION_FLOW_ID === '1'
                                 ? <Button
                                     type="button"
-                                    disabled={!data.id || evaluationShouldBeBlocked(data)}
+                                    disabled={!data.id || !['NDG'].includes(data.applicationStatus) || !data.ndg || evaluationShouldBeBlocked(data)}
                                     onClick={doCreateAppointment}
                                     label={__('Crea l\'appuntamento', 'gepafin')}
-                                /> : null}*/}
-                            <Button
-                                type="button"
-                                disabled={true}
-                                onClick={() => {
-                                }}
-                                label={__('Crea l\'appuntamento', 'gepafin')}
-                            />
-                            {/*{APP_EVALUATION_FLOW_ID === '1' && ['APPOINTMENT'].includes(data.applicationStatus)
+                                /> : null}
+                            {APP_EVALUATION_FLOW_ID === '1'
                                 ? <Button
                                     type="button"
-                                    disabled={!data.id || evaluationShouldBeBlocked(data)}
+                                    disabled={!data.id || !['APPOINTMENT'].includes(data.applicationStatus) || evaluationShouldBeBlocked(data)}
                                     onClick={doMakeAdmisible}
-                                    label={__('Ammissibile', 'gepafin')}
-                                /> : null}*/}
-                            <Button
-                                type="button"
-                                disabled={true}
-                                onClick={() => {
-                                }}
-                                label={__('Ammissibile', 'gepafin')}
-                            />
+                                    label={__('Ammissibile formalmente', 'gepafin')}
+                                /> : null}
                             {data.id
                                 ? <Button
                                     type="button"
-                                    disabled={!isAdmissible || ['APPROVED'].includes(data.applicationStatus) || evaluationShouldBeBlocked(data)}
-                                    /*disabled={!isAdmissible
-                                        || (APP_EVALUATION_FLOW_ID === '1' && !['ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus))}*/
+                                    disabled={!isAdmissible
+                                        || ['APPROVED'].includes(data.applicationStatus)
+                                        || evaluationShouldBeBlocked(data)
+                                        || (APP_EVALUATION_FLOW_ID === '1' && !['ADMISSIBLE'].includes(data.applicationStatus))
+                                    }
                                     onClick={initiateApproving}
-                                    label={__('Approva Domanda', 'gepafin')}
+                                    label={__('Domanda deliberata', 'gepafin')}
                                     icon="pi pi-check" iconPos="right"/> : null}
-                            {/*{data.id
-                                ? <Button
-                                    type="button"
-                                    disabled={APP_EVALUATION_FLOW_ID === '1' && !['ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)}
-                                    onClick={initiateRejecting}
-                                    label={__('Respingi Domanda', 'gepafin')}
-                                    icon="pi pi-times" iconPos="right"/> : null}*/}
                             {data.id
                                 ? <Button
                                     type="button"
@@ -862,7 +837,7 @@ const DomandaEditPreInstructor = () => {
                                         && !['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
                                         || evaluationShouldBeBlocked(data)}
                                     onClick={initiateRejecting}
-                                    label={__('Respingi Domanda', 'gepafin')}
+                                    label={__('Respingi domanda', 'gepafin')}
                                     icon="pi pi-times" iconPos="right"/> : null}
                         </div>
                     </div>
diff --git a/src/pages/SoccorsoEditBeneficiario/index.js b/src/pages/SoccorsoEditBeneficiario/index.js
index 4862266..97b2f06 100644
--- a/src/pages/SoccorsoEditBeneficiario/index.js
+++ b/src/pages/SoccorsoEditBeneficiario/index.js
@@ -325,7 +325,7 @@ const SoccorsoEditBeneficiario = () => {
 
                 {data.id
                     ? <div className="appPageSection">
-                        <h2>{__('Dettagli Richiesta', 'gepafin')}</h2>
+                        <h2>{__('Dettagli richiesta', 'gepafin')}</h2>
                         <h3>{__('Note e spiegazioni', 'gepafin')}</h3>
                         <div>{getEmailTemplateForSoccorso(data.emailTemplate, data.note)}</div>
                     </div> : null}
@@ -338,7 +338,7 @@ const SoccorsoEditBeneficiario = () => {
 
                 {data.id
                     ? <div className="appPageSection">
-                        <h3>{__('Documenti Richiesti', 'gepafin')}</h3>
+                        <h3>{__('Documenti richiesti', 'gepafin')}</h3>
                         <form className="appForm" onSubmit={handleSubmit(onSubmit)}>
                             {data.formFields
                                 ? data.formFields.map((o, i) => {
diff --git a/src/pages/SoccorsoEditPreInstructor/index.js b/src/pages/SoccorsoEditPreInstructor/index.js
index f10a68e..b925b77 100644
--- a/src/pages/SoccorsoEditPreInstructor/index.js
+++ b/src/pages/SoccorsoEditPreInstructor/index.js
@@ -164,7 +164,7 @@ const SoccorsoEditPreInstructor = () => {
     const updateAmendmentCallback = (data, doClose = false) => {
         if (data.status === 'SUCCESS') {
             setData(getFormattedData(data.data));
-            console.log('internalNote', internalNote)
+
             if (doClose) {
                 const submitData = {
                     internalNote
@@ -410,13 +410,13 @@ const SoccorsoEditPreInstructor = () => {
                 </div>
 
                 <div className="appPageSection">
-                    <h2>{__('Dettagli Richiesta', 'gepafin')}</h2>
+                    <h2>{__('Dettagli richiesta', 'gepafin')}</h2>
                     <h3>{__('Note e spiegazioni', 'gepafin')}</h3>
                     <div
                         className="appPageSection__emailTemplate">{getEmailTemplateForSoccorso(data.emailTemplate, data.note)}</div>
                 </div>
                 <div className="appPageSection">
-                    <h3>{__('Documenti Richiesti', 'gepafin')}</h3>
+                    <h3>{__('Documenti richiesti', 'gepafin')}</h3>
                     <ol className="appPageSection__list">
                         {data.formFields
                             ? data.formFields.map((o, i) => <li key={o.fieldId}
diff --git a/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js b/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
index 87cba6b..1d7224d 100644
--- a/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
+++ b/src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
@@ -152,7 +152,7 @@ const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
                 <Column field="companyName" header={__('Azienda Beneficiaria', 'gepafin')}
                         filter filterPlaceholder={__('Cerca', 'gepafin')}
                         style={{ minWidth: '8rem' }}/>
-                <Column header={__('Data Richiesta', 'gepafin')}
+                <Column header={__('Data richiesta', 'gepafin')}
                         filterField="startDate" dataType="date"
                         style={{ minWidth: '8rem' }}
                         body={dateStartBodyTemplate} filter filterElement={dateFilterTemplate}/>

From b345207aa4853f55e52167d7c20152d68e04eb7b Mon Sep 17 00:00:00 2001
From: Vitalii Kiiko <mr.psiho@gmail.com>
Date: Thu, 9 Jan 2025 12:16:05 +0100
Subject: [PATCH 2/2] - re-enabled uploading of delega on company profile page;

---
 src/pages/ProfileCompany/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/pages/ProfileCompany/index.js b/src/pages/ProfileCompany/index.js
index 5162575..f590086 100644
--- a/src/pages/ProfileCompany/index.js
+++ b/src/pages/ProfileCompany/index.js
@@ -559,7 +559,8 @@ const ProfileCompany = () => {
                         </div>
                     </div>
 
-                    {APP_HUB_ID === 'nonexisting' // hide it from all hub
+                    {APP_HUB_ID
+                    //=== 'nonexisting' // hide it from all hub
                         ? <div>
                             <Button
                                 disabled={isEmpty(delegaCodiceFiscale) || isEmpty(delegaFirstName) || isEmpty(delegaLastName)}
@@ -569,7 +570,8 @@ const ProfileCompany = () => {
                                 icon="pi pi-check" iconPos="right"/>
                         </div> : null}
 
-                    {APP_HUB_ID === 'nonexisting' // hide it from all hub
+                    {APP_HUB_ID
+                    //=== 'nonexisting' // hide it from all hub
                         ? <div className="appForm__field">
                             <label htmlFor="delega">
                                 {__('Carica documento Delega Firmato', 'gepafin')}