diff --git a/src/app/simulator/access-and-offer/enrollment-by-stage-series/enrollment-by-stage-series.component.html b/src/app/simulator/access-and-offer/enrollment-by-stage-series/enrollment-by-stage-series.component.html index 1b88dddb9472311c16350f12c7a4152143381758..6ae7b0901f3045bcf256d01a288c0528a6419220 100644 --- a/src/app/simulator/access-and-offer/enrollment-by-stage-series/enrollment-by-stage-series.component.html +++ b/src/app/simulator/access-and-offer/enrollment-by-stage-series/enrollment-by-stage-series.component.html @@ -27,7 +27,7 @@ </th> </tr> <tr> - <th>{{data.offerYear}}</th> + <th>{{data.outOfSchoolPopulationCurrentYear}}</th> <th>{{data.offerYear}}</th> <th *ngFor="let year of data.years">{{year}}</th> </tr> diff --git a/src/app/simulator/access-and-offer/enrollment-by-stage-series/entities/enrollment-by-stage-series.ts b/src/app/simulator/access-and-offer/enrollment-by-stage-series/entities/enrollment-by-stage-series.ts index 3cc1fde1d2fed1559f6e5357d3d794048a082753..7e4a157b9bbd9e92df7afbf4ff74cfbc62c26a5f 100644 --- a/src/app/simulator/access-and-offer/enrollment-by-stage-series/entities/enrollment-by-stage-series.ts +++ b/src/app/simulator/access-and-offer/enrollment-by-stage-series/entities/enrollment-by-stage-series.ts @@ -5,6 +5,7 @@ export class EnrollmentByStageSeries extends NavigableComponentData { projections: Array<Projection> = new Array<Projection>(); years: Array<number>; offerYear: number; + outOfSchoolPopulationCurrentYear: number; constructor(init?: Partial<EnrollmentByStageSeries>) { super(); diff --git a/src/app/simulator/access-and-offer/enrollment-by-stage-series/services/enrollment-by-stage-series.service.ts b/src/app/simulator/access-and-offer/enrollment-by-stage-series/services/enrollment-by-stage-series.service.ts index 32b6b4808914ad362d3acc6c0ba704bce3125475..0e0fec8f0b09693a7ce22878060d4f22170b13ea 100644 --- a/src/app/simulator/access-and-offer/enrollment-by-stage-series/services/enrollment-by-stage-series.service.ts +++ b/src/app/simulator/access-and-offer/enrollment-by-stage-series/services/enrollment-by-stage-series.service.ts @@ -45,9 +45,11 @@ export class EnrollmentByStageSeriesService implements NavigableComponentService getData(): Observable<EnrollmentByStageSeries> { const requestOptions: any = this.getRequestOptions(); const offerYear: number = this.currentYearService.getEnrollmentCurrentYear(); + const outOfSchoolPopulationCurrentYear: number = this.currentYearService.getOutOfSchoolPopulationCurrentYear(); const enrollmentByStageSeries: EnrollmentByStageSeries = new EnrollmentByStageSeries({ projections: this.getProjections(), offerYear: offerYear, + outOfSchoolPopulationCurrentYear: outOfSchoolPopulationCurrentYear, years: this.utilitiesService.getSimulationYears() });