diff --git a/dashboard/src/index.scss b/dashboard/src/index.scss index 71103d5a1..b0c10ddf5 100644 --- a/dashboard/src/index.scss +++ b/dashboard/src/index.scss @@ -324,11 +324,6 @@ hr { page-break-before: auto; display: none; } - @page { - margin: 1cm; - margin-top: 50px; - margin-bottom: 30mm !important; - } } @media screen { .printonly { diff --git a/dashboard/src/scenes/stats/CustomFieldsStats.js b/dashboard/src/scenes/stats/CustomFieldsStats.js index 986d59b75..d150fa9b5 100644 --- a/dashboard/src/scenes/stats/CustomFieldsStats.js +++ b/dashboard/src/scenes/stats/CustomFieldsStats.js @@ -29,54 +29,54 @@ const CustomFieldsStats = ({ customFields, data, additionalCols = [], dataTestId /> ))} - {customFieldsInStats.map((field) => { - if (['number'].includes(field.type)) { - return ( -
- -
- ); - } - if (['date', 'date-with-time'].includes(field.type)) { - return ( -
- -
- ); - } - if (['boolean', 'yes-no', 'enum'].includes(field.type)) { - return ( - onSliceClick?.(newSlice, field.name) : undefined} - key={field.name} - data={getPieData(data, field.name, { - options: field.options, - isBoolean: field.type === 'boolean', - })} - /> - ); - } - if (['multi-choice'].includes(field.type)) { - return ( - onSliceClick?.(newSlice, field.name) : undefined} - key={field.name} - isMultiChoice - axisTitleY="File active" - axisTitleX={field.name} - totalForMultiChoice={data.length} - totalTitleForMultiChoice={totalTitleForMultiChoice} - data={getMultichoiceBarData(data, field.name, { options: field.options })} - /> - ); - } - return null; - })} + {customFieldsInStats.map((field) => { + if (['number'].includes(field.type)) { + return ( +
+ +
+ ); + } + if (['date', 'date-with-time'].includes(field.type)) { + return ( +
+ +
+ ); + } + if (['boolean', 'yes-no', 'enum'].includes(field.type)) { + return ( + onSliceClick?.(newSlice, field.name) : undefined} + key={field.name} + data={getPieData(data, field.name, { + options: field.options, + isBoolean: field.type === 'boolean', + })} + /> + ); + } + if (['multi-choice'].includes(field.type)) { + return ( + onSliceClick?.(newSlice, field.name) : undefined} + key={field.name} + isMultiChoice + axisTitleY="File active" + axisTitleX={field.name} + totalForMultiChoice={data.length} + totalTitleForMultiChoice={totalTitleForMultiChoice} + data={getMultichoiceBarData(data, field.name, { options: field.options })} + /> + ); + } + return null; + })} ); }; diff --git a/dashboard/src/scenes/stats/PersonsStats.js b/dashboard/src/scenes/stats/PersonsStats.js index eb148d251..479293a0e 100644 --- a/dashboard/src/scenes/stats/PersonsStats.js +++ b/dashboard/src/scenes/stats/PersonsStats.js @@ -74,7 +74,6 @@ export default function PersonStats({ return ( <> {!evolutivesStatsActivated &&

Statistiques des {title}

} -

Statistiques des {title}

{evolutivesStatsActivated ? ( <> @@ -185,6 +184,7 @@ export default function PersonStats({ return (
}; return ( -
+
-
+
+

{title} {!!help && }

@@ -159,7 +159,7 @@ export const CustomResponsiveBar = ({
{!!showWarning && (