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

Merge branch 'develop' into feature/93-user-details-page

Browse Source
This commit is contained in:
Vitalii Kiiko
2025-01-15 16:30:24 +01:00
parent f4aef02941 9bb47792d2
commit 3dfd7e7cc4
3 changed files with 31 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/pages/DashboardPreInstructor/components/PreInstructorDomandeTable/index.js
View File

@@ -25,6 +25,8 @@ import { Tag } from 'primereact/tag';
import translationStrings from '../../../../translationStringsForComponents'; import translationStrings from '../../../../translationStringsForComponents';
const APP_HUB_ID = process.env.REACT_APP_HUB_ID;
const PreInstructorDomandeTable = () => { const PreInstructorDomandeTable = () => {
const userData = useStore().main.userData(); const userData = useStore().main.userData();
const [items, setItems] = useState(null); const [items, setItems] = useState(null);
@@ -147,12 +149,14 @@ const PreInstructorDomandeTable = () => {
<Column field="protocolNumber" header={__('Protocollo', 'gepafin')} <Column field="protocolNumber" header={__('Protocollo', 'gepafin')}
sortable filterPlaceholder={__('Cerca', 'gepafin')} sortable filterPlaceholder={__('Cerca', 'gepafin')}
style={{ minWidth: '6rem' }}/> style={{ minWidth: '6rem' }}/>
<Column field="ndg" header={__('NDG', 'gepafin')} {APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
? <Column field="ndg" header={__('NDG', 'gepafin')}
sortable filterPlaceholder={__('Cerca', 'gepafin')} sortable filterPlaceholder={__('Cerca', 'gepafin')}
style={{ minWidth: '6rem' }}/> style={{ minWidth: '6rem' }}/> : null}
<Column field="appointmentId" header={__('ID appuntamento', 'gepafin')} {APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
? <Column field="appointmentId" header={__('ID appuntamento', 'gepafin')}
sortable filterPlaceholder={__('Cerca', 'gepafin')} sortable filterPlaceholder={__('Cerca', 'gepafin')}
style={{ minWidth: '6rem' }}/> style={{ minWidth: '6rem' }}/> : null}
<Column field="callName" header={__('Bando', 'gepafin')} <Column field="callName" header={__('Bando', 'gepafin')}
filter sortable filter sortable
filterPlaceholder={__('Cerca', 'gepafin')} filterPlaceholder={__('Cerca', 'gepafin')}

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

@@ -39,6 +39,7 @@ import RepeaterFields from '../DomandaEditPreInstructor/components/RepeaterField
import getDateTimeFromISOstring from '../../helpers/getDateTimeFromISOstring'; import getDateTimeFromISOstring from '../../helpers/getDateTimeFromISOstring';
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 APP_HUB_ID = process.env.REACT_APP_HUB_ID;
const DomandaEditPreInstructor = () => { const DomandaEditPreInstructor = () => {
const isAsyncRequest = useStore().main.isAsyncRequest(); const isAsyncRequest = useStore().main.isAsyncRequest();
@@ -561,14 +562,16 @@ const DomandaEditPreInstructor = () => {
<span>{__('Protocollo', 'gepafin')}</span> <span>{__('Protocollo', 'gepafin')}</span>
<span>{data.protocolNumber}</span> <span>{data.protocolNumber}</span>
</p> </p>
<p className="appPageSection__pMeta"> {APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
? <p className="appPageSection__pMeta">
<span>{__('NDG', 'gepafin')}</span> <span>{__('NDG', 'gepafin')}</span>
<span>{data.ndg}</span> <span>{data.ndg}</span>
</p> </p> : null}
<p className="appPageSection__pMeta"> {APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
? <p className="appPageSection__pMeta">
<span>{__('Appuntamento', 'gepafin')}</span> <span>{__('Appuntamento', 'gepafin')}</span>
<span>{data.appointmentId}</span> <span>{data.appointmentId}</span>
</p> </p> : null}
<p className="appPageSection__pMeta"> <p className="appPageSection__pMeta">
<span>{__('Bando', 'gepafin')}</span> <span>{__('Bando', 'gepafin')}</span>
<span>{data.callName}</span> <span>{data.callName}</span>
@@ -799,6 +802,7 @@ const DomandaEditPreInstructor = () => {
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)
&& APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
? <Button ? <Button
type="button" type="button"
disabled={!data.id || !allFilesRated || !allChecksChecked disabled={!data.id || !allFilesRated || !allChecksChecked
@@ -806,7 +810,7 @@ const DomandaEditPreInstructor = () => {
onClick={doCheckNDG} onClick={doCheckNDG}
label={__('Controlla NDG', 'gepafin')} label={__('Controlla NDG', 'gepafin')}
/> : null} /> : null}
{APP_EVALUATION_FLOW_ID === '1' {APP_EVALUATION_FLOW_ID === '1' && APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
? <Button ? <Button
type="button" type="button"
disabled={!data.id || !['NDG'].includes(data.applicationStatus) || !data.ndg || evaluationShouldBeBlocked(data)} disabled={!data.id || !['NDG'].includes(data.applicationStatus) || !data.ndg || evaluationShouldBeBlocked(data)}

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

@@ -40,6 +40,7 @@ import RepeaterFields from './components/RepeaterFields';
import getDateTimeFromISOstring from '../../helpers/getDateTimeFromISOstring'; import getDateTimeFromISOstring from '../../helpers/getDateTimeFromISOstring';
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 APP_HUB_ID = process.env.REACT_APP_HUB_ID;
const DomandaEditPreInstructor = () => { const DomandaEditPreInstructor = () => {
const isAsyncRequest = useStore().main.isAsyncRequest(); const isAsyncRequest = useStore().main.isAsyncRequest();
@@ -563,14 +564,16 @@ const DomandaEditPreInstructor = () => {
<span>{__('Protocollo', 'gepafin')}</span> <span>{__('Protocollo', 'gepafin')}</span>
<span>{data.protocolNumber}</span> <span>{data.protocolNumber}</span>
</p> </p>
<p className="appPageSection__pMeta"> {APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
<span>{__('NDG', 'gepafin')}</span> ? <p className="appPageSection__pMeta">
<span>{data.ndg}</span> <span>{__('NDG', 'gepafin')}</span>
</p> <span>{data.ndg}</span>
<p className="appPageSection__pMeta"> </p> : null}
<span>{__('Appuntamento', 'gepafin')}</span> {APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
<span>{data.appointmentId}</span> ? <p className="appPageSection__pMeta">
</p> <span>{__('Appuntamento', 'gepafin')}</span>
<span>{data.appointmentId}</span>
</p> : null}
<p className="appPageSection__pMeta"> <p className="appPageSection__pMeta">
<span>{__('Bando', 'gepafin')}</span> <span>{__('Bando', 'gepafin')}</span>
<span>{data.callName}</span> <span>{data.callName}</span>
@@ -801,6 +804,7 @@ const DomandaEditPreInstructor = () => {
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)
&& APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
? <Button ? <Button
type="button" type="button"
disabled={!data.id || !allFilesRated || !allChecksChecked disabled={!data.id || !allFilesRated || !allChecksChecked
@@ -808,7 +812,7 @@ const DomandaEditPreInstructor = () => {
onClick={doCheckNDG} onClick={doCheckNDG}
label={__('Controlla NDG', 'gepafin')} label={__('Controlla NDG', 'gepafin')}
/> : null} /> : null}
{APP_EVALUATION_FLOW_ID === '1' {APP_EVALUATION_FLOW_ID === '1' && APP_HUB_ID !== 't7jh5wfg9QXylNaTZkPoE'
? <Button ? <Button
type="button" type="button"
disabled={!data.id || !['NDG'].includes(data.applicationStatus) || !data.ndg || evaluationShouldBeBlocked(data)} disabled={!data.id || !['NDG'].includes(data.applicationStatus) || !data.ndg || evaluationShouldBeBlocked(data)}
@@ -838,7 +842,7 @@ const DomandaEditPreInstructor = () => {
type="button" type="button"
disabled={APP_EVALUATION_FLOW_ID === '1' disabled={APP_EVALUATION_FLOW_ID === '1'
&& (!['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}