- saving progress;

This commit is contained in:
Vitalii Kiiko
2024-09-02 17:15:43 +02:00
parent d634e425e5
commit c15360faf0
41 changed files with 1531 additions and 356 deletions

View File

@@ -1,10 +1,11 @@
import React from 'react';
import { __ } from '@wordpress/i18n';
import { isNil } from 'ramda';
// components
import { Button } from 'primereact/button';
const BandoEditFormActions = ({ openPreview, openPreviewEvaluation }) => {
const BandoEditFormActions = ({ id, openPreview, openPreviewEvaluation }) => {
return (
<div className="appPageSection">
<div className="appPageSection__actions">
@@ -13,7 +14,7 @@ const BandoEditFormActions = ({ openPreview, openPreviewEvaluation }) => {
label={__('Salva bozza', 'gepafin')} icon="pi pi-save" iconPos="right"/>
<Button
type="button"
disabled={false}
disabled={isNil(id)}
outlined
onClick={openPreview}
label={__('Anteprima beneficiario', 'gepafin')} icon="pi pi-eye" iconPos="right"/>

View File

@@ -1,4 +1,4 @@
import React, { forwardRef, useImperativeHandle, useEffect } from 'react';
import React, { forwardRef, useImperativeHandle, useEffect, useState, useMemo } from 'react';
import { __ } from '@wordpress/i18n';
import { useNavigate } from 'react-router-dom';
import { useForm } from 'react-hook-form';
@@ -10,9 +10,16 @@ import FormFieldRepeater from '../../../../components/FormFieldRepeater';
import FormFieldRepeaterFaq from '../../../../components/FormFieldRepeaterFaq';
import BandoEditFormActions from '../BandoEditFormActions';
import UnsavedChangesDetector from '../../../../components/UnsavedChangesDetector';
import BandoService from '../../../../service/bando-service';
import LookupdataService from '../../../../service/lookupdata-service';
import { storeSet, useStore } from '../../../../store';
const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors }, ref) {
const navigate = useNavigate();
const isAsyncRequest = useStore().main.isAsyncRequest();
const [aimedToOptions, setAimedToOptions] = useState([]);
const [faqOptions, setFaqOptions] = useState([]);
const [formInitialData, setFormInitialData] = useState(initialData);
const {
control,
handleSubmit,
@@ -21,8 +28,13 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },
register,
trigger,
getValues,
clearErrors
} = useForm({defaultValues: initialData, mode: 'onChange'});
clearErrors,
reset
} = useForm({
defaultValues: useMemo(() => {
return formInitialData;
}, [formInitialData]), mode: 'onChange'
});
const values = getValues();
let minDateStart = new Date();
@@ -30,22 +42,67 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },
if (!isNil(formData.dates) && formData.dates.length) {
formData.dates = formData.dates.map(v => is(String, v) ? v : v.toISOString());
}
console.log('onSubmit', formData);
if (!formData.id) {
BandoService.createBando(formData, createCallback, errCreateCallback);
} else {
BandoService.updateBandoStep1(formData.id, formData, createCallback, errCreateCallback);
}
};
// TODO temp data
const exampleOfAimedToOptions = [{ id: 11, value: 'PMI con sede in Umbria' }];
const exampleOfFaqOptions = [
{ id: 2, question: 'Question 1?', answer: 'Lorem ipsum dolor', visible: true }
];
// end of temp data
const createCallback = (data) => {
if (data.status === 'SUCCESS') {
const values = getValues();
if (!values.id && data.data.id) {
navigate(`/bandi/${data.data.id}`);
} else {
setFormInitialData(data.data);
reset();
}
}
}
const errCreateCallback = (data) => {
console.log('errCreateCallback', data);
}
const openPreview = () => {
navigate('/bandi/11/preview');
navigate(`/bandi/${values.id}/preview`);
}
const openPreviewEvaluation = () => {
navigate('/bandi/11/preview-evaluation');
navigate(`/bandi/${values.id}/preview-evaluation`);
}
const lookupdataCallback = (data) => {
if (data.status === 'SUCCESS') {
const aimedTo = data.data
.filter(o => o.type === 'AIMED_TO')
.map(o => {
delete o.type;
return {
...o,
lookUpDataId: o.id
};
});
setAimedToOptions(aimedTo);
const faqItems = data.data
.filter(o => o.type === 'FAQ')
.map(o => {
delete o.type;
return {
...o,
lookUpDataId: o.id
};
});
setFaqOptions(faqItems);
}
storeSet.main.unsetAsyncRequest();
}
const errLookupdataCallback = (data) => {
console.log('errLookupdataCallback', data);
storeSet.main.unsetAsyncRequest();
}
useImperativeHandle(
@@ -65,12 +122,26 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },
}, [errors, isValid]);
useEffect(() => {
setFormInitialData(initialData);
}, [initialData]);
useEffect(() => {
reset(formInitialData);
}, [formInitialData]);
useEffect(() => {
if (isAsyncRequest !== 0) {
return;
}
trigger().then(() => clearErrors());
//storeSet.main.setAsyncRequest();
LookupdataService.getItems(lookupdataCallback, errLookupdataCallback, [['type', ['AIMED_TO', 'FAQ']]])
}, []);
return (
<form className="appForm" onSubmit={handleSubmit(onSubmit)}>
<UnsavedChangesDetector initialData={values} getValuesFn={getValues}/>
<UnsavedChangesDetector initialData={formInitialData} getValuesFn={getValues}/>
<FormField
type="switch"
fieldName="confidi"
@@ -123,7 +194,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },
data={values}
setDataFn={setValue}
fieldName="aimedTo"
options={exampleOfAimedToOptions}
options={aimedToOptions}
errors={errors}
register={register}
trigger={trigger}
@@ -191,7 +262,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },
data={values}
setDataFn={setValue}
fieldName="faq"
options={exampleOfFaqOptions}
options={faqOptions}
errors={errors}
register={register}
trigger={trigger}
@@ -210,6 +281,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors },
</div>
<BandoEditFormActions
id={values.id}
openPreview={openPreview}
openPreviewEvaluation={openPreviewEvaluation}/>
</form>

View File

@@ -1,4 +1,4 @@
import React, { forwardRef, useEffect, useImperativeHandle } from 'react';
import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useState } from 'react';
import { __ } from '@wordpress/i18n';
import { useNavigate } from 'react-router-dom';
import { useForm } from 'react-hook-form';
@@ -10,9 +10,14 @@ import FormFieldRepeater from '../../../../components/FormFieldRepeater';
import FormFieldRepeaterCriteria from '../../../../components/FormFieldRepeaterCriteria';
import BandoEditFormActions from '../BandoEditFormActions';
import UnsavedChangesDetector from '../../../../components/UnsavedChangesDetector';
import BandoService from '../../../../service/bando-service';
import LookupdataService from '../../../../service/lookupdata-service';
const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors }, ref) {
const navigate = useNavigate();
const [criteriaOptions, setCriteriaOptions] = useState([]);
const [checklistOptions, setChecklistOptions] = useState([]);
const [formInitialData, setFormInitialData] = useState(initialData);
const {
control,
handleSubmit,
@@ -21,27 +26,71 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors },
register,
trigger,
getValues,
clearErrors
} = useForm({defaultValues: initialData, mode: 'onChange'});
clearErrors,
reset
} = useForm({
defaultValues: useMemo(() => {
return formInitialData;
}, [formInitialData]), mode: 'onChange'
});
const values = getValues();
const step2Props = ['threshold', 'criteria', 'checkList', 'docs', 'images'];
const onSubmit = (formData) => {
if (!isNil(formData.dates) && formData.dates.length) {
formData.dates = formData.dates.map(v => is(String, v) ? v : v.toISOString());
}
console.log('onSubmit', formData);
const forSubmit = Object.keys(formData).reduce((acc, cur) => {
if (step2Props.includes(cur)) {
acc[cur] = formData[cur];
}
return acc;
}, {});
BandoService.updateBandoStep2(formData.id, forSubmit, createCallback, errCreateCallback);
};
// TODO temp data
const exampleOfCriteriaOptions = [
{ id: 15, value: 'Innovatività del progetto', score: 9 },
{ id: 16, value: 'Impatto sulla competitività dell\'azienda', score: 3 },
{ id: 17, value: 'Sostenibilità economico-finanziaria', score: 5 }
];
const exampleOfChecklistOptions = [
{ id: 15, value: 'Innovatività del progetto' }
];
// end of temp data
const createCallback = (data) => {
if (data.status === 'SUCCESS') {
setFormInitialData(data.data);
reset();
}
}
const errCreateCallback = (data) => {
console.log('errCreateCallback', data);
}
const lookupdataCallback = (data) => {
if (data.status === 'SUCCESS') {
const criteria = data.data
.filter(o => o.type === 'EVALUATION_CRITERIA')
.map(o => {
delete o.type;
return {
...o,
score: 0,
lookUpDataId: o.id
};
});
setCriteriaOptions(criteria);
const checklist = data.data
.filter(o => o.type === 'CHECKLIST')
.map(o => {
delete o.type;
return {
...o,
lookUpDataId: o.id
};
});
setChecklistOptions(checklist);
}
}
const errLookupdataCallback = (data) => {
console.log('errLookupdataCallback', data)
}
const openPreview = () => {
navigate('/bandi/preview/11');
@@ -67,8 +116,17 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors },
}
}, [errors, isValid]);
useEffect(() => {
setFormInitialData(initialData);
}, [initialData]);
useEffect(() => {
reset(formInitialData);
}, [formInitialData]);
useEffect(() => {
trigger().then(() => clearErrors());
LookupdataService.getItems(lookupdataCallback, errLookupdataCallback, [['type', ['CHECKLIST', 'EVALUATION_CRITERIA']]])
}, []);
return (
@@ -78,7 +136,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors },
data={values}
setDataFn={setValue}
fieldName="criteria"
options={exampleOfCriteriaOptions}
options={criteriaOptions}
errors={errors}
register={register}
label={<>{__('Criteri di valutazione', 'gepafin')}*
@@ -95,17 +153,18 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors },
<FormField
type="fileupload"
setDataFn={setValue}
fieldName="documentation"
fieldName="docs"
label={__('Documentazione', 'gepafin')}
control={control}
errors={errors}
defaultValue={values['documentation']}
defaultValue={values['docs']}
config={{ required: __('È obbligatorio', 'gepafin') }}
accept="application/pdf,application/vnd.ms-excel"
chooseLabel={__('Aggiungi documento', 'gepafin')}
multiple={true}
doctype='document'
register={register}
callId={values.id}
/>
<FormField
@@ -118,13 +177,14 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors },
defaultValue={values['images']}
doctype='images'
register={register}
callId={values.id}
/>
<FormFieldRepeater
data={values}
setDataFn={setValue}
fieldName="checklist"
options={exampleOfChecklistOptions}
fieldName="checkList"
options={checklistOptions}
errors={errors}
register={register}
label={<>{__('Checklist valutazione Pre-Istruttoria', 'gepafin')}*