From 66f7951d0f51e76e056b4b0aa251fc5449035e35 Mon Sep 17 00:00:00 2001
From: nevisson <nevisson@gmail.com>
Date: Mon, 15 Jul 2019 12:27:16 -0300
Subject: [PATCH] =?UTF-8?q?Ajuste=20na=20nota=20de=20rodap=C3=A9=20do=20qu?=
=?UTF-8?q?adro=20de=20funcion=C3=A1rios.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../schools-staff/entities/schools-staff.ts | 16 +++++++++-------
.../schools-staff/schools-staff.component.html | 10 ++++------
.../schools-staff/schools-staff.component.scss | 5 -----
.../services/schools-staff.service.ts | 11 +++++++++++
4 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/src/app/simulator/quality-conditions/schools-staff/entities/schools-staff.ts b/src/app/simulator/quality-conditions/schools-staff/entities/schools-staff.ts
index 3c79882c..1a72ebc8 100644
--- a/src/app/simulator/quality-conditions/schools-staff/entities/schools-staff.ts
+++ b/src/app/simulator/quality-conditions/schools-staff/entities/schools-staff.ts
@@ -1,15 +1,17 @@
+import { Footnote } from './../../../../shared/components/footnote/entities/footnote';
import { FormationLevel } from '../../../../shared/entities/formation-level';
import { Location } from '../../../../shared/entities/location';
import { SchoolStaff } from './school-staff';
import { NavigableComponentData } from '../../../shared/entities/base/navigable-component-data';
export class SchoolsStaff extends NavigableComponentData {
- staffs: Array<SchoolStaff> = new Array<SchoolStaff>();
- formationLevels: Array<FormationLevel>;
- locations: Array<Location>;
+ staffs: Array<SchoolStaff> = new Array<SchoolStaff>();
+ formationLevels: Array<FormationLevel>;
+ locations: Array<Location>;
+ sourceInformationGeneral: Footnote;
- constructor(init?: Partial<SchoolsStaff>) {
- super();
- Object.assign(this, init);
- }
+ constructor(init?: Partial<SchoolsStaff>) {
+ super();
+ Object.assign(this, init);
+ }
}
diff --git a/src/app/simulator/quality-conditions/schools-staff/schools-staff.component.html b/src/app/simulator/quality-conditions/schools-staff/schools-staff.component.html
index edad85ba..a236fdce 100644
--- a/src/app/simulator/quality-conditions/schools-staff/schools-staff.component.html
+++ b/src/app/simulator/quality-conditions/schools-staff/schools-staff.component.html
@@ -100,16 +100,14 @@
[(ngModel)]="staff.referenceDate" [disabled]="!pqrAdminMode && pqrMode">
</td>
</tr>
- <tr *ngIf="!pqrMode">
- <td class="observation" colspan="12">*A função Auxiliar de Alimentação não pode ser removida, pois é
- utilizada no cálculo do custo-aluno, para desconsiderá-la informe o valor zero na sua respectiva
- remuneração.</td>
- </tr>
</tbody>
</table>
+ <div *ngIf="!pqrMode" class="panel-footer notes">
+ <app-footnote [footnote]="data.sourceInformationGeneral"></app-footnote>
+ </div>
</div>
</div>
</div>
<app-inconsistency *ngIf="!pqrMode" [inconsistencies]="inconsistencies"></app-inconsistency>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/simulator/quality-conditions/schools-staff/schools-staff.component.scss b/src/app/simulator/quality-conditions/schools-staff/schools-staff.component.scss
index c9382841..eb3ca929 100644
--- a/src/app/simulator/quality-conditions/schools-staff/schools-staff.component.scss
+++ b/src/app/simulator/quality-conditions/schools-staff/schools-staff.component.scss
@@ -9,8 +9,3 @@
.gross-monthly-remuneration {
min-width: 110px;
}
-
-.observation {
-text-align: left;
-color: #c62a10;
-}
diff --git a/src/app/simulator/quality-conditions/schools-staff/services/schools-staff.service.ts b/src/app/simulator/quality-conditions/schools-staff/services/schools-staff.service.ts
index 6e14b720..a4f820c5 100644
--- a/src/app/simulator/quality-conditions/schools-staff/services/schools-staff.service.ts
+++ b/src/app/simulator/quality-conditions/schools-staff/services/schools-staff.service.ts
@@ -1,3 +1,4 @@
+import { Footnote } from './../../../../shared/components/footnote/entities/footnote';
import { Injectable } from '@angular/core';
import { Observable, of } from 'rxjs';
@@ -20,6 +21,7 @@ export class SchoolsStaffService implements NavigableComponentService {
getData(): Observable<SchoolsStaff> {
let schoolsStaff: SchoolsStaff = new SchoolsStaff();
schoolsStaff = this.sessionService.getItem<SchoolsStaff>(Functionality.schoolsStaff.pqrKey);
+ schoolsStaff.sourceInformationGeneral = this.getSourceInformationGeneral();
return of(schoolsStaff);
}
@@ -48,4 +50,13 @@ export class SchoolsStaffService implements NavigableComponentService {
}
}
}
+
+ private getSourceInformationGeneral(): Footnote {
+ const footNote: Footnote = new Footnote({
+ remarks: 'A função Auxiliar de Alimentação não pode ser removida, pois é utilizada no cálculo do custo-aluno, ' +
+ 'para desconsiderá-la informe o valor zero na sua respectiva remuneração.'
+
+ });
+ return footNote;
+ }
}
--
GitLab