From b46f8149213f4bbdda30d6634a189c32d98ff158 Mon Sep 17 00:00:00 2001
From: Hugo Leonardo <hugo.com.h@gmail.com>
Date: Thu, 18 Jul 2019 23:43:32 -0300
Subject: [PATCH] =?UTF-8?q?Ajustando=20o=20ano=20da=20popula=C3=A7=C3=A3o?=
=?UTF-8?q?=20fora=20da=20escola?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/app/shared/entities/functionality/functionality.ts | 2 +-
.../entities/view-enrollment-by-stage-series.ts | 3 ++-
.../services/view-enrollment-by-stage-series.service.ts | 4 +++-
.../view-enrollment-by-stage-series.component.html | 4 +++-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/app/shared/entities/functionality/functionality.ts b/src/app/shared/entities/functionality/functionality.ts
index 296002d6..8ee70f97 100644
--- a/src/app/shared/entities/functionality/functionality.ts
+++ b/src/app/shared/entities/functionality/functionality.ts
@@ -28,7 +28,7 @@ export class Functionality {
static viewEnrollmentByStageAndSeries: FunctionalityInfo = new FunctionalityInfo({
name: 'Diagnóstico',
- subtitle: 'População fora da escola e características da matrícula em {currentYear}.',
+ subtitle: 'População fora da escola ({outOfSchoolPopulationCurrentYear}) e características da matrícula ({enrollmentCurrentYear}).',
key: FunctionalityKey.viewEnrollmentByStageAndSeries,
route: FunctionalityRoute.viewEnrollmentByStageAndSeries,
previousStep: FunctionalityRoute.simulationTime,
diff --git a/src/app/simulator/access-and-offer/view-enrollment-by-stage-series/entities/view-enrollment-by-stage-series.ts b/src/app/simulator/access-and-offer/view-enrollment-by-stage-series/entities/view-enrollment-by-stage-series.ts
index 077c9967..5b3e871b 100644
--- a/src/app/simulator/access-and-offer/view-enrollment-by-stage-series/entities/view-enrollment-by-stage-series.ts
+++ b/src/app/simulator/access-and-offer/view-enrollment-by-stage-series/entities/view-enrollment-by-stage-series.ts
@@ -7,7 +7,8 @@ export class ViewEnrollmentByStageSeries extends NavigableComponentData {
admDependencies: Array<string>;
locations: Array<string>;
totals: StageAdmDependencyLocationEnrollments;
- currentYear: number;
+ enrollmentCurrentYear: number;
+ outOfSchoolPopulationCurrentYear: number;
sourceInformations: Array<Footnote>;
notesOutOfSchoolPopulation: Array<Footnote>;
diff --git a/src/app/simulator/access-and-offer/view-enrollment-by-stage-series/services/view-enrollment-by-stage-series.service.ts b/src/app/simulator/access-and-offer/view-enrollment-by-stage-series/services/view-enrollment-by-stage-series.service.ts
index ac0d6f7f..11c7ab31 100644
--- a/src/app/simulator/access-and-offer/view-enrollment-by-stage-series/services/view-enrollment-by-stage-series.service.ts
+++ b/src/app/simulator/access-and-offer/view-enrollment-by-stage-series/services/view-enrollment-by-stage-series.service.ts
@@ -32,6 +32,7 @@ export class ViewEnrollmentByStageSeriesService implements NavigableComponentSer
getData(): Observable<ViewEnrollmentByStageSeries> {
const enrollmentCurrentYear: number = this.currentYearService.getEnrollmentCurrentYear();
+ const outOfSchoolPopulationCurrentYear: number = this.currentYearService.getOutOfSchoolPopulationCurrentYear();
const viewEnrollmentByStageSeries = new ViewEnrollmentByStageSeries({
totals: new StageAdmDependencyLocationEnrollments({
description: 'TOTAL',
@@ -42,7 +43,8 @@ export class ViewEnrollmentByStageSeriesService implements NavigableComponentSer
new Footnote({ indice: 8, sourceInformation: SourceInformationEnum.outOfSchoolPopulation, remarks: 'Resultados disponíveis somente para Brasil, estados e municípios das capitais' }),
new Footnote({ indice: 9, sourceInformation: SourceInformationEnum.enrollment })
),
- currentYear: enrollmentCurrentYear
+ enrollmentCurrentYear: enrollmentCurrentYear,
+ outOfSchoolPopulationCurrentYear: outOfSchoolPopulationCurrentYear
});
return this.utilitiesService.getAdmDependenciesDetailed().pipe(
diff --git a/src/app/simulator/access-and-offer/view-enrollment-by-stage-series/view-enrollment-by-stage-series.component.html b/src/app/simulator/access-and-offer/view-enrollment-by-stage-series/view-enrollment-by-stage-series.component.html
index daffe29d..2cbad1db 100644
--- a/src/app/simulator/access-and-offer/view-enrollment-by-stage-series/view-enrollment-by-stage-series.component.html
+++ b/src/app/simulator/access-and-offer/view-enrollment-by-stage-series/view-enrollment-by-stage-series.component.html
@@ -2,7 +2,9 @@
<div class="col-md-12">
<div class="page-header">
<h1 class="page-title">{{functionality.name}}</h1>
- <h3 class="page-subtitle">{{functionality.subtitle.replace('{currentYear}', data.currentYear?.toString())}}</h3>
+ <h3 class="page-subtitle">
+ {{functionality.subtitle.replace('{outOfSchoolPopulationCurrentYear}', data.outOfSchoolPopulationCurrentYear).replace('{enrollmentCurrentYear}', data.enrollmentCurrentYear)}}
+ </h3>
</div>
<div class="panel panel-default">
<div class="panel-body">
--
GitLab