Merge branch 'develop' into feature/130-table-async
This commit is contained in:
@@ -126,7 +126,7 @@ const DraftApplicationsTable = () => {
|
||||
};
|
||||
|
||||
const actionsBodyTemplate = (rowData) => {
|
||||
return <Link to={`/domande/${rowData.id}`}>
|
||||
return <Link to={`/domande/${rowData.id}/preview`}>
|
||||
<Button severity="info" label={__('Anteprima', 'gepafin')} icon="pi pi-eye" size="small"
|
||||
iconPos="right"/>
|
||||
</Link>
|
||||
|
||||
@@ -14,6 +14,8 @@ import { Calendar } from 'primereact/calendar';
|
||||
import ProperBandoLabel from '../../../../components/ProperBandoLabel';
|
||||
import { Link } from 'react-router-dom';
|
||||
import translationStrings from '../../../../translationStringsForComponents';
|
||||
import getTimeParsedFromString from '../../../../helpers/getTimeParsedFromString';
|
||||
import getTimeFromISOstring from '../../../../helpers/getTimeFromISOstring';
|
||||
|
||||
|
||||
const LatestBandiTable = () => {
|
||||
@@ -107,11 +109,13 @@ const LatestBandiTable = () => {
|
||||
};
|
||||
|
||||
const dateStartBodyTemplate = (rowData) => {
|
||||
return formatDate(rowData.start_date);
|
||||
const startTimeObj = getTimeParsedFromString(rowData.startTime);
|
||||
return formatDate(rowData.start_date) + ' ' + getTimeFromISOstring(startTimeObj);
|
||||
};
|
||||
|
||||
const dateEndBodyTemplate = (rowData) => {
|
||||
return formatDate(rowData.end_date);
|
||||
const endTimeObg = getTimeParsedFromString(rowData.endTime);
|
||||
return formatDate(rowData.end_date) + ' ' + getTimeFromISOstring(endTimeObg);
|
||||
};
|
||||
|
||||
const dateFilterTemplate = (options) => {
|
||||
|
||||
Reference in New Issue
Block a user