BFLOWS/bflows-bandi-fe
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/46-forms-flow-preview

Browse Source
This commit is contained in:
Vitalii Kiiko
2025-01-09 12:53:27 +01:00
parent 92aed03003 b345207aa4
commit 66178f3d9a
8 changed files with 40 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/BandoView/index.js
View File

@@ -156,7 +156,7 @@ const BandoView = () => {
</div> </div>
<div className="appPageSection__withBorder"> <div className="appPageSection__withBorder">
<h2>{__('Documentazione Richiesta', 'gepafin')}</h2> <h2>{__('Documentazione richiesta', 'gepafin')}</h2>
<div className="ql-editor"> <div className="ql-editor">
{renderHtmlContent(data.documentationRequested)} {renderHtmlContent(data.documentationRequested)}
</div> </div>

2
src/pages/BandoViewBeneficiario/index.js
View File

@@ -408,7 +408,7 @@ const BandoViewBeneficiario = () => {
</div> </div>
<div className="appPageSection__withBorder"> <div className="appPageSection__withBorder">
<h2>{__('Documentazione Richiesta', 'gepafin')}</h2> <h2>{__('Documentazione richiesta', 'gepafin')}</h2>
<div className="ql-editor"> <div className="ql-editor">
{renderHtmlContent(data.documentationRequested)} {renderHtmlContent(data.documentationRequested)}
</div> </div>

12
src/pages/DomandaEditInstructorManager/index.js
View File

@@ -743,10 +743,10 @@ const DomandaEditPreInstructor = () => {
<td> <td>
{isAdmissible {isAdmissible
? <Tag icon="pi pi-check" severity="success" ? <Tag icon="pi pi-check" severity="success"
value={__('Ammissibile')}></Tag> : null} value={__('Ammissibile formalmente')}></Tag> : null}
{!isAdmissible {!isAdmissible
? <Tag icon="pi pi-times" severity="warning" ? <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> </td>
</tr> </tr>
</tbody> </tbody>
@@ -775,8 +775,8 @@ const DomandaEditPreInstructor = () => {
outlined outlined
label={<> label={<>
{data.applicationStatus === 'EVALUATION' {data.applicationStatus === 'EVALUATION'
? __('Richiedi Soccorso Istruttorio', 'gepafin') ? __('Richiedi soccorso istruttorio', 'gepafin')
: __('Apri Soccorso Istruttorio', 'gepafin')} : __('Apri soccorso istruttorio', 'gepafin')}
<i style={{ marginLeft: 7 }}> <i style={{ marginLeft: 7 }}>
<HelpIcon/> <HelpIcon/>
</i> </i>
@@ -832,7 +832,7 @@ const DomandaEditPreInstructor = () => {
type="button" type="button"
disabled={true} disabled={true}
onClick={() => {}} onClick={() => {}}
label={__('Ammissibile', 'gepafin')} label={__('Ammissibile formalmente', 'gepafin')}
/> />
{data.id {data.id
? <Button ? <Button
@@ -841,7 +841,7 @@ const DomandaEditPreInstructor = () => {
/*disabled={!isAdmissible /*disabled={!isAdmissible
|| (APP_EVALUATION_FLOW_ID === '1' && !['ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus))}*/ || (APP_EVALUATION_FLOW_ID === '1' && !['ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus))}*/
onClick={initiateApproving} onClick={initiateApproving}
label={__('Approva Domanda', 'gepafin')} label={__('Domanda deliberata', 'gepafin')}
icon="pi pi-check" iconPos="right"/> : null} icon="pi pi-check" iconPos="right"/> : null}
{/*{data.id {/*{data.id
? <Button ? <Button

69
src/pages/DomandaEditPreInstructor/index.js
View File

@@ -745,10 +745,10 @@ const DomandaEditPreInstructor = () => {
<td> <td>
{isAdmissible {isAdmissible
? <Tag icon="pi pi-check" severity="success" ? <Tag icon="pi pi-check" severity="success"
value={__('Ammissibile')}></Tag> : null} value={__('Ammissibile formalmente')}></Tag> : null}
{!isAdmissible {!isAdmissible
? <Tag icon="pi pi-times" severity="warning" ? <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> </td>
</tr> </tr>
</tbody> </tbody>
@@ -777,8 +777,8 @@ const DomandaEditPreInstructor = () => {
outlined outlined
label={<> label={<>
{data.applicationStatus === 'EVALUATION' {data.applicationStatus === 'EVALUATION'
? __('Richiedi Soccorso Istruttorio', 'gepafin') ? __('Richiedi soccorso istruttorio', 'gepafin')
: __('Apri Soccorso Istruttorio', 'gepafin')} : __('Apri soccorso istruttorio', 'gepafin')}
<i style={{ marginLeft: 7 }}> <i style={{ marginLeft: 7 }}>
<HelpIcon/> <HelpIcon/>
</i> </i>
@@ -797,64 +797,39 @@ const DomandaEditPreInstructor = () => {
onClick={() => doSaveDraft()} onClick={() => doSaveDraft()}
label={__('Crea valutazione', 'gepafin')} label={__('Crea valutazione', 'gepafin')}
icon="pi pi-save" iconPos="right"/>} 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 ? <Button
type="button" type="button"
disabled={!data.id || !allFilesRated || !allChecksChecked || evaluationShouldBeBlocked(data)} disabled={!data.id || !allFilesRated || !allChecksChecked
|| !['EVALUATION'].includes(data.applicationStatus) || evaluationShouldBeBlocked(data)}
onClick={doCheckNDG} onClick={doCheckNDG}
label={__('Controlla NDG', 'gepafin')} label={__('Controlla NDG', 'gepafin')}
/> : null}*/} /> : null}
<Button {APP_EVALUATION_FLOW_ID === '1'
type="button"
disabled={true}
onClick={() => {
}}
label={__('Controlla NDG', 'gepafin')}
/>
{/*{APP_EVALUATION_FLOW_ID === '1' && ['NDG'].includes(data.applicationStatus) && data.ndg
? <Button ? <Button
type="button" type="button"
disabled={!data.id || evaluationShouldBeBlocked(data)} disabled={!data.id || !['NDG'].includes(data.applicationStatus) || !data.ndg || evaluationShouldBeBlocked(data)}
onClick={doCreateAppointment} onClick={doCreateAppointment}
label={__('Crea l\'appuntamento', 'gepafin')} label={__('Crea l\'appuntamento', 'gepafin')}
/> : null}*/} /> : null}
<Button {APP_EVALUATION_FLOW_ID === '1'
type="button"
disabled={true}
onClick={() => {
}}
label={__('Crea l\'appuntamento', 'gepafin')}
/>
{/*{APP_EVALUATION_FLOW_ID === '1' && ['APPOINTMENT'].includes(data.applicationStatus)
? <Button ? <Button
type="button" type="button"
disabled={!data.id || evaluationShouldBeBlocked(data)} disabled={!data.id || !['APPOINTMENT'].includes(data.applicationStatus) || evaluationShouldBeBlocked(data)}
onClick={doMakeAdmisible} onClick={doMakeAdmisible}
label={__('Ammissibile', 'gepafin')} label={__('Ammissibile formalmente', 'gepafin')}
/> : null}*/} /> : null}
<Button
type="button"
disabled={true}
onClick={() => {
}}
label={__('Ammissibile', 'gepafin')}
/>
{data.id {data.id
? <Button ? <Button
type="button" type="button"
disabled={!isAdmissible || ['APPROVED'].includes(data.applicationStatus) || evaluationShouldBeBlocked(data)} disabled={!isAdmissible
/*disabled={!isAdmissible || ['APPROVED'].includes(data.applicationStatus)
|| (APP_EVALUATION_FLOW_ID === '1' && !['ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus))}*/ || evaluationShouldBeBlocked(data)
|| (APP_EVALUATION_FLOW_ID === '1' && !['ADMISSIBLE'].includes(data.applicationStatus))
}
onClick={initiateApproving} onClick={initiateApproving}
label={__('Approva Domanda', 'gepafin')} label={__('Domanda deliberata', 'gepafin')}
icon="pi pi-check" iconPos="right"/> : null} 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 {data.id
? <Button ? <Button
type="button" type="button"
@@ -862,7 +837,7 @@ const DomandaEditPreInstructor = () => {
&& !['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus) && !['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
|| evaluationShouldBeBlocked(data)} || evaluationShouldBeBlocked(data)}
onClick={initiateRejecting} onClick={initiateRejecting}
label={__('Respingi Domanda', 'gepafin')} label={__('Respingi domanda', 'gepafin')}
icon="pi pi-times" iconPos="right"/> : null} icon="pi pi-times" iconPos="right"/> : null}
</div> </div>
</div> </div>

6
src/pages/ProfileCompany/index.js
View File

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

4
src/pages/SoccorsoEditBeneficiario/index.js
View File

@@ -325,7 +325,7 @@ const SoccorsoEditBeneficiario = () => {
{data.id {data.id
? <div className="appPageSection"> ? <div className="appPageSection">
<h2>{__('Dettagli Richiesta', 'gepafin')}</h2> <h2>{__('Dettagli richiesta', 'gepafin')}</h2>
<h3>{__('Note e spiegazioni', 'gepafin')}</h3> <h3>{__('Note e spiegazioni', 'gepafin')}</h3>
<div>{getEmailTemplateForSoccorso(data.emailTemplate, data.note)}</div> <div>{getEmailTemplateForSoccorso(data.emailTemplate, data.note)}</div>
</div> : null} </div> : null}
@@ -338,7 +338,7 @@ const SoccorsoEditBeneficiario = () => {
{data.id {data.id
? <div className="appPageSection"> ? <div className="appPageSection">
<h3>{__('Documenti Richiesti', 'gepafin')}</h3> <h3>{__('Documenti richiesti', 'gepafin')}</h3>
<form className="appForm" onSubmit={handleSubmit(onSubmit)}> <form className="appForm" onSubmit={handleSubmit(onSubmit)}>
{data.formFields {data.formFields
? data.formFields.map((o, i) => { ? data.formFields.map((o, i) => {

6
src/pages/SoccorsoEditPreInstructor/index.js
View File

@@ -164,7 +164,7 @@ const SoccorsoEditPreInstructor = () => {
const updateAmendmentCallback = (data, doClose = false) => { const updateAmendmentCallback = (data, doClose = false) => {
if (data.status === 'SUCCESS') { if (data.status === 'SUCCESS') {
setData(getFormattedData(data.data)); setData(getFormattedData(data.data));
console.log('internalNote', internalNote)
if (doClose) { if (doClose) {
const submitData = { const submitData = {
internalNote internalNote
@@ -410,13 +410,13 @@ const SoccorsoEditPreInstructor = () => {
</div> </div>
<div className="appPageSection"> <div className="appPageSection">
<h2>{__('Dettagli Richiesta', 'gepafin')}</h2> <h2>{__('Dettagli richiesta', 'gepafin')}</h2>
<h3>{__('Note e spiegazioni', 'gepafin')}</h3> <h3>{__('Note e spiegazioni', 'gepafin')}</h3>
<div <div
className="appPageSection__emailTemplate">{getEmailTemplateForSoccorso(data.emailTemplate, data.note)}</div> className="appPageSection__emailTemplate">{getEmailTemplateForSoccorso(data.emailTemplate, data.note)}</div>
</div> </div>
<div className="appPageSection"> <div className="appPageSection">
<h3>{__('Documenti Richiesti', 'gepafin')}</h3> <h3>{__('Documenti richiesti', 'gepafin')}</h3>
<ol className="appPageSection__list"> <ol className="appPageSection__list">
{data.formFields {data.formFields
? data.formFields.map((o, i) => <li key={o.fieldId} ? data.formFields.map((o, i) => <li key={o.fieldId}

2
src/pages/SoccorsoIstruttorioPreInstructor/components/PreInstructorSoccorsiTable/index.js
View File

@@ -152,7 +152,7 @@ const PreInstructorSoccorsiTable = ({ openDialogFn }) => {
<Column field="companyName" header={__('Azienda Beneficiaria', 'gepafin')} <Column field="companyName" header={__('Azienda Beneficiaria', 'gepafin')}
filter filterPlaceholder={__('Cerca', 'gepafin')} filter filterPlaceholder={__('Cerca', 'gepafin')}
style={{ minWidth: '8rem' }}/> style={{ minWidth: '8rem' }}/>
<Column header={__('Data Richiesta', 'gepafin')} <Column header={__('Data richiesta', 'gepafin')}
filterField="startDate" dataType="date" filterField="startDate" dataType="date"
style={{ minWidth: '8rem' }} style={{ minWidth: '8rem' }}
body={dateStartBodyTemplate} filter filterElement={dateFilterTemplate}/> body={dateStartBodyTemplate} filter filterElement={dateFilterTemplate}/>