Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
jerem1508 committed Jul 1, 2024
1 parent 90206e4 commit a7ddb5d
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 44 deletions.
1 change: 0 additions & 1 deletion client/src/pages/atlas/charts/map-pie-sectors/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ export default function MapPieSectors({
item.effectif_secteur_public > item.effectif_secteur_prive ? -1 : 1,
item.nom,
]);

Highcharts.seriesType(
"mappie",
"pie",
Expand Down
48 changes: 26 additions & 22 deletions client/src/pages/atlas/components/main/tabs/genders.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
} from "@dataesr/dsfr-plus";

import GenderChart from "../../../charts/genders-pie.tsx";
import MapPieGender from "../../../charts/map-pie-sectors/index.jsx";
import MapPieGender from "../../../charts/map-pie-genders/index.jsx";
import TrendCard from "../../../charts/trend.tsx";
import {
getGeoPolygon,
Expand Down Expand Up @@ -239,27 +239,31 @@ export function Genders() {
/>
</Col>
</Row>
<Row className="fr-my-5w">
<Col>
<Title as="h3" look="h5">
<span
className="fr-icon-pie-chart-2-line fr-mr-1w"
aria-hidden="true"
/>
{`Répartition des étudiants par ${getSubLevelName()}`}
</Title>
</Col>
</Row>
<Row gutters>
<Col md={12}>
<MapPieGender
currentYear={currentYear}
isLoading={isLoadingDataGenders}
mapPieData={dataGenders}
polygonsData={polygonsData}
/>
</Col>
</Row>
{polygonsData.length > 1 && (
<>
<Row className="fr-my-5w">
<Col>
<Title as="h3" look="h5">
<span
className="fr-icon-pie-chart-2-line fr-mr-1w"
aria-hidden="true"
/>
{`Répartition des étudiants par ${getSubLevelName()}`}
</Title>
</Col>
</Row>
<Row gutters>
<Col md={12}>
<MapPieGender
currentYear={currentYear}
isLoading={isLoadingDataGenders}
mapPieData={dataGenders}
polygonsData={polygonsData}
/>
</Col>
</Row>
</>
)}
<Row className="fr-mt-5w">
<Col>
<Title as="h3" look="h5">
Expand Down
46 changes: 25 additions & 21 deletions client/src/pages/atlas/components/main/tabs/sectors.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -218,27 +218,31 @@ export function Sectors() {
/>
</Col>
</Row>
<Row className="fr-my-5w">
<Col>
<Title as="h3" look="h5">
<span
className="fr-icon-pie-chart-2-line fr-mr-1w"
aria-hidden="true"
/>
{`Répartition des étudiants par ${getSubLevelName()}`}
</Title>
</Col>
</Row>
<Row gutters>
<Col md={12}>
<MapPieSectors
currentYear={currentYear}
isLoading={isLoadingDataSectorsMap}
mapPieData={dataSectorsMap}
polygonsData={polygonsData}
/>
</Col>
</Row>
{polygonsData.length > 1 && (
<>
<Row className="fr-my-5w">
<Col>
<Title as="h3" look="h5">
<span
className="fr-icon-pie-chart-2-line fr-mr-1w"
aria-hidden="true"
/>
{`Répartition des étudiants par ${getSubLevelName()}`}
</Title>
</Col>
</Row>
<Row gutters>
<Col md={12}>
<MapPieSectors
currentYear={currentYear}
isLoading={isLoadingDataSectorsMap}
mapPieData={dataSectorsMap}
polygonsData={polygonsData}
/>
</Col>
</Row>
</>
)}
<Row className="fr-mt-5w">
<Col>
<Title as="h3" look="h5">
Expand Down

0 comments on commit a7ddb5d

Please sign in to comment.