From 3147ee76d66536f056c98d0c67748c8179dd65cb Mon Sep 17 00:00:00 2001
From: Hugo Leonardo <hugo.com.h@gmail.com>
Date: Thu, 18 Jul 2019 23:49:00 -0300
Subject: [PATCH] =?UTF-8?q?Ajustando=20o=20ano=20da=20popula=C3=A7=C3=A3o?=
=?UTF-8?q?=20fora=20da=20escola=20na=20tela=20de=20proje=C3=A7=C3=A3o=20d?=
=?UTF-8?q?e=20matricula?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../enrollment-by-stage-series.component.html | 2 +-
.../entities/enrollment-by-stage-series.ts | 1 +
.../services/enrollment-by-stage-series.service.ts | 2 ++
3 files changed, 4 insertions(+), 1 deletion(-)
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 1b88dddb..6ae7b090 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 3cc1fde1..7e4a157b 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 32b6b480..0e0fec8f 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()
});
--
GitLab