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

- merged with develop;

Browse Source
This commit is contained in:
Vitalii Kiiko
2024-11-15 17:18:27 +01:00
parent bda7e084ba e5031006c6
commit 4d14971d1f
28 changed files with 247 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/assets/scss/components/appForm.scss
View File

@@ -147,6 +147,7 @@
.appForm__fileUploadItemName { .appForm__fileUploadItemName {
color: var(--global-textColor); color: var(--global-textColor);
font-style: italic; font-style: italic;
text-align: left;
} }
.appForm__row { .appForm__row {

4
src/assets/scss/components/appPage.scss
View File

@@ -276,6 +276,10 @@
.summary { .summary {
font-weight: bold; font-weight: bold;
} }
a {
color: inherit;
}
} }
@container section_with_border (max-width: 600px) { @container section_with_border (max-width: 600px) {

8
src/assets/scss/components/layout.scss
View File

@@ -28,6 +28,14 @@ body {
} }
} }
a {
color: inherit;
&:hover {
text-decoration: none;
}
}
#root, .wrapper { #root, .wrapper {
min-height: 100%; min-height: 100%;
display: flex; display: flex;

4
src/assets/scss/components/misc.scss
View File

@@ -118,6 +118,10 @@
user-select: none; user-select: none;
} }
.p-dropdown-panel {
max-width: 100%;
}
.p-inputgroup.flex-1 { .p-inputgroup.flex-1 {
align-items: center; align-items: center;
} }

1
src/components/FormFieldRepeater/index.js
View File

@@ -73,6 +73,7 @@ const FormFieldRepeater = ({
const properField = (item, i) => { const properField = (item, i) => {
return !isNil(item.lookUpDataId) return !isNil(item.lookUpDataId)
? <Dropdown value={item.value} ? <Dropdown value={item.value}
filter
disabled={disabled} disabled={disabled}
onChange={(e) => selectItem(e, i)} onChange={(e) => selectItem(e, i)}
optionDisabled={(opt) => usedExistingValues().includes(opt.value)} optionDisabled={(opt) => usedExistingValues().includes(opt.value)}

1
src/components/FormFieldRepeaterCriteria/index.js
View File

@@ -79,6 +79,7 @@ const FormFieldRepeaterCriteria = ({
const properField = (item, i) => { const properField = (item, i) => {
return !isNil(item.lookUpDataId) return !isNil(item.lookUpDataId)
? <Dropdown value={item.value} ? <Dropdown value={item.value}
filter
disabled={disabled} disabled={disabled}
onChange={(e) => selectItem(e, i)} onChange={(e) => selectItem(e, i)}
optionDisabled={(opt) => usedExistingValues().includes(opt.value)} optionDisabled={(opt) => usedExistingValues().includes(opt.value)}

11
src/components/FormFieldRepeaterFaq/index.js
View File

@@ -12,6 +12,7 @@ import { Dialog } from 'primereact/dialog';
import { InputSwitch } from 'primereact/inputswitch'; import { InputSwitch } from 'primereact/inputswitch';
import renderHtmlContent from '../../helpers/renderHtmlContent'; import renderHtmlContent from '../../helpers/renderHtmlContent';
import { Editor } from 'primereact/editor'; import { Editor } from 'primereact/editor';
import DOMPurify from 'dompurify';
const FormFieldRepeaterFaq = ({ const FormFieldRepeaterFaq = ({
data, data,
@@ -143,6 +144,10 @@ const FormFieldRepeaterFaq = ({
const header = renderHeader(); const header = renderHeader();
const faqOptionTemplate = (option) => {
return DOMPurify.sanitize(option.title, {ALLOWED_TAGS: ['#text']});
}
useEffect(() => { useEffect(() => {
const storeFieldData = data ?? []; const storeFieldData = data ?? [];
setStateFieldData(storeFieldData); setStateFieldData(storeFieldData);
@@ -177,9 +182,11 @@ const FormFieldRepeaterFaq = ({
disabled={disabled} disabled={disabled}
icon="pi pi-plus" onClick={addNewItem}/> icon="pi pi-plus" onClick={addNewItem}/>
<Dropdown onChange={(e) => selectItem(e)} <Dropdown onChange={(e) => selectItem(e)}
filter
disabled={disabled} disabled={disabled}
optionDisabled={(opt) => usedExistingValues().includes(opt.title)} optionDisabled={(opt) => usedExistingValues().includes(opt.title)}
options={stateOptionsData} options={stateOptionsData}
itemTemplate={faqOptionTemplate}
placeholder={__('Scegli tra quelli pre-creati', 'gepafin')} placeholder={__('Scegli tra quelli pre-creati', 'gepafin')}
optionLabel="title"/> optionLabel="title"/>
</div> </div>
@@ -216,9 +223,9 @@ const FormFieldRepeaterFaq = ({
</div> </div>
} }
> >
<p className="m-0"> <span className="m-0">
{renderHtmlContent(o.response)} {renderHtmlContent(o.response)}
</p> </span>
</AccordionTab>)} </AccordionTab>)}
</Accordion> </Accordion>
<Dialog <Dialog

29
src/configData.js
View File

@@ -14,3 +14,32 @@ export const mimeTypes = [
]; ];
export const defaultMaxFileSize = 314572800; // 314572800 = 300 Mb export const defaultMaxFileSize = 314572800; // 314572800 = 300 Mb
const dynamicDataForTextinput = [
{ label: 'company name', value: 'company.companyName' },
{ label: 'company piva', value: 'company.vatNumber' },
{ label: 'company codiceFiscale', value: 'company.codiceFiscale' },
{ label: 'company address', value: 'company.address' },
{ label: 'company phoneNumber', value: 'company.phoneNumber' },
{ label: 'company city', value: 'company.city' },
{ label: 'company province', value: 'company.province' },
{ label: 'company cap', value: 'company.cap' },
{ label: 'company country', value: 'company.country' },
{ label: 'company pec', value: 'company.pec' },
{ label: 'company email', value: 'company.email' },
{ label: 'company contactName', value: 'company.contactName' },
{ label: 'company contactEmail', value: 'company.contactEmail' },
{ label: 'user email', value: 'user.email' },
{ label: 'user firstName', value: 'user.firstName' },
{ label: 'user lastName', value: 'user.lastName' },
{ label: 'user phoneNumber', value: 'user.phoneNumber' },
{ label: 'user codiceFiscale', value: 'user.codiceFiscale' }
]
export const dynamicDataOptions = {
datepicker: [
{ label: 'user dateOfBirth', value: 'user.dateOfBirth' }
],
textinput: dynamicDataForTextinput,
textarea: dynamicDataForTextinput
}

12
src/pages/BandiBeneficiario/components/AllBandiAccordion/index.js
View File

@@ -1,6 +1,6 @@
import React, { useState, useEffect} from 'react'; import React, { useState, useEffect} from 'react';
import { __ } from '@wordpress/i18n'; import { __ } from '@wordpress/i18n';
import { is, uniq, isNil } from 'ramda'; import { is, uniq, isNil, isEmpty } from 'ramda';
import { wrap } from 'object-path-immutable'; import { wrap } from 'object-path-immutable';
import { useNavigate } from 'react-router-dom'; import { useNavigate } from 'react-router-dom';
@@ -29,6 +29,7 @@ import PreferredBandoService from '../../../../service/preferred-bando-service';
const AllBandiAccordion = () => { const AllBandiAccordion = () => {
const chosenCompanyId = useStore().main.chosenCompanyId();
const isAsyncRequest = useStore().main.isAsyncRequest(); const isAsyncRequest = useStore().main.isAsyncRequest();
const [items, setItems] = useState(null); const [items, setItems] = useState(null);
const [filters, setFilters] = useState(null); const [filters, setFilters] = useState(null);
@@ -161,11 +162,11 @@ const AllBandiAccordion = () => {
<div className="p-3"> <div className="p-3">
{renderHtmlContent(data.descriptionShort)} {renderHtmlContent(data.descriptionShort)}
<p>{__('Scadenza', 'gepafin')}: {getDateFromISOstring(data.dates[1])}</p> <p>{__('Scadenza', 'gepafin')}: {getDateFromISOstring(data.dates[1])}</p>
{!data.confidi {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && !data.confidi
? <Button onClick={() => goToBandoPage(data.id)} severity="info"> ? <Button onClick={() => goToBandoPage(data.id)} severity="info">
{__('Partecipa', 'gepafin')} {__('Partecipa', 'gepafin')}
</Button> : null} </Button> : null}
{data.confidi {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && data.confidi
? <Button onClick={() => goToBandoPage(data.id)} severity="info"> ? <Button onClick={() => goToBandoPage(data.id)} severity="info">
{__('Mostra', 'gepafin')} {__('Mostra', 'gepafin')}
</Button> : null} </Button> : null}
@@ -199,9 +200,10 @@ const AllBandiAccordion = () => {
<Column field="status" header={__('Stato', 'gepafin')} filterMenuStyle={{ width: '14rem' }} <Column field="status" header={__('Stato', 'gepafin')} filterMenuStyle={{ width: '14rem' }}
style={{ width: '8rem' }} body={statusBodyTemplate} filter sortable style={{ width: '8rem' }} body={statusBodyTemplate} filter sortable
filterElement={statusFilterTemplate}/> filterElement={statusFilterTemplate}/>
<Column header={__('Azioni', 'gepafin')} {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0
? <Column header={__('Azioni', 'gepafin')}
style={{ width: '8rem' }} style={{ width: '8rem' }}
body={actionsBodyTemplate}/> body={actionsBodyTemplate}/> : null}
</DataTable> </DataTable>
</div> </div>
) )

20
src/pages/BandiBeneficiario/index.js
View File

@@ -1,10 +1,17 @@
import React from 'react'; import React from 'react';
import { __ } from '@wordpress/i18n'; import { __ } from '@wordpress/i18n';
import { Link } from 'react-router-dom';
import { isEmpty } from 'ramda';
// store
import { useStore } from '../../store';
// components // components
import AllBandiAccordion from './components/AllBandiAccordion'; import AllBandiAccordion from './components/AllBandiAccordion';
const BandiBeneficiario = () => { const BandiBeneficiario = () => {
const chosenCompanyId = useStore().main.chosenCompanyId();
return ( return (
<div className="appPage"> <div className="appPage">
<div className="appPage__pageHeader"> <div className="appPage__pageHeader">
@@ -13,6 +20,19 @@ const BandiBeneficiario = () => {
<div className="appPage__spacer"></div> <div className="appPage__spacer"></div>
{isEmpty(chosenCompanyId) || chosenCompanyId === 0
? <>
<div className="appPageSection__message warning">
<i className="pi pi-exclamation-triangle"></i>
<span className="summary">{__('Attenzione', 'gepafin')}</span>
<span>
{__('Per applicare ai bandi devi Registare un Azienda clicca', 'gepafin')}
<Link to={`/agguingi-azienda`} style={{marginLeft: '0.5ch'}}>{__('qua', 'gepafin')}</Link>
</span>
</div>
<div className="appPage__spacer"></div>
</> : null}
<div className="appPageSection"> <div className="appPageSection">
<AllBandiAccordion/> <AllBandiAccordion/>
</div> </div>

10
src/pages/BandoEdit/components/BandoEditFormActions/index.js
View File

@@ -5,27 +5,29 @@ import { isNil } from 'ramda';
// components // components
import { Button } from 'primereact/button'; import { Button } from 'primereact/button';
const BandoEditFormActions = ({ id, openPreview, openPreviewEvaluation, submitFn }) => { const BandoEditFormActions = ({ id, openPreview, submitFn, status }) => {
return ( return (
<div className="appPageSection"> <div className="appPageSection">
<div className="appPageSection__actions"> <div className="appPageSection__actions">
<Button <Button
type="button" type="button"
onClick={submitFn} onClick={submitFn}
label={__('Salva bozza', 'gepafin')} icon="pi pi-save" iconPos="right"/> label={status === 'PUBLISH'
? __('Modifica', 'gepafin')
: __('Salva bozza', 'gepafin')} icon="pi pi-save" iconPos="right"/>
<Button <Button
type="button" type="button"
disabled={isNil(id)} disabled={isNil(id)}
outlined outlined
onClick={openPreview} onClick={openPreview}
label={__('Anteprima beneficiario', 'gepafin')} icon="pi pi-eye" iconPos="right"/> label={__('Anteprima beneficiario', 'gepafin')} icon="pi pi-eye" iconPos="right"/>
<Button {/*<Button
type="button" type="button"
disabled={true} disabled={true}
outlined outlined
onClick={openPreviewEvaluation} onClick={openPreviewEvaluation}
label={__('Anteprima pre-istruttoria', 'gepafin')} icon="pi pi-eye" label={__('Anteprima pre-istruttoria', 'gepafin')} icon="pi pi-eye"
iconPos="right"/> iconPos="right"/>*/}
</div> </div>
</div> </div>
) )

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

@@ -112,7 +112,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
toast.current.show({ toast.current.show({
severity: 'success', severity: 'success',
summary: '', summary: '',
detail: __('Il bando è stato aggiornato corretamente!', 'gepafin') detail: __('Il bando è stato aggiornato correttamente!', 'gepafin')
}); });
} }
const values = getValues(); const values = getValues();
@@ -176,8 +176,13 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
} }
const shouldDisableField = () => { const shouldDisableField = (fieldName) => {
return values.status === 'PUBLISH' return values.status === 'PUBLISH' &&
![
'descriptionShort', 'descriptionLong', 'documentationRequested', 'threshold',
'aimedTo', 'criteria', 'docs', 'checklist', 'faq', 'amount', 'amountMin', 'amountMax',
'email', 'phoneNumber', 'checkList', 'images'
].includes(fieldName)
} }
useImperativeHandle( useImperativeHandle(
@@ -239,7 +244,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
<UnsavedChangesDetector getValuesFn={getValues}/> <UnsavedChangesDetector getValuesFn={getValues}/>
<FormField <FormField
type="switch" type="switch"
disabled={shouldDisableField()} disabled={shouldDisableField('confidi')}
fieldName="confidi" fieldName="confidi"
label={__('Bando Confidi', 'gepafin')} label={__('Bando Confidi', 'gepafin')}
control={control} control={control}
@@ -251,7 +256,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
<FormField <FormField
type="textinput" type="textinput"
disabled={shouldDisableField()} disabled={shouldDisableField('name')}
fieldName="name" fieldName="name"
label={__('Titolo del Bando', 'gepafin')} label={__('Titolo del Bando', 'gepafin')}
control={control} control={control}
@@ -262,7 +267,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
<FormField <FormField
type="wysiwyg" type="wysiwyg"
disabled={shouldDisableField()} disabled={shouldDisableField('descriptionShort')}
fieldName="descriptionShort" fieldName="descriptionShort"
label={__('Descrizione breve', 'gepafin')} label={__('Descrizione breve', 'gepafin')}
control={control} control={control}
@@ -275,7 +280,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
<FormField <FormField
type="wysiwyg" type="wysiwyg"
disabled={shouldDisableField()} disabled={shouldDisableField('descriptionLong')}
fieldName="descriptionLong" fieldName="descriptionLong"
label={__('Descrizione completa', 'gepafin')} label={__('Descrizione completa', 'gepafin')}
control={control} control={control}
@@ -291,7 +296,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
<FormFieldRepeater <FormFieldRepeater
data={values['aimedTo']} data={values['aimedTo']}
disabled={shouldDisableField()} disabled={shouldDisableField('aimedTo')}
setDataFn={setValue} setDataFn={setValue}
fieldName="aimedTo" fieldName="aimedTo"
options={aimedToOptions} options={aimedToOptions}
@@ -310,7 +315,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
<FormField <FormField
type="wysiwyg" type="wysiwyg"
disabled={shouldDisableField()} disabled={shouldDisableField('documentationRequested')}
fieldName="documentationRequested" fieldName="documentationRequested"
label={__('Documentazione richiesta', 'gepafin')} label={__('Documentazione richiesta', 'gepafin')}
control={control} control={control}
@@ -334,7 +339,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
<div className="appForm__cols"> <div className="appForm__cols">
<FormField <FormField
type="datepicker" type="datepicker"
disabled={shouldDisableField()} disabled={shouldDisableField('startDate')}
fieldName="startDate" fieldName="startDate"
label={__('Data di inizio', 'gepafin')} label={__('Data di inizio', 'gepafin')}
control={control} control={control}
@@ -345,7 +350,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
<FormField <FormField
type="datepicker" type="datepicker"
disabled={shouldDisableField()} disabled={shouldDisableField('endDate')}
fieldName="endDate" fieldName="endDate"
label={__('Data di fine', 'gepafin')} label={__('Data di fine', 'gepafin')}
control={control} control={control}
@@ -358,7 +363,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
<div className="appForm__cols"> <div className="appForm__cols">
<FormField <FormField
type="datepicker" type="datepicker"
disabled={shouldDisableField()} disabled={shouldDisableField('startTime')}
fieldName="startTime" fieldName="startTime"
label={__('Ora di inizio', 'gepafin')} label={__('Ora di inizio', 'gepafin')}
control={control} control={control}
@@ -370,7 +375,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
<FormField <FormField
type="datepicker" type="datepicker"
disabled={shouldDisableField()} disabled={shouldDisableField('endTime')}
fieldName="endTime" fieldName="endTime"
label={__('Ora di fine', 'gepafin')} label={__('Ora di fine', 'gepafin')}
control={control} control={control}
@@ -384,7 +389,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
<div className="appForm__cols"> <div className="appForm__cols">
<FormField <FormField
type="numberinput" type="numberinput"
disabled={shouldDisableField()} disabled={shouldDisableField('amount')}
fieldName="amount" fieldName="amount"
label={__('Dotazione del Bando', 'gepafin')} label={__('Dotazione del Bando', 'gepafin')}
control={control} control={control}
@@ -397,7 +402,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
<FormField <FormField
type="numberinput" type="numberinput"
disabled={shouldDisableField()} disabled={shouldDisableField('amountMin')}
fieldName="amountMin" fieldName="amountMin"
label={__('Importo minimo per Progetto', 'gepafin')} label={__('Importo minimo per Progetto', 'gepafin')}
control={control} control={control}
@@ -410,7 +415,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
<FormField <FormField
type="numberinput" type="numberinput"
disabled={shouldDisableField()} disabled={shouldDisableField('amountMax')}
fieldName="amountMax" fieldName="amountMax"
label={__('Importo massimo per Progetto', 'gepafin')} label={__('Importo massimo per Progetto', 'gepafin')}
control={control} control={control}
@@ -425,7 +430,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
<div className="appForm__cols"> <div className="appForm__cols">
<FormField <FormField
type="textinput" type="textinput"
disabled={shouldDisableField()} disabled={shouldDisableField('email')}
fieldName="email" fieldName="email"
label={__('Email', 'gepafin')} label={__('Email', 'gepafin')}
control={control} control={control}
@@ -441,7 +446,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
<FormField <FormField
type="textinput" type="textinput"
disabled={shouldDisableField()} disabled={shouldDisableField('phoneNumber')}
fieldName="phoneNumber" fieldName="phoneNumber"
label={__('Telefono', 'gepafin')} label={__('Telefono', 'gepafin')}
control={control} control={control}
@@ -457,6 +462,7 @@ const BandoEditFormStep1 = forwardRef(function ({ initialData, getFormErrors, st
<FormFieldRepeaterFaq <FormFieldRepeaterFaq
data={values['faq']} data={values['faq']}
disabled={shouldDisableField('faq')}
setDataFn={setValue} setDataFn={setValue}
fieldName="faq" fieldName="faq"
options={faqOptions} options={faqOptions}

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

@@ -104,7 +104,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
toast.current.show({ toast.current.show({
severity: 'success', severity: 'success',
summary: '', summary: '',
detail: __('Il bando è stato aggiornato corretamente!', 'gepafin') detail: __('Il bando è stato aggiornato correttamente!', 'gepafin')
}); });
const newFormData = {...formInitialData, ...data.data}; const newFormData = {...formInitialData, ...data.data};
setFormInitialData(newFormData); setFormInitialData(newFormData);
@@ -206,8 +206,13 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
} }
}, []); }, []);
const shouldDisableField = () => { const shouldDisableField = (fieldName) => {
return values.status === 'PUBLISH' return values.status === 'PUBLISH' &&
![
'descriptionShort', 'descriptionLong', 'documentationRequested', 'threshold',
'aimedTo', 'criteria', 'docs', 'checklist', 'faq', 'amount', 'amountMin', 'amountMax',
'email', 'phoneNumber', 'checkList', 'images'
].includes(fieldName)
} }
const acceptAllFormats = () => { const acceptAllFormats = () => {
@@ -219,7 +224,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
<UnsavedChangesDetector getValuesFn={getValues}/> <UnsavedChangesDetector getValuesFn={getValues}/>
<FormFieldRepeaterCriteria <FormFieldRepeaterCriteria
data={values} data={values}
disabled={shouldDisableField()} disabled={shouldDisableField('criteria')}
setDataFn={setValue} setDataFn={setValue}
fieldName="criteria" fieldName="criteria"
options={criteriaOptions} options={criteriaOptions}
@@ -238,7 +243,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
<FormField <FormField
type="fileuploadasync" type="fileuploadasync"
disabled={shouldDisableField()} disabled={shouldDisableField('docs')}
setDataFn={setValue} setDataFn={setValue}
fieldName="docs" fieldName="docs"
label={__('Documentazione', 'gepafin')} label={__('Documentazione', 'gepafin')}
@@ -257,7 +262,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
<FormField <FormField
type="fileuploadasync" type="fileuploadasync"
disabled={shouldDisableField()} disabled={shouldDisableField('images')}
setDataFn={setValue} setDataFn={setValue}
fieldName="images" fieldName="images"
label={__('Immagine del Bando', 'gepafin')} label={__('Immagine del Bando', 'gepafin')}
@@ -273,7 +278,7 @@ const BandoEditFormStep2 = forwardRef(function ({ initialData, getFormErrors, st
<FormFieldRepeater <FormFieldRepeater
data={values['checkList']} data={values['checkList']}
disabled={shouldDisableField()} disabled={shouldDisableField('checkList')}
setDataFn={setValue} setDataFn={setValue}
fieldName="checkList" fieldName="checkList"
options={checklistOptions} options={checklistOptions}

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

@@ -112,7 +112,7 @@ const BandoFlowEdit = () => {
toast.current.show({ toast.current.show({
severity: 'success', severity: 'success',
summary: '', summary: '',
detail: __('Il flusso è stato aggiornato corretamente!', 'gepafin') detail: __('Il flusso è stato aggiornato correttamente!', 'gepafin')
}); });
} }
} }

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

@@ -91,7 +91,7 @@ const BandoForms = () => {
toast.current.show({ toast.current.show({
severity: 'success', severity: 'success',
summary: '', summary: '',
detail: __('Il form è stato aggiornato corretamente!', 'gepafin') detail: __('Il form è stato aggiornato correttamente!', 'gepafin')
}); });
} }
@@ -235,7 +235,7 @@ const BandoForms = () => {
outlined outlined
disabled={!selectedForm} disabled={!selectedForm}
onClick={goToEditForm} onClick={goToEditForm}
label={'PUBLISH' === bandoStatus ? __('Mostra', 'gepafin') : __('Modifica', 'gepafin')} label={__('Modifica', 'gepafin')}
icon="pi pi-cog" iconPos="right"/> icon="pi pi-cog" iconPos="right"/>
</div> </div>
</div> </div>

22
src/pages/BandoFormsEdit/components/BuilderElement/index.js
View File

@@ -11,7 +11,7 @@ import { Button } from 'primereact/button';
import { Tag } from 'primereact/tag'; import { Tag } from 'primereact/tag';
import BuilderElementProperLabel from '../BuilderElementProperLabel'; import BuilderElementProperLabel from '../BuilderElementProperLabel';
const BuilderElement = ({ id, name, label, index }) => { const BuilderElement = ({ id, name, label, index, bandoStatus }) => {
const draggingElementId = useStore().main.draggingElementId(); const draggingElementId = useStore().main.draggingElementId();
const ref = useRef(null); const ref = useRef(null);
@@ -109,28 +109,10 @@ const BuilderElement = ({ id, name, label, index }) => {
</div> </div>
<div className="actions"> <div className="actions">
<Button icon="pi pi-cog" onClick={() => openSettings(id)} outlined severity="info"/> <Button icon="pi pi-cog" onClick={() => openSettings(id)} outlined severity="info"/>
<Button icon="pi pi-trash" onClick={() => remove(id)} outlined severity="danger"/> <Button icon="pi pi-trash" disabled={bandoStatus === 'PUBLISH'} onClick={() => remove(id)} outlined severity="danger"/>
</div> </div>
</div> </div>
) )
/*return (
<div ref={ref} className="formBuilder__element" style={{ opacity }} data-handler-id={handlerId}>
{draggingId === id
? <div className="formBuilder__elementNew"></div>
: <>
<div className="meta">
<Tag value={name} severity="info"/>
<BuilderElementProperLabel id={id} defaultLabel={label}/>
</div>
<div className="actions">
<Button icon="pi pi-cog" onClick={() => openSettings(id)} outlined severity="info"/>
<Button icon="pi pi-trash" onClick={() => remove(id)} outlined severity="danger"/>
</div>
</>
}
</div>
)*/
} }
export default BuilderElement; export default BuilderElement;

4
src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSetting/index.js
View File

@@ -11,7 +11,7 @@ import { Editor } from 'primereact/editor';
import { mimeTypes } from '../../../../../../configData'; import { mimeTypes } from '../../../../../../configData';
import ElementSettingTableColumns from '../ElementSettingTableColumns'; import ElementSettingTableColumns from '../ElementSettingTableColumns';
const ElementSetting = ({ setting, changeFn, updateDataFn }) => { const ElementSetting = ({ setting, changeFn, updateDataFn, bandoStatus }) => {
const settingLabels = { const settingLabels = {
label: __('Label', 'gepafin'), label: __('Label', 'gepafin'),
@@ -48,6 +48,7 @@ const ElementSetting = ({ setting, changeFn, updateDataFn }) => {
return <ElementSettingRepeater return <ElementSettingRepeater
value={is(Array, setting.value) ? setting.value : []} value={is(Array, setting.value) ? setting.value : []}
name={setting.name} name={setting.name}
bandoStatus={bandoStatus}
setDataFn={updateDataFn}/> setDataFn={updateDataFn}/>
} else if (setting.name === 'mime') { } else if (setting.name === 'mime') {
return <MultiSelect return <MultiSelect
@@ -75,6 +76,7 @@ const ElementSetting = ({ setting, changeFn, updateDataFn }) => {
return <ElementSettingTableColumns return <ElementSettingTableColumns
value={is(Object, setting.value) ? setting.value : {}} value={is(Object, setting.value) ? setting.value : {}}
name={setting.name} name={setting.name}
bandoStatus={bandoStatus}
setDataFn={updateDataFn}/> setDataFn={updateDataFn}/>
} else { } else {
return <InputText id={setting.name} aria-describedby={`${setting.name}-help`} return <InputText id={setting.name} aria-describedby={`${setting.name}-help`}

7
src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSettingRepeater/index.js
View File

@@ -11,7 +11,8 @@ import uniqid from '../../../../../../helpers/uniqid';
const ElementSettingRepeater = ({ const ElementSettingRepeater = ({
value, value,
name, name,
setDataFn setDataFn,
bandoStatus
}) => { }) => {
const [stateFieldData, setStateFieldData] = useState([]); const [stateFieldData, setStateFieldData] = useState([]);
@@ -53,10 +54,10 @@ const ElementSettingRepeater = ({
{stateFieldData.map((o, i) => <div key={i} className="formElementSettings__repeaterItem"> {stateFieldData.map((o, i) => <div key={i} className="formElementSettings__repeaterItem">
<div className="p-inputgroup flex-1"> <div className="p-inputgroup flex-1">
{properField(o, i)} {properField(o, i)}
<Button icon="pi pi-times" className="p-button-danger" onClick={() => removeItem(i)}/> <Button icon="pi pi-times" disabled={bandoStatus === 'PUBLISH'} className="p-button-danger" onClick={() => removeItem(i)}/>
</div> </div>
</div>)} </div>)}
<Button type="button" outlined label={__('Aggiungi', 'gepafin')} onClick={addNewItem}/> <Button type="button" disabled={bandoStatus === 'PUBLISH'} outlined label={__('Aggiungi', 'gepafin')} onClick={addNewItem}/>
</div> </div>
) )
} }

20
src/pages/BandoFormsEdit/components/BuilderElementSettings/components/ElementSettingTableColumns/index.js
View File

@@ -14,7 +14,8 @@ import uniqid from '../../../../../../helpers/uniqid';
const ElementSettingTableColumns = ({ const ElementSettingTableColumns = ({
value, value,
name, name,
setDataFn setDataFn,
bandoStatus
}) => { }) => {
const [stateFieldData, setStateFieldData] = useState([]); const [stateFieldData, setStateFieldData] = useState([]);
const [rowsData, setRowsData] = useState([]); const [rowsData, setRowsData] = useState([]);
@@ -87,7 +88,10 @@ const ElementSettingTableColumns = ({
<InputText value={item.label} onInput={(e) => onInputChange(e, i)}/> <InputText value={item.label} onInput={(e) => onInputChange(e, i)}/>
<div className="flex-1"> <div className="flex-1">
<span>{__('Predefinito?', 'gepafin')}</span> <span>{__('Predefinito?', 'gepafin')}</span>
<InputSwitch checked={item.predefined} onChange={(e) => setChecked(e.value, i)}/> <InputSwitch
checked={item.predefined}
disabled={bandoStatus === 'PUBLISH'}
onChange={(e) => setChecked(e.value, i)}/>
</div> </div>
</> </>
} }
@@ -118,10 +122,10 @@ const ElementSettingTableColumns = ({
{stateFieldData.map((o, i) => <div key={i} className="formElementSettings__repeaterItem"> {stateFieldData.map((o, i) => <div key={i} className="formElementSettings__repeaterItem">
<div className="p-inputgroup flex-1"> <div className="p-inputgroup flex-1">
{properField(o, i)} {properField(o, i)}
<Button icon="pi pi-times" className="p-button-danger" onClick={() => removeItem(i)}/> <Button icon="pi pi-times" disabled={bandoStatus === 'PUBLISH'} className="p-button-danger" onClick={() => removeItem(i)}/>
</div> </div>
</div>)} </div>)}
<Button type="button" outlined label={__('Aggiungi', 'gepafin')} onClick={addNewItem}/> <Button type="button" disabled={bandoStatus === 'PUBLISH'} outlined label={__('Aggiungi', 'gepafin')} onClick={addNewItem}/>
</div> </div>
{stateFieldData {stateFieldData
.filter(o => o.predefined) .filter(o => o.predefined)
@@ -133,12 +137,16 @@ const ElementSettingTableColumns = ({
return <div key={k} className="formElementSettings__repeaterItem"> return <div key={k} className="formElementSettings__repeaterItem">
<div className="p-inputgroup flex-1"> <div className="p-inputgroup flex-1">
{properSubField(c, k, o.name)} {properSubField(c, k, o.name)}
<Button icon="pi pi-times" className="p-button-danger" <Button icon="pi pi-times"
disabled={bandoStatus === 'PUBLISH'}
className="p-button-danger"
onClick={() => removeRow(k)}/> onClick={() => removeRow(k)}/>
</div> </div>
</div> </div>
})} })}
<Button type="button" outlined <Button type="button"
outlined
disabled={bandoStatus === 'PUBLISH'}
label={__('Aggiungi una righa', 'gepafin')} label={__('Aggiungi una righa', 'gepafin')}
onClick={addNewRow}/> onClick={addNewRow}/>
</div> </div>

6
src/pages/BandoFormsEdit/components/BuilderElementSettings/index.js
View File

@@ -16,8 +16,9 @@ import { InputSwitch } from 'primereact/inputswitch';
import ElementSetting from './components/ElementSetting'; import ElementSetting from './components/ElementSetting';
import { Dropdown } from 'primereact/dropdown'; import { Dropdown } from 'primereact/dropdown';
import { MultiSelect } from 'primereact/multiselect'; import { MultiSelect } from 'primereact/multiselect';
import { dynamicDataOptions } from '../../../../configData';
const BuilderElementSettings = ({ closeSettingsFn }) => { const BuilderElementSettings = ({ closeSettingsFn, bandoStatus }) => {
const elements = useStore().main.formElements(); const elements = useStore().main.formElements();
const activeElement = useStore().main.activeElement(); const activeElement = useStore().main.activeElement();
const criteriaOptions = useStore().main.bandoCriteria(); const criteriaOptions = useStore().main.bandoCriteria();
@@ -162,10 +163,11 @@ const BuilderElementSettings = ({ closeSettingsFn }) => {
? settings.map((o) => <ElementSetting ? settings.map((o) => <ElementSetting
key={o.name} key={o.name}
setting={o} setting={o}
bandoStatus={bandoStatus}
changeFn={onChange} changeFn={onChange}
updateDataFn={onUpdateOptions}/>) updateDataFn={onUpdateOptions}/>)
: null} : null}
{['textinput', 'datepicker'].includes(activeElementData.name) {!isNil(dynamicDataOptions[activeElementData.name])
? <div className="formElementSettings__field"> ? <div className="formElementSettings__field">
<label htmlFor="dynamicData">{__('Dati dinamici', 'gepafin')}</label> <label htmlFor="dynamicData">{__('Dati dinamici', 'gepafin')}</label>
<Dropdown <Dropdown

7
src/pages/BandoFormsEdit/components/FormBuilder/index.js
View File

@@ -13,7 +13,7 @@ import BuilderElementSettings from '../BuilderElementSettings';
import BuilderDropzone from '../BuilderDropzone'; import BuilderDropzone from '../BuilderDropzone';
import BlockingOverlay from '../../../../components/BlockingOverlay'; import BlockingOverlay from '../../../../components/BlockingOverlay';
const FormBuilder = () => { const FormBuilder = ({ bandoStatus }) => {
const elements = useStore().main.formElements(); const elements = useStore().main.formElements();
const elementItems = useStore().main.elementItems(); const elementItems = useStore().main.elementItems();
const activeElement = useStore().main.activeElement(); const activeElement = useStore().main.activeElement();
@@ -27,9 +27,10 @@ const FormBuilder = () => {
id={field.id} id={field.id}
label={field.label} label={field.label}
name={field.name} name={field.name}
bandoStatus={bandoStatus}
/> />
) )
}, []); }, [bandoStatus]);
const renderItem = useCallback((item) => { const renderItem = useCallback((item) => {
return ( return (
@@ -57,7 +58,7 @@ const FormBuilder = () => {
<> <>
<Sidebar visible={!isEmpty(activeElement)} onHide={closeSettings} className="formBuilder__elementSettings"> <Sidebar visible={!isEmpty(activeElement)} onHide={closeSettings} className="formBuilder__elementSettings">
<h2>{__('Impostazioni del campo modulo', 'gepafin')}</h2> <h2>{__('Impostazioni del campo modulo', 'gepafin')}</h2>
{!isEmpty(activeElement) ? <BuilderElementSettings closeSettingsFn={closeSettings}/> : null} {!isEmpty(activeElement) ? <BuilderElementSettings closeSettingsFn={closeSettings} bandoStatus={bandoStatus}/> : null}
</Sidebar> </Sidebar>
<div className="formBuilder"> <div className="formBuilder">
<div className="formBuilder__main"> <div className="formBuilder__main">

10
src/pages/BandoFormsEdit/index.js
View File

@@ -123,7 +123,7 @@ const BandoFormsEdit = () => {
toast.current.show({ toast.current.show({
severity: 'success', severity: 'success',
summary: '', summary: '',
detail: __('Il form è stato aggiornato corretamente!', 'gepafin') detail: __('Il form è stato aggiornato correttamente!', 'gepafin')
}); });
} }
} }
@@ -210,7 +210,6 @@ const BandoFormsEdit = () => {
} }
const errFormDeleteCallback = (data) => { const errFormDeleteCallback = (data) => {
console.log('errFormDeleteCallback', data)
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
} }
@@ -223,7 +222,6 @@ const BandoFormsEdit = () => {
} }
const errGetElementItemsCallbacks = (data) => { const errGetElementItemsCallbacks = (data) => {
console.log('errGetElementItemsCallbacks', data)
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
} }
@@ -246,9 +244,9 @@ const BandoFormsEdit = () => {
const getBandoCallback = (data) => { const getBandoCallback = (data) => {
if (data.status === 'SUCCESS') { if (data.status === 'SUCCESS') {
setBandoStatus(data.data.status);
const criteria = pathOr([], ['data', 'criteria'], data); const criteria = pathOr([], ['data', 'criteria'], data);
const criteriaOptions = criteria.map(o => ({value: o.id, label: o.value})); const criteriaOptions = criteria.map(o => ({value: o.id, label: o.value}));
console.log('criteriaOptions', criteriaOptions);
storeSet.main.bandoCriteria(criteriaOptions); storeSet.main.bandoCriteria(criteriaOptions);
} }
} }
@@ -319,7 +317,7 @@ const BandoFormsEdit = () => {
<div className="appPageSection"> <div className="appPageSection">
<DndProvider backend={HTML5Backend}> <DndProvider backend={HTML5Backend}>
<FormBuilder/> <FormBuilder bandoStatus={bandoStatus}/>
</DndProvider> </DndProvider>
</div> </div>
@@ -334,7 +332,7 @@ const BandoFormsEdit = () => {
label={__('Indietro', 'gepafin')} icon="pi pi-arrow-left" iconPos="left"/> label={__('Indietro', 'gepafin')} icon="pi pi-arrow-left" iconPos="left"/>
<Button <Button
onClick={() => doSave()} onClick={() => doSave()}
disabled={isAsyncRequest || 'PUBLISH' === bandoStatus} disabled={isAsyncRequest}
label={__('Salva progressi', 'gepafin')} icon="pi pi-save" iconPos="right"/> label={__('Salva progressi', 'gepafin')} icon="pi pi-save" iconPos="right"/>
<Button <Button
outlined outlined

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

@@ -87,6 +87,22 @@ const BandoViewBeneficiario = () => {
return !isNaN(parsed) ? parsed : 0; return !isNaN(parsed) ? parsed : 0;
} }
const submitBtnLabel = () => {
if (applicationObj && applicationObj.id) {
return __('Vai alla domanda', 'gepafin');
} else {
return __('Presenta domanda', 'gepafin');
}
}
const submitBtnIcon = () => {
if (applicationObj && applicationObj.id) {
return 'pi pi-arrow-right';
} else {
return 'pi pi-save';
}
}
const submitApplication = () => { const submitApplication = () => {
if (data.confidi) { if (data.confidi) {
displayConfidiPopup(); displayConfidiPopup();
@@ -231,13 +247,15 @@ const BandoViewBeneficiario = () => {
const header = renderHeader(); const header = renderHeader();
useEffect(() => { useEffect(() => {
if (!isEmpty(chosenCompanyId) && chosenCompanyId !== 0) {
const bandoId = getBandoId(); const bandoId = getBandoId();
storeSet.main.setAsyncRequest(); storeSet.main.setAsyncRequest();
BandoService.getBando(bandoId, getBandoCallback, errGetBandoCallback); BandoService.getBando(bandoId, getBandoCallback, errGetBandoCallback);
ApplicationService.getApplications(getApplCallback, errGetApplCallback, [ ApplicationService.getApplications(getApplCallback, errGetApplCallback, [
['callId', bandoId], ['callId', bandoId],
['companyId', chosenCompanyId] ['companyId', chosenCompanyId]
]) ]);
}
}, [id, chosenCompanyId]); }, [id, chosenCompanyId]);
return ( return (
@@ -425,8 +443,8 @@ const BandoViewBeneficiario = () => {
type="button" type="button"
disabled={isAsyncRequest || chosenCompanyId === 0} disabled={isAsyncRequest || chosenCompanyId === 0}
onClick={submitApplication} onClick={submitApplication}
label={__('Presenta Domanda', 'gepafin')} label={submitBtnLabel()}
icon="pi pi-save" iconPos="right"/> icon={submitBtnIcon()} iconPos="right"/>
{/*<Button {/*<Button
type="button" type="button"
outlined outlined

20
src/pages/DashboardBeneficiario/components/LatestBandiTable/index.js
View File

@@ -1,10 +1,10 @@
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { __ } from '@wordpress/i18n'; import { __ } from '@wordpress/i18n';
import { uniq, isNil } from 'ramda'; import { uniq, isEmpty, isNil } from 'ramda';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
// store // store
import { storeGet } from '../../../../store'; import { storeGet, useStore } from '../../../../store';
// api // api
import BandoService from '../../../../service/bando-service'; import BandoService from '../../../../service/bando-service';
@@ -24,6 +24,7 @@ import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse
const LatestBandiTable = () => { const LatestBandiTable = () => {
const chosenCompanyId = useStore().main.chosenCompanyId();
const [items, setItems] = useState(null); const [items, setItems] = useState(null);
const [filters, setFilters] = useState(null); const [filters, setFilters] = useState(null);
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
@@ -192,16 +193,10 @@ const LatestBandiTable = () => {
onClick={() => addToFavourites(rowData.id, rowData.preferredCallId)}> onClick={() => addToFavourites(rowData.id, rowData.preferredCallId)}>
<i className="pi pi-heart" style={{ fontSize: '1rem' }}></i> <i className="pi pi-heart" style={{ fontSize: '1rem' }}></i>
</button> </button>
{rowData.confidi <Link to={`/bandi/${rowData.id}`}>
? <Link to={`/bandi/${rowData.id}`}>
<Button severity="info" label={__('Mostra', 'gepafin')} icon="pi pi-eye" size="small"
iconPos="right"/>
</Link>
: <Link to={`/bandi/${rowData.id}`}>
<Button severity="info" label={__('Partecipa', 'gepafin')} icon="pi pi-arrow-right" size="small" <Button severity="info" label={__('Partecipa', 'gepafin')} icon="pi pi-arrow-right" size="small"
iconPos="right"/> iconPos="right"/>
</Link>} </Link></div>
</div>
} }
const header = renderHeader(); const header = renderHeader();
@@ -225,8 +220,9 @@ const LatestBandiTable = () => {
body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/> body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/>
<Column field="status" header={__('Stato', 'gepafin')} <Column field="status" header={__('Stato', 'gepafin')}
style={{ minWidth: '7rem' }} body={statusBodyTemplate} /> style={{ minWidth: '7rem' }} body={statusBodyTemplate} />
<Column header={__('Azioni', 'gepafin')} {!isEmpty(chosenCompanyId) && chosenCompanyId !== 0
body={actionsBodyTemplate}/> ? <Column header={__('Azioni', 'gepafin')}
body={actionsBodyTemplate}/> : null}
</DataTable> </DataTable>
</div> </div>
) )

6
src/pages/DashboardBeneficiario/components/MyLatestSubmissionsTable/index.js
View File

@@ -1,6 +1,6 @@
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { __ } from '@wordpress/i18n'; import { __ } from '@wordpress/i18n';
import { uniq, is } from 'ramda'; import { uniq, is, isEmpty } from 'ramda';
// tools // tools
import getBandoLabel from '../../../../helpers/getBandoLabel'; import getBandoLabel from '../../../../helpers/getBandoLabel';
@@ -36,11 +36,13 @@ const MyLatestSubmissionsTable = () => {
const [statuses, setStatuses] = useState([]); const [statuses, setStatuses] = useState([]);
useEffect(() => { useEffect(() => {
if (!isEmpty(chosenCompanyId) && chosenCompanyId !== 0) {
setLocalAsyncRequest(true); setLocalAsyncRequest(true);
ApplicationService.getApplications(getApplCallback, errGetApplCallback, [ ApplicationService.getApplications(getApplCallback, errGetApplCallback, [
['companyId', chosenCompanyId], ['companyId', chosenCompanyId],
['statuses', ['DRAFT', 'AWAITING', 'READY']] ['statuses', ['DRAFT', 'AWAITING', 'READY']]
]) ]);
}
}, [chosenCompanyId]); }, [chosenCompanyId]);
const getApplCallback = (data) => { const getApplCallback = (data) => {

22
src/pages/DashboardBeneficiario/index.js
View File

@@ -1,7 +1,7 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from 'react';
import { __ } from '@wordpress/i18n'; import { __, sprintf } from '@wordpress/i18n';
import { useNavigate } from 'react-router-dom'; import { Link, useNavigate } from 'react-router-dom';
import { head, pathOr } from 'ramda'; import { head, isEmpty, pathOr } from 'ramda';
import NumberFlow from '@number-flow/react'; import NumberFlow from '@number-flow/react';
// store // store
@@ -35,7 +35,8 @@ const DashboardBeneficiario = () => {
} }
} }
const errGetStats = () => {} const errGetStats = () => {
}
useEffect(() => { useEffect(() => {
const existingCompany = head(companies.filter(o => o.id === chosenCompanyId)); const existingCompany = head(companies.filter(o => o.id === chosenCompanyId));
@@ -89,6 +90,19 @@ const DashboardBeneficiario = () => {
<div className="appPage__spacer"></div> <div className="appPage__spacer"></div>
{isEmpty(chosenCompanyId) || chosenCompanyId === 0
? <>
<div className="appPageSection__message warning">
<i className="pi pi-exclamation-triangle"></i>
<span className="summary">{__('Attenzione', 'gepafin')}</span>
<span>
{__('Per applicare ai bandi devi Registare un Azienda clicca', 'gepafin')}
<Link to={`/agguingi-azienda`} style={{marginLeft: '0.5ch'}}>{__('qua', 'gepafin')}</Link>
</span>
</div>
<div className="appPage__spacer"></div>
</> : null}
<div className="appPageSection"> <div className="appPageSection">
<h2>{__('Bandi disponibili', 'gepafin')}</h2> <h2>{__('Bandi disponibili', 'gepafin')}</h2>
<LatestBandiTable/> <LatestBandiTable/>

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

@@ -329,6 +329,10 @@ const DomandaEditPreInstructor = () => {
</p> </p>
</div> </div>
<div className="appPageSection">
</div>
<div className="appPageSection"> <div className="appPageSection">
<h2>{__('Punteggi di valutazione', 'gepafin')}</h2> <h2>{__('Punteggi di valutazione', 'gepafin')}</h2>
{data.criteria {data.criteria

6
src/pages/DomandeBeneficiario/components/BeneficiarioDomandeTable/index.js
View File

@@ -1,6 +1,6 @@
import React, { useState, useEffect } from 'react'; import React, { useState, useEffect } from 'react';
import { __ } from '@wordpress/i18n'; import { __ } from '@wordpress/i18n';
import { is, uniq } from 'ramda'; import { is, isEmpty, uniq } from 'ramda';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
// store // store
@@ -36,11 +36,13 @@ const BeneficiarioDomandeTable = () => {
const [statuses, setStatuses] = useState([]); const [statuses, setStatuses] = useState([]);
useEffect(() => { useEffect(() => {
if (!isEmpty(chosenCompanyId) && chosenCompanyId !== 0) {
setLocalAsyncRequest(true); setLocalAsyncRequest(true);
ApplicationService.getApplications(getApplCallback, errGetApplCallback, [ ApplicationService.getApplications(getApplCallback, errGetApplCallback, [
['companyId', chosenCompanyId], ['companyId', chosenCompanyId],
['statuses', ['SOCCORSO', 'APPROVED', 'REJECTED', 'EVALUATION']] ['statuses', ['SOCCORSO', 'APPROVED', 'REJECTED', 'EVALUATION']]
]) ]);
}
}, [chosenCompanyId]); }, [chosenCompanyId]);
const getApplCallback = (data) => { const getApplCallback = (data) => {