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-10 10:46:34 +01:00
parent 40e84c7d02 588f1132d1
commit a418548e45
3 changed files with 44 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/helpers/getDateTimeFromISOstring.js Normal file
View File

@@ -0,0 +1,10 @@
const getDateTimeFromISOstring = (
value,
options = {
day: '2-digit', month: '2-digit', year: 'numeric', hour12: false,
hour: 'numeric', minute: 'numeric', second: 'numeric',
}) => {
return value ? Intl.DateTimeFormat('it-IT', options).format(new Date(value)) : value;
}
export default getDateTimeFromISOstring;

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

@@ -36,6 +36,7 @@ import DownloadCompanyDelegation from '../DomandaEditPreInstructor/components/Do
import DownloadSignedApplication from '../DomandaEditPreInstructor/components/DownloadSignedApplication';
import ListOfFiles from '../DomandaEditPreInstructor/components/ListOfFiles';
import RepeaterFields from '../DomandaEditPreInstructor/components/RepeaterFields';
import getDateTimeFromISOstring from '../../helpers/getDateTimeFromISOstring';
const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
@@ -225,6 +226,7 @@ const DomandaEditPreInstructor = () => {
motivation
}
setLoading(true);
setIsVisibleCompleteDialog(false);
ApplicationEvaluationService.updateEvaluation(data.assignedApplicationId, formData, updateStatusCallback, errUpdateStatusCallback);
}
@@ -239,6 +241,7 @@ const DomandaEditPreInstructor = () => {
motivation
}
setLoading(true);
setIsVisibleCompleteDialog(false);
ApplicationEvaluationService.updateEvaluation(data.assignedApplicationId, formData, updateStatusCallback, errUpdateStatusCallback);
}
@@ -254,7 +257,7 @@ const DomandaEditPreInstructor = () => {
});
}
}
storeSet.main.unsetAsyncRequest();
setLoading(false);
}
const errUpdateStatusCallback = (data) => {
@@ -266,7 +269,7 @@ const DomandaEditPreInstructor = () => {
});
}
set404FromErrorResponse(data);
storeSet.main.unsetAsyncRequest();
setLoading(false);
}
const displayCriterionData = (id) => {
@@ -580,11 +583,11 @@ const DomandaEditPreInstructor = () => {
</p>
<p className="appPageSection__pMeta">
<span>{__('Data ricezione', 'gepafin')}</span>
<span>{getDateFromISOstring(data.submissionDate)}</span>
<span>{getDateTimeFromISOstring(data.submissionDate)}</span>
</p>
<p className="appPageSection__pMeta">
<span>{__('Data assegnazione', 'gepafin')}</span>
<span>{getDateFromISOstring(data.assignedAt)}</span>
<span>{getDateTimeFromISOstring(data.assignedAt)}</span>
</p>
<p className="appPageSection__pMeta">
<span>{__('Scadenza Valutazione', 'gepafin')}</span>
@@ -795,67 +798,45 @@ 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 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={__('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"
disabled={APP_EVALUATION_FLOW_ID === '1'
&& !['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
|| evaluationShouldBeBlocked(data)}
&& (!['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
|| evaluationShouldBeBlocked(data))}
onClick={initiateRejecting}
label={__('Respingi Domanda', 'gepafin')}
icon="pi pi-times" iconPos="right"/> : null}

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

@@ -37,6 +37,7 @@ import DownloadCompanyDelegation from './components/DownloadCompanyDelegation';
import DownloadSignedApplication from './components/DownloadSignedApplication';
import ListOfFiles from './components/ListOfFiles';
import RepeaterFields from './components/RepeaterFields';
import getDateTimeFromISOstring from '../../helpers/getDateTimeFromISOstring';
const APP_EVALUATION_FLOW_ID = process.env.REACT_APP_EVALUATION_FLOW_ID;
@@ -226,6 +227,7 @@ const DomandaEditPreInstructor = () => {
motivation
}
setLoading(true);
setIsVisibleCompleteDialog(false);
ApplicationEvaluationService.updateEvaluation(data.assignedApplicationId, formData, updateStatusCallback, errUpdateStatusCallback);
}
@@ -240,6 +242,7 @@ const DomandaEditPreInstructor = () => {
motivation
}
setLoading(true);
setIsVisibleCompleteDialog(false);
ApplicationEvaluationService.updateEvaluation(data.assignedApplicationId, formData, updateStatusCallback, errUpdateStatusCallback);
}
@@ -255,7 +258,7 @@ const DomandaEditPreInstructor = () => {
});
}
}
storeSet.main.unsetAsyncRequest();
setLoading(false);
}
const errUpdateStatusCallback = (data) => {
@@ -267,7 +270,7 @@ const DomandaEditPreInstructor = () => {
});
}
set404FromErrorResponse(data);
storeSet.main.unsetAsyncRequest();
setLoading(false);
}
const displayCriterionData = (id) => {
@@ -582,11 +585,11 @@ const DomandaEditPreInstructor = () => {
</p>
<p className="appPageSection__pMeta">
<span>{__('Data ricezione', 'gepafin')}</span>
<span>{getDateFromISOstring(data.submissionDate)}</span>
<span>{getDateTimeFromISOstring(data.submissionDate)}</span>
</p>
<p className="appPageSection__pMeta">
<span>{__('Data assegnazione', 'gepafin')}</span>
<span>{getDateFromISOstring(data.assignedAt)}</span>
<span>{getDateTimeFromISOstring(data.assignedAt)}</span>
</p>
<p className="appPageSection__pMeta">
<span>{__('Scadenza Valutazione', 'gepafin')}</span>
@@ -834,8 +837,8 @@ const DomandaEditPreInstructor = () => {
? <Button
type="button"
disabled={APP_EVALUATION_FLOW_ID === '1'
&& !['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
|| evaluationShouldBeBlocked(data)}
&& (!['EVALUATION', 'ADMISSIBLE', 'APPOINTMENT'].includes(data.applicationStatus)
|| evaluationShouldBeBlocked(data))}
onClick={initiateRejecting}
label={__('Respingi domanda', 'gepafin')}
icon="pi pi-times" iconPos="right"/> : null}