diff --git a/src/pages/BandoEdit/components/BandoEditFormStep3/index.js b/src/pages/BandoEdit/components/BandoEditFormStep3/index.js
index b67b93f..e9db65c 100644
--- a/src/pages/BandoEdit/components/BandoEditFormStep3/index.js
+++ b/src/pages/BandoEdit/components/BandoEditFormStep3/index.js
@@ -78,7 +78,11 @@ const BandoEditFormStep3 = forwardRef(function () {
const getElementItemsCallback = (data) => {
if (data.status === 'SUCCESS') {
//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();
}
diff --git a/src/pages/BandoFormsEdit/components/BuilderElement/index.js b/src/pages/BandoFormsEdit/components/BuilderElement/index.js
index d0acc67..6fda4b4 100644
--- a/src/pages/BandoFormsEdit/components/BuilderElement/index.js
+++ b/src/pages/BandoFormsEdit/components/BuilderElement/index.js
@@ -2,7 +2,7 @@ import React, { useCallback, useEffect, useRef, useState } from 'react'
import { useDrag, useDrop } from 'react-dnd'
import { ItemTypes } from '../ItemTypes';
import { __ } from '@wordpress/i18n';
-import { head, isEmpty } from 'ramda';
+import { head, isEmpty, pathOr } from 'ramda';
import { klona } from 'klona';
// store
@@ -22,6 +22,7 @@ const BuilderElement = ({ id, name, label, index, bandoStatus }) => {
const ref = useRef(null);
const elements = useStore().main.formElements();
const element = head(elements.filter(o => o.id === id));
+ const elementSettings = pathOr([], ['settings'], element);
const [isVariable, setIsVariable] = useState('secondary');
const [isFormula, setIsFormula] = useState('secondary');
const [variableName, setVariableName] = useState('secondary');
@@ -134,10 +135,10 @@ const BuilderElement = ({ id, name, label, index, bandoStatus }) => {
drag(drop(ref));
useEffect(() => {
- const variable = head(element.settings.filter(o => o.name === 'variable'));
- const formula = head(element.settings.filter(o => o.name === 'formula'));
- const isRequestedAmount = head(element.settings.filter(o => o.name === 'isRequestedAmount'));
- const isDelegation = head(element.settings.filter(o => o.name === 'isDelegation'));
+ const variable = head(elementSettings.filter(o => o.name === 'variable'));
+ const formula = head(elementSettings.filter(o => o.name === 'formula'));
+ const isRequestedAmount = head(elementSettings.filter(o => o.name === 'isRequestedAmount'));
+ const isDelegation = head(elementSettings.filter(o => o.name === 'isDelegation'));
if (variable && !isEmpty(variable.value)) {
setIsVariable('warning');
@@ -151,12 +152,16 @@ const BuilderElement = ({ id, name, label, index, bandoStatus }) => {
if (isRequestedAmount && !isEmpty(isRequestedAmount.value) && isRequestedAmount.value) {
setIsRequestedAmount('tertiary');
+ } else {
+ setIsRequestedAmount(false);
}
if (isDelegation && !isEmpty(isDelegation.value) && isDelegation.value) {
setIsDelegation('tertiary');
+ } else {
+ setIsDelegation(false);
}
- }, [elements]);
+ }, [elementSettings]);
return (
draggingElementId === id
diff --git a/src/pages/BandoFormsEdit/index.js b/src/pages/BandoFormsEdit/index.js
index e739c89..2c55a2b 100644
--- a/src/pages/BandoFormsEdit/index.js
+++ b/src/pages/BandoFormsEdit/index.js
@@ -24,7 +24,7 @@ import set404FromErrorResponse from '../../helpers/set404FromErrorResponse';
import BandoService from '../../service/bando-service';
// TODO temp data
-//import { elementItems } from '../../tempData';
+import { elementItems } from '../../tempData';
const BandoFormsEdit = () => {
const { id, formId } = useParams();
@@ -215,10 +215,10 @@ const BandoFormsEdit = () => {
const getElementItemsCallback = (data) => {
if (data.status === 'SUCCESS') {
- //storeSet.main.elementItems(elementItems.sort((a, b) => a.sortOrder - b.sortOrder));
- storeSet.main.elementItems(data.data
+ storeSet.main.elementItems(elementItems.sort((a, b) => a.sortOrder - b.sortOrder));
+ /*storeSet.main.elementItems(data.data
.filter(o => o.id !== 22)
- .sort((a, b) => a.sortOrder - b.sortOrder));
+ .sort((a, b) => a.sortOrder - b.sortOrder));*/
}
storeSet.main.unsetAsyncRequest();
}
diff --git a/src/pages/Dashboard/components/LatestBandiTableAsync/index.js b/src/pages/Dashboard/components/LatestBandiTableAsync/index.js
new file mode 100644
index 0000000..71421ff
--- /dev/null
+++ b/src/pages/Dashboard/components/LatestBandiTableAsync/index.js
@@ -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
+
+
+ }
+
+ const statusBodyTemplate = (rowData) => {
+ return
;
+ };
+
+ const statusItemTemplate = (option) => {
+ return ;
+ };
+
+ const statusFilterTemplate = (options) => {
+ return {
+ 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 (
+
+
+
+
+
+
+
+
+
+ )
+}
+
+export default LatestBandiTableAsync;
\ No newline at end of file
diff --git a/src/pages/Dashboard/index.js b/src/pages/Dashboard/index.js
index e7e7585..48c47d9 100644
--- a/src/pages/Dashboard/index.js
+++ b/src/pages/Dashboard/index.js
@@ -14,6 +14,7 @@ import AllDomandeTable from '../Domande/components/AllDomandeTable';
import DraftApplicationsTable from './components/DraftApplicationsTable';
import ChartDomandePerBando from '../../components/ChartDomandePerBando';
import ChartStatoDomande from '../../components/ChartStatoDomande';
+import LatestBandiTableAsync from './components/LatestBandiTableAsync';
const Dashboard = () => {
const navigate = useNavigate();
@@ -136,7 +137,8 @@ const Dashboard = () => {
{__('Ultimi bandi pubblicati', 'gepafin')}
-
+
+ {/**/}
diff --git a/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js b/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js
new file mode 100644
index 0000000..6089454
--- /dev/null
+++ b/src/pages/DocumentsBeneficiary/components/DocumentsTable/index.js
@@ -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 (
+
+
+ );
+ };
+
+ const dateCreatedBodyTemplate = (rowData) => {
+ return getDateFromISOstring(rowData.createdDate);
+ };
+ const dateExpirationBodyTemplate = (rowData) => {
+ return getDateFromISOstring(rowData.expirationDate);
+ };
+
+ const dateFilterTemplate = (options) => {
+ return 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 ;
+ };
+
+ const statusFilterTemplate = (options) => {
+ return options.filterCallback(e.value, options.index)}
+ itemTemplate={statusItemTemplate} placeholder={__('Scegli uno', 'gepafin')}
+ className="p-column-filter"
+ showClear/>;
+ };
+
+ const statusItemTemplate = (option) => {
+ return ;
+ };
+
+ 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
+
+ }
+
+ 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 (
+
+ setFilters(e.filters)}>
+
+
+
+
+
+
+
+
+ )
+}
+
+export default DocumentsTable;
diff --git a/src/pages/DocumentsBeneficiary/index.js b/src/pages/DocumentsBeneficiary/index.js
new file mode 100644
index 0000000..7f99c92
--- /dev/null
+++ b/src/pages/DocumentsBeneficiary/index.js
@@ -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 {__('Aggiungi file', 'gepafin')}
+ }
+
+ const footerAddNewDialog = () => {
+ return
+
+
+ }
+
+ 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(
+
+
+
{__('Gestione documenti', 'gepafin')}
+
+
+
+
+
+
+ {__('Documenti del rappresentante legale', 'gepafin')}
+
+
+
+
+
+
+
+
+ {__('Documenti dell\'azienda', 'gepafin')}
+
+
+
+
+
+