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

- updated version;

Browse Source
This commit is contained in:
Vitalii Kiiko
2024-09-05 17:15:57 +02:00
parent d2a28bea1b
commit 4054745695
33 changed files with 516 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/pages/BandoEdit/components/BandoEditFormStep1/index.js
View File

@@ -39,7 +39,6 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },
}, [formInitialData]), mode: 'onChange'
});
const values = getValues();
let minDateStart = new Date();
const onSubmit = (formData) => {
if (!isNil(formData.dates) && formData.dates.length) {
@@ -57,7 +56,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },
if (data.status === 'SUCCESS') {
const values = getValues();
if (!values.id && data.data.id) {
navigate(`/bandi/${data.data.id}`);
navigate(`/tenders/${data.data.id}`);
} else {
setFormInitialData(data.data);
reset();
@@ -70,11 +69,11 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },
}
const openPreview = () => {
navigate(`/bandi/${values.id}/preview`);
navigate(`/tenders/${values.id}/preview`);
}
const openPreviewEvaluation = () => {
navigate(`/bandi/${values.id}/preview-evaluation`);
navigate(`/tenders/${values.id}/preview-evaluation`);
}
const lookupdataCallback = (data) => {
@@ -125,6 +124,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },
}, [errors, isValid]);
useEffect(() => {
storeSet.main.formInitialData(initialData);
setFormInitialData(initialData);
}, [initialData]);
@@ -142,13 +142,16 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },
}
trigger().then(() => clearErrors());
//storeSet.main.setAsyncRequest();
LookupdataService.getItems(lookupdataCallback, errLookupdataCallback, [['type', ['AIMED_TO', 'FAQ']]])
LookupdataService.getItems(lookupdataCallback, errLookupdataCallback, [['type', ['AIMED_TO', 'FAQ']]]);
return () => {
storeSet.main.formInitialData({});
}
}, []);
return (
<form className="appForm" onSubmit={handleSubmit(onSubmit)}>
<UnsavedChangesDetector initialData={formInitialData} getValuesFn={getValues}/>
<UnsavedChangesDetector getValuesFn={getValues}/>
<FormField
type="switch"
fieldName="confidi"
@@ -236,7 +239,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },
errors={errors}
defaultValue={values['dates']}
config={{ required: __('È obbligatorio', 'gepafin') }}
minDate={minDateStart}
/*minDate={minDateStart}*/
/>
<div className="appForm__twoCols">

14
src/pages/BandoEdit/components/BandoEditFormStep2/index.js
View File

@@ -13,6 +13,7 @@ import BandoEditFormActions from '../BandoEditFormActions';
import UnsavedChangesDetector from '../../../../components/UnsavedChangesDetector';
import BandoService from '../../../../service/bando-service';
import LookupdataService from '../../../../service/lookupdata-service';
import { storeSet } from '../../../../store';
const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors }, ref) {
const navigate = useNavigate();
@@ -94,11 +95,11 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors },
}
const openPreview = () => {
navigate('/bandi/preview/11');
navigate('/tenders/preview/11');
}
const openPreviewEvaluation = () => {
navigate('/bandi/preview-evaluation/11');
navigate('/tenders/preview-evaluation/11');
}
useImperativeHandle(
@@ -118,6 +119,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors },
}, [errors, isValid]);
useEffect(() => {
storeSet.main.formInitialData(initialData);
setFormInitialData(initialData);
}, [initialData]);
@@ -131,12 +133,16 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors },
useEffect(() => {
trigger().then(() => clearErrors());
LookupdataService.getItems(lookupdataCallback, errLookupdataCallback, [['type', ['CHECKLIST', 'EVALUATION_CRITERIA']]])
LookupdataService.getItems(lookupdataCallback, errLookupdataCallback, [['type', ['CHECKLIST', 'EVALUATION_CRITERIA']]]);
return () => {
storeSet.main.formInitialData({});
}
}, []);
return (
<form className="appForm" onSubmit={handleSubmit(onSubmit)}>
<UnsavedChangesDetector initialData={initialData} getValuesFn={getValues}/>
<UnsavedChangesDetector getValuesFn={getValues}/>
<FormFieldRepeaterCriteria
data={values}
setDataFn={setValue}

16
src/pages/BandoEdit/index.js
View File

@@ -52,7 +52,7 @@ const BandoEdit = () => {
bandoMsgs.current.show([
{
id: '98',
sticky: true, severity: 'error', summary: 'Error',
sticky: true, severity: 'error', summary: '',
detail: __('Potrai andare su altro step dopo risolvere errori della forma', 'gepafin'),
closable: true
}
@@ -77,7 +77,7 @@ const BandoEdit = () => {
bandoMsgs.current.show([
{
id: '98',
sticky: true, severity: 'error', summary: 'Error',
sticky: true, severity: 'error', summary: '',
detail: __('Potrai andare su altro step dopo risolvere errori della forma', 'gepafin'),
closable: true
}
@@ -92,11 +92,11 @@ const BandoEdit = () => {
}
const openBandoFormManagement = () => {
navigate(`/bandi/${id}/forms`);
navigate(`/tenders/${id}/forms`);
}
const openBandoFlowManagement = () => {
navigate(`/bandi/${id}/flow`);
navigate(`/tenders/${id}/flow`);
}
const validateBando = () => {
@@ -162,7 +162,7 @@ const BandoEdit = () => {
bandoMsgs.current.show([
{
id: '1',
sticky: true, severity: 'info', summary: 'Info',
sticky: true, severity: 'info', summary: '',
detail: __('Potrai pubblicare il tuo Bando.', 'gepafin'),
closable: false
}
@@ -173,7 +173,7 @@ const BandoEdit = () => {
bandoMsgs.current.show([
{
id: '1',
sticky: true, severity: 'info', summary: 'Info',
sticky: true, severity: 'info', summary: '',
detail: __('Potrai pubblicare il tuo Bando solo dopo aver completato tutti i campi obbligatori contrassegnati dagli asterischi.', 'gepafin'),
closable: false
}
@@ -195,7 +195,7 @@ const BandoEdit = () => {
if (bandoMsgs.current && data.message) {
bandoMsgs.current.show([
{
sticky: true, severity: 'error', summary: 'Error',
sticky: true, severity: 'error', summary: '',
detail: data.message,
closable: true
}
@@ -230,7 +230,7 @@ const BandoEdit = () => {
bandoMsgs.current.show([
{
id: '1',
sticky: true, severity: 'info', summary: 'Info',
sticky: true, severity: 'info', summary: '',
detail: __('Potrai pubblicare il tuo Bando solo dopo aver completato tutti i campi obbligatori contrassegnati dagli asterischi.', 'gepafin'),
closable: false
}