diff --git a/src/app/shared/entities/functionality/functionality.ts b/src/app/shared/entities/functionality/functionality.ts index 296002d624544195b392eae97d8a44bcf423d242..8ee70f97c5c37019481479234d6c3672fe207a4f 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 077c9967024ce1346c186e316326b5409bd52cfb..5b3e871b9a081ea72f1a6491ff9f5a36df604425 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 ac0d6f7f55645041db917c36e10ce7ab379830a2..11c7ab31aefef19f55e5ee849af1e3721a2e281d 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 daffe29d3d1b01f275d7ec9ac8728b709a2d834e..2cbad1db99300068363733483de42fc0adc8ebca 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">