Skip to content
Snippets Groups Projects
Commit 3147ee76 authored by Hugo Leonardo's avatar Hugo Leonardo
Browse files

Ajustando o ano da população fora da escola na tela de projeção de matricula

parent b46f8149
Branches
No related tags found
1 merge request!1v1
......@@ -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>
......
......@@ -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();
......
......@@ -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()
});
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment