Adequação de exibição de boletim

Author: fgarioli

src/app/app-routing.module.ts

@@ -40,12 +40,12 @@ const routes: Routes = [
     loadChildren: './pages/mensagens-details/mensagens-details.module#MensagensDetailsPageModule'
   },
   {
-    path: 'boletim',
-    loadChildren: './pages/boletim/boletim.module#BoletimPageModule'
+    path: 'boletim-trimestre',
+    loadChildren: './pages/boletim-trimestre/boletim-trimestre.module#BoletimTrimestrePageModule'
   },
   {
-    path: 'boletim-details',
-    loadChildren: './pages/boletim-details/boletim-details.module#BoletimDetailsPageModule'
+    path: 'boletim-trimestre-disciplina',
+    loadChildren: './pages/boletim-trimestre-disciplina/boletim-trimestre-disciplina.module#BoletimTrimestreDisciplinaPageModule'
   },
   {
     path: 'ativ-aval-disc',

src/app/models/boletim.dto.ts

@@ -1,11 +1,10 @@
 export interface BoletimDTO {
+    qtdFaltas: number;
+    tipoAvaliacao: string;
+    resultado: string;
+    descricao: string;
+    nota: number;
+    notaRec: number;
+    periodo: number;
     disciplina: string;
-    notaTrim1: string;
-    notaTrim2: string;
-    notaTrim3: string;
-    faltasTrim1: string;
-    faltasTrim2: string;
-    faltasTrim3: string;
-    notaAnual: string;
-    totalFaltas: string;
 }

src/app/pages/aluno/aluno.page.ts

@@ -68,7 +68,7 @@ export class AlunoPage implements OnInit {
 
   openBoletimPage(codTurmAlun) {
     this.data.storage = { codTurmAlun };
-    this.router.navigate(["boletim"]);
+    this.router.navigate(["boletim-trimestre"]);
   }
 
   openFrequenciaPage(codTurmAlun) {

src/app/pages/boletim-details/boletim-details.page.html

@@ -2,7 +2,7 @@ import { NgModule } from "@angular/core";
 import { RouterModule } from "@angular/router";
 import { IonicModule } from "@ionic/angular";
 
-import { BoletimPage } from "./boletim.page";
+import { BoletimTrimestreDisciplinaPage } from "./boletim-trimestre-disciplina.page";
 import { CommonModule } from "@angular/common";
 import { FormsModule } from "@angular/forms";
 
@@ -11,8 +11,8 @@ import { FormsModule } from "@angular/forms";
     CommonModule,
     FormsModule,
     IonicModule,
-    RouterModule.forChild([{ path: "", component: BoletimPage }])
+    RouterModule.forChild([{ path: "", component: BoletimTrimestreDisciplinaPage }])
   ],
-  declarations: [BoletimPage]
+  declarations: [BoletimTrimestreDisciplinaPage]
 })
-export class BoletimPageModule {}
+export class BoletimTrimestreDisciplinaPageModule {}

src/app/pages/boletim-details/boletim-details.page.scss

@@ -0,0 +1,49 @@
+<ion-header>
+  <ion-toolbar color="primary">
+    <ion-title>{{ trimestre }}º Trimestre</ion-title>
+    <ion-buttons slot="start">
+      <ion-back-button defaultHref="frequencia"> </ion-back-button>
+    </ion-buttons>
+  </ion-toolbar>
+</ion-header>
+
+<ion-content padding>
+  <ion-grid>
+    <ion-row>
+      <ion-col>
+        <ion-card no-margin margin-bottom class="full-width">
+          <ion-item class="border-bottom" text-wrap>
+            <ion-label text-wrap>Ano Letivo: {{ anoLetivo }}</ion-label>
+          </ion-item>
+        </ion-card>
+      </ion-col>
+    </ion-row>
+    <ion-row>
+      <ion-col>
+        <ion-list>
+          <ion-item
+            *ngFor="let item of boletim"
+            class="item ios in-list ion-focusable item-label hydrated"
+          >
+            <ion-label
+              class="sc-ion-label-ios-h sc-ion-label-ios-s ios hydrated"
+              text-wrap
+            >
+              <h2>Disciplina: {{ item.disciplina }}</h2>
+              <h3>
+                Nota:
+                {{
+                  item.notaRec && item.notaRec > item.nota
+                    ? item.notaRec
+                    : item.nota
+                }}
+              </h3>
+              <h3 style="color: red;">Faltas: {{ item.qtdFaltas }}</h3>
+              <!-- <p style="text-align: justify">Conteúdo: {{ aula.conteudo }}</p> -->
+            </ion-label>
+          </ion-item>
+        </ion-list>
+      </ion-col>
+    </ion-row>
+  </ion-grid>
+</ion-content>

src/app/pages/boletim-details/boletim-details.page.ts

@@ -0,0 +1,5 @@
+ion-card {
+  ion-item {
+    --inner-border-width: 0;
+  }
+}

src/app/pages/boletim/boletim.module.ts …a/boletim-trimestre-disciplina.module.tssrc/app/pages/boletim/boletim.module.ts renamed to src/app/pages/boletim-trimestre-disciplina/boletim-trimestre-disciplina.module.ts src/app/pages/boletim/boletim.module.ts renamed to src/app/pages/boletim-trimestre-disciplina/boletim-trimestre-disciplina.module.ts

@@ -0,0 +1,22 @@
+import { BoletimDTO } from "../../models/boletim.dto";
+import { Component, OnInit } from "@angular/core";
+import { DataProvider } from "src/app/providers/data.provider";
+import { environment } from "src/environments/environment";
+
+@Component({
+  selector: "app-boletim-trimestre-disciplina",
+  templateUrl: "boletim-trimestre-disciplina.page.html",
+  styleUrls: ["./boletim-trimestre-disciplina.page.scss"]
+})
+export class BoletimTrimestreDisciplinaPage implements OnInit {
+  boletim: BoletimDTO[];
+  trimestre: number;
+  anoLetivo = environment.ano;
+
+  constructor(private dataProvider: DataProvider) {
+    this.boletim = this.dataProvider.storage.listNotas;
+    this.trimestre = this.dataProvider.storage.trimestre;
+  }
+
+  async ngOnInit() {}
+}