File tree Expand file tree Collapse file tree
client/src/boards/outcomes/pages Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -201,7 +201,6 @@ function SankeyChartView({
201201 id : "outcomes-flux-sankey" ,
202202 integrationURL : `/integration?chart_id=outcomesFluxSankey&${ searchParams . toString ( ) } ` ,
203203 title : "Parcours des néo-bacheliers inscrits en L1 en 2019" ,
204- sources : [ { label : { fr : < > MESRE-SIES</ > } , url : { fr : "https://data.enseignementsup-recherche.gouv.fr" } } ] ,
205204 } }
206205 options = { options }
207206 renderData = { ( ) => < SankeyRenderData links = { links } totalStudents = { totalStudents } /> }
Original file line number Diff line number Diff line change @@ -57,14 +57,16 @@ export default function BreakdownBar({ field: fieldProp }: BreakdownBarProps = {
5757 integrationParams . set ( "field" , field ) ;
5858
5959 return (
60- < ChartWrapper
61- config = { {
62- id : `outcomes-phd-breakdown-${ field } ` ,
63- integrationURL : `/integration?chart_id=outcomesPhdBreakdown&${ integrationParams . toString ( ) } ` ,
64- title,
65- sources : [ { label : { fr : < > MESRE-SIES</ > } , url : { fr : "https://data.enseignementsup-recherche.gouv.fr" } } ] ,
66- } }
67- options = { chartOptions }
68- />
60+ < div className = "fr-mb-3w" >
61+ < ChartWrapper
62+ config = { {
63+ id : `outcomes-phd-breakdown-${ field } ` ,
64+ integrationURL : `/integration?chart_id=outcomesPhdBreakdown&${ integrationParams . toString ( ) } ` ,
65+ title,
66+ sources : [ { label : { fr : < > MESRE-SIES</ > } , url : { fr : "https://data.enseignementsup-recherche.gouv.fr" } } ] ,
67+ } }
68+ options = { chartOptions }
69+ />
70+ </ div >
6971 ) ;
7072}
Original file line number Diff line number Diff line change @@ -277,20 +277,26 @@ export default function PlusHautDiplomePage() {
277277 </ div >
278278 </ div >
279279
280- < DiplomaDonut />
281-
282- < Title as = "h2" look = "h5" className = "fr-mt-3w fr-mb-2w" > Diplômés vs non diplômés</ Title >
283-
284- { BREAKDOWN_SECTIONS . map ( ( { field } ) => {
285- const options = data . filterOptions ?. [ field ] || [ ] ;
286- const activeKey = filters [ field ] ;
287- const filteredOptions = activeKey
288- ? options . filter ( ( o ) => o . key === activeKey )
289- : options ;
290- const withData = filteredOptions . filter ( ( o ) => ( o . dipl ?? 0 ) + ( o . ndipl ?? 0 ) > 0 ) ;
291- if ( ! withData . length ) return null ;
292- return < BreakdownBar key = { field } field = { field } /> ;
293- } ) }
280+ < Row className = "fr-mt-3w" >
281+ < Col >
282+ < DiplomaDonut />
283+ </ Col >
284+ </ Row >
285+ < Row className = "fr-mt-3w" >
286+ < Col >
287+ < Title as = "h2" look = "h5" className = "fr-mt-3w fr-mb-2w" > Diplômés vs non diplômés</ Title >
288+ { BREAKDOWN_SECTIONS . map ( ( { field } ) => {
289+ const options = data . filterOptions ?. [ field ] || [ ] ;
290+ const activeKey = filters [ field ] ;
291+ const filteredOptions = activeKey
292+ ? options . filter ( ( o ) => o . key === activeKey )
293+ : options ;
294+ const withData = filteredOptions . filter ( ( o ) => ( o . dipl ?? 0 ) + ( o . ndipl ?? 0 ) > 0 ) ;
295+ if ( ! withData . length ) return null ;
296+ return < BreakdownBar key = { field } field = { field } /> ;
297+ } ) }
298+ </ Col >
299+ </ Row >
294300 </ >
295301 ) }
296302
Original file line number Diff line number Diff line change @@ -207,7 +207,7 @@ export default function RepartitionPage() {
207207 < RepartitionChart hideTitle />
208208 ) }
209209
210- < div className = "fr-mt-1w outcomes-flux-page__params outcomes-flux-page__params--after-chart" >
210+ < div className = "fr-mt-3w outcomes-flux-page__params outcomes-flux-page__params--after-chart" >
211211 < Title as = "h2" look = "h5" className = "fr-mb-2w" > Paramètres pour la répartition</ Title >
212212 < Row gutters >
213213 < Col >
You can’t perform that action at this time.
0 commit comments