Merge branch 'develop' into feature/130-table-async

This commit is contained in:
Vitalii Kiiko
2025-02-26 11:11:16 +01:00
14 changed files with 286 additions and 87 deletions

View File

@@ -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>

View File

@@ -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) => {

View File

@@ -20,6 +20,7 @@ const Dashboard = () => {
const navigate = useNavigate();
const [mainStats, setMainStats] = useState({});
const [chartStats, setChartStats] = useState({});
const [pecUsage, setPecUsage] = useState(0);
const onGoToCreateNewBando = () => {
navigate('/bandi/new');
@@ -45,6 +46,7 @@ const Dashboard = () => {
if (data.status === 'SUCCESS') {
setMainStats(data.data.widget1);
setChartStats(data.data.widgetBars);
setPecUsage(data.data.pecUsage/data.data.pecLimit * 100);
}
}
@@ -63,6 +65,19 @@ const Dashboard = () => {
<div className="appPage__spacer"></div>
<div className={`appPageSection__withBorder${pecUsage > 91 ? ' danger' : ''}`}>
<p className="appPageSection__pMeta">
<span>{__('PEC inbox quota', 'gepafin')}</span>
<span>{<NumberFlow
value={pecUsage}
format={{ notation: 'compact' }}
suffix={'%'}
locales="it-IT"/>}</span>
</p>
</div>
<div className="appPage__spacer"></div>
<div className="appPageSection statsBigBadges">
<h2>{__('Panoramica di Sistema', 'gepafin')}</h2>
<div className="statsBigBadges__grid">