Merge pull request #37 from Kitzanos/feature/130-table-async

Feature/130 table async
This commit is contained in:
Vitalii Kiiko
2025-03-03 11:17:32 +01:00
committed by GitHub
22 changed files with 1157 additions and 22 deletions

View File

@@ -4,7 +4,8 @@ import Routes from './routes';
import { createI18n, setLocaleData } from '@wordpress/i18n'; import { createI18n, setLocaleData } from '@wordpress/i18n';
import { I18nProvider } from '@wordpress/react-i18n'; import { I18nProvider } from '@wordpress/react-i18n';
import './assets/scss/theme.scss'; import './assets/scss/theme.scss';
import { isEmpty, head } from 'ramda' import { isEmpty, head } from 'ramda';
import { addLocale, PrimeReactProvider } from 'primereact/api';
// store // store
import { useStore, storeSet, storeGet } from './store'; import { useStore, storeSet, storeGet } from './store';
@@ -18,6 +19,9 @@ function App() {
const role = useStore().main.getRole(); const role = useStore().main.getRole();
const chosenCompanyId = useStore().main.chosenCompanyId(); const chosenCompanyId = useStore().main.chosenCompanyId();
const isRedirectedOnceNoCompany = useStore().main.isRedirectedOnceNoCompany(); const isRedirectedOnceNoCompany = useStore().main.isRedirectedOnceNoCompany();
const value = {
locale: 'it',
};
const callback = (data) => { const callback = (data) => {
if (data.status === 'SUCCESS') { if (data.status === 'SUCCESS') {
@@ -59,6 +63,51 @@ function App() {
storeSet.main.setAsyncRequest(); storeSet.main.setAsyncRequest();
AuthenticationService.me(callback, errCallback); AuthenticationService.me(callback, errCallback);
addLocale('it', {
startsWith: 'Inizia con',
contains: 'Contiene',
notContains: 'Non contiene',
endsWith: 'Finisce con',
equals: 'Uguale a',
notEquals: 'Diverso da',
noFilter: 'Nessun filtro',
lt: 'Minore di',
lte: 'Minore o uguale a',
gt: 'Maggiore di',
gte: 'Maggiore o uguale a',
dateIs: 'Data uguale a',
dateIsNot: 'Data diversa da',
dateBefore: 'Data prima di',
dateAfter: 'Data dopo',
custom: 'Personalizzato',
clear: 'Cancella',
apply: 'Applica',
matchAll: 'Tutte le condizioni',
matchAny: 'Qualsiasi condizione',
addRule: 'Aggiungi regola',
removeRule: 'Rimuovi regola',
accept: 'Sì',
reject: 'No',
choose: 'Scegli',
upload: 'Carica',
cancel: 'Annulla',
dayNames: ['Domenica', 'Lunedì', 'Martedì', 'Mercoledì', 'Giovedì', 'Venerdì', 'Sabato'],
dayNamesShort: ['Dom', 'Lun', 'Mar', 'Mer', 'Gio', 'Ven', 'Sab'],
dayNamesMin: ['D', 'L', 'M', 'M', 'G', 'V', 'S'],
monthNames: ['Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre'],
monthNamesShort: ['Gen', 'Feb', 'Mar', 'Apr', 'Mag', 'Giu', 'Lug', 'Ago', 'Set', 'Ott', 'Nov', 'Dic'],
today: 'Oggi',
weekHeader: 'Sm',
firstDayOfWeek: 1,
dateFormat: 'dd/mm/yy',
weak: 'Debole',
medium: 'Medio',
strong: 'Forte',
passwordPrompt: 'Inserisci una password',
emptyMessage: 'Nessun risultato trovato',
emptyFilterMessage: 'Nessun risultato trovato'
});
fetch('/languages/en_US.json') fetch('/languages/en_US.json')
.then((res) => res.json()) .then((res) => res.json())
.then(res => { .then(res => {
@@ -69,7 +118,9 @@ function App() {
return ( return (
<I18nProvider i18n={i18n}> <I18nProvider i18n={i18n}>
<BrowserRouter> <BrowserRouter>
<Routes role={role} chosenCompanyId={chosenCompanyId}/> <PrimeReactProvider value={value}>
<Routes role={role} chosenCompanyId={chosenCompanyId}/>
</PrimeReactProvider>
</BrowserRouter> </BrowserRouter>
</I18nProvider> </I18nProvider>
); );

View File

@@ -109,6 +109,51 @@
background-color: var(--table-border-color) background-color: var(--table-border-color)
} }
} }
&.fileselect {
.fileselectInner {
flex-direction: row;
display: flex;
gap: 1rem;
> div {
flex: 1 1 50%;
}
}
.fileselectInner__selectionBox {
display: flex;
flex-direction: column;
gap: 10px;
}
.fileselectInner__selectedFiles {
display: flex;
flex-direction: column;
gap: 10px;
p {
margin: 0;
font-weight: bold;
font-size: 14px;
}
ul {
margin: 0;
padding: 0;
display: flex;
flex-direction: column;
gap: 7px;
li {
display: flex;
gap: 1rem;
justify-content: space-between;
align-items: center;
}
}
}
}
} }
.appForm__field--required.appForm__field--required { .appForm__field--required.appForm__field--required {

View File

@@ -113,6 +113,10 @@
font-weight: 600; font-weight: 600;
line-height: normal; line-height: normal;
margin: 0 0 24px; margin: 0 0 24px;
display: flex;
gap: 1rem;
flex-wrap: wrap;
align-items: center;
} }
h3 { h3 {

View File

@@ -167,6 +167,13 @@
} }
} }
.p-column-filter-overlay .p-column-filter-row-items .p-column-filter-row-item.p-highlight {
color: white;
}
.p-listbox .p-listbox-list .p-listbox-item.p-highlight {
color: white;
}
.p-inputnumber-input[readonly] { .p-inputnumber-input[readonly] {
background-color: #e1e1e1; background-color: #e1e1e1;
} }

View File

@@ -0,0 +1,105 @@
import React, { useEffect, useState } from 'react';
import { __ } from '@wordpress/i18n';
import translationStrings from '../../translationStringsForComponents';
// components
import { DataTable } from 'primereact/datatable';
import { Column } from 'primereact/column';
import { Button } from 'primereact/button';
import BandoService from '../../service/bando-service';
const DataTableAsync = () => {
const [localAsyncRequest, setLocalAsyncRequest] = useState(false);
const [items, setItems] = useState(null);
const [totalRecordsNum, setTotalRecordsNum] = useState(0);
const [lazyState, setLazyState] = useState({
first: 0,
rows: 5,
page: 1,
sortField: null,
sortOrder: null,
filters: {
name: { value: '', matchMode: 'contains' }
}
});
const getPaginationQuery = () => {
return {
"globalFilters": {
"page": 0,
"limit": lazyState.rows,
"sortBy": {
"columnName": "ID",
"sortDesc": true
}
}
}
}
const onPage = (event) => {
setLazyState(event);
};
const onSort = (event) => {
setLazyState(event);
};
const onFilter = (event) => {
event['first'] = 0;
setLazyState(event);
};
const getCallback = (data) => {
if (data.status === 'SUCCESS') {
const { body, totalRecords, currentPage, totalPages, pageSize } = data.data;
setTotalRecordsNum(totalRecords);
const newItems = body.filter(o => o.status === 'PUBLISH');
setItems(getFormattedBandiData(newItems));
}
setLocalAsyncRequest(false);
}
const errGetCallbacks = (data) => {
setLocalAsyncRequest(false);
}
const getFormattedBandiData = (data) => {
return [...(data || [])].map((d) => {
d.start_date = new Date(d.dates[0]);
d.end_date = new Date(d.dates[1]);
return d;
});
};
useEffect(() => {
console.log(lazyState)
}, [lazyState]);
useEffect(() => {
if (!localAsyncRequest) {
setLocalAsyncRequest(true);
const paginationQuery = getPaginationQuery();
BandoService.getBandiPaginated(paginationQuery, getCallback, errGetCallbacks);
}
}, []);
return (
<div className="appPageSection__table">
<DataTable
value={items} stripedRows showGridlines
lazy filterDisplay="row" dataKey="id" paginator
first={lazyState.first} rows={lazyState.rows} totalRecords={totalRecordsNum} onPage={onPage}
onSort={onSort} sortField={lazyState.sortField} sortOrder={lazyState.sortOrder}
onFilter={onFilter} filters={lazyState.filters} loading={localAsyncRequest}
emptyMessage={translationStrings.emptyMessage}>
<Column field="name" filterField="name" filter
header={__('Nome Bando', 'gepafin')}
style={{ minWidth: '8rem' }}/>
</DataTable>
</div>
)
}
export default DataTableAsync;

View File

@@ -0,0 +1,153 @@
import React, { useCallback, useEffect, useRef, useState } from 'react';
import { classNames } from 'primereact/utils';
import { __ } from '@wordpress/i18n';
import { isEmpty, pluck } from 'ramda';
// components
import { ListBox } from 'primereact/listbox';
import { Button } from 'primereact/button';
import CompanyDocumentsService from '../../../../service/company-documents-service';
import { Link } from 'react-router-dom';
const FileSelect = ({
fieldName,
label,
setDataFn,
register,
errors,
defaultValue,
config = {},
infoText = null,
disabled = false,
options = [],
sourceId = 0,
source = 'DOCUMENT',
saveFormCallback
}) => {
//const [stateFieldData, setStateFieldData] = useState([]);
const stateFieldData = useRef([]);
const [selectedUnconfirmed, setSelectedUnconfirmed] = useState([]);
const [optionsTransformed, setOptionsTransformed] = useState([]);
const [loading, setLoading] = useState(false);
const attachSelectedFiles = useCallback(() => {
const existingIds = pluck('id', stateFieldData.current);
const selectedToBeAdded = selectedUnconfirmed.filter(o => !existingIds.includes(o.id));
setSelectedUnconfirmed([]);
setLoading(true);
// eslint-disable-next-line array-callback-return
selectedToBeAdded.map(o => {
CompanyDocumentsService.attachCompanyDocumentToAppl(o.id, callback, errCallback, [
['applicationId', sourceId],
['documentType', source]
])
});
}, [selectedUnconfirmed]);
const removeAttached = (id) => {
console.log('stateFieldData', stateFieldData, id)
}
const callback = (resp) => {
if (resp.status === 'SUCCESS') {
stateFieldData.current = [...stateFieldData.current, resp.data];
setDataFn(fieldName, stateFieldData.current, { shouldValidate: true });
saveFormCallback();
}
setLoading(false);
}
const errCallback = () => {
setLoading(false);
}
useEffect(() => {
console.log('selectedUnconfirmed', selectedUnconfirmed)
}, [selectedUnconfirmed]);
useEffect(() => {
stateFieldData.current = defaultValue;
register(fieldName, config)
}, []);
useEffect(() => {
if (!isEmpty(options)) {
const optionsDefault = [
{
label: __('Documenti dell\'Azienda', 'gepafin'),
code: 'COMPANY_DOCUMENT',
items: options.filter(o => o.type === 'COMPANY_DOCUMENT')
},
{
label: __('Documenti del Rappresentante Legale', 'gepafin'),
code: 'PERSONAL_DOCUMENT',
items: options.filter(o => o.type === 'PERSONAL_DOCUMENT')
}
];
setOptionsTransformed(optionsDefault);
}
}, [options]);
useEffect(() => {
stateFieldData.current = defaultValue;
}, [defaultValue]);
return (
<>
<label htmlFor={fieldName} className={classNames({ 'p-error': errors[fieldName] })}>
{label}{config.required || config.isRequired ?
<span className="appForm__field--required">*</span> : null}
</label>
<div className="fileselectInner">
<div className="fileselectInner__selectionBox">
<ListBox multiple
value={selectedUnconfirmed}
onChange={(e) => setSelectedUnconfirmed(e.value)}
options={optionsTransformed}
optionLabel="name"
optionGroupLabel="label"
optionGroupChildren="items"
className="w-full md:w-14rem"
listStyle={{ maxHeight: '130px' }}/>
{!isEmpty(optionsTransformed)
? <Button
severity="success"
disabled={loading}
onClick={attachSelectedFiles}
label={__('Conferma i file scelti', 'gepafin')}
icon="pi pi-arrow-right" size="small" iconPos="right"/> : null}
</div>
{!isEmpty(optionsTransformed)
? <div className="fileselectInner__selectedFiles">
<p>{__('I file selezionati')}</p>
<ul>
{[...stateFieldData.current].map(o => <li key={o.id}>
{o.name}
<div className="appPageSection__iconActions">
<Button icon="pi pi-times" rounded
type="button"
size="small"
onClick={() => removeAttached(o.id)}
outlined severity="danger"
aria-label={__('Cancella', 'gepafin')}/>
</div>
</li>)}
</ul>
</div> : null}
</div>
{isEmpty(optionsTransformed)
? <div className="appPageSection__message warning">
<span>
{__('I file caricati sulla pagina Documenti saranno disponibili qui. ', 'gepafin')}
<Link to={`/documenti`}>
{__('Vai alla pagina Documenti', 'gepafin')}
</Link>
</span>
</div>
: null}
{infoText ? <small>{infoText}</small> : null}
</>)
}
export default FileSelect;

View File

@@ -18,6 +18,7 @@ import Fileupload from './components/Fileupload';
import Table from './components/Table'; import Table from './components/Table';
import PasswordField from './components/PasswordField'; import PasswordField from './components/PasswordField';
import CriteriaTable from './components/CriteriaTable'; import CriteriaTable from './components/CriteriaTable';
import FileSelect from './components/FileSelect';
const FormField = (props) => { const FormField = (props) => {
const fields = { const fields = {
@@ -35,7 +36,8 @@ const FormField = (props) => {
checkboxes: Checkboxes, checkboxes: Checkboxes,
table: Table, table: Table,
criteria_table: CriteriaTable, criteria_table: CriteriaTable,
password: PasswordField password: PasswordField,
fileselect: FileSelect,
} }
const Comp = !isNil(fields[props.type]) ? fields[props.type] : null; const Comp = !isNil(fields[props.type]) ? fields[props.type] : null;

View File

@@ -14,6 +14,9 @@ const getBandoLabel = (status) => {
case 'APPROVED': case 'APPROVED':
return __('Approvato', 'gepafin'); return __('Approvato', 'gepafin');
case 'VALID':
return __('Valido', 'gepafin');
case 'READY_TO_PUBLISH': case 'READY_TO_PUBLISH':
return __('Pronto', 'gepafin'); return __('Pronto', 'gepafin');
@@ -29,6 +32,9 @@ const getBandoLabel = (status) => {
case 'ADMISSIBLE': case 'ADMISSIBLE':
return __('Ammisibile', 'gepafin'); return __('Ammisibile', 'gepafin');
case 'DUE':
return __('In scadenza', 'gepafin');
case 'RESPONSE_RECEIVED': case 'RESPONSE_RECEIVED':
return __('Riposta ricevuta', 'gepafin'); return __('Riposta ricevuta', 'gepafin');

View File

@@ -12,6 +12,9 @@ const getBandoSeverity = (status) => {
case 'APPROVED': case 'APPROVED':
return 'success'; return 'success';
case 'VALID':
return 'success';
case 'READY_TO_PUBLISH': case 'READY_TO_PUBLISH':
return 'info'; return 'info';
@@ -27,6 +30,9 @@ const getBandoSeverity = (status) => {
case 'ADMISSIBLE': case 'ADMISSIBLE':
return 'info'; return 'info';
case 'DUE':
return 'warning';
case 'RESPONSE_RECEIVED': case 'RESPONSE_RECEIVED':
return 'warning'; return 'warning';

View File

@@ -138,6 +138,13 @@ const AppSidebar = () => {
id: 15, id: 15,
enable: intersection(permissions, ['APPLY_CALLS']).length enable: intersection(permissions, ['APPLY_CALLS']).length
}, },
{
label: __('Documenti', 'gepafin'),
icon: 'pi pi-folder-open',
href: '/documenti',
id: 16,
enable: intersection(permissions, ['APPLY_CALLS']).length
},
{ {
label: __('Log di Sistema', 'gepafin'), label: __('Log di Sistema', 'gepafin'),
icon: 'pi pi-receipt', icon: 'pi pi-receipt',

View File

@@ -1,7 +1,7 @@
import React, { useState, useEffect, useRef, useMemo } from 'react'; import React, { useState, useEffect, useRef, useMemo } from 'react';
import { __, sprintf } from '@wordpress/i18n'; import { __, sprintf } from '@wordpress/i18n';
import { useParams } from 'react-router-dom'; import { useParams } from 'react-router-dom';
import { head, is, pluck, isEmpty, pathOr, isNil } from 'ramda'; import { head, is, pluck, isEmpty, pathOr, isNil, uniqBy } from 'ramda';
import { useForm } from 'react-hook-form'; import { useForm } from 'react-hook-form';
import 'quill/dist/quill.core.css'; import 'quill/dist/quill.core.css';
import { wrap } from 'object-path-immutable'; import { wrap } from 'object-path-immutable';
@@ -47,6 +47,7 @@ import FileuploadApplicationSignedPdf from '../../components/FileuploadApplicati
import { defaultMaxFileSize } from '../../configData'; import { defaultMaxFileSize } from '../../configData';
import parseCommaDecimal from '../../helpers/parseCommaDecimal'; import parseCommaDecimal from '../../helpers/parseCommaDecimal';
import CompanyDocumentsService from '../../service/company-documents-service';
const BandoApplication = () => { const BandoApplication = () => {
const chosenCompanyId = useStore().main.chosenCompanyId(); const chosenCompanyId = useStore().main.chosenCompanyId();
@@ -62,6 +63,8 @@ const BandoApplication = () => {
const [applicationStatus, setApplicationStatus] = useState(''); const [applicationStatus, setApplicationStatus] = useState('');
const [activeStep, setActiveStep] = useState(1); const [activeStep, setActiveStep] = useState(1);
const [signedPdfFile, setSignedPdfFile] = useState([]); const [signedPdfFile, setSignedPdfFile] = useState([]);
const [companyDocs, setCompanyDocs] = useState([]);
const [personalDocs, setPersonalDocs] = useState([]);
const [isRequestForApplData, setIsRequestForApplData] = useState(false); const [isRequestForApplData, setIsRequestForApplData] = useState(false);
const isAsyncRequest = useStore().main.isAsyncRequest(); const isAsyncRequest = useStore().main.isAsyncRequest();
const previousStatus = useRef(''); const previousStatus = useRef('');
@@ -217,7 +220,7 @@ const BandoApplication = () => {
} }
fieldVal = isEmpty(fieldVal) ? null : fieldVal; fieldVal = isEmpty(fieldVal) ? null : fieldVal;
if (formField && formField.name === 'fileupload') { if (formField && ['fileupload', 'fileselect'].includes(formField.name)) {
fieldVal = is(Array, fieldVal) ? fieldVal.map(o => o.id).join(',') : null; fieldVal = is(Array, fieldVal) ? fieldVal.map(o => o.id).join(',') : null;
} }
acc.push({ acc.push({
@@ -260,7 +263,7 @@ const BandoApplication = () => {
}); });
} }
if (!isEmpty(saveAndMove) && is(String, saveAndMove)) { if (!isEmpty(saveAndMove) && is(String, saveAndMove)) {
if (['NEXT','PREVIOUS'].includes(saveAndMove)) { if (['NEXT', 'PREVIOUS'].includes(saveAndMove)) {
storeSet.main.setAsyncRequest(); storeSet.main.setAsyncRequest();
ApplicationService.getApplicationForm(data.data.id, getApplFormCallback, errGetApplFormCallbacks, [ ApplicationService.getApplicationForm(data.data.id, getApplFormCallback, errGetApplFormCallbacks, [
['formId', formId], ['formId', formId],
@@ -540,6 +543,26 @@ const BandoApplication = () => {
? ['.p7m', '.pdf'] ? ['.p7m', '.pdf']
: ['.p7m']; : ['.p7m'];
const getDocsCallback = (resp, type) => {
if (resp.status === 'SUCCESS') {
const filteredPersonal = getFormattedDocsData(resp.data.filter(o => o.type === 'PERSONAL_DOCUMENT'));
setPersonalDocs(uniqBy((o) => o.id, filteredPersonal));
const filteredCompany = getFormattedDocsData(resp.data.filter(o => o.type === 'COMPANY_DOCUMENT'));
setCompanyDocs(uniqBy((o) => o.id, filteredCompany));
}
}
const errDocsGetCallbacks = () => {
}
const getFormattedDocsData = (data) => {
return data.map((d) => {
d.callEndDate = is(String, d.callEndDate) ? new Date(d.callEndDate) : (d.callEndDate ? d.callEndDate : '');
return d;
});
};
useEffect(() => { useEffect(() => {
let updatedFormValues = klona(formValues); let updatedFormValues = klona(formValues);
let context = {}; let context = {};
@@ -628,6 +651,13 @@ const BandoApplication = () => {
ApplicationService.getApplicationForm(applId, getApplFormCallback, errGetApplFormCallbacks, [ ApplicationService.getApplicationForm(applId, getApplFormCallback, errGetApplFormCallbacks, [
['companyId', chosenCompanyId] ['companyId', chosenCompanyId]
]); ]);
CompanyDocumentsService.getCompanyDocuments(chosenCompanyId, getDocsCallback, errDocsGetCallbacks);
/*CompanyDocumentsService.getCompanyDocuments(chosenCompanyId, (resp) => getDocsCallback(resp, 'COMPANY_DOCUMENT'), errDocsGetCallbacks, [
['documentType', 'COMPANY_DOCUMENT']
]);
CompanyDocumentsService.getCompanyDocuments(chosenCompanyId, (resp) => getDocsCallback(resp, 'PERSONAL_DOCUMENT'), errDocsGetCallbacks, [
['documentType', 'PERSONAL_DOCUMENT']
]);*/
} }
}, [id, chosenCompanyId]); }, [id, chosenCompanyId]);
@@ -684,7 +714,9 @@ const BandoApplication = () => {
const label = head(o.settings.filter(o => o.name === 'label')); const label = head(o.settings.filter(o => o.name === 'label'));
const text = head(o.settings.filter(o => o.name === 'text')); const text = head(o.settings.filter(o => o.name === 'text'));
const placeholder = head(o.settings.filter(o => o.name === 'placeholder')); const placeholder = head(o.settings.filter(o => o.name === 'placeholder'));
const options = head(o.settings.filter(o => o.name === 'options')); const options = ['fileselect'].includes(o.name)
? { value: [...companyDocs, ...personalDocs] }
: head(o.settings.filter(o => o.name === 'options'));
let tableColumns = head(o.settings.filter(o => o.name === 'table_columns')); let tableColumns = head(o.settings.filter(o => o.name === 'table_columns'));
if (!tableColumns) { if (!tableColumns) {
tableColumns = head(o.settings.filter(o => o.name === 'criteria_table_columns')); tableColumns = head(o.settings.filter(o => o.name === 'criteria_table_columns'));
@@ -718,9 +750,9 @@ const BandoApplication = () => {
return acc; return acc;
}, {}); }, {});
/*if (o.name === 'table') { if (o.name === 'fileselect') {
console.log('value:', values[o.id] ? values[o.id] : '') console.log('options::', options)
}*/ }
return ['paragraph'].includes(o.name) && text return ['paragraph'].includes(o.name) && text
? <div key={o.id}> ? <div key={o.id}>

View File

@@ -78,7 +78,11 @@ const BandoEditFormStep3 = forwardRef(function () {
const getElementItemsCallback = (data) => { const getElementItemsCallback = (data) => {
if (data.status === 'SUCCESS') { if (data.status === 'SUCCESS') {
//storeSet.main.elementItems(elementItems.sort((a, b) => a.sortOrder - b.sortOrder)); //storeSet.main.elementItems(elementItems.sort((a, b) => a.sortOrder - b.sortOrder));
storeSet.main.elementItems(data.data.sort((a, b) => a.sortOrder - b.sortOrder)); storeSet.main.elementItems(
data.data
.filter(o => !['fileselect'].includes(o.name))
.sort((a, b) => a.sortOrder - b.sortOrder)
);
} }
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
} }

View File

@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react'
import { useDrag, useDrop } from 'react-dnd' import { useDrag, useDrop } from 'react-dnd'
import { ItemTypes } from '../ItemTypes'; import { ItemTypes } from '../ItemTypes';
import { __ } from '@wordpress/i18n'; import { __ } from '@wordpress/i18n';
import { head, isEmpty } from 'ramda'; import { head, isEmpty, pathOr } from 'ramda';
import { klona } from 'klona'; import { klona } from 'klona';
// store // store
@@ -22,6 +22,7 @@ const BuilderElement = ({ id, name, label, index, bandoStatus }) => {
const ref = useRef(null); const ref = useRef(null);
const elements = useStore().main.formElements(); const elements = useStore().main.formElements();
const element = head(elements.filter(o => o.id === id)); const element = head(elements.filter(o => o.id === id));
const elementSettings = pathOr([], ['settings'], element);
const [isVariable, setIsVariable] = useState('secondary'); const [isVariable, setIsVariable] = useState('secondary');
const [isFormula, setIsFormula] = useState('secondary'); const [isFormula, setIsFormula] = useState('secondary');
const [variableName, setVariableName] = useState('secondary'); const [variableName, setVariableName] = useState('secondary');
@@ -134,10 +135,10 @@ const BuilderElement = ({ id, name, label, index, bandoStatus }) => {
drag(drop(ref)); drag(drop(ref));
useEffect(() => { useEffect(() => {
const variable = head(element.settings.filter(o => o.name === 'variable')); const variable = head(elementSettings.filter(o => o.name === 'variable'));
const formula = head(element.settings.filter(o => o.name === 'formula')); const formula = head(elementSettings.filter(o => o.name === 'formula'));
const isRequestedAmount = head(element.settings.filter(o => o.name === 'isRequestedAmount')); const isRequestedAmount = head(elementSettings.filter(o => o.name === 'isRequestedAmount'));
const isDelegation = head(element.settings.filter(o => o.name === 'isDelegation')); const isDelegation = head(elementSettings.filter(o => o.name === 'isDelegation'));
if (variable && !isEmpty(variable.value)) { if (variable && !isEmpty(variable.value)) {
setIsVariable('warning'); setIsVariable('warning');
@@ -151,12 +152,16 @@ const BuilderElement = ({ id, name, label, index, bandoStatus }) => {
if (isRequestedAmount && !isEmpty(isRequestedAmount.value) && isRequestedAmount.value) { if (isRequestedAmount && !isEmpty(isRequestedAmount.value) && isRequestedAmount.value) {
setIsRequestedAmount('tertiary'); setIsRequestedAmount('tertiary');
} else {
setIsRequestedAmount(false);
} }
if (isDelegation && !isEmpty(isDelegation.value) && isDelegation.value) { if (isDelegation && !isEmpty(isDelegation.value) && isDelegation.value) {
setIsDelegation('tertiary'); setIsDelegation('tertiary');
} else {
setIsDelegation(false);
} }
}, [elements]); }, [elementSettings]);
return ( return (
draggingElementId === id draggingElementId === id

View File

@@ -24,7 +24,7 @@ import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
import BandoService from '../../service/bando-service'; import BandoService from '../../service/bando-service';
// TODO temp data // TODO temp data
//import { elementItems } from '../../tempData'; import { elementItems } from '../../tempData';
const BandoFormsEdit = () => { const BandoFormsEdit = () => {
const { id, formId } = useParams(); const { id, formId } = useParams();
@@ -215,10 +215,10 @@ const BandoFormsEdit = () => {
const getElementItemsCallback = (data) => { const getElementItemsCallback = (data) => {
if (data.status === 'SUCCESS') { if (data.status === 'SUCCESS') {
//storeSet.main.elementItems(elementItems.sort((a, b) => a.sortOrder - b.sortOrder)); storeSet.main.elementItems(elementItems.sort((a, b) => a.sortOrder - b.sortOrder));
storeSet.main.elementItems(data.data /*storeSet.main.elementItems(data.data
.filter(o => o.id !== 22) .filter(o => o.id !== 22)
.sort((a, b) => a.sortOrder - b.sortOrder)); .sort((a, b) => a.sortOrder - b.sortOrder));*/
} }
storeSet.main.unsetAsyncRequest(); storeSet.main.unsetAsyncRequest();
} }

View File

@@ -0,0 +1,194 @@
import React, { useEffect, useState, useCallback } from 'react';
import { __ } from '@wordpress/i18n';
import translationStrings from '../../../../translationStringsForComponents';
// api
import BandoService from '../../../../service/bando-service';
// components
import { DataTable } from 'primereact/datatable';
import { Column } from 'primereact/column';
import { Link } from 'react-router-dom';
import { Button } from 'primereact/button';
import ProperBandoLabel from '../../../../components/ProperBandoLabel';
import { Dropdown } from 'primereact/dropdown';
import { Tag } from 'primereact/tag';
import getBandoLabel from '../../../../helpers/getBandoLabel';
import getBandoSeverity from '../../../../helpers/getBandoSeverity';
const LatestBandiTableAsync = () => {
const [localAsyncRequest, setLocalAsyncRequest] = useState(false);
const [items, setItems] = useState(null);
const [totalRecordsNum, setTotalRecordsNum] = useState(0);
const [lazyState, setLazyState] = useState({
first: 0,
rows: 5,
page: 0,
sortField: null,
sortOrder: null,
filters: {
name: { value: '', matchMode: 'contains' },
status: { value: '', matchMode: 'contains' }
}
});
const statuses = ['PUBLISH'];
const getPaginationQuery = useCallback(() => {
let sortBy = {
"columnName": "ID",
"sortDesc": true
};
if (lazyState.sortField) {
sortBy = {
"columnName": lazyState.sortField,
"sortDesc": lazyState.sortOrder === -1
}
}
return {
"globalFilters": {
"page": lazyState.page ? lazyState.page + 1 : 1,
"limit": lazyState.rows,
sortBy,
status: statuses
}
}
}, [lazyState]);
const onPage = (event) => {
console.log('onPage', event);
setLazyState(event);
};
const onSort = (event) => {
console.log('onSort', event);
setLazyState(event);
};
const onFilter = useCallback((event) => {
console.log('onFilter', event);
event['first'] = 0;
setLazyState(event);
}, [lazyState]);
const getCallback = (data) => {
if (data.status === 'SUCCESS') {
const { body, totalRecords, currentPage, totalPages, pageSize } = data.data;
setTotalRecordsNum(totalRecords);
//const newItems = body.filter(o => o.status === 'PUBLISH');
setItems(getFormattedBandiData(body));
}
setLocalAsyncRequest(false);
}
const errGetCallbacks = (data) => {
setLocalAsyncRequest(false);
}
const getFormattedBandiData = (data) => {
return [...(data || [])].map((d) => {
d.start_date = new Date(d.dates[0]);
d.end_date = new Date(d.dates[1]);
return d;
});
};
const actionsBodyTemplate = (rowData) => {
return <Link to={`/bandi/${rowData.id}`}>
<Button severity="info" label={__('Modifica', 'gepafin')} icon="pi pi-pencil" size="small" iconPos="right" />
</Link>
}
const statusBodyTemplate = (rowData) => {
return <ProperBandoLabel status={rowData.status}/>;
};
const statusItemTemplate = (option) => {
return <Tag value={getBandoLabel(option)} severity={getBandoSeverity(option)}/>;
};
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
onChange={(e) => {
options.filterCallback(e.value, options.index)
const filters = { ...lazyState.filters };
if (e.value) {
filters['status'] = { value: e.value, matchMode: 'equals' };
} else {
delete filters['status'];
}
setLazyState({ ...lazyState, filters, first: 0 });
}}
itemTemplate={statusItemTemplate} placeholder={translationStrings.selectOneLabel} className="p-column-filter"
showClear/>;
};
const dateStartBodyTemplate = (rowData) => {
return formatDate(rowData.start_date);
};
const dateEndBodyTemplate = (rowData) => {
return formatDate(rowData.end_date);
};
const formatDate = (value) => {
return value.toLocaleDateString('it-IT', {
day: '2-digit',
month: '2-digit',
year: 'numeric'
});
};
useEffect(() => {
console.log('lazyState', lazyState)
/*const paginationQuery = getPaginationQuery();
console.log('paginationQuery', paginationQuery)*/
setLocalAsyncRequest(true);
const paginationQuery = getPaginationQuery();
console.log('paginationQuery', paginationQuery)
BandoService.getBandiPaginated(paginationQuery, getCallback, errGetCallbacks);
}, [lazyState]);
useEffect(() => {
if (!localAsyncRequest) {
setLocalAsyncRequest(true);
const paginationQuery = getPaginationQuery();
BandoService.getBandiPaginated(paginationQuery, getCallback, errGetCallbacks);
}
}, []);
return (
<div className="appPageSection__table">
<DataTable
value={items} stripedRows showGridlines
lazy filterDisplay="menu" dataKey="id" paginator
first={lazyState.first} rows={lazyState.rows} totalRecords={totalRecordsNum} onPage={onPage}
onSort={onSort} sortField={lazyState.sortField} sortOrder={lazyState.sortOrder}
onFilter={onFilter} filters={lazyState.filters} loading={localAsyncRequest}
emptyMessage={translationStrings.emptyMessage}>
<Column field="name"
sortable
filterField="name" filter filterMatchModeOptions={['contains']}
header={__('Nome Bando', 'gepafin')}
style={{ minWidth: '8rem' }}/>
<Column header={__('Data Pubblicazione', 'gepafin')}
style={{ minWidth: '8rem' }}
body={dateStartBodyTemplate}/>
<Column header={__('Data Scadenza', 'gepafin')}
style={{ minWidth: '8rem' }}
body={dateEndBodyTemplate}/>
<Column field="status"
filterElement={statusFilterTemplate} filter filterMatchModeOptions={['contains']}
header={__('Stato', 'gepafin')}
style={{ minWidth: '7rem' }}
body={statusBodyTemplate} />
<Column header={__('Azioni', 'gepafin')}
body={actionsBodyTemplate}/>
</DataTable>
</div>
)
}
export default LatestBandiTableAsync;

View File

@@ -14,6 +14,7 @@ import AllDomandeTable from '../Domande/components/AllDomandeTable';
import DraftApplicationsTable from './components/DraftApplicationsTable'; import DraftApplicationsTable from './components/DraftApplicationsTable';
import ChartDomandePerBando from '../../components/ChartDomandePerBando'; import ChartDomandePerBando from '../../components/ChartDomandePerBando';
import ChartStatoDomande from '../../components/ChartStatoDomande'; import ChartStatoDomande from '../../components/ChartStatoDomande';
import LatestBandiTableAsync from './components/LatestBandiTableAsync';
const Dashboard = () => { const Dashboard = () => {
const navigate = useNavigate(); const navigate = useNavigate();
@@ -136,7 +137,8 @@ const Dashboard = () => {
<div className="appPageSection"> <div className="appPageSection">
<h2>{__('Ultimi bandi pubblicati', 'gepafin')}</h2> <h2>{__('Ultimi bandi pubblicati', 'gepafin')}</h2>
<LatestBandiTable/> <LatestBandiTableAsync/>
{/*<LatestBandiTable/>*/}
</div> </div>
<div className="appPage__spacer"></div> <div className="appPage__spacer"></div>

View File

@@ -0,0 +1,221 @@
import React, { useState, useEffect } from 'react';
import { __ } from '@wordpress/i18n';
import { is, uniq } from 'ramda';
import copy from 'copy-to-clipboard';
import { Link } from 'react-router-dom';
// store
import { useStore } from '../../../../store';
// tools
import getBandoSeverity from '../../../../helpers/getBandoSeverity';
import getBandoLabel from '../../../../helpers/getBandoLabel';
import getDateFromISOstring from '../../../../helpers/getDateFromISOstring';
// api
import CompanyDocumentsService from '../../../../service/company-documents-service';
// components
import { FilterMatchMode, FilterOperator } from 'primereact/api';
import { DataTable } from 'primereact/datatable';
import { Column } from 'primereact/column';
import { Dropdown } from 'primereact/dropdown';
import { Button } from 'primereact/button';
import { Calendar } from 'primereact/calendar';
import { Tag } from 'primereact/tag';
import ProperBandoLabel from '../../../../components/ProperBandoLabel';
import translationStrings from '../../../../translationStringsForComponents';
import { confirmPopup, ConfirmPopup } from 'primereact/confirmpopup';
const DocumentsTable = ({ type, reload = 0 }) => {
const chosenCompanyId = useStore().main.chosenCompanyId();
const [docs, setDocs] = useState([]);
const [filters, setFilters] = useState(null);
const [loading, setLoading] = useState(false);
const [statuses, setStatuses] = useState([]);
useEffect(() => {
if (!loading && chosenCompanyId && chosenCompanyId !== 0 && reload !== 0) {
setLoading(true);
CompanyDocumentsService.getCompanyDocuments(chosenCompanyId, getCallback, errGetCallbacks, [
['documentType', type]
]);
}
}, [chosenCompanyId, reload]);
useEffect(() => {
setLoading(true);
CompanyDocumentsService.getCompanyDocuments(chosenCompanyId, getCallback, errGetCallbacks, [
['documentType', type]
]);
}, []);
const getCallback = (resp) => {
if (resp.status === 'SUCCESS') {
setDocs(getFormattedData(resp.data));
setStatuses(uniq(resp.data.map(o => o.status)))
initFilters();
}
setLoading(false);
}
const errGetCallbacks = () => {
setLoading(false);
}
const getFormattedData = (data) => {
return data.map((d) => {
d.callEndDate = is(String, d.callEndDate) ? new Date(d.callEndDate) : (d.callEndDate ? d.callEndDate : '');
return d;
});
};
const clearFilter = () => {
initFilters();
};
const initFilters = () => {
setFilters({
name: {
operator: FilterOperator.AND,
constraints: [{ value: null, matchMode: FilterMatchMode.STARTS_WITH }]
},
createdDate: {
operator: FilterOperator.AND,
constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
},
expirationDate: {
operator: FilterOperator.AND,
constraints: [{ value: null, matchMode: FilterMatchMode.DATE_IS }]
}
});
};
const renderHeader = () => {
return (
<div className="appTableHeader">
<Button type="button" icon="pi pi-filter-slash" label={__('Pulisci', 'gepafin')} outlined
onClick={clearFilter}/>
</div>
);
};
const dateCreatedBodyTemplate = (rowData) => {
return getDateFromISOstring(rowData.createdDate);
};
const dateExpirationBodyTemplate = (rowData) => {
return getDateFromISOstring(rowData.expirationDate);
};
const dateFilterTemplate = (options) => {
return <Calendar value={options.value} onChange={(e) => options.filterCallback(e.value, options.index)}
dateFormat="mm/dd/yy" placeholder="mm/dd/yyyy" mask="99/99/9999"/>;
};
const catBodyTemplate = (rowData) => {
return rowData.category.categoryName;
};
const statusBodyTemplate = (rowData) => {
return <ProperBandoLabel status={rowData.status}/>;
};
const statusFilterTemplate = (options) => {
return <Dropdown value={options.value} options={statuses}
onChange={(e) => options.filterCallback(e.value, options.index)}
itemTemplate={statusItemTemplate} placeholder={__('Scegli uno', 'gepafin')}
className="p-column-filter"
showClear/>;
};
const statusItemTemplate = (option) => {
return <Tag value={getBandoLabel(option)} severity={getBandoSeverity(option)}/>;
};
const handleDeleteFile = (id) => {
setLoading(true);
CompanyDocumentsService.deleteCompanyDocument(id,(resp) => deleteCallback(resp, id), errDeleteCallback)
}
const deleteCallback = (resp, deletedId) => {
if (resp.status === 'SUCCESS') {
setDocs(docs.filter(o => o.id !== deletedId));
}
setLoading(false);
}
const errDeleteCallback = () => {
setLoading(false);
}
const actionsBodyTemplate = (rowData) => {
return <div className="appPageSection__iconActions">
<Button icon="pi pi-eye" rounded
onClick={() => {
window.open(rowData.filePath, '_blank').focus()
}}
outlined severity="info"
aria-label={__('Mostra', 'gepafin')}/>
{/*<Button icon="pi pi-sync" rounded
onClick={() => {}}
outlined severity="success"
aria-label={__('Aggiorna', 'gepafin')}/>*/}
<ConfirmPopup/>
<Button icon="pi pi-trash" rounded
onClick={(event) => confirmDelete(event, rowData.id)}
outlined severity="danger"
aria-label={__('Cancella', 'gepafin')}/>
</div>
}
const confirmDelete = (event, id) => {
confirmPopup({
target: event.currentTarget,
message: __('Sei sicuro di voler rimuovere il file?', 'gepafin'),
acceptLabel: __('Si', 'gepafin'),
icon: 'pi pi-info-circle',
defaultFocus: 'reject',
acceptClassName: 'p-button-danger',
accept: () => {
handleDeleteFile(id);
},
reject: () => {
}
});
};
const header = renderHeader();
return (
<div className="appPageSection__table">
<DataTable value={docs} paginator showGridlines rows={5} loading={loading} dataKey="id"
filters={filters} stripedRows removableSort
header={header}
onFilter={(e) => setFilters(e.filters)}>
<Column field="name"
header={__('Nome documento', 'gepafin')}
filter filterField="name"
filterPlaceholder={__('Cerca per nome', 'gepafin')}
style={{ minWidth: '12rem' }}/>
<Column body={catBodyTemplate} header={__('Categoria', 'gepafin')}
style={{ minWidth: '8rem' }}/>
<Column header={__('Data caricamento', 'gepafin')}
filterField="createdDate" dataType="date"
style={{ minWidth: '7rem' }}
body={dateCreatedBodyTemplate} filter filterElement={dateFilterTemplate}/>
<Column header={__('Data scadenza', 'gepafin')}
filterField="expirationDate" dataType="date"
style={{ minWidth: '7rem' }}
body={dateExpirationBodyTemplate} filter filterElement={dateFilterTemplate}/>
<Column field="status" header={__('Stato', 'gepafin')}
filterMenuStyle={{ width: '14rem' }}
style={{ width: '120px' }} body={statusBodyTemplate}
filterElement={statusFilterTemplate}/>
<Column header={__('Azioni', 'gepafin')}
body={actionsBodyTemplate}/>
</DataTable>
</div>
)
}
export default DocumentsTable;

View File

@@ -0,0 +1,230 @@
import React, { useCallback, useEffect, useState } from 'react';
import { __ } from '@wordpress/i18n';
import { classNames } from 'primereact/utils';
import { wrap } from 'object-path-immutable';
import { isEmpty, isNil } from 'ramda';
// api
import DocumentCategoryService from '../../service/document-category-service';
// components
import DocumentsTable from './components/DocumentsTable';
import { Dialog } from 'primereact/dialog';
import { Button } from 'primereact/button';
import { Dropdown } from 'primereact/dropdown';
import { InputText } from 'primereact/inputtext';
import { useStore } from '../../store';
import { Calendar } from 'primereact/calendar';
import { FileUpload } from 'primereact/fileupload';
import formatDateString from '../../helpers/formatDateString';
import CompanyDocumentsService from '../../service/company-documents-service';
const DocumentsBeneficiary = () => {
const [loading, setLoading] = useState(false);
const chosenCompanyId = useStore().main.chosenCompanyId();
const [isVisibleAddNewDialog, setIsVisibleAddNewDialog] = useState(false);
const [categories, setCategories] = useState(false);
const [newFileData, setNewFileData] = useState({});
const [fileAttached, setFileAttached] = useState([]);
const [reloadHash, setReloadHash] = useState(0);
const today = new Date();
const tomorrow = new Date(today);
tomorrow.setDate(today.getDate() + 1);
const onCreateNew = useCallback((type) => {
const newData = wrap({})
.set(['documentType'], type)
.set(['documentCategoryId'], 0)
.set(['expirationDate'], '')
.set(['name'], '')
.value();
setNewFileData(newData);
setFileAttached([]);
setIsVisibleAddNewDialog(true);
}, [newFileData, chosenCompanyId]);
const hideAddNewDialog = () => {
setIsVisibleAddNewDialog(false);
const newData = wrap({})
.set(['documentType'], '')
.set(['documentCategoryId'], 0)
.set(['expirationDate'], '')
.set(['name'], '')
.value();
setNewFileData(newData);
setFileAttached([]);
}
const headerAddNewDialog = () => {
return <span>{__('Aggiungi file', 'gepafin')}</span>
}
const footerAddNewDialog = () => {
return <div>
<Button type="button" label={__('Anulla', 'gepafin')} onClick={hideAddNewDialog} outlined/>
<Button
type="button"
disabled={loading || !isValidForm()}
label={__('Salva', 'gepafin')} onClick={doAddNew}/>
</div>
}
const isValidForm = useCallback(() => {
return !isEmpty(fileAttached) && !Object.keys(newFileData).filter(k => isInvalidField(newFileData, k)
|| newFileData[k] === 0).length
}, [fileAttached, newFileData]);
const doAddNew = useCallback(() => {
const submitData = {
...newFileData,
expirationDate: formatDateString(newFileData.expirationDate)
}
const queryParams = Object.keys(submitData).map(k => [
k, submitData[k]
]);
if (!isEmpty(fileAttached)) {
const formData = new FormData()
for (const file of fileAttached) {
formData.append('file', file)
}
setLoading(true);
CompanyDocumentsService.uploadCompanyDocument(chosenCompanyId, formData, uploadDoc, errUploadDoc, queryParams);
}
}, [fileAttached, newFileData, chosenCompanyId]);
const uploadDoc = (resp) => {
if (resp.status === 'SUCCESS') {
hideAddNewDialog();
setReloadHash(new Date().getTime())
}
setLoading(false);
}
const errUploadDoc = () => {
setLoading(false);
}
const isInvalidField = (data, key) => isEmpty(data[key]) || isNil(data[key]);
const onUpdateFieldValue = useCallback((value, name) => {
const newData = wrap(newFileData).set([name], value).value();
setNewFileData(newData);
}, [newFileData]);
const onFileSelect = (file) => {
setFileAttached(file.files);
}
const getCategories = (resp) => {
if (resp.status === 'SUCCESS') {
setCategories(resp.data.map(o => ({value: o.id, label: o.description})));
}
setLoading(false);
}
const errGetCategories = () => {
setLoading(false);
}
useEffect(() => {
setLoading(true);
DocumentCategoryService.getCategories(getCategories, errGetCategories)
}, []);
return(
<div className="appPage">
<div className="appPage__pageHeader">
<h1>{__('Gestione documenti', 'gepafin')}</h1>
</div>
<div className="appPage__spacer"></div>
<div className="appPageSection statsBigBadges">
<h2>
{__('Documenti del rappresentante legale', 'gepafin')}
<Button
onClick={() => onCreateNew('PERSONAL_DOCUMENT')}
size="small"
label={__('Aggiungi nuovo')} icon="pi pi-plus" iconPos="right"/>
</h2>
<DocumentsTable type="PERSONAL_DOCUMENT" reload={reloadHash}/>
</div>
<div className="appPage__spacer"></div>
<div className="appPageSection statsBigBadges">
<h2>
{__('Documenti dell\'azienda', 'gepafin')}
<Button
onClick={() => onCreateNew('COMPANY_DOCUMENT')}
size="small"
label={__('Aggiungi nuovo')} icon="pi pi-plus" iconPos="right"/>
</h2>
<DocumentsTable type="COMPANY_DOCUMENT" reload={reloadHash}/>
</div>
<Dialog
visible={isVisibleAddNewDialog}
modal
header={headerAddNewDialog}
footer={footerAddNewDialog}
style={{ maxWidth: '600px', width: '100%' }}
onHide={hideAddNewDialog}>
<div className="appForm__cols">
<div className="appForm__field">
<label
className={classNames({ 'p-error': isInvalidField(newFileData, 'name') })}>
{__('Nome', 'gepafin')}*
</label>
<InputText value={newFileData.name}
invalid={isInvalidField(newFileData, 'name')}
onChange={(e) => onUpdateFieldValue(e.target.value, 'name')}/>
</div>
<div className="appForm__field">
<label
className={classNames({ 'p-error': isInvalidField(newFileData, 'documentCategoryId') || newFileData.documentCategoryId === 0 })}>
{__('Categoria', 'gepafin')}*
</label>
<Dropdown
value={newFileData.documentCategoryId}
invalid={isEmpty(newFileData.documentCategoryId) || isNil(newFileData.documentCategoryId) || newFileData.documentCategoryId === 0}
onChange={(e) => onUpdateFieldValue(e.value, 'documentCategoryId')}
options={categories}
optionLabel="label"
optionValue="value"/>
</div>
</div>
<div className="appForm__cols">
<div className="appForm__field">
<label
className={classNames({ 'p-error': isEmpty(newFileData.expirationDate) || isNil(newFileData.expirationDate) })}>
{__('Scadenza', 'gepafin')}*
</label>
<Calendar
value={newFileData.expirationDate}
minDate={tomorrow}
invalid={isEmpty(newFileData.expirationDate) || isNil(newFileData.expirationDate) || newFileData.expirationDate === 0}
onChange={(e) => onUpdateFieldValue(e.value, 'expirationDate')}/>
</div>
</div>
<div className="appForm__cols">
<div className="appForm__field">
<label
className={classNames({ 'p-error': isEmpty(newFileData.file) || isNil(newFileData.expirationDate) })}>
{__('File', 'gepafin')}*
</label>
<FileUpload
mode="basic"
name="file"
onSelect={onFileSelect}/>
</div>
</div>
</Dialog>
</div>
)
}
export default DocumentsBeneficiary;

View File

@@ -51,6 +51,7 @@ import SoccorsoEditInstructorManager from './pages/SoccorsoEditInstructorManager
import SoccorsoIstruttorioInstructorManager from './pages/SoccorsoIstruttorioInstructorManager'; import SoccorsoIstruttorioInstructorManager from './pages/SoccorsoIstruttorioInstructorManager';
import SoccorsoIstruttorioMioInstructorManager from './pages/SoccorsoIstruttorioMioInstructorManager'; import SoccorsoIstruttorioMioInstructorManager from './pages/SoccorsoIstruttorioMioInstructorManager';
import StatsBeneficiary from './pages/StatsBeneficiary'; import StatsBeneficiary from './pages/StatsBeneficiary';
import DocumentsBeneficiary from './pages/DocumentsBeneficiary';
const routes = ({ role, chosenCompanyId }) => { const routes = ({ role, chosenCompanyId }) => {
@@ -243,6 +244,12 @@ const routes = ({ role, chosenCompanyId }) => {
{'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null} {'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
{'ROLE_INSTRUCTOR_MANAGER' === role ? <PageNotFound/> : null} {'ROLE_INSTRUCTOR_MANAGER' === role ? <PageNotFound/> : null}
</DefaultLayout>}/> </DefaultLayout>}/>
<Route path="/documenti" element={<DefaultLayout>
{'ROLE_SUPER_ADMIN' === role ? <PageNotFound/> : null}
{'ROLE_BENEFICIARY' === role ? <DocumentsBeneficiary/> : null}
{'ROLE_PRE_INSTRUCTOR' === role ? <PageNotFound/> : null}
{'ROLE_INSTRUCTOR_MANAGER' === role ? <PageNotFound/> : null}
</DefaultLayout>}/>
</Route> </Route>
<Route exact path="/reset-password" element={<ResetPassword/>}/> <Route exact path="/reset-password" element={<ResetPassword/>}/>
<Route exact path="/login" element={<Login/>}/> <Route exact path="/login" element={<Login/>}/>

View File

@@ -0,0 +1,24 @@
import { NetworkService } from './network-service';
const API_BASE_URL = process.env.REACT_APP_API_EXECUTION_ADDRESS;
export default class CompanyDocumentsService {
static getCompanyDocuments = (companyId, callback, errCallback, queryParams) => {
NetworkService.get(`${API_BASE_URL}/companyDocument/company/${companyId}`, callback, errCallback, queryParams);
};
static uploadCompanyDocument = (id, body, callback, errCallback, queryParams) => {
NetworkService.postMultiPart(`${API_BASE_URL}/companyDocument/company/${id}/upload`, body, callback, errCallback, queryParams);
};
static attachCompanyDocumentToAppl = (id, callback, errCallback, queryParams) => {
NetworkService.put(`${API_BASE_URL}/companyDocument/${id}/document/upload`, {}, callback, errCallback, queryParams);
};
static deleteCompanyDocument = (id, callback, errCallback) => {
NetworkService.delete(`${API_BASE_URL}/companyDocument`, {}, callback, errCallback, [
['id', id]
]);
};
}

View File

@@ -0,0 +1,10 @@
import { NetworkService } from './network-service';
const API_BASE_URL = process.env.REACT_APP_API_EXECUTION_ADDRESS;
export default class DocumentCategoryService {
static getCategories = (callback, errCallback) => {
NetworkService.get(`${API_BASE_URL}/documentCategory`, callback, errCallback);
};
}

View File

@@ -483,5 +483,25 @@ export const elementItems = [
validators: { validators: {
isRequired: false isRequired: false
} }
},
{
id: 23,
sortOrder: 23,
name: 'fileselect',
label: 'Seleziona File',
description: "Per selezionare di documenti o immagini",
settings: [
{
name: "label",
value: "Seleziona File"
},
{
name: "isDelegation",
value: false
}
],
validators: {
isRequired: false
}
} }
] ]