From 2e785d955800729500e572eef7a241a0808075ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Victor=20Frans=20Pondaco=20Winandy?=
<jvfpw18@inf.ufpr.br>
Date: Mon, 1 Jun 2020 10:01:50 -0300
Subject: [PATCH 1/4] Remove education_level_mod filter from auxiliar
---
.../teacher-number/service/teacher-number.service.ts | 1 -
.../services/budget-forecast-report.service.ts | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/app/simulator/quality-conditions/teacher-number/service/teacher-number.service.ts b/src/app/simulator/quality-conditions/teacher-number/service/teacher-number.service.ts
index b0c04c1c..ae9b89db 100644
--- a/src/app/simulator/quality-conditions/teacher-number/service/teacher-number.service.ts
+++ b/src/app/simulator/quality-conditions/teacher-number/service/teacher-number.service.ts
@@ -132,7 +132,6 @@ export class TeacherNumberService implements NavigableComponentService {
`min_year:"${teacherCurrentYear}"`,
`max_year:"${teacherCurrentYear}"`,
`adm_dependency:["1","2","3"]`,
- `education_level_mod:["1","2","4","5","6","8","9"]`
);
filters = filters.concat(filtersLocation);
diff --git a/src/app/simulator/results/budget-forecast-report/services/budget-forecast-report.service.ts b/src/app/simulator/results/budget-forecast-report/services/budget-forecast-report.service.ts
index dd6269bf..e0efadc2 100644
--- a/src/app/simulator/results/budget-forecast-report/services/budget-forecast-report.service.ts
+++ b/src/app/simulator/results/budget-forecast-report/services/budget-forecast-report.service.ts
@@ -389,8 +389,7 @@ export class BudgetForecastReportService {
let filters: Array<string> = new Array<string>(
`min_year:"${teacherCurrentYear}"`,
`max_year:"${teacherCurrentYear}"`,
- `adm_dependency:["1","2","3"]`,
- `education_level_mod:["1","2","4","5","6","8","9"]`
+ `adm_dependency:["1","2","3"]`
);
filters = filters.concat(filtersLocation);
--
GitLab
From 011028411fbf65734acbb5ae5a907752614b96eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Victor=20Frans=20Pondaco=20Winandy?=
<jvfpw18@inf.ufpr.br>
Date: Wed, 3 Jun 2020 10:10:49 -0300
Subject: [PATCH 2/4] Fix month/year not showing in infrastructure screen
---
.../infrastructure-school-buildings.service.ts | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/app/simulator/quality-conditions/infrastructure-school-buildings/services/infrastructure-school-buildings.service.ts b/src/app/simulator/quality-conditions/infrastructure-school-buildings/services/infrastructure-school-buildings.service.ts
index 444d78c1..8f791e2a 100644
--- a/src/app/simulator/quality-conditions/infrastructure-school-buildings/services/infrastructure-school-buildings.service.ts
+++ b/src/app/simulator/quality-conditions/infrastructure-school-buildings/services/infrastructure-school-buildings.service.ts
@@ -20,13 +20,20 @@ import { NavigableComponentService } from '../../../shared/entities/base/navigab
import { StagesSpecificities } from '../entities/stages-specificities';
import { SourceInformationEnum } from './../../../../shared/entities/enums/source-information.enum';
import { Footnote } from './../../../../shared/components/footnote/entities/footnote';
+import { CurrentYearMonthService } from '../../../shared/services/current-year-month/current-year-month.service';
@Injectable({
providedIn: 'root'
})
export class InfrastructureSchoolBuildingsService implements NavigableComponentService {
- constructor(private httpService: HttpService, private utilitiesService: UtilitiesService, private sessionService: SessionService, private currentYearService: CurrentYearService) { }
+ constructor(
+ private httpService: HttpService,
+ private utilitiesService: UtilitiesService,
+ private sessionService: SessionService,
+ private currentYearService: CurrentYearService,
+ private currentYearMonthService: CurrentYearMonthService
+ ) { }
getData(pqrMode: boolean = false): Observable<InfrastructureSchoolsBuildings> {
const infrastructureSchoolsBuildings: InfrastructureSchoolsBuildings = new InfrastructureSchoolsBuildings();
@@ -214,8 +221,11 @@ export class InfrastructureSchoolBuildingsService implements NavigableComponentS
}
setUnitPrice(infrastructureSchools: InfrastructureSchools, priceCub: Array<any>): void {
+
+ const yearsMonth = this.currentYearMonthService.getCubCurrentYearMonth();
for (let i = 0; i < infrastructureSchools.infrastructureBuildings.length; i++) {
infrastructureSchools.infrastructureBuildings[i].unitPrice = _.first(priceCub).preco;
+ infrastructureSchools.infrastructureBuildings[i].referenceDate = _.first(yearsMonth).month + '/' + _.first(yearsMonth).year;
}
}
--
GitLab
From 5ed8684e06184e9a703e4dec7f9ea1aa06cedcc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Victor=20Frans=20Pondaco=20Winandy?=
<jvfpw18@inf.ufpr.br>
Date: Mon, 15 Jun 2020 10:25:39 -0300
Subject: [PATCH 3/4] Change daily charge amount filters
---
.../services/daily-teaching-load.service.ts | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/app/simulator/quality-conditions/daily-teaching-load/services/daily-teaching-load.service.ts b/src/app/simulator/quality-conditions/daily-teaching-load/services/daily-teaching-load.service.ts
index 1dd0e47c..709081da 100644
--- a/src/app/simulator/quality-conditions/daily-teaching-load/services/daily-teaching-load.service.ts
+++ b/src/app/simulator/quality-conditions/daily-teaching-load/services/daily-teaching-load.service.ts
@@ -69,17 +69,14 @@ export class DailyTeachingLoadService implements NavigableComponentService {
filters = new Array<string>(
`min_year:"${currentYear}"`,
`max_year:"${currentYear}"`,
- `adm_dependency:["1","2","3"]`,
- `education_level_mod:["1","2","4","5","6","8","9"]`,
+ `adm_dependency:["1","2","3"]`
);
if (shiftId === PeriodTeachingLoadEnum.diurnoParcial) {
- filters.push(`integral_time:["0"]`);
filters.push(`period:["1","2"]`);
} else if (shiftId === PeriodTeachingLoadEnum.tempoIntegral) {
- filters.push(`integral_time:["1"]`);
+ filters.push(`period:["4"]`);
} else { // noturno
- filters.push(`integral_time:["0"]`);
filters.push(`period:["3"]`);
}
--
GitLab
From cb03c6fcc78b0d3d95902a2039884937739c592e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Victor=20Frans=20Pondaco=20Winandy?=
<jvfpw18@inf.ufpr.br>
Date: Tue, 16 Jun 2020 10:14:14 -0300
Subject: [PATCH 4/4] Update outOfSchool to follow api pattern
---
.../services/current-year/current-year.service.ts | 2 +-
.../out-of-school-population.service.ts | 14 +-------------
2 files changed, 2 insertions(+), 14 deletions(-)
diff --git a/src/app/simulator/shared/services/current-year/current-year.service.ts b/src/app/simulator/shared/services/current-year/current-year.service.ts
index d90079ed..906ef62d 100644
--- a/src/app/simulator/shared/services/current-year/current-year.service.ts
+++ b/src/app/simulator/shared/services/current-year/current-year.service.ts
@@ -144,7 +144,7 @@ export class CurrentYearService {
}
getOutOfSchoolPopulationCurrentYear(): number {
- return 2017;
+ return 2018;
}
private processCurrentYears(currentYearKey: string, partialUrl: string): void {
diff --git a/src/app/simulator/shared/services/out-of-school-population/out-of-school-population.service.ts b/src/app/simulator/shared/services/out-of-school-population/out-of-school-population.service.ts
index 64592b08..891cbf67 100644
--- a/src/app/simulator/shared/services/out-of-school-population/out-of-school-population.service.ts
+++ b/src/app/simulator/shared/services/out-of-school-population/out-of-school-population.service.ts
@@ -85,23 +85,11 @@ export class OutOfSchoolPopulationService {
const enrollmentCurrentYear: number = this.currentYearService.getEnrollmentCurrentYear();
const filters: Array<string> = this.utilitiesService.getYearAndSelectLocationFilters(enrollmentCurrentYear);
- // Adjustment because the data is not in the default format.
- if (filters.length === 2) {
- // Brazil is represented by 'state' 0 (zero).
- filters.push('state:"0"');
- } else if (filters.length === 4) {
- // Remove the 'state' filter on index 2.
- filters.splice(2, 1);
-
- // Replace the 'city' filter with the 'state' filter.
- filters[2] = filters[2].replace('city', 'state');
- }
-
const searchParams: Map<string, string> = new Map<string, string>([
['filter', filters.join(',')]
]);
- searchParams.set('dims', 'pfe,state');
+ searchParams.set('dims', 'pfe');
return this.httpService.getRequestOptionsWithSearchParams(searchParams);
}
--
GitLab