diff --git a/src/app/about/about.component.html b/src/app/about/about.component.html
index 8cfddb9b62b2c8f438e05bde1799cd4e6c020906..17882fac58d8c58432c11acca70a557c1d901d5f 100644
--- a/src/app/about/about.component.html
+++ b/src/app/about/about.component.html
@@ -1,6 +1,6 @@
<div class="container about">
<div class="col-md-12">
- <h2>O que é?</h2>
+ <h2 class="title">O que é?</h2>
<hr>
<p class="text-justify">
O <strong>Simulador de Custo-Aluno Qualidade (SimCAQ)</strong> é um sistema gratuito e
@@ -8,7 +8,7 @@
ensino em condições de qualidade nas escolas públicas de educação básica e subsidiar a elaboração do orçamento
público para assegurar um financiamento adequado nos níveis municipal, estadual e nacional.
</p>
- <h2>O que faz?</h2>
+ <h2 class="title">O que faz?</h2>
<hr>
<p class="text-justify">O SimCAQ subsidia:</p>
<ol>
@@ -66,7 +66,7 @@
</p>
</li>
</ul>
- <h2>Público-alvo</h2>
+ <h2 class="title">Público-alvo</h2>
<hr>
<ul>
<li>Gestores das secretarias municipais, estaduais e Ministério da Educação;</li>
@@ -80,7 +80,7 @@
<li>Comunidade acadêmica (professores, pesquisadores, alunos e técnicos administrativos);</li>
<li>Imprensa.</li>
</ul>
- <h2>Realização</h2>
+ <h2 class="title">Realização</h2>
<hr>
<p class="text-justify">
O simulador é resultado de um projeto de pesquisa coordenado por quatro professores (as) do Departamento de
@@ -112,7 +112,7 @@
É importante frisar que a autonomia da universidade pública foi preservada no âmbito da cooperação UFPR/MEC e que
os conteúdos do SimCAQ são de autoria e responsabilidade dos pesquisadores que coordenam o projeto.
</p>
- <h2>Breve trajetória</h2>
+ <h2 class="title">Breve trajetória</h2>
<hr>
<p class="text-justify">
A ideia inicial do SimCAQ surgiu em 2008 motivada pelas evidências de subfinanciamento (precariedade da
@@ -157,7 +157,7 @@
SimCAQ foi desenvolvido em versão web para ser disponibilizada para o público, sendo uma primeira versão
disponibilizada a partir de dezembro de 2018.
</p>
- <p class="text-justify reference">
+ <p class="title text-justify reference">
REFERÊNCIAS
</p>
<p class="text-justify reference">
diff --git a/src/app/about/about.component.scss b/src/app/about/about.component.scss
index 242c88c919de477b42552258ce81cd7cc6356428..f88e7d69879128a895f869d9671887bede261535 100644
--- a/src/app/about/about.component.scss
+++ b/src/app/about/about.component.scss
@@ -1,9 +1,11 @@
+@import "../shared/styles/variables.scss";
+
.about {
font-size: 16px;
- color: #3e3e3e !important;
+ color: $text-color;
- h2 {
- font-weight: 600;
+ .title {
+ color: $navbar-color;
}
p, ol, ul {
diff --git a/src/app/shared/services/auth/auth.service.ts b/src/app/shared/services/auth/auth.service.ts
index c7760643b3b641c2a68a44ccbf4e9511b24e9ec6..80fc0a9a65aea35e8df91498dac598da8e61ab44 100644
--- a/src/app/shared/services/auth/auth.service.ts
+++ b/src/app/shared/services/auth/auth.service.ts
@@ -3,14 +3,12 @@ import { Router } from '@angular/router';
import { HttpParams, HttpHeaders } from '@angular/common/http';
import { throwError, Subject, Observable, of, empty } from 'rxjs';
import { map, catchError } from 'rxjs/operators';
-import { BsModalService, BsModalRef } from 'ngx-bootstrap/modal';
import { UtilitiesService } from '../utilities/utilities.service';
import { NotificationService } from '../notification/notification.service';
import { HttpService } from '../http/http.service';
import { SessionService } from '../session/session.service';
import { UserInfo } from './entities/user-info';
-import { User } from '../../../user/entities/user';
@Injectable({
providedIn: 'root'
diff --git a/src/app/shared/services/utilities/utilities.service.ts b/src/app/shared/services/utilities/utilities.service.ts
index 45846b65b3feae6a713076f37a7a72ca9b949343..d1b0f1e94ffba71e395608de79f73fb46d8ce534 100644
--- a/src/app/shared/services/utilities/utilities.service.ts
+++ b/src/app/shared/services/utilities/utilities.service.ts
@@ -32,6 +32,7 @@ import { ClassSizeByLocation } from '../../entities/class-size-by-location';
import { LocationEnum } from '../../entities/enums/location.enum';
import { ClassSize } from '../../entities/class-size';
import { FinancialData } from '../../../simulator/results/budget-forecast-report/entities/financial-data';
+import { FunctionalityInfo } from '../../entities/functionality/functionality-info';
@Injectable({
providedIn: 'root'
@@ -47,6 +48,7 @@ export class UtilitiesService {
static readonly hasErrorSessionKey: string = 'haserror';
static readonly hasRequiredDataSessionKey: string = 'hasrequireddata';
static readonly isDiscardContentSimulation: string = 'isdiscardcontentsimulation';
+ static readonly simulationTypeSessionKey: string = `${FunctionalityInfo.simulationNamespace}.type`;
static readonly minSimulationTime: number = 1;
static readonly maxSimulationTime: number = 10;
static readonly idStageEeExclusiva: number = 7;
diff --git a/src/app/shared/styles/variables.scss b/src/app/shared/styles/variables.scss
index 213cdb90f147a1ab7670acb28ec86768728925a8..2e7d9748b7db90bfaac6d85a5cc549b8e739d588 100644
--- a/src/app/shared/styles/variables.scss
+++ b/src/app/shared/styles/variables.scss
@@ -6,6 +6,7 @@ $blue-color: #2f4858;
$blue-second-color: #7ea5be;
$red-color: #a72222;
$gray-color: #777e82;
+$text-color: #777d82;
$differentiated-table-background-color: #eee;
$float-breakpoint: 1064px;
diff --git a/src/app/simulator/access-and-offer/view-enrollment-by-stage-series/view-enrollment-by-stage-series.component.ts b/src/app/simulator/access-and-offer/view-enrollment-by-stage-series/view-enrollment-by-stage-series.component.ts
index 2e717e85a97a0cf502837c19b10cca868e364ec8..0c5e3ab5a2c30395a53eb39bdf54fca76f26cfe8 100644
--- a/src/app/simulator/access-and-offer/view-enrollment-by-stage-series/view-enrollment-by-stage-series.component.ts
+++ b/src/app/simulator/access-and-offer/view-enrollment-by-stage-series/view-enrollment-by-stage-series.component.ts
@@ -10,8 +10,8 @@ import { ViewEnrollmentByStageSeries } from './entities/view-enrollment-by-stage
import { FunctionalityInfo } from '../../../shared/entities/functionality/functionality-info';
import { OutOfSchoolPopulationService } from '../../shared/services/out-of-school-population/out-of-school-population.service';
import { SerieEnum } from '../../../shared/entities/enums/serie.enum';
-import { SimulatorService } from '../../simulator/services/simulator.service';
import { SimulationType } from '../../simulator/entities/enums/simulation-type.enum';
+import { UtilitiesService } from '../../../shared/services/utilities/utilities.service';
@Component({
selector: 'app-view-enrollment-by-stage-series',
@@ -53,7 +53,7 @@ export class ViewEnrollmentByStageSeriesComponent extends BaseNavigableComponent
}
getPreviousStepRoute(): Array<string> {
- const simulationType: SimulationType = this.sessionService.getItem<SimulationType>(SimulatorService.simulationTypeSessionKey);
+ const simulationType: SimulationType = this.sessionService.getItem<SimulationType>(UtilitiesService.simulationTypeSessionKey);
if (simulationType !== SimulationType.planning) {
return undefined;
diff --git a/src/app/simulator/pqr/pqr.component.html b/src/app/simulator/pqr/pqr.component.html
index e066a91bfaec86078faa4be53e7f59e5e900b899..15ae3c2bd73834c37c08a20024e4528ff1fd5308 100644
--- a/src/app/simulator/pqr/pqr.component.html
+++ b/src/app/simulator/pqr/pqr.component.html
@@ -1,7 +1,7 @@
<div class="row pqr">
<div class="col-md-10 col-md-offset-1">
<div class="page-header">
- <h1 class="page-title">Padrão de qualidade de referência<sup>1</sup></h1>
+ <h1 class="page-title">Padrão de qualidade de referência</h1>
</div>
<div class="text-center presentation-container">
<h3 class="title">Apresentação</h3>
@@ -49,7 +49,7 @@
</p>
<p class="text" align="justify">
Os parâmetros que se referem mais especificamente às condições de qualidade são pensados tendo como base as
- especificidades das etapas e modalidades<sup>2</sup> bem como a localização e o tamanho das escolas. Os
+ especificidades das etapas e modalidades bem como a localização e o tamanho das escolas. Os
valores atribuídos são uma proposta de padrão de qualidade de referência para o cálculo <strong>Custo-Aluno
Qualidade inicial (CAQi)</strong>, para o ano de 2019.
</p>
@@ -63,22 +63,6 @@
parte dos entes federativos.
</p>
</div>
- <div class="notes text-left">
- <div class="separator">_____________________________________</div>
- <p class="note" align="justify">
- <sup>1</sup> O Projeto SimCAQ obteve financiamento para o período de 2016 a 2019 oriundo de um Termo de
- Execução Descentralizada (TED) firmado entre a Universidade Federal do Paraná (UFPR) e a Secretaria de
- Articulação com os Sistemas de Ensino do Ministério da Educação (SASE/MEC).
- </p>
- <p class="note" align="justify">
- <sup>2</sup> Na versão em desenvolvimento, o SimCAQ apresenta os cálculos de valores do CAQ para creche,
- pré-escola, ensino fundamental anos iniciais e finais (separadamente), ensino médio e educação de jovens e
- adultos (EJA). Considerando às especificidades das diversas situações de oferta da educação espacial e
- educação profissional o SimCAQ pretende avançar no cálculo do CAQ destas modalidades em nova fase da pesquisa.
- Desta forma, cada matrícula da Educação Especial e Educação Profissional é financiada com o mesmo valor de CAQ
- corresponde às etapas regulares que os alunos frequentam.
- </p>
- </div>
<hr>
<h3 class="title">Valores do PQR para o cálculo do CAQi</h3>
<p class="text" align="justify">
diff --git a/src/app/simulator/pqr/pqr.component.scss b/src/app/simulator/pqr/pqr.component.scss
index eee1bf8b96c8fb9b317d9d2cc618f184a8248dfb..142653fba2b8ae24f4c6826f18ee20812016f5bc 100644
--- a/src/app/simulator/pqr/pqr.component.scss
+++ b/src/app/simulator/pqr/pqr.component.scss
@@ -1,18 +1,18 @@
-$text-color: #3e3e3e;
-$note-color: #7b7b7b;
+@import "../../shared/styles/variables.scss";
.pqr {
margin-top: 24px;
+ color: $text-color;
.title {
margin-top: 25px;
margin-bottom: 25px;
+ color: $navbar-color;
}
.presentation-container {
.text {
font-size: 16px;
- color: $text-color;
margin-bottom: 20px;
&.emphasis {
@@ -21,20 +21,6 @@ $note-color: #7b7b7b;
}
}
- .notes {
- font-size: 14px;
- color: $note-color;
-
- .separator {
- margin-top: -16px;
- margin-bottom: 8px;
- }
-
- .note {
- margin-bottom: 20px;
- }
- }
-
.toolbar {
.btn {
height: 40px;
@@ -85,8 +71,6 @@ $note-color: #7b7b7b;
}
.references {
- color: $text-color;
-
p {
margin-bottom: 15px;
diff --git a/src/app/simulator/quality-conditions/offer-goal-enrollment-full-time/services/offer-goal-enrollment-full-time.service.ts b/src/app/simulator/quality-conditions/offer-goal-enrollment-full-time/services/offer-goal-enrollment-full-time.service.ts
index 11efcad5170fde06a3036f32702a0cf5b58a59dd..d36ea246743aa5f47cbc6fbe5a4023501bab8a95 100644
--- a/src/app/simulator/quality-conditions/offer-goal-enrollment-full-time/services/offer-goal-enrollment-full-time.service.ts
+++ b/src/app/simulator/quality-conditions/offer-goal-enrollment-full-time/services/offer-goal-enrollment-full-time.service.ts
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { Observable, of } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { map, switchMap } from 'rxjs/operators';
import * as _ from 'lodash';
import { Functionality } from '../../../../shared/entities/functionality/functionality';
@@ -40,8 +40,6 @@ export class OfferGoalEnrollmentFullTimeService implements NavigableComponentSer
const fullTimes: Array<FullTime> = new Array<FullTime>();
const offerGoalEnrollmentFullTimePQR = this.sessionService.getItem<OfferGoalEnrollmentFullTime>(Functionality.offerGoalEnrollmentFullTime.pqrKey);
- const resultForEnrollmentProjection = this.sessionService.getItem<EnrollmentProjection>(Functionality.enrollmentProjection.key);
- const enrollmentProjectionByLocation = _.first(resultForEnrollmentProjection.enrollmentsProjectionsByLocations);
for (let i = 0; i < offerGoalEnrollmentFullTimePQR.fullTime.length; i++) {
fullTimes.push(new FullTime({
@@ -52,26 +50,30 @@ export class OfferGoalEnrollmentFullTimeService implements NavigableComponentSer
}));
}
- return this.getDiagnostic().pipe(
- map(diagnostic => {
- for (let i = 0; i < diagnostic.length; i++) {
- for (let j = 0; j < fullTimes.length; j++) {
- if (fullTimes[j].id === diagnostic[i].education_level_short_id) {
- const enrollmentStage = _.find(enrollmentProjectionByLocation.stagesEnrollments, rEP => rEP.id === fullTimes[j].id);
- fullTimes[j].diagnostic = enrollmentStage.totalCurrentOffers > 0 ?
- ((diagnostic[i].total / enrollmentStage.totalCurrentOffers) * 100) : undefined;
+ return this.getEnrollmentT4().pipe(
+ switchMap(enrollmentT4 => {
+ return this.getDiagnostic().pipe(
+ map(diagnostic => {
+ for (let i = 0; i < diagnostic.length; i++) {
+ for (let j = 0; j < fullTimes.length; j++) {
+ if (fullTimes[j].id === diagnostic[i].education_level_short_id) {
+ const enrollmentStage = _.find(enrollmentT4, rEP => rEP.education_level_mod_name === fullTimes[j].stageDescription);
+ fullTimes[j].diagnostic = enrollmentStage.total > 0 ?
+ ((diagnostic[i].total / enrollmentStage.total) * 100) : undefined;
+ }
+ }
}
- }
- }
- data.fullTime = fullTimes;
- return data;
- }));
+ data.fullTime = fullTimes;
+ return data;
+ }));
+ })
+ );
}
getDiagnostic(): Observable<any> {
- const diagnosticFulltimeUrl: string = `${this.httpService.apiEndpointV1}/enrollment?dims=education_level_short`;
+ const diagnosticFulltimeUrl: string = `${this.httpService.apiEndpointV1}/enrollment?dims=education_level_short,integral_time`;
let filtersLocation: Array<string> = new Array<string>();
const enrollmentCurrentYear: number = this.currentYearService.getEnrollmentCurrentYear();
@@ -80,8 +82,8 @@ export class OfferGoalEnrollmentFullTimeService implements NavigableComponentSer
let filters: Array<string> = new Array<string>(
`min_year:"${enrollmentCurrentYear}"`,
`max_year:"${enrollmentCurrentYear}"`,
- `integral_time:"1"`,
- `education_level_short:["1","2","3","4","5","6"]`,
+ `integral_time:"true"`,
+ `education_level_short:["1","2","3","4","5"]`,
`adm_dependency:["1","2","3"]`
);
@@ -92,4 +94,27 @@ export class OfferGoalEnrollmentFullTimeService implements NavigableComponentSer
return this.httpService.get<Array<any>>(`${diagnosticFulltimeUrl}`, options).pipe(
map(diagnostic => diagnostic));
}
+
+ getEnrollmentT4(): Observable<any> {
+
+ const url: string = `${this.httpService.apiEndpointV1}/enrollment?dims=education_level_mod`;
+ let filtersLocation: Array<string> = new Array<string>();
+ const enrollmentCurrentYear: number = this.currentYearService.getEnrollmentCurrentYear();
+
+ filtersLocation = this.utilitiesService.getSelectLocationFilter();
+
+ let filters: Array<string> = new Array<string>(
+ `min_year:"${enrollmentCurrentYear}"`,
+ `max_year:"${enrollmentCurrentYear}"`,
+ `adm_dependency:["1","2","3"]`
+ );
+
+ filters = filters.concat(filtersLocation);
+
+ const options: any = this.httpService.getRequestOptionsWithSearchParams(new Map<string, string>([['filter', filters.join(',')]]));
+
+ return this.httpService.get<Array<any>>(`${url}`, options).pipe(
+ map(diagnosticT4 => diagnosticT4));
+ }
+
}
diff --git a/src/app/simulator/quality-conditions/school-day-per-week/school-day-per-week.component.ts b/src/app/simulator/quality-conditions/school-day-per-week/school-day-per-week.component.ts
index efdf03ca447db9ee8f95ebdcca86e1fc2f5c05c1..c84a2ae49966463769331d5416774c426aa8f955 100644
--- a/src/app/simulator/quality-conditions/school-day-per-week/school-day-per-week.component.ts
+++ b/src/app/simulator/quality-conditions/school-day-per-week/school-day-per-week.component.ts
@@ -9,6 +9,8 @@ import { SchoolDayPerWeek } from './entities/school-day-per-week';
import { Inconsistency } from '../../../shared/components/inconsistency/entities/inconsistency';
import { FunctionalityInfo } from '../../../shared/entities/functionality/functionality-info';
import { NavigableComponentData } from '../../shared/entities/base/navigable-component-data';
+import { SimulationType } from '../../simulator/entities/enums/simulation-type.enum';
+import { UtilitiesService } from '../../../shared/services/utilities/utilities.service';
@Component({
selector: 'app-school-day-per-week',
@@ -41,6 +43,16 @@ export class SchoolDayPerWeekComponent extends BaseNavigableComponent<SchoolDayP
this.data = pqrData;
}
+ getPreviousStepRoute(): Array<string> {
+ const simulationType: SimulationType = this.sessionService.getItem<SimulationType>(UtilitiesService.simulationTypeSessionKey);
+
+ if (simulationType === SimulationType.caq) {
+ return undefined;
+ } else {
+ return this.functionality.previousStep;
+ }
+ }
+
processValidation(): void {
super.processValidation();
diff --git a/src/app/simulator/shared/components/processing-simulation/processing-simulation.component.ts b/src/app/simulator/shared/components/processing-simulation/processing-simulation.component.ts
index cf1250aef026a8b7de60a262c9c98ad0ec6d784e..796b2f36571816672095bf34c8b028d99d351164 100644
--- a/src/app/simulator/shared/components/processing-simulation/processing-simulation.component.ts
+++ b/src/app/simulator/shared/components/processing-simulation/processing-simulation.component.ts
@@ -7,6 +7,7 @@ import { SimulatorService } from '../../../simulator/services/simulator.service'
import { SimulationType } from '../../../simulator/entities/enums/simulation-type.enum';
import { SessionService } from '../../../../shared/services/session/session.service';
import { FunctionalityRoute } from '../../../../shared/entities/functionality/functionality-route';
+import { UtilitiesService } from '../../../../shared/services/utilities/utilities.service';
@Component({
selector: 'app-processing-simulation',
@@ -24,7 +25,7 @@ export class ProcessingSimulationComponent extends BaseUnsubscribe implements On
}
processSimulation(): void {
- const simulationType: SimulationType = this.sessionService.getItem(SimulatorService.simulationTypeSessionKey);
+ const simulationType: SimulationType = this.sessionService.getItem(UtilitiesService.simulationTypeSessionKey);
this.simulatorService.initializeSimulation(simulationType).pipe(
takeUntil(this.unsubscribe))
diff --git a/src/app/simulator/shared/guards/simulator/simulation-planning-financing-type.guard.ts b/src/app/simulator/shared/guards/simulator/simulation-planning-financing-type.guard.ts
index 061dd2aa9e0ac9f300035e332c520c5382aa8841..ff1be2922e7231ed1301caf661e299aafa823ef4 100644
--- a/src/app/simulator/shared/guards/simulator/simulation-planning-financing-type.guard.ts
+++ b/src/app/simulator/shared/guards/simulator/simulation-planning-financing-type.guard.ts
@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
import { SessionService } from '../../../../shared/services/session/session.service';
import { SimulationType } from '../../../simulator/entities/enums/simulation-type.enum';
-import { SimulatorService } from '../../../simulator/services/simulator.service';
+import { UtilitiesService } from '../../../../shared/services/utilities/utilities.service';
@Injectable({
providedIn: 'root'
@@ -14,7 +14,7 @@ export class SimulationPlanningFinancingTypeGuard implements CanActivate {
constructor(private sessionService: SessionService) { }
canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
- const simulationType: SimulationType = this.sessionService.getItem<SimulationType>(SimulatorService.simulationTypeSessionKey);
+ const simulationType: SimulationType = this.sessionService.getItem<SimulationType>(UtilitiesService.simulationTypeSessionKey);
return simulationType === SimulationType.planning || simulationType === SimulationType.financing;
}
diff --git a/src/app/simulator/shared/guards/simulator/simulation-planning-type.guard.ts b/src/app/simulator/shared/guards/simulator/simulation-planning-type.guard.ts
index 803063653f9323aca1f4e101c6ed0e716102e11c..8ae64c839f0dbd8658061f8372cb2b32c1752f7a 100644
--- a/src/app/simulator/shared/guards/simulator/simulation-planning-type.guard.ts
+++ b/src/app/simulator/shared/guards/simulator/simulation-planning-type.guard.ts
@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
import { SessionService } from '../../../../shared/services/session/session.service';
import { SimulationType } from '../../../simulator/entities/enums/simulation-type.enum';
-import { SimulatorService } from '../../../simulator/services/simulator.service';
+import { UtilitiesService } from '../../../../shared/services/utilities/utilities.service';
@Injectable({
providedIn: 'root'
@@ -14,7 +14,7 @@ export class SimulationPlanningTypeGuard implements CanActivate {
constructor(private sessionService: SessionService) { }
canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
- const simulationType: SimulationType = this.sessionService.getItem<SimulationType>(SimulatorService.simulationTypeSessionKey);
+ const simulationType: SimulationType = this.sessionService.getItem<SimulationType>(UtilitiesService.simulationTypeSessionKey);
return simulationType === SimulationType.planning;
}
}
diff --git a/src/app/simulator/shared/guards/simulator/simulation-type.guard.ts b/src/app/simulator/shared/guards/simulator/simulation-type.guard.ts
index fb83e213f11a98e61e035fb2eb005063fc757aa3..2a495b51dada0f1b600d774f9143b0306eba84c4 100644
--- a/src/app/simulator/shared/guards/simulator/simulation-type.guard.ts
+++ b/src/app/simulator/shared/guards/simulator/simulation-type.guard.ts
@@ -4,7 +4,7 @@ import { Observable } from 'rxjs';
import { SessionService } from '../../../../shared/services/session/session.service';
import { SimulationType } from '../../../simulator/entities/enums/simulation-type.enum';
-import { SimulatorService } from '../../../simulator/services/simulator.service';
+import { UtilitiesService } from '../../../../shared/services/utilities/utilities.service';
@Injectable({
providedIn: 'root'
@@ -14,7 +14,7 @@ export class SimulationTypeGuard implements CanActivate {
constructor(private sessionService: SessionService) { }
canActivate(next: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean | UrlTree> | Promise<boolean | UrlTree> | boolean | UrlTree {
- const simulationType: SimulationType = this.sessionService.getItem<SimulationType>(SimulatorService.simulationTypeSessionKey);
+ const simulationType: SimulationType = this.sessionService.getItem<SimulationType>(UtilitiesService.simulationTypeSessionKey);
return simulationType === SimulationType.caq || simulationType === SimulationType.planning || simulationType === SimulationType.financing;
}
}
diff --git a/src/app/simulator/simulator/services/simulator.service.ts b/src/app/simulator/simulator/services/simulator.service.ts
index b03e3e3cb04409f0b4741b45898244677626f7e5..747e11ece1afdfb12b42a6cf28637192c3fbaf51 100644
--- a/src/app/simulator/simulator/services/simulator.service.ts
+++ b/src/app/simulator/simulator/services/simulator.service.ts
@@ -43,13 +43,13 @@ import { FunctionalityRoute } from '../../../shared/entities/functionality/funct
import { CurrentYearMonthService } from '../../shared/services/current-year-month/current-year-month.service';
import { SourceInformationService } from '../../shared/services/source-information/source-information.service';
import { SimulationTime } from '../../simulation-time/entities/simulation-time';
+import { UtilitiesService } from '../../../shared/services/utilities/utilities.service';
@Injectable({
providedIn: 'root'
})
export class SimulatorService {
- static readonly simulationTypeSessionKey: string = `${FunctionalityInfo.simulationNamespace}.type`;
static readonly simulationEditModeSessionKey: string = `${FunctionalityInfo.simulationNamespace}.editmode`;
static readonly simulationPerformedSessionKey: string = `${FunctionalityInfo.simulationNamespace}.performed`;
@@ -134,7 +134,7 @@ export class SimulatorService {
}
startSimulation(simulationType: SimulationType): void {
- this.sessionService.setItem(SimulatorService.simulationTypeSessionKey, simulationType);
+ this.sessionService.setItem(UtilitiesService.simulationTypeSessionKey, simulationType);
this.simulationInitialized = false;
this.router.navigate(FunctionalityRoute.processingSimulation);
}
@@ -152,7 +152,7 @@ export class SimulatorService {
mergeMap(() => {
return this.sourceInformationService.loadSourceInformations().pipe(
mergeMap(() => {
- this.sessionService.setItem(SimulatorService.simulationTypeSessionKey, simulationType);
+ this.sessionService.setItem(UtilitiesService.simulationTypeSessionKey, simulationType);
this.sessionService.setItem(SimulatorService.simulationPerformedSessionKey, false);
this.sessionService.setItem(SimulatorService.simulationEditModeSessionKey, false);
@@ -189,7 +189,7 @@ export class SimulatorService {
}
getResultSimulationRoute(): Array<string> {
- const simulationType: SimulationType = this.sessionService.getItem<SimulationType>(SimulatorService.simulationTypeSessionKey);
+ const simulationType: SimulationType = this.sessionService.getItem<SimulationType>(UtilitiesService.simulationTypeSessionKey);
let route: Array<string>;
switch (simulationType) {
@@ -218,7 +218,7 @@ export class SimulatorService {
}
navigateToEditModeSimulation(): void {
- const simulationType: SimulationType = this.sessionService.getItem(SimulatorService.simulationTypeSessionKey);
+ const simulationType: SimulationType = this.sessionService.getItem(UtilitiesService.simulationTypeSessionKey);
let route: Array<string>;
switch (simulationType) {
diff --git a/src/app/simulator/simulator/simulator.component.ts b/src/app/simulator/simulator/simulator.component.ts
index 758fd5e850ede5b99b3c1cd98b8ce7488952b467..749d8de2bb8693c718b89d4013fe0caf27c6d569 100644
--- a/src/app/simulator/simulator/simulator.component.ts
+++ b/src/app/simulator/simulator/simulator.component.ts
@@ -6,6 +6,7 @@ import { Functionality } from '../../shared/entities/functionality/functionality
import { SimulatorService } from './services/simulator.service';
import { SimulationType } from './entities/enums/simulation-type.enum';
import { SessionService } from '../../shared/services/session/session.service';
+import { UtilitiesService } from '../../shared/services/utilities/utilities.service';
@Component({
selector: 'app-simulator',
@@ -55,7 +56,7 @@ export class SimulatorComponent extends BaseUnsubscribe implements OnInit {
}
ngOnInit(): void {
- const simulationTypeFromSession: SimulationType = this.sessionService.getItem<SimulationType>(SimulatorService.simulationTypeSessionKey);
+ const simulationTypeFromSession: SimulationType = this.sessionService.getItem<SimulationType>(UtilitiesService.simulationTypeSessionKey);
const simulationPerformedromSession: boolean = this.sessionService.getItem<boolean>(SimulatorService.simulationPerformedSessionKey);
const simulationEditModeFromSession: boolean = this.sessionService.getItem<boolean>(SimulatorService.simulationEditModeSessionKey);
diff --git a/src/app/team/team.component.scss b/src/app/team/team.component.scss
index 35279963e0f1597e37397dd89857ca7a3f76675b..e452c7da405618d2ac080a4548e2b4f81c3aa2cd 100644
--- a/src/app/team/team.component.scss
+++ b/src/app/team/team.component.scss
@@ -23,6 +23,7 @@
.member-name {
font-size: 18px;
+ color: #5c5c5c;
}
.member-info {