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

Merge pull request #8 from Kitzanos/feature/68-published-call-editable-fields

Browse Source 
Feature/68 published call editable fields
This commit is contained in:
Vitalii Kiiko
2024-11-14 15:19:34 +01:00
committed by GitHub
parent c9ce96f860 cf5f04d6c2
commit 7371ff1eb9
21 changed files with 111 additions and 92 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 {
color: var(--global-textColor);
font-style: italic;
text-align: left;
}
.appForm__row {

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

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

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

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

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

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

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

@@ -182,6 +182,7 @@ const FormFieldRepeaterFaq = ({
disabled={disabled}
icon="pi pi-plus" onClick={addNewItem}/>
<Dropdown onChange={(e) => selectItem(e)}
filter
disabled={disabled}
optionDisabled={(opt) => usedExistingValues().includes(opt.title)}
options={stateOptionsData}

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

@@ -1,6 +1,6 @@
import React, { useState, useEffect} from 'react';
import { __ } from '@wordpress/i18n';
import { is, uniq, isNil } from 'ramda';
import { is, uniq, isNil, isEmpty } from 'ramda';
import { wrap } from 'object-path-immutable';
// store
@@ -28,6 +28,7 @@ import set404FromErrorResponse from '../../../../helpers/set404FromErrorResponse
const AllBandiAccordion = () => {
const chosenCompanyId = useStore().main.chosenCompanyId();
const isAsyncRequest = useStore().main.isAsyncRequest();
const [items, setItems] = useState(null);
const [filters, setFilters] = useState(null);
@@ -113,11 +114,11 @@ const AllBandiAccordion = () => {
<div className="p-3">
{renderHtmlContent(data.descriptionShort)}
<p>{__('Scadenza', 'gepafin')}: {getDateFromISOstring(data.dates[1])}</p>
{!data.confidi
{!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && !data.confidi
? <Button onClick={() => goToBandoPage(data.id)} severity="info">
{__('Partecipa', 'gepafin')}
</Button> : null}
{data.confidi
{!isEmpty(chosenCompanyId) && chosenCompanyId !== 0 && data.confidi
? <Button onClick={() => goToBandoPage(data.id)} severity="info">
{__('Mostra', 'gepafin')}
</Button> : null}

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

@@ -1,10 +1,8 @@
import React from 'react';
import { __ } from '@wordpress/i18n';
import { useNavigate } from 'react-router-dom';
// components
import AllBandiAccordion from './components/AllBandiAccordion';
import { Button } from 'primereact/button';
const BandiBeneficiario = () => {
return(

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

@@ -5,14 +5,16 @@ import { isNil } from 'ramda';
// components
import { Button } from 'primereact/button';
const BandoEditFormActions = ({ id, openPreview, openPreviewEvaluation, submitFn }) => {
const BandoEditFormActions = ({ id, openPreview, openPreviewEvaluation, submitFn, status }) => {
return (
<div className="appPageSection">
<div className="appPageSection__actions">
<Button
type="button"
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
type="button"
disabled={isNil(id)}

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

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

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

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

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 BuilderElementProperLabel from '../BuilderElementProperLabel';
const BuilderElement = ({ id, name, label, index }) => {
const BuilderElement = ({ id, name, label, index, bandoStatus }) => {
const draggingElementId = useStore().main.draggingElementId();
const ref = useRef(null);
@@ -109,28 +109,10 @@ const BuilderElement = ({ id, name, label, index }) => {
</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"/>
<Button icon="pi pi-trash" disabled={bandoStatus === 'PUBLISH'} onClick={() => remove(id)} outlined severity="danger"/>
</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;

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 ElementSettingTableColumns from '../ElementSettingTableColumns';
const ElementSetting = ({ setting, changeFn, updateDataFn }) => {
const ElementSetting = ({ setting, changeFn, updateDataFn, bandoStatus }) => {
const settingLabels = {
label: __('Label', 'gepafin'),
@@ -48,6 +48,7 @@ const ElementSetting = ({ setting, changeFn, updateDataFn }) => {
return <ElementSettingRepeater
value={is(Array, setting.value) ? setting.value : []}
name={setting.name}
bandoStatus={bandoStatus}
setDataFn={updateDataFn}/>
} else if (setting.name === 'mime') {
return <MultiSelect
@@ -75,6 +76,7 @@ const ElementSetting = ({ setting, changeFn, updateDataFn }) => {
return <ElementSettingTableColumns
value={is(Object, setting.value) ? setting.value : {}}
name={setting.name}
bandoStatus={bandoStatus}
setDataFn={updateDataFn}/>
} else {
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 = ({
value,
name,
setDataFn
setDataFn,
bandoStatus
}) => {
const [stateFieldData, setStateFieldData] = useState([]);
@@ -53,10 +54,10 @@ const ElementSettingRepeater = ({
{stateFieldData.map((o, i) => <div key={i} className="formElementSettings__repeaterItem">
<div className="p-inputgroup flex-1">
{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>)}
<Button type="button" outlined label={__('Aggiungi', 'gepafin')} onClick={addNewItem}/>
<Button type="button" disabled={bandoStatus === 'PUBLISH'} outlined label={__('Aggiungi', 'gepafin')} onClick={addNewItem}/>
</div>
)
}

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

@@ -14,7 +14,8 @@ import uniqid from '../../../../../../helpers/uniqid';
const ElementSettingTableColumns = ({
value,
name,
setDataFn
setDataFn,
bandoStatus
}) => {
const [stateFieldData, setStateFieldData] = useState([]);
const [rowsData, setRowsData] = useState([]);
@@ -34,7 +35,7 @@ const ElementSettingTableColumns = ({
.reduce((acc, cur) => {
acc[cur.name] = ''
return acc;
}, {});
}, {});
setRowsData([...rowsData, obj]);
}
@@ -87,7 +88,10 @@ const ElementSettingTableColumns = ({
<InputText value={item.label} onInput={(e) => onInputChange(e, i)}/>
<div className="flex-1">
<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>
</>
}
@@ -118,10 +122,10 @@ const ElementSettingTableColumns = ({
{stateFieldData.map((o, i) => <div key={i} className="formElementSettings__repeaterItem">
<div className="p-inputgroup flex-1">
{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>)}
<Button type="button" outlined label={__('Aggiungi', 'gepafin')} onClick={addNewItem}/>
<Button type="button" disabled={bandoStatus === 'PUBLISH'} outlined label={__('Aggiungi', 'gepafin')} onClick={addNewItem}/>
</div>
{stateFieldData
.filter(o => o.predefined)
@@ -138,7 +142,9 @@ const ElementSettingTableColumns = ({
</div>
</div>
})}
<Button type="button" outlined
<Button type="button"
outlined
disabled={bandoStatus === 'PUBLISH'}
label={__('Aggiungi una righa', 'gepafin')}
onClick={addNewRow}/>
</div>

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

@@ -17,7 +17,7 @@ import ElementSetting from './components/ElementSetting';
import { Dropdown } from 'primereact/dropdown';
import { MultiSelect } from 'primereact/multiselect';
const BuilderElementSettings = ({ closeSettingsFn }) => {
const BuilderElementSettings = ({ closeSettingsFn, bandoStatus }) => {
const elements = useStore().main.formElements();
const activeElement = useStore().main.activeElement();
const criteriaOptions = useStore().main.bandoCriteria();
@@ -162,6 +162,7 @@ const BuilderElementSettings = ({ closeSettingsFn }) => {
? settings.map((o) => <ElementSetting
key={o.name}
setting={o}
bandoStatus={bandoStatus}
changeFn={onChange}
updateDataFn={onUpdateOptions}/>)
: null}

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

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

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

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

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

@@ -247,13 +247,15 @@ const BandoViewBeneficiario = () => {
const header = renderHeader();
useEffect(() => {
const bandoId = getBandoId();
storeSet.main.setAsyncRequest();
BandoService.getBando(bandoId, getBandoCallback, errGetBandoCallback);
ApplicationService.getApplications(getApplCallback, errGetApplCallback, [
['callId', bandoId],
['companyId', chosenCompanyId]
])
if (!isEmpty(chosenCompanyId) && chosenCompanyId !== 0) {
const bandoId = getBandoId();
storeSet.main.setAsyncRequest();
BandoService.getBando(bandoId, getBandoCallback, errGetBandoCallback);
ApplicationService.getApplications(getApplCallback, errGetApplCallback, [
['callId', bandoId],
['companyId', chosenCompanyId]
]);
}
}, [id, chosenCompanyId]);
return (

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

@@ -1,10 +1,10 @@
import React, { useState, useEffect } from 'react';
import { __ } from '@wordpress/i18n';
import { uniq } from 'ramda';
import { isEmpty, uniq } from 'ramda';
import { Link } from 'react-router-dom';
// store
import { storeSet } from '../../../../store';
import { storeSet, useStore } from '../../../../store';
// api
import BandoService from '../../../../service/bando-service';
@@ -22,6 +22,7 @@ import ProperBandoLabel from '../../../../components/ProperBandoLabel';
const LatestBandiTable = () => {
const chosenCompanyId = useStore().main.chosenCompanyId();
const [items, setItems] = useState(null);
const [filters, setFilters] = useState(null);
const [loading, setLoading] = useState(false);
@@ -145,8 +146,9 @@ const LatestBandiTable = () => {
body={dateEndBodyTemplate} filter filterElement={dateFilterTemplate}/>
<Column field="status" header={__('Stato', 'gepafin')}
style={{ minWidth: '7rem' }} body={statusBodyTemplate} />
<Column header={__('Azioni', 'gepafin')}
body={actionsBodyTemplate}/>
{!isEmpty(chosenCompanyId) && chosenCompanyId !== 0
? <Column header={__('Azioni', 'gepafin')}
body={actionsBodyTemplate}/> : null}
</DataTable>
</div>
)

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

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

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

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